From 02bae742f22b16c190b483731cc04cf2d2460a36 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 26 May 2006 21:25:18 +0000 Subject: [PATCH 001/266] Initial import. git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@1 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- COPYING | 340 +++ MANIFEST.in | 38 + Makefile | 45 + README | 23 + docs/README | 46 + docs/README.SOURCE | 233 ++ docs/pysol.6 | 219 ++ po/games.pot | 3050 ++++++++++++++++++++++ po/pysol.pot | 2781 ++++++++++++++++++++ po/ru_games.po | 3188 +++++++++++++++++++++++ po/ru_pysol.po | 3005 +++++++++++++++++++++ pysol | 66 + pysollib/__init__.py | 0 pysollib/acard.py | 143 + pysollib/actions.py | 1118 ++++++++ pysollib/app.py | 1613 ++++++++++++ pysollib/game.py | 2427 +++++++++++++++++ pysollib/gamedb.py | 581 +++++ pysollib/games/__init__.py | 59 + pysollib/games/acesup.py | 265 ++ pysollib/games/algerian.py | 169 ++ pysollib/games/auldlangsyne.py | 460 ++++ pysollib/games/bakersdozen.py | 344 +++ pysollib/games/bakersgame.py | 366 +++ pysollib/games/beleagueredcastle.py | 659 +++++ pysollib/games/bisley.py | 257 ++ pysollib/games/braid.py | 382 +++ pysollib/games/bristol.py | 327 +++ pysollib/games/buffalobill.py | 111 + pysollib/games/calculation.py | 278 ++ pysollib/games/camelot.py | 219 ++ pysollib/games/canfield.py | 710 +++++ pysollib/games/capricieuse.py | 145 ++ pysollib/games/contrib/__init__.py | 1 + pysollib/games/contrib/sanibel.py | 75 + pysollib/games/curdsandwhey.py | 327 +++ pysollib/games/dieboesesieben.py | 126 + pysollib/games/diplomat.py | 183 ++ pysollib/games/doublets.py | 142 + pysollib/games/eiffeltower.py | 126 + pysollib/games/fan.py | 598 +++++ pysollib/games/fortythieves.py | 786 ++++++ pysollib/games/freecell.py | 530 ++++ pysollib/games/glenwood.py | 186 ++ pysollib/games/golf.py | 634 +++++ pysollib/games/grandfathersclock.py | 142 + pysollib/games/gypsy.py | 510 ++++ pysollib/games/harp.py | 185 ++ pysollib/games/headsandtails.py | 142 + pysollib/games/katzenschwanz.py | 352 +++ pysollib/games/klondike.py | 1040 ++++++++ pysollib/games/labyrinth.py | 140 + pysollib/games/mahjongg/__init__.py | 4 + pysollib/games/mahjongg/mahjongg.py | 719 +++++ pysollib/games/mahjongg/mahjongg1.py | 149 ++ pysollib/games/mahjongg/mahjongg2.py | 138 + pysollib/games/mahjongg/mahjongg3.py | 87 + pysollib/games/mahjongg/shisensho.py | 468 ++++ pysollib/games/matriarchy.py | 229 ++ pysollib/games/montana.py | 407 +++ pysollib/games/montecarlo.py | 798 ++++++ pysollib/games/napoleon.py | 273 ++ pysollib/games/needle.py | 121 + pysollib/games/numerica.py | 544 ++++ pysollib/games/osmosis.py | 302 +++ pysollib/games/parallels.py | 176 ++ pysollib/games/pasdedeux.py | 230 ++ pysollib/games/picturegallery.py | 436 ++++ pysollib/games/pileon.py | 140 + pysollib/games/poker.py | 294 +++ pysollib/games/pushpin.py | 231 ++ pysollib/games/pyramid.py | 301 +++ pysollib/games/royalcotillion.py | 510 ++++ pysollib/games/royaleast.py | 123 + pysollib/games/siebenbisas.py | 268 ++ pysollib/games/simplex.py | 103 + pysollib/games/special/__init__.py | 4 + pysollib/games/special/hanoi.py | 165 ++ pysollib/games/special/memory.py | 324 +++ pysollib/games/special/pegged.py | 261 ++ pysollib/games/special/tarock.py | 943 +++++++ pysollib/games/spider.py | 1051 ++++++++ pysollib/games/sthelena.py | 176 ++ pysollib/games/sultan.py | 656 +++++ pysollib/games/takeaway.py | 114 + pysollib/games/terrace.py | 279 ++ pysollib/games/tournament.py | 248 ++ pysollib/games/ultra/__init__.py | 9 + pysollib/games/ultra/dashavatara.py | 1294 +++++++++ pysollib/games/ultra/hanafuda.py | 1052 ++++++++ pysollib/games/ultra/hanafuda1.py | 717 +++++ pysollib/games/ultra/hanafuda_common.py | 482 ++++ pysollib/games/ultra/hexadeck.py | 1405 ++++++++++ pysollib/games/ultra/larasgame.py | 774 ++++++ pysollib/games/ultra/matrix.py | 471 ++++ pysollib/games/ultra/mughal.py | 1174 +++++++++ pysollib/games/ultra/tarock.py | 274 ++ pysollib/games/ultra/threepeaks.py | 300 +++ pysollib/games/unionsquare.py | 183 ++ pysollib/games/wavemotion.py | 100 + pysollib/games/windmill.py | 270 ++ pysollib/games/yukon.py | 545 ++++ pysollib/help.py | 171 ++ pysollib/hint.py | 965 +++++++ pysollib/images.py | 324 +++ pysollib/layout.py | 913 +++++++ pysollib/main.py | 536 ++++ pysollib/mfxutil.py | 437 ++++ pysollib/move.py | 436 ++++ pysollib/pysolaudio.py | 331 +++ pysollib/pysolrandom.py | 233 ++ pysollib/pysoltk.py | 43 + pysollib/resource.py | 589 +++++ pysollib/settings.py | 60 + pysollib/stack.py | 2101 +++++++++++++++ pysollib/stats.py | 213 ++ pysollib/tk/__init__.py | 0 pysollib/tk/card.py | 289 ++ pysollib/tk/colorsdialog.py | 138 + pysollib/tk/demooptionsdialog.py | 112 + pysollib/tk/edittextdialog.py | 129 + pysollib/tk/fontsdialog.py | 211 ++ pysollib/tk/gameinfodialog.py | 136 + pysollib/tk/menubar.py | 1052 ++++++++ pysollib/tk/playeroptionsdialog.py | 188 ++ pysollib/tk/progressbar.py | 157 ++ pysollib/tk/selectcardset.py | 404 +++ pysollib/tk/selectgame.py | 571 ++++ pysollib/tk/selecttile.py | 205 ++ pysollib/tk/selecttree.py | 190 ++ pysollib/tk/soundoptionsdialog.py | 180 ++ pysollib/tk/statusbar.py | 182 ++ pysollib/tk/timeoutsdialog.py | 99 + pysollib/tk/tkcanvas.py | 343 +++ pysollib/tk/tkconst.py | 124 + pysollib/tk/tkhtml.py | 549 ++++ pysollib/tk/tkstats.py | 864 ++++++ pysollib/tk/tktree.py | 422 +++ pysollib/tk/tkutil.py | 396 +++ pysollib/tk/tkwidget.py | 646 +++++ pysollib/tk/tkwrap.py | 172 ++ pysollib/tk/toolbar.py | 526 ++++ pysollib/util.py | 228 ++ pysollib/version.py | 30 + scripts/all_games.py | 231 ++ scripts/build.bat | 11 + scripts/cardset_viewer.py | 256 ++ scripts/create_iss.py | 47 + scripts/mahjongg_utils.py | 208 ++ setup.cfg | 8 + setup.py | 71 + 151 files changed, 66941 insertions(+) create mode 100644 COPYING create mode 100644 MANIFEST.in create mode 100644 Makefile create mode 100644 README create mode 100644 docs/README create mode 100644 docs/README.SOURCE create mode 100644 docs/pysol.6 create mode 100644 po/games.pot create mode 100644 po/pysol.pot create mode 100644 po/ru_games.po create mode 100644 po/ru_pysol.po create mode 100755 pysol create mode 100644 pysollib/__init__.py create mode 100644 pysollib/acard.py create mode 100644 pysollib/actions.py create mode 100644 pysollib/app.py create mode 100644 pysollib/game.py create mode 100644 pysollib/gamedb.py create mode 100644 pysollib/games/__init__.py create mode 100644 pysollib/games/acesup.py create mode 100644 pysollib/games/algerian.py create mode 100644 pysollib/games/auldlangsyne.py create mode 100644 pysollib/games/bakersdozen.py create mode 100644 pysollib/games/bakersgame.py create mode 100644 pysollib/games/beleagueredcastle.py create mode 100644 pysollib/games/bisley.py create mode 100644 pysollib/games/braid.py create mode 100644 pysollib/games/bristol.py create mode 100644 pysollib/games/buffalobill.py create mode 100644 pysollib/games/calculation.py create mode 100644 pysollib/games/camelot.py create mode 100644 pysollib/games/canfield.py create mode 100644 pysollib/games/capricieuse.py create mode 100644 pysollib/games/contrib/__init__.py create mode 100644 pysollib/games/contrib/sanibel.py create mode 100644 pysollib/games/curdsandwhey.py create mode 100644 pysollib/games/dieboesesieben.py create mode 100644 pysollib/games/diplomat.py create mode 100644 pysollib/games/doublets.py create mode 100644 pysollib/games/eiffeltower.py create mode 100644 pysollib/games/fan.py create mode 100644 pysollib/games/fortythieves.py create mode 100644 pysollib/games/freecell.py create mode 100644 pysollib/games/glenwood.py create mode 100644 pysollib/games/golf.py create mode 100644 pysollib/games/grandfathersclock.py create mode 100644 pysollib/games/gypsy.py create mode 100644 pysollib/games/harp.py create mode 100644 pysollib/games/headsandtails.py create mode 100644 pysollib/games/katzenschwanz.py create mode 100644 pysollib/games/klondike.py create mode 100644 pysollib/games/labyrinth.py create mode 100644 pysollib/games/mahjongg/__init__.py create mode 100644 pysollib/games/mahjongg/mahjongg.py create mode 100644 pysollib/games/mahjongg/mahjongg1.py create mode 100644 pysollib/games/mahjongg/mahjongg2.py create mode 100644 pysollib/games/mahjongg/mahjongg3.py create mode 100644 pysollib/games/mahjongg/shisensho.py create mode 100644 pysollib/games/matriarchy.py create mode 100644 pysollib/games/montana.py create mode 100644 pysollib/games/montecarlo.py create mode 100644 pysollib/games/napoleon.py create mode 100644 pysollib/games/needle.py create mode 100644 pysollib/games/numerica.py create mode 100644 pysollib/games/osmosis.py create mode 100644 pysollib/games/parallels.py create mode 100644 pysollib/games/pasdedeux.py create mode 100644 pysollib/games/picturegallery.py create mode 100644 pysollib/games/pileon.py create mode 100644 pysollib/games/poker.py create mode 100644 pysollib/games/pushpin.py create mode 100644 pysollib/games/pyramid.py create mode 100644 pysollib/games/royalcotillion.py create mode 100644 pysollib/games/royaleast.py create mode 100644 pysollib/games/siebenbisas.py create mode 100644 pysollib/games/simplex.py create mode 100644 pysollib/games/special/__init__.py create mode 100644 pysollib/games/special/hanoi.py create mode 100644 pysollib/games/special/memory.py create mode 100644 pysollib/games/special/pegged.py create mode 100644 pysollib/games/special/tarock.py create mode 100644 pysollib/games/spider.py create mode 100644 pysollib/games/sthelena.py create mode 100644 pysollib/games/sultan.py create mode 100644 pysollib/games/takeaway.py create mode 100644 pysollib/games/terrace.py create mode 100644 pysollib/games/tournament.py create mode 100644 pysollib/games/ultra/__init__.py create mode 100644 pysollib/games/ultra/dashavatara.py create mode 100644 pysollib/games/ultra/hanafuda.py create mode 100644 pysollib/games/ultra/hanafuda1.py create mode 100644 pysollib/games/ultra/hanafuda_common.py create mode 100644 pysollib/games/ultra/hexadeck.py create mode 100644 pysollib/games/ultra/larasgame.py create mode 100644 pysollib/games/ultra/matrix.py create mode 100644 pysollib/games/ultra/mughal.py create mode 100644 pysollib/games/ultra/tarock.py create mode 100644 pysollib/games/ultra/threepeaks.py create mode 100644 pysollib/games/unionsquare.py create mode 100644 pysollib/games/wavemotion.py create mode 100644 pysollib/games/windmill.py create mode 100644 pysollib/games/yukon.py create mode 100644 pysollib/help.py create mode 100644 pysollib/hint.py create mode 100644 pysollib/images.py create mode 100644 pysollib/layout.py create mode 100644 pysollib/main.py create mode 100644 pysollib/mfxutil.py create mode 100644 pysollib/move.py create mode 100644 pysollib/pysolaudio.py create mode 100644 pysollib/pysolrandom.py create mode 100644 pysollib/pysoltk.py create mode 100644 pysollib/resource.py create mode 100644 pysollib/settings.py create mode 100644 pysollib/stack.py create mode 100644 pysollib/stats.py create mode 100644 pysollib/tk/__init__.py create mode 100644 pysollib/tk/card.py create mode 100644 pysollib/tk/colorsdialog.py create mode 100644 pysollib/tk/demooptionsdialog.py create mode 100644 pysollib/tk/edittextdialog.py create mode 100644 pysollib/tk/fontsdialog.py create mode 100644 pysollib/tk/gameinfodialog.py create mode 100644 pysollib/tk/menubar.py create mode 100644 pysollib/tk/playeroptionsdialog.py create mode 100644 pysollib/tk/progressbar.py create mode 100644 pysollib/tk/selectcardset.py create mode 100644 pysollib/tk/selectgame.py create mode 100644 pysollib/tk/selecttile.py create mode 100644 pysollib/tk/selecttree.py create mode 100644 pysollib/tk/soundoptionsdialog.py create mode 100644 pysollib/tk/statusbar.py create mode 100644 pysollib/tk/timeoutsdialog.py create mode 100644 pysollib/tk/tkcanvas.py create mode 100644 pysollib/tk/tkconst.py create mode 100644 pysollib/tk/tkhtml.py create mode 100644 pysollib/tk/tkstats.py create mode 100644 pysollib/tk/tktree.py create mode 100644 pysollib/tk/tkutil.py create mode 100644 pysollib/tk/tkwidget.py create mode 100644 pysollib/tk/tkwrap.py create mode 100644 pysollib/tk/toolbar.py create mode 100644 pysollib/util.py create mode 100644 pysollib/version.py create mode 100755 scripts/all_games.py create mode 100755 scripts/build.bat create mode 100755 scripts/cardset_viewer.py create mode 100755 scripts/create_iss.py create mode 100755 scripts/mahjongg_utils.py create mode 100644 setup.cfg create mode 100644 setup.py diff --git a/COPYING b/COPYING new file mode 100644 index 00000000..b4951ab7 --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + + 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 +convey 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) 19yy + + 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 2 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, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This 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 Library General +Public License instead of this License. diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 00000000..2afd0be5 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,38 @@ +## MANIFEST.in for PySolFC +## +## code +## +include pysol setup.py setup.cfg MANIFEST.in Makefile COPYING README +#recursive-include pysollib *.py +include pysollib/*.py pysollib/tk/*.py +include pysollib/games/*.py pysollib/games/special/*.py +include pysollib/games/ultra/*.py pysollib/games/contrib/*.py +include pysollib/games/mahjongg/*.py +include docs/* +include po/* +include scripts/build.bat scripts/create_iss.py scripts/mahjongg_utils.py +include scripts/all_games.py scripts/cardset_viewer.py +## +## data +## +graft data/cardset-2000 +graft data/cardset-crystal-mahjongg +graft data/cardset-dashavatara-ganjifa +graft data/cardset-hexadeck +graft data/cardset-kintengu +graft data/cardset-gnome-mahjongg-1 +graft data/cardset-matrix +graft data/cardset-mughal-ganjifa +graft data/cardset-oxymoron +graft data/cardset-standard +graft data/cardset-tuxedo +graft data/cardset-vienna-2k +graft data/html +graft data/html-src +graft data/images +#graft data/music +#graft data/plugins +graft data/sound +graft data/tiles +include data/pysol.xbm data/pysol.xpm data/pysol.ico +graft locale diff --git a/Makefile b/Makefile new file mode 100644 index 00000000..aab76980 --- /dev/null +++ b/Makefile @@ -0,0 +1,45 @@ +# Makefile for PySolFC + +PYSOLLIB_FILES=pysollib/tk/*.py pysollib/*.py \ + pysollib/games/*.py pysollib/games/special/*.py \ + pysollib/games/contrib/*.py pysollib/games/ultra/*.py + +.PHONY : install dist all_games_html rules pot mo + +install: + python setup.py install + +dist: + ./scripts/all_games.py > docs/all_games.html + python setup.py sdist + +rpm: + python setup.py bdist_rpm --use-bzip2 + +all_games_html: + ./scripts/all_games.py > docs/all_games.html + +rules: + (cd data/html-src && ./gen-html.py) + cp -r data/html-src/images data/html-src/html + rm -rf data/html + mv data/html-src/html data + +pot: + pygettext.py -k n_ -o po/pysol.pot $(PYSOLLIB_FILES) + ./scripts/all_games.py gettext > po/games.pot + for lng in ru; do \ + mv -f po/$${lng}_pysol.po po/$${lng}_pysol.old.po; \ + msgmerge po/$${lng}_pysol.old.po po/pysol.pot > po/$${lng}_pysol.po; \ + rm -f po/$${lng}_pysol.old.po; \ + mv -f po/$${lng}_games.po po/$${lng}_games.old.po; \ + msgmerge po/$${lng}_games.old.po po/games.pot > po/$${lng}_games.po; \ + rm -f po/$${lng}_games.old.po; \ + done + +mo: + test -d locale/ru/LC_MESSAGES || mkdir -p locale/ru/LC_MESSAGES + test -d locale/ru_RU/LC_MESSAGES || mkdir -p locale/ru_RU/LC_MESSAGES + msgcat po/ru_games.po po/ru_pysol.po > po/ru.po 2>/dev/null + msgfmt -o locale/ru/LC_MESSAGES/pysol.mo po/ru.po + cp -f locale/ru/LC_MESSAGES/pysol.mo locale/ru_RU/LC_MESSAGES/pysol.mo diff --git a/README b/README new file mode 100644 index 00000000..5096417b --- /dev/null +++ b/README @@ -0,0 +1,23 @@ +PySol Fan Club edition +====================== + + +Requirements. +------------- + +- Python (2.3 or later) +- Tkinter +- PySol-Sound-Server: http://www.pysol.org/ (not necessarily) +- PIL (Python Image Library): http://www.pythonware.com/products/pil (not necessarily) +- Freecell Solver: http://vipe.technion.ac.il/~shlomif/freecell-solver/ (not necessarily) + + +Installation. +------------- + +See: http://www.python.org/doc/current/inst/ + +or just run from the source directory: + +$ python pysol + diff --git a/docs/README b/docs/README new file mode 100644 index 00000000..16359bda --- /dev/null +++ b/docs/README @@ -0,0 +1,46 @@ +================================================================== +PySol - a solitaire game collection +================================================================== + +PySol is an exciting collection of more than 200 solitaire games. + + +Introduction +------------ + Please see the HTML documentation `data/html/intro.html' + for an overview of the many features. + + For other questions like "how do I install PySol ?" and "how to play ?" + also consult the HTML documentation in the `data/html' directory. + + +Feedback +-------- + As I do not have the time to test all variants thoroughly this + release will have bugs and misfeatures. The only way to get + these fixed is to report them. + + I also welcome your comments and suggestions (or just a mail + that you like PySol :-) + + +Copyright +--------- + PySol is Copyright (C) 1998, 1999, 2000, 2001, 2002 + Markus Franz Xaver Johannes Oberhumer + All Rights Reserved + + PySol is distributed under the terms of the GNU General Public License (GPL). + See the file COPYING. + + +Have fun, +Markus + + +http://www.oberhumer.com/pysol + + +P.S. To simplify installation PySol is distributed in a "bundled" version. + The full developers source code is available from the PySol homepage. + diff --git a/docs/README.SOURCE b/docs/README.SOURCE new file mode 100644 index 00000000..8c1d3af9 --- /dev/null +++ b/docs/README.SOURCE @@ -0,0 +1,233 @@ +================================================================== +PySol - a Python Solitaire Game Collection +================================================================== + +This is the developers source code. + + +Background information +---------------------- +In order to simplify installation the main PySol package is distributed +in a "bundled" version, which is basically a concatenation of all +source files. + + +Note for package maintainers +---------------------------- +You are strongly advised to package up the bundled byte-compiled +version as it loads faster, uses less memory and guarantees +compatibility with saved games of older PySol versions (<= 3.00). + + +Prerequisites +------------- +First of all you will need the Python development environment, which +is freely available from http://www.python.org + + +Source code introduction +------------------------ +The source basically consists of these three parts: + + - The main layer + Main application code and game logic. + + - The toolkit layer + Interface to the underlying GUI toolkit and windowing system. + + - The games layer + The actual games and plugins, implemented as subclasses of the + abstract classes Game and Stack. + + +The main layer +-------------- + pysol.py, main.py: + Main entry and initialization. Create an Application and start it. + + app.py: + Main control loop. Contains the class Application which is the glue + between the toplevel window and a Game. Also responsible for global + resources like options, statistics and plugins. + + Main objects making a full PySol application are: + - an Application [app] + - a concrete subclass of a Game [app.game] + - a Toplevel window [app.top] + - a Menubar which is connected to the game and toplevel [app.menubar] + - a Canvas for the playing table [app.canvas] + - a Toolbar which is connected to the game and menubar [app.toolbar] + + pysoltk.py: + Interface to the toolkit layer - see below. + + game.py: + Abstract class Game: undo/redo, hint/demo, load/save. + Responsible for combining the stacks to form a complete game. + + stack.py: + The stacks contain most of the intelligence. Very important methods + are acceptsCards(), canMoveCards(), canDropCards() and canFlipCard(). + Also, the stacks are responsible for card movement (mouse events) + and the card layout (the getPositionFor() method). + *** stack.py is the central file of PySol *** + + layout.py: + Utility class used by subclasses of Game to handle common layout + and graphics tasks. + + move.py: + Implements the actual atomic move types. Any move (and any + visualization of a move) passes through this. + + actions.py: + Implementation of default actions for the menubar and toolbar. + Subclassed by the toolkit layer. + + acard.py: + Implementation of default methods for a card - a card does not + contain any intelligence and is merely a display object. + Subclassed by the toolkit layer. + + hint.py: + Hint/demo logic. Rather generic, individual games may subclass. + Currently optimized for Klondike/Gypsy type games. + + gamedb.py: + Game database and game/plugin loader. + + resource.py: + Resource managers (cardsets, tiles, samples, music) + + stats.py: + Abstract statistics handler. May get rewritten in the future. + + mfxutil.py, util.py, random.py: + More or less standalone utility modules. + + help.py: + Interface to the HTML viewer and some dialogs. + + pysolaudio.py: + Interface to the sound server. + + +The toolkit layer +----------------- + PySol has been designed so that it can run under multiple UI toolkits - + due to the dynamic nature of Python this can even be under control + of a runtime option. + + The preferred toolkit is Tcl/Tk using the Tkinter bindings which + ship with every Python installation, but a very experimental version + for Gnome (using the pygnome and pygtk bindings) exists as well. + + A more exicting idea is to use JPython to make PySol run under a + Java VM using Swing as the toolkit. + + Because Tkinter is the "main" interface other toolkit layers have + to emulate a limited subset of Tkinter's API. This should hopefully + not prove too difficult in practice. + + Relevant modules: + + pysoltk.py: + Any access to the toolkit layer goes via this module. This means + that the implementation of the toolkit layer is completely hidden + and can use any number of internal modules in its subdirectory. + + Important modules of the Tkinter implementation: + + tk/tkconst.py, tk/tkutil.py, tk/tkwidget.py, tk/edittextdialog: + Toolkit constants, utils and generic widgets. + + tk/tkcanvas.py: + Wrapper for canvas widgets. + + tk/tkwrap.py: + Wrapper for other widgets. + + tk/card.py: + How to display a card on the screen. No intelligence here. + Subclasses the main layer. + + tk/menubar.py: + Create menubar and handle menu actions. Delegates to class Game. + Subclasses the actions.py main layer. + + tk/toolbar.py: + Toolbar. Subclasses the actions.py main layer. + + tk/progressbar.py, tk/statusbar.py: + Progress- and statusbar widgets. + + tk/tkstats.py: + Statistics dialogs. Uses stats.py from the main layer. + + tk/tktree.py, tk/selecttree.py, tk/select*.py: + Tree and tree-selection widgets. + + tk/tkhtml.py: + A very limited HTML widget. Could be useful for other projects, though. + + +The games layer +--------------- + games/*.py: + These modules implement subclasses of Game/Stack for the actual game + layout. Start with eiffeltower.py and klondike.py to get an idea + how it works. + + Implementing your own favourite solitaire game is straightforward: + + Create a new source file in the games directory (copy a game that + is somewhat similar for use as a starting point). If your game requires + special intelligence derive subclasses of a stack - see braid.py or + picturegallery.py for really complex examples. You can also derive + from stacks of other games. + + Layout of the stacks and texts is controlled by the game (createGame, + utility class Layout), while intelligence is mostly contained + in the stacks. + + Implement your own hint class if necessary (see golf.py for a + simple example). + + Do not change global files like stack.py, game.py or hint.py - derive + subclasses if necessary. + + Do not pollute the global namespace. + + Follow the PySol style coding style. + + Adapt the parameters in the call of registerGame(): + a unique game ID (should be in range 100000..999999 for user + written games), the game class, the game name, and various other + parameters - see the file gamedb.py for a full description. + + +Converting your game to a plugin +-------------------------------- +Plugins in the `data/plugins' directory will be loaded automatically at +program startup, so you can distribute your plugins separately. + +Converting a game to a plugin is completely trivial - just +move the Python source file to the `data/plugins' directory. + +If you want to contribute your game to the official PySol distribution +you must write a useable HTML documentation. Also, your variant should +have an interesting gameplay. + + +Contributing +------------ +Apart from contributing new games you can also help by improving the +interface - e.g. some fancy statistics dialogs would be very nice. +See the main README for more ideas. + + +Have fun, +Markus + +http://www.oberhumer.com/pysol + diff --git a/docs/pysol.6 b/docs/pysol.6 new file mode 100644 index 00000000..ab150e11 --- /dev/null +++ b/docs/pysol.6 @@ -0,0 +1,219 @@ +.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13 +.\" +.\" Standard preamble: +.\" ======================================================================== +.de Sh \" Subsection heading +.br +.if t .Sp +.ne 5 +.PP +\fB\\$1\fR +.PP +.. +.de Sp \" Vertical space (when we can't use .PP) +.if t .sp .5v +.if n .sp +.. +.de Vb \" Begin verbatim text +.ft CW +.nf +.ne \\$1 +.. +.de Ve \" End verbatim text +.ft R +.fi +.. +.\" Set up some character translations and predefined strings. \*(-- will +.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left +.\" double quote, and \*(R" will give a right double quote. | will give a +.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to +.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' +.\" expand to `' in nroff, nothing in troff, for use with C<>. +.tr \(*W-|\(bv\*(Tr +.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' +.ie n \{\ +. ds -- \(*W- +. ds PI pi +. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch +. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch +. ds L" "" +. ds R" "" +. ds C` "" +. ds C' "" +'br\} +.el\{\ +. ds -- \|\(em\| +. ds PI \(*p +. ds L" `` +. ds R" '' +'br\} +.\" +.\" If the F register is turned on, we'll generate index entries on stderr for +.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index +.\" entries marked with X<> in POD. Of course, you'll have to process the +.\" output yourself in some meaningful fashion. +.if \nF \{\ +. de IX +. tm Index:\\$1\t\\n%\t"\\$2" +.. +. nr % 0 +. rr F +.\} +.\" +.\" For nroff, turn off justification. Always turn off hyphenation; it makes +.\" way too many mistakes in technical documents. +.hy 0 +.if n .na +.\" +.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). +.\" Fear. Run. Save yourself. No user-serviceable parts. +. \" fudge factors for nroff and troff +.if n \{\ +. ds #H 0 +. ds #V .8m +. ds #F .3m +. ds #[ \f1 +. ds #] \fP +.\} +.if t \{\ +. ds #H ((1u-(\\\\n(.fu%2u))*.13m) +. ds #V .6m +. ds #F 0 +. ds #[ \& +. ds #] \& +.\} +. \" simple accents for nroff and troff +.if n \{\ +. ds ' \& +. ds ` \& +. ds ^ \& +. ds , \& +. ds ~ ~ +. ds / +.\} +.if t \{\ +. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" +. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' +. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' +. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' +. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' +. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' +.\} +. \" troff and (daisy-wheel) nroff accents +.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' +.ds 8 \h'\*(#H'\(*b\h'-\*(#H' +.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] +.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' +.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' +.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] +.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] +.ds ae a\h'-(\w'a'u*4/10)'e +.ds Ae A\h'-(\w'A'u*4/10)'E +. \" corrections for vroff +.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' +.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' +. \" for low resolution devices (crt and lpr) +.if \n(.H>23 .if \n(.V>19 \ +\{\ +. ds : e +. ds 8 ss +. ds o a +. ds d- d\h'-1'\(ga +. ds D- D\h'-1'\(hy +. ds th \o'bp' +. ds Th \o'LP' +. ds ae ae +. ds Ae AE +.\} +.rm #[ #] #H #V #F C +.\" ======================================================================== +.\" +.IX Title "PYSOL 6" +.TH PYSOL 6 "20 Aug 2003" "Version 4.82" " " +.SH "NAME" +PySol \- a collection of more than 200 solitaire games +.SH "SYNOPSIS" +.IX Header "SYNOPSIS" +\&\fBpysol\fR [\fIfilename\fR] +.PP +The only option available is the file name of a saved game. +All other options are ignored \- PySol is fully +configurable within the game. +.SH "DESCRIPTION" +.IX Header "DESCRIPTION" +\&\fBPySol\fR is an exciting solitaire card game collection. Its features include +support for more than 200 distinct games, very nice look and feel, unlimited +undo & redo, load & save games, player statistics, hint system, +demo games, support for user written plug-ins, samples and background +music, integrated help browser and lots of documentation. +.PP +\&\fBPySol\fR comes with an integrated help browser. Just press after +the program has started. +.PP +\&\fBPySol\fR is written in 100% pure Python and runs out-of-the-box +on Unix (X11), Windows 95/98/ME/2000/NT/XP and Macintosh platforms. +.SH "FILES" +.IX Header "FILES" +\&\fBPySol\fR searches its data files in a number of directories including: +.PP +.Vb 7 +\& the current directory +\& /usr/share/pysol +\& /usr/lib/pysol +\& /usr/share/games/pysol +\& /usr/lib/games/pysol +\& /usr/games/share/pysol +\& /usr/games/lib/pysol +.Ve +.PP +Options are saved in \fB~/.pysol/options.dat\fR +.PP +Statistics and logs are saved in \fB~/.pysol/statistics.dat\fR +.PP +Additional plugins are searched in \fB~/.pysol/plugins/\fR +.PP +Additional cardsets are searched in \fB~/.pysol/cardset\-*/\fR +.PP +Additional table tiles are searched in \fB~/.pysol/tiles/\fR +.PP +Additional music songs are searched in \fB~/.pysol/music/\fR +.SH "ENVIRONMENT" +.IX Header "ENVIRONMENT" +\&\fB\s-1HOME\s0\fR is used for finding the users home directory. +.PP +\&\fB\s-1USER\s0\fR and \fB\s-1LOGNAME\s0\fR are used for getting the initial name of the player. +.PP +Additional cardsets are searched according to the path variable +\&\fB\s-1PYSOL_CARDSETS\s0\fR. You can specify multiple directories. +.PP +Additional table tiles are searched according to the path variable +\&\fB\s-1PYSOL_TILES\s0\fR. You can specify multiple directories. +.PP +Additional music songs are searched according to the path variable +\&\fB\s-1PYSOL_MUSIC\s0\fR. You can specify multiple directories. +.SH "DIAGNOSTICS" +.IX Header "DIAGNOSTICS" +Exit status is normally 0. +.SH "SEE ALSO" +.IX Header "SEE ALSO" +\&\fBpython\fR(1) +.PP +\&\fBace_solitaire\fR, \fBfreecell\fR, \fBgnome-freecell\fR, +\&\fBkabale\fR, \fBklondike\fR, \fBkpat\fR, \fBseahaven\fR, \fBsol\fR, +\&\fBspider\fR, \fBtksol\fR, \fBxfreecell\fR, \fBxpat2\fR, \fBxsol\fR +.SH "BUGS" +.IX Header "BUGS" +Please report all bugs immediately to the author. +.SH "AUTHOR" +.IX Header "AUTHOR" +Markus F.X.J. Oberhumer +.PP +http://www.oberhumer.com/pysol +.SH "COPYRIGHT" +.IX Header "COPYRIGHT" +PySol is Copyright (C) 1998, 1999, 2000, 2001, 2002 by Markus F.X.J. Oberhumer +.PP +All Rights Reserved. +.PP +PySol is distributed under the terms of the +\&\s-1GNU\s0 General Public License (\s-1GPL\s0) diff --git a/po/games.pot b/po/games.pot new file mode 100644 index 00000000..f71d5e8f --- /dev/null +++ b/po/games.pot @@ -0,0 +1,3050 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PySol 0.0.1\n" +"POT-Creation-Date: Fri May 26 20:25:43 2006\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: ENCODING\n" +"Generated-By: ./scripts/all_games.py 0.1\n" + + +msgid " 3x3 Matrix" +msgstr "" + +msgid " 4x4 Matrix" +msgstr "" + +msgid " 5x5 Matrix" +msgstr "" + +msgid " 6x6 Matrix" +msgstr "" + +msgid " 7x7 Matrix" +msgstr "" + +msgid " 8x8 Matrix" +msgstr "" + +msgid " 9x9 Matrix" +msgstr "" + +msgid "10 x 8" +msgstr "" + +msgid "10x10 Matrix" +msgstr "" + +msgid "8 x 8" +msgstr "" + +msgid "Abacus" +msgstr "" + +msgid "Aces High" +msgstr "" + +msgid "Aces Up" +msgstr "" + +msgid "Aces Up 5" +msgstr "" + +msgid "Achtmal Acht" +msgstr "" + +msgid "Acme" +msgstr "" + +msgid "Adelaide" +msgstr "" + +msgid "Agnes Bernauer" +msgstr "" + +msgid "Agnes Sorel" +msgstr "" + +msgid "Akbar's Conquest" +msgstr "" + +msgid "Akbar's Triumph" +msgstr "" + +msgid "Alaska" +msgstr "" + +msgid "Algerian Patience" +msgstr "" + +msgid "Algerian Patience (3 decks)" +msgstr "" + +msgid "Alhambra" +msgstr "" + +msgid "All in a Row" +msgstr "" + +msgid "Altar" +msgstr "" + +msgid "Alternation" +msgstr "" + +msgid "Amazons" +msgstr "" + +msgid "American Toad" +msgstr "" + +msgid "Another Round" +msgstr "" + +msgid "Appachan's Waterfall" +msgstr "" + +msgid "Applegate" +msgstr "" + +msgid "Aqab's" +msgstr "" + +msgid "Arachnida" +msgstr "" + +msgid "Arena" +msgstr "" + +msgid "Arena 2" +msgstr "" + +msgid "Arizona" +msgstr "" + +msgid "Arrow" +msgstr "" + +msgid "Art Moderne" +msgstr "" + +msgid "Ashrafi" +msgstr "" + +msgid "Ashta Dikapala" +msgstr "" + +msgid "Ashwapati" +msgstr "" + +msgid "Auld Lang Syne" +msgstr "" + +msgid "Aunt Mary" +msgstr "" + +msgid "Australian Patience" +msgstr "" + +msgid "Baby Spiderette" +msgstr "" + +msgid "Backbone" +msgstr "" + +msgid "Backbone +" +msgstr "" + +msgid "Bad Seven" +msgstr "" + +msgid "Baker's Dozen" +msgstr "" + +msgid "Baker's Game" +msgstr "" + +msgid "Balance" +msgstr "" + +msgid "Balarama" +msgstr "" + +msgid "Bastion" +msgstr "" + +msgid "Bat" +msgstr "" + +msgid "Bath" +msgstr "" + +msgid "Batsford" +msgstr "" + +msgid "Bavarian Patience" +msgstr "" + +msgid "Beak and Flipper" +msgstr "" + +msgid "Beatle" +msgstr "" + +msgid "Beleaguered Castle" +msgstr "" + +msgid "Belvedere" +msgstr "" + +msgid "Betsy Ross" +msgstr "" + +msgid "Big Easy" +msgstr "" + +msgid "Big Flying Dragon" +msgstr "" + +msgid "Big Forty" +msgstr "" + +msgid "Big Harp" +msgstr "" + +msgid "Big Hole" +msgstr "" + +msgid "Big Mountain" +msgstr "" + +msgid "Big Spider" +msgstr "" + +msgid "Big Spider (1 suit)" +msgstr "" + +msgid "Big Spider (2 suits)" +msgstr "" + +msgid "Big Sumo" +msgstr "" + +msgid "Bim Bom" +msgstr "" + +msgid "Bisley" +msgstr "" + +msgid "Bits n Bytes" +msgstr "" + +msgid "Bizarre" +msgstr "" + +msgid "Black Hole" +msgstr "" + +msgid "Black Widow" +msgstr "" + +msgid "Blind Alleys" +msgstr "" + +msgid "Blockade" +msgstr "" + +msgid "Blondes and Brunettes" +msgstr "" + +msgid "Blue Moon" +msgstr "" + +msgid "Boar" +msgstr "" + +msgid "Boat" +msgstr "" + +msgid "Boudoir" +msgstr "" + +msgid "Box Fan" +msgstr "" + +msgid "Box Kite" +msgstr "" + +msgid "Braid" +msgstr "" + +msgid "Bridesmaids" +msgstr "" + +msgid "Bridge" +msgstr "" + +msgid "Bridge 2" +msgstr "" + +msgid "Bridget's Game" +msgstr "" + +msgid "Bridget's Game Doubled" +msgstr "" + +msgid "Brigade" +msgstr "" + +msgid "Bristol" +msgstr "" + +msgid "British Constitution" +msgstr "" + +msgid "British Square" +msgstr "" + +msgid "Brunswick" +msgstr "" + +msgid "Buffalo Bill" +msgstr "" + +msgid "Bug" +msgstr "" + +msgid "Busy Aces" +msgstr "" + +msgid "Butterfly" +msgstr "" + +msgid "Butterfly 2" +msgstr "" + +msgid "Calculation" +msgstr "" + +msgid "Camelot" +msgstr "" + +msgid "Canfield" +msgstr "" + +msgid "Canister" +msgstr "" + +msgid "Capricieuse" +msgstr "" + +msgid "Captive Queens" +msgstr "" + +msgid "Carlton" +msgstr "" + +msgid "Carpet" +msgstr "" + +msgid "Carre Napoleon" +msgstr "" + +msgid "Carthage" +msgstr "" + +msgid "Casino Klondike" +msgstr "" + +msgid "Castle" +msgstr "" + +msgid "Castle of Indolence" +msgstr "" + +msgid "Castles in Spain" +msgstr "" + +msgid "Cat and Mouse" +msgstr "" + +msgid "Cat's Tail" +msgstr "" + +msgid "Cavalier" +msgstr "" + +msgid "Cell 11" +msgstr "" + +msgid "Ceremonial" +msgstr "" + +msgid "Challenge FreeCell" +msgstr "" + +msgid "Chamberlain" +msgstr "" + +msgid "Chameleon" +msgstr "" + +msgid "Checkered" +msgstr "" + +msgid "Chelicera" +msgstr "" + +msgid "Chequers" +msgstr "" + +msgid "Cherry Bomb" +msgstr "" + +msgid "ChessMania" +msgstr "" + +msgid "Chessboard" +msgstr "" + +msgid "Chinese Discipline" +msgstr "" + +msgid "Chinese Solitaire" +msgstr "" + +msgid "Chip" +msgstr "" + +msgid "Cicely" +msgstr "" + +msgid "Citadel" +msgstr "" + +msgid "Clink" +msgstr "" + +msgid "Clover Leaf" +msgstr "" + +msgid "Cluitjar's Lair" +msgstr "" + +msgid "Cockroach" +msgstr "" + +msgid "Colorado" +msgstr "" + +msgid "Columns" +msgstr "" + +msgid "Concentration" +msgstr "" + +msgid "Cone" +msgstr "" + +msgid "Congress" +msgstr "" + +msgid "Contradance" +msgstr "" + +msgid "Convolution" +msgstr "" + +msgid "Corkscrew" +msgstr "" + +msgid "Corners" +msgstr "" + +msgid "Corona" +msgstr "" + +msgid "Courtyard" +msgstr "" + +msgid "Cross" +msgstr "" + +msgid "Crown" +msgstr "" + +msgid "Cruel" +msgstr "" + +msgid "Cupido's Heart" +msgstr "" + +msgid "Cupola" +msgstr "" + +msgid "Curds and Whey" +msgstr "" + +msgid "Danda" +msgstr "" + +msgid "Dashavatara" +msgstr "" + +msgid "Dashavatara Circles" +msgstr "" + +msgid "Dead King Golf" +msgstr "" + +msgid "Deep" +msgstr "" + +msgid "Deep Well" +msgstr "" + +msgid "Der Katzenschwanz" +msgstr "" + +msgid "Der Zopf" +msgstr "" + +msgid "Der freie Napoleon" +msgstr "" + +msgid "Der kleine Napoleon" +msgstr "" + +msgid "Der lange Zopf" +msgstr "" + +msgid "Der letzte Monarch" +msgstr "" + +msgid "Deuces" +msgstr "" + +msgid "Dhanpati" +msgstr "" + +msgid "Diamond" +msgstr "" + +msgid "Die Bildgallerie" +msgstr "" + +msgid "Die Königsbergerin" +msgstr "" + +msgid "Die Russische" +msgstr "" + +msgid "Die Schlange" +msgstr "" + +msgid "Die böse Sieben" +msgstr "" + +msgid "Die große Harfe" +msgstr "" + +msgid "Die kleine Harfe" +msgstr "" + +msgid "Diplomat" +msgstr "" + +msgid "Dog" +msgstr "" + +msgid "Dojouji's Game" +msgstr "" + +msgid "Dojouji's Game Doubled" +msgstr "" + +msgid "Double Bisley" +msgstr "" + +msgid "Double Canfield" +msgstr "" + +msgid "Double Cockroach" +msgstr "" + +msgid "Double Dot" +msgstr "" + +msgid "Double Drawbridge" +msgstr "" + +msgid "Double Easthaven" +msgstr "" + +msgid "Double FreeCell" +msgstr "" + +msgid "Double Grasshopper" +msgstr "" + +msgid "Double Klondike" +msgstr "" + +msgid "Double Klondike by Threes" +msgstr "" + +msgid "Double Mahjongg Big Castle" +msgstr "" + +msgid "Double Mahjongg Big Flying Dragon" +msgstr "" + +msgid "Double Mahjongg Eight Squares" +msgstr "" + +msgid "Double Mahjongg Faro" +msgstr "" + +msgid "Double Mahjongg Roost" +msgstr "" + +msgid "Double Mahjongg Sphere" +msgstr "" + +msgid "Double Mahjongg Twin Picks" +msgstr "" + +msgid "Double Mahjongg Two Squares" +msgstr "" + +msgid "Double Rail" +msgstr "" + +msgid "Double Samuri" +msgstr "" + +msgid "Double Your Fun" +msgstr "" + +msgid "Double Yukon" +msgstr "" + +msgid "Doublets" +msgstr "" + +msgid "Dover" +msgstr "" + +msgid "Dragon" +msgstr "" + +msgid "Dragon 2" +msgstr "" + +msgid "Drawbridge" +msgstr "" + +msgid "Dress Parade" +msgstr "" + +msgid "Drivel" +msgstr "" + +msgid "Dude" +msgstr "" + +msgid "Duke" +msgstr "" + +msgid "Dumfries" +msgstr "" + +msgid "Eagle Wing" +msgstr "" + +msgid "Eastcliff" +msgstr "" + +msgid "Easthaven" +msgstr "" + +msgid "Easy Supreme" +msgstr "" + +msgid "Easy x One" +msgstr "" + +msgid "Egyptian Solitaire" +msgstr "" + +msgid "Eiffel Tower" +msgstr "" + +msgid "Eight Legions" +msgstr "" + +msgid "Eight Off" +msgstr "" + +msgid "Eight Squares" +msgstr "" + +msgid "Eight Times Eight" +msgstr "" + +msgid "Elevator" +msgstr "" + +msgid "Emperor" +msgstr "" + +msgid "Empty Pyramids" +msgstr "" + +msgid "Enterprise" +msgstr "" + +msgid "Escalator" +msgstr "" + +msgid "Eularia" +msgstr "" + +msgid "Excuse" +msgstr "" + +msgid "Eye" +msgstr "" + +msgid "F-15 Eagle" +msgstr "" + +msgid "Fair Lucy" +msgstr "" + +msgid "Fairest" +msgstr "" + +msgid "Falling Star" +msgstr "" + +msgid "Fan" +msgstr "" + +msgid "Farandole" +msgstr "" + +msgid "Faro" +msgstr "" + +msgid "Fastness" +msgstr "" + +msgid "Fatimeh's Game" +msgstr "" + +msgid "Fatimeh's Game Relaxed" +msgstr "" + +msgid "Fifteen Puzzle" +msgstr "" + +msgid "Fifteen plus" +msgstr "" + +msgid "Firecracker" +msgstr "" + +msgid "First Law" +msgstr "" + +msgid "Fish" +msgstr "" + +msgid "Fish face" +msgstr "" + +msgid "Five Aces" +msgstr "" + +msgid "Five Pyramids" +msgstr "" + +msgid "Floating City" +msgstr "" + +msgid "Flower Arrangement" +msgstr "" + +msgid "Flower Clock" +msgstr "" + +msgid "Flower Garden" +msgstr "" + +msgid "Flowers" +msgstr "" + +msgid "Fly" +msgstr "" + +msgid "Flying Dragon" +msgstr "" + +msgid "ForeCell" +msgstr "" + +msgid "Fort" +msgstr "" + +msgid "Fortress" +msgstr "" + +msgid "Fortress Towers" +msgstr "" + +msgid "Fortune's Favor" +msgstr "" + +msgid "Fortunes" +msgstr "" + +msgid "Forty Thieves" +msgstr "" + +msgid "Forty and Eight" +msgstr "" + +msgid "Four Colours" +msgstr "" + +msgid "Four Kings" +msgstr "" + +msgid "Four Leaf Clovers" +msgstr "" + +msgid "Four Seasons" +msgstr "" + +msgid "Four Stacks" +msgstr "" + +msgid "Four Winds" +msgstr "" + +msgid "Fourteen" +msgstr "" + +msgid "Fred's Spider" +msgstr "" + +msgid "Fred's Spider (3 decks)" +msgstr "" + +msgid "Free Fan" +msgstr "" + +msgid "Free Napoleon" +msgstr "" + +msgid "FreeCell" +msgstr "" + +msgid "Frog" +msgstr "" + +msgid "Full Vision" +msgstr "" + +msgid "Full Vision 2" +msgstr "" + +msgid "Future" +msgstr "" + +msgid "Gajapati" +msgstr "" + +msgid "Gaji" +msgstr "" + +msgid "Galary" +msgstr "" + +msgid "Galloway" +msgstr "" + +msgid "Gaps" +msgstr "" + +msgid "Garden" +msgstr "" + +msgid "Gargantua" +msgstr "" + +msgid "Garhpati" +msgstr "" + +msgid "Gate" +msgstr "" + +msgid "Gayle's" +msgstr "" + +msgid "General's Patience" +msgstr "" + +msgid "Genesis" +msgstr "" + +msgid "Genesis +" +msgstr "" + +msgid "German Patience" +msgstr "" + +msgid "Ghulam" +msgstr "" + +msgid "Giant" +msgstr "" + +msgid "Glade" +msgstr "" + +msgid "Glenwood" +msgstr "" + +msgid "Gloaming" +msgstr "" + +msgid "Gloria" +msgstr "" + +msgid "Gnat" +msgstr "" + +msgid "Golf" +msgstr "" + +msgid "Good Measure" +msgstr "" + +msgid "Grampus" +msgstr "" + +msgid "Grandfather" +msgstr "" + +msgid "Grandfather's Clock" +msgstr "" + +msgid "Grandmother's Game" +msgstr "" + +msgid "Grasshopper" +msgstr "" + +msgid "Great Wall" +msgstr "" + +msgid "Great Wheel" +msgstr "" + +msgid "Greater Queue" +msgstr "" + +msgid "Griffon" +msgstr "" + +msgid "Ground for a Divorce" +msgstr "" + +msgid "Ground for a Divorce (3 decks)" +msgstr "" + +msgid "Ground for a Divorce (4 decks)" +msgstr "" + +msgid "Gypsy" +msgstr "" + +msgid "H for Haga" +msgstr "" + +msgid "Half Mahjongg Happy New Year" +msgstr "" + +msgid "Half Mahjongg Smile" +msgstr "" + +msgid "Half Mahjongg Wall" +msgstr "" + +msgid "Hanoi Puzzle 4" +msgstr "" + +msgid "Hanoi Puzzle 5" +msgstr "" + +msgid "Hanoi Puzzle 6" +msgstr "" + +msgid "Happy New Year" +msgstr "" + +msgid "Hare" +msgstr "" + +msgid "Hayagriva" +msgstr "" + +msgid "Haystack" +msgstr "" + +msgid "Heads and Tails" +msgstr "" + +msgid "Helios" +msgstr "" + +msgid "Hex A Klon" +msgstr "" + +msgid "Hex A Klon by Threes" +msgstr "" + +msgid "Hex Labyrinth" +msgstr "" + +msgid "Hidden Passages" +msgstr "" + +msgid "Hidden Words" +msgstr "" + +msgid "High and Low" +msgstr "" + +msgid "Hiranyaksha" +msgstr "" + +msgid "Hopscotch" +msgstr "" + +msgid "Horse" +msgstr "" + +msgid "House in the Wood" +msgstr "" + +msgid "House on the Hill" +msgstr "" + +msgid "Hovercraft" +msgstr "" + +msgid "Hurdles" +msgstr "" + +msgid "Hurricane" +msgstr "" + +msgid "Idiot's Delight" +msgstr "" + +msgid "Idle Aces" +msgstr "" + +msgid "IloveU" +msgstr "" + +msgid "Imperial Trumps" +msgstr "" + +msgid "Inazuma" +msgstr "" + +msgid "Inca" +msgstr "" + +msgid "Indian" +msgstr "" + +msgid "Indian Patience" +msgstr "" + +msgid "Inner Circle" +msgstr "" + +msgid "Intelligence" +msgstr "" + +msgid "Intelligence +" +msgstr "" + +msgid "Interregnum" +msgstr "" + +msgid "Iris" +msgstr "" + +msgid "Irmgard" +msgstr "" + +msgid "JPs" +msgstr "" + +msgid "Jamestown" +msgstr "" + +msgid "Jane" +msgstr "" + +msgid "Japan" +msgstr "" + +msgid "Japanese Garden" +msgstr "" + +msgid "Japanese Garden II" +msgstr "" + +msgid "Japanese Garden III" +msgstr "" + +msgid "Joker" +msgstr "" + +msgid "Josephine" +msgstr "" + +msgid "Journey to Cuddapah" +msgstr "" + +msgid "Jumbo" +msgstr "" + +msgid "Jungle" +msgstr "" + +msgid "Just For Fun" +msgstr "" + +msgid "K for Kyodai" +msgstr "" + +msgid "Kali's Game" +msgstr "" + +msgid "Kali's Game Doubled" +msgstr "" + +msgid "Kali's Game Relaxed" +msgstr "" + +msgid "Kansas" +msgstr "" + +msgid "Katrina's Game" +msgstr "" + +msgid "Katrina's Game Doubled" +msgstr "" + +msgid "Katrina's Game Relaxed" +msgstr "" + +msgid "Khadga" +msgstr "" + +msgid "King Albert" +msgstr "" + +msgid "King Only Baker's Game" +msgstr "" + +msgid "King Only Hex A Klon" +msgstr "" + +msgid "Kingdom" +msgstr "" + +msgid "Kings" +msgstr "" + +msgid "Kingsdown Eights" +msgstr "" + +msgid "Klondike" +msgstr "" + +msgid "Klondike Plus 16" +msgstr "" + +msgid "Klondike by Threes" +msgstr "" + +msgid "Km" +msgstr "" + +msgid "Krebs" +msgstr "" + +msgid "Kujaku" +msgstr "" + +msgid "Kumo" +msgstr "" + +msgid "Kurma" +msgstr "" + +msgid "Kyodai 14" +msgstr "" + +msgid "Kyodai 17" +msgstr "" + +msgid "Kyodai 18" +msgstr "" + +msgid "Kyodai 20" +msgstr "" + +msgid "Kyodai 23" +msgstr "" + +msgid "Kyodai 24" +msgstr "" + +msgid "Kyodai 25" +msgstr "" + +msgid "Kyodai 26" +msgstr "" + +msgid "Kyodai 27" +msgstr "" + +msgid "Kyodai 28" +msgstr "" + +msgid "Kyodai 41" +msgstr "" + +msgid "Kyodai 42" +msgstr "" + +msgid "La Belle Lucie" +msgstr "" + +msgid "La Nivernaise" +msgstr "" + +msgid "Labyrinth" +msgstr "" + +msgid "Lady Betty" +msgstr "" + +msgid "Lady Palk" +msgstr "" + +msgid "Lady of the Manor" +msgstr "" + +msgid "Lanes" +msgstr "" + +msgid "Lara's Game" +msgstr "" + +msgid "Lara's Game Doubled" +msgstr "" + +msgid "Lara's Game Relaxed" +msgstr "" + +msgid "Lattice" +msgstr "" + +msgid "Le Cadran" +msgstr "" + +msgid "Le Grande Teton" +msgstr "" + +msgid "Leo" +msgstr "" + +msgid "Lesser Queue" +msgstr "" + +msgid "Lexington Harp" +msgstr "" + +msgid "Lily" +msgstr "" + +msgid "Limited" +msgstr "" + +msgid "Lion" +msgstr "" + +msgid "Little Billie" +msgstr "" + +msgid "Little Easy" +msgstr "" + +msgid "Little Forty" +msgstr "" + +msgid "Little Gate" +msgstr "" + +msgid "Long Braid" +msgstr "" + +msgid "Long Journey to Cuddapah" +msgstr "" + +msgid "Loose Ends" +msgstr "" + +msgid "Lost " +msgstr "" + +msgid "Lucas" +msgstr "" + +msgid "Mage's Game" +msgstr "" + +msgid "Mahjongg Altar" +msgstr "" + +msgid "Mahjongg Another Round" +msgstr "" + +msgid "Mahjongg Aqab's" +msgstr "" + +msgid "Mahjongg Arena" +msgstr "" + +msgid "Mahjongg Arena 2" +msgstr "" + +msgid "Mahjongg Arrow" +msgstr "" + +msgid "Mahjongg Art Moderne" +msgstr "" + +msgid "Mahjongg Balance" +msgstr "" + +msgid "Mahjongg Bat" +msgstr "" + +msgid "Mahjongg Beatle" +msgstr "" + +msgid "Mahjongg Big Hole" +msgstr "" + +msgid "Mahjongg Big Mountain" +msgstr "" + +msgid "Mahjongg Bizarre" +msgstr "" + +msgid "Mahjongg Boar" +msgstr "" + +msgid "Mahjongg Boat" +msgstr "" + +msgid "Mahjongg Bridge" +msgstr "" + +msgid "Mahjongg Bridge 2" +msgstr "" + +msgid "Mahjongg Bug" +msgstr "" + +msgid "Mahjongg Butterfly" +msgstr "" + +msgid "Mahjongg Butterfly 2" +msgstr "" + +msgid "Mahjongg Castle" +msgstr "" + +msgid "Mahjongg Cat and Mouse" +msgstr "" + +msgid "Mahjongg Ceremonial" +msgstr "" + +msgid "Mahjongg Checkered" +msgstr "" + +msgid "Mahjongg ChessMania" +msgstr "" + +msgid "Mahjongg Chip" +msgstr "" + +msgid "Mahjongg Columns" +msgstr "" + +msgid "Mahjongg Cross" +msgstr "" + +msgid "Mahjongg Crown" +msgstr "" + +msgid "Mahjongg Cupido's Heart" +msgstr "" + +msgid "Mahjongg Cupola" +msgstr "" + +msgid "Mahjongg Deep Well" +msgstr "" + +msgid "Mahjongg Diamond" +msgstr "" + +msgid "Mahjongg Dog" +msgstr "" + +msgid "Mahjongg Dragon" +msgstr "" + +msgid "Mahjongg Dragon 2" +msgstr "" + +msgid "Mahjongg Dude" +msgstr "" + +msgid "Mahjongg Empty Pyramids" +msgstr "" + +msgid "Mahjongg Enterprise" +msgstr "" + +msgid "Mahjongg Eye" +msgstr "" + +msgid "Mahjongg F-15 Eagle" +msgstr "" + +msgid "Mahjongg Farandole" +msgstr "" + +msgid "Mahjongg Fish" +msgstr "" + +msgid "Mahjongg Fish face" +msgstr "" + +msgid "Mahjongg Five Pyramids" +msgstr "" + +msgid "Mahjongg Floating City" +msgstr "" + +msgid "Mahjongg Flowers" +msgstr "" + +msgid "Mahjongg Flying Dragon" +msgstr "" + +msgid "Mahjongg Fortress Towers" +msgstr "" + +msgid "Mahjongg Full Vision" +msgstr "" + +msgid "Mahjongg Full Vision 2" +msgstr "" + +msgid "Mahjongg Future" +msgstr "" + +msgid "Mahjongg Garden" +msgstr "" + +msgid "Mahjongg Gayle's" +msgstr "" + +msgid "Mahjongg Glade" +msgstr "" + +msgid "Mahjongg H for Haga" +msgstr "" + +msgid "Mahjongg Hare" +msgstr "" + +msgid "Mahjongg Helios" +msgstr "" + +msgid "Mahjongg Hidden Words" +msgstr "" + +msgid "Mahjongg High and Low" +msgstr "" + +msgid "Mahjongg Horse" +msgstr "" + +msgid "Mahjongg Hovercraft" +msgstr "" + +msgid "Mahjongg Hurdles" +msgstr "" + +msgid "Mahjongg Hurricane" +msgstr "" + +msgid "Mahjongg IloveU" +msgstr "" + +msgid "Mahjongg Inazuma" +msgstr "" + +msgid "Mahjongg Inca" +msgstr "" + +msgid "Mahjongg Inner Circle" +msgstr "" + +msgid "Mahjongg JPs" +msgstr "" + +msgid "Mahjongg Japan" +msgstr "" + +msgid "Mahjongg Joker" +msgstr "" + +msgid "Mahjongg K for Kyodai" +msgstr "" + +msgid "Mahjongg Km" +msgstr "" + +msgid "Mahjongg Krebs" +msgstr "" + +msgid "Mahjongg Kujaku" +msgstr "" + +msgid "Mahjongg Kumo" +msgstr "" + +msgid "Mahjongg Kyodai 14" +msgstr "" + +msgid "Mahjongg Kyodai 17" +msgstr "" + +msgid "Mahjongg Kyodai 18" +msgstr "" + +msgid "Mahjongg Kyodai 20" +msgstr "" + +msgid "Mahjongg Kyodai 23" +msgstr "" + +msgid "Mahjongg Kyodai 24" +msgstr "" + +msgid "Mahjongg Kyodai 25" +msgstr "" + +msgid "Mahjongg Kyodai 26" +msgstr "" + +msgid "Mahjongg Kyodai 27" +msgstr "" + +msgid "Mahjongg Kyodai 28" +msgstr "" + +msgid "Mahjongg Kyodai 41" +msgstr "" + +msgid "Mahjongg Kyodai 42" +msgstr "" + +msgid "Mahjongg Labyrinth" +msgstr "" + +msgid "Mahjongg Lattice" +msgstr "" + +msgid "Mahjongg Leo" +msgstr "" + +msgid "Mahjongg Lion" +msgstr "" + +msgid "Mahjongg Loose Ends" +msgstr "" + +msgid "Mahjongg Lost " +msgstr "" + +msgid "Mahjongg Maya" +msgstr "" + +msgid "Mahjongg Mesh" +msgstr "" + +msgid "Mahjongg Mini Traditional" +msgstr "" + +msgid "Mahjongg Mini-Layout" +msgstr "" + +msgid "Mahjongg Mission Impossible" +msgstr "" + +msgid "Mahjongg Monkey" +msgstr "" + +msgid "Mahjongg Moth" +msgstr "" + +msgid "Mahjongg Multi X" +msgstr "" + +msgid "Mahjongg N for Namida" +msgstr "" + +msgid "Mahjongg New Layout" +msgstr "" + +msgid "Mahjongg Okie's Nitemare" +msgstr "" + +msgid "Mahjongg Orbital" +msgstr "" + +msgid "Mahjongg Order" +msgstr "" + +msgid "Mahjongg Owl" +msgstr "" + +msgid "Mahjongg Ox" +msgstr "" + +msgid "Mahjongg Pantheon" +msgstr "" + +msgid "Mahjongg Papillon" +msgstr "" + +msgid "Mahjongg Pattern" +msgstr "" + +msgid "Mahjongg Portal" +msgstr "" + +msgid "Mahjongg Pyramid 1" +msgstr "" + +msgid "Mahjongg Pyramid 2" +msgstr "" + +msgid "Mahjongg Quad" +msgstr "" + +msgid "Mahjongg Ram" +msgstr "" + +msgid "Mahjongg Rat" +msgstr "" + +msgid "Mahjongg Rectangle" +msgstr "" + +msgid "Mahjongg Reindeer" +msgstr "" + +msgid "Mahjongg Rings" +msgstr "" + +msgid "Mahjongg River Bridge" +msgstr "" + +msgid "Mahjongg Rocket" +msgstr "" + +msgid "Mahjongg Roman Arena" +msgstr "" + +msgid "Mahjongg Rooster" +msgstr "" + +msgid "Mahjongg Rugby" +msgstr "" + +msgid "Mahjongg Scorpion" +msgstr "" + +msgid "Mahjongg Screw Up" +msgstr "" + +msgid "Mahjongg Seven" +msgstr "" + +msgid "Mahjongg Seven Pyramids" +msgstr "" + +msgid "Mahjongg Shapeshifter" +msgstr "" + +msgid "Mahjongg Shield" +msgstr "" + +msgid "Mahjongg Siam" +msgstr "" + +msgid "Mahjongg Snake" +msgstr "" + +msgid "Mahjongg Space Bridge" +msgstr "" + +msgid "Mahjongg Space Shuttle" +msgstr "" + +msgid "Mahjongg Square" +msgstr "" + +msgid "Mahjongg Squares" +msgstr "" + +msgid "Mahjongg Squaring" +msgstr "" + +msgid "Mahjongg Stage 1" +msgstr "" + +msgid "Mahjongg Stage 2" +msgstr "" + +msgid "Mahjongg Stairs" +msgstr "" + +msgid "Mahjongg Stairs 2" +msgstr "" + +msgid "Mahjongg Stairs 3" +msgstr "" + +msgid "Mahjongg Star Ship" +msgstr "" + +msgid "Mahjongg Stargate" +msgstr "" + +msgid "Mahjongg Step Pyramid" +msgstr "" + +msgid "Mahjongg Stonehenge" +msgstr "" + +msgid "Mahjongg Sukis" +msgstr "" + +msgid "Mahjongg SunMoon" +msgstr "" + +msgid "Mahjongg Taipei" +msgstr "" + +msgid "Mahjongg Temple" +msgstr "" + +msgid "Mahjongg Temple 1" +msgstr "" + +msgid "Mahjongg Temple 2" +msgstr "" + +msgid "Mahjongg The Door" +msgstr "" + +msgid "Mahjongg The Great Wall" +msgstr "" + +msgid "Mahjongg Theater" +msgstr "" + +msgid "Mahjongg Tiger" +msgstr "" + +msgid "Mahjongg Tile Fighter" +msgstr "" + +msgid "Mahjongg Tilepiles" +msgstr "" + +msgid "Mahjongg Time Tunnel" +msgstr "" + +msgid "Mahjongg Tomb" +msgstr "" + +msgid "Mahjongg Totally Random-Made" +msgstr "" + +msgid "Mahjongg Traditional Reviewed" +msgstr "" + +msgid "Mahjongg Tree of Life" +msgstr "" + +msgid "Mahjongg Trika" +msgstr "" + +msgid "Mahjongg Twin" +msgstr "" + +msgid "Mahjongg Twin Temples" +msgstr "" + +msgid "Mahjongg Two Domes" +msgstr "" + +msgid "Mahjongg Vagues" +msgstr "" + +msgid "Mahjongg Vi" +msgstr "" + +msgid "Mahjongg Victory Arrow" +msgstr "" + +msgid "Mahjongg Wavelets" +msgstr "" + +msgid "Mahjongg Wedges" +msgstr "" + +msgid "Mahjongg Well" +msgstr "" + +msgid "Mahjongg Well2" +msgstr "" + +msgid "Mahjongg Whatever" +msgstr "" + +msgid "Mahjongg Win" +msgstr "" + +msgid "Mahjongg X-Files" +msgstr "" + +msgid "Mahjongg X-Shape" +msgstr "" + +msgid "Mahjongg Yummy" +msgstr "" + +msgid "Makara" +msgstr "" + +msgid "Mancunian" +msgstr "" + +msgid "Maria" +msgstr "" + +msgid "Maria Luisa" +msgstr "" + +msgid "Martha" +msgstr "" + +msgid "Matriarchy" +msgstr "" + +msgid "Matrimony" +msgstr "" + +msgid "MatsuKiri" +msgstr "" + +msgid "MatsuKiri Strict" +msgstr "" + +msgid "Matsya" +msgstr "" + +msgid "Maya" +msgstr "" + +msgid "Maze" +msgstr "" + +msgid "Memory 24" +msgstr "" + +msgid "Memory 30" +msgstr "" + +msgid "Memory 40" +msgstr "" + +msgid "Merlin's Meander" +msgstr "" + +msgid "Mesh" +msgstr "" + +msgid "Midnight Oil" +msgstr "" + +msgid "Midshipman" +msgstr "" + +msgid "Milligan Cell" +msgstr "" + +msgid "Milligan Harp" +msgstr "" + +msgid "Minerva" +msgstr "" + +msgid "Mini Traditional" +msgstr "" + +msgid "Mini-Layout" +msgstr "" + +msgid "Miss Milligan" +msgstr "" + +msgid "Miss Muffet" +msgstr "" + +msgid "Mission Impossible" +msgstr "" + +msgid "Mississippi" +msgstr "" + +msgid "Mod-3" +msgstr "" + +msgid "Monaco" +msgstr "" + +msgid "Monkey" +msgstr "" + +msgid "Montana" +msgstr "" + +msgid "Monte Carlo" +msgstr "" + +msgid "Moonlight" +msgstr "" + +msgid "Moosehide" +msgstr "" + +msgid "Morehead" +msgstr "" + +msgid "Moth" +msgstr "" + +msgid "Mount Olympus" +msgstr "" + +msgid "Mrs. Mop" +msgstr "" + +msgid "Mughal Circles" +msgstr "" + +msgid "Multi X" +msgstr "" + +msgid "Mumbai" +msgstr "" + +msgid "Munger" +msgstr "" + +msgid "Musical Patience" +msgstr "" + +msgid "N for Namida" +msgstr "" + +msgid "Napoleon" +msgstr "" + +msgid "Napoleon at St.Helena" +msgstr "" + +msgid "Napoleon's Exile" +msgstr "" + +msgid "Napoleon's Favorite" +msgstr "" + +msgid "Napoleon's Flank" +msgstr "" + +msgid "Napoleon's Square" +msgstr "" + +msgid "Napoleon's Tomb" +msgstr "" + +msgid "Narasimha" +msgstr "" + +msgid "Narpati" +msgstr "" + +msgid "Nasty" +msgstr "" + +msgid "Nationale" +msgstr "" + +msgid "Needle" +msgstr "" + +msgid "Neighbour" +msgstr "" + +msgid "Nestor" +msgstr "" + +msgid "New British Constitution" +msgstr "" + +msgid "New Layout" +msgstr "" + +msgid "New York" +msgstr "" + +msgid "Nomad" +msgstr "" + +msgid "Nordic" +msgstr "" + +msgid "Northwest Territory" +msgstr "" + +msgid "Number Ten" +msgstr "" + +msgid "Numerica" +msgstr "" + +msgid "Octagon" +msgstr "" + +msgid "Octave" +msgstr "" + +msgid "Odd and Even" +msgstr "" + +msgid "Odessa" +msgstr "" + +msgid "Okie's Nitemare" +msgstr "" + +msgid "Old Mole" +msgstr "" + +msgid "Oonsoo" +msgstr "" + +msgid "Oonsoo Open" +msgstr "" + +msgid "Oonsoo Strict" +msgstr "" + +msgid "Oonsoo Times Two" +msgstr "" + +msgid "Oonsoo Too" +msgstr "" + +msgid "Open Jumbo" +msgstr "" + +msgid "Open Peek" +msgstr "" + +msgid "Open Spider" +msgstr "" + +msgid "Opus" +msgstr "" + +msgid "Orbital" +msgstr "" + +msgid "Order" +msgstr "" + +msgid "Osmosis" +msgstr "" + +msgid "Owl" +msgstr "" + +msgid "Ox" +msgstr "" + +msgid "Pagat" +msgstr "" + +msgid "Pagoda" +msgstr "" + +msgid "Panopticon" +msgstr "" + +msgid "Pantheon" +msgstr "" + +msgid "Papillon" +msgstr "" + +msgid "Parallels" +msgstr "" + +msgid "Parashurama" +msgstr "" + +msgid "Pas Seul" +msgstr "" + +msgid "Pas de Deux" +msgstr "" + +msgid "Patriarchs" +msgstr "" + +msgid "Pattern" +msgstr "" + +msgid "Paulownia" +msgstr "" + +msgid "Peek" +msgstr "" + +msgid "Pegged" +msgstr "" + +msgid "Pegged 6x6" +msgstr "" + +msgid "Pegged 7x7" +msgstr "" + +msgid "Pegged Cross 1" +msgstr "" + +msgid "Pegged Cross 2" +msgstr "" + +msgid "Pegged Triangle 1" +msgstr "" + +msgid "Pegged Triangle 2" +msgstr "" + +msgid "Penguin" +msgstr "" + +msgid "Peony" +msgstr "" + +msgid "Perpetual Motion" +msgstr "" + +msgid "Perseverance" +msgstr "" + +msgid "Phoenix" +msgstr "" + +msgid "Picture Gallery" +msgstr "" + +msgid "Pigtail" +msgstr "" + +msgid "PileOn" +msgstr "" + +msgid "Pine" +msgstr "" + +msgid "Pitchfork" +msgstr "" + +msgid "Plait" +msgstr "" + +msgid "Plus Belle" +msgstr "" + +msgid "Poker Shuffle" +msgstr "" + +msgid "Poker Square" +msgstr "" + +msgid "Ponytail" +msgstr "" + +msgid "Portal" +msgstr "" + +msgid "Portuguese Solitaire" +msgstr "" + +msgid "Progression" +msgstr "" + +msgid "Provisions" +msgstr "" + +msgid "Push Pin" +msgstr "" + +msgid "Puss in the Corner" +msgstr "" + +msgid "Pyramid" +msgstr "" + +msgid "Pyramid 1" +msgstr "" + +msgid "Pyramid 2" +msgstr "" + +msgid "Pyramid Golf" +msgstr "" + +msgid "Q.C." +msgstr "" + +msgid "Quad" +msgstr "" + +msgid "Quadrangle" +msgstr "" + +msgid "Quadruple Alliance" +msgstr "" + +msgid "Queen of Italy" +msgstr "" + +msgid "Queenie" +msgstr "" + +msgid "Quilt" +msgstr "" + +msgid "Rachel" +msgstr "" + +msgid "Raglan" +msgstr "" + +msgid "Rainbow" +msgstr "" + +msgid "Rainfall" +msgstr "" + +msgid "Ram" +msgstr "" + +msgid "Rambling" +msgstr "" + +msgid "Rangoon" +msgstr "" + +msgid "Rank and File" +msgstr "" + +msgid "Rat" +msgstr "" + +msgid "Raw Prawn" +msgstr "" + +msgid "Rectangle" +msgstr "" + +msgid "Red Moon" +msgstr "" + +msgid "Red and Black" +msgstr "" + +msgid "Reindeer" +msgstr "" + +msgid "Relax" +msgstr "" + +msgid "Relaxed FreeCell" +msgstr "" + +msgid "Relaxed Golf" +msgstr "" + +msgid "Relaxed Pyramid" +msgstr "" + +msgid "Relaxed Seahaven Towers" +msgstr "" + +msgid "Relaxed Spider" +msgstr "" + +msgid "Repair" +msgstr "" + +msgid "Retinue" +msgstr "" + +msgid "Rings" +msgstr "" + +msgid "Ripple Fan" +msgstr "" + +msgid "Rittenhouse" +msgstr "" + +msgid "River Bridge" +msgstr "" + +msgid "Robert" +msgstr "" + +msgid "Robin" +msgstr "" + +msgid "Rock Hopper" +msgstr "" + +msgid "Rock Hopper 6x6" +msgstr "" + +msgid "Rock Hopper 7x7" +msgstr "" + +msgid "Rock Hopper Cross 1" +msgstr "" + +msgid "Rock Hopper Cross 2" +msgstr "" + +msgid "Rocket" +msgstr "" + +msgid "Roman Arena" +msgstr "" + +msgid "Roost" +msgstr "" + +msgid "Rooster" +msgstr "" + +msgid "Roslin" +msgstr "" + +msgid "Rouge et Noir" +msgstr "" + +msgid "Rows of Four" +msgstr "" + +msgid "Royal Cotillion" +msgstr "" + +msgid "Royal East" +msgstr "" + +msgid "Royal Family" +msgstr "" + +msgid "Royal Marriage" +msgstr "" + +msgid "Rugby" +msgstr "" + +msgid "Rushdike" +msgstr "" + +msgid "Russian Aces" +msgstr "" + +msgid "Russian Patience" +msgstr "" + +msgid "Russian Point" +msgstr "" + +msgid "Russian Solitaire" +msgstr "" + +msgid "Salic Law" +msgstr "" + +msgid "Samuri" +msgstr "" + +msgid "Sanibel" +msgstr "" + +msgid "Scarab" +msgstr "" + +msgid "Scheidungsgrund" +msgstr "" + +msgid "Scorpion" +msgstr "" + +msgid "Scorpion Head" +msgstr "" + +msgid "Scorpion Tail" +msgstr "" + +msgid "Scotch Patience" +msgstr "" + +msgid "Screw Up" +msgstr "" + +msgid "Sea Towers" +msgstr "" + +msgid "Seahaven Towers" +msgstr "" + +msgid "Senate" +msgstr "" + +msgid "Senate +" +msgstr "" + +msgid "Serpent" +msgstr "" + +msgid "Seven" +msgstr "" + +msgid "Seven Devils" +msgstr "" + +msgid "Seven Pyramids" +msgstr "" + +msgid "Seven by Five" +msgstr "" + +msgid "Seven by Four" +msgstr "" + +msgid "Shamrocks" +msgstr "" + +msgid "Shamsher" +msgstr "" + +msgid "Shanka" +msgstr "" + +msgid "Shapeshifter" +msgstr "" + +msgid "Shield" +msgstr "" + +msgid "Shifting" +msgstr "" + +msgid "Shisen-Sho (No Gra) 14x6" +msgstr "" + +msgid "Shisen-Sho (No Gra) 18x8" +msgstr "" + +msgid "Shisen-Sho (No Gra) 24x12" +msgstr "" + +msgid "Shisen-Sho 14x6" +msgstr "" + +msgid "Shisen-Sho 18x8" +msgstr "" + +msgid "Shisen-Sho 24x12" +msgstr "" + +msgid "Siam" +msgstr "" + +msgid "Sieben bis As" +msgstr "" + +msgid "Simon Jester" +msgstr "" + +msgid "Simple Carlo" +msgstr "" + +msgid "Simple Pairs" +msgstr "" + +msgid "Simple Simon" +msgstr "" + +msgid "Simplex" +msgstr "" + +msgid "Simplicity" +msgstr "" + +msgid "Single Rail" +msgstr "" + +msgid "Sir Tommy" +msgstr "" + +msgid "Six Sages" +msgstr "" + +msgid "Six Tengus" +msgstr "" + +msgid "Sixes and Sevens" +msgstr "" + +msgid "Skiz" +msgstr "" + +msgid "Small Harp" +msgstr "" + +msgid "Small PileOn" +msgstr "" + +msgid "Smile" +msgstr "" + +msgid "Snake" +msgstr "" + +msgid "Snakestone" +msgstr "" + +msgid "Solid Square" +msgstr "" + +msgid "Somerset" +msgstr "" + +msgid "Space Bridge" +msgstr "" + +msgid "Space Shuttle" +msgstr "" + +msgid "Spaces" +msgstr "" + +msgid "Spaces and Aces" +msgstr "" + +msgid "Spanish Patience" +msgstr "" + +msgid "Sphere" +msgstr "" + +msgid "Spider" +msgstr "" + +msgid "Spider (1 suit)" +msgstr "" + +msgid "Spider (2 suits)" +msgstr "" + +msgid "Spider (4 decks)" +msgstr "" + +msgid "Spider 3x3" +msgstr "" + +msgid "Spider Web" +msgstr "" + +msgid "Spidercells" +msgstr "" + +msgid "Spiderette" +msgstr "" + +msgid "Spidike" +msgstr "" + +msgid "Squadron" +msgstr "" + +msgid "Square" +msgstr "" + +msgid "Squares" +msgstr "" + +msgid "Squaring" +msgstr "" + +msgid "St. Helena" +msgstr "" + +msgid "Stage 1" +msgstr "" + +msgid "Stage 2" +msgstr "" + +msgid "Stairs" +msgstr "" + +msgid "Stairs 2" +msgstr "" + +msgid "Stairs 3" +msgstr "" + +msgid "Stalactites" +msgstr "" + +msgid "Star Ship" +msgstr "" + +msgid "Stargate" +msgstr "" + +msgid "Step Pyramid" +msgstr "" + +msgid "Steps" +msgstr "" + +msgid "Stonehenge" +msgstr "" + +msgid "Stonewall" +msgstr "" + +msgid "Storehouse" +msgstr "" + +msgid "Straight Up" +msgstr "" + +msgid "Strategy" +msgstr "" + +msgid "Streets" +msgstr "" + +msgid "Streets and Alleys" +msgstr "" + +msgid "Stronghold" +msgstr "" + +msgid "Sukis" +msgstr "" + +msgid "Sultan" +msgstr "" + +msgid "Sultan +" +msgstr "" + +msgid "Sultan of Turkey" +msgstr "" + +msgid "Sumo" +msgstr "" + +msgid "SunMoon" +msgstr "" + +msgid "Super Challenge FreeCell" +msgstr "" + +msgid "Super Flower Garden" +msgstr "" + +msgid "Super Samuri" +msgstr "" + +msgid "Superior Canfield" +msgstr "" + +msgid "Surprise" +msgstr "" + +msgid "Surukh" +msgstr "" + +msgid "Taipei" +msgstr "" + +msgid "Take Away" +msgstr "" + +msgid "Tam O'Shanter" +msgstr "" + +msgid "Tarantula" +msgstr "" + +msgid "Temple" +msgstr "" + +msgid "Temple 1" +msgstr "" + +msgid "Temple 2" +msgstr "" + +msgid "Ten Across" +msgstr "" + +msgid "Ten Avatars" +msgstr "" + +msgid "Ten by One" +msgstr "" + +msgid "Terrace" +msgstr "" + +msgid "The Bouquet" +msgstr "" + +msgid "The Door" +msgstr "" + +msgid "The Familiar" +msgstr "" + +msgid "The Garden" +msgstr "" + +msgid "The Great Wall" +msgstr "" + +msgid "The Wish" +msgstr "" + +msgid "The Wish (open)" +msgstr "" + +msgid "The last Monarch" +msgstr "" + +msgid "Theater" +msgstr "" + +msgid "Thirteen Up" +msgstr "" + +msgid "Thirty Six" +msgstr "" + +msgid "Three Blind Mice" +msgstr "" + +msgid "Three Peaks" +msgstr "" + +msgid "Three Peaks Non-scoring" +msgstr "" + +msgid "Three Shuffles and a Draw" +msgstr "" + +msgid "Thumb and Pouch" +msgstr "" + +msgid "Tiger" +msgstr "" + +msgid "Tile Fighter" +msgstr "" + +msgid "Tilepiles" +msgstr "" + +msgid "Time Tunnel" +msgstr "" + +msgid "Tipati" +msgstr "" + +msgid "Toad" +msgstr "" + +msgid "Tomb" +msgstr "" + +msgid "Totally Random-Made" +msgstr "" + +msgid "Tournament" +msgstr "" + +msgid "Tower of Hanoy" +msgstr "" + +msgid "Towers" +msgstr "" + +msgid "Traditional Reviewed" +msgstr "" + +msgid "Treasure Trove" +msgstr "" + +msgid "Tree of Life" +msgstr "" + +msgid "Trefoil" +msgstr "" + +msgid "Tri Peaks" +msgstr "" + +msgid "Trika" +msgstr "" + +msgid "Trillium" +msgstr "" + +msgid "Triple Canfield" +msgstr "" + +msgid "Triple Easthaven" +msgstr "" + +msgid "Triple FreeCell" +msgstr "" + +msgid "Triple Klondike" +msgstr "" + +msgid "Triple Klondike by Threes" +msgstr "" + +msgid "Triple Line" +msgstr "" + +msgid "Triple York" +msgstr "" + +msgid "Triple Yukon" +msgstr "" + +msgid "Twenty" +msgstr "" + +msgid "Twin" +msgstr "" + +msgid "Twin Picks" +msgstr "" + +msgid "Twin Temples" +msgstr "" + +msgid "Two Domes" +msgstr "" + +msgid "Two Familiars" +msgstr "" + +msgid "Two Squares" +msgstr "" + +msgid "Union Square" +msgstr "" + +msgid "Vagues" +msgstr "" + +msgid "Vajra" +msgstr "" + +msgid "Vamana" +msgstr "" + +msgid "Varaha" +msgstr "" + +msgid "Variegated Canfield" +msgstr "" + +msgid "Vegas Klondike" +msgstr "" + +msgid "Vertical" +msgstr "" + +msgid "Vi" +msgstr "" + +msgid "Victory Arrow" +msgstr "" + +msgid "Wall" +msgstr "" + +msgid "Waning Moon" +msgstr "" + +msgid "Washington's Favorite" +msgstr "" + +msgid "Wasp" +msgstr "" + +msgid "Wave Motion" +msgstr "" + +msgid "Wavelets" +msgstr "" + +msgid "Weddings" +msgstr "" + +msgid "Wedges" +msgstr "" + +msgid "Well" +msgstr "" + +msgid "Well2" +msgstr "" + +msgid "Westcliff" +msgstr "" + +msgid "Westhaven" +msgstr "" + +msgid "Whatever" +msgstr "" + +msgid "Wheel of Fortune" +msgstr "" + +msgid "Whitehead" +msgstr "" + +msgid "Wicked" +msgstr "" + +msgid "Will o' the Wisp" +msgstr "" + +msgid "Win" +msgstr "" + +msgid "Windmill" +msgstr "" + +msgid "Wisteria" +msgstr "" + +msgid "X-Files" +msgstr "" + +msgid "X-Shape" +msgstr "" + +msgid "York" +msgstr "" + +msgid "Yukon" +msgstr "" + +msgid "Yummy" +msgstr "" + +msgid "Zebra" +msgstr "" + +msgid "Zerline" +msgstr "" + +msgid "Zerline (3 decks)" +msgstr "" + +msgid "Zeus" +msgstr "" + diff --git a/po/pysol.pot b/po/pysol.pot new file mode 100644 index 00000000..d4b883af --- /dev/null +++ b/po/pysol.pot @@ -0,0 +1,2781 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: Fri May 26 20:25:31 2006\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: ENCODING\n" +"Generated-By: pygettext.py 1.5\n" + + +#: pysollib/actions.py:345 pysollib/game.py:1205 pysollib/game.py:1220 +#: pysollib/game.py:1226 pysollib/game.py:1231 pysollib/tk/toolbar.py:183 +msgid "New game" +msgstr "" + +#: pysollib/actions.py:358 pysollib/tk/menubar.py:668 +#: pysollib/tk/menubar.py:682 +msgid "Select game" +msgstr "" + +#: pysollib/actions.py:381 +msgid "Invalid game number" +msgstr "" + +#: pysollib/actions.py:382 +msgid "" +"Invalid game number\n" +msgstr "" + +#: pysollib/actions.py:399 +msgid "Select next game number" +msgstr "" + +#: pysollib/actions.py:408 pysollib/actions.py:418 +msgid "Select new game number" +msgstr "" + +#: pysollib/actions.py:409 +msgid "" +"\n" +"\n" +"Enter new game number" +msgstr "" + +#: pysollib/actions.py:410 +msgid "Next number" +msgstr "" + +#: pysollib/actions.py:410 pysollib/app.py:1085 pysollib/app.py:1097 +#: pysollib/game.py:828 pysollib/game.py:1641 pysollib/main.py:399 +#: pysollib/main.py:404 pysollib/tk/colorsdialog.py:131 +#: pysollib/tk/demooptionsdialog.py:87 pysollib/tk/edittextdialog.py:82 +#: pysollib/tk/edittextdialog.py:94 pysollib/tk/fontsdialog.py:140 +#: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:133 +#: pysollib/tk/playeroptionsdialog.py:86 +#: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 +#: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 +#: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:158 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:506 +#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 +#: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 +#: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:776 +#: pysollib/tk/tkstats.py:860 pysollib/tk/tkwidget.py:158 +#: pysollib/tk/tkwidget.py:297 +msgid "OK" +msgstr "" + +#: pysollib/actions.py:410 pysollib/app.py:1097 pysollib/game.py:828 +#: pysollib/game.py:1205 pysollib/game.py:1220 pysollib/game.py:1226 +#: pysollib/game.py:1231 pysollib/tk/colorsdialog.py:131 +#: pysollib/tk/demooptionsdialog.py:87 pysollib/tk/edittextdialog.py:94 +#: pysollib/tk/fontsdialog.py:140 pysollib/tk/fontsdialog.py:204 +#: pysollib/tk/menubar.py:855 pysollib/tk/menubar.py:857 +#: pysollib/tk/playeroptionsdialog.py:86 +#: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 +#: pysollib/tk/selectgame.py:268 pysollib/tk/selectgame.py:409 +#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:106 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:297 +msgid "Cancel" +msgstr "" + +#: pysollib/actions.py:426 +msgid "Select random game" +msgstr "" + +#: pysollib/actions.py:462 +msgid "Select next game" +msgstr "" + +#: pysollib/actions.py:495 pysollib/tk/toolbar.py:197 +msgid "Quit " +msgstr "" + +#: pysollib/actions.py:545 +msgid "Clear bookmarks" +msgstr "" + +#: pysollib/actions.py:546 +msgid "Clear all bookmarks ?" +msgstr "" + +#: pysollib/actions.py:556 +msgid "Restart game" +msgstr "" + +#: pysollib/actions.py:557 +msgid "Restart this game ?" +msgstr "" + +#: pysollib/actions.py:594 +msgid "" +"Comments for %s:\n" +"\n" +msgstr "" + +#: pysollib/actions.py:596 +msgid "Comments for " +msgstr "" + +#: pysollib/actions.py:614 pysollib/actions.py:650 +msgid "Error while writing to file" +msgstr "" + +#: pysollib/actions.py:617 pysollib/actions.py:653 pysollib/actions.py:956 +msgid " Info" +msgstr "" + +#: pysollib/actions.py:618 +msgid "" +"Comments were appended to\n" +"\n" +msgstr "" + +#: pysollib/actions.py:635 +msgid "Demo statistics" +msgstr "" + +#: pysollib/actions.py:638 +msgid "Your statistics" +msgstr "" + +#: pysollib/actions.py:654 +msgid "" +" were appended to\n" +"\n" +msgstr "" + +#: pysollib/actions.py:668 +msgid " Demo" +msgstr "" + +#: pysollib/actions.py:668 +msgid " Demo " +msgstr "" + +#: pysollib/actions.py:671 pysollib/actions.py:689 +msgid " for " +msgstr "" + +#: pysollib/actions.py:677 pysollib/actions.py:696 +msgid "Statistics for " +msgstr "" + +#: pysollib/actions.py:680 pysollib/tk/selectgame.py:352 +#: pysollib/tk/toolbar.py:194 +msgid "Statistics" +msgstr "" + +#: pysollib/actions.py:683 +msgid "Full log" +msgstr "" + +#: pysollib/actions.py:686 +msgid "Session log" +msgstr "" + +#: pysollib/actions.py:692 +msgid "Game Info" +msgstr "" + +#: pysollib/actions.py:701 +msgid "Full log for " +msgstr "" + +#: pysollib/actions.py:706 +msgid "Session log for " +msgstr "" + +#: pysollib/actions.py:711 +msgid "Reset all statistics" +msgstr "" + +#: pysollib/actions.py:712 +msgid "" +"Reset ALL statistics and logs for player\n" +"%s ?" +msgstr "" + +#: pysollib/actions.py:718 +msgid "Reset game statistics" +msgstr "" + +#: pysollib/actions.py:719 +msgid "" +"Reset statistics and logs for player\n" +"%s\n" +"and game\n" +"%s ?" +msgstr "" + +#: pysollib/actions.py:775 +msgid "Play demo" +msgstr "" + +#: pysollib/actions.py:786 +msgid "Set player options" +msgstr "" + +#: pysollib/actions.py:875 +msgid "Sound settings" +msgstr "" + +#: pysollib/actions.py:896 +msgid "Set demo options" +msgstr "" + +#: pysollib/actions.py:910 +msgid "Set colors" +msgstr "" + +#: pysollib/actions.py:929 +msgid "Set fonts" +msgstr "" + +#: pysollib/actions.py:938 +msgid "Set timeouts" +msgstr "" + +#: pysollib/actions.py:953 +msgid "Error while saving options" +msgstr "" + +#: pysollib/actions.py:957 +msgid "" +"Options were saved to\n" +"\n" +msgstr "" + +#: pysollib/app.py:85 +msgid "Unknown" +msgstr "" + +#: pysollib/app.py:947 +msgid "Loading %s %s..." +msgstr "" + +#: pysollib/app.py:982 +msgid " load error" +msgstr "" + +#: pysollib/app.py:983 +msgid "Error while loading " +msgstr "" + +#: pysollib/app.py:1077 +msgid "Incompatible " +msgstr "" + +#: pysollib/app.py:1079 +msgid "" +"The currently selected %s %s\n" +"is not compatible with the game\n" +"%s\n" +"\n" +"Please select a %s type %s.\n" +msgstr "" + +#: pysollib/app.py:1095 +msgid "Please select a %s type %s" +msgstr "" + +#: pysollib/game.py:750 pysollib/game.py:756 +msgid "" +"Player\n" +msgstr "" + +#: pysollib/game.py:824 +msgid "Discard current game ?" +msgstr "" + +#: pysollib/game.py:1159 +msgid "" +"\n" +"You have reached\n" +"#%d in the %s of playing time" +msgstr "" + +#: pysollib/game.py:1162 +msgid "" +"\n" +"and #%d in the %s of moves" +msgstr "" + +#: pysollib/game.py:1164 +msgid "" +"\n" +"You have reached\n" +"#%d in the %s of moves" +msgstr "" + +#: pysollib/game.py:1167 +msgid "" +"\n" +"and #%d in the %s of total moves" +msgstr "" + +#: pysollib/game.py:1169 +msgid "" +"\n" +"You have reached\n" +"#%d in the %s of total moves" +msgstr "" + +#: pysollib/game.py:1196 pysollib/game.py:1212 +msgid "Game won" +msgstr "" + +#: pysollib/game.py:1197 +msgid "" +"\n" +"Congratulations, this\n" +"was a truly perfect game !\n" +"\n" +"Your playing time is %s\n" +"for %d moves.\n" +"%s\n" +msgstr "" + +#: pysollib/game.py:1213 +msgid "" +"\n" +"Congratulations, you did it !\n" +"\n" +"Your playing time is %s\n" +"for %d moves.\n" +"%s\n" +msgstr "" + +#: pysollib/game.py:1224 pysollib/game.py:1229 +msgid "Game finished" +msgstr "" + +#: pysollib/game.py:1225 pysollib/game.py:1642 +msgid "" +"\n" +"Game finished\n" +msgstr "" + +#: pysollib/game.py:1230 +msgid "" +"\n" +"Game finished, but not without my help...\n" +msgstr "" + +#: pysollib/game.py:1231 pysollib/tk/toolbar.py:184 +msgid "Restart" +msgstr "" + +#: pysollib/game.py:1535 +msgid "Score %6d" +msgstr "" + +#: pysollib/game.py:1634 +msgid "Cool" +msgstr "" + +#: pysollib/game.py:1634 +msgid "Great" +msgstr "" + +#: pysollib/game.py:1634 +msgid "Wow" +msgstr "" + +#: pysollib/game.py:1634 +msgid "Yeah" +msgstr "" + +#: pysollib/game.py:1635 pysollib/game.py:1645 pysollib/game.py:1657 +msgid " Autopilot" +msgstr "" + +#: pysollib/game.py:1636 +msgid "" +"\n" +"Game solved in %d moves.\n" +msgstr "" + +#: pysollib/game.py:1656 +msgid "Hmm" +msgstr "" + +#: pysollib/game.py:1656 +msgid "Oh well" +msgstr "" + +#: pysollib/game.py:1656 +msgid "That's life" +msgstr "" + +#: pysollib/game.py:1658 +msgid "" +"\n" +"This won't come out...\n" +msgstr "" + +#: pysollib/game.py:2062 +msgid "Set bookmark" +msgstr "" + +#: pysollib/game.py:2063 +msgid "Replace existing bookmark %d ?" +msgstr "" + +#: pysollib/game.py:2085 +msgid "Goto bookmark" +msgstr "" + +#: pysollib/game.py:2086 +msgid "Goto bookmark %d ?" +msgstr "" + +#: pysollib/game.py:2117 +msgid "Open game" +msgstr "" + +#: pysollib/game.py:2128 pysollib/game.py:2137 pysollib/game.py:2142 +msgid "Load game error" +msgstr "" + +#: pysollib/game.py:2129 +msgid "" +"Error while loading game.\n" +"\n" +"Probably the game file is damaged,\n" +"but this could also be a bug you might want to report." +msgstr "" + +#: pysollib/game.py:2138 +msgid "Error while loading game" +msgstr "" + +#: pysollib/game.py:2143 +msgid "" +"Internal error while loading game.\n" +"\n" +"Please report this bug." +msgstr "" + +#: pysollib/game.py:2168 +msgid "Save game error" +msgstr "" + +#: pysollib/game.py:2169 +msgid "Error while saving game" +msgstr "" + +#: pysollib/gamedb.py:113 +msgid "Baker's Dozen" +msgstr "" + +#: pysollib/gamedb.py:114 +msgid "Beleaguered Castle" +msgstr "" + +#: pysollib/gamedb.py:115 +msgid "Canfield" +msgstr "" + +#: pysollib/gamedb.py:116 +msgid "Fan" +msgstr "" + +#: pysollib/gamedb.py:117 +msgid "Forty Thieves" +msgstr "" + +#: pysollib/gamedb.py:118 +msgid "FreeCell" +msgstr "" + +#: pysollib/gamedb.py:119 +msgid "Golf" +msgstr "" + +#: pysollib/gamedb.py:120 +msgid "Gypsy" +msgstr "" + +#: pysollib/gamedb.py:121 +msgid "Klondike" +msgstr "" + +#: pysollib/gamedb.py:122 +msgid "Montana" +msgstr "" + +#: pysollib/gamedb.py:123 +msgid "Napoleon" +msgstr "" + +#: pysollib/gamedb.py:124 +msgid "Numerica" +msgstr "" + +#: pysollib/gamedb.py:125 +msgid "Pairing" +msgstr "" + +#: pysollib/gamedb.py:126 +msgid "Raglan" +msgstr "" + +#: pysollib/gamedb.py:127 pysollib/gamedb.py:160 +msgid "Simple games" +msgstr "" + +#: pysollib/gamedb.py:128 +msgid "Spider" +msgstr "" + +#: pysollib/gamedb.py:129 +msgid "Terrace" +msgstr "" + +#: pysollib/gamedb.py:130 +msgid "Yukon" +msgstr "" + +#: pysollib/gamedb.py:131 pysollib/gamedb.py:164 +msgid "One-Deck games" +msgstr "" + +#: pysollib/gamedb.py:132 pysollib/gamedb.py:165 +msgid "Two-Deck games" +msgstr "" + +#: pysollib/gamedb.py:133 pysollib/gamedb.py:166 +msgid "Three-Deck games" +msgstr "" + +#: pysollib/gamedb.py:134 pysollib/gamedb.py:167 +msgid "Four-Deck games" +msgstr "" + +#: pysollib/gamedb.py:146 +msgid "Baker's Dozen type" +msgstr "" + +#: pysollib/gamedb.py:147 +msgid "Beleaguered Castle type" +msgstr "" + +#: pysollib/gamedb.py:148 +msgid "Canfield type" +msgstr "" + +#: pysollib/gamedb.py:149 +msgid "Fan type" +msgstr "" + +#: pysollib/gamedb.py:150 +msgid "Forty Thieves type" +msgstr "" + +#: pysollib/gamedb.py:151 +msgid "FreeCell type" +msgstr "" + +#: pysollib/gamedb.py:152 +msgid "Golf type" +msgstr "" + +#: pysollib/gamedb.py:153 +msgid "Gypsy type" +msgstr "" + +#: pysollib/gamedb.py:154 +msgid "Klondike type" +msgstr "" + +#: pysollib/gamedb.py:155 +msgid "Montana type" +msgstr "" + +#: pysollib/gamedb.py:156 +msgid "Napoleon type" +msgstr "" + +#: pysollib/gamedb.py:157 +msgid "Numerica type" +msgstr "" + +#: pysollib/gamedb.py:158 +msgid "Pairing type" +msgstr "" + +#: pysollib/gamedb.py:159 +msgid "Raglan type" +msgstr "" + +#: pysollib/gamedb.py:161 +msgid "Spider type" +msgstr "" + +#: pysollib/gamedb.py:162 +msgid "Terrace type" +msgstr "" + +#: pysollib/gamedb.py:163 +msgid "Yukon type" +msgstr "" + +#: pysollib/gamedb.py:188 pysollib/gamedb.py:196 +msgid "French type" +msgstr "" + +#: pysollib/gamedb.py:189 pysollib/gamedb.py:197 pysollib/gamedb.py:206 +msgid "Ganjifa type" +msgstr "" + +#: pysollib/gamedb.py:190 pysollib/gamedb.py:198 pysollib/gamedb.py:207 +msgid "Hanafuda type" +msgstr "" + +#: pysollib/gamedb.py:191 pysollib/gamedb.py:199 pysollib/gamedb.py:214 +msgid "Hex A Deck type" +msgstr "" + +#: pysollib/gamedb.py:192 pysollib/gamedb.py:200 pysollib/gamedb.py:219 +msgid "Tarock type" +msgstr "" + +#: pysollib/gamedb.py:205 +msgid "Dashavatara Ganjifa type" +msgstr "" + +#: pysollib/gamedb.py:208 +msgid "Mughal Ganjifa type" +msgstr "" + +#: pysollib/gamedb.py:209 +msgid "Navagraha Ganjifa type" +msgstr "" + +#: pysollib/gamedb.py:213 +msgid "Shisen-Sho" +msgstr "" + +#: pysollib/gamedb.py:215 +msgid "Matrix type" +msgstr "" + +#: pysollib/gamedb.py:216 +msgid "Memory type" +msgstr "" + +#: pysollib/gamedb.py:217 +msgid "Poker type" +msgstr "" + +#: pysollib/gamedb.py:218 +msgid "Puzzle type" +msgstr "" + +#: pysollib/games/auldlangsyne.py:142 pysollib/games/calculation.py:101 +#: pysollib/games/numerica.py:90 pysollib/games/numerica.py:197 +msgid "Row. Build regardless of rank and suit." +msgstr "" + +#: pysollib/games/braid.py:250 pysollib/games/napoleon.py:190 +#: pysollib/games/ultra/dashavatara.py:959 +#: pysollib/games/ultra/hanafuda1.py:256 pysollib/games/ultra/hexadeck.py:1190 +#: pysollib/games/ultra/mughal.py:802 +msgid " Ascending" +msgstr "" + +#: pysollib/games/braid.py:252 pysollib/games/napoleon.py:192 +#: pysollib/games/ultra/dashavatara.py:961 +#: pysollib/games/ultra/hanafuda1.py:258 pysollib/games/ultra/hexadeck.py:1192 +#: pysollib/games/ultra/mughal.py:804 +msgid " Descending" +msgstr "" + +#: pysollib/games/calculation.py:135 pysollib/games/calculation.py:230 +msgid "" +"1: 2 3 4 5 6 7 8 9 T J Q K\n" +"2: 4 6 8 T Q A 3 5 7 9 J K\n" +"3: 6 9 Q 2 5 8 J A 4 7 T K\n" +"4: 8 Q 3 7 J 2 6 T A 5 9 K" +msgstr "" + +#: pysollib/games/curdsandwhey.py:58 +msgid "Row. Build down by suit or of the same rank." +msgstr "" + +#: pysollib/games/fan.py:279 +msgid "Draw" +msgstr "" + +#: pysollib/games/fan.py:279 +msgid "X" +msgstr "" + +#: pysollib/games/fortythieves.py:393 pysollib/games/klondike.py:148 +msgid "Row. Build down in any suit but the same." +msgstr "" + +#: pysollib/games/golf.py:114 pysollib/games/golf.py:413 +#: pysollib/stack.py:1740 +msgid "Row. No building." +msgstr "" + +#: pysollib/games/golf.py:381 +msgid "Balance $%4d" +msgstr "" + +#: pysollib/games/golf.py:497 pysollib/stack.py:1673 +msgid "Foundation. Build up regardless of suit." +msgstr "" + +#: pysollib/games/klondike.py:115 +msgid "Balance $%d" +msgstr "" + +#: pysollib/games/klondike.py:387 +msgid "Reserve. Only Kings are acceptable." +msgstr "" + +#: pysollib/games/matriarchy.py:125 +msgid "Round %d/%d" +msgstr "" + +#: pysollib/games/matriarchy.py:127 +msgid "Deal %d" +msgstr "" + +#: pysollib/games/numerica.py:184 +msgid "Foundation. Build up by color." +msgstr "" + +#: pysollib/games/poker.py:82 +msgid "" +"Royal Flush\n" +"Straight Flush\n" +"Four of a Kind\n" +"Full House\n" +"Flush\n" +"Straight\n" +"Three of a Kind\n" +"Two Pair\n" +"One Pair" +msgstr "" + +#: pysollib/games/poker.py:189 pysollib/games/special/memory.py:181 +msgid "" +"WON\n" +"\n" +msgstr "" + +#: pysollib/games/poker.py:191 pysollib/games/special/memory.py:178 +msgid "Points: %d" +msgstr "" + +#: pysollib/games/poker.py:193 pysollib/games/special/memory.py:182 +msgid "Total: %d" +msgstr "" + +#: pysollib/games/special/tarock.py:222 +msgid "Coin" +msgstr "" + +#: pysollib/games/special/tarock.py:222 +msgid "Cup" +msgstr "" + +#: pysollib/games/special/tarock.py:222 +msgid "Sword" +msgstr "" + +#: pysollib/games/special/tarock.py:222 +msgid "Trump" +msgstr "" + +#: pysollib/games/special/tarock.py:222 +msgid "Wand" +msgstr "" + +#: pysollib/games/special/tarock.py:223 +#: pysollib/games/ultra/dashavatara.py:351 +#: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 +#: pysollib/stack.py:1190 pysollib/util.py:80 +msgid "Ace" +msgstr "" + +#: pysollib/games/special/tarock.py:224 +msgid "Page" +msgstr "" + +#: pysollib/games/special/tarock.py:224 +msgid "Valet" +msgstr "" + +#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1188 +#: pysollib/util.py:81 +msgid "Queen" +msgstr "" + +#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1189 +#: pysollib/util.py:81 +msgid "King" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:349 +msgid "Boar" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:349 +msgid "Dwarf" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:349 +msgid "Fish" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:349 +msgid "Lion" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:349 +msgid "Tortoise" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:350 +msgid "Arrow" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:350 +msgid "Axe" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:350 +msgid "Horse" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:350 +msgid "Lotus" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:350 +msgid "Plow" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:352 pysollib/games/ultra/mughal.py:255 +msgid "Pradhan" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:352 pysollib/games/ultra/mughal.py:255 +msgid "Raja" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 +msgid "Black" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 +msgid "Brown" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 +msgid "Red" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 +msgid "Yellow" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:257 +#: pysollib/tk/selecttile.py:86 +msgid "Green" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:354 +msgid "Crimson" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:354 +msgid "White" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:354 pysollib/games/ultra/mughal.py:257 +msgid "Grey" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:354 pysollib/games/ultra/mughal.py:257 +#: pysollib/tk/selecttile.py:89 +msgid "Orange" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:354 pysollib/tk/selecttile.py:88 +msgid "Olive" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:355 pysollib/games/ultra/mughal.py:258 +msgid "Strong" +msgstr "" + +#: pysollib/games/ultra/dashavatara.py:355 pysollib/games/ultra/mughal.py:258 +msgid "Weak" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:373 +msgid "Rising" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:375 +msgid "Setting" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:511 +msgid "Filled" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:513 +msgid " Deck" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:513 +msgid "nd" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:513 +msgid "rd" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:513 +msgid "st" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:513 +msgid "th" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:563 +msgid "East" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:563 +msgid "North" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:563 +msgid "South" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:563 +msgid "West" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:564 +msgid "NE" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:564 +msgid "NW" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:564 +msgid "SE" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:564 +msgid "SW" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:67 +msgid "Cherry" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:67 +msgid "Pine" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:67 +msgid "Plum" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:67 +msgid "Wisteria" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:68 +msgid "Bush Clover" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:68 +msgid "Eularia" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:68 +msgid "Iris" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:68 +msgid "Peony" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:69 +msgid "Chrysanthemum" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:69 +msgid "Maple" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:69 +msgid "Paulownia" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:69 +msgid "Willow" +msgstr "" + +#: pysollib/games/ultra/larasgame.py:157 pysollib/stack.py:1368 +msgid "Round %d" +msgstr "" + +#: pysollib/games/ultra/mughal.py:252 +msgid "Crown" +msgstr "" + +#: pysollib/games/ultra/mughal.py:252 +msgid "Saber" +msgstr "" + +#: pysollib/games/ultra/mughal.py:252 +msgid "Servant" +msgstr "" + +#: pysollib/games/ultra/mughal.py:252 +msgid "Silver" +msgstr "" + +#: pysollib/games/ultra/mughal.py:253 +msgid "Document" +msgstr "" + +#: pysollib/games/ultra/mughal.py:253 +msgid "Gold" +msgstr "" + +#: pysollib/games/ultra/mughal.py:253 +msgid "Harp" +msgstr "" + +#: pysollib/games/ultra/mughal.py:253 +msgid "Stores" +msgstr "" + +#: pysollib/games/ultra/mughal.py:257 +msgid "Tan" +msgstr "" + +#: pysollib/games/ultra/threepeaks.py:217 +msgid "Score:\tThis hand: " +msgstr "" + +#: pysollib/games/ultra/threepeaks.py:218 +msgid "\tThis game: " +msgstr "" + +#: pysollib/games/yukon.py:145 +msgid "Row. Build down in any suit but the same, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/games/yukon.py:201 +msgid "Row. Build up or down by suit, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/games/yukon.py:218 +msgid "Row. Build up or down by alternate color, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/games/yukon.py:320 +msgid "" +"Club: A 2 3 4 5 6 7 8 9 T J Q K\n" +"Spade: 2 4 6 8 T Q A 3 5 7 9 J K\n" +"Heart: 3 6 9 Q 2 5 8 J A 4 7 T K\n" +"Diamond: 4 8 Q 3 7 J 2 6 T A 5 9 K" +msgstr "" + +#: pysollib/help.py:64 +msgid "" +"A Python Solitaire Game Collection\n" +msgstr "" + +#: pysollib/help.py:66 +msgid "" +"A World Domination Project\n" +msgstr "" + +#: pysollib/help.py:67 +msgid "Credits..." +msgstr "" + +#: pysollib/help.py:67 +msgid "Nice" +msgstr "" + +#: pysollib/help.py:69 +msgid "Enjoy" +msgstr "" + +#: pysollib/help.py:71 +msgid "" +"Version %s\n" +"\n" +msgstr "" + +#: pysollib/help.py:72 +msgid "About " +msgstr "" + +#: pysollib/help.py:73 +msgid "" +"PySol Fan Club edition\n" +"%s%s\n" +"Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003\n" +"Markus F.X.J. Oberhumer\n" +"Copyright (C) 2003 Mt. Hood Playing Card Co.\n" +"Copyright (C) 2005 Skomoroh (Fan Club edition)\n" +"All Rights Reserved.\n" +"\n" +"PySol is free software distributed under the terms\n" +"of the GNU General Public License.\n" +"\n" +"For more information about this application visit\n" +"%s" +msgstr "" + +#: pysollib/help.py:102 +msgid "Credits" +msgstr "" + +#: pysollib/help.py:103 +msgid "" +" credits go to:\n" +"\n" +"Volker Weidner for getting me into Solitaire\n" +"Guido van Rossum for the initial example program\n" +"T. Kirk for lots of contributed games and cardsets\n" +"Carl Larsson for the background music\n" +"The Gnome AisleRiot team for parts of the documentation\n" +"Natascha\n" +"\n" +"The Python, %s, SDL & Linux crews\n" +"for making this program possible" +msgstr "" + +#: pysollib/help.py:138 +msgid " HTML Problem" +msgstr "" + +#: pysollib/help.py:139 +msgid "" +"Cannot find help document\n" +msgstr "" + +#: pysollib/help.py:152 +msgid " Help" +msgstr "" + +#: pysollib/main.py:68 pysollib/main.py:310 +msgid " installation error" +msgstr "" + +#: pysollib/main.py:69 +msgid "" +"No %ss were found !!!\n" +"\n" +"Main data directory is:\n" +"%s\n" +"\n" +"Please check your %s installation.\n" +msgstr "" + +#: pysollib/main.py:76 pysollib/main.py:319 pysollib/tk/toolbar.py:197 +msgid "Quit" +msgstr "" + +#: pysollib/main.py:95 +msgid "" +"%s: %s\n" +"try %s --help for more information" +msgstr "" + +#: pysollib/main.py:120 +msgid "" +"Usage: %s [OPTIONS] [FILE]\n" +" --fg --foreground=COLOR foreground color\n" +" --bg --background=COLOR background color\n" +" --fn --font=FONT default font\n" +" --nosound disable sound support\n" +" --noplugins disable load plugins\n" +" -h --help display this help and exit\n" +"\n" +" FILE - file name of a saved game\n" +msgstr "" + +#: pysollib/main.py:133 +msgid "" +"%s: too many files\n" +"try %s --help for more information" +msgstr "" + +#: pysollib/main.py:137 +msgid "" +"%s: invalide file name\n" +"try %s --help for more information" +msgstr "" + +#: pysollib/main.py:311 +msgid "" +"\n" +"No games were found !!!\n" +"\n" +"Main data directory is:\n" +"%s\n" +"\n" +"Please check your %s installation.\n" +msgstr "" + +#: pysollib/main.py:397 pysollib/main.py:402 +msgid " installation problem" +msgstr "" + +#: pysollib/main.py:398 +msgid "" +"Your Python installation is compiled without thread support.\n" +"\n" +"Sounds and background music will be disabled." +msgstr "" + +#: pysollib/main.py:403 +msgid "" +"The pysolsoundserver module was not found.\n" +"\n" +"Sounds and background music will be disabled." +msgstr "" + +#: pysollib/main.py:407 +msgid "Welcome to " +msgstr "" + +#: pysollib/settings.py:58 +msgid "Top 10" +msgstr "" + +#: pysollib/stack.py:1184 +msgid "Base card - %s." +msgstr "" + +#: pysollib/stack.py:1185 +msgid "Empty row cannot be filled." +msgstr "" + +#: pysollib/stack.py:1186 +msgid "any card" +msgstr "" + +#: pysollib/stack.py:1187 pysollib/util.py:81 +msgid "Jack" +msgstr "" + +#: pysollib/stack.py:1196 +msgid "No cards" +msgstr "" + +#: pysollib/stack.py:1197 +msgid "1 card" +msgstr "" + +#: pysollib/stack.py:1198 +msgid " cards" +msgstr "" + +#: pysollib/stack.py:1377 pysollib/stack.py:1379 pysollib/stack.py:1410 +msgid "Redeal" +msgstr "" + +#: pysollib/stack.py:1379 +msgid "Stop" +msgstr "" + +#: pysollib/stack.py:1430 +msgid "Variable redeals." +msgstr "" + +#: pysollib/stack.py:1431 +msgid "Unlimited redeals." +msgstr "" + +#: pysollib/stack.py:1432 +msgid "No redeals." +msgstr "" + +#: pysollib/stack.py:1433 +msgid "One redeal." +msgstr "" + +#: pysollib/stack.py:1434 +msgid " redeals." +msgstr "" + +#: pysollib/stack.py:1436 +msgid "Talon." +msgstr "" + +#: pysollib/stack.py:1611 pysollib/stack.py:2035 +msgid "Reserve. No building." +msgstr "" + +#: pysollib/stack.py:1657 +msgid "Foundation. Build up by suit." +msgstr "" + +#: pysollib/stack.py:1658 +msgid "Foundation. Build down by suit." +msgstr "" + +#: pysollib/stack.py:1659 pysollib/stack.py:1675 pysollib/stack.py:1697 +msgid "Foundation. Build by same rank." +msgstr "" + +#: pysollib/stack.py:1674 +msgid "Foundation. Build down regardless of suit." +msgstr "" + +#: pysollib/stack.py:1695 +msgid "Foundation. Build up by alternate color." +msgstr "" + +#: pysollib/stack.py:1696 +msgid "Foundation. Build down by alternate color." +msgstr "" + +#: pysollib/stack.py:1770 +msgid "Row. Build up by alternate color." +msgstr "" + +#: pysollib/stack.py:1771 +msgid "Row. Build down by alternate color." +msgstr "" + +#: pysollib/stack.py:1772 pysollib/stack.py:1782 pysollib/stack.py:1791 +#: pysollib/stack.py:1800 pysollib/stack.py:1828 +msgid "Row. Build by same rank." +msgstr "" + +#: pysollib/stack.py:1780 +msgid "Row. Build up by color." +msgstr "" + +#: pysollib/stack.py:1781 +msgid "Row. Build down by color." +msgstr "" + +#: pysollib/stack.py:1789 +msgid "Row. Build up by suit." +msgstr "" + +#: pysollib/stack.py:1790 +msgid "Row. Build down by suit." +msgstr "" + +#: pysollib/stack.py:1798 pysollib/stack.py:1826 +msgid "Row. Build up regardless of suit." +msgstr "" + +#: pysollib/stack.py:1799 pysollib/stack.py:1827 +msgid "Row. Build down regardless of suit." +msgstr "" + +#: pysollib/stack.py:1849 +msgid "Row. Build up by alternate color, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:1850 +msgid "Row. Build down by alternate color, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:1851 pysollib/stack.py:1862 +msgid "Row. Build by same rank, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:1860 +msgid "Row. Build up by suit, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:1861 +msgid "Row. Build down by suit, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:1894 +msgid "Row. Build up or down by color." +msgstr "" + +#: pysollib/stack.py:1905 +msgid "Row. Build up or down by alternate color." +msgstr "" + +#: pysollib/stack.py:1916 +msgid "Row. Build up or down by suit." +msgstr "" + +#: pysollib/stack.py:1927 +msgid "Row. Build up or down regardless of suit." +msgstr "" + +#: pysollib/stack.py:1938 +msgid "Waste." +msgstr "" + +#: pysollib/stack.py:2036 +msgid "Free cell." +msgstr "" + +#: pysollib/stats.py:120 pysollib/tk/tkstats.py:78 +msgid "Demo games" +msgstr "" + +#: pysollib/stats.py:121 +msgid "Played" +msgstr "" + +#: pysollib/stats.py:122 pysollib/stats.py:202 +msgid "Won" +msgstr "" + +#: pysollib/stats.py:123 pysollib/stats.py:202 +msgid "Lost" +msgstr "" + +#: pysollib/stats.py:124 pysollib/tk/statusbar.py:134 +msgid "Playing time" +msgstr "" + +#: pysollib/stats.py:125 +msgid "Moves" +msgstr "" + +#: pysollib/stats.py:126 +msgid "% won" +msgstr "" + +#: pysollib/stats.py:155 +msgid "Total (%d out of %d games)" +msgstr "" + +#: pysollib/stats.py:164 +msgid "Game" +msgstr "" + +#: pysollib/stats.py:164 +msgid "Started at " +msgstr "" + +#: pysollib/stats.py:164 +msgid "Status" +msgstr "" + +#: pysollib/stats.py:164 pysollib/tk/statusbar.py:136 +#: pysollib/tk/tkstats.py:734 +msgid "Game number" +msgstr "" + +#: pysollib/stats.py:187 +msgid "** UNKNOWN %d **" +msgstr "" + +#: pysollib/stats.py:195 +msgid "** ERROR **" +msgstr "" + +#: pysollib/stats.py:202 +msgid "Loaded" +msgstr "" + +#: pysollib/stats.py:202 +msgid "Not won" +msgstr "" + +#: pysollib/stats.py:202 +msgid "Perfect" +msgstr "" + +#: pysollib/tk/colorsdialog.py:73 +msgid "Text foreground:" +msgstr "" + +#: pysollib/tk/colorsdialog.py:79 pysollib/tk/colorsdialog.py:97 +#: pysollib/tk/fontsdialog.py:185 +msgid "Change..." +msgstr "" + +#: pysollib/tk/colorsdialog.py:85 pysollib/tk/timeoutsdialog.py:68 +msgid "Highlight piles:" +msgstr "" + +#: pysollib/tk/colorsdialog.py:86 +msgid "Highlight cards 1:" +msgstr "" + +#: pysollib/tk/colorsdialog.py:87 +msgid "Highlight cards 2:" +msgstr "" + +#: pysollib/tk/colorsdialog.py:88 +msgid "Highlight same rank 1:" +msgstr "" + +#: pysollib/tk/colorsdialog.py:89 +msgid "Highlight same rank 2:" +msgstr "" + +#: pysollib/tk/colorsdialog.py:90 +msgid "Hint arrow:" +msgstr "" + +#: pysollib/tk/colorsdialog.py:91 +msgid "Highlight not matching:" +msgstr "" + +#: pysollib/tk/colorsdialog.py:123 +msgid "Select color" +msgstr "" + +#: pysollib/tk/demooptionsdialog.py:66 +msgid "Display floating Demo logo" +msgstr "" + +#: pysollib/tk/demooptionsdialog.py:69 +msgid "Show score in statusbar" +msgstr "" + +#: pysollib/tk/demooptionsdialog.py:73 +msgid "Set demo delay in seconds" +msgstr "" + +#: pysollib/tk/fontsdialog.py:85 +msgid "abcdefghABCDEFGH" +msgstr "" + +#: pysollib/tk/fontsdialog.py:94 +msgid "Bold" +msgstr "" + +#: pysollib/tk/fontsdialog.py:97 +msgid "Italic" +msgstr "" + +#: pysollib/tk/fontsdialog.py:195 +msgid "Select font" +msgstr "" + +#: pysollib/tk/menubar.py:75 +msgid "Style" +msgstr "" + +#: pysollib/tk/menubar.py:84 +msgid "Relief" +msgstr "" + +#: pysollib/tk/menubar.py:85 +msgid "Flat" +msgstr "" + +#: pysollib/tk/menubar.py:89 +msgid "Raised" +msgstr "" + +#: pysollib/tk/menubar.py:94 +msgid "Compound" +msgstr "" + +#: pysollib/tk/menubar.py:100 +msgid "Hide" +msgstr "" + +#: pysollib/tk/menubar.py:103 +msgid "Top" +msgstr "" + +#: pysollib/tk/menubar.py:106 +msgid "Bottom" +msgstr "" + +#: pysollib/tk/menubar.py:109 +msgid "Left" +msgstr "" + +#: pysollib/tk/menubar.py:112 +msgid "Right" +msgstr "" + +#: pysollib/tk/menubar.py:116 +msgid "Small icons" +msgstr "" + +#: pysollib/tk/menubar.py:119 +msgid "Large icons" +msgstr "" + +#: pysollib/tk/menubar.py:125 +msgid "Customize toolbar" +msgstr "" + +#: pysollib/tk/menubar.py:248 +msgid "&File" +msgstr "" + +#: pysollib/tk/menubar.py:249 +msgid "&New game" +msgstr "" + +#: pysollib/tk/menubar.py:250 +msgid "R&ecent games" +msgstr "" + +#: pysollib/tk/menubar.py:252 +msgid "Select &random game" +msgstr "" + +#: pysollib/tk/menubar.py:253 +msgid "&All games" +msgstr "" + +#: pysollib/tk/menubar.py:254 +msgid "Games played and &won" +msgstr "" + +#: pysollib/tk/menubar.py:255 +msgid "Games played and ¬ won" +msgstr "" + +#: pysollib/tk/menubar.py:256 +msgid "Games not &played" +msgstr "" + +#: pysollib/tk/menubar.py:257 +msgid "Select game by nu&mber..." +msgstr "" + +#: pysollib/tk/menubar.py:259 +msgid "Fa&vorite games" +msgstr "" + +#: pysollib/tk/menubar.py:260 +msgid "A&dd to favorites" +msgstr "" + +#: pysollib/tk/menubar.py:261 +msgid "R&emove from favorites" +msgstr "" + +#: pysollib/tk/menubar.py:263 +msgid "&Open..." +msgstr "" + +#: pysollib/tk/menubar.py:264 +msgid "&Save" +msgstr "" + +#: pysollib/tk/menubar.py:265 +msgid "Save &as..." +msgstr "" + +#: pysollib/tk/menubar.py:267 +msgid "&Hold and quit" +msgstr "" + +#: pysollib/tk/menubar.py:268 +msgid "&Quit" +msgstr "" + +#: pysollib/tk/menubar.py:270 +msgid "&Select" +msgstr "" + +#: pysollib/tk/menubar.py:273 +msgid "&Edit" +msgstr "" + +#: pysollib/tk/menubar.py:274 +msgid "&Undo" +msgstr "" + +#: pysollib/tk/menubar.py:275 +msgid "&Redo" +msgstr "" + +#: pysollib/tk/menubar.py:276 +msgid "Redo &all" +msgstr "" + +#: pysollib/tk/menubar.py:279 +msgid "&Set bookmark" +msgstr "" + +#: pysollib/tk/menubar.py:281 pysollib/tk/menubar.py:285 +msgid "Bookmark %d" +msgstr "" + +#: pysollib/tk/menubar.py:283 +msgid "Go&to bookmark" +msgstr "" + +#: pysollib/tk/menubar.py:288 +msgid "&Clear bookmarks" +msgstr "" + +#: pysollib/tk/menubar.py:291 +msgid "Restart &game" +msgstr "" + +#: pysollib/tk/menubar.py:293 +msgid "&Game" +msgstr "" + +#: pysollib/tk/menubar.py:294 +msgid "&Deal cards" +msgstr "" + +#: pysollib/tk/menubar.py:295 pysollib/tk/menubar.py:324 +msgid "&Auto drop" +msgstr "" + +#: pysollib/tk/menubar.py:296 +msgid "&Pause" +msgstr "" + +#: pysollib/tk/menubar.py:299 +msgid "S&tatus..." +msgstr "" + +#: pysollib/tk/menubar.py:300 +msgid "&Comments..." +msgstr "" + +#: pysollib/tk/menubar.py:302 +msgid "&Statistics" +msgstr "" + +#: pysollib/tk/menubar.py:303 pysollib/tk/menubar.py:311 +msgid "Current game..." +msgstr "" + +#: pysollib/tk/menubar.py:304 pysollib/tk/menubar.py:312 +#: pysollib/tk/tkstats.py:289 +msgid "All games..." +msgstr "" + +#: pysollib/tk/menubar.py:306 pysollib/tk/tkstats.py:647 +msgid "Session log..." +msgstr "" + +#: pysollib/tk/menubar.py:307 pysollib/tk/tkstats.py:663 +msgid "Full log..." +msgstr "" + +#: pysollib/tk/menubar.py:310 +msgid "D&emo statistics" +msgstr "" + +#: pysollib/tk/menubar.py:314 +msgid "&Assist" +msgstr "" + +#: pysollib/tk/menubar.py:315 +msgid "&Hint" +msgstr "" + +#: pysollib/tk/menubar.py:316 +msgid "Highlight p&iles" +msgstr "" + +#: pysollib/tk/menubar.py:318 +msgid "&Demo" +msgstr "" + +#: pysollib/tk/menubar.py:319 +msgid "Demo (&all games)" +msgstr "" + +#: pysollib/tk/menubar.py:320 +msgid "&Options" +msgstr "" + +#: pysollib/tk/menubar.py:321 +msgid "&Player options..." +msgstr "" + +#: pysollib/tk/menubar.py:322 +msgid "&Automatic play" +msgstr "" + +#: pysollib/tk/menubar.py:323 +msgid "Auto &face up" +msgstr "" + +#: pysollib/tk/menubar.py:325 +msgid "Auto &deal" +msgstr "" + +#: pysollib/tk/menubar.py:327 +msgid "&Quick play" +msgstr "" + +#: pysollib/tk/menubar.py:328 +msgid "Assist &level" +msgstr "" + +#: pysollib/tk/menubar.py:329 +msgid "Enable &undo" +msgstr "" + +#: pysollib/tk/menubar.py:330 +msgid "Enable &bookmarks" +msgstr "" + +#: pysollib/tk/menubar.py:331 +msgid "Enable &hint" +msgstr "" + +#: pysollib/tk/menubar.py:332 +msgid "Enable highlight p&iles" +msgstr "" + +#: pysollib/tk/menubar.py:333 +msgid "Enable highlight &cards" +msgstr "" + +#: pysollib/tk/menubar.py:334 +msgid "Enable highlight same &rank" +msgstr "" + +#: pysollib/tk/menubar.py:335 +msgid "Highlight &no matching" +msgstr "" + +#: pysollib/tk/menubar.py:337 +msgid "Show removed tiles (in Mahjongg games)" +msgstr "" + +#: pysollib/tk/menubar.py:338 +msgid "Show hint arrow (in Shisen-Sho games)" +msgstr "" + +#: pysollib/tk/menubar.py:340 +msgid "&Sound" +msgstr "" + +#: pysollib/tk/menubar.py:350 +msgid "Cards&et..." +msgstr "" + +#: pysollib/tk/menubar.py:351 +msgid "Table t&ile..." +msgstr "" + +#: pysollib/tk/menubar.py:353 +msgid "Card &background" +msgstr "" + +#: pysollib/tk/menubar.py:354 +msgid "Card &view" +msgstr "" + +#: pysollib/tk/menubar.py:355 +msgid "Card shado&w" +msgstr "" + +#: pysollib/tk/menubar.py:356 +msgid "Shade &legal moves" +msgstr "" + +#: pysollib/tk/menubar.py:357 +msgid "&Negative card bottom" +msgstr "" + +#: pysollib/tk/menubar.py:358 +msgid "A&nimations" +msgstr "" + +#: pysollib/tk/menubar.py:359 +msgid "&None" +msgstr "" + +#: pysollib/tk/menubar.py:360 +msgid "&Timer based" +msgstr "" + +#: pysollib/tk/menubar.py:361 +msgid "&Fast" +msgstr "" + +#: pysollib/tk/menubar.py:362 +msgid "&Slow" +msgstr "" + +#: pysollib/tk/menubar.py:363 +msgid "&Very slow" +msgstr "" + +#: pysollib/tk/menubar.py:364 +msgid "Stick&y mouse" +msgstr "" + +#: pysollib/tk/menubar.py:368 +msgid "&Fonts..." +msgstr "" + +#: pysollib/tk/menubar.py:369 +msgid "&Colors..." +msgstr "" + +#: pysollib/tk/menubar.py:370 +msgid "Time&outs..." +msgstr "" + +#: pysollib/tk/menubar.py:372 +msgid "&Toolbar" +msgstr "" + +#: pysollib/tk/menubar.py:374 +msgid "Stat&usbar" +msgstr "" + +#: pysollib/tk/menubar.py:375 +msgid "Show &statusbar" +msgstr "" + +#: pysollib/tk/menubar.py:376 +msgid "Show &number of cards" +msgstr "" + +#: pysollib/tk/menubar.py:377 +msgid "Show &help bar" +msgstr "" + +#: pysollib/tk/menubar.py:378 +msgid "&Demo logo" +msgstr "" + +#: pysollib/tk/menubar.py:379 +msgid "Startup splash sc&reen" +msgstr "" + +#: pysollib/tk/menubar.py:383 +msgid "&Help" +msgstr "" + +#: pysollib/tk/menubar.py:384 +msgid "&Contents" +msgstr "" + +#: pysollib/tk/menubar.py:385 +msgid "&How to play" +msgstr "" + +#: pysollib/tk/menubar.py:386 +msgid "&Rules for this game" +msgstr "" + +#: pysollib/tk/menubar.py:387 +msgid "&License terms" +msgstr "" + +#: pysollib/tk/menubar.py:390 +msgid "&About " +msgstr "" + +#: pysollib/tk/menubar.py:498 +msgid "All &games..." +msgstr "" + +#: pysollib/tk/menubar.py:499 +msgid "Playable pre&view..." +msgstr "" + +#: pysollib/tk/menubar.py:501 +msgid "&Popular games" +msgstr "" + +#: pysollib/tk/menubar.py:504 +msgid "&French games" +msgstr "" + +#: pysollib/tk/menubar.py:507 +msgid "&Mahjongg games" +msgstr "" + +#: pysollib/tk/menubar.py:510 +msgid "&Oriental games" +msgstr "" + +#: pysollib/tk/menubar.py:514 +msgid "&Special games" +msgstr "" + +#: pysollib/tk/menubar.py:518 +msgid "All games by name" +msgstr "" + +#: pysollib/tk/menubar.py:855 pysollib/tk/menubar.py:857 +#: pysollib/tk/selectcardset.py:240 +msgid "Load" +msgstr "" + +#: pysollib/tk/menubar.py:857 +msgid "Info..." +msgstr "" + +#: pysollib/tk/menubar.py:860 +msgid "Select " +msgstr "" + +#: pysollib/tk/menubar.py:920 +msgid "Select table background" +msgstr "" + +#: pysollib/tk/menubar.py:932 pysollib/tk/selecttile.py:176 +msgid "Select table color" +msgstr "" + +#: pysollib/tk/playeroptionsdialog.py:113 +msgid "" +"\n" +"Please enter your name" +msgstr "" + +#: pysollib/tk/playeroptionsdialog.py:121 +msgid "Select..." +msgstr "" + +#: pysollib/tk/playeroptionsdialog.py:125 +msgid "Confirm quit" +msgstr "" + +#: pysollib/tk/playeroptionsdialog.py:129 +msgid "Update statistics and logs" +msgstr "" + +#: pysollib/tk/playeroptionsdialog.py:146 +msgid "Select name" +msgstr "" + +#: pysollib/tk/selectcardset.py:81 pysollib/tk/selectcardset.py:146 +msgid "(no cardsets)" +msgstr "" + +#: pysollib/tk/selectcardset.py:91 pysollib/tk/selectcardset.py:154 +msgid "by Type" +msgstr "" + +#: pysollib/tk/selectcardset.py:101 pysollib/tk/selectcardset.py:112 +#: pysollib/tk/selectcardset.py:123 +msgid "Uncategorized" +msgstr "" + +#: pysollib/tk/selectcardset.py:102 +msgid "by Style" +msgstr "" + +#: pysollib/tk/selectcardset.py:113 +msgid "by Nationality" +msgstr "" + +#: pysollib/tk/selectcardset.py:124 +msgid "by Date" +msgstr "" + +#: pysollib/tk/selectcardset.py:127 +msgid "All Cardsets" +msgstr "" + +#: pysollib/tk/selectcardset.py:128 +msgid "by Size" +msgstr "" + +#: pysollib/tk/selectcardset.py:129 +msgid "Tiny cardsets" +msgstr "" + +#: pysollib/tk/selectcardset.py:130 +msgid "Small cardsets" +msgstr "" + +#: pysollib/tk/selectcardset.py:131 +msgid "Medium cardsets" +msgstr "" + +#: pysollib/tk/selectcardset.py:132 +msgid "Large cardsets" +msgstr "" + +#: pysollib/tk/selectcardset.py:133 +msgid "XLarge cardsets" +msgstr "" + +#: pysollib/tk/selectcardset.py:319 +msgid "About cardset" +msgstr "" + +#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:367 +msgid "Type:" +msgstr "" + +#: pysollib/tk/selectcardset.py:336 +msgid "Styles:" +msgstr "" + +#: pysollib/tk/selectcardset.py:337 +msgid "Nationality:" +msgstr "" + +#: pysollib/tk/selectcardset.py:338 +msgid "Year:" +msgstr "" + +#: pysollib/tk/selectcardset.py:340 +msgid "Size:" +msgstr "" + +#: pysollib/tk/selectgame.py:100 +msgid "(no games)" +msgstr "" + +#: pysollib/tk/selectgame.py:118 +msgid "French games" +msgstr "" + +#: pysollib/tk/selectgame.py:121 +msgid "Oriental Games" +msgstr "" + +#: pysollib/tk/selectgame.py:124 +msgid "Special Games" +msgstr "" + +#: pysollib/tk/selectgame.py:127 +msgid "Original Games" +msgstr "" + +#: pysollib/tk/selectgame.py:141 +msgid "by Compatibility" +msgstr "" + +#: pysollib/tk/selectgame.py:159 +msgid "New games in v" +msgstr "" + +#: pysollib/tk/selectgame.py:162 +msgid "by PySol version" +msgstr "" + +#: pysollib/tk/selectgame.py:169 +msgid "All Games" +msgstr "" + +#: pysollib/tk/selectgame.py:170 +msgid "Alternate Names" +msgstr "" + +#: pysollib/tk/selectgame.py:171 +msgid "Popular Games" +msgstr "" + +#: pysollib/tk/selectgame.py:172 +msgid "Mahjongg Games" +msgstr "" + +#: pysollib/tk/selectgame.py:178 +msgid "by Game Feature" +msgstr "" + +#: pysollib/tk/selectgame.py:179 +msgid "by Number of Cards" +msgstr "" + +#: pysollib/tk/selectgame.py:180 +msgid "32 cards" +msgstr "" + +#: pysollib/tk/selectgame.py:181 +msgid "48 cards" +msgstr "" + +#: pysollib/tk/selectgame.py:182 +msgid "52 cards" +msgstr "" + +#: pysollib/tk/selectgame.py:183 +msgid "64 cards" +msgstr "" + +#: pysollib/tk/selectgame.py:184 +msgid "78 cards" +msgstr "" + +#: pysollib/tk/selectgame.py:185 +msgid "104 cards" +msgstr "" + +#: pysollib/tk/selectgame.py:186 +msgid "144 cards" +msgstr "" + +#: pysollib/tk/selectgame.py:187 +msgid "Other number" +msgstr "" + +#: pysollib/tk/selectgame.py:189 +msgid "by Number of Decks" +msgstr "" + +#: pysollib/tk/selectgame.py:190 +msgid "1 deck games" +msgstr "" + +#: pysollib/tk/selectgame.py:191 +msgid "2 deck games" +msgstr "" + +#: pysollib/tk/selectgame.py:192 +msgid "3 deck games" +msgstr "" + +#: pysollib/tk/selectgame.py:193 +msgid "4 deck games" +msgstr "" + +#: pysollib/tk/selectgame.py:195 +msgid "by Number of Redeals" +msgstr "" + +#: pysollib/tk/selectgame.py:196 +msgid "No redeal" +msgstr "" + +#: pysollib/tk/selectgame.py:197 +msgid "1 redeal" +msgstr "" + +#: pysollib/tk/selectgame.py:198 +msgid "2 redeals" +msgstr "" + +#: pysollib/tk/selectgame.py:199 +msgid "3 redeals" +msgstr "" + +#: pysollib/tk/selectgame.py:200 +msgid "Unlimited redeals" +msgstr "" + +#: pysollib/tk/selectgame.py:202 +msgid "Other number of redeals" +msgstr "" + +#: pysollib/tk/selectgame.py:207 +msgid "Other Categories" +msgstr "" + +#: pysollib/tk/selectgame.py:208 +msgid "Games for Children (very easy)" +msgstr "" + +#: pysollib/tk/selectgame.py:209 +msgid "Games with Scoring" +msgstr "" + +#: pysollib/tk/selectgame.py:210 +msgid "Games with Separate Decks" +msgstr "" + +#: pysollib/tk/selectgame.py:211 +msgid "Open Games (all cards visible)" +msgstr "" + +#: pysollib/tk/selectgame.py:212 +msgid "Relaxed Variants" +msgstr "" + +#: pysollib/tk/selectgame.py:351 +msgid "About game" +msgstr "" + +#: pysollib/tk/selectgame.py:364 +msgid "Name:" +msgstr "" + +#: pysollib/tk/selectgame.py:365 +msgid "Alternate names:" +msgstr "" + +#: pysollib/tk/selectgame.py:366 +msgid "Category:" +msgstr "" + +#: pysollib/tk/selectgame.py:368 +msgid "Decks:" +msgstr "" + +#: pysollib/tk/selectgame.py:369 +msgid "Redeals:" +msgstr "" + +#: pysollib/tk/selectgame.py:371 +msgid "Played:" +msgstr "" + +#: pysollib/tk/selectgame.py:372 pysollib/tk/tkstats.py:111 +#: pysollib/tk/tkstats.py:163 +msgid "Won:" +msgstr "" + +#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:112 +#: pysollib/tk/tkstats.py:164 +msgid "Lost:" +msgstr "" + +#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:804 +msgid "Playing time:" +msgstr "" + +#: pysollib/tk/selectgame.py:375 pysollib/tk/tkstats.py:811 +msgid "Moves:" +msgstr "" + +#: pysollib/tk/selectgame.py:376 +msgid "% won:" +msgstr "" + +#: pysollib/tk/selectgame.py:409 +msgid "Select" +msgstr "" + +#: pysollib/tk/selectgame.py:409 pysollib/tk/toolbar.py:195 +msgid "Rules" +msgstr "" + +#: pysollib/tk/selectgame.py:490 +msgid "Playable Preview - " +msgstr "" + +#: pysollib/tk/selectgame.py:538 +msgid "variable" +msgstr "" + +#: pysollib/tk/selectgame.py:539 +msgid "unlimited" +msgstr "" + +#: pysollib/tk/selecttile.py:80 +msgid "(no tiles)" +msgstr "" + +#: pysollib/tk/selecttile.py:84 +msgid "Solid Colors" +msgstr "" + +#: pysollib/tk/selecttile.py:85 +msgid "Blue" +msgstr "" + +#: pysollib/tk/selecttile.py:87 +msgid "Navy" +msgstr "" + +#: pysollib/tk/selecttile.py:90 +msgid "Teal" +msgstr "" + +#: pysollib/tk/selecttile.py:92 +msgid "All Backgrounds" +msgstr "" + +#: pysollib/tk/selecttile.py:158 +msgid "Solid color..." +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:76 +msgid "Sound enabled" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:82 +msgid "Use DirectX for sound playing" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:88 +msgid "Sample volume" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:94 +msgid "Music volume" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:106 +msgid "Apply" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:108 +msgid "Mixer..." +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:155 +msgid "Sound preferences info" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:156 +msgid "" +"Changing DirectX settings will take effect\n" +"the next time you restart " +msgstr "" + +#: pysollib/tk/statusbar.py:135 +msgid "Moves/Total moves" +msgstr "" + +#: pysollib/tk/statusbar.py:137 +msgid "Games played: won/lost" +msgstr "" + +#: pysollib/tk/timeoutsdialog.py:65 +msgid "Demo:" +msgstr "" + +#: pysollib/tk/timeoutsdialog.py:66 +msgid "Hint:" +msgstr "" + +#: pysollib/tk/timeoutsdialog.py:67 +msgid "Raise card:" +msgstr "" + +#: pysollib/tk/timeoutsdialog.py:69 +msgid "Highlight cards:" +msgstr "" + +#: pysollib/tk/timeoutsdialog.py:70 +msgid "Highlight same rank:" +msgstr "" + +#: pysollib/tk/tkconst.py:104 +msgid "Icons only" +msgstr "" + +#: pysollib/tk/tkconst.py:105 +msgid "Text below icons" +msgstr "" + +#: pysollib/tk/tkconst.py:106 +msgid "Text beside icons" +msgstr "" + +#: pysollib/tk/tkconst.py:107 +msgid "Text only" +msgstr "" + +#: pysollib/tk/tkhtml.py:280 +msgid "Index" +msgstr "" + +#: pysollib/tk/tkhtml.py:284 +msgid "Back" +msgstr "" + +#: pysollib/tk/tkhtml.py:288 +msgid "Forward" +msgstr "" + +#: pysollib/tk/tkhtml.py:292 +msgid "Close" +msgstr "" + +#: pysollib/tk/tkhtml.py:394 +msgid "" +" HTML limitation:\n" +"The %s protocol is not supported yet.\n" +"\n" +"Please use your standard web browser\n" +"to open the following URL:\n" +"%s\n" +msgstr "" + +#: pysollib/tk/tkhtml.py:419 pysollib/tk/tkhtml.py:423 +msgid "" +"Unable to service request:\n" +msgstr "" + +#: pysollib/tk/tkstats.py:95 +msgid "Total" +msgstr "" + +#: pysollib/tk/tkstats.py:97 +msgid "Current session" +msgstr "" + +#: pysollib/tk/tkstats.py:113 pysollib/tk/tkstats.py:165 +msgid "Total:" +msgstr "" + +#: pysollib/tk/tkstats.py:278 +msgid "No games" +msgstr "" + +#: pysollib/tk/tkstats.py:291 +msgid "Reset..." +msgstr "" + +#: pysollib/tk/tkstats.py:574 pysollib/tk/tkstats.py:647 +#: pysollib/tk/tkstats.py:663 +msgid "Save to file" +msgstr "" + +#: pysollib/tk/tkstats.py:575 +msgid "Reset all..." +msgstr "" + +#: pysollib/tk/tkstats.py:625 +msgid "No entries for player " +msgstr "" + +#: pysollib/tk/tkstats.py:642 +msgid "" +"No log entries for %s\n" +msgstr "" + +#: pysollib/tk/tkstats.py:658 +msgid "" +"No current session log entries for %s\n" +msgstr "" + +#: pysollib/tk/tkstats.py:678 +msgid "Highlight piles: " +msgstr "" + +#: pysollib/tk/tkstats.py:679 +msgid "Highlight cards: " +msgstr "" + +#: pysollib/tk/tkstats.py:680 +msgid "Highlight same rank: " +msgstr "" + +#: pysollib/tk/tkstats.py:683 +msgid "" +"\n" +"Redeals: " +msgstr "" + +#: pysollib/tk/tkstats.py:684 +msgid "" +"\n" +"Cards in Talon: " +msgstr "" + +#: pysollib/tk/tkstats.py:686 +msgid "" +"\n" +"Cards in Waste: " +msgstr "" + +#: pysollib/tk/tkstats.py:688 +msgid "" +"\n" +"Cards in Foundations: " +msgstr "" + +#: pysollib/tk/tkstats.py:691 +msgid "Game status" +msgstr "" + +#: pysollib/tk/tkstats.py:694 +msgid "Playing time: " +msgstr "" + +#: pysollib/tk/tkstats.py:695 +msgid "Started at: " +msgstr "" + +#: pysollib/tk/tkstats.py:696 +msgid "Moves: " +msgstr "" + +#: pysollib/tk/tkstats.py:697 +msgid "Undo moves: " +msgstr "" + +#: pysollib/tk/tkstats.py:698 +msgid "Bookmark moves: " +msgstr "" + +#: pysollib/tk/tkstats.py:699 +msgid "Demo moves: " +msgstr "" + +#: pysollib/tk/tkstats.py:700 +msgid "Total player moves: " +msgstr "" + +#: pysollib/tk/tkstats.py:701 +msgid "Total moves in this game: " +msgstr "" + +#: pysollib/tk/tkstats.py:702 +msgid "Hints: " +msgstr "" + +#: pysollib/tk/tkstats.py:706 +msgid "Statistics..." +msgstr "" + +#: pysollib/tk/tkstats.py:731 +msgid "N" +msgstr "" + +#: pysollib/tk/tkstats.py:737 +msgid "Started at" +msgstr "" + +#: pysollib/tk/tkstats.py:740 +msgid "Result" +msgstr "" + +#: pysollib/tk/tkstats.py:796 +msgid "Minimum" +msgstr "" + +#: pysollib/tk/tkstats.py:797 +msgid "Maximum" +msgstr "" + +#: pysollib/tk/tkstats.py:798 +msgid "Average" +msgstr "" + +#: pysollib/tk/tkstats.py:818 +msgid "Total moves:" +msgstr "" + +#: pysollib/tk/tkstats.py:849 +msgid "No TOP for this game" +msgstr "" + +#: pysollib/tk/toolbar.py:183 +msgid "New" +msgstr "" + +#: pysollib/tk/toolbar.py:184 +msgid "" +"Restart the\n" +"current game" +msgstr "" + +#: pysollib/tk/toolbar.py:186 +msgid "Open" +msgstr "" + +#: pysollib/tk/toolbar.py:186 +msgid "" +"Open a\n" +"saved game" +msgstr "" + +#: pysollib/tk/toolbar.py:187 +msgid "Save" +msgstr "" + +#: pysollib/tk/toolbar.py:187 +msgid "Save game" +msgstr "" + +#: pysollib/tk/toolbar.py:189 +msgid "Undo" +msgstr "" + +#: pysollib/tk/toolbar.py:189 +msgid "Undo last move" +msgstr "" + +#: pysollib/tk/toolbar.py:190 +msgid "Redo" +msgstr "" + +#: pysollib/tk/toolbar.py:190 +msgid "Redo last move" +msgstr "" + +#: pysollib/tk/toolbar.py:191 +msgid "Auto drop cards" +msgstr "" + +#: pysollib/tk/toolbar.py:191 +msgid "Autodrop" +msgstr "" + +#: pysollib/tk/toolbar.py:192 +msgid "Pause" +msgstr "" + +#: pysollib/tk/toolbar.py:192 +msgid "Pause game" +msgstr "" + +#: pysollib/tk/toolbar.py:194 +msgid "View statistics" +msgstr "" + +#: pysollib/tk/toolbar.py:195 +msgid "Rules for this game" +msgstr "" + +#: pysollib/tk/toolbar.py:209 +msgid "Player" +msgstr "" + +#: pysollib/tk/toolbar.py:210 +msgid "Player options" +msgstr "" + +#: pysollib/tk/toolbar.py:428 +msgid "Toolbar" +msgstr "" + +#: pysollib/util.py:76 +msgid "Club" +msgstr "" + +#: pysollib/util.py:76 +msgid "Diamond" +msgstr "" + +#: pysollib/util.py:76 +msgid "Heart" +msgstr "" + +#: pysollib/util.py:76 +msgid "Spade" +msgstr "" + +#: pysollib/util.py:77 +msgid "black" +msgstr "" + +#: pysollib/util.py:77 +msgid "red" +msgstr "" + +#: pysollib/util.py:102 +msgid "cardset" +msgstr "" + diff --git a/po/ru_games.po b/po/ru_games.po new file mode 100644 index 00000000..e6f25882 --- /dev/null +++ b/po/ru_games.po @@ -0,0 +1,3188 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PySol 0.0.1\n" +"POT-Creation-Date: Fri May 26 20:25:43 2006\n" +"PO-Revision-Date: 2006-05-13 17:41+0400\n" +"Last-Translator: Скоморох \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: utf-8\n" +"Generated-By: ./scripts/all_games.py 0.1\n" + +msgid " 3x3 Matrix" +msgstr "Матрица 3x3" + +msgid " 4x4 Matrix" +msgstr "Матрица 4x4" + +msgid " 5x5 Matrix" +msgstr "Матрица 5x5" + +msgid " 6x6 Matrix" +msgstr "Матрица 6x6" + +msgid " 7x7 Matrix" +msgstr "Матрица 7x7" + +msgid " 8x8 Matrix" +msgstr "Матрица 8x8" + +msgid " 9x9 Matrix" +msgstr "Матрица 9x9" + +msgid "10 x 8" +msgstr "10 x 8" + +msgid "10x10 Matrix" +msgstr "Матрица 10x10" + +msgid "8 x 8" +msgstr "8 x 8" + +msgid "Abacus" +msgstr "Абак" + +#, fuzzy +msgid "Aces High" +msgstr "Тузы вверх" + +msgid "Aces Up" +msgstr "Тузы вверх" + +msgid "Aces Up 5" +msgstr "Тузы вверх 5" + +msgid "Achtmal Acht" +msgstr "" + +msgid "Acme" +msgstr "" + +#, fuzzy +msgid "Adelaide" +msgstr "Поляна" + +msgid "Agnes Bernauer" +msgstr "Агнесса Берно" + +msgid "Agnes Sorel" +msgstr "Агнесса Сорел" + +msgid "Akbar's Conquest" +msgstr "" + +msgid "Akbar's Triumph" +msgstr "" + +msgid "Alaska" +msgstr "Аляска" + +msgid "Algerian Patience" +msgstr "Алжирский пасьянс" + +#, fuzzy +msgid "Algerian Patience (3 decks)" +msgstr "Алжирский пасьянс" + +msgid "Alhambra" +msgstr "Алхамбра" + +msgid "All in a Row" +msgstr "" + +msgid "Altar" +msgstr "Алтарь" + +msgid "Alternation" +msgstr "Чередование" + +msgid "Amazons" +msgstr "Амазонки" + +msgid "American Toad" +msgstr "Американская жаба" + +msgid "Another Round" +msgstr "Другой Раунд" + +msgid "Appachan's Waterfall" +msgstr "Апачианский водопад" + +msgid "Applegate" +msgstr "" + +msgid "Aqab's" +msgstr "" + +msgid "Arachnida" +msgstr "" + +msgid "Arena" +msgstr "Арена" + +msgid "Arena 2" +msgstr "Арена 2" + +msgid "Arizona" +msgstr "Аризона" + +msgid "Arrow" +msgstr "Стрела" + +msgid "Art Moderne" +msgstr "Современное искусство" + +msgid "Ashrafi" +msgstr "" + +msgid "Ashta Dikapala" +msgstr "" + +msgid "Ashwapati" +msgstr "" + +msgid "Auld Lang Syne" +msgstr "Старые добрые времена" + +msgid "Aunt Mary" +msgstr "" + +#, fuzzy +msgid "Australian Patience" +msgstr "Русский пасьянс" + +#, fuzzy +msgid "Baby Spiderette" +msgstr "Паучок" + +msgid "Backbone" +msgstr "Основа" + +msgid "Backbone +" +msgstr "Основа +" + +msgid "Bad Seven" +msgstr "Плохая семёрка" + +msgid "Baker's Dozen" +msgstr "Чёртова дюжина" + +#, fuzzy +msgid "Baker's Game" +msgstr "Чёртова дюжина" + +msgid "Balance" +msgstr "Баланс" + +msgid "Balarama" +msgstr "" + +msgid "Bastion" +msgstr "Бастион" + +msgid "Bat" +msgstr "Летучая мышь" + +#, fuzzy +msgid "Bath" +msgstr "Летучая мышь" + +msgid "Batsford" +msgstr "Бетсфорд" + +#, fuzzy +msgid "Bavarian Patience" +msgstr "Алжирский пасьянс" + +msgid "Beak and Flipper" +msgstr "Клюв и ласты" + +msgid "Beatle" +msgstr "Жук" + +msgid "Beleaguered Castle" +msgstr "Осаждённый замок" + +msgid "Belvedere" +msgstr "Бельведер" + +msgid "Betsy Ross" +msgstr "Бетси Росс" + +#, fuzzy +msgid "Big Easy" +msgstr "Большая арфа" + +msgid "Big Flying Dragon" +msgstr "Большой Летящий Дракон" + +#, fuzzy +msgid "Big Forty" +msgstr "Форт" + +msgid "Big Harp" +msgstr "Большая арфа" + +msgid "Big Hole" +msgstr "Большая дыра" + +msgid "Big Mountain" +msgstr "Большая гора" + +msgid "Big Spider" +msgstr "Большой паук" + +#, fuzzy +msgid "Big Spider (1 suit)" +msgstr "Паук (1 масть)" + +#, fuzzy +msgid "Big Spider (2 suits)" +msgstr "Паук (2 масти)" + +#, fuzzy +msgid "Big Sumo" +msgstr "Большая дыра" + +msgid "Bim Bom" +msgstr "" + +msgid "Bisley" +msgstr "Бисли" + +msgid "Bits n Bytes" +msgstr "Биты и Байты" + +msgid "Bizarre" +msgstr "Причудливый" + +msgid "Black Hole" +msgstr "Чёрная дыра" + +msgid "Black Widow" +msgstr "Чёрная вдова" + +msgid "Blind Alleys" +msgstr "Тёмные аллеи" + +msgid "Blockade" +msgstr "Блокада" + +msgid "Blondes and Brunettes" +msgstr "Блондинки и Брюнетки" + +msgid "Blue Moon" +msgstr "Голубая луна" + +msgid "Boar" +msgstr "Боров" + +msgid "Boat" +msgstr "Лодка" + +msgid "Boudoir" +msgstr "Будуар" + +msgid "Box Fan" +msgstr "Коробка для веера" + +msgid "Box Kite" +msgstr "" + +msgid "Braid" +msgstr "Коса" + +#, fuzzy +msgid "Bridesmaids" +msgstr "Коса" + +msgid "Bridge" +msgstr "Мост" + +msgid "Bridge 2" +msgstr "Мост 2" + +#, fuzzy +msgid "Bridget's Game" +msgstr "Мост 2" + +msgid "Bridget's Game Doubled" +msgstr "" + +msgid "Brigade" +msgstr "Бригада" + +msgid "Bristol" +msgstr "Бристоль" + +msgid "British Constitution" +msgstr "Британская конституция" + +#, fuzzy +msgid "British Square" +msgstr "Восемь квадратов" + +msgid "Brunswick" +msgstr "Брюнсвик" + +msgid "Buffalo Bill" +msgstr "Буффало Билл" + +msgid "Bug" +msgstr "Клоп" + +#, fuzzy +msgid "Busy Aces" +msgstr "Русские тузы" + +msgid "Butterfly" +msgstr "Бабочка" + +msgid "Butterfly 2" +msgstr "Бабочка 2" + +msgid "Calculation" +msgstr "Вычисление" + +msgid "Camelot" +msgstr "Камелот" + +msgid "Canfield" +msgstr "Кенфилд" + +msgid "Canister" +msgstr "Коробочка" + +msgid "Capricieuse" +msgstr "Каприз" + +msgid "Captive Queens" +msgstr "Пленённые королевы" + +msgid "Carlton" +msgstr "Карлтон" + +msgid "Carpet" +msgstr "Ковёр" + +msgid "Carre Napoleon" +msgstr "Каре Наполеона" + +msgid "Carthage" +msgstr "Карфаген" + +msgid "Casino Klondike" +msgstr "Казино Клондайк" + +msgid "Castle" +msgstr "Замок" + +msgid "Castle of Indolence" +msgstr "Замок праздности" + +msgid "Castles in Spain" +msgstr "Замок в Испании" + +msgid "Cat and Mouse" +msgstr "Кот и Мышь" + +msgid "Cat's Tail" +msgstr "Кошачий хвост" + +msgid "Cavalier" +msgstr "Рыцарь" + +msgid "Cell 11" +msgstr "" + +msgid "Ceremonial" +msgstr "Церемониал" + +msgid "Challenge FreeCell" +msgstr "Сложная Свободная ячейка" + +msgid "Chamberlain" +msgstr "Камергер" + +msgid "Chameleon" +msgstr "Хамелеон" + +msgid "Checkered" +msgstr "Клетчатый" + +msgid "Chelicera" +msgstr "Хелицера" + +msgid "Chequers" +msgstr "Шахматный порядок" + +msgid "Cherry Bomb" +msgstr "Хлопушка" + +#, fuzzy +msgid "ChessMania" +msgstr "Маджонг ChessMania" + +msgid "Chessboard" +msgstr "Шахматная доска" + +msgid "Chinese Discipline" +msgstr "Китайский порядок" + +msgid "Chinese Solitaire" +msgstr "Китайский пасьянс" + +msgid "Chip" +msgstr "Щепка" + +msgid "Cicely" +msgstr "Кервель" + +msgid "Citadel" +msgstr "Цитадель" + +msgid "Clink" +msgstr "Застенок" + +msgid "Clover Leaf" +msgstr "Лепесток клевера" + +msgid "Cluitjar's Lair" +msgstr "" + +msgid "Cockroach" +msgstr "Таракан" + +msgid "Colorado" +msgstr "Колорадо" + +msgid "Columns" +msgstr "Столбцы" + +msgid "Concentration" +msgstr "Концентрация" + +msgid "Cone" +msgstr "Конус" + +msgid "Congress" +msgstr "Конгресс" + +msgid "Contradance" +msgstr "Контрданс" + +msgid "Convolution" +msgstr "Виток" + +msgid "Corkscrew" +msgstr "Штопор" + +msgid "Corners" +msgstr "Углы" + +msgid "Corona" +msgstr "Корона" + +msgid "Courtyard" +msgstr "Внутренний двор" + +msgid "Cross" +msgstr "Крест" + +msgid "Crown" +msgstr "Венец" + +msgid "Cruel" +msgstr "Изнурительный" + +msgid "Cupido's Heart" +msgstr "Сердце Купидона" + +msgid "Cupola" +msgstr "Купол" + +msgid "Curds and Whey" +msgstr "Творог и сыворотка" + +#, fuzzy +msgid "Danda" +msgstr "Алмаз" + +msgid "Dashavatara" +msgstr "Дашаватара" + +#, fuzzy +msgid "Dashavatara Circles" +msgstr "Дашаватара" + +msgid "Dead King Golf" +msgstr "Гольф Смертельный Король" + +#, fuzzy +msgid "Deep" +msgstr "Глубокий колодец" + +msgid "Deep Well" +msgstr "Глубокий колодец" + +msgid "Der Katzenschwanz" +msgstr "" + +msgid "Der Zopf" +msgstr "" + +#, fuzzy +msgid "Der freie Napoleon" +msgstr "Свободный Наполеон" + +#, fuzzy +msgid "Der kleine Napoleon" +msgstr "Свободный Наполеон" + +msgid "Der lange Zopf" +msgstr "" + +#, fuzzy +msgid "Der letzte Monarch" +msgstr "Последний ,Монарх" + +msgid "Deuces" +msgstr "Двойки" + +msgid "Dhanpati" +msgstr "" + +msgid "Diamond" +msgstr "Алмаз" + +msgid "Die Bildgallerie" +msgstr "" + +msgid "Die Königsbergerin" +msgstr "" + +msgid "Die Russische" +msgstr "" + +msgid "Die Schlange" +msgstr "" + +msgid "Die böse Sieben" +msgstr "" + +msgid "Die große Harfe" +msgstr "" + +msgid "Die kleine Harfe" +msgstr "" + +msgid "Diplomat" +msgstr "Дипломат" + +msgid "Dog" +msgstr "Пёс" + +msgid "Dojouji's Game" +msgstr "" + +msgid "Dojouji's Game Doubled" +msgstr "" + +msgid "Double Bisley" +msgstr "Двойной Бисли" + +msgid "Double Canfield" +msgstr "Двойной Кенфилд" + +msgid "Double Cockroach" +msgstr "Двойной таракан" + +#, fuzzy +msgid "Double Dot" +msgstr "Дубликаты" + +msgid "Double Drawbridge" +msgstr "Двойной разводной мост" + +#, fuzzy +msgid "Double Easthaven" +msgstr "Двойной кузнечик" + +msgid "Double FreeCell" +msgstr "Двойная свободная ячейка" + +msgid "Double Grasshopper" +msgstr "Двойной кузнечик" + +msgid "Double Klondike" +msgstr "Двойной Клондайк" + +msgid "Double Klondike by Threes" +msgstr "Двойной Клондайк по три" + +msgid "Double Mahjongg Big Castle" +msgstr "Двойной Маджонг Большой замок" + +msgid "Double Mahjongg Big Flying Dragon" +msgstr "Двойной Маджонг Большой Летящий Дракон" + +msgid "Double Mahjongg Eight Squares" +msgstr "Двойной Маджонг Восемь квадратов" + +msgid "Double Mahjongg Faro" +msgstr "Двойной Маджонг Фараон" + +msgid "Double Mahjongg Roost" +msgstr "Двойной Маджонг Насест" + +msgid "Double Mahjongg Sphere" +msgstr "Двойной Маджонг Сфера" + +msgid "Double Mahjongg Twin Picks" +msgstr "Двойной Маджонг Двойная вершина" + +msgid "Double Mahjongg Two Squares" +msgstr "Двойной Маджонг Два квадрата" + +msgid "Double Rail" +msgstr "Двойные рельсы" + +#, fuzzy +msgid "Double Samuri" +msgstr "Двойные рельсы" + +#, fuzzy +msgid "Double Your Fun" +msgstr "Двойной Юкон" + +msgid "Double Yukon" +msgstr "Двойной Юкон" + +msgid "Doublets" +msgstr "Дубликаты" + +msgid "Dover" +msgstr "Довер" + +msgid "Dragon" +msgstr "Дракон" + +msgid "Dragon 2" +msgstr "Дракон 2" + +msgid "Drawbridge" +msgstr "Разводной мост" + +msgid "Dress Parade" +msgstr "Показ мод" + +msgid "Drivel" +msgstr "Бессмыслица" + +msgid "Dude" +msgstr "Пижон" + +msgid "Duke" +msgstr "Герцог" + +msgid "Dumfries" +msgstr "" + +msgid "Eagle Wing" +msgstr "Крыло орла" + +msgid "Eastcliff" +msgstr "" + +msgid "Easthaven" +msgstr "" + +msgid "Easy Supreme" +msgstr "" + +msgid "Easy x One" +msgstr "" + +msgid "Egyptian Solitaire" +msgstr "Египетский пасьянс" + +msgid "Eiffel Tower" +msgstr "Эйфелева башня" + +msgid "Eight Legions" +msgstr "Восемь легионов" + +msgid "Eight Off" +msgstr "" + +msgid "Eight Squares" +msgstr "Восемь квадратов" + +msgid "Eight Times Eight" +msgstr "Восемь раз по восемь" + +msgid "Elevator" +msgstr "Лифт" + +msgid "Emperor" +msgstr "Император" + +msgid "Empty Pyramids" +msgstr "Пустые пирамиды" + +msgid "Enterprise" +msgstr "Предприятие" + +msgid "Escalator" +msgstr "Эскалатор" + +#, fuzzy +msgid "Eularia" +msgstr "Мария" + +msgid "Excuse" +msgstr "" + +msgid "Eye" +msgstr "Глаз" + +#, fuzzy +msgid "F-15 Eagle" +msgstr "Маджонг F-15 Eagle" + +msgid "Fair Lucy" +msgstr "" + +#, fuzzy +msgid "Fairest" +msgstr "Ковёр" + +msgid "Falling Star" +msgstr "Падающая звезда" + +msgid "Fan" +msgstr "Веер" + +msgid "Farandole" +msgstr "Фарандола" + +msgid "Faro" +msgstr "Фараон" + +msgid "Fastness" +msgstr "Цитадель" + +#, fuzzy +msgid "Fatimeh's Game" +msgstr "Бабушкина игра" + +msgid "Fatimeh's Game Relaxed" +msgstr "" + +#, fuzzy +msgid "Fifteen Puzzle" +msgstr "Пятнашки" + +msgid "Fifteen plus" +msgstr "Пятнадцать плюс" + +msgid "Firecracker" +msgstr "Хлопушка" + +msgid "First Law" +msgstr "Фундаментальный закон" + +msgid "Fish" +msgstr "Рыба" + +#, fuzzy +msgid "Fish face" +msgstr "Маджонг Fish face" + +msgid "Five Aces" +msgstr "Пять тузов" + +msgid "Five Pyramids" +msgstr "Пять пирамид" + +msgid "Floating City" +msgstr "Плавающий город" + +msgid "Flower Arrangement" +msgstr "Аранжировка цветов" + +msgid "Flower Clock" +msgstr "Цветочные часы" + +msgid "Flower Garden" +msgstr "Цветочный сад" + +msgid "Flowers" +msgstr "Цветы" + +msgid "Fly" +msgstr "Полёт" + +msgid "Flying Dragon" +msgstr "Летящий дракон" + +#, fuzzy +msgid "ForeCell" +msgstr "Свободная ячейка" + +msgid "Fort" +msgstr "Форт" + +msgid "Fortress" +msgstr "Крепость" + +msgid "Fortress Towers" +msgstr "Крепостные башни" + +#, fuzzy +msgid "Fortune's Favor" +msgstr "Судьба" + +msgid "Fortunes" +msgstr "Судьба" + +msgid "Forty Thieves" +msgstr "Сорок разбойников" + +msgid "Forty and Eight" +msgstr "Сорок и восемь" + +#, fuzzy +msgid "Four Colours" +msgstr "Четырёхлистный клевер" + +msgid "Four Kings" +msgstr "Четыре короля" + +msgid "Four Leaf Clovers" +msgstr "Четырёхлистный клевер" + +msgid "Four Seasons" +msgstr "Четыре сезона" + +msgid "Four Stacks" +msgstr "Четыре кучи" + +msgid "Four Winds" +msgstr "Четыре ветра" + +msgid "Fourteen" +msgstr "Четырнадцать" + +#, fuzzy +msgid "Fred's Spider" +msgstr "Смягчённый Паук" + +#, fuzzy +msgid "Fred's Spider (3 decks)" +msgstr "Церлин (3 колоды)" + +msgid "Free Fan" +msgstr "Свободный веер" + +msgid "Free Napoleon" +msgstr "Свободный Наполеон" + +msgid "FreeCell" +msgstr "Свободная ячейка" + +msgid "Frog" +msgstr "Лягушка" + +#, fuzzy +msgid "Full Vision" +msgstr "Маджонг Full Vision" + +#, fuzzy +msgid "Full Vision 2" +msgstr "Маджонг Full Vision 2" + +msgid "Future" +msgstr "Будущее" + +msgid "Gajapati" +msgstr "" + +msgid "Gaji" +msgstr "" + +msgid "Galary" +msgstr "Галерея" + +msgid "Galloway" +msgstr "Шотландская лошадка" + +msgid "Gaps" +msgstr "Пробелы" + +msgid "Garden" +msgstr "Сад" + +msgid "Gargantua" +msgstr "Гаргантюа" + +msgid "Garhpati" +msgstr "" + +msgid "Gate" +msgstr "Ворота" + +#, fuzzy +msgid "Gayle's" +msgstr "Маджонг Gayle's" + +msgid "General's Patience" +msgstr "Генеральский пасьянс" + +msgid "Genesis" +msgstr "Происхождение" + +msgid "Genesis +" +msgstr "Происхождение +" + +#, fuzzy +msgid "German Patience" +msgstr "Алжирский пасьянс" + +msgid "Ghulam" +msgstr "" + +msgid "Giant" +msgstr "Великан" + +msgid "Glade" +msgstr "Поляна" + +msgid "Glenwood" +msgstr "Гленвуд" + +msgid "Gloaming" +msgstr "Вечерние сумерки" + +msgid "Gloria" +msgstr "Глория" + +msgid "Gnat" +msgstr "Комар" + +msgid "Golf" +msgstr "Гольф" + +msgid "Good Measure" +msgstr "Полная мера" + +msgid "Grampus" +msgstr "Касатка" + +msgid "Grandfather" +msgstr "Дедушка" + +msgid "Grandfather's Clock" +msgstr "Дедушкины часы" + +msgid "Grandmother's Game" +msgstr "Бабушкина игра" + +msgid "Grasshopper" +msgstr "Кузнечик" + +msgid "Great Wall" +msgstr "Великая стена" + +msgid "Great Wheel" +msgstr "Великое Колесо" + +msgid "Greater Queue" +msgstr "Длинная коса" + +msgid "Griffon" +msgstr "Грифон" + +msgid "Ground for a Divorce" +msgstr "Повод для разрыва" + +msgid "Ground for a Divorce (3 decks)" +msgstr "Повод для разрыва (3 колоды)" + +#, fuzzy +msgid "Ground for a Divorce (4 decks)" +msgstr "Повод для разрыва (3 колоды)" + +msgid "Gypsy" +msgstr "Цыганский" + +#, fuzzy +msgid "H for Haga" +msgstr "Маджонг H for Haga" + +msgid "Half Mahjongg Happy New Year" +msgstr "Половинный Маджонг С Новым Годом" + +msgid "Half Mahjongg Smile" +msgstr "Половинный Маджонг Улыбка" + +msgid "Half Mahjongg Wall" +msgstr "Половинный Маджонг Стена" + +msgid "Hanoi Puzzle 4" +msgstr "Ханойская головоломка 4" + +msgid "Hanoi Puzzle 5" +msgstr "Ханойская головоломка 5" + +msgid "Hanoi Puzzle 6" +msgstr "Ханойская головоломка 6" + +msgid "Happy New Year" +msgstr "С Новым Годом" + +msgid "Hare" +msgstr "Заяц" + +msgid "Hayagriva" +msgstr "" + +msgid "Haystack" +msgstr "Стог сена" + +msgid "Heads and Tails" +msgstr "Головы и хвосты" + +msgid "Helios" +msgstr "Гелиос" + +msgid "Hex A Klon" +msgstr "" + +#, fuzzy +msgid "Hex A Klon by Threes" +msgstr "Клондайк по три" + +msgid "Hex Labyrinth" +msgstr "Шестнадцатеричный лабиринт" + +msgid "Hidden Passages" +msgstr "Тайные ходы" + +msgid "Hidden Words" +msgstr "Спрятанные слова" + +#, fuzzy +msgid "High and Low" +msgstr "Маджонг High and Low" + +msgid "Hiranyaksha" +msgstr "" + +msgid "Hopscotch" +msgstr "Классы" + +msgid "Horse" +msgstr "Лошадь" + +msgid "House in the Wood" +msgstr "Дом в лесу" + +msgid "House on the Hill" +msgstr "Дом на холме" + +msgid "Hovercraft" +msgstr "Ховеркрафт" + +msgid "Hurdles" +msgstr "Барьеры" + +msgid "Hurricane" +msgstr "Ураган" + +msgid "Idiot's Delight" +msgstr "Дурацкое удовольствие" + +#, fuzzy +msgid "Idle Aces" +msgstr "Пять тузов" + +msgid "IloveU" +msgstr "" + +msgid "Imperial Trumps" +msgstr "Имперские козыри" + +#, fuzzy +msgid "Inazuma" +msgstr "Маджонг Inazuma" + +msgid "Inca" +msgstr "" + +msgid "Indian" +msgstr "Индийский" + +#, fuzzy +msgid "Indian Patience" +msgstr "Русский пасьянс" + +msgid "Inner Circle" +msgstr "Внутренний круг" + +msgid "Intelligence" +msgstr "Смекалка" + +msgid "Intelligence +" +msgstr "Смекалка +" + +msgid "Interregnum" +msgstr "Междуцарствие" + +msgid "Iris" +msgstr "Ирис" + +msgid "Irmgard" +msgstr "" + +msgid "JPs" +msgstr "" + +msgid "Jamestown" +msgstr "Джеймстаун" + +msgid "Jane" +msgstr "Джейн" + +msgid "Japan" +msgstr "Япония" + +msgid "Japanese Garden" +msgstr "Японский сад" + +msgid "Japanese Garden II" +msgstr "Японский сад II" + +msgid "Japanese Garden III" +msgstr "Японский сад III" + +msgid "Joker" +msgstr "Джокер" + +msgid "Josephine" +msgstr "Жозефина" + +msgid "Journey to Cuddapah" +msgstr "Путешествие в Куддапах" + +msgid "Jumbo" +msgstr "Гигант" + +msgid "Jungle" +msgstr "Джунгли" + +msgid "Just For Fun" +msgstr "Просто для удовольствия" + +#, fuzzy +msgid "K for Kyodai" +msgstr "Маджонг K for Kyodai" + +msgid "Kali's Game" +msgstr "" + +msgid "Kali's Game Doubled" +msgstr "" + +msgid "Kali's Game Relaxed" +msgstr "" + +msgid "Kansas" +msgstr "Канзас" + +#, fuzzy +msgid "Katrina's Game" +msgstr "Бабушкина игра" + +msgid "Katrina's Game Doubled" +msgstr "" + +msgid "Katrina's Game Relaxed" +msgstr "" + +msgid "Khadga" +msgstr "" + +msgid "King Albert" +msgstr "Король Альберт" + +msgid "King Only Baker's Game" +msgstr "" + +msgid "King Only Hex A Klon" +msgstr "" + +msgid "Kingdom" +msgstr "Королевство" + +msgid "Kings" +msgstr "Короли" + +msgid "Kingsdown Eights" +msgstr "" + +msgid "Klondike" +msgstr "Клондайк" + +#, fuzzy +msgid "Klondike Plus 16" +msgstr "Клондайк" + +msgid "Klondike by Threes" +msgstr "Клондайк по три" + +msgid "Km" +msgstr "" + +msgid "Krebs" +msgstr "" + +msgid "Kujaku" +msgstr "" + +#, fuzzy +msgid "Kumo" +msgstr "Гигант" + +msgid "Kurma" +msgstr "" + +#, fuzzy +msgid "Kyodai 14" +msgstr "Маджонг Kyodai 14" + +#, fuzzy +msgid "Kyodai 17" +msgstr "Маджонг Kyodai 17" + +#, fuzzy +msgid "Kyodai 18" +msgstr "Маджонг Kyodai 18" + +#, fuzzy +msgid "Kyodai 20" +msgstr "Маджонг Kyodai 20" + +#, fuzzy +msgid "Kyodai 23" +msgstr "Маджонг Kyodai 23" + +#, fuzzy +msgid "Kyodai 24" +msgstr "Маджонг Kyodai 24" + +#, fuzzy +msgid "Kyodai 25" +msgstr "Маджонг Kyodai 25" + +#, fuzzy +msgid "Kyodai 26" +msgstr "Маджонг Kyodai 26" + +#, fuzzy +msgid "Kyodai 27" +msgstr "Маджонг Kyodai 27" + +#, fuzzy +msgid "Kyodai 28" +msgstr "Маджонг Kyodai 28" + +#, fuzzy +msgid "Kyodai 41" +msgstr "Маджонг Kyodai 4" + +#, fuzzy +msgid "Kyodai 42" +msgstr "Маджонг Kyodai 42" + +msgid "La Belle Lucie" +msgstr "Прекрасная Люси" + +msgid "La Nivernaise" +msgstr "" + +msgid "Labyrinth" +msgstr "Лабиринт" + +msgid "Lady Betty" +msgstr "Леди Бетти" + +msgid "Lady Palk" +msgstr "Леди Полк" + +msgid "Lady of the Manor" +msgstr "" + +msgid "Lanes" +msgstr "Тропинки" + +#, fuzzy +msgid "Lara's Game" +msgstr "Бабушкина игра" + +msgid "Lara's Game Doubled" +msgstr "" + +msgid "Lara's Game Relaxed" +msgstr "" + +msgid "Lattice" +msgstr "Решётка" + +msgid "Le Cadran" +msgstr "" + +msgid "Le Grande Teton" +msgstr "" + +msgid "Leo" +msgstr "Лев" + +msgid "Lesser Queue" +msgstr "Короткая коса" + +msgid "Lexington Harp" +msgstr "Лексингтонская арфа" + +msgid "Lily" +msgstr "Лили" + +msgid "Limited" +msgstr "Ограниченный" + +msgid "Lion" +msgstr "Лион" + +#, fuzzy +msgid "Little Billie" +msgstr "Малые ворота" + +#, fuzzy +msgid "Little Easy" +msgstr "Малые ворота" + +#, fuzzy +msgid "Little Forty" +msgstr "Малые ворота" + +msgid "Little Gate" +msgstr "Малые ворота" + +msgid "Long Braid" +msgstr "Долгая коса" + +msgid "Long Journey to Cuddapah" +msgstr "Долгое путешествие в Куддапах" + +msgid "Loose Ends" +msgstr "Свободные концы" + +msgid "Lost " +msgstr "Потеря" + +msgid "Lucas" +msgstr "Лукас" + +#, fuzzy +msgid "Mage's Game" +msgstr "Бабушкина игра" + +msgid "Mahjongg Altar" +msgstr "Маджонг Алтарь" + +msgid "Mahjongg Another Round" +msgstr "Маджонг Другой раунд" + +msgid "Mahjongg Aqab's" +msgstr "Маджонг Aqab's" + +msgid "Mahjongg Arena" +msgstr "Маджонг Арена" + +msgid "Mahjongg Arena 2" +msgstr "Маджонг Арена 2" + +msgid "Mahjongg Arrow" +msgstr "Маджонг Стрела" + +msgid "Mahjongg Art Moderne" +msgstr "Маджонг Современное искусство" + +msgid "Mahjongg Balance" +msgstr "Маджонг Баланс" + +msgid "Mahjongg Bat" +msgstr "Маджонг Летучая мышь" + +msgid "Mahjongg Beatle" +msgstr "Маджонг Жук" + +msgid "Mahjongg Big Hole" +msgstr "Маджонг Большая дыра" + +msgid "Mahjongg Big Mountain" +msgstr "Маджонг Большая гора" + +msgid "Mahjongg Bizarre" +msgstr "Маджонг Причудливый" + +msgid "Mahjongg Boar" +msgstr "Маджонг Боров" + +msgid "Mahjongg Boat" +msgstr "Маджонг Лодка" + +msgid "Mahjongg Bridge" +msgstr "Маджонг Мост" + +msgid "Mahjongg Bridge 2" +msgstr "Маджонг Мост 2" + +msgid "Mahjongg Bug" +msgstr "Маджонг Клоп" + +msgid "Mahjongg Butterfly" +msgstr "Маджонг Бабочка" + +msgid "Mahjongg Butterfly 2" +msgstr "Маджонг Бабочка 2" + +msgid "Mahjongg Castle" +msgstr "Маджонг Замок" + +msgid "Mahjongg Cat and Mouse" +msgstr "Маджонг Кот и Мышь" + +msgid "Mahjongg Ceremonial" +msgstr "Маджонг Церемониал" + +msgid "Mahjongg Checkered" +msgstr "Маджонг Клетчатый" + +msgid "Mahjongg ChessMania" +msgstr "Маджонг ChessMania" + +msgid "Mahjongg Chip" +msgstr "Маджонг Щепка" + +msgid "Mahjongg Columns" +msgstr "Маджонг Столбцы" + +msgid "Mahjongg Cross" +msgstr "Маджонг Крест" + +msgid "Mahjongg Crown" +msgstr "Маджонг Венец" + +msgid "Mahjongg Cupido's Heart" +msgstr "Маджонг Сердце Купидона" + +msgid "Mahjongg Cupola" +msgstr "Маджонг Купол" + +msgid "Mahjongg Deep Well" +msgstr "Маджонг Глубокий колодец" + +msgid "Mahjongg Diamond" +msgstr "Маджонг Алмаз" + +msgid "Mahjongg Dog" +msgstr "Маджонг Пёс" + +msgid "Mahjongg Dragon" +msgstr "Маджонг Дракон" + +msgid "Mahjongg Dragon 2" +msgstr "Маджонг Дракон 2" + +msgid "Mahjongg Dude" +msgstr "Маджонг Пижон" + +msgid "Mahjongg Empty Pyramids" +msgstr "Маджонг Пустые пирамиды" + +msgid "Mahjongg Enterprise" +msgstr "Маджонг Предприятие" + +msgid "Mahjongg Eye" +msgstr "Маджонг Глаз" + +msgid "Mahjongg F-15 Eagle" +msgstr "Маджонг F-15 Eagle" + +msgid "Mahjongg Farandole" +msgstr "Маджонг Фарандола" + +msgid "Mahjongg Fish" +msgstr "Маджонг Рыба" + +msgid "Mahjongg Fish face" +msgstr "Маджонг Fish face" + +msgid "Mahjongg Five Pyramids" +msgstr "Маджонг Пять пирамид" + +msgid "Mahjongg Floating City" +msgstr "Маджонг Плавающий город" + +msgid "Mahjongg Flowers" +msgstr "Маджонг Цветы" + +msgid "Mahjongg Flying Dragon" +msgstr "Маджонг Летящий Дракон" + +msgid "Mahjongg Fortress Towers" +msgstr "Маджонг Крепостные башни" + +msgid "Mahjongg Full Vision" +msgstr "Маджонг Full Vision" + +msgid "Mahjongg Full Vision 2" +msgstr "Маджонг Full Vision 2" + +msgid "Mahjongg Future" +msgstr "Маджонг Будущее" + +msgid "Mahjongg Garden" +msgstr "Маджонг Сад" + +msgid "Mahjongg Gayle's" +msgstr "Маджонг Gayle's" + +msgid "Mahjongg Glade" +msgstr "Маджонг Поляна" + +msgid "Mahjongg H for Haga" +msgstr "Маджонг H for Haga" + +msgid "Mahjongg Hare" +msgstr "Маджонг Заяц" + +msgid "Mahjongg Helios" +msgstr "Маджонг Гелиос" + +msgid "Mahjongg Hidden Words" +msgstr "Маджонг Спрятанные слова" + +msgid "Mahjongg High and Low" +msgstr "Маджонг High and Low" + +msgid "Mahjongg Horse" +msgstr "Маджонг Лошадь" + +msgid "Mahjongg Hovercraft" +msgstr "Маджонг Ховеркрафт" + +msgid "Mahjongg Hurdles" +msgstr "Маджонг Барьеры" + +msgid "Mahjongg Hurricane" +msgstr "Маджонг Ураган" + +msgid "Mahjongg IloveU" +msgstr "Маджонг IloveU" + +msgid "Mahjongg Inazuma" +msgstr "Маджонг Inazuma" + +msgid "Mahjongg Inca" +msgstr "Маджонг Inca" + +msgid "Mahjongg Inner Circle" +msgstr "Маджонг Внутренний круг" + +msgid "Mahjongg JPs" +msgstr "Маджонг JPs" + +msgid "Mahjongg Japan" +msgstr "Маджонг Япония" + +msgid "Mahjongg Joker" +msgstr "Маджонг Джокер" + +msgid "Mahjongg K for Kyodai" +msgstr "Маджонг K for Kyodai" + +msgid "Mahjongg Km" +msgstr "Маджонг Km" + +msgid "Mahjongg Krebs" +msgstr "Маджонг Krebs" + +msgid "Mahjongg Kujaku" +msgstr "Маджонг Kujaku" + +msgid "Mahjongg Kumo" +msgstr "Маджонг Kumo" + +msgid "Mahjongg Kyodai 14" +msgstr "Маджонг Kyodai 14" + +msgid "Mahjongg Kyodai 17" +msgstr "Маджонг Kyodai 17" + +msgid "Mahjongg Kyodai 18" +msgstr "Маджонг Kyodai 18" + +msgid "Mahjongg Kyodai 20" +msgstr "Маджонг Kyodai 20" + +msgid "Mahjongg Kyodai 23" +msgstr "Маджонг Kyodai 23" + +msgid "Mahjongg Kyodai 24" +msgstr "Маджонг Kyodai 24" + +msgid "Mahjongg Kyodai 25" +msgstr "Маджонг Kyodai 25" + +msgid "Mahjongg Kyodai 26" +msgstr "Маджонг Kyodai 26" + +msgid "Mahjongg Kyodai 27" +msgstr "Маджонг Kyodai 27" + +msgid "Mahjongg Kyodai 28" +msgstr "Маджонг Kyodai 28" + +msgid "Mahjongg Kyodai 41" +msgstr "Маджонг Kyodai 4" + +msgid "Mahjongg Kyodai 42" +msgstr "Маджонг Kyodai 42" + +msgid "Mahjongg Labyrinth" +msgstr "Маджонг Лабиринт" + +msgid "Mahjongg Lattice" +msgstr "Маджонг Решётка" + +msgid "Mahjongg Leo" +msgstr "Маджонг Лев" + +msgid "Mahjongg Lion" +msgstr "Маджонг Лион" + +msgid "Mahjongg Loose Ends" +msgstr "Маджонг Свободные концы" + +msgid "Mahjongg Lost " +msgstr "Маджонг Потеря" + +msgid "Mahjongg Maya" +msgstr "Маджонг Майя" + +msgid "Mahjongg Mesh" +msgstr "Маджонг Западня" + +msgid "Mahjongg Mini Traditional" +msgstr "Маджонг Mini Traditional" + +msgid "Mahjongg Mini-Layout" +msgstr "Маджонг Mini-Layout" + +msgid "Mahjongg Mission Impossible" +msgstr "Маджонг Миссия невыполнима" + +msgid "Mahjongg Monkey" +msgstr "Маджонг Обезьяна" + +msgid "Mahjongg Moth" +msgstr "Маджонг Мотылёк" + +msgid "Mahjongg Multi X" +msgstr "Маджонг Multi X" + +msgid "Mahjongg N for Namida" +msgstr "Маджонг N for Namida" + +msgid "Mahjongg New Layout" +msgstr "Маджонг New Layout" + +msgid "Mahjongg Okie's Nitemare" +msgstr "Маджонг Okie's Nitemare" + +msgid "Mahjongg Orbital" +msgstr "Маджонг Орбитальный" + +msgid "Mahjongg Order" +msgstr "Маджонг Порядок" + +msgid "Mahjongg Owl" +msgstr "Маджонг Сова" + +msgid "Mahjongg Ox" +msgstr "Маджонг Бык" + +msgid "Mahjongg Pantheon" +msgstr "Маджонг Пантеон" + +msgid "Mahjongg Papillon" +msgstr "Маджонг Папильотка" + +msgid "Mahjongg Pattern" +msgstr "Маджонг Образец" + +msgid "Mahjongg Portal" +msgstr "Маджонг Портал" + +msgid "Mahjongg Pyramid 1" +msgstr "Маджонг Пирамида 1" + +msgid "Mahjongg Pyramid 2" +msgstr "Маджонг Пирамида 2" + +msgid "Mahjongg Quad" +msgstr "Маджонг Quad" + +msgid "Mahjongg Ram" +msgstr "Маджонг Овен" + +msgid "Mahjongg Rat" +msgstr "Маджонг Крыса" + +msgid "Mahjongg Rectangle" +msgstr "Маджонг Прямоугольник" + +msgid "Mahjongg Reindeer" +msgstr "Маджонг Северный олень" + +msgid "Mahjongg Rings" +msgstr "Маджонг Круги" + +msgid "Mahjongg River Bridge" +msgstr "Маджонг Мост через реку" + +msgid "Mahjongg Rocket" +msgstr "Маджонг Ракета" + +msgid "Mahjongg Roman Arena" +msgstr "Маджонг Римская арена" + +msgid "Mahjongg Rooster" +msgstr "Маджонг Петух" + +msgid "Mahjongg Rugby" +msgstr "Маджонг Регби" + +msgid "Mahjongg Scorpion" +msgstr "Маджонг Скорпион" + +msgid "Mahjongg Screw Up" +msgstr "Маджонг Screw Up" + +msgid "Mahjongg Seven" +msgstr "Маджонг Семёрка" + +msgid "Mahjongg Seven Pyramids" +msgstr "Маджонг Семь пирамид" + +msgid "Mahjongg Shapeshifter" +msgstr "Маджонг Shapeshifter" + +msgid "Mahjongg Shield" +msgstr "Маджонг Щит" + +msgid "Mahjongg Siam" +msgstr "Маджонг Сиам" + +msgid "Mahjongg Snake" +msgstr "Маджонг Хвост" + +msgid "Mahjongg Space Bridge" +msgstr "Маджонг Космический мост" + +msgid "Mahjongg Space Shuttle" +msgstr "Маджонг Космический челнок" + +msgid "Mahjongg Square" +msgstr "Маджонг Квадрат" + +msgid "Mahjongg Squares" +msgstr "Маджонг Квадраты" + +msgid "Mahjongg Squaring" +msgstr "Маджонг Squaring" + +msgid "Mahjongg Stage 1" +msgstr "Маджонг Stage 1" + +msgid "Mahjongg Stage 2" +msgstr "Маджонг Stage 2" + +msgid "Mahjongg Stairs" +msgstr "Маджонг Ступени" + +msgid "Mahjongg Stairs 2" +msgstr "Маджонг Ступени 2" + +msgid "Mahjongg Stairs 3" +msgstr "Маджонг Ступени 3" + +msgid "Mahjongg Star Ship" +msgstr "Маджонг Космический корабль" + +msgid "Mahjongg Stargate" +msgstr "Маджонг Звёздные врата" + +msgid "Mahjongg Step Pyramid" +msgstr "Маджонг Семь пирамид" + +msgid "Mahjongg Stonehenge" +msgstr "Маджонг Стоунхендж" + +msgid "Mahjongg Sukis" +msgstr "Маджонг Sukis" + +msgid "Mahjongg SunMoon" +msgstr "Маджонг SunMoon" + +msgid "Mahjongg Taipei" +msgstr "Маджонг Тайпей" + +msgid "Mahjongg Temple" +msgstr "Маджонг Храм" + +msgid "Mahjongg Temple 1" +msgstr "Маджонг Храм 1" + +msgid "Mahjongg Temple 2" +msgstr "Маджонг Храм 2" + +msgid "Mahjongg The Door" +msgstr "Маджонг Дверь" + +msgid "Mahjongg The Great Wall" +msgstr "Маджонг Великая стена" + +msgid "Mahjongg Theater" +msgstr "Маджонг Театр" + +msgid "Mahjongg Tiger" +msgstr "Маджонг Тигр" + +msgid "Mahjongg Tile Fighter" +msgstr "Маджонг Tile Fighter" + +msgid "Mahjongg Tilepiles" +msgstr "Маджонг Tilepiles" + +msgid "Mahjongg Time Tunnel" +msgstr "Маджонг Time Tunnel" + +msgid "Mahjongg Tomb" +msgstr "Маджонг Гробница" + +msgid "Mahjongg Totally Random-Made" +msgstr "Маджонг Totally Random-Made" + +msgid "Mahjongg Traditional Reviewed" +msgstr "Маджонг Traditional Reviewed" + +msgid "Mahjongg Tree of Life" +msgstr "Маджонг Древо жизни" + +msgid "Mahjongg Trika" +msgstr "Маджонг Trika" + +msgid "Mahjongg Twin" +msgstr "Маджонг Twin" + +msgid "Mahjongg Twin Temples" +msgstr "Маджонг Twin Temples" + +msgid "Mahjongg Two Domes" +msgstr "Маджонг Two Domes" + +msgid "Mahjongg Vagues" +msgstr "Маджонг Vagues" + +msgid "Mahjongg Vi" +msgstr "Маджонг Vi" + +msgid "Mahjongg Victory Arrow" +msgstr "Маджонг Victory Arrow" + +msgid "Mahjongg Wavelets" +msgstr "Маджонг Волны" + +msgid "Mahjongg Wedges" +msgstr "Маджонг Клинья" + +msgid "Mahjongg Well" +msgstr "Маджонг Well" + +msgid "Mahjongg Well2" +msgstr "Маджонг Well2" + +msgid "Mahjongg Whatever" +msgstr "Маджонг Нечто" + +msgid "Mahjongg Win" +msgstr "Маджонг Win" + +msgid "Mahjongg X-Files" +msgstr "Маджонг X-Files" + +msgid "Mahjongg X-Shape" +msgstr "Маджонг X-Shape" + +msgid "Mahjongg Yummy" +msgstr "Маджонг Приятный" + +#, fuzzy +msgid "Makara" +msgstr "Мария" + +msgid "Mancunian" +msgstr "Манчестерский" + +msgid "Maria" +msgstr "Мария" + +msgid "Maria Luisa" +msgstr "Мария Луиза" + +msgid "Martha" +msgstr "Марта" + +msgid "Matriarchy" +msgstr "Матриархат" + +#, fuzzy +msgid "Matrimony" +msgstr "Матриархат" + +msgid "MatsuKiri" +msgstr "" + +msgid "MatsuKiri Strict" +msgstr "" + +#, fuzzy +msgid "Matsya" +msgstr "Майя" + +msgid "Maya" +msgstr "Майя" + +msgid "Maze" +msgstr "Путаница" + +msgid "Memory 24" +msgstr "" + +msgid "Memory 30" +msgstr "" + +msgid "Memory 40" +msgstr "" + +msgid "Merlin's Meander" +msgstr "Орнамент Мерлина" + +msgid "Mesh" +msgstr "Западня" + +msgid "Midnight Oil" +msgstr "" + +msgid "Midshipman" +msgstr "Гардемарин" + +#, fuzzy +msgid "Milligan Cell" +msgstr "Мисс Миллиган" + +#, fuzzy +msgid "Milligan Harp" +msgstr "Большая арфа" + +#, fuzzy +msgid "Minerva" +msgstr "Джунгли" + +#, fuzzy +msgid "Mini Traditional" +msgstr "Маджонг Mini Traditional" + +#, fuzzy +msgid "Mini-Layout" +msgstr "Маджонг Mini-Layout" + +msgid "Miss Milligan" +msgstr "Мисс Миллиган" + +msgid "Miss Muffet" +msgstr "Мисс Муффет" + +msgid "Mission Impossible" +msgstr "Миссия невыполнима" + +msgid "Mississippi" +msgstr "Миссисипи" + +msgid "Mod-3" +msgstr "" + +msgid "Monaco" +msgstr "Монако" + +msgid "Monkey" +msgstr "Обезьяна" + +msgid "Montana" +msgstr "Монтана" + +msgid "Monte Carlo" +msgstr "Монте-Карло" + +msgid "Moonlight" +msgstr "Лунный свет" + +#, fuzzy +msgid "Moosehide" +msgstr "Джозефина" + +msgid "Morehead" +msgstr "" + +msgid "Moth" +msgstr "Мотылёк" + +msgid "Mount Olympus" +msgstr "Гора Олимп" + +msgid "Mrs. Mop" +msgstr "Миссис Моп" + +msgid "Mughal Circles" +msgstr "" + +#, fuzzy +msgid "Multi X" +msgstr "Маджонг Multi X" + +msgid "Mumbai" +msgstr "Мумбаи" + +#, fuzzy +msgid "Munger" +msgstr "Джунгли" + +msgid "Musical Patience" +msgstr "Музыкальный пасьянс" + +#, fuzzy +msgid "N for Namida" +msgstr "Маджонг N for Namida" + +msgid "Napoleon" +msgstr "Наполеон" + +msgid "Napoleon at St.Helena" +msgstr "Наполеон на острове св.Елена" + +msgid "Napoleon's Exile" +msgstr "Изгнание Наполеона" + +msgid "Napoleon's Favorite" +msgstr "Фаворит Наполеона" + +#, fuzzy +msgid "Napoleon's Flank" +msgstr "Фланг Наполеона" + +msgid "Napoleon's Square" +msgstr "Квадрат Наполеона" + +msgid "Napoleon's Tomb" +msgstr "Гробница Наполеона" + +msgid "Narasimha" +msgstr "" + +#, fuzzy +msgid "Narpati" +msgstr "Ковёр" + +msgid "Nasty" +msgstr "Противный" + +msgid "Nationale" +msgstr "Национальность" + +msgid "Needle" +msgstr "Иголка" + +msgid "Neighbour" +msgstr "Соседи" + +msgid "Nestor" +msgstr "Нестор" + +msgid "New British Constitution" +msgstr "Новая Британская конституция" + +#, fuzzy +msgid "New Layout" +msgstr "Маджонг New Layout" + +msgid "New York" +msgstr "Нью-Йорк" + +msgid "Nomad" +msgstr "Бродяга" + +msgid "Nordic" +msgstr "Скандинавский" + +msgid "Northwest Territory" +msgstr "Северо-Западные Территории" + +msgid "Number Ten" +msgstr "Номер десять" + +msgid "Numerica" +msgstr "Числовой" + +#, fuzzy +msgid "Octagon" +msgstr "Дракон" + +msgid "Octave" +msgstr "Восемь" + +msgid "Odd and Even" +msgstr "Чёт и нечет" + +msgid "Odessa" +msgstr "Одесса" + +#, fuzzy +msgid "Okie's Nitemare" +msgstr "Маджонг Okie's Nitemare" + +msgid "Old Mole" +msgstr "Старая дамба" + +msgid "Oonsoo" +msgstr "" + +msgid "Oonsoo Open" +msgstr "" + +msgid "Oonsoo Strict" +msgstr "" + +msgid "Oonsoo Times Two" +msgstr "" + +msgid "Oonsoo Too" +msgstr "" + +msgid "Open Jumbo" +msgstr "Открытый гигант" + +msgid "Open Peek" +msgstr "" + +#, fuzzy +msgid "Open Spider" +msgstr "Паук" + +msgid "Opus" +msgstr "" + +msgid "Orbital" +msgstr "Орбитальный" + +msgid "Order" +msgstr "Порядок" + +msgid "Osmosis" +msgstr "Осмос" + +msgid "Owl" +msgstr "Сова" + +msgid "Ox" +msgstr "Бык" + +#, fuzzy +msgid "Pagat" +msgstr "Пагода" + +msgid "Pagoda" +msgstr "Пагода" + +msgid "Panopticon" +msgstr "Паноптикум" + +msgid "Pantheon" +msgstr "Пантеон" + +msgid "Papillon" +msgstr "Папильотка" + +msgid "Parallels" +msgstr "Параллели" + +msgid "Parashurama" +msgstr "" + +msgid "Pas Seul" +msgstr "Сольный танец" + +msgid "Pas de Deux" +msgstr "Па-де-де" + +#, fuzzy +msgid "Patriarchs" +msgstr "Матриархат" + +msgid "Pattern" +msgstr "Образец" + +msgid "Paulownia" +msgstr "" + +msgid "Peek" +msgstr "" + +msgid "Pegged" +msgstr "" + +msgid "Pegged 6x6" +msgstr "" + +msgid "Pegged 7x7" +msgstr "" + +msgid "Pegged Cross 1" +msgstr "" + +msgid "Pegged Cross 2" +msgstr "" + +msgid "Pegged Triangle 1" +msgstr "" + +msgid "Pegged Triangle 2" +msgstr "" + +msgid "Penguin" +msgstr "Пингвин" + +msgid "Peony" +msgstr "Пион" + +msgid "Perpetual Motion" +msgstr "Перпетуум-мобиле" + +msgid "Perseverance" +msgstr "Настойчивость" + +msgid "Phoenix" +msgstr "Феникс" + +msgid "Picture Gallery" +msgstr "Картинная галерея" + +#, fuzzy +msgid "Pigtail" +msgstr "Портал" + +msgid "PileOn" +msgstr "" + +msgid "Pine" +msgstr "Сосна" + +msgid "Pitchfork" +msgstr "Камертон" + +msgid "Plait" +msgstr "" + +msgid "Plus Belle" +msgstr "" + +msgid "Poker Shuffle" +msgstr "" + +#, fuzzy +msgid "Poker Square" +msgstr "Два квадрата" + +msgid "Ponytail" +msgstr "Конский хвост" + +msgid "Portal" +msgstr "Портал" + +msgid "Portuguese Solitaire" +msgstr "Португальский пасьянс" + +msgid "Progression" +msgstr "Движение" + +msgid "Provisions" +msgstr "Припасы" + +msgid "Push Pin" +msgstr "Пуш-пин" + +#, fuzzy +msgid "Puss in the Corner" +msgstr "Дом в лесу" + +msgid "Pyramid" +msgstr "Пирамида" + +msgid "Pyramid 1" +msgstr "Пирамида 1" + +msgid "Pyramid 2" +msgstr "Пирамида 2" + +#, fuzzy +msgid "Pyramid Golf" +msgstr "Пирамида 1" + +msgid "Q.C." +msgstr "" + +msgid "Quad" +msgstr "" + +msgid "Quadrangle" +msgstr "Четырёхугольник" + +msgid "Quadruple Alliance" +msgstr "" + +msgid "Queen of Italy" +msgstr "Королева Италии" + +msgid "Queenie" +msgstr "" + +msgid "Quilt" +msgstr "Одеяло" + +msgid "Rachel" +msgstr "Рашель" + +msgid "Raglan" +msgstr "Реглан" + +msgid "Rainbow" +msgstr "Радуга" + +msgid "Rainfall" +msgstr "Ливень" + +msgid "Ram" +msgstr "Овен" + +msgid "Rambling" +msgstr "Бродячий" + +#, fuzzy +msgid "Rangoon" +msgstr "Дракон" + +msgid "Rank and File" +msgstr "Ряд и шеренга" + +msgid "Rat" +msgstr "Крыса" + +msgid "Raw Prawn" +msgstr "" + +msgid "Rectangle" +msgstr "Прямоугольник" + +msgid "Red Moon" +msgstr "Красная Луна" + +msgid "Red and Black" +msgstr "Красное и Чёрное" + +msgid "Reindeer" +msgstr "Северный олень" + +msgid "Relax" +msgstr "" + +msgid "Relaxed FreeCell" +msgstr "Смягчённая Свободная ячейка" + +msgid "Relaxed Golf" +msgstr "Смягчённый Гольф" + +msgid "Relaxed Pyramid" +msgstr "Смягчённая Пирамида" + +msgid "Relaxed Seahaven Towers" +msgstr "" + +msgid "Relaxed Spider" +msgstr "Смягчённый Паук" + +msgid "Repair" +msgstr "" + +msgid "Retinue" +msgstr "Свита" + +msgid "Rings" +msgstr "Круги" + +msgid "Ripple Fan" +msgstr "Волнистый веер" + +msgid "Rittenhouse" +msgstr "Риттенхаус" + +msgid "River Bridge" +msgstr "Мост через реку" + +#, fuzzy +msgid "Robert" +msgstr "Ракета" + +msgid "Robin" +msgstr "Робин" + +msgid "Rock Hopper" +msgstr "" + +msgid "Rock Hopper 6x6" +msgstr "" + +msgid "Rock Hopper 7x7" +msgstr "" + +msgid "Rock Hopper Cross 1" +msgstr "" + +msgid "Rock Hopper Cross 2" +msgstr "" + +msgid "Rocket" +msgstr "Ракета" + +msgid "Roman Arena" +msgstr "Римская арена" + +msgid "Roost" +msgstr "Насест" + +msgid "Rooster" +msgstr "Петух" + +#, fuzzy +msgid "Roslin" +msgstr "Робин" + +msgid "Rouge et Noir" +msgstr "" + +msgid "Rows of Four" +msgstr "" + +msgid "Royal Cotillion" +msgstr "Королевский котильон" + +#, fuzzy +msgid "Royal East" +msgstr "Королевская семья" + +msgid "Royal Family" +msgstr "Королевская семья" + +msgid "Royal Marriage" +msgstr "Королевская свадьба" + +msgid "Rugby" +msgstr "Регби" + +msgid "Rushdike" +msgstr "" + +msgid "Russian Aces" +msgstr "Русские тузы" + +msgid "Russian Patience" +msgstr "Русский пасьянс" + +msgid "Russian Point" +msgstr "Русский пункт" + +msgid "Russian Solitaire" +msgstr "Русский солитер" + +msgid "Salic Law" +msgstr "Салический закон" + +msgid "Samuri" +msgstr "" + +msgid "Sanibel" +msgstr "Санибел" + +msgid "Scarab" +msgstr "Скарабей" + +msgid "Scheidungsgrund" +msgstr "" + +msgid "Scorpion" +msgstr "Скорпион" + +msgid "Scorpion Head" +msgstr "Голова скорпиона" + +msgid "Scorpion Tail" +msgstr "Хвост скорпиона" + +msgid "Scotch Patience" +msgstr "Шотландский пасьянс" + +#, fuzzy +msgid "Screw Up" +msgstr "Тузы вверх" + +msgid "Sea Towers" +msgstr "Морские башни" + +msgid "Seahaven Towers" +msgstr "" + +msgid "Senate" +msgstr "Сенат" + +msgid "Senate +" +msgstr "Сенат +" + +msgid "Serpent" +msgstr "Змея" + +msgid "Seven" +msgstr "Семёрка" + +msgid "Seven Devils" +msgstr "Семь чертей" + +msgid "Seven Pyramids" +msgstr "Семь пирамид" + +msgid "Seven by Five" +msgstr "Семь по пять" + +msgid "Seven by Four" +msgstr "Семь по четыре" + +msgid "Shamrocks" +msgstr "Трилистник" + +msgid "Shamsher" +msgstr "" + +msgid "Shanka" +msgstr "" + +#, fuzzy +msgid "Shapeshifter" +msgstr "Маджонг Shapeshifter" + +msgid "Shield" +msgstr "Щит" + +msgid "Shifting" +msgstr "" + +msgid "Shisen-Sho (No Gra) 14x6" +msgstr "" + +msgid "Shisen-Sho (No Gra) 18x8" +msgstr "" + +msgid "Shisen-Sho (No Gra) 24x12" +msgstr "" + +msgid "Shisen-Sho 14x6" +msgstr "" + +msgid "Shisen-Sho 18x8" +msgstr "" + +msgid "Shisen-Sho 24x12" +msgstr "" + +msgid "Siam" +msgstr "Сиам" + +msgid "Sieben bis As" +msgstr "" + +msgid "Simon Jester" +msgstr "Саймон Джестер" + +msgid "Simple Carlo" +msgstr "Просто-Карло" + +msgid "Simple Pairs" +msgstr "Простые пары" + +msgid "Simple Simon" +msgstr "Симон-простофиля" + +#, fuzzy +msgid "Simplex" +msgstr "Улыбка" + +msgid "Simplicity" +msgstr "Простота" + +msgid "Single Rail" +msgstr "Одинарные рельсы" + +msgid "Sir Tommy" +msgstr "Сэр Томми" + +msgid "Six Sages" +msgstr "Шесть мудрецов" + +#, fuzzy +msgid "Six Tengus" +msgstr "Шесть мудрецов" + +msgid "Sixes and Sevens" +msgstr "Шестёрки и семёрки" + +msgid "Skiz" +msgstr "" + +msgid "Small Harp" +msgstr "Малая арфа" + +msgid "Small PileOn" +msgstr "" + +msgid "Smile" +msgstr "Улыбка" + +msgid "Snake" +msgstr "Хвост" + +#, fuzzy +msgid "Snakestone" +msgstr "Хвост" + +#, fuzzy +msgid "Solid Square" +msgstr "Два квадрата" + +msgid "Somerset" +msgstr "Сомерсет" + +msgid "Space Bridge" +msgstr "Космический мост" + +msgid "Space Shuttle" +msgstr "Космический челнок" + +msgid "Spaces" +msgstr "Промежутки" + +msgid "Spaces and Aces" +msgstr "Промежутки и тузы" + +msgid "Spanish Patience" +msgstr "Испанский пасьянс" + +msgid "Sphere" +msgstr "Сфера" + +msgid "Spider" +msgstr "Паук" + +msgid "Spider (1 suit)" +msgstr "Паук (1 масть)" + +msgid "Spider (2 suits)" +msgstr "Паук (2 масти)" + +#, fuzzy +msgid "Spider (4 decks)" +msgstr "Паук (1 масть)" + +#, fuzzy +msgid "Spider 3x3" +msgstr "Паук" + +msgid "Spider Web" +msgstr "Паутина" + +#, fuzzy +msgid "Spidercells" +msgstr "Паук" + +msgid "Spiderette" +msgstr "Паучок" + +#, fuzzy +msgid "Spidike" +msgstr "Паук" + +#, fuzzy +msgid "Squadron" +msgstr "Квадрат" + +msgid "Square" +msgstr "Квадрат" + +msgid "Squares" +msgstr "Квадраты" + +#, fuzzy +msgid "Squaring" +msgstr "Квадрат" + +msgid "St. Helena" +msgstr "Св. Елена" + +#, fuzzy +msgid "Stage 1" +msgstr "Звёздные врата" + +#, fuzzy +msgid "Stage 2" +msgstr "Ступени 2" + +msgid "Stairs" +msgstr "Ступени" + +msgid "Stairs 2" +msgstr "Ступени 2" + +msgid "Stairs 3" +msgstr "Ступени 3" + +msgid "Stalactites" +msgstr "Сталактиты" + +msgid "Star Ship" +msgstr "Космический корабль" + +msgid "Stargate" +msgstr "Звёздные врата" + +#, fuzzy +msgid "Step Pyramid" +msgstr "Семь пирамид" + +#, fuzzy +msgid "Steps" +msgstr "Улицы" + +msgid "Stonehenge" +msgstr "Стоунхендж" + +msgid "Stonewall" +msgstr "Оппозиция" + +msgid "Storehouse" +msgstr "Сокровищница" + +msgid "Straight Up" +msgstr "" + +msgid "Strategy" +msgstr "Стратегия" + +msgid "Streets" +msgstr "Улицы" + +msgid "Streets and Alleys" +msgstr "Улицы и аллеи" + +msgid "Stronghold" +msgstr "Цитадель" + +msgid "Sukis" +msgstr "" + +msgid "Sultan" +msgstr "Султан" + +msgid "Sultan +" +msgstr "Султан +" + +msgid "Sultan of Turkey" +msgstr "Турецкий султан" + +#, fuzzy +msgid "Sumo" +msgstr "Гигант" + +#, fuzzy +msgid "SunMoon" +msgstr "Голубая луна" + +msgid "Super Challenge FreeCell" +msgstr "Очень Сложная Свободная ячейка" + +#, fuzzy +msgid "Super Flower Garden" +msgstr "Цветочный сад" + +msgid "Super Samuri" +msgstr "" + +#, fuzzy +msgid "Superior Canfield" +msgstr "Двойной Кенфилд" + +#, fuzzy +msgid "Surprise" +msgstr "Предприятие" + +msgid "Surukh" +msgstr "" + +msgid "Taipei" +msgstr "Тайпей" + +msgid "Take Away" +msgstr "Удаление" + +msgid "Tam O'Shanter" +msgstr "" + +msgid "Tarantula" +msgstr "Тарантул" + +msgid "Temple" +msgstr "Храм" + +msgid "Temple 1" +msgstr "Храм 1" + +msgid "Temple 2" +msgstr "Храм 2" + +msgid "Ten Across" +msgstr "Десять в ширину" + +msgid "Ten Avatars" +msgstr "Десять аватар" + +msgid "Ten by One" +msgstr "Десять по одному" + +msgid "Terrace" +msgstr "Терраса" + +msgid "The Bouquet" +msgstr "Букет" + +msgid "The Door" +msgstr "Дверь" + +msgid "The Familiar" +msgstr "Близкий" + +msgid "The Garden" +msgstr "Сад" + +msgid "The Great Wall" +msgstr "Великая Стена" + +msgid "The Wish" +msgstr "Желание" + +msgid "The Wish (open)" +msgstr "Желание (открытое)" + +msgid "The last Monarch" +msgstr "Последний Монарх" + +msgid "Theater" +msgstr "Театр" + +msgid "Thirteen Up" +msgstr "Тринадцать вверх" + +msgid "Thirty Six" +msgstr "Тридцать шесть" + +msgid "Three Blind Mice" +msgstr "Три слепые мышки" + +msgid "Three Peaks" +msgstr "Три вершины" + +msgid "Three Peaks Non-scoring" +msgstr "Три вершины без подсчёта очков" + +msgid "Three Shuffles and a Draw" +msgstr "" + +msgid "Thumb and Pouch" +msgstr "" + +msgid "Tiger" +msgstr "Тигр" + +#, fuzzy +msgid "Tile Fighter" +msgstr "Маджонг Tile Fighter" + +#, fuzzy +msgid "Tilepiles" +msgstr "Маджонг Tilepiles" + +#, fuzzy +msgid "Time Tunnel" +msgstr "Маджонг Time Tunnel" + +#, fuzzy +msgid "Tipati" +msgstr "Тайпей" + +msgid "Toad" +msgstr "Жаба" + +msgid "Tomb" +msgstr "Гробница" + +#, fuzzy +msgid "Totally Random-Made" +msgstr "Маджонг Totally Random-Made" + +msgid "Tournament" +msgstr "Турнир" + +msgid "Tower of Hanoy" +msgstr "Ханойская башня" + +msgid "Towers" +msgstr "Башни" + +#, fuzzy +msgid "Traditional Reviewed" +msgstr "Маджонг Traditional Reviewed" + +msgid "Treasure Trove" +msgstr "Клад" + +msgid "Tree of Life" +msgstr "Древо жизни" + +msgid "Trefoil" +msgstr "Клевер" + +#, fuzzy +msgid "Tri Peaks" +msgstr "Три вершины" + +msgid "Trika" +msgstr "" + +msgid "Trillium" +msgstr "" + +msgid "Triple Canfield" +msgstr "Тройной Кенфилд" + +msgid "Triple Easthaven" +msgstr "" + +msgid "Triple FreeCell" +msgstr "Тройная Свободная ячейка" + +msgid "Triple Klondike" +msgstr "Тройной Клондайк" + +msgid "Triple Klondike by Threes" +msgstr "Тройной Клондайк по три" + +#, fuzzy +msgid "Triple Line" +msgstr "Тройной Юкон" + +#, fuzzy +msgid "Triple York" +msgstr "Тройной Юкон" + +msgid "Triple Yukon" +msgstr "Тройной Юкон" + +msgid "Twenty" +msgstr "" + +msgid "Twin" +msgstr "" + +msgid "Twin Picks" +msgstr "" + +#, fuzzy +msgid "Twin Temples" +msgstr "Маджонг Twin Temples" + +#, fuzzy +msgid "Two Domes" +msgstr "Маджонг Two Domes" + +msgid "Two Familiars" +msgstr "" + +msgid "Two Squares" +msgstr "Два квадрата" + +#, fuzzy +msgid "Union Square" +msgstr "Два квадрата" + +msgid "Vagues" +msgstr "" + +msgid "Vajra" +msgstr "" + +msgid "Vamana" +msgstr "" + +#, fuzzy +msgid "Varaha" +msgstr "Марта" + +msgid "Variegated Canfield" +msgstr "Пёстрый Кенфилд" + +#, fuzzy +msgid "Vegas Klondike" +msgstr "Казино Клондайк" + +msgid "Vertical" +msgstr "Вертикаль" + +msgid "Vi" +msgstr "" + +#, fuzzy +msgid "Victory Arrow" +msgstr "Маджонг Victory Arrow" + +msgid "Wall" +msgstr "Стена" + +msgid "Waning Moon" +msgstr "Луна на ущербе" + +msgid "Washington's Favorite" +msgstr "Фаворит Вашингтона" + +msgid "Wasp" +msgstr "Оса" + +msgid "Wave Motion" +msgstr "Волновое движение" + +msgid "Wavelets" +msgstr "Волны" + +msgid "Weddings" +msgstr "Свадьбы" + +msgid "Wedges" +msgstr "Клинья" + +#, fuzzy +msgid "Well" +msgstr "Стена" + +#, fuzzy +msgid "Well2" +msgstr "Стена" + +msgid "Westcliff" +msgstr "" + +msgid "Westhaven" +msgstr "" + +msgid "Whatever" +msgstr "Нечто" + +msgid "Wheel of Fortune" +msgstr "Колесо фортуны" + +msgid "Whitehead" +msgstr "" + +msgid "Wicked" +msgstr "Злой" + +msgid "Will o' the Wisp" +msgstr "" + +msgid "Win" +msgstr "" + +msgid "Windmill" +msgstr "Ветряная мельница" + +msgid "Wisteria" +msgstr "Глициния" + +#, fuzzy +msgid "X-Files" +msgstr "Маджонг X-Files" + +#, fuzzy +msgid "X-Shape" +msgstr "Маджонг X-Shape" + +#, fuzzy +msgid "York" +msgstr "Нью-Йорк" + +msgid "Yukon" +msgstr "Юкон" + +msgid "Yummy" +msgstr "Приятный" + +msgid "Zebra" +msgstr "Зебра" + +msgid "Zerline" +msgstr "Церлин" + +msgid "Zerline (3 decks)" +msgstr "Церлин (3 колоды)" + +msgid "Zeus" +msgstr "Зевс" diff --git a/po/ru_pysol.po b/po/ru_pysol.po new file mode 100644 index 00000000..6cbde4ce --- /dev/null +++ b/po/ru_pysol.po @@ -0,0 +1,3005 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PySol 0.0.1\n" +"POT-Creation-Date: Fri May 26 20:25:31 2006\n" +"PO-Revision-Date: 2006-05-13 00:53+0400\n" +"Last-Translator: Скоморох \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: utf-8\n" +"Generated-By: pygettext.py 1.5\n" + +#: pysollib/actions.py:345 pysollib/game.py:1205 pysollib/game.py:1220 +#: pysollib/game.py:1226 pysollib/game.py:1231 pysollib/tk/toolbar.py:183 +msgid "New game" +msgstr "Новая игра" + +#: pysollib/actions.py:358 pysollib/tk/menubar.py:668 +#: pysollib/tk/menubar.py:682 +msgid "Select game" +msgstr "Выбрать игру" + +#: pysollib/actions.py:381 +msgid "Invalid game number" +msgstr "Неправильный номер игры" + +#: pysollib/actions.py:382 +msgid "Invalid game number\n" +msgstr "Неправильный номер игры\n" + +#: pysollib/actions.py:399 +msgid "Select next game number" +msgstr "Выберите номер следующей игры" + +#: pysollib/actions.py:408 pysollib/actions.py:418 +msgid "Select new game number" +msgstr "Выберите номер новой игры" + +#: pysollib/actions.py:409 +msgid "" +"\n" +"\n" +"Enter new game number" +msgstr "" +"\n" +"\n" +"Введите номер новой игры" + +#: pysollib/actions.py:410 +msgid "Next number" +msgstr "Следующий номер" + +#: pysollib/actions.py:410 pysollib/app.py:1085 pysollib/app.py:1097 +#: pysollib/game.py:828 pysollib/game.py:1641 pysollib/main.py:399 +#: pysollib/main.py:404 pysollib/tk/colorsdialog.py:131 +#: pysollib/tk/demooptionsdialog.py:87 pysollib/tk/edittextdialog.py:82 +#: pysollib/tk/edittextdialog.py:94 pysollib/tk/fontsdialog.py:140 +#: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:133 +#: pysollib/tk/playeroptionsdialog.py:86 +#: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 +#: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 +#: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:158 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:506 +#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 +#: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 +#: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:776 +#: pysollib/tk/tkstats.py:860 pysollib/tk/tkwidget.py:158 +#: pysollib/tk/tkwidget.py:297 +msgid "OK" +msgstr "ОК" + +#: pysollib/actions.py:410 pysollib/app.py:1097 pysollib/game.py:828 +#: pysollib/game.py:1205 pysollib/game.py:1220 pysollib/game.py:1226 +#: pysollib/game.py:1231 pysollib/tk/colorsdialog.py:131 +#: pysollib/tk/demooptionsdialog.py:87 pysollib/tk/edittextdialog.py:94 +#: pysollib/tk/fontsdialog.py:140 pysollib/tk/fontsdialog.py:204 +#: pysollib/tk/menubar.py:855 pysollib/tk/menubar.py:857 +#: pysollib/tk/playeroptionsdialog.py:86 +#: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 +#: pysollib/tk/selectgame.py:268 pysollib/tk/selectgame.py:409 +#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:106 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:297 +msgid "Cancel" +msgstr "Отмена" + +#: pysollib/actions.py:426 +msgid "Select random game" +msgstr "Выбор случайной игры" + +#: pysollib/actions.py:462 +msgid "Select next game" +msgstr "Выбрать следующую игру" + +#: pysollib/actions.py:495 pysollib/tk/toolbar.py:197 +msgid "Quit " +msgstr "Выйти из " + +#: pysollib/actions.py:545 +msgid "Clear bookmarks" +msgstr "Удалить закладки" + +#: pysollib/actions.py:546 +msgid "Clear all bookmarks ?" +msgstr "Удалить все закладки?" + +#: pysollib/actions.py:556 +msgid "Restart game" +msgstr "Начать игру с начала" + +#: pysollib/actions.py:557 +msgid "Restart this game ?" +msgstr "Начать игру с начала?" + +#: pysollib/actions.py:594 +msgid "" +"Comments for %s:\n" +"\n" +msgstr "" +"Комментарий для %s:\n" +"\n" + +#: pysollib/actions.py:596 +msgid "Comments for " +msgstr "Комментарий для " + +#: pysollib/actions.py:614 pysollib/actions.py:650 +msgid "Error while writing to file" +msgstr "Ошибка при записи в файл" + +#: pysollib/actions.py:617 pysollib/actions.py:653 pysollib/actions.py:956 +msgid " Info" +msgstr " Информация" + +#: pysollib/actions.py:618 +msgid "" +"Comments were appended to\n" +"\n" +msgstr "" +"Комментарий добавлен в файл\n" +"\n" + +#: pysollib/actions.py:635 +msgid "Demo statistics" +msgstr "Статистика демо" + +#: pysollib/actions.py:638 +msgid "Your statistics" +msgstr "Ваша статистика" + +#: pysollib/actions.py:654 +msgid "" +" were appended to\n" +"\n" +msgstr "" +" добавлена в файл\n" +"\n" + +#: pysollib/actions.py:668 +msgid " Demo" +msgstr " Демо" + +#: pysollib/actions.py:668 +msgid " Demo " +msgstr " Демо " + +#: pysollib/actions.py:671 pysollib/actions.py:689 +msgid " for " +msgstr " для " + +#: pysollib/actions.py:677 pysollib/actions.py:696 +msgid "Statistics for " +msgstr "Статистика игры " + +#: pysollib/actions.py:680 pysollib/tk/selectgame.py:352 +#: pysollib/tk/toolbar.py:194 +msgid "Statistics" +msgstr "Статистика" + +#: pysollib/actions.py:683 +msgid "Full log" +msgstr "Полный лог" + +#: pysollib/actions.py:686 +msgid "Session log" +msgstr "Лог сессии" + +#: pysollib/actions.py:692 +msgid "Game Info" +msgstr "Информация об игре" + +#: pysollib/actions.py:701 +msgid "Full log for " +msgstr "Полный лог для " + +#: pysollib/actions.py:706 +msgid "Session log for " +msgstr "Лог сессии для " + +#: pysollib/actions.py:711 +msgid "Reset all statistics" +msgstr "Очистить всю статистику" + +#: pysollib/actions.py:712 +msgid "" +"Reset ALL statistics and logs for player\n" +"%s ?" +msgstr "" +"Очистить всю статистику и лог для игрока\n" +"%s?" + +#: pysollib/actions.py:718 +msgid "Reset game statistics" +msgstr "Очистить статистику игры" + +#: pysollib/actions.py:719 +msgid "" +"Reset statistics and logs for player\n" +"%s\n" +"and game\n" +"%s ?" +msgstr "" +"Очистить всю статистику и лог для игрока\n" +"%s\n" +"и игры\n" +"%s?" + +#: pysollib/actions.py:775 +msgid "Play demo" +msgstr "Показать демо" + +#: pysollib/actions.py:786 +msgid "Set player options" +msgstr "Установить настройки игрока" + +#: pysollib/actions.py:875 +msgid "Sound settings" +msgstr "Настройка звука" + +#: pysollib/actions.py:896 +msgid "Set demo options" +msgstr "Настройка демо" + +#: pysollib/actions.py:910 +msgid "Set colors" +msgstr "Настроить цвета" + +#: pysollib/actions.py:929 +msgid "Set fonts" +msgstr "Настроить шрифт" + +#: pysollib/actions.py:938 +msgid "Set timeouts" +msgstr "Настроить таймауты" + +#: pysollib/actions.py:953 +msgid "Error while saving options" +msgstr "Ошибка при сохранении настроек" + +#: pysollib/actions.py:957 +msgid "" +"Options were saved to\n" +"\n" +msgstr "" +"Опции сохранены в\n" +"\n" + +#: pysollib/app.py:85 +msgid "Unknown" +msgstr "Неизвестный" + +#: pysollib/app.py:947 +msgid "Loading %s %s..." +msgstr "Загружается %s %s..." + +#: pysollib/app.py:982 +msgid " load error" +msgstr " ошибка при загрузке" + +#: pysollib/app.py:983 +msgid "Error while loading " +msgstr "Ошибка при загрузке" + +#: pysollib/app.py:1077 +msgid "Incompatible " +msgstr "Несовместимый " + +#: pysollib/app.py:1079 +msgid "" +"The currently selected %s %s\n" +"is not compatible with the game\n" +"%s\n" +"\n" +"Please select a %s type %s.\n" +msgstr "" +"Текущий %s %s\n" +"несовместим с игрой\n" +"%s\n" +"\n" +"Необходимо выбрать %s типа %s.\n" + +#: pysollib/app.py:1095 +msgid "Please select a %s type %s" +msgstr "Выберите %s типа %s" + +#: pysollib/game.py:750 pysollib/game.py:756 +msgid "Player\n" +msgstr "Игрок\n" + +#: pysollib/game.py:824 +msgid "Discard current game ?" +msgstr "Завершить текущую игру?" + +#: pysollib/game.py:1159 +msgid "" +"\n" +"You have reached\n" +"#%d in the %s of playing time" +msgstr "" +"\n" +"Вы достигли\n" +"#%d в %s игрового времени" + +#: pysollib/game.py:1162 +msgid "" +"\n" +"and #%d in the %s of moves" +msgstr "" +"\n" +"и #%d в %s количества ходов" + +#: pysollib/game.py:1164 +msgid "" +"\n" +"You have reached\n" +"#%d in the %s of moves" +msgstr "" +"\n" +"Вы достигли\n" +"#%d в %s количества ходов" + +#: pysollib/game.py:1167 +msgid "" +"\n" +"and #%d in the %s of total moves" +msgstr "" +"\n" +"и #%d в %s общего количества ходов" + +#: pysollib/game.py:1169 +msgid "" +"\n" +"You have reached\n" +"#%d in the %s of total moves" +msgstr "" +"\n" +"Вы достигли\n" +"#%d в %s общего количества ходов" + +#: pysollib/game.py:1196 pysollib/game.py:1212 +msgid "Game won" +msgstr "Игра выиграна" + +#: pysollib/game.py:1197 +msgid "" +"\n" +"Congratulations, this\n" +"was a truly perfect game !\n" +"\n" +"Your playing time is %s\n" +"for %d moves.\n" +"%s\n" +msgstr "" +"\n" +"Поздравляем!\n" +"Это была действительно\n" +"великолепная игра!\n" +"\n" +"Ваше игровое время: %s\n" +"Количество ходов: %s\n" +"%s\n" + +#: pysollib/game.py:1213 +msgid "" +"\n" +"Congratulations, you did it !\n" +"\n" +"Your playing time is %s\n" +"for %d moves.\n" +"%s\n" +msgstr "" +"\n" +"Поздравляем!\n" +"Вы сделали это!\n" +"\n" +"Ваше игровое время: %s\n" +"Количество ходов: %s\n" +"%s\n" + +#: pysollib/game.py:1224 pysollib/game.py:1229 +msgid "Game finished" +msgstr "Игра закончена" + +#: pysollib/game.py:1225 pysollib/game.py:1642 +msgid "" +"\n" +"Game finished\n" +msgstr "" +"\n" +"Игра закончена\n" + +#: pysollib/game.py:1230 +msgid "" +"\n" +"Game finished, but not without my help...\n" +msgstr "" +"\n" +"Игра закончена, но не без моей помощи...\n" + +#: pysollib/game.py:1231 pysollib/tk/toolbar.py:184 +msgid "Restart" +msgstr "Начало" + +#: pysollib/game.py:1535 +msgid "Score %6d" +msgstr "Счет %6d" + +#: pysollib/game.py:1634 +msgid "Cool" +msgstr "Отлично" + +#: pysollib/game.py:1634 +msgid "Great" +msgstr "Эдорово" + +#: pysollib/game.py:1634 +msgid "Wow" +msgstr "Ура" + +#: pysollib/game.py:1634 +msgid "Yeah" +msgstr "Ага" + +#: pysollib/game.py:1635 pysollib/game.py:1645 pysollib/game.py:1657 +msgid " Autopilot" +msgstr " Автопилот" + +#: pysollib/game.py:1636 +msgid "" +"\n" +"Game solved in %d moves.\n" +msgstr "" +"\n" +"Игра решена за %d ходов\n" + +#: pysollib/game.py:1656 +msgid "Hmm" +msgstr "Хмм" + +#: pysollib/game.py:1656 +msgid "Oh well" +msgstr "Ох" + +#: pysollib/game.py:1656 +msgid "That's life" +msgstr "Такова жизнь" + +#: pysollib/game.py:1658 +msgid "" +"\n" +"This won't come out...\n" +msgstr "" +"\n" +"Не удалось...\n" + +#: pysollib/game.py:2062 +msgid "Set bookmark" +msgstr "Установить закладку" + +#: pysollib/game.py:2063 +msgid "Replace existing bookmark %d ?" +msgstr "Заменить существующую закладку %d ?" + +#: pysollib/game.py:2085 +msgid "Goto bookmark" +msgstr "Перейти к закладке" + +#: pysollib/game.py:2086 +msgid "Goto bookmark %d ?" +msgstr "Перейти к закладке %d ?" + +#: pysollib/game.py:2117 +msgid "Open game" +msgstr "Открыть игру" + +#: pysollib/game.py:2128 pysollib/game.py:2137 pysollib/game.py:2142 +msgid "Load game error" +msgstr "Ошибка при загрузке игры" + +#: pysollib/game.py:2129 +msgid "" +"Error while loading game.\n" +"\n" +"Probably the game file is damaged,\n" +"but this could also be a bug you might want to report." +msgstr "" + +#: pysollib/game.py:2138 +msgid "Error while loading game" +msgstr "Ошибка при загрузке игры" + +#: pysollib/game.py:2143 +msgid "" +"Internal error while loading game.\n" +"\n" +"Please report this bug." +msgstr "" +"Внутренняя ошибка при загрузке игры.\n" +"\n" +"Пожалуйста сообщите об этой ошибке." + +#: pysollib/game.py:2168 +msgid "Save game error" +msgstr "Ошибка при сохранении игры" + +#: pysollib/game.py:2169 +msgid "Error while saving game" +msgstr "Ошибка при сохранении игры" + +#: pysollib/gamedb.py:113 +msgid "Baker's Dozen" +msgstr "" + +#: pysollib/gamedb.py:114 +msgid "Beleaguered Castle" +msgstr "" + +#: pysollib/gamedb.py:115 +msgid "Canfield" +msgstr "" + +#: pysollib/gamedb.py:116 +msgid "Fan" +msgstr "" + +#: pysollib/gamedb.py:117 +msgid "Forty Thieves" +msgstr "" + +#: pysollib/gamedb.py:118 +msgid "FreeCell" +msgstr "" + +#: pysollib/gamedb.py:119 +msgid "Golf" +msgstr "" + +#: pysollib/gamedb.py:120 +msgid "Gypsy" +msgstr "" + +#: pysollib/gamedb.py:121 +msgid "Klondike" +msgstr "" + +#: pysollib/gamedb.py:122 +msgid "Montana" +msgstr "" + +#: pysollib/gamedb.py:123 +msgid "Napoleon" +msgstr "" + +#: pysollib/gamedb.py:124 +msgid "Numerica" +msgstr "" + +#: pysollib/gamedb.py:125 +msgid "Pairing" +msgstr "" + +#: pysollib/gamedb.py:126 +msgid "Raglan" +msgstr "" + +#: pysollib/gamedb.py:127 pysollib/gamedb.py:160 +msgid "Simple games" +msgstr "Простые игры" + +#: pysollib/gamedb.py:128 +msgid "Spider" +msgstr "" + +#: pysollib/gamedb.py:129 +msgid "Terrace" +msgstr "" + +#: pysollib/gamedb.py:130 +msgid "Yukon" +msgstr "" + +#: pysollib/gamedb.py:131 pysollib/gamedb.py:164 +msgid "One-Deck games" +msgstr "Игры с одной колодой" + +#: pysollib/gamedb.py:132 pysollib/gamedb.py:165 +msgid "Two-Deck games" +msgstr "Игры с двумя колодами" + +#: pysollib/gamedb.py:133 pysollib/gamedb.py:166 +msgid "Three-Deck games" +msgstr "Игры с тремя колодами" + +#: pysollib/gamedb.py:134 pysollib/gamedb.py:167 +msgid "Four-Deck games" +msgstr "Игры с четырьмя колодами" + +#: pysollib/gamedb.py:146 +msgid "Baker's Dozen type" +msgstr "Игры типа Чёртова Дюжина (Baker's Dozen)" + +#: pysollib/gamedb.py:147 +msgid "Beleaguered Castle type" +msgstr "Игры типа Осаждённый Замок (Beleaguered Castle)" + +#: pysollib/gamedb.py:148 +msgid "Canfield type" +msgstr "Игры типа Кенфилд (Canfield)" + +#: pysollib/gamedb.py:149 +msgid "Fan type" +msgstr "Игры типа Веер (Fan)" + +#: pysollib/gamedb.py:150 +msgid "Forty Thieves type" +msgstr "Игры типа Сорок Воров (Forty Thieves)" + +#: pysollib/gamedb.py:151 +msgid "FreeCell type" +msgstr "Игры типа Свободная Ячейка (FreeCell)" + +#: pysollib/gamedb.py:152 +msgid "Golf type" +msgstr "Игры типа Гольф (Golf)" + +#: pysollib/gamedb.py:153 +msgid "Gypsy type" +msgstr "Игры типа Цыганский Пасьянс (Gypsy)" + +#: pysollib/gamedb.py:154 +msgid "Klondike type" +msgstr "Игры типа Клондайк (Klondike)" + +#: pysollib/gamedb.py:155 +msgid "Montana type" +msgstr "Игры типа Монтана (Montana)" + +#: pysollib/gamedb.py:156 +msgid "Napoleon type" +msgstr "Игры типа Наполеон (Napoleon)" + +#: pysollib/gamedb.py:157 +msgid "Numerica type" +msgstr "Игры числового типа (Numerica)" + +#: pysollib/gamedb.py:158 +msgid "Pairing type" +msgstr "Парные игры" + +#: pysollib/gamedb.py:159 +msgid "Raglan type" +msgstr "Игры типа Реглан (Raglan)" + +#: pysollib/gamedb.py:161 +msgid "Spider type" +msgstr "Игры типа Паук (Spider)" + +#: pysollib/gamedb.py:162 +msgid "Terrace type" +msgstr "Игры типа Терраса (Terrace)" + +#: pysollib/gamedb.py:163 +msgid "Yukon type" +msgstr "Игры типа Юкон (Yukon)" + +#: pysollib/gamedb.py:188 pysollib/gamedb.py:196 +msgid "French type" +msgstr "Классические" + +#: pysollib/gamedb.py:189 pysollib/gamedb.py:197 pysollib/gamedb.py:206 +msgid "Ganjifa type" +msgstr "Игры типа Ганджифа (Ganjifa)" + +#: pysollib/gamedb.py:190 pysollib/gamedb.py:198 pysollib/gamedb.py:207 +msgid "Hanafuda type" +msgstr "Игры типа Ханафуда (Hanafuda)" + +#: pysollib/gamedb.py:191 pysollib/gamedb.py:199 pysollib/gamedb.py:214 +msgid "Hex A Deck type" +msgstr "Игры типа Hex A Deck" + +#: pysollib/gamedb.py:192 pysollib/gamedb.py:200 pysollib/gamedb.py:219 +msgid "Tarock type" +msgstr "Таро" + +#: pysollib/gamedb.py:205 +msgid "Dashavatara Ganjifa type" +msgstr "Игры типа Дашаватара Ганджифа (Dashavatara Ganjifa)" + +#: pysollib/gamedb.py:208 +msgid "Mughal Ganjifa type" +msgstr "Игры типа Мугал Ганджифа (Mughal Ganjifa)" + +#: pysollib/gamedb.py:209 +msgid "Navagraha Ganjifa type" +msgstr "Игры типа Наваграха Ганджифа (Navagraha Ganjifa)" + +#: pysollib/gamedb.py:213 +msgid "Shisen-Sho" +msgstr "" + +#: pysollib/gamedb.py:215 +msgid "Matrix type" +msgstr "Мозаика" + +#: pysollib/gamedb.py:216 +msgid "Memory type" +msgstr "Игры на запоминание" + +#: pysollib/gamedb.py:217 +msgid "Poker type" +msgstr "Покер" + +#: pysollib/gamedb.py:218 +msgid "Puzzle type" +msgstr "Пазлы" + +#: pysollib/games/auldlangsyne.py:142 pysollib/games/calculation.py:101 +#: pysollib/games/numerica.py:90 pysollib/games/numerica.py:197 +msgid "Row. Build regardless of rank and suit." +msgstr "" + +#: pysollib/games/braid.py:250 pysollib/games/napoleon.py:190 +#: pysollib/games/ultra/dashavatara.py:959 +#: pysollib/games/ultra/hanafuda1.py:256 pysollib/games/ultra/hexadeck.py:1190 +#: pysollib/games/ultra/mughal.py:802 +msgid " Ascending" +msgstr " вверх" + +#: pysollib/games/braid.py:252 pysollib/games/napoleon.py:192 +#: pysollib/games/ultra/dashavatara.py:961 +#: pysollib/games/ultra/hanafuda1.py:258 pysollib/games/ultra/hexadeck.py:1192 +#: pysollib/games/ultra/mughal.py:804 +msgid " Descending" +msgstr " вниз" + +#: pysollib/games/calculation.py:135 pysollib/games/calculation.py:230 +msgid "" +"1: 2 3 4 5 6 7 8 9 T J Q K\n" +"2: 4 6 8 T Q A 3 5 7 9 J K\n" +"3: 6 9 Q 2 5 8 J A 4 7 T K\n" +"4: 8 Q 3 7 J 2 6 T A 5 9 K" +msgstr "" +"1: 2 3 4 5 6 7 8 9 10 В Д К\n" +"2: 4 6 8 10 Д Т 3 5 7 9 В К\n" +"3: 6 9 Д 2 5 8 В Т 4 7 10 К\n" +"4: 8 Д 3 7 В 2 6 10 Т 5 9 К" + +#: pysollib/games/curdsandwhey.py:58 +msgid "Row. Build down by suit or of the same rank." +msgstr "" + +#: pysollib/games/fan.py:279 +msgid "Draw" +msgstr "Снять" + +#: pysollib/games/fan.py:279 +msgid "X" +msgstr "Х" + +#: pysollib/games/fortythieves.py:393 pysollib/games/klondike.py:148 +msgid "Row. Build down in any suit but the same." +msgstr "" + +#: pysollib/games/golf.py:114 pysollib/games/golf.py:413 +#: pysollib/stack.py:1740 +msgid "Row. No building." +msgstr "" + +#: pysollib/games/golf.py:381 +msgid "Balance $%4d" +msgstr "Баланс $%4d" + +#: pysollib/games/golf.py:497 pysollib/stack.py:1673 +msgid "Foundation. Build up regardless of suit." +msgstr "" + +#: pysollib/games/klondike.py:115 +msgid "Balance $%d" +msgstr "Баланс $%d" + +#: pysollib/games/klondike.py:387 +msgid "Reserve. Only Kings are acceptable." +msgstr "" + +#: pysollib/games/matriarchy.py:125 +msgid "Round %d/%d" +msgstr "Раунд %d/%d" + +#: pysollib/games/matriarchy.py:127 +msgid "Deal %d" +msgstr "Сдача %d" + +#: pysollib/games/numerica.py:184 +msgid "Foundation. Build up by color." +msgstr "" + +#: pysollib/games/poker.py:82 +msgid "" +"Royal Flush\n" +"Straight Flush\n" +"Four of a Kind\n" +"Full House\n" +"Flush\n" +"Straight\n" +"Three of a Kind\n" +"Two Pair\n" +"One Pair" +msgstr "" +"Флешь Ройал\n" +"Флешь Стрит\n" +"Четыре одинаковых\n" +"Полный дом\n" +"Флешь\n" +"Стрит\n" +"Три одинаковых\n" +"Две пары\n" +"Пара" + +#: pysollib/games/poker.py:189 pysollib/games/special/memory.py:181 +msgid "" +"WON\n" +"\n" +msgstr "" +"Выигрыш\n" +"\n" + +#: pysollib/games/poker.py:191 pysollib/games/special/memory.py:178 +msgid "Points: %d" +msgstr "Очков: %d" + +#: pysollib/games/poker.py:193 pysollib/games/special/memory.py:182 +msgid "Total: %d" +msgstr "Всего: %d" + +#: pysollib/games/special/tarock.py:222 +msgid "Coin" +msgstr "Монеты" + +#: pysollib/games/special/tarock.py:222 +msgid "Cup" +msgstr "Чаши" + +#: pysollib/games/special/tarock.py:222 +msgid "Sword" +msgstr "Мечи" + +#: pysollib/games/special/tarock.py:222 +msgid "Trump" +msgstr "Козырь" + +#: pysollib/games/special/tarock.py:222 +msgid "Wand" +msgstr "Жезлы" + +#: pysollib/games/special/tarock.py:223 +#: pysollib/games/ultra/dashavatara.py:351 +#: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 +#: pysollib/stack.py:1190 pysollib/util.py:80 +msgid "Ace" +msgstr "Туз" + +#: pysollib/games/special/tarock.py:224 +msgid "Page" +msgstr "Паж" + +#: pysollib/games/special/tarock.py:224 +msgid "Valet" +msgstr "Валет" + +#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1188 +#: pysollib/util.py:81 +msgid "Queen" +msgstr "Королева" + +#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1189 +#: pysollib/util.py:81 +msgid "King" +msgstr "Король" + +#: pysollib/games/ultra/dashavatara.py:349 +msgid "Boar" +msgstr "Боров" + +#: pysollib/games/ultra/dashavatara.py:349 +msgid "Dwarf" +msgstr "Гном" + +#: pysollib/games/ultra/dashavatara.py:349 +msgid "Fish" +msgstr "Рыба" + +#: pysollib/games/ultra/dashavatara.py:349 +msgid "Lion" +msgstr "Лев" + +#: pysollib/games/ultra/dashavatara.py:349 +msgid "Tortoise" +msgstr "Черепаха" + +#: pysollib/games/ultra/dashavatara.py:350 +msgid "Arrow" +msgstr "Стрела" + +#: pysollib/games/ultra/dashavatara.py:350 +msgid "Axe" +msgstr "Топор" + +#: pysollib/games/ultra/dashavatara.py:350 +msgid "Horse" +msgstr "Конь" + +#: pysollib/games/ultra/dashavatara.py:350 +msgid "Lotus" +msgstr "Лотос" + +#: pysollib/games/ultra/dashavatara.py:350 +msgid "Plow" +msgstr "Плуг" + +#: pysollib/games/ultra/dashavatara.py:352 pysollib/games/ultra/mughal.py:255 +msgid "Pradhan" +msgstr "Прадхана" + +#: pysollib/games/ultra/dashavatara.py:352 pysollib/games/ultra/mughal.py:255 +msgid "Raja" +msgstr "Раджа" + +#: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 +msgid "Black" +msgstr "Черный" + +#: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 +msgid "Brown" +msgstr "Коричневый" + +#: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 +msgid "Red" +msgstr "Красный" + +#: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 +msgid "Yellow" +msgstr "Желтый" + +#: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:257 +#: pysollib/tk/selecttile.py:86 +msgid "Green" +msgstr "Зеленый" + +#: pysollib/games/ultra/dashavatara.py:354 +msgid "Crimson" +msgstr "Темно-красный" + +#: pysollib/games/ultra/dashavatara.py:354 +msgid "White" +msgstr "Белый" + +#: pysollib/games/ultra/dashavatara.py:354 pysollib/games/ultra/mughal.py:257 +msgid "Grey" +msgstr "Серый" + +#: pysollib/games/ultra/dashavatara.py:354 pysollib/games/ultra/mughal.py:257 +#: pysollib/tk/selecttile.py:89 +msgid "Orange" +msgstr "Оранжевый" + +#: pysollib/games/ultra/dashavatara.py:354 pysollib/tk/selecttile.py:88 +msgid "Olive" +msgstr "Оливковый" + +#: pysollib/games/ultra/dashavatara.py:355 pysollib/games/ultra/mughal.py:258 +msgid "Strong" +msgstr "Сильный" + +#: pysollib/games/ultra/dashavatara.py:355 pysollib/games/ultra/mughal.py:258 +msgid "Weak" +msgstr "Слабый" + +#: pysollib/games/ultra/hanafuda.py:373 +msgid "Rising" +msgstr "Вверх" + +#: pysollib/games/ultra/hanafuda.py:375 +msgid "Setting" +msgstr "Вниз" + +#: pysollib/games/ultra/hanafuda.py:511 +msgid "Filled" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:513 +msgid " Deck" +msgstr " колода" + +#: pysollib/games/ultra/hanafuda.py:513 +msgid "nd" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:513 +msgid "rd" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:513 +msgid "st" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:513 +msgid "th" +msgstr "" + +#: pysollib/games/ultra/hanafuda.py:563 +msgid "East" +msgstr "Восток" + +#: pysollib/games/ultra/hanafuda.py:563 +msgid "North" +msgstr "Север" + +#: pysollib/games/ultra/hanafuda.py:563 +msgid "South" +msgstr "Юг" + +#: pysollib/games/ultra/hanafuda.py:563 +msgid "West" +msgstr "Запад" + +#: pysollib/games/ultra/hanafuda.py:564 +msgid "NE" +msgstr "СВ" + +#: pysollib/games/ultra/hanafuda.py:564 +msgid "NW" +msgstr "СЗ" + +#: pysollib/games/ultra/hanafuda.py:564 +msgid "SE" +msgstr "ЮВ" + +#: pysollib/games/ultra/hanafuda.py:564 +msgid "SW" +msgstr "ЮЗ" + +#: pysollib/games/ultra/hanafuda_common.py:67 +msgid "Cherry" +msgstr "Вишня" + +#: pysollib/games/ultra/hanafuda_common.py:67 +msgid "Pine" +msgstr "Сосна" + +#: pysollib/games/ultra/hanafuda_common.py:67 +msgid "Plum" +msgstr "Слива" + +#: pysollib/games/ultra/hanafuda_common.py:67 +msgid "Wisteria" +msgstr "Глициния" + +#: pysollib/games/ultra/hanafuda_common.py:68 +msgid "Bush Clover" +msgstr "Клевер" + +#: pysollib/games/ultra/hanafuda_common.py:68 +msgid "Eularia" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:68 +msgid "Iris" +msgstr "Ирис" + +#: pysollib/games/ultra/hanafuda_common.py:68 +msgid "Peony" +msgstr "Пеон" + +#: pysollib/games/ultra/hanafuda_common.py:69 +msgid "Chrysanthemum" +msgstr "Хризантема" + +#: pysollib/games/ultra/hanafuda_common.py:69 +msgid "Maple" +msgstr "Клен" + +#: pysollib/games/ultra/hanafuda_common.py:69 +msgid "Paulownia" +msgstr "" + +#: pysollib/games/ultra/hanafuda_common.py:69 +msgid "Willow" +msgstr "Ива" + +#: pysollib/games/ultra/larasgame.py:157 pysollib/stack.py:1368 +msgid "Round %d" +msgstr "Раунд %d" + +#: pysollib/games/ultra/mughal.py:252 +#, fuzzy +msgid "Crown" +msgstr "Коричневый" + +#: pysollib/games/ultra/mughal.py:252 +msgid "Saber" +msgstr "" + +#: pysollib/games/ultra/mughal.py:252 +msgid "Servant" +msgstr "" + +#: pysollib/games/ultra/mughal.py:252 +msgid "Silver" +msgstr "" + +#: pysollib/games/ultra/mughal.py:253 +msgid "Document" +msgstr "" + +#: pysollib/games/ultra/mughal.py:253 +msgid "Gold" +msgstr "" + +#: pysollib/games/ultra/mughal.py:253 +#, fuzzy +msgid "Harp" +msgstr "Черви" + +#: pysollib/games/ultra/mughal.py:253 +#, fuzzy +msgid "Stores" +msgstr "Настроить цвета" + +#: pysollib/games/ultra/mughal.py:257 +msgid "Tan" +msgstr "" + +#: pysollib/games/ultra/threepeaks.py:217 +msgid "Score:\tThis hand: " +msgstr "" + +#: pysollib/games/ultra/threepeaks.py:218 +msgid "\tThis game: " +msgstr "" + +#: pysollib/games/yukon.py:145 +msgid "" +"Row. Build down in any suit but the same, can move any face-up cards " +"regardless of sequence." +msgstr "" + +#: pysollib/games/yukon.py:201 +msgid "" +"Row. Build up or down by suit, can move any face-up cards regardless of " +"sequence." +msgstr "" + +#: pysollib/games/yukon.py:218 +msgid "" +"Row. Build up or down by alternate color, can move any face-up cards " +"regardless of sequence." +msgstr "" + +#: pysollib/games/yukon.py:320 +msgid "" +"Club: A 2 3 4 5 6 7 8 9 T J Q K\n" +"Spade: 2 4 6 8 T Q A 3 5 7 9 J K\n" +"Heart: 3 6 9 Q 2 5 8 J A 4 7 T K\n" +"Diamond: 4 8 Q 3 7 J 2 6 T A 5 9 K" +msgstr "" +"Треф: Т 2 3 4 5 6 7 8 9 10 В Д К\n" +"Пики: 2 4 6 8 10 Д Т 3 5 7 9 В К\n" +"Черви: 3 6 9 Д 2 5 8 В Т 4 7 10 К\n" +"Буби: 4 8 Д 3 7 В 2 6 10 Т 5 9 К" + +#: pysollib/help.py:64 +msgid "A Python Solitaire Game Collection\n" +msgstr "Коллекция питоновских пасьянсев\n" + +#: pysollib/help.py:66 +msgid "A World Domination Project\n" +msgstr "Всемирный непревзойденный проект\n" + +#: pysollib/help.py:67 +msgid "Credits..." +msgstr "Благодарности..." + +#: pysollib/help.py:67 +msgid "Nice" +msgstr "Отлично" + +#: pysollib/help.py:69 +msgid "Enjoy" +msgstr "Наслаждайтесь" + +#: pysollib/help.py:71 +msgid "" +"Version %s\n" +"\n" +msgstr "" +"Версия %s\n" +"\n" + +#: pysollib/help.py:72 +msgid "About " +msgstr "О программе " + +#: pysollib/help.py:73 +msgid "" +"PySol Fan Club edition\n" +"%s%s\n" +"Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003\n" +"Markus F.X.J. Oberhumer\n" +"Copyright (C) 2003 Mt. Hood Playing Card Co.\n" +"Copyright (C) 2005 Skomoroh (Fan Club edition)\n" +"All Rights Reserved.\n" +"\n" +"PySol is free software distributed under the terms\n" +"of the GNU General Public License.\n" +"\n" +"For more information about this application visit\n" +"%s" +msgstr "" +"PySol Fan Club edition\n" +"%s%s\n" +"Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003\n" +"Markus F.X.J. Oberhumer\n" +"Copyright (C) 2003 Mt. Hood Playing Card Co.\n" +"Copyright (C) 2005 Skomoroh (Fan Club edition)\n" +"All Rights Reserved.\n" +"\n" +"PySol свободное программное обеспечение,\n" +"распространяющееся по лицензии GPL\n" +"\n" +"Для получения дополнительной информации\n" +"об этом приложении посетите сайт\n" +"%s" + +#: pysollib/help.py:102 +msgid "Credits" +msgstr "Благодарности" + +#: pysollib/help.py:103 +msgid "" +" credits go to:\n" +"\n" +"Volker Weidner for getting me into Solitaire\n" +"Guido van Rossum for the initial example program\n" +"T. Kirk for lots of contributed games and cardsets\n" +"Carl Larsson for the background music\n" +"The Gnome AisleRiot team for parts of the documentation\n" +"Natascha\n" +"\n" +"The Python, %s, SDL & Linux crews\n" +"for making this program possible" +msgstr "" + +#: pysollib/help.py:138 +msgid " HTML Problem" +msgstr " проблема с HTML" + +#: pysollib/help.py:139 +msgid "Cannot find help document\n" +msgstr "Не найден файл помощи\n" + +#: pysollib/help.py:152 +msgid " Help" +msgstr " Помощь" + +#: pysollib/main.py:68 pysollib/main.py:310 +msgid " installation error" +msgstr " проблема с установкой" + +#: pysollib/main.py:69 +msgid "" +"No %ss were found !!!\n" +"\n" +"Main data directory is:\n" +"%s\n" +"\n" +"Please check your %s installation.\n" +msgstr "" + +#: pysollib/main.py:76 pysollib/main.py:319 pysollib/tk/toolbar.py:197 +msgid "Quit" +msgstr "Выйти" + +#: pysollib/main.py:95 +msgid "" +"%s: %s\n" +"try %s --help for more information" +msgstr "" +"%s: %s\n" +"попробуйте %s --help для получения более подробной информаци" + +#: pysollib/main.py:120 +msgid "" +"Usage: %s [OPTIONS] [FILE]\n" +" --fg --foreground=COLOR foreground color\n" +" --bg --background=COLOR background color\n" +" --fn --font=FONT default font\n" +" --nosound disable sound support\n" +" --noplugins disable load plugins\n" +" -h --help display this help and exit\n" +"\n" +" FILE - file name of a saved game\n" +msgstr "" +"Испльзование: %s [OPTIONS] [FILE]\n" +" --fg --foreground=COLOR цвет текста\n" +" --bg --background=COLOR цвет фона\n" +" --fn --font=FONT шрифт по умолчанию\n" +" --nosound отключить звук\n" +" --noplugins отключить загрузку плагинов\n" +" -h --help показать это сообщение и выйти\n" +"\n" +" FILE - имя файла сохраненной игры\n" + +#: pysollib/main.py:133 +msgid "" +"%s: too many files\n" +"try %s --help for more information" +msgstr "" +"\"%s: слишком много файлов\n" +"попробуйте %s --help для получения более подробной информаци" + +#: pysollib/main.py:137 +msgid "" +"%s: invalide file name\n" +"try %s --help for more information" +msgstr "" +"%s: неправильное имя файла\n" +"попробуйте %s --help для получения более подробной информаци" + +#: pysollib/main.py:311 +msgid "" +"\n" +"No games were found !!!\n" +"\n" +"Main data directory is:\n" +"%s\n" +"\n" +"Please check your %s installation.\n" +msgstr "" + +#: pysollib/main.py:397 pysollib/main.py:402 +msgid " installation problem" +msgstr "" + +#: pysollib/main.py:398 +msgid "" +"Your Python installation is compiled without thread support.\n" +"\n" +"Sounds and background music will be disabled." +msgstr "" + +#: pysollib/main.py:403 +msgid "" +"The pysolsoundserver module was not found.\n" +"\n" +"Sounds and background music will be disabled." +msgstr "" +"Модуль pysolsoundserver не найден\n" +"\n" +"Звук и фоновая музыка будут недоступны" + +#: pysollib/main.py:407 +msgid "Welcome to " +msgstr "Добро пожаловать в " + +#: pysollib/settings.py:58 +msgid "Top 10" +msgstr "Top 10" + +#: pysollib/stack.py:1184 +msgid "Base card - %s." +msgstr "" + +#: pysollib/stack.py:1185 +msgid "Empty row cannot be filled." +msgstr "" + +#: pysollib/stack.py:1186 +msgid "any card" +msgstr "" + +#: pysollib/stack.py:1187 pysollib/util.py:81 +msgid "Jack" +msgstr "Валет" + +#: pysollib/stack.py:1196 +msgid "No cards" +msgstr "Нет карт" + +#: pysollib/stack.py:1197 +msgid "1 card" +msgstr "1 карта" + +#: pysollib/stack.py:1198 +msgid " cards" +msgstr " карт" + +#: pysollib/stack.py:1377 pysollib/stack.py:1379 pysollib/stack.py:1410 +msgid "Redeal" +msgstr "Сдать" + +#: pysollib/stack.py:1379 +msgid "Stop" +msgstr "Стоп" + +#: pysollib/stack.py:1430 +msgid "Variable redeals." +msgstr "Переменное количество пересдач." + +#: pysollib/stack.py:1431 +msgid "Unlimited redeals." +msgstr "Неограниченное количество пересдач." + +#: pysollib/stack.py:1432 +msgid "No redeals." +msgstr "Без пересдачи." + +#: pysollib/stack.py:1433 +msgid "One redeal." +msgstr "1 пересдача." + +#: pysollib/stack.py:1434 +msgid " redeals." +msgstr " пересдачи." + +#: pysollib/stack.py:1436 +msgid "Talon." +msgstr "" + +#: pysollib/stack.py:1611 pysollib/stack.py:2035 +msgid "Reserve. No building." +msgstr "" + +#: pysollib/stack.py:1657 +msgid "Foundation. Build up by suit." +msgstr "" + +#: pysollib/stack.py:1658 +msgid "Foundation. Build down by suit." +msgstr "" + +#: pysollib/stack.py:1659 pysollib/stack.py:1675 pysollib/stack.py:1697 +msgid "Foundation. Build by same rank." +msgstr "" + +#: pysollib/stack.py:1674 +msgid "Foundation. Build down regardless of suit." +msgstr "" + +#: pysollib/stack.py:1695 +msgid "Foundation. Build up by alternate color." +msgstr "" + +#: pysollib/stack.py:1696 +msgid "Foundation. Build down by alternate color." +msgstr "" + +#: pysollib/stack.py:1770 +msgid "Row. Build up by alternate color." +msgstr "" + +#: pysollib/stack.py:1771 +msgid "Row. Build down by alternate color." +msgstr "" + +#: pysollib/stack.py:1772 pysollib/stack.py:1782 pysollib/stack.py:1791 +#: pysollib/stack.py:1800 pysollib/stack.py:1828 +msgid "Row. Build by same rank." +msgstr "" + +#: pysollib/stack.py:1780 +msgid "Row. Build up by color." +msgstr "" + +#: pysollib/stack.py:1781 +msgid "Row. Build down by color." +msgstr "" + +#: pysollib/stack.py:1789 +msgid "Row. Build up by suit." +msgstr "" + +#: pysollib/stack.py:1790 +msgid "Row. Build down by suit." +msgstr "" + +#: pysollib/stack.py:1798 pysollib/stack.py:1826 +msgid "Row. Build up regardless of suit." +msgstr "" + +#: pysollib/stack.py:1799 pysollib/stack.py:1827 +msgid "Row. Build down regardless of suit." +msgstr "" + +#: pysollib/stack.py:1849 +msgid "" +"Row. Build up by alternate color, can move any face-up cards regardless of " +"sequence." +msgstr "" + +#: pysollib/stack.py:1850 +msgid "" +"Row. Build down by alternate color, can move any face-up cards regardless of " +"sequence." +msgstr "" + +#: pysollib/stack.py:1851 pysollib/stack.py:1862 +msgid "" +"Row. Build by same rank, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:1860 +msgid "" +"Row. Build up by suit, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:1861 +msgid "" +"Row. Build down by suit, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:1894 +msgid "Row. Build up or down by color." +msgstr "" + +#: pysollib/stack.py:1905 +msgid "Row. Build up or down by alternate color." +msgstr "" + +#: pysollib/stack.py:1916 +msgid "Row. Build up or down by suit." +msgstr "" + +#: pysollib/stack.py:1927 +msgid "Row. Build up or down regardless of suit." +msgstr "" + +#: pysollib/stack.py:1938 +msgid "Waste." +msgstr "" + +#: pysollib/stack.py:2036 +msgid "Free cell." +msgstr "Свободная ячейка." + +#: pysollib/stats.py:120 pysollib/tk/tkstats.py:78 +msgid "Demo games" +msgstr "Демо игры" + +#: pysollib/stats.py:121 +msgid "Played" +msgstr "Играл" + +#: pysollib/stats.py:122 pysollib/stats.py:202 +msgid "Won" +msgstr "Выиграл" + +#: pysollib/stats.py:123 pysollib/stats.py:202 +msgid "Lost" +msgstr "Проиграл" + +#: pysollib/stats.py:124 pysollib/tk/statusbar.py:134 +msgid "Playing time" +msgstr "Время игры" + +#: pysollib/stats.py:125 +msgid "Moves" +msgstr "Ходов" + +#: pysollib/stats.py:126 +msgid "% won" +msgstr "% побед" + +#: pysollib/stats.py:155 +msgid "Total (%d out of %d games)" +msgstr "Всего (%d из %d игр)" + +#: pysollib/stats.py:164 +msgid "Game" +msgstr "Игра" + +#: pysollib/stats.py:164 +msgid "Started at " +msgstr "Игра начата " + +#: pysollib/stats.py:164 +msgid "Status" +msgstr "Статус" + +#: pysollib/stats.py:164 pysollib/tk/statusbar.py:136 +#: pysollib/tk/tkstats.py:734 +msgid "Game number" +msgstr "Номер игры" + +#: pysollib/stats.py:187 +msgid "** UNKNOWN %d **" +msgstr "" + +#: pysollib/stats.py:195 +msgid "** ERROR **" +msgstr "" + +#: pysollib/stats.py:202 +msgid "Loaded" +msgstr "Загружал" + +#: pysollib/stats.py:202 +msgid "Not won" +msgstr "Не выиграл" + +#: pysollib/stats.py:202 +msgid "Perfect" +msgstr "Великолепная" + +#: pysollib/tk/colorsdialog.py:73 +msgid "Text foreground:" +msgstr "Цвет текста:" + +#: pysollib/tk/colorsdialog.py:79 pysollib/tk/colorsdialog.py:97 +#: pysollib/tk/fontsdialog.py:185 +msgid "Change..." +msgstr "Изменить..." + +#: pysollib/tk/colorsdialog.py:85 pysollib/tk/timeoutsdialog.py:68 +msgid "Highlight piles:" +msgstr "Подсветка групп:" + +#: pysollib/tk/colorsdialog.py:86 +msgid "Highlight cards 1:" +msgstr "Подсветка карт 1:" + +#: pysollib/tk/colorsdialog.py:87 +msgid "Highlight cards 2:" +msgstr "Подсветка карт 2:" + +#: pysollib/tk/colorsdialog.py:88 +msgid "Highlight same rank 1:" +msgstr "Подсветка карт одного достоинства 1:" + +#: pysollib/tk/colorsdialog.py:89 +msgid "Highlight same rank 2:" +msgstr "Подсветка карт одного достоинства 2:" + +#: pysollib/tk/colorsdialog.py:90 +msgid "Hint arrow:" +msgstr "Стрелка подсказки:" + +#: pysollib/tk/colorsdialog.py:91 +msgid "Highlight not matching:" +msgstr "Подсветка отсутствия совпадения:" + +#: pysollib/tk/colorsdialog.py:123 +msgid "Select color" +msgstr "Выбрать цвет" + +#: pysollib/tk/demooptionsdialog.py:66 +msgid "Display floating Demo logo" +msgstr "Показывать демо лого" + +#: pysollib/tk/demooptionsdialog.py:69 +msgid "Show score in statusbar" +msgstr "Показывать счет в строке состояния" + +#: pysollib/tk/demooptionsdialog.py:73 +msgid "Set demo delay in seconds" +msgstr "Установить задуржку демо в секундах" + +#: pysollib/tk/fontsdialog.py:85 +msgid "abcdefghABCDEFGH" +msgstr "abcdeABCDE абвгдАБВГД" + +#: pysollib/tk/fontsdialog.py:94 +msgid "Bold" +msgstr "Жирный" + +#: pysollib/tk/fontsdialog.py:97 +msgid "Italic" +msgstr "Наклонный" + +#: pysollib/tk/fontsdialog.py:195 +msgid "Select font" +msgstr "Выбрать шрифт" + +#: pysollib/tk/menubar.py:75 +msgid "Style" +msgstr "Стиль" + +#: pysollib/tk/menubar.py:84 +msgid "Relief" +msgstr "Рельеф" + +#: pysollib/tk/menubar.py:85 +msgid "Flat" +msgstr "Плоский" + +#: pysollib/tk/menubar.py:89 +msgid "Raised" +msgstr "Выпуклый" + +#: pysollib/tk/menubar.py:94 +msgid "Compound" +msgstr "Компоновка" + +#: pysollib/tk/menubar.py:100 +msgid "Hide" +msgstr "Спрятать" + +#: pysollib/tk/menubar.py:103 +msgid "Top" +msgstr "Сверху" + +#: pysollib/tk/menubar.py:106 +msgid "Bottom" +msgstr "Внизу" + +#: pysollib/tk/menubar.py:109 +msgid "Left" +msgstr "Слева" + +#: pysollib/tk/menubar.py:112 +msgid "Right" +msgstr "Справа" + +#: pysollib/tk/menubar.py:116 +msgid "Small icons" +msgstr "Маленькие пиктограммы" + +#: pysollib/tk/menubar.py:119 +msgid "Large icons" +msgstr "Большие пиктограммы" + +#: pysollib/tk/menubar.py:125 +msgid "Customize toolbar" +msgstr "Настроить панель инструментов" + +#: pysollib/tk/menubar.py:248 +msgid "&File" +msgstr "&Файл" + +#: pysollib/tk/menubar.py:249 +msgid "&New game" +msgstr "&Новая игра" + +#: pysollib/tk/menubar.py:250 +msgid "R&ecent games" +msgstr "Выбрать н&едавнюю игру" + +#: pysollib/tk/menubar.py:252 +msgid "Select &random game" +msgstr "С&лучайная игра" + +#: pysollib/tk/menubar.py:253 +msgid "&All games" +msgstr "&Все игры" + +#: pysollib/tk/menubar.py:254 +msgid "Games played and &won" +msgstr "&Выигранные игры" + +#: pysollib/tk/menubar.py:255 +msgid "Games played and ¬ won" +msgstr "&Невыигранные игры" + +#: pysollib/tk/menubar.py:256 +msgid "Games not &played" +msgstr "Не&сыгранные игры" + +#: pysollib/tk/menubar.py:257 +msgid "Select game by nu&mber..." +msgstr "Выбрать игру по &номеру..." + +#: pysollib/tk/menubar.py:259 +msgid "Fa&vorite games" +msgstr "&Избранные игры" + +#: pysollib/tk/menubar.py:260 +msgid "A&dd to favorites" +msgstr "&Добавить в избранное" + +#: pysollib/tk/menubar.py:261 +msgid "R&emove from favorites" +msgstr "&Удалить из избранных" + +#: pysollib/tk/menubar.py:263 +msgid "&Open..." +msgstr "&Открыть..." + +#: pysollib/tk/menubar.py:264 +msgid "&Save" +msgstr "&Сохранить" + +#: pysollib/tk/menubar.py:265 +msgid "Save &as..." +msgstr "Сохранить &как..." + +#: pysollib/tk/menubar.py:267 +msgid "&Hold and quit" +msgstr "Со&храниться и выйти" + +#: pysollib/tk/menubar.py:268 +msgid "&Quit" +msgstr "В&ыход" + +#: pysollib/tk/menubar.py:270 +msgid "&Select" +msgstr "&Выбрать" + +#: pysollib/tk/menubar.py:273 +msgid "&Edit" +msgstr "Р&едактировать" + +#: pysollib/tk/menubar.py:274 +msgid "&Undo" +msgstr "&Отмена" + +#: pysollib/tk/menubar.py:275 +msgid "&Redo" +msgstr "&Повтор" + +#: pysollib/tk/menubar.py:276 +msgid "Redo &all" +msgstr "Вернуть все" + +#: pysollib/tk/menubar.py:279 +msgid "&Set bookmark" +msgstr "Установить &закладку" + +#: pysollib/tk/menubar.py:281 pysollib/tk/menubar.py:285 +msgid "Bookmark %d" +msgstr "Закладка %d" + +#: pysollib/tk/menubar.py:283 +msgid "Go&to bookmark" +msgstr "&Перейти к закладке" + +#: pysollib/tk/menubar.py:288 +msgid "&Clear bookmarks" +msgstr "О&чистить закладки" + +#: pysollib/tk/menubar.py:291 +msgid "Restart &game" +msgstr "&Начать с начала" + +#: pysollib/tk/menubar.py:293 +msgid "&Game" +msgstr "&Игра" + +#: pysollib/tk/menubar.py:294 +msgid "&Deal cards" +msgstr "&Сдать карты" + +#: pysollib/tk/menubar.py:295 pysollib/tk/menubar.py:324 +msgid "&Auto drop" +msgstr "С&бросить карты" + +#: pysollib/tk/menubar.py:296 +msgid "&Pause" +msgstr "&Пауза" + +#: pysollib/tk/menubar.py:299 +msgid "S&tatus..." +msgstr "С&татус" + +#: pysollib/tk/menubar.py:300 +msgid "&Comments..." +msgstr "&Комментарии..." + +#: pysollib/tk/menubar.py:302 +msgid "&Statistics" +msgstr "Ст&атистика" + +#: pysollib/tk/menubar.py:303 pysollib/tk/menubar.py:311 +msgid "Current game..." +msgstr "Текущая игра..." + +#: pysollib/tk/menubar.py:304 pysollib/tk/menubar.py:312 +#: pysollib/tk/tkstats.py:289 +msgid "All games..." +msgstr "Все игры..." + +#: pysollib/tk/menubar.py:306 pysollib/tk/tkstats.py:647 +msgid "Session log..." +msgstr "Лог сессии..." + +#: pysollib/tk/menubar.py:307 pysollib/tk/tkstats.py:663 +msgid "Full log..." +msgstr "Полный лог..." + +#: pysollib/tk/menubar.py:310 +msgid "D&emo statistics" +msgstr "Статистика демо" + +#: pysollib/tk/menubar.py:314 +msgid "&Assist" +msgstr "&Подсказка" + +#: pysollib/tk/menubar.py:315 +msgid "&Hint" +msgstr "Подсказать &ход" + +#: pysollib/tk/menubar.py:316 +msgid "Highlight p&iles" +msgstr "П&оказать группы" + +#: pysollib/tk/menubar.py:318 +msgid "&Demo" +msgstr "&Демо" + +#: pysollib/tk/menubar.py:319 +msgid "Demo (&all games)" +msgstr "Демо (&все игры)" + +#: pysollib/tk/menubar.py:320 +msgid "&Options" +msgstr "&Настройка" + +#: pysollib/tk/menubar.py:321 +msgid "&Player options..." +msgstr "Настройки &игрока..." + +#: pysollib/tk/menubar.py:322 +msgid "&Automatic play" +msgstr "Настройки &автоматической игры" + +#: pysollib/tk/menubar.py:323 +msgid "Auto &face up" +msgstr "Автоматически переворачивать" + +#: pysollib/tk/menubar.py:325 +msgid "Auto &deal" +msgstr "Автоматически &сдавать карты" + +#: pysollib/tk/menubar.py:327 +msgid "&Quick play" +msgstr "&Быстрая игра" + +#: pysollib/tk/menubar.py:328 +msgid "Assist &level" +msgstr "&Уровень подсказки" + +#: pysollib/tk/menubar.py:329 +msgid "Enable &undo" +msgstr "Разрешить &возврат хода" + +#: pysollib/tk/menubar.py:330 +msgid "Enable &bookmarks" +msgstr "Разрешить &закладки" + +#: pysollib/tk/menubar.py:331 +msgid "Enable &hint" +msgstr "Разрешить &подсказки" + +#: pysollib/tk/menubar.py:332 +msgid "Enable highlight p&iles" +msgstr "Разрешить показывать к&учи" + +#: pysollib/tk/menubar.py:333 +msgid "Enable highlight &cards" +msgstr "Разрешить показывать &карты" + +#: pysollib/tk/menubar.py:334 +msgid "Enable highlight same &rank" +msgstr "Разрешить показывать карты &одного достоинства" + +#: pysollib/tk/menubar.py:335 +msgid "Highlight &no matching" +msgstr "Подсветка отсутствия &совпадения:" + +#: pysollib/tk/menubar.py:337 +msgid "Show removed tiles (in Mahjongg games)" +msgstr "Показывать удаленные (в Маджонгг)" + +#: pysollib/tk/menubar.py:338 +msgid "Show hint arrow (in Shisen-Sho games)" +msgstr "Показывать стрелку (в Shisen-Sho)" + +#: pysollib/tk/menubar.py:340 +msgid "&Sound" +msgstr "&Звук" + +#: pysollib/tk/menubar.py:350 +msgid "Cards&et..." +msgstr "Коло&да..." + +#: pysollib/tk/menubar.py:351 +msgid "Table t&ile..." +msgstr "&Игровой стол..." + +#: pysollib/tk/menubar.py:353 +msgid "Card &background" +msgstr "&Рубашка карты" + +#: pysollib/tk/menubar.py:354 +msgid "Card &view" +msgstr "&Вид карты" + +#: pysollib/tk/menubar.py:355 +msgid "Card shado&w" +msgstr "Тень карты" + +#: pysollib/tk/menubar.py:356 +msgid "Shade &legal moves" +msgstr "Подсвечивать &разрешенные ходы" + +#: pysollib/tk/menubar.py:357 +msgid "&Negative card bottom" +msgstr "&Негативные контуры карты" + +#: pysollib/tk/menubar.py:358 +msgid "A&nimations" +msgstr "&Анимация" + +#: pysollib/tk/menubar.py:359 +msgid "&None" +msgstr "&Нет" + +#: pysollib/tk/menubar.py:360 +msgid "&Timer based" +msgstr "Базирующаяся на &таймере" + +#: pysollib/tk/menubar.py:361 +msgid "&Fast" +msgstr "&Быстрая" + +#: pysollib/tk/menubar.py:362 +msgid "&Slow" +msgstr "&Медленная" + +#: pysollib/tk/menubar.py:363 +msgid "&Very slow" +msgstr "&Очень медленная" + +#: pysollib/tk/menubar.py:364 +msgid "Stick&y mouse" +msgstr "&Липкая мышь" + +#: pysollib/tk/menubar.py:368 +msgid "&Fonts..." +msgstr "&Шрифты..." + +#: pysollib/tk/menubar.py:369 +msgid "&Colors..." +msgstr "&Цвета..." + +#: pysollib/tk/menubar.py:370 +msgid "Time&outs..." +msgstr "Тайма&уты..." + +#: pysollib/tk/menubar.py:372 +msgid "&Toolbar" +msgstr "Панель &инструментов" + +#: pysollib/tk/menubar.py:374 +msgid "Stat&usbar" +msgstr "Панель состояния" + +#: pysollib/tk/menubar.py:375 +msgid "Show &statusbar" +msgstr "Показывать панель состояния" + +#: pysollib/tk/menubar.py:376 +msgid "Show &number of cards" +msgstr "Показывать количество карт" + +#: pysollib/tk/menubar.py:377 +msgid "Show &help bar" +msgstr "Показывать панель помощи" + +#: pysollib/tk/menubar.py:378 +msgid "&Demo logo" +msgstr "&Демо лого" + +#: pysollib/tk/menubar.py:379 +msgid "Startup splash sc&reen" +msgstr "Окно &запуска" + +#: pysollib/tk/menubar.py:383 +msgid "&Help" +msgstr "&Помощь" + +#: pysollib/tk/menubar.py:384 +msgid "&Contents" +msgstr "&Содержание" + +#: pysollib/tk/menubar.py:385 +msgid "&How to play" +msgstr "Как &играть" + +#: pysollib/tk/menubar.py:386 +msgid "&Rules for this game" +msgstr "&Правила текущей игры" + +#: pysollib/tk/menubar.py:387 +msgid "&License terms" +msgstr "&Лицензия" + +#: pysollib/tk/menubar.py:390 +msgid "&About " +msgstr "&О программе " + +#: pysollib/tk/menubar.py:498 +msgid "All &games..." +msgstr "&Все игры..." + +#: pysollib/tk/menubar.py:499 +msgid "Playable pre&view..." +msgstr "Играемый &предпросмотр..." + +#: pysollib/tk/menubar.py:501 +msgid "&Popular games" +msgstr "&Популярные игры" + +#: pysollib/tk/menubar.py:504 +msgid "&French games" +msgstr "&Классические игры" + +#: pysollib/tk/menubar.py:507 +msgid "&Mahjongg games" +msgstr "Игры маджонг" + +#: pysollib/tk/menubar.py:510 +msgid "&Oriental games" +msgstr "&Восточные игры" + +#: pysollib/tk/menubar.py:514 +msgid "&Special games" +msgstr "&Особые игры" + +#: pysollib/tk/menubar.py:518 +msgid "All games by name" +msgstr "Все игры по имени" + +#: pysollib/tk/menubar.py:855 pysollib/tk/menubar.py:857 +#: pysollib/tk/selectcardset.py:240 +msgid "Load" +msgstr "Загрузить" + +#: pysollib/tk/menubar.py:857 +msgid "Info..." +msgstr "Информация..." + +#: pysollib/tk/menubar.py:860 +msgid "Select " +msgstr "Выбрать " + +#: pysollib/tk/menubar.py:920 +msgid "Select table background" +msgstr "Выбрать фоновое изображение" + +#: pysollib/tk/menubar.py:932 pysollib/tk/selecttile.py:176 +msgid "Select table color" +msgstr "Выбрать цвет" + +#: pysollib/tk/playeroptionsdialog.py:113 +msgid "" +"\n" +"Please enter your name" +msgstr "" +"\n" +"Пожалуйста введите Ваше имя" + +#: pysollib/tk/playeroptionsdialog.py:121 +msgid "Select..." +msgstr "Выбрать..." + +#: pysollib/tk/playeroptionsdialog.py:125 +msgid "Confirm quit" +msgstr "Подтверждение выхода" + +#: pysollib/tk/playeroptionsdialog.py:129 +msgid "Update statistics and logs" +msgstr "Обнавлять статистику и лог" + +#: pysollib/tk/playeroptionsdialog.py:146 +msgid "Select name" +msgstr "Выбрать имя" + +#: pysollib/tk/selectcardset.py:81 pysollib/tk/selectcardset.py:146 +msgid "(no cardsets)" +msgstr "(нет колод)" + +#: pysollib/tk/selectcardset.py:91 pysollib/tk/selectcardset.py:154 +msgid "by Type" +msgstr "По типу" + +#: pysollib/tk/selectcardset.py:101 pysollib/tk/selectcardset.py:112 +#: pysollib/tk/selectcardset.py:123 +msgid "Uncategorized" +msgstr "Неопределенный" + +#: pysollib/tk/selectcardset.py:102 +msgid "by Style" +msgstr "По стилю" + +#: pysollib/tk/selectcardset.py:113 +msgid "by Nationality" +msgstr "По национальности" + +#: pysollib/tk/selectcardset.py:124 +msgid "by Date" +msgstr "По дате" + +#: pysollib/tk/selectcardset.py:127 +msgid "All Cardsets" +msgstr "Все колоды" + +#: pysollib/tk/selectcardset.py:128 +msgid "by Size" +msgstr "По размеру" + +#: pysollib/tk/selectcardset.py:129 +msgid "Tiny cardsets" +msgstr "Очень маленькие колоды" + +#: pysollib/tk/selectcardset.py:130 +msgid "Small cardsets" +msgstr "Маленькие колоды" + +#: pysollib/tk/selectcardset.py:131 +msgid "Medium cardsets" +msgstr "Средние колоды" + +#: pysollib/tk/selectcardset.py:132 +msgid "Large cardsets" +msgstr "Большие колоды" + +#: pysollib/tk/selectcardset.py:133 +msgid "XLarge cardsets" +msgstr "Очень большие колоды" + +#: pysollib/tk/selectcardset.py:319 +msgid "About cardset" +msgstr "О наборе карт" + +#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:367 +msgid "Type:" +msgstr "Тип:" + +#: pysollib/tk/selectcardset.py:336 +msgid "Styles:" +msgstr "Стиль:" + +#: pysollib/tk/selectcardset.py:337 +msgid "Nationality:" +msgstr "Национальность:" + +#: pysollib/tk/selectcardset.py:338 +msgid "Year:" +msgstr "Год:" + +#: pysollib/tk/selectcardset.py:340 +msgid "Size:" +msgstr "Размер:" + +#: pysollib/tk/selectgame.py:100 +msgid "(no games)" +msgstr "(нет игр)" + +#: pysollib/tk/selectgame.py:118 +msgid "French games" +msgstr "Классические игры" + +#: pysollib/tk/selectgame.py:121 +msgid "Oriental Games" +msgstr "Восточные игры" + +#: pysollib/tk/selectgame.py:124 +msgid "Special Games" +msgstr "Особые игры" + +#: pysollib/tk/selectgame.py:127 +msgid "Original Games" +msgstr "Оригинальные игры" + +#: pysollib/tk/selectgame.py:141 +msgid "by Compatibility" +msgstr "По совместимости с другими программами" + +#: pysollib/tk/selectgame.py:159 +msgid "New games in v" +msgstr "Новые игры в версии " + +#: pysollib/tk/selectgame.py:162 +msgid "by PySol version" +msgstr "По версии PySol" + +#: pysollib/tk/selectgame.py:169 +msgid "All Games" +msgstr "Все игры" + +#: pysollib/tk/selectgame.py:170 +msgid "Alternate Names" +msgstr "Другие имена" + +#: pysollib/tk/selectgame.py:171 +msgid "Popular Games" +msgstr "Популярные игры" + +#: pysollib/tk/selectgame.py:172 +msgid "Mahjongg Games" +msgstr "Игры маджонг" + +#: pysollib/tk/selectgame.py:178 +msgid "by Game Feature" +msgstr "По особенностям игры" + +#: pysollib/tk/selectgame.py:179 +msgid "by Number of Cards" +msgstr "По количеству карт" + +#: pysollib/tk/selectgame.py:180 +msgid "32 cards" +msgstr "32 карты" + +#: pysollib/tk/selectgame.py:181 +msgid "48 cards" +msgstr "48 карт" + +#: pysollib/tk/selectgame.py:182 +msgid "52 cards" +msgstr "52 карты" + +#: pysollib/tk/selectgame.py:183 +msgid "64 cards" +msgstr "64 карты" + +#: pysollib/tk/selectgame.py:184 +msgid "78 cards" +msgstr "78 карт" + +#: pysollib/tk/selectgame.py:185 +msgid "104 cards" +msgstr "104 карты" + +#: pysollib/tk/selectgame.py:186 +msgid "144 cards" +msgstr "144 карты" + +#: pysollib/tk/selectgame.py:187 +msgid "Other number" +msgstr "Другое количество" + +#: pysollib/tk/selectgame.py:189 +msgid "by Number of Decks" +msgstr "По количеству колод" + +#: pysollib/tk/selectgame.py:190 +msgid "1 deck games" +msgstr "Игры с 1 колодой" + +#: pysollib/tk/selectgame.py:191 +msgid "2 deck games" +msgstr "Игры с 2 колодами" + +#: pysollib/tk/selectgame.py:192 +msgid "3 deck games" +msgstr "Игры с 3 колодами" + +#: pysollib/tk/selectgame.py:193 +msgid "4 deck games" +msgstr "Игры с 4 колодами" + +#: pysollib/tk/selectgame.py:195 +msgid "by Number of Redeals" +msgstr "По количеству пересдач" + +#: pysollib/tk/selectgame.py:196 +msgid "No redeal" +msgstr "Без пересдачи" + +#: pysollib/tk/selectgame.py:197 +msgid "1 redeal" +msgstr "1 пересдача" + +#: pysollib/tk/selectgame.py:198 +msgid "2 redeals" +msgstr "2 пересдачи" + +#: pysollib/tk/selectgame.py:199 +msgid "3 redeals" +msgstr "3 пересдачи" + +#: pysollib/tk/selectgame.py:200 +msgid "Unlimited redeals" +msgstr "Неограниченное количество пересдач" + +#: pysollib/tk/selectgame.py:202 +msgid "Other number of redeals" +msgstr "Другое количество пересдач" + +#: pysollib/tk/selectgame.py:207 +msgid "Other Categories" +msgstr "Другие категории" + +#: pysollib/tk/selectgame.py:208 +msgid "Games for Children (very easy)" +msgstr "Игры для детей (очень легкие)" + +#: pysollib/tk/selectgame.py:209 +msgid "Games with Scoring" +msgstr "Игры со счётом" + +#: pysollib/tk/selectgame.py:210 +msgid "Games with Separate Decks" +msgstr "Игры с раздельными колодами" + +#: pysollib/tk/selectgame.py:211 +msgid "Open Games (all cards visible)" +msgstr "Открытые игры (все карты видны)" + +#: pysollib/tk/selectgame.py:212 +msgid "Relaxed Variants" +msgstr "Облегченные варианты" + +#: pysollib/tk/selectgame.py:351 +msgid "About game" +msgstr "Об игре " + +#: pysollib/tk/selectgame.py:364 +msgid "Name:" +msgstr "Имя:" + +#: pysollib/tk/selectgame.py:365 +msgid "Alternate names:" +msgstr "Другие имена:" + +#: pysollib/tk/selectgame.py:366 +msgid "Category:" +msgstr "Категория:" + +#: pysollib/tk/selectgame.py:368 +msgid "Decks:" +msgstr "Колод:" + +#: pysollib/tk/selectgame.py:369 +msgid "Redeals:" +msgstr "Пересдач:" + +#: pysollib/tk/selectgame.py:371 +msgid "Played:" +msgstr "Играл:" + +#: pysollib/tk/selectgame.py:372 pysollib/tk/tkstats.py:111 +#: pysollib/tk/tkstats.py:163 +msgid "Won:" +msgstr "Выиграл:" + +#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:112 +#: pysollib/tk/tkstats.py:164 +msgid "Lost:" +msgstr "Проиграл:" + +#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:804 +msgid "Playing time:" +msgstr "Игровое время:" + +#: pysollib/tk/selectgame.py:375 pysollib/tk/tkstats.py:811 +msgid "Moves:" +msgstr "Ходов:" + +#: pysollib/tk/selectgame.py:376 +msgid "% won:" +msgstr "% побед:" + +#: pysollib/tk/selectgame.py:409 +msgid "Select" +msgstr "Выбрать" + +#: pysollib/tk/selectgame.py:409 pysollib/tk/toolbar.py:195 +msgid "Rules" +msgstr "Правила" + +#: pysollib/tk/selectgame.py:490 +msgid "Playable Preview - " +msgstr "Играемый предпросмотр - " + +#: pysollib/tk/selectgame.py:538 +msgid "variable" +msgstr "переменное кол-во" + +#: pysollib/tk/selectgame.py:539 +msgid "unlimited" +msgstr "неограниченное кол-во" + +#: pysollib/tk/selecttile.py:80 +msgid "(no tiles)" +msgstr "(нет плитки)" + +#: pysollib/tk/selecttile.py:84 +msgid "Solid Colors" +msgstr "Монотонный цвет" + +#: pysollib/tk/selecttile.py:85 +msgid "Blue" +msgstr "Голубой" + +#: pysollib/tk/selecttile.py:87 +msgid "Navy" +msgstr "Синий" + +#: pysollib/tk/selecttile.py:90 +msgid "Teal" +msgstr "Чайный" + +#: pysollib/tk/selecttile.py:92 +msgid "All Backgrounds" +msgstr "Все фоновые изображения" + +#: pysollib/tk/selecttile.py:158 +msgid "Solid color..." +msgstr "Монотонный цвет..." + +#: pysollib/tk/soundoptionsdialog.py:76 +msgid "Sound enabled" +msgstr "Звук доступен" + +#: pysollib/tk/soundoptionsdialog.py:82 +msgid "Use DirectX for sound playing" +msgstr "Использовать DirectX длы вывода звука" + +#: pysollib/tk/soundoptionsdialog.py:88 +msgid "Sample volume" +msgstr "Уровень звуков" + +#: pysollib/tk/soundoptionsdialog.py:94 +msgid "Music volume" +msgstr "Уровень музыки" + +#: pysollib/tk/soundoptionsdialog.py:106 +msgid "Apply" +msgstr "Применить" + +#: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:108 +msgid "Mixer..." +msgstr "Миксер..." + +#: pysollib/tk/soundoptionsdialog.py:155 +msgid "Sound preferences info" +msgstr "Информация о настройках звука" + +#: pysollib/tk/soundoptionsdialog.py:156 +msgid "" +"Changing DirectX settings will take effect\n" +"the next time you restart " +msgstr "" +"Изменения установок DirectX вступят в силу\n" +"при следующем запуске " + +#: pysollib/tk/statusbar.py:135 +msgid "Moves/Total moves" +msgstr "Ходов/Всего ходов" + +#: pysollib/tk/statusbar.py:137 +msgid "Games played: won/lost" +msgstr "Игр: выиграно/проиграно" + +#: pysollib/tk/timeoutsdialog.py:65 +msgid "Demo:" +msgstr "Демо:" + +#: pysollib/tk/timeoutsdialog.py:66 +msgid "Hint:" +msgstr "Подсказка:" + +#: pysollib/tk/timeoutsdialog.py:67 +msgid "Raise card:" +msgstr "Подъем карты:" + +#: pysollib/tk/timeoutsdialog.py:69 +msgid "Highlight cards:" +msgstr "Подсветка карты:" + +#: pysollib/tk/timeoutsdialog.py:70 +msgid "Highlight same rank:" +msgstr "Подсветка одинаковых карт:" + +#: pysollib/tk/tkconst.py:104 +msgid "Icons only" +msgstr "Только пиктограммы" + +#: pysollib/tk/tkconst.py:105 +msgid "Text below icons" +msgstr "Текст под пиктограммами" + +#: pysollib/tk/tkconst.py:106 +msgid "Text beside icons" +msgstr "Текст рядом с пиктограммами" + +#: pysollib/tk/tkconst.py:107 +msgid "Text only" +msgstr "Только текст" + +#: pysollib/tk/tkhtml.py:280 +msgid "Index" +msgstr "Индекс" + +#: pysollib/tk/tkhtml.py:284 +msgid "Back" +msgstr "Назад" + +#: pysollib/tk/tkhtml.py:288 +msgid "Forward" +msgstr "Вперед" + +#: pysollib/tk/tkhtml.py:292 +msgid "Close" +msgstr "Закрыть" + +#: pysollib/tk/tkhtml.py:394 +msgid "" +" HTML limitation:\n" +"The %s protocol is not supported yet.\n" +"\n" +"Please use your standard web browser\n" +"to open the following URL:\n" +"%s\n" +msgstr "" +"Ограничения HTML:\n" +"Протокол %s не поддерживается.\n" +"\n" +"Пожалуйста воспользуйтесь Вашим стандартным браузером\n" +"чтобы открыть URL:\n" +"%s\n" + +#: pysollib/tk/tkhtml.py:419 pysollib/tk/tkhtml.py:423 +msgid "Unable to service request:\n" +msgstr "" + +#: pysollib/tk/tkstats.py:95 +msgid "Total" +msgstr "Всего" + +#: pysollib/tk/tkstats.py:97 +msgid "Current session" +msgstr "Текущая сессия" + +#: pysollib/tk/tkstats.py:113 pysollib/tk/tkstats.py:165 +msgid "Total:" +msgstr "Всего:" + +#: pysollib/tk/tkstats.py:278 +msgid "No games" +msgstr "Нет игр" + +#: pysollib/tk/tkstats.py:291 +msgid "Reset..." +msgstr "Очистить..." + +#: pysollib/tk/tkstats.py:574 pysollib/tk/tkstats.py:647 +#: pysollib/tk/tkstats.py:663 +msgid "Save to file" +msgstr "Сохранить в файл" + +#: pysollib/tk/tkstats.py:575 +msgid "Reset all..." +msgstr "Очистить все..." + +#: pysollib/tk/tkstats.py:625 +msgid "No entries for player " +msgstr "Нет записей для игрока " + +#: pysollib/tk/tkstats.py:642 +#, fuzzy +msgid "No log entries for %s\n" +msgstr "Нет записей для " + +#: pysollib/tk/tkstats.py:658 +#, fuzzy +msgid "No current session log entries for %s\n" +msgstr "В текущем сеансе нет записей для " + +#: pysollib/tk/tkstats.py:678 +msgid "Highlight piles: " +msgstr "Подсветка групп: " + +#: pysollib/tk/tkstats.py:679 +msgid "Highlight cards: " +msgstr "Подсветка карт: " + +#: pysollib/tk/tkstats.py:680 +msgid "Highlight same rank: " +msgstr "Подсветка карт одного достоинства: " + +#: pysollib/tk/tkstats.py:683 +msgid "" +"\n" +"Redeals: " +msgstr "" +"\n" +"Раздач: " + +#: pysollib/tk/tkstats.py:684 +msgid "" +"\n" +"Cards in Talon: " +msgstr "" +"\n" +"Карт в колоде: " + +#: pysollib/tk/tkstats.py:686 +msgid "" +"\n" +"Cards in Waste: " +msgstr "" +"\n" +"Карт в сбросе: " + +#: pysollib/tk/tkstats.py:688 +msgid "" +"\n" +"Cards in Foundations: " +msgstr "" +"\n" +"Карт в игре: " + +#: pysollib/tk/tkstats.py:691 +msgid "Game status" +msgstr "Статус игры" + +#: pysollib/tk/tkstats.py:694 +msgid "Playing time: " +msgstr "Игровое время: " + +#: pysollib/tk/tkstats.py:695 +msgid "Started at: " +msgstr "Игра начата: " + +#: pysollib/tk/tkstats.py:696 +msgid "Moves: " +msgstr "Ходов: " + +#: pysollib/tk/tkstats.py:697 +msgid "Undo moves: " +msgstr "Отменено ходов: " + +#: pysollib/tk/tkstats.py:698 +msgid "Bookmark moves: " +msgstr "Ходов по закладкам: " + +#: pysollib/tk/tkstats.py:699 +msgid "Demo moves: " +msgstr "Демо ходов: " + +#: pysollib/tk/tkstats.py:700 +msgid "Total player moves: " +msgstr "Всего ходов игрока:" + +#: pysollib/tk/tkstats.py:701 +msgid "Total moves in this game: " +msgstr "Всего ходов в этой игре: " + +#: pysollib/tk/tkstats.py:702 +msgid "Hints: " +msgstr "Подсказок: " + +#: pysollib/tk/tkstats.py:706 +msgid "Statistics..." +msgstr "Статистика..." + +#: pysollib/tk/tkstats.py:731 +msgid "N" +msgstr "N" + +#: pysollib/tk/tkstats.py:737 +msgid "Started at" +msgstr "Игра начата" + +#: pysollib/tk/tkstats.py:740 +msgid "Result" +msgstr "Результат" + +#: pysollib/tk/tkstats.py:796 +msgid "Minimum" +msgstr "Минимум" + +#: pysollib/tk/tkstats.py:797 +msgid "Maximum" +msgstr "Максимум" + +#: pysollib/tk/tkstats.py:798 +msgid "Average" +msgstr "Среднее" + +#: pysollib/tk/tkstats.py:818 +msgid "Total moves:" +msgstr "Всего ходов:" + +#: pysollib/tk/tkstats.py:849 +#, fuzzy +msgid "No TOP for this game" +msgstr "Не имеется" + +#: pysollib/tk/toolbar.py:183 +msgid "New" +msgstr "Новая" + +#: pysollib/tk/toolbar.py:184 +msgid "" +"Restart the\n" +"current game" +msgstr "" +"Начать текущую игру\n" +"с начала" + +#: pysollib/tk/toolbar.py:186 +msgid "Open" +msgstr "Открыть" + +#: pysollib/tk/toolbar.py:186 +msgid "" +"Open a\n" +"saved game" +msgstr "" +"Открыть\n" +"сохраненную игру" + +#: pysollib/tk/toolbar.py:187 +msgid "Save" +msgstr "Сохранить" + +#: pysollib/tk/toolbar.py:187 +msgid "Save game" +msgstr "Сохранить игру" + +#: pysollib/tk/toolbar.py:189 +msgid "Undo" +msgstr "Отмена" + +#: pysollib/tk/toolbar.py:189 +msgid "Undo last move" +msgstr "Отменить последний ход" + +#: pysollib/tk/toolbar.py:190 +msgid "Redo" +msgstr "Повтор" + +#: pysollib/tk/toolbar.py:190 +msgid "Redo last move" +msgstr "Вернуть ход" + +#: pysollib/tk/toolbar.py:191 +msgid "Auto drop cards" +msgstr "Автоматически сбросить карты" + +#: pysollib/tk/toolbar.py:191 +msgid "Autodrop" +msgstr "Сбросить" + +#: pysollib/tk/toolbar.py:192 +msgid "Pause" +msgstr "Пауза" + +#: pysollib/tk/toolbar.py:192 +msgid "Pause game" +msgstr "Пауза в игре" + +#: pysollib/tk/toolbar.py:194 +msgid "View statistics" +msgstr "Посмотреть статистику" + +#: pysollib/tk/toolbar.py:195 +msgid "Rules for this game" +msgstr "Правила текущей игры" + +#: pysollib/tk/toolbar.py:209 +msgid "Player" +msgstr "Игрок" + +#: pysollib/tk/toolbar.py:210 +msgid "Player options" +msgstr "Установки игрока" + +#: pysollib/tk/toolbar.py:428 +msgid "Toolbar" +msgstr "Панель инструментов" + +#: pysollib/util.py:76 +msgid "Club" +msgstr "Треф" + +#: pysollib/util.py:76 +msgid "Diamond" +msgstr "Буби" + +#: pysollib/util.py:76 +msgid "Heart" +msgstr "Черви" + +#: pysollib/util.py:76 +msgid "Spade" +msgstr "Пики" + +#: pysollib/util.py:77 +msgid "black" +msgstr "черный" + +#: pysollib/util.py:77 +msgid "red" +msgstr "красный" + +#: pysollib/util.py:102 +msgid "cardset" +msgstr "набор карт" + +#~ msgid "" +#~ "No Free\n" +#~ "Matching\n" +#~ "Pairs" +#~ msgstr "" +#~ "Нет\n" +#~ "свободных\n" +#~ "пар" + +#~ msgid "" +#~ "1 Free\n" +#~ "Matching\n" +#~ "Pair" +#~ msgstr "" +#~ "1\n" +#~ "свободная\n" +#~ "пара" + +#~ msgid "" +#~ " Free\n" +#~ "Matching\n" +#~ "Pairs" +#~ msgstr "" +#~ " \n" +#~ "свободных\n" +#~ "пар" + +#~ msgid "" +#~ "\n" +#~ "Tiles\n" +#~ "Removed\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "удалено\n" +#~ "\n" + +#~ msgid "" +#~ "\n" +#~ "Tiles\n" +#~ "Remaining\n" +#~ "\n" +#~ msgstr "" +#~ "\n" +#~ "осталось\n" +#~ "\n" + +#~ msgid "Playable Area" +#~ msgstr "Область игры" + +#~ msgid "Alignment" +#~ msgstr "Компоновка" + +#~ msgid "What's &new ?" +#~ msgstr "&Новости" + +#~ msgid "Playing Time:" +#~ msgstr "Время игры:" + +#~ msgid "Enable highlight ¬ matching cards" +#~ msgstr "Разрешить показывать &отсутствие совпадение карт" + +#~ msgid "Invalid or damaged " +#~ msgstr "Поврежденный " + +#~ msgid "Balance %d/%d" +#~ msgstr "Баланс %d/%d" + +#~ msgid "No" +#~ msgstr "Нет" + +#~ msgid "" +#~ " Free\n" +#~ "Matching\n" +#~ "Pair" +#~ msgstr "" +#~ " свободных\n" +#~ "пар" diff --git a/pysol b/pysol new file mode 100755 index 00000000..b841ac68 --- /dev/null +++ b/pysol @@ -0,0 +1,66 @@ +#! /usr/bin/env python +## -*- coding: iso-8859-1 -*- +## +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +import sys, os + +if os.name == 'nt': + try: + import locale + l = locale.getdefaultlocale() + os.environ['LANG'] = l[0] + except: + pass +##locale.setlocale(locale.LC_ALL, '') + +import gettext +##locale_dir = 'locale' +locale_dir = None +d = os.path.join(sys.path[0], 'locale') +if os.path.exists(d) and os.path.isdir(d): + locale_dir = d +if os.name == 'nt': + if sys.path[0] and not os.path.isdir(sys.path[0]): # i.e. library.zip + locale_dir = os.path.join(os.path.split(sys.path[0])[0], 'locale') +##if locale_dir: locale_dir = os.path.normpath(locale_dir) +gettext.install('pysol', locale_dir, unicode=True) + +from pysollib.main import main +#import pychecker.checker + +sys.exit(main(sys.argv)) + diff --git a/pysollib/__init__.py b/pysollib/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pysollib/acard.py b/pysollib/acard.py new file mode 100644 index 00000000..81ac4b4a --- /dev/null +++ b/pysollib/acard.py @@ -0,0 +1,143 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports + +# PySol imports +from mfxutil import SubclassResponsibility + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class AbstractCard: + # A playing card. + # + # A card doesn't record to which stack it belongs; only the stack + # records this (it turns out that we always know this from the + # context, and this saves a ``double update'' with potential for + # inconsistencies). + # + # Public methods: + # + # moveTo(x, y) -- move the card to an absolute position + # moveBy(dx, dy) -- move the card by a relative offset + # tkraise() -- raise the card to the top of its stack + # showFace(), showBack() -- turn the card face up or down & raise it + # + # Public read-only instance variables: + # + # suit, rank, color -- the card's suit, rank and color + # face_up -- true when the card is shown face up, else false + # + # Semi-public read-only instance variables: + # + # item -- the CanvasItem representing the card + # x, y -- the position of the card's top left corner + # + + def __init__(self, id, deck, suit, rank, game, x=0, y=0): + # The card is created at position (x, y), with its face down. + # Adding it to a stack will position it according to that + # stack's rules. + self.id = id + self.deck = deck + self.suit = suit + self.color = suit / 2 + self.rank = rank + self.x = x + self.y = y + self.item = None + self.face_up = 0 + # To improve display speed, we move cards out of the visible canvas. + # Because the whole area that will be passed by a move will get + # updated by Tk, we must choose an optimal way off the screen. + self.hide_stack = None + self.hide_x = self.hide_y = 0 + + def __str__(self): + # Return a string for debug print statements. + return "Card(%d, %d, %d, %d)" % (self.id, self.deck, self.suit, self.rank) + + def isHidden(self): + return self.hide_stack is not None + + def moveTo(self, x, y): + # Move the card to absolute position (x, y). + # The card remains hidden. + self.moveBy(x - self.x + self.hide_x, y - self.y + self.hide_y) + + def moveBy(self, dx, dy): + # Move the card by (dx, dy). + dx, dy = int(dx), int(dy) + if dx or dy: + self.x = self.x + dx + self.y = self.y + dy + ##print "moveBy:", self.id, dx, dy, self.item.coords() + self.item.move(dx, dy) + + def tkraise(self, unhide=1): + # Raise the card above all other objects in its group (i.e. stack). + if unhide: + self.unhide() + self.item.tkraise() + + + # + # abstract methods + # + + def hide(self, stack): + pass + + def unhide(self): + pass + + def setSelected(self, s, group=None): + pass + + def showFace(self, unhide=1): + # Turn the card's face up. + raise SubclassResponsibility + + def showBack(self, unhide=1): + # Turn the card's face down. + raise SubclassResponsibility + + def updateCardBackground(self, image): + raise SubclassResponsibility + diff --git a/pysollib/actions.py b/pysollib/actions.py new file mode 100644 index 00000000..aabdad7a --- /dev/null +++ b/pysollib/actions.py @@ -0,0 +1,1118 @@ +## -*- coding: utf-8 -*- +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import os, re, sys, string, time, types, locale + +# PySol imports +from mfxutil import EnvError, SubclassResponsibility +from mfxutil import Struct, destruct, openURL +from pysolrandom import constructRandom +from version import VERSION +from settings import PACKAGE, PACKAGE_URL +from settings import TOP_TITLE + +# stats imports +from stats import PysolStatsFormatter +from pysoltk import SingleGame_StatsDialog, AllGames_StatsDialog +from pysoltk import FullLog_StatsDialog, SessionLog_StatsDialog +from pysoltk import Status_StatsDialog, Top_StatsDialog +from pysoltk import GameInfoDialog + +# toolkit imports +from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE +from pysoltk import MfxDialog, MfxSimpleEntry +from pysoltk import MfxExceptionDialog +from pysoltk import BooleanVar, IntVar, StringVar +from pysoltk import PlayerOptionsDialog +from pysoltk import SoundOptionsDialog +from pysoltk import DemoOptionsDialog +#from pysoltk import HintOptionsDialog +from pysoltk import TimeoutsDialog +from pysoltk import ColorsDialog +from pysoltk import FontsDialog +from pysoltk import EditTextDialog +from pysoltk import TOOLBAR_BUTTONS +from help import helpAbout, helpHTML + +gettext = _ + +# /*********************************************************************** +# // menubar +# ************************************************************************/ + +class PysolMenubarActions: + def __init__(self, app, top): + self.app = app + self.top = top + self.game = None + # enabled/disabled - this is set by updateMenuState() + self.menustate = Struct( + save = 0, + save_as = 0, + hold_and_quit = 0, + undo = 0, + redo = 0, + restart = 0, + deal = 0, + hint = 0, + autofaceup = 0, + autodrop = 0, + autodeal = 0, + quickplay = 0, + demo = 0, + highlight_piles = 0, + rules = 0, + pause = 0, + ) + # structure to convert menu-options to Toolkit variables + self.tkopt = Struct( + gameid = IntVar(), + gameid_popular = IntVar(), + comment = BooleanVar(), + autofaceup = BooleanVar(), + autodrop = BooleanVar(), + autodeal = BooleanVar(), + quickplay = BooleanVar(), + undo = BooleanVar(), + bookmarks = BooleanVar(), + hint = BooleanVar(), + highlight_piles = BooleanVar(), + highlight_cards = BooleanVar(), + highlight_samerank = BooleanVar(), + highlight_not_matching = BooleanVar(), + mahjongg_show_removed = BooleanVar(), + shisen_show_hint = BooleanVar(), + sound = BooleanVar(), + cardback = IntVar(), + tabletile = IntVar(), + animations = IntVar(), + shadow = BooleanVar(), + shade = BooleanVar(), + toolbar = IntVar(), + toolbar_style = StringVar(), + toolbar_relief = StringVar(), + toolbar_compound = StringVar(), + toolbar_size = IntVar(), + statusbar = BooleanVar(), + num_cards = BooleanVar(), + helpbar = BooleanVar(), + splashscreen = BooleanVar(), + demo_logo = BooleanVar(), + sticky_mouse = BooleanVar(), + negative_bottom = BooleanVar(), + pause = BooleanVar(), + toolbar_vars = {}, + ) + + for w in TOOLBAR_BUTTONS: + self.tkopt.toolbar_vars[w] = BooleanVar() + + + def connectGame(self, game): + self.game = game + if game is None: + return + assert self.app is game.app + tkopt, opt = self.tkopt, self.app.opt + # set state of the menu items + tkopt.gameid.set(game.id) + tkopt.gameid_popular.set(game.id) + tkopt.comment.set(bool(game.gsaveinfo.comment)) + tkopt.autofaceup.set(opt.autofaceup) + tkopt.autodrop.set(opt.autodrop) + tkopt.autodeal.set(opt.autodeal) + tkopt.quickplay.set(opt.quickplay) + tkopt.undo.set(opt.undo) + tkopt.hint.set(opt.hint) + tkopt.bookmarks.set(opt.bookmarks) + tkopt.highlight_piles.set(opt.highlight_piles) + tkopt.highlight_cards.set(opt.highlight_cards) + tkopt.highlight_samerank.set(opt.highlight_samerank) + tkopt.highlight_not_matching.set(opt.highlight_not_matching) + tkopt.mahjongg_show_removed.set(opt.mahjongg_show_removed) + tkopt.shisen_show_hint.set(opt.shisen_show_hint) + tkopt.sound.set(opt.sound) + tkopt.cardback.set(self.app.cardset.backindex) + tkopt.tabletile.set(self.app.tabletile_index) + tkopt.animations.set(opt.animations) + tkopt.shadow.set(opt.shadow) + tkopt.shade.set(opt.shade) + tkopt.toolbar.set(opt.toolbar) + tkopt.toolbar_style.set(opt.toolbar_style) + tkopt.toolbar_relief.set(opt.toolbar_relief) + tkopt.toolbar_compound.set(opt.toolbar_compound) + tkopt.toolbar_size.set(opt.toolbar_size) + tkopt.toolbar_relief.set(opt.toolbar_relief) + tkopt.statusbar.set(opt.statusbar) + tkopt.num_cards.set(opt.num_cards) + tkopt.helpbar.set(opt.helpbar) + tkopt.demo_logo.set(opt.demo_logo) + tkopt.splashscreen.set(opt.splashscreen) + tkopt.sticky_mouse.set(opt.sticky_mouse) + tkopt.negative_bottom.set(opt.negative_bottom) + + for w in TOOLBAR_BUTTONS: + tkopt.toolbar_vars[w].set(opt.toolbar_vars[w]) + + # will get called after connectGame() + def updateRecentGamesMenu(self, gameids): + pass + + def updateBookmarkMenuState(self): + pass + + # will get called after a new cardset has been loaded + def updateBackgroundImagesMenu(self): + pass + + + # + # delegation to Game + # + + def _finishDrag(self): + return self.game is None or self.game._finishDrag() + + def _cancelDrag(self, break_pause=True): + return self.game is None or self.game._cancelDrag(break_pause=break_pause) + + def changed(self, *args, **kw): + assert self.game is not None + return apply(self.game.changed, args, kw) + + + # + # menu updates + # + + def setMenuState(self, state, path): + raise SubclassResponsibility + + def setToolbarState(self, state, path): + raise SubclassResponsibility + + def _clearMenuState(self): + ms = self.menustate + for k, v in ms.__dict__.items(): + if type(v) is types.ListType: + ms.__dict__[k] = [0] * len(v) + else: + ms.__dict__[k] = 0 + + # update self.menustate for menu items and toolbar + def _updateMenuState(self): + self._clearMenuState() + game = self.game + assert game is not None + opt = self.app.opt + ms = self.menustate + # 0 = DISABLED, 1 = ENABLED + ms.save_as = game.canSaveGame() + ms.hold_and_quit = ms.save_as + if game.filename and ms.save_as: + ms.save = 1 + if opt.undo: + if game.canUndo() and game.moves.index > 0: + ms.undo = 1 + if game.canRedo() and game.moves.index < len(game.moves.history): + ms.redo = 1 + if game.moves.index > 0: + ms.restart = 1 + if game.canDealCards(): + ms.deal = 1 + if game.getHintClass() is not None: + if opt.hint: + ms.hint = 1 + ###if not game.demo: # if not already running + ms.demo = 1 + autostacks = game.getAutoStacks() + if autostacks[0]: + ms.autofaceup = 1 + if autostacks[1] and game.s.foundations: + ms.autodrop = 1 + if game.s.waste: + ms.autodeal = 1 + if autostacks[2]: + ms.quickplay = 1 + ms.highlight_piles = 0 + if opt.highlight_piles and game.getHighlightPilesStacks(): + ms.highlight_piles = 1 + if game.app.getGameRulesFilename(game.id): # note: this may return "" + ms.rules = 1 + if not game.finished: + ms.pause = 1 + + # update menu items and toolbar + def _updateMenus(self): + if self.game is None: + return + ms = self.menustate + # File menu + self.setMenuState(ms.save, "file.save") + self.setMenuState(ms.save_as, "file.saveas") + self.setMenuState(ms.hold_and_quit, "file.holdandquit") + # Edit menu + self.setMenuState(ms.undo, "edit.undo") + self.setMenuState(ms.redo, "edit.redo") + self.setMenuState(ms.redo, "edit.redoall") + self.updateBookmarkMenuState() + self.setMenuState(ms.restart, "edit.restartgame") + # Game menu + self.setMenuState(ms.deal, "game.dealcards") + self.setMenuState(ms.autodrop, "game.autodrop") + self.setMenuState(ms.pause, "game.pause") + # Assist menu + self.setMenuState(ms.hint, "assist.hint") + self.setMenuState(ms.highlight_piles, "assist.highlightpiles") + self.setMenuState(ms.demo, "assist.demo") + self.setMenuState(ms.demo, "assist.demoallgames") + # Options menu + self.setMenuState(ms.autofaceup, "options.automaticplay.autofaceup") + self.setMenuState(ms.autodrop, "options.automaticplay.autodrop") + self.setMenuState(ms.autodeal, "options.automaticplay.autodeal") + self.setMenuState(ms.quickplay, "options.automaticplay.quickplay") + # Help menu + self.setMenuState(ms.rules, "help.rulesforthisgame") + # Toolbar + self.setToolbarState(ms.restart, "restart") + self.setToolbarState(ms.save_as, "save") + self.setToolbarState(ms.undo, "undo") + self.setToolbarState(ms.redo, "redo") + self.setToolbarState(ms.autodrop, "autodrop") + self.setToolbarState(ms.pause, "pause") + self.setToolbarState(ms.rules, "rules") + # + self.tkopt.comment.set(bool(self.game.gsaveinfo.comment)) + #self.setToolbarState(ms.pause, "pause") + + # update menu items and toolbar + def updateMenus(self): + if self.game is None: + return + self._updateMenuState() + self._updateMenus() + + # disable menu items and toolbar + def disableMenus(self): + if self.game is None: + return + self._clearMenuState() + self._updateMenus() + + + # + # File menu + # + + def mNewGame(self, *args): + if self._cancelDrag(): return + if self.changed(): + if not self.game.areYouSure(_("New game")): return + if self.game.nextGameFlags(self.game.id) == 0: + self.game.endGame() + self.game.newGame() + else: + self.game.endGame() + self.game.quitGame(self.game.id) + + def _mSelectGame(self, id, random=None): + if self._cancelDrag(): return + if self.game.id == id: + return + if self.changed(): + if not self.game.areYouSure(_("Select game")): + # restore radiobutton settings + self.tkopt.gameid.set(self.game.id) + self.tkopt.gameid_popular.set(self.game.id) + return + self.game.endGame() + self.game.quitGame(id, random=random) + + def mSelectGame(self, *args): + self._mSelectGame(self.tkopt.gameid.get()) + + def mSelectGamePopular(self, *args): + self._mSelectGame(self.tkopt.gameid_popular.get()) + + def _mNewGameBySeed(self, seed, origin): + try: + random = constructRandom(seed) + if random is None: + return + id = self.game.id + if not self.app.getGameInfo(id): + raise ValueError + except (ValueError, TypeError), ex: + d = MfxDialog(self.top, title=_("Invalid game number"), + text=_("Invalid game number\n") + str(seed), + bitmap="error") + return + f = self.game.nextGameFlags(id, random) + if f & 17 == 0: + return + random.origin = origin + if f & 15 == 0: + self.game.endGame() + self.game.newGame(random=random) + else: + self.game.endGame() + self.game.quitGame(id, random=random) + + def mNewGameWithNextId(self, *args): + if self._cancelDrag(): return + if self.changed(): + if not self.game.areYouSure(_("Select next game number")): return + r = self.game.random + seed = r.increaseSeed(r.initial_seed) + seed = r.str(seed) + self._mNewGameBySeed(seed, self.game.random.ORIGIN_NEXT_GAME) + + def mSelectGameById(self, *args): + if self._cancelDrag(break_pause=False): return + id, f = None, self.game.getGameNumber(format=0) + d = MfxSimpleEntry(self.top, _("Select new game number"), + _("\n\nEnter new game number"), f, + strings=(_("OK"), _("Next number"), _("Cancel")), + default=0, e_width=25) + if d.status != 0: return + if d.button == 2: return + if d.button == 1: + self.mNewGameWithNextId() + return + if self.changed(): + if not self.game.areYouSure(_("Select new game number")): return + self._mNewGameBySeed(d.value, self.game.random.ORIGIN_SELECTED) + + + + def mSelectRandomGame(self, type='all'): + if self._cancelDrag(): return + if self.changed(): + if not self.game.areYouSure(_("Select random game")): return + game_id = None + for i in range(1000): # just in case, don't loop forever + gi = self.app.getGameInfo(self.app.getRandomGameId()) + if gi is None: + continue + if 1 and gi.id == self.game.id: + # force change of game + continue + if 1 and gi.category != self.game.gameinfo.category: + # don't change game category + continue + if type == 'all': + game_id = gi.id + break + won, lost = self.app.stats.getStats(self.app.opt.player, gi.id) + if type == 'won' and won > 0: + game_id = gi.id + break + if type == 'not won' and won == 0 and lost > 0: + game_id = gi.id + break + if type == 'not played' and won+lost == 0: + game_id = gi.id + break + if game_id and game_id != self.game.id: + self.game.endGame() + self.game.quitGame(gi.id) + + def _mSelectNextGameFromList(self, gl, step): + if self._cancelDrag(): return + id = self.game.id + gl = list(gl) + if len(gl) < 2 or not id in gl: + return + if self.changed(): + if not self.game.areYouSure(_("Select next game")): return + index = (gl.index(id) + step) % len(gl) + self.game.endGame() + self.game.quitGame(gl[index]) + + def mSelectNextGameById(self, *args): + self._mSelectNextGameFromList(self.app.gdb.getGamesIdSortedById(), 1) + + def mSelectPrevGameById(self, *args): + self._mSelectNextGameFromList(self.app.gdb.getGamesIdSortedById(), -1) + + def mSelectNextGameByName(self, *args): + self._mSelectNextGameFromList(self.app.gdb.getGamesIdSortedByName(), 1) + + def mSelectPrevGameByName(self, *args): + self._mSelectNextGameFromList(self.app.gdb.getGamesIdSortedByName(), -1) + + def mSave(self, *args): + if self._cancelDrag(break_pause=False): return + if self.menustate.save_as: + if self.game.filename: + self.game.saveGame(self.game.filename) + else: + self.mSaveAs() + + def mHoldAndQuit(self, *args): + if self._cancelDrag(): return + self.game.endGame(holdgame=1) + self.game.quitGame(holdgame=1) + + def mQuit(self, *args): + if self._cancelDrag(): return + if self.changed(): + if not self.game.areYouSure(_("Quit ") + PACKAGE): return + self.game.endGame() + self.game.quitGame() + + + # + # Edit menu + # + + def mUndo(self, *args): + if self._cancelDrag(): return + if self.menustate.undo: + self.game.playSample("undo") + self.game.undo() + + def mRedo(self, *args): + if self._cancelDrag(): return + if self.menustate.redo: + self.game.playSample("redo") + self.game.redo() + self.game.checkForWin() + + def mRedoAll(self, *args): + if self._cancelDrag(): return + if self.menustate.redo: + self.game.playSample("redo", loop=1) + while self.game.moves.index < len(self.game.moves.history): + self.game.redo() + if self.game.checkForWin(): + break + self.game.stopSamples() + + def mSetBookmark(self, n, confirm=1): + if self._cancelDrag(): return + if not self.app.opt.bookmarks: return + if not (0 <= n <= 8): return + self.game.setBookmark(n, confirm=confirm) + self.game.updateMenus() + + def mGotoBookmark(self, n, confirm=-1): + if self._cancelDrag(): return + if not self.app.opt.bookmarks: return + if not (0 <= n <= 8): return + self.game.gotoBookmark(n, confirm=confirm) + self.game.updateMenus() + + def mClearBookmarks(self, *args): + if self._cancelDrag(): return + if not self.app.opt.bookmarks: return + if not self.game.gsaveinfo.bookmarks: return + if not self.game.areYouSure(_("Clear bookmarks"), + _("Clear all bookmarks ?")): + return + self.game.gsaveinfo.bookmarks = {} + self.game.updateMenus() + + def mRestart(self, *args): + if self._cancelDrag(): return + if self.game.moves.index == 0: + return + if self.changed(restart=1): + if not self.game.areYouSure(_("Restart game"), + _("Restart this game ?")): + return + self.game.restartGame() + + + # + # Game menu + # + + def mDeal(self, *args): + if self._cancelDrag(): return + self.game.dealCards() + + def mDrop(self, *args): + if self._cancelDrag(): return + self.game.autoPlay(autofaceup=-1, autodrop=1) + + def mDrop1(self, *args): + if self._cancelDrag(): return + self.game.autoPlay(autofaceup=1, autodrop=1) + + def mStatus(self, *args): + if self._cancelDrag(break_pause=False): return + self.mPlayerStats(mode=100) + + def mTop10(self, *args): + if self._cancelDrag(break_pause=False): return + self.mPlayerStats(mode=105) + + def mGameInfo(self, *args): + if self._cancelDrag(break_pause=False): return + self.mPlayerStats(mode=106) + + def mEditGameComment(self, *args): + if self._cancelDrag(break_pause=False): return + game, gi = self.game, self.game.gameinfo + t = " " + game.getGameNumber(format=1) + cc = _("Comments for %s:\n\n") % (gi.name + t) + c = game.gsaveinfo.comment or cc + d = EditTextDialog(game.top, _("Comments for ")+t, text=c) + if d.status == 0 and d.button == 0: + text = d.text + if text.strip() == cc.strip(): + game.gsaveinfo.comment = "" + else: + game.gsaveinfo.comment = d.text + # save to file + fn = os.path.join(self.app.dn.config, "comments.txt") + fn = os.path.normpath(fn) + if not text.endswith(os.linesep): + text += os.linesep + enc = locale.getpreferredencoding() + try: + fd = open(fn, 'a') + fd.write(text.encode(enc, 'replace')) + except Exception, err: + d = MfxExceptionDialog(self.top, err, + text=_("Error while writing to file")) + else: + if fd: fd.close() + d = MfxDialog(self.top, title=PACKAGE+_(" Info"), bitmap="info", + text=_("Comments were appended to\n\n") + fn) + self.tkopt.comment.set(bool(game.gsaveinfo.comment)) + + + def mPause(self, *args): + if not self.game.pause: + if self._cancelDrag(): return + self.game.doPause() + self.tkopt.pause.set(self.game.pause) + + # + # Game menu - statistics + # + + def _mStatsSave(self, player, header, filename, write_method): + file = None + if player is None: + text = _("Demo statistics") + filename = filename + "_demo" + else: + text = _("Your statistics") + filename = os.path.join(self.app.dn.config, filename + ".txt") + filename = os.path.normpath(filename) + try: + file = open(filename, "a") + a = PysolStatsFormatter(self.app) + writer = a.FileWriter(file) + apply(write_method, (a, writer, player, header)) + destruct(a) + except EnvError, ex: + if file: file.close() + d = MfxExceptionDialog(self.top, ex, + text=_("Error while writing to file")) + else: + if file: file.close() + d = MfxDialog(self.top, title=PACKAGE+_(" Info"), bitmap="info", + text=text + _(" were appended to\n\n") + filename) + + + def mPlayerStats(self, *args, **kw): + mode = kw.get("mode", 101) + demo = 0 + while mode > 0: + if mode > 1000: + demo = not demo + mode = mode % 1000 + # + d = Struct(status=-1, button=-1) + if demo: + player = None + p0, p1, p2 = PACKAGE+_(" Demo"), PACKAGE+_(" Demo "), "" + else: + player = self.app.opt.player + p0, p1, p2 = player, "", _(" for ") + player + n = gettext(self.game.gameinfo.short_name) + # + if mode == 100: + d = Status_StatsDialog(self.top, game=self.game) + elif mode == 101: + header = p1 + _("Statistics for ") + n + d = SingleGame_StatsDialog(self.top, header, self.app, player, gameid=self.game.id) + elif mode == 102: + header = p1 + _("Statistics") + p2 + d = AllGames_StatsDialog(self.top, header, self.app, player) + elif mode == 103: + header = p1 + _("Full log") + p2 + d = FullLog_StatsDialog(self.top, header, self.app, player) + elif mode == 104: + header = p1 + _("Session log") + p2 + d = SessionLog_StatsDialog(self.top, header, self.app, player) + elif mode == 105: + header = p1 + TOP_TITLE + _(" for ") + n + d = Top_StatsDialog(self.top, header, self.app, player, gameid=self.game.id) + elif mode == 106: + header = _("Game Info") + d = GameInfoDialog(self.top, header, self.app) + elif mode == 202: + # print stats to file + header = _("Statistics for ") + p0 + write_method = PysolStatsFormatter.writeStats + self._mStatsSave(player, header, "stats", write_method) + elif mode == 203: + # print full log to file + header = _("Full log for ") + p0 + write_method = PysolStatsFormatter.writeFullLog + self._mStatsSave(player, header, "log", write_method) + elif mode == 204: + # print session log to file + header = _("Session log for ") + p0 + write_method = PysolStatsFormatter.writeSessionLog + self._mStatsSave(player, header, "log", write_method) + elif mode == 301: + # reset all player stats + if self.game.areYouSure(_("Reset all statistics"), + _("Reset ALL statistics and logs for player\n%s ?") % p0, + confirm=1, default=1): + self.app.stats.resetStats(player, 0) + self.game.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.game.id)) + elif mode == 302: + # reset player stats for current game + if self.game.areYouSure(_("Reset game statistics"), + _('Reset statistics and logs for player\n%s\nand game\n%s ?') % (p0, n), + confirm=1, default=1): + self.app.stats.resetStats(player, self.game.id) + self.game.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.game.id)) + elif mode == 401: + # start a new game with a gameid + ## TODO + pass + elif mode == 402: + # start a new game with a gameid / gamenumber + ## TODO + pass + else: + print "stats problem:", mode, demo, player + pass + if d.status != 0: + break + mode = d.button + + + # + # Assist menu + # + + def mHint(self, *args): + if self._cancelDrag(): return + if self.app.opt.hint: + if self.game.showHint(0, self.app.opt.hint_sleep): + self.game.stats.hints = self.game.stats.hints + 1 + + def mHint1(self, *args): + if self._cancelDrag(): return + if self.app.opt.hint: + if self.game.showHint(1, self.app.opt.hint_sleep): + self.game.stats.hints = self.game.stats.hints + 1 + + def mHighlightPiles(self, *args): + if self._cancelDrag(): return + if self.app.opt.highlight_piles: + if self.game.highlightPiles(self.app.opt.highlight_piles_sleep): + self.game.stats.highlight_piles = self.game.stats.highlight_piles + 1 + + def mDemo(self, *args): + if self._cancelDrag(): return + if self.game.getHintClass() is not None: + self._mDemo(mixed=0) + + def mMixedDemo(self, *args): + if self._cancelDrag(): return + self._mDemo(mixed=1) + + def _mDemo(self, mixed): + if self._cancelDrag(): return + if self.changed(): + # only ask if there have been no demo moves or hints yet + if self.game.stats.demo_moves == 0 and self.game.stats.hints == 0: + if not self.game.areYouSure(_("Play demo")): return + ##self.app.demo_counter = 0 + self.game.startDemo(mixed=mixed) + + + # + # Options menu + # + + def mOptPlayerOptions(self, *args): + if self._cancelDrag(break_pause=False): return + d = PlayerOptionsDialog(self.top, _("Set player options"), self.app) + if d.status == 0 and d.button == 0: + self.app.opt.confirm = bool(d.confirm) + self.app.opt.update_player_stats = bool(d.update_stats) + self.app.opt.win_animation = bool(d.win_animation) + ##n = string.strip(d.player) + n = d.player[:30].strip() + if 0 < len(n) <= 30: + self.app.opt.player = n + self.game.updateStatus(player=self.app.opt.player) + self.game.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.game.id)) + + def mOptAutoFaceUp(self, *args): + if self._cancelDrag(): return + self.app.opt.autofaceup = self.tkopt.autofaceup.get() + if self.app.opt.autofaceup: + self.game.autoPlay() + + def mOptAutoDrop(self, *args): + if self._cancelDrag(): return + self.app.opt.autodrop = self.tkopt.autodrop.get() + if self.app.opt.autodrop: + self.game.autoPlay() + + def mOptAutoDeal(self, *args): + if self._cancelDrag(): return + self.app.opt.autodeal = self.tkopt.autodeal.get() + if self.app.opt.autodeal: + self.game.autoPlay() + + def mOptQuickPlay(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.quickplay = self.tkopt.quickplay.get() + + def mOptEnableUndo(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.undo = self.tkopt.undo.get() + self.game.updateMenus() + + def mOptEnableBookmarks(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.bookmarks = self.tkopt.bookmarks.get() + self.game.updateMenus() + + def mOptEnableHint(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.hint = self.tkopt.hint.get() + self.game.updateMenus() + + def mOptEnableHighlightPiles(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_piles = self.tkopt.highlight_piles.get() + self.game.updateMenus() + + def mOptEnableHighlightCards(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_cards = self.tkopt.highlight_cards.get() + self.game.updateMenus() + + def mOptEnableHighlightSameRank(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_samerank = self.tkopt.highlight_samerank.get() + ##self.game.updateMenus() + + def mOptEnableHighlightNotMatching(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_not_matching = self.tkopt.highlight_not_matching.get() + ##self.game.updateMenus() + + def mOptMahjonggShowRemoved(self, *args): + if self._cancelDrag(): return + self.app.opt.mahjongg_show_removed = self.tkopt.mahjongg_show_removed.get() + ##self.game.updateMenus() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def mOptShisenShowHint(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shisen_show_hint = self.tkopt.shisen_show_hint.get() + ##self.game.updateMenus() + + def mOptSound(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.sound = self.tkopt.sound.get() + if not self.app.opt.sound: + self.app.audio.stopAll() + + def mOptSoundDialog(self, *args): + if self._cancelDrag(break_pause=False): return + d = SoundOptionsDialog(self.top, _("Sound settings"), self.app) + self.tkopt.sound.set(self.app.opt.sound) + + def mOptAnimations(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.animations = self.tkopt.animations.get() + + def mOptShadow(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shadow = self.tkopt.shadow.get() + + def mOptShade(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shade = self.tkopt.shade.get() + + def mOptIrregularPiles(self, *args): + if self._cancelDrag(): return + self.app.opt.irregular_piles = self.tkopt.irregular_piles.get() + + def mOptDemoOptions(self, *args): + if self._cancelDrag(break_pause=False): return + d = DemoOptionsDialog(self.top, _("Set demo options"), self.app) + if d.status == 0 and d.button == 0: + self.app.opt.demo_logo = d.demo_logo + self.app.opt.demo_score = d.demo_score + self.app.opt.demo_sleep = d.demo_sleep + +## def mOptHintOptions(self, *args): +## if self._cancelDrag(break_pause=False): return +## d = HintOptionsDialog(self.top, "Set hint options", self.app) +## if d.status == 0 and d.button == 0: +## self.app.opt.hint_sleep = d.hint_sleep + + def mOptColorsOptions(self, *args): + if self._cancelDrag(break_pause=False): return + d = ColorsDialog(self.top, _("Set colors"), self.app) + table_text_color = self.app.opt.table_text_color + table_text_color_value = self.app.opt.table_text_color_value + if d.status == 0 and d.button == 0: + self.app.opt.table_text_color = d.table_text_color + self.app.opt.table_text_color_value = d.table_text_color_value + ##self.app.opt.table_color = d.table_color + self.app.opt.highlight_piles_colors = d.highlight_piles_colors + self.app.opt.highlight_cards_colors = d.highlight_cards_colors + self.app.opt.highlight_samerank_colors = d.highlight_samerank_colors + self.app.opt.hintarrow_color = d.hintarrow_color + self.app.opt.highlight_not_matching_color = d.highlight_not_matching_color + # + if table_text_color != self.app.opt.table_text_color \ + or table_text_color_value != self.app.opt.table_text_color_value: + self.app.setTile(self.tkopt.tabletile.get(), 1) + + def mOptFontsOptions(self, *args): + if self._cancelDrag(break_pause=False): return + d = FontsDialog(self.top, _("Set fonts"), self.app) + if d.status == 0 and d.button == 0: + self.app.opt.fonts.update(d.fonts) + self._cancelDrag() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def mOptTimeoutsOptions(self, *args): + if self._cancelDrag(break_pause=False): return + d = TimeoutsDialog(self.top, _("Set timeouts"), self.app) + if d.status == 0 and d.button == 0: + self.app.opt.demo_sleep = d.demo_sleep + self.app.opt.hint_sleep = d.hint_sleep + self.app.opt.raise_card_sleep = d.raise_card_sleep + self.app.opt.highlight_piles_sleep = d.highlight_piles_sleep + self.app.opt.highlight_cards_sleep = d.highlight_cards_sleep + self.app.opt.highlight_samerank_sleep = d.highlight_samerank_sleep + + def mOptSave(self, *args): + if self._cancelDrag(break_pause=False): return + try: + self.app.saveOptions() + except Exception, ex: + d = MfxExceptionDialog(self.top, ex, + text=_("Error while saving options")) + else: + # tell the player where their config files reside + d = MfxDialog(self.top, title=PACKAGE+_(" Info"), + text=_("Options were saved to\n\n") + self.app.fn.opt, + bitmap="info") + + # + # Help menu + # + + def mHelp(self, *args): + if self._cancelDrag(break_pause=False): return + helpHTML(self.app, "index.html", "html") + + def mHelpHowToPlay(self, *args): + if self._cancelDrag(break_pause=False): return + helpHTML(self.app, "howtoplay.html", "html") + + def mHelpRules(self, *args): + if self._cancelDrag(break_pause=False): return + if not self.menustate.rules: + return + dir = os.path.join("html", "rules") + ## FIXME: plugins + helpHTML(self.app, self.app.getGameRulesFilename(self.game.id), dir) + + def mHelpLicense(self, *args): + if self._cancelDrag(break_pause=False): return + helpHTML(self.app, "license.html", "html") + + def mHelpNews(self, *args): + if self._cancelDrag(break_pause=False): return + helpHTML(self.app, "news.html", "html") + + def mHelpWebSite(self, *args): + openURL(PACKAGE_URL) + + def mHelpAbout(self, *args): + if self._cancelDrag(break_pause=False): return + helpAbout(self.app) + + # + # misc + # + + def mScreenshot(self, *args): + if self._cancelDrag(): return + f = os.path.join(self.app.dn.config, "screenshots") + if not os.path.isdir(f): + return + f = os.path.join(f, self.app.getGameSaveName(self.game.id)) + i = 1 + while 1: + fn = "%s-%d.ppm" % (f, i) + if not os.path.exists(fn): + break + i = i + 1 + if i >= 10000: # give up + return + self.top.screenshot(fn) + + def mPlayNextMusic(self, *args): + if self._cancelDrag(break_pause=False): return + if self.app.audio and self.app.opt.sound_music_volume > 0: + self.app.audio.playNextMusic() + if 1 and self.app.debug: + index = self.app.audio.getMusicInfo() + music = self.app.music_manager.get(index) + if music: + print "playing music:", music.filename + + def mIconify(self, *args): + self.top.wm_iconify() + + +# /*********************************************************************** +# // toolbar +# ************************************************************************/ + +class PysolToolbarActions: + def __init__(self): + self.game = None + self.menubar = None + + # + # public methods + # + + def connectGame(self, game, menubar): + self.game = game + self.menubar = menubar + + + # + # button event handlers - delegate to menubar + # + + def _busy(self): + raise SubclassResponsibility + + def mNewGame(self, *args): + if not self._busy(): + self.menubar.mNewGame() + return 1 + + def mOpen(self, *args): + if not self._busy(): + self.menubar.mOpen() + return 1 + + def mRestart(self, *args): + if not self._busy(): + self.menubar.mRestart() + return 1 + + def mSave(self, *args): + if not self._busy(): + self.menubar.mSaveAs() + return 1 + + def mUndo(self, *args): + if not self._busy(): + self.menubar.mUndo() + return 1 + + def mRedo(self, *args): + if not self._busy(): + self.menubar.mRedo() + return 1 + + def mDrop(self, *args): + if not self._busy(): + self.menubar.mDrop() + return 1 + + def mPause(self, *args): + if not self._busy(): + self.menubar.mPause() + return 1 + + def mStatus(self, *args): + if not self._busy(): + self.menubar.mStatus() + return 1 + + def mPlayerStats(self, *args): + if not self._busy(): + self.menubar.mPlayerStats() + return 1 + + def mHelpRules(self, *args): + if not self._busy(): + self.menubar.mHelpRules() + return 1 + + def mQuit(self, *args): + if not self._busy(): + self.menubar.mQuit() + return 1 + + def mOptPlayerOptions(self, *args): + if not self._busy(): + self.menubar.mOptPlayerOptions() + return 1 + diff --git a/pysollib/app.py b/pysollib/app.py new file mode 100644 index 00000000..0c9c84a4 --- /dev/null +++ b/pysollib/app.py @@ -0,0 +1,1613 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import sys, os, re, time, types +import traceback + +# PySol imports +from mfxutil import destruct, Struct +from mfxutil import pickle, unpickle, Unpickler, UnpicklingError +from mfxutil import getusername, gethomedir, getprefdir, EnvError +from mfxutil import latin1_to_ascii +from util import Timer +from util import CARDSET, IMAGE_EXTENSIONS +from version import VERSION, VERSION_TUPLE +from settings import PACKAGE, PACKAGE_URL +from resource import CSI, CardsetConfig, Cardset, CardsetManager +from resource import Tile, TileManager +from resource import Sample, SampleManager +from resource import Music, MusicManager +from images import Images, SubsampledImages +from pysolrandom import PysolRandom +from game import Game +from gamedb import GI, GAME_DB, loadGame +from settings import TOP_SIZE, TOP_TITLE + +# Toolkit imports +from pysoltk import tkname, tkversion, wm_withdraw, loadImage +from pysoltk import bind, unbind_destroy +from pysoltk import MfxDialog, MfxExceptionDialog +from pysoltk import TclError, MfxRoot, MfxCanvas, MfxScrolledCanvas +from pysoltk import PysolMenubar +from pysoltk import PysolProgressBar +from pysoltk import PysolToolbar +from pysoltk import PysolStatusbar, HelpStatusbar +from pysoltk import SelectCardsetByTypeDialogWithPreview +from pysoltk import SelectDialogTreeData +from pysoltk import TOOLBAR_BUTTONS +from help import helpAbout + +gettext = _ + +# /*********************************************************************** +# // Options +# ************************************************************************/ + +class Options: + def __init__(self): + self.version_tuple = VERSION_TUPLE + self.saved = 0 + # options menu: + self.player = _("Unknown") + self.confirm = 1 + self.update_player_stats = 1 + self.autofaceup = 1 + self.autodrop = 0 + self.autodeal = 1 + self.quickplay = 1 + self.undo = 1 + self.bookmarks = 1 + self.hint = 1 + self.highlight_piles = 1 + self.highlight_cards = 1 + self.highlight_samerank = 1 + self.highlight_not_matching = 0 + self.mahjongg_show_removed = False + self.mahjongg_create_solvable = True + self.shisen_show_hint = True + self.animations = 2 # default to Timer based + self.shadow = 1 + self.shade = 1 + self.demo_logo = 1 + self.demo_score = 0 + self.toolbar = 1 + ##self.toolbar_style = 'default' + self.toolbar_style = 'crystal' + self.toolbar_relief = 'flat' + self.toolbar_compound = 'none' # icons only + self.toolbar_size = 0 + self.toolbar_vars = {} + for w in TOOLBAR_BUTTONS: + self.toolbar_vars[w] = True + self.statusbar = 1 + self.num_cards = 0 + self.helpbar = 0 + self.sound = 1 + self.sound_mode = 1 + self.sound_sample_volume = 128 + self.sound_music_volume = 128 + # fonts + self.fonts = {"default" : None, + #"default" : ("helvetica", 12), + "sans" : ("times", 14), # for html + "fixed" : ("courier", 14), # for html & log + "small" : ("helvetica", 12), + "canvas_default" : ("helvetica", 12), + #"canvas_card" : ("helvetica", 12), + "canvas_fixed" : ("courier", 12), + "canvas_large" : ("helvetica", 18), + "canvas_small" : ("helvetica", 12), # not used? + #"tree_small" : ("helvetica", 12), + } + if os.name == 'posix': + self.fonts["sans"] = ("helvetica", 12) + if os.name == 'nt': + self.fonts["sans"] = ("times new roman", 14) + self.fonts["fixed"] = ("courier new", 10) + # colors + self.table_color = "#008200" + self.highlight_piles_colors = (None, "#ffc000") + self.highlight_cards_colors = (None, "#ffc000", None, "#0000ff") + self.highlight_samerank_colors = (None, "#ffc000", None, "#0000ff") + self.hintarrow_color = "#303030" + self.highlight_not_matching_color = '#ff0000' + self.table_text_color = 0 + self.table_text_color_value = '#ffffff' + # delays + self.hint_sleep = 1.0 + self.demo_sleep = 1.0 + self.raise_card_sleep = 1.0 + self.highlight_piles_sleep = 1.0 + self.highlight_cards_sleep = 1.0 + self.highlight_samerank_sleep = 1.0 + # additional startup information + self.recent_gameid = [] + self.favorite_gameid = [] + self.last_gameid = 0 # last game played + self.last_player = None # last player + self.last_save_dir = None # last directory for load/save + self.game_holded = 0 + self.wm_maximized = 0 + # + self.splashscreen = True + self.sticky_mouse = False + self.negative_bottom = False + self.cache_carsets = True + # defaults & constants + self.setDefaults() + self.setConstants() + + def setDefaults(self, top=None): + sw, sh, sd = 0, 0, 8 + if top: + sw, sh, sd = top.winfo_screenwidth(), top.winfo_screenheight(), top.winfo_screendepth() + if sd > 8: + #self.tabletile_name = "Fade_Green.ppm" # basename + self.tabletile_name = "Nostalgy.gif" # basename + else: + self.tabletile_name = None + # + #c = "Oxymoron" + c = "Standard" + if sw < 800 or sh < 600: + c = "2000" +## elif sw >= 1024 and sh >= 768 and sd > 8: +## c = "Dondorf Whist A" + self.cardset = { + 0: (c, ""), + CSI.TYPE_FRENCH: (c, ""), + CSI.TYPE_HANAFUDA: ("Kintengu", ""), + CSI.TYPE_MAHJONGG: ("Crystal Mahjongg", ""), + CSI.TYPE_TAROCK: ("Vienna 2K", ""), + CSI.TYPE_HEXADECK: ("Hex A Deck", ""), + CSI.TYPE_MUGHAL_GANJIFA: ("Mughal Ganjifa", ""), + ##CSI.TYPE_MUGHAL_GANJIFA: ("Dashavatara Ganjifa", ""), + ##CSI.TYPE_NAVAGRAHA_GANJIFA: ("Navagraha Ganjifa", ""), + CSI.TYPE_NAVAGRAHA_GANJIFA: ("Dashavatara Ganjifa", ""), + CSI.TYPE_DASHAVATARA_GANJIFA: ("Dashavatara Ganjifa", ""), + CSI.TYPE_TRUMP_ONLY: ("Matrix", ""), + } + + # not changeable options + def setConstants(self): + self.win_animation = 1 + self.dragcursor = 1 + + def copy(self): + opt = Options() + opt.__dict__.update(self.__dict__) + opt.setConstants() + return opt + + +# /*********************************************************************** +# // Statistics +# ************************************************************************/ + +class _GameStatResult: + def __init__(self): + self.min = 0 + self.max = 0 + self.top = [] + self.num = 0 + self.total = 0 # sum of all values + self.average = 0 + + def update(self, value, game_number, game_start_time): + # update min & max + if not self.min or value < self.min: + self.min = value + if not self.max or value > self.max: + self.max = value + # calculate position & update top + position = None + n = 0 + for i in self.top: + if value < i.value: + position = n+1 + v = Struct(value=value, + game_number=game_number, + game_start_time=game_start_time) + self.top.insert(n, v) + del self.top[TOP_SIZE:] + break + n += 1 + if not position and len(self.top) < TOP_SIZE: + v = Struct(value=value, + game_number=game_number, + game_start_time=game_start_time) + self.top.append(v) + position = len(self.top) + # update average + self.total += value + self.num += 1 + self.average = float(self.total)/self.num + return position + + +class GameStat: + def __init__(self, id): + self.gameid = id + # + self.num_total = 0 + #self.num_not_won = 0 + self.num_lost = 0 + self.num_won = 0 + self.num_perfect = 0 + # + self.time_result = _GameStatResult() + self.moves_result = _GameStatResult() + self.total_moves_result = _GameStatResult() + self.score_result = _GameStatResult() + self.score_casino_result = _GameStatResult() + + def update(self, game, status): + # + game_number = game.getGameNumber(format=0) + game_start_time = game.gstats.start_time + # update number of games + # status: + # 0 - LOST + # 1 - WON + # 2 - PERFECT + self.num_total += 1 + assert status in (0, 1, 2) + if status == 0: + self.num_lost += 1 + return + elif status == 1: + self.num_won += 1 + else: # status == 2 + self.num_perfect += 1 + + score = game.getGameScore() + ##print 'GameScore:', score + score_p = None + if not score is None: + score_p = self.score_result.update( + score, game_number, game_start_time) + score = game.getGameScoreCasino() + ##print 'GameScoreCasino:', score + score_casino_p = None + if not score is None: + score_casino_p = self.score_casino_result.update( + score, game_number, game_start_time) + + if status == 0: + return + + game.updateTime() + time_p = self.time_result.update( + game.stats.elapsed_time, game_number, game_start_time) + moves_p = self.moves_result.update( + game.moves.index, game_number, game_start_time) + total_moves_p = self.total_moves_result.update( + game.stats.total_moves, game_number, game_start_time) + + return time_p, moves_p, total_moves_p, score_p, score_casino_p + + +class Statistics: + def __init__(self): + self.version_tuple = VERSION_TUPLE + self.saved = 0 + # a dictionary of dictionaries of GameStat (keys: player and gameid) + self.games_stats = {} + # a dictionary of lists of tuples (key: player) + self.prev_games = {} + self.all_prev_games = {} + self.session_games = {} + # some simple balance scores (key: gameid) + self.total_balance = {} # a dictionary of integers + self.session_balance = {} # reset per session + self.gameid_balance = 0 # reset when changing the gameid + + def new(self): + return Statistics() + + # + # player & demo statistics + # + + def resetStats(self, player, gameid): + self.__resetPrevGames(player, self.prev_games, gameid) + self.__resetPrevGames(player, self.session_games, gameid) + if not self.games_stats.has_key(player): + return + if gameid == 0: + # remove all games + try: del self.games_stats[player] + except KeyError: pass + else: + try: del self.games_stats[player][gameid] + except KeyError: pass + + def __resetPrevGames(self, player, games, gameid): + if not games.has_key(player): + return + if gameid == 0: + del games[player] + else: + games[player] = filter(lambda a, b=gameid: a[0] != b, games[player]) + + def getStats(self, player, gameid): + # returned (won, lost) + return self.getFullStats(player, gameid)[:2] + + def getFullStats(self, player, gameid): + # returned (won, lost, playing time, moves) + stats = self.games_stats + if stats.has_key(player) and stats[player].has_key(gameid): + s = self.games_stats[player][gameid] + return (s.num_won+s.num_perfect, + s.num_lost, + s.time_result.average, + s.moves_result.average,) + return (0, 0, 0, 0) + + def getSessionStats(self, player, gameid): + g = self.session_games.get(player, []) + g = filter(lambda a, b=gameid: a[0] == b, g) + won = len(filter(lambda a, b=gameid: a[2] > 0, g)) + lost = len(filter(lambda a, b=gameid: a[2] == 0, g)) + return won, lost + + def updateStats(self, player, game, status): + return self.updateLog(player, game, status) + + def updateLog(self, player, game, status): + ret = None + log = (game.id, game.getGameNumber(format=0), status, + game.gstats.start_time, game.gstats.total_elapsed_time, + VERSION_TUPLE, game.getGameScore(), game.getGameScoreCasino(), + game.GAME_VERSION) + # full log + if player is not None and status >= 0: + if not self.prev_games.has_key(player): + self.prev_games[player] = [] + self.prev_games[player].append(log) + if not self.all_prev_games.has_key(player): + self.all_prev_games[player] = [] + self.all_prev_games[player].append(log) + ret = self.updateGameStat(player, game, status) + # session log + if not self.session_games.has_key(player): + self.session_games[player] = [] + self.session_games[player].append(log) + return ret + + def updateGameStat(self, player, game, status): + # + if not self.games_stats.has_key(player): + self.games_stats[player] = {} + if not self.games_stats[player].has_key(game.id): + game_stat = GameStat(game.id) + self.games_stats[player][game.id] = game_stat + else: + game_stat = self.games_stats[player][game.id] + return game_stat.update(game, status) + + +# /*********************************************************************** +# // Comments +# ************************************************************************/ + +class Comments: + def __init__(self): + self.version_tuple = VERSION_TUPLE + self.saved = 0 + # + self.comments = {} + + def new(self): + return Comments() + + def setGameComment(self, gameid, text): + player = None + key = (1, gameid, player) + self.comments[key] = str(text) + + def getGameComment(self, gameid): + player = None + key = (1, gameid, player) + return self.comments.get(key, "") + + +# /*********************************************************************** +# // Application +# // This is the glue between the toplevel window and a Game. +# // Also handles all global resources. +# ************************************************************************/ + +class Application: + def __init__(self): + ##self.starttimer = Timer("Application.__init__") + self.gdb = GAME_DB + self.opt = Options() + self.startup_opt = self.opt.copy() + self.stats = Statistics() + self.comments = Comments() + self.splashscreen = 1 + self.debug = 0 + # visual components + self.top = None # the root toplevel window + self.top_bg = None # default background + self.top_palette = [None, None] # from command line [fg, bg] + self.top_cursor = None # default cursor + self.menubar = None + self.toolbar = None + self.canvas = None + self.statusbar = None + self.cardsets_cache = {} + # + self.game = None + self.dataloader = None + self.audio = None + self.images = None + self.subsampled_images = None + self.gimages = Struct( # global images + border = [], + demo = [], # demo logos + pause = [], # pause logos + logos = [], + redeal = [], + ##shade = [], + ##stats = [], + ) + #self.progress_bg = None + self.progress_images = [] + self.cardset_manager = CardsetManager() + self.cardset = None # current cardset + self.tabletile_manager = TileManager() + self.tabletile_index = 0 # current table tile + self.sample_manager = SampleManager() + self.music_manager = MusicManager() + self.music_playlist = [] + self.intro = Struct( + progress = None, # progress bar + ) + # directory names + home = os.path.normpath(gethomedir()) + config = os.path.normpath(getprefdir(PACKAGE, home)) + self.dn = Struct( + home = home, + config = config, + plugins = os.path.join(config, "plugins"), + savegames = os.path.join(config, "savegames"), + maint = os.path.join(config, "maint"), # debug + ) + for k, v in self.dn.__dict__.items(): +## if os.name == "nt": +## v = os.path.normcase(v) + v = os.path.normpath(v) + self.dn.__dict__[k] = v + # file names + self.fn = Struct( + opt = os.path.join(self.dn.config, "options.dat"), + stats = os.path.join(self.dn.config, "statistics.dat"), + holdgame = os.path.join(self.dn.config, "holdgame.dat"), + comments = os.path.join(self.dn.config, "comments.dat"), + ) + for k, v in self.dn.__dict__.items(): + if os.name == "nt": + v = os.path.normcase(v) + v = os.path.normpath(v) + self.fn.__dict__[k] = v + # random generators + self.gamerandom = PysolRandom() + self.miscrandom = PysolRandom() + # player + player = getusername() + if not player: + player = "unknown" + player = player[:30] + self.opt.player = player + # misc + self.nextgame = Struct( + id = 0, # start this game + random = None, # use this random generator + loadedgame = None, # data for loaded game + startdemo = 0, # start demo ? + cardset = None, # use this cardset + holdgame = 0, # hold this game on exit ? + bookmark = None, # goto this bookmark (load new cardset) + ) + self.commandline = Struct( + loadgame = None, # load a game ? + ) + self.demo_counter = 0 + + + # the PySol mainloop + def mainloop(self): + # copy startup options + self.startup_opt = self.opt.copy() + # try to load statistics + try: + self.loadStatistics() + except: + pass + # try to load comments + try: + self.loadComments() + except: + pass + # startup information + if self.getGameClass(self.opt.last_gameid): + self.nextgame.id = self.opt.last_gameid + # load a holded or saved game + id = self.gdb.getGamesIdSortedByName()[0] + tmpgame = self.constructGame(id) + if self.opt.game_holded > 0 and not self.nextgame.loadedgame: + game = None + try: + game = tmpgame._loadGame(self.fn.holdgame, self) + except: + game = None + if game: + if game.id == self.opt.game_holded and game.gstats.holded: + game.gstats.loaded = game.gstats.loaded - 1 + game.gstats.holded = 0 + self.nextgame.loadedgame = game + else: + # not a holded game + game.destruct() + destruct(game) + game = None + if self.commandline.loadgame and not self.nextgame.loadedgame: + try: + self.nextgame.loadedgame = tmpgame._loadGame(self.commandline.loadgame, self) + self.nextgame.loadedgame.gstats.holded = 0 + except: + self.nextgame.loadedgame = None + self.opt.game_holded = 0 + tmpgame.destruct() + destruct(tmpgame) + tmpgame = None + # + # widgets + # + # create the menubar + self.menubar = PysolMenubar(self, self.top) + # create the statusbar(s) + self.statusbar = PysolStatusbar(self.top) + self.statusbar.show(self.opt.statusbar) + self.helpbar = HelpStatusbar(self.top) + self.helpbar.show(self.opt.helpbar) + # create the canvas + self.scrolled_canvas = MfxScrolledCanvas(self.top) + self.canvas = self.scrolled_canvas.canvas + self.scrolled_canvas.grid(row=1, column=1, sticky='nsew') + self.top.grid_columnconfigure(1, weight=1) + self.top.grid_rowconfigure(1, weight=1) + self.setTile(self.tabletile_index, force=True) + # create the toolbar + dir = self.getToolbarImagesDir() + self.toolbar = PysolToolbar(self.top, dir=dir, + size=self.opt.toolbar_size, + relief=self.opt.toolbar_relief, + compound=self.opt.toolbar_compound) + self.toolbar.show(self.opt.toolbar) + for w, v in self.opt.toolbar_vars.items(): + self.toolbar.config(w, v) + # + if self.intro.progress: self.intro.progress.update(step=1) + # + try: + # this is the mainloop + while 1: + assert self.cardset is not None + id, random = self.nextgame.id, self.nextgame.random + self.nextgame.id, self.nextgame.random = 0, None + self.runGame(id, random) + if self.nextgame.holdgame: + assert self.nextgame.id <= 0 + try: + self.game.gstats.holded = 1 + self.game._saveGame(self.fn.holdgame) + self.opt.game_holded = self.game.id + except: + pass + self.freeGame() + # + if self.nextgame.id <= 0: + break + # load new cardset + if self.nextgame.cardset is not self.cardset: + self.loadCardset(self.nextgame.cardset, id=self.nextgame.id, update=7+256) + else: + self.requestCompatibleCardsetType(self.nextgame.id) + finally: + # update options + self.opt.last_gameid = id +## if self.debug: +## self.wm_save_state() +## # save options +## self.saveOptions() +## # save statistics +## self.saveStatistics() +## # save comments +## self.saveComments() +## # shut down audio +## self.audio.destroy() +## else: + try: self.wm_save_state() + except: + pass + # save options + try: self.saveOptions() + except: + pass + # save statistics + try: self.saveStatistics() + except: + pass + # save comments + try: self.saveComments() + except: + pass + # shut down audio + try: self.audio.destroy() + except: + pass + + + def runGame(self, id, random=None): + self.top.connectApp(self) + # create game instance + g = self.getGameClass(id) + if g is None: + id = 2 # start Klondike as default game + random = None + g = self.getGameClass(id) + if g is None: + # start first available game + id = self.gdb.getGamesIdSortedByName()[0] + g = self.getGameClass(id) + gi = self.getGameInfo(id) + #assert g and type(g) is types.ClassType and id > 0 + assert gi is not None and gi.id == id + self.game = self.constructGame(id) + self.gdb.setSelected(id) + self.game.busy = 1 + # create stacks and layout + self.game.create(self) + # connect with game + self.menubar.connectGame(self.game) + self.toolbar.connectGame(self.game, self.menubar) + self.game.updateStatus(player=self.opt.player) + # update "Recent games" menubar entry + while 1: + try: + self.opt.recent_gameid.remove(id) + except ValueError: + break + self.opt.recent_gameid.insert(0, id) + del self.opt.recent_gameid[15:] + self.menubar.updateRecentGamesMenu(self.opt.recent_gameid) + self.menubar.updateFavoriteGamesMenu() + # delete intro progress bar + if self.intro.progress: + self.intro.progress.destroy() + destruct(self.intro.progress) + self.intro.progress = None + # prepare game + autoplay = 0 + if self.nextgame.loadedgame is not None: + self.stats.gameid_balance = 0 + self.game.restoreGame(self.nextgame.loadedgame) + destruct(self.nextgame.loadedgame) + elif self.nextgame.bookmark is not None: + self.game.restoreGameFromBookmark(self.nextgame.bookmark) + else: + self.stats.gameid_balance = 0 + self.game.newGame(random=random, autoplay=0) + autoplay = 1 + self.nextgame.loadedgame = None + self.nextgame.bookmark = None + # splash screen + if self.opt.splashscreen and self.splashscreen > 0: + status = helpAbout(self, timeout=20000, sound=0) + if status == 2: # timeout - start a demo + if autoplay: + self.nextgame.startdemo = 1 + self.splashscreen = 0 + # start demo/autoplay + if self.nextgame.startdemo: + self.nextgame.startdemo = 0 + self.game.startDemo() + self.game.createDemoInfoText() + elif autoplay: + self.game.autoPlay() + self.game.stats.player_moves = 0 + # enter the Tk mainloop + self.game.busy = 0 + self.top.mainloop() + + + # free game + def freeGame(self): + # disconnect from game + self.toolbar.connectGame(None, None) + self.menubar.connectGame(None) + # clean up the canvas + unbind_destroy(self.canvas) + self.canvas.deleteAllItems() + self.canvas.update_idletasks() + # destruct the game + if self.game: + self.game.destruct() + destruct(self.game) + self.game = None + self.top.connectApp(None) + + + # + # UI support + # + + def wm_save_state(self): + if self.top: + s = self.top.wm_state() + ##print "wm_save_state", s + if s == "zoomed": + self.opt.wm_maximized = 1 + elif s == "normal": + self.opt.wm_maximized = 0 + + def wm_withdraw(self): + if self.intro.progress: + self.intro.progress.destroy() + destruct(self.intro.progress) + self.intro.progress = None + if self.top: + wm_withdraw(self.top) + self.top.busyUpdate() + + def loadImages1(self): + dir = os.path.join("images", "logos") + for f in ("joker07_40_774", + "joker08_40_774", + "joker07_50_774", + "joker08_50_774", + "joker11_100_774", + "joker10_100", + "pysol_40",): + self.gimages.logos.append(self.dataloader.findImage(f, dir)) + dir = "images" + ##for f in ("noredeal", "redeal",): + for f in ("stopsign", "redeal",): + self.gimages.redeal.append(self.dataloader.findImage(f, dir)) + + def loadImages2(self): + dir = os.path.join("images", "demo") + for f in ("demo01", "demo02", "demo03", "demo04", "demo05",): + self.gimages.demo.append(self.dataloader.findImage(f, dir)) + dir = os.path.join("images", "pause") + for f in ("pause01", "pause02",): + self.gimages.pause.append(self.dataloader.findImage(f, dir)) + ##dir = os.path.join("images", "stats") + ##for f in ("barchart",): + ## self.gimages.stats.append(self.dataloader.findImage(f, dir)) + + def loadImages3(self): + MfxDialog.img = [] + #dir = os.path.join('images', 'dialog', 'default') + dir = os.path.join('images', 'dialog', 'bluecurve') + for f in ('error', 'info', 'question', 'warning'): + fn = self.dataloader.findImage(f, dir) + im = loadImage(fn) + MfxDialog.img.append(im) + SelectDialogTreeData.img = [] + dir = os.path.join('images', 'tree') + for f in ('folder', 'openfolder', 'node', 'emptynode'): + fn = self.dataloader.findImage(f, dir) + im = loadImage(fn) + SelectDialogTreeData.img.append(im) + + def loadImages4(self): + # load all remaining images + for k, v in self.gimages.__dict__.items(): + if type(v) is types.ListType: + for i in range(len(v)): + if type(v[i]) is types.StringType: + v[i] = loadImage(v[i]) + if self.intro.progress: + self.intro.progress.update(step=1) + self.gimages.__dict__[k] = tuple(v) + + def _getImagesDir(self, *dirs, **kwargs): + check = kwargs.get('check', True) + d = os.path.join(self.dataloader.dir, 'images', *dirs) + if check: + if os.path.exists(d): + return d + return None + return d + + def getToolbarImagesDir(self): + if self.opt.toolbar_size: + size = 'large' + else: + size = 'small' + style = self.opt.toolbar_style + d = self._getImagesDir('toolbar', style, size) + if d: + return d + return self._getImagesDir('toolbar', 'default', size, check=False) + + def setTile(self, i, force=0): + if self.scrolled_canvas.setTile(self, i, force): + tile = self.tabletile_manager.get(i) + if i == 0: + self.opt.table_color = tile.color + self.opt.tabletile_name = None + else: + self.opt.tabletile_name = tile.basename + self.tabletile_index = i + self.tabletile_manager.setSelected(i) + return True + return False + + def getFont(self, name): + return self.opt.fonts.get(name) + + + # + # cardset + # + + def updateCardset(self, id=0, update=7): + cs = self.images.cs + self.cardset = cs + self.nextgame.cardset = cs + # update settings + self.cardset_manager.setSelected(cs.index) + # update options + self.images.setNegative(self.opt.negative_bottom) + self.subsampled_images.setNegative(self.opt.negative_bottom) + if update & 1: + self.opt.cardset[0] = (cs.name, cs.backname) + if update & 2: + self.opt.cardset[cs.si.type] = (cs.name, cs.backname) + gi = self.getGameInfo(id) + if gi: + if update & 256: + try: + del self.opt.cardset[(1, gi.id)] + except KeyError: + pass + t = self.checkCompatibleCardsetType(gi, cs) + if not t[1]: + if update & 4: + self.opt.cardset[gi.category] = (cs.name, cs.backname) + if update & 8: + self.opt.cardset[(1, gi.id)] = (cs.name, cs.backname) + #from pprint import pprint + #pprint(self.opt.cardset) + + def loadCardset(self, cs, id=0, update=7, progress=None): + #print 'loadCardset', cs.ident + r = 0 + if cs is None or cs.error: + return 0 + if cs is self.cardset: + self.updateCardset(id, update=update) + return 1 + # cache carsets + # self.cardsets_cache: + # key: Cardset.type + # value: (Cardset.ident, Images, SubsampledImages) + c = self.cardsets_cache.get(cs.type) + if c and c[0] == cs.ident: + #print 'load from cache', c + self.images, self.subsampled_images = c[1], c[2] + self.updateCardset(id, update=update) + if self.menubar is not None: + self.menubar.updateBackgroundImagesMenu() + return 1 + # + if progress is None: + self.wm_save_state() + self.wm_withdraw() + title = _("Loading %s %s...") % (CARDSET, cs.name) + color = self.opt.table_color + if self.tabletile_index > 0: + color = "#008200" + progress = PysolProgressBar(self, self.top, title=title, + color=color, + images=self.progress_images) + images = Images(self.dataloader, cs) + try: + if not images.load(app=self, progress=progress): + raise Exception, "Invalid or damaged "+CARDSET + simages = SubsampledImages(images) + if self.opt.cache_carsets: + c = self.cardsets_cache.get(cs.type) + if c: + ##c[1].destruct() + destruct(c[1]) + self.cardsets_cache[cs.type] = (cs.ident, images, simages) + elif self.images is not None: + ##self.images.destruct() + destruct(self.images) + # update + self.images = images + self.subsampled_images = simages + self.updateCardset(id, update=update) + r = 1 + except (Exception, TclError, UnpicklingError), ex: + traceback.print_exc() + cs.error = 1 + # restore settings + self.nextgame.cardset = self.cardset + if self.cardset: + self.cardset_manager.setSelected(self.cardset.index) + ##images.destruct() + destruct(images) + d = MfxExceptionDialog(self.top, ex, title=CARDSET+_(" load error"), + text=_("Error while loading ")+CARDSET) + self.intro.progress = progress + if r and self.menubar is not None: + self.menubar.updateBackgroundImagesMenu() + return r + + def checkCompatibleCardsetType(self, gi, cs): + assert gi is not None + assert cs is not None + gc = gi.category + cs_type = cs.si.type + t0, t1 = None, None + if gc == GI.GC_FRENCH: + t0 = "French" + if cs_type not in (CSI.TYPE_FRENCH, + ##CSI.TYPE_TAROCK, + ): + t1 = t0 + elif gc == GI.GC_HANAFUDA: + t0 = "Hanafuda" + if cs_type not in (CSI.TYPE_HANAFUDA,): + t1 = t0 + elif gc == GI.GC_TAROCK: + t0 = "Tarock" + if cs_type not in (CSI.TYPE_TAROCK,): + t1 = t0 + elif gc == GI.GC_MAHJONGG: + t0 = "Mahjongg" + if cs_type not in (CSI.TYPE_MAHJONGG,): + t1 = t0 + elif gc == GI.GC_HEXADECK: + t0 = "Hex A Deck" + if cs_type not in (CSI.TYPE_HEXADECK,): + t1 = t0 + elif gc == GI.GC_MUGHAL_GANJIFA: + t0 = "Mughal Ganjifa" + if cs_type not in (CSI.TYPE_MUGHAL_GANJIFA, + CSI.TYPE_NAVAGRAHA_GANJIFA, + CSI.TYPE_DASHAVATARA_GANJIFA,): + t1 = t0 + elif gc == GI.GC_NAVAGRAHA_GANJIFA: + t0 = "Navagraha Ganjifa" + if cs_type not in (CSI.TYPE_NAVAGRAHA_GANJIFA, + CSI.TYPE_DASHAVATARA_GANJIFA,): + t1 = t0 + elif gc == GI.GC_DASHAVATARA_GANJIFA: + t0 = "Dashavatara Ganjifa" + if cs_type not in (CSI.TYPE_DASHAVATARA_GANJIFA,): + t1 = t0 + elif gc == GI.GC_TRUMP_ONLY: + t0 = "Trump only" + if cs_type not in (CSI.TYPE_TRUMP_ONLY,): + t1 = t0 + elif len(cs.trumps) < gi.ncards: # not enough cards + t1 = t0 + else: + # we should not come here + t0 = t1 = "Unknown" + return t0, t1 + + def getCompatibleCardset(self, gi, cs): + if gi is None: + return cs, 1 + # try current + if cs: + t = self.checkCompatibleCardsetType(gi, cs) + if not t[1]: + return cs, 1 + # try by gameid / category + for key, flag in (((1, gi.id), 8), (gi.category, 4)): + c = self.opt.cardset.get(key) + if not c or len(c) != 2: + continue + cs = self.cardset_manager.getByName(c[0]) + if not cs: + continue + t = self.checkCompatibleCardsetType(gi, cs) + if not t[1]: + cs.updateCardback(backname=c[1]) + return cs, flag + # ask + return None, 0 + + def requestCompatibleCardsetType(self, id): + gi = self.getGameInfo(id) + # + cs, cs_update_flag = self.getCompatibleCardset(gi, self.cardset) + if cs is self.cardset: + return 0 + if cs is not None: + self.loadCardset(cs, update=1) + return 1 + # + t = self.checkCompatibleCardsetType(gi, self.cardset) + d = MfxDialog(self.top, title=_("Incompatible ")+CARDSET, + bitmap="warning", + text=_('''The currently selected %s %s +is not compatible with the game +%s + +Please select a %s type %s. +''') % (CARDSET, self.cardset.name, gi.name, t[0], CARDSET), + strings=(_("OK"),), default=0) + cs = self.__selectCardsetDialog(t) + if cs is None: + return -1 + self.loadCardset(cs, id=id) + return 1 + + def __selectCardsetDialog(self, t): + key = self.cardset.index + d = SelectCardsetByTypeDialogWithPreview( + self.top, title=_("Please select a %s type %s") % (t[0], CARDSET), + app=self, manager=self.cardset_manager, key=key, + strings=(None, _("OK"), _("Cancel")), default=1) + if d.status != 0 or d.button != 1: + return None + cs = self.cardset_manager.get(d.key) + if cs is None or d.key == key: + return None + return cs + + + # + # load & save options, statistics and comments + # + + def loadOptions(self): + self.opt.setDefaults(self.top) + if not os.path.exists(self.fn.opt): + return + opt = unpickle(self.fn.opt) + if opt: + ##import pprint + ##pprint.pprint(opt.__dict__) + #cardset = self.opt.cardset + #cardset.update(opt.cardset) + self.opt.__dict__.update(opt.__dict__) + #self.opt.cardset = cardset + self.opt.setConstants() + + def loadStatistics(self): + stats = unpickle(self.fn.stats) + if stats: + ##print "loaded:", stats.__dict__ + self.stats.__dict__.update(stats.__dict__) + # start a new session + self.stats.session_games = {} + self.stats.session_balance = {} + self.stats.gameid_balance = 0 + + def loadComments(self): + comments = unpickle(self.fn.comments) + if comments: + ##print "loaded:", comments.__dict__ + self.comments.__dict__.update(comments.__dict__) + + def __saveObject(self, obj, fn): + obj.version_tuple = VERSION_TUPLE + obj.saved = obj.saved + 1 + pickle(obj, fn, binmode=1) + + def saveOptions(self): + self.__saveObject(self.opt, self.fn.opt) + + def saveStatistics(self): + self.__saveObject(self.stats, self.fn.stats) + + def saveComments(self): + self.__saveObject(self.comments, self.fn.comments) + + + # + # access games database + # + + def constructGame(self, id): + gi = self.gdb.get(id) + if gi is None: + raise Exception, "Unknown game (id %d)" % id + return gi.gameclass(gi) + + def getGamesIdSortedById(self): + return self.gdb.getGamesIdSortedById() + + def getGamesIdSortedByName(self): + return self.gdb.getGamesIdSortedByName() + + ## + def getGamesIdSortedByPlayed(self): + def _cmp(a, b): + wa, la, ta, ma = self.stats.getFullStats(self.opt.player, a) + wb, lb, tb, mb = self.stats.getFullStats(self.opt.player, b) + return cmp(wb+lb, wa+la) # reverse + games = list(self.gdb.getGamesIdSortedByName()) + games.sort(_cmp) + return games + + def getGamesIdSortedByWon(self): + def _cmp(a, b): + wa, la, ta, ma = self.stats.getFullStats(self.opt.player, a) + wb, lb, tb, mb = self.stats.getFullStats(self.opt.player, b) + return cmp(wb, wa) # reverse + games = list(self.gdb.getGamesIdSortedByName()) + games.sort(_cmp) + return games + + def getGamesIdSortedByLost(self): + def _cmp(a, b): + wa, la, ta, ma = self.stats.getFullStats(self.opt.player, a) + wb, lb, tb, mb = self.stats.getFullStats(self.opt.player, b) + return cmp(lb, la) # reverse + games = list(self.gdb.getGamesIdSortedByName()) + games.sort(_cmp) + return games + + def getGamesIdSortedByPercent(self): + def _cmp(a, b): + wa, la, ta, ma = self.stats.getFullStats(self.opt.player, a) + wb, lb, tb, mb = self.stats.getFullStats(self.opt.player, b) + if wa+la == 0 or wb+lb == 0: + return cmp(wb+lb, wa+la) # reverse + return cmp(float(wb)/(wb+lb), + float(wa)/(wa+la)) # reverse + games = list(self.gdb.getGamesIdSortedByName()) + games.sort(_cmp) + return games + + def getGamesIdSortedByPlayingTime(self): + def _cmp(a, b): + wa, la, ta, ma = self.stats.getFullStats(self.opt.player, a) + wb, lb, tb, mb = self.stats.getFullStats(self.opt.player, b) + return cmp(tb, ta) # reverse + games = list(self.gdb.getGamesIdSortedByName()) + games.sort(_cmp) + return games + + def getGamesIdSortedByMoves(self): + def _cmp(a, b): + wa, la, ta, ma = self.stats.getFullStats(self.opt.player, a) + wb, lb, tb, mb = self.stats.getFullStats(self.opt.player, b) + return cmp(mb, ma) # reverse + games = list(self.gdb.getGamesIdSortedByName()) + games.sort(_cmp) + return games + + + def getGameInfo(self, id): + return self.gdb.get(id) + + def getGameClass(self, id): + gi = self.gdb.get(id) + if gi is None: return None + return gi.gameclass + + def getGameTitleName(self, id): + gi = self.gdb.get(id) + if gi is None: return None + return gettext(gi.name) + + def getGameMenuitemName(self, id): + gi = self.gdb.get(id) + if gi is None: return None + return gi.short_name + + def getGameRulesFilename(self, id): + gi = self.gdb.get(id) + if gi is None: return None + if gi.rules_filename is not None: + return gi.rules_filename + n = gi.name + n = re.sub(r"[\[\(].*$", "", n) + n = latin1_to_ascii(n) + n = re.sub(r"[^\w]", "", n) + n = n.lower() + ".html" + f = os.path.join(self.dataloader.dir, "html", "rules", n) + if not os.path.exists(f): + n = '' + gi.rules_filename = n # cache the filename for next use + return n + + def getGameSaveName(self, id): + n = self.getGameTitleName(id) + if not n: return None + m = re.search(r"^(.*)([\[\(](\w+).*[\]\)])\s*$", n) + if m: + n = m.group(1) + "_" + m.group(2).lower() + n = latin1_to_ascii(n) + return re.sub(r"[^\w\-]", "", n) + + def getRandomGameId(self): + return self.miscrandom.choice(self.gdb.getGamesIdSortedById()) + + def getAllUserNames(self): + names = [] + for n in self.stats.games_stats.keys(): + if self.stats.games_stats[n]: + names.append(n) + names.sort() + return names + + # + # plugins + # + + def loadPlugins(self, dir): + if not dir or not os.path.isdir(dir): + return + names = os.listdir(dir) + names = map(os.path.normcase, names) + names.sort() + for name in names: + m = re.search(r"^(.+)\.py$", name) + n = os.path.join(dir, name) + if m and os.path.isfile(n): + p = sys.path[:] + try: + loadGame(m.group(1), n) + except Exception, ex: + print "Error loading plugin " + n + ": " + str(ex) + sys.stdout.flush() + sys.path = p + + + # + # init cardsets + # + + # read & parse a cardset config.txt file - see class Cardset in resource.py + def _readCardsetConfig(self, dir, filename): + f = None + try: + f = open(filename, "r") + lines = f.readlines() + finally: + if f: f.close() + lines = [l.strip() for l in lines] + if lines[0].find("PySol") != 0: + return None + config = CardsetConfig() + if not self._parseCardsetConfig(config, lines): + ##print filename, 'invalide config' + return None + if config.CARDD > self.top.winfo_screendepth(): + return None + cs = Cardset() + cs.dir = dir + cs.update(config.__dict__) + return cs + + def _parseCardsetConfig(self, cs, line): + _debug = True + def print_err(line, field=None, msg=''): + if field: + print '_parseCardsetConfig error: line #%d, fields#%d %s' \ + % (line, field, msg) + else: + print '_parseCardsetConfig error: line #%d: %s' \ + % (line, msg) + if len(line) < 6: + if _debug: print_err(1, msg='number of lines') + return 0 + # line[0]: magic identifier, possible version information + fields = [f.strip() for f in line[0].split(';')] + if len(fields) >= 2: + m = re.search(r"^(\d+)$", fields[1]) + if m: cs.version = int(m.group(1)) + if cs.version >= 3: + if len(fields) < 5: + if _debug: print_err(1, msg='number of fields') + return 0 + cs.ext = fields[2] + m = re.search(r"^(\d+)$", fields[3]) + if not m: + if _debug: print_err(1, 3, 'not integer') + return 0 + cs.type = int(m.group(1)) + m = re.search(r"^(\d+)$", fields[4]) + if not m: + if _debug: print_err(1, 4, 'not integer') + return 0 + cs.ncards = int(m.group(1)) + if cs.version >= 4: + if len(fields) < 6: + if _debug: print_err(1, msg='number of fields') + return 0 + styles = fields[5].split(",") + for s in styles: + m = re.search(r"^\s*(\d+)\s*$", s) + if not m: + if _debug: print_err(1, 5, 'not integer') + return 0 + s = int(m.group(1)) + if not s in cs.styles: + cs.styles.append(s) + if cs.version >= 5: + if len(fields) < 7: + if _debug: print_err(1, msg='number of fields') + return 0 + m = re.search(r"^(\d+)$", fields[6]) + if not m: + if _debug: print_err(1, 6, 'not integer') + return 0 + cs.year = int(m.group(1)) + if len(cs.ext) < 2 or cs.ext[0] != ".": + if _debug: print_err(1, msg='invalide extention') + return 0 + # line[1]: identifier/name + if not line[1]: + if _debug: print_err(2, msg='empty line') + return 0 + cs.ident = line[1] + m = re.search(r"^(.*;)?([^;]+)$", cs.ident) + if not m: + if _debug: print_err(2, msg='invalide format') + return 0 + cs.name = m.group(2).strip() + # line[2]: CARDW, CARDH, CARDD + m = re.search(r"^(\d+)\s+(\d+)\s+(\d+)", line[2]) + if not m: + if _debug: print_err(3, msg='invalide format') + return 0 + cs.CARDW, cs.CARDH, cs.CARDD = int(m.group(1)), int(m.group(2)), int(m.group(3)) + # line[3]: CARD_UP_YOFFSET, CARD_DOWN_YOFFSET, SHADOW_XOFFSET, SHADOW_YOFFSET + m = re.search(r"^(\d+)\s+(\d+)\s+(\d+)\s+(\d+)", line[3]) + if not m: + if _debug: print_err(4, msg='invalide format') + return 0 + cs.CARD_XOFFSET = int(m.group(1)) + cs.CARD_YOFFSET = int(m.group(2)) + cs.SHADOW_XOFFSET = int(m.group(3)) + cs.SHADOW_YOFFSET = int(m.group(4)) + # line[4]: default background + back = line[4] + if not back: + if _debug: print_err(5, msg='empty line') + return 0 + # line[5]: all available backgrounds + cs.backnames = [f.strip() for f in line[5].split(';')] + if back in cs.backnames: + cs.backindex = cs.backnames.index(back) + else: + cs.backnames.insert(0, back) + cs.backindex = 0 + ##if cs.type != 1: print cs.type, cs.name + return 1 + + def initCardsets(self): + manager = self.cardset_manager + # find all available cardsets + dirs = manager.getSearchDirs(self, ("cardsets", ""), "PYSOL_CARDSETS") + if self.debug: + dirs = dirs + manager.getSearchDirs(self, "cardsets-*") + try: + dirs = dirs + manager.getRegistryDirs(self, ("PySol_Cardsets", "Cardsets")) + except: + pass + ##print dirs + found, t = [], {} + for dir in dirs: + dir = dir.strip() + try: + names = [] + if dir and os.path.isdir(dir) and not t.has_key(dir): + t[dir] = 1 + names = os.listdir(dir) + names.sort() + for name in names: + if not name.startswith('cardset-'): continue + d = os.path.join(dir, name) + if not os.path.isdir(d): continue + f1 = os.path.join(d, "config.txt") + f2 = os.path.join(d, "COPYRIGHT") + if os.path.isfile(f1) and os.path.isfile(f2): + try: + cs = self._readCardsetConfig(d, f1) + if cs: + ##from pprint import pprint + ##print cs.name + ##pprint(cs.__dict__) + back = cs.backnames[cs.backindex] + f1 = os.path.join(d, back) + f2 = os.path.join(d, "shade" + cs.ext) + if (cs.ext in IMAGE_EXTENSIONS and + os.path.isfile(f1) and os.path.isfile(f2)): + found.append(cs) + #print '+', cs.name + else: + print 'fail _readCardsetConfig:', d, f1 + pass + except Exception, err: + ##traceback.print_exc() + pass + except EnvError, ex: + pass + # register cardsets + for obj in found: + if not manager.getByName(obj.name): + manager.register(obj) + ##print obj.index, obj.name + + + # + # init tiles + # + + def initTiles(self): + manager = self.tabletile_manager + # find all available tiles + dirs = manager.getSearchDirs(self, + ("tiles-*", os.path.join("tiles", 'stretch')), + "PYSOL_TILES") + try: + dirs = dirs + manager.getRegistryDirs(self, "Tiles") + except: + pass + ##print dirs + s = "((\\" + ")|(\\".join(IMAGE_EXTENSIONS) + "))$" + ext_re = re.compile(s, re.I) + text_color_re = re.compile(r"^(.+)-([0-9A-Fa-f]{6})$") + found, t = [], {} + for dir in dirs: + dir = dir.strip() + try: + names = [] + if dir and os.path.isdir(dir): + names = os.listdir(dir) + names.sort() + for name in names: + if not name or not ext_re.search(name): + continue + f = os.path.join(dir, name) + if not os.path.isfile(f): + continue + tile = Tile() + tile.filename = f + n = ext_re.sub("", name.strip()) + if os.path.split(dir)[-1] == 'stretch': + tile.stretch = 1 + elif n.find('-stretch') > 0: + # stretch? + tile.stretch = 1 + n = n.replace('-stretch', '') + #else: + # tile.stretch = 0 + m = text_color_re.search(n) + if m: + n = m.group(1) + tile.text_color = "#" + m.group(2).lower() + #n = re.sub("[-_]", " ", n) + n = n.replace('_', ' ') + tile.name = n + key = n.lower() + if not t.has_key(key): + t[key] = 1 + found.append((n, tile)) + except EnvError, ex: + pass + # register tiles + found.sort() + for f in found: + obj = f[1] + if not manager.getByName(obj.name): + manager.register(obj) + + + # + # init samples / music + # + + def initResource(self, manager, dirs, ext_re, Resource_Class): + found, t = [], {} + for dir in dirs: + dir = dir.strip() + if dir: + dir = os.path.normpath(dir) + try: + names = [] + if dir and os.path.isdir(dir): + names = os.listdir(dir) + names = map(os.path.normcase, names) + names.sort() + for name in names: + if not name or not ext_re.search(name): + continue + f = os.path.join(dir, name) + f = os.path.normpath(f) + if not os.path.isfile(f): + continue + obj = Resource_Class() + obj.filename = f + n = ext_re.sub("", name.strip()) + obj.name = n + key = n.lower() + if not t.has_key(key): + t[key] = 1 + found.append((n, obj)) + except EnvError, ex: + pass + # register songs + found.sort() + if manager: + for f in found: + obj = f[1] + if not manager.getByName(obj.name): + manager.register(obj) + return found + + + def initSamples(self): + manager = self.sample_manager + # find all available samples + dirs = manager.getSearchDirs(self, ("sound", os.path.join("sound", "extra"))) + ##print dirs + ext_re = re.compile(r"\.((wav))$", re.I) + self.initResource(manager, dirs, ext_re, Sample) + + + def initMusic(self): + manager = self.music_manager + # find all available music songs + dirs = manager.getSearchDirs(self, "music-*", "PYSOL_MUSIC") + try: + dirs = dirs + manager.getRegistryDirs(self, "Music") + except: + pass + ##print dirs + ext_re = re.compile(r"\.((it)|(mod)|(mp3)|(pym)|(s3m)|(xm))$", re.I) + self.initResource(manager, dirs, ext_re, Music) + + diff --git a/pysollib/game.py b/pysollib/game.py new file mode 100644 index 00000000..fe193ef3 --- /dev/null +++ b/pysollib/game.py @@ -0,0 +1,2427 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import time, types +from cStringIO import StringIO + +# PySol imports +from mfxutil import Pickler, Unpickler, UnpicklingError +from mfxutil import destruct, Struct, SubclassResponsibility +from mfxutil import UnpicklingError, uclock, usleep +from mfxutil import format_time +from util import get_version_tuple, Timer +from util import ACE, QUEEN, KING +from version import VERSION, VERSION_TUPLE +from settings import PACKAGE +from settings import TOP_TITLE +from gamedb import GI +from resource import CSI +from pysolrandom import PysolRandom, LCRandom31 +from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE +from pysoltk import CURSOR_WATCH, ANCHOR_SW, ANCHOR_SE +from pysoltk import tkname, bind, wm_map +from pysoltk import after, after_idle, after_cancel +from pysoltk import MfxDialog, MfxExceptionDialog +from pysoltk import MfxCanvasText, MfxCanvasImage +from pysoltk import MfxCanvasLine, MfxCanvasRectangle +from pysoltk import Card +from move import AMoveMove, AFlipMove, ATurnStackMove +from move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove +from move import AUpdateStackMove, AFlipAllMove, ASaveStateMove +from hint import DefaultHint +from help import helpAbout + +PLAY_TIME_TIMEOUT = 200 + +# /*********************************************************************** +# // Base class for all solitaire games +# // +# // Handles: +# // load/save +# // undo/redo (using a move history) +# // hints/demo +# ************************************************************************/ + +class Game: + # for self.gstats.updated + U_PLAY = 0 + U_WON = -2 + U_LOST = -3 + U_PERFECT = -4 + + # for self.moves.state + S_INIT = 0x00 + S_DEAL = 0x10 + S_FILL = 0x20 + S_PLAY = 0x30 + S_UNDO = 0x40 + S_REDO = 0x50 + + # for loading and saving - subclasses should override if + # the format for a saved game changed (see also canLoadGame()) + GAME_VERSION = 1 + + + # + # game construction + # + + # only basic initialization here + def __init__(self, gameinfo): + self.preview = 0 + self.random = None + self.gameinfo = gameinfo + self.id = gameinfo.id + assert self.id > 0 + self.busy = 0 + self.pause = False + self.finished = False + self.version = VERSION + self.version_tuple = VERSION_TUPLE + self.cards = [] + self.stackmap = {} # dict with (x,y) tuples as key + self.allstacks = [] + self.demo_logo = None + self.pause_logo = None + self.s = Struct( # stacks + talon = None, + waste = None, + foundations = [], + rows = [], + reserves = [], + internals = [], + ) + self.sg = Struct( # stack-groups + openstacks = [], # for getClosestStack(): only on these stacks the player can place a card + talonstacks = [], # for Hint + dropstacks = [], # for Hint & getAutoStacks() + reservestacks = [], # for Hint +## hint = Struct(), # extra info for class Hint + hp_stacks = [], # for getHightlightPilesStacks() + ) + self.regions = Struct( # for getClosestStack() + # set by optimizeRegions(): + info = [], # list of tuples(stacks, rect) + remaining = [], # list of stacks in no region + # + data = [], # raw data + ) + self.reset() + + # main constructor + def create(self, app): + ##timer = Timer("Game.create") + old_busy = self.busy + self.__createCommon(app) + self.setCursor(cursor=CURSOR_WATCH) + #print 'gameid:', self.id + self.top.wm_title(PACKAGE + " - " + self.getTitleName()) + self.top.wm_iconname(PACKAGE + " - " + self.getTitleName()) + # create the game + if self.app.intro.progress: self.app.intro.progress.update(step=1) + ##print timer + self.createGame() + ##print timer + # set some defaults + self.sg.openstacks = filter(lambda s: s.cap.max_accept >= s.cap.min_accept, self.sg.openstacks) + self.sg.hp_stacks = filter(lambda s: s.cap.max_move >= 2, self.sg.dropstacks) + # convert stackgroups to tuples (speed) + self.allstacks = tuple(self.allstacks) + self.s.foundations = tuple(self.s.foundations) + self.s.rows = tuple(self.s.rows) + self.s.reserves = tuple(self.s.reserves) + self.s.internals = tuple(self.s.internals) + self.sg.openstacks = tuple(self.sg.openstacks) + self.sg.talonstacks = tuple(self.sg.talonstacks) + self.sg.dropstacks = tuple(self.sg.dropstacks) + self.sg.reservestacks = tuple(self.sg.reservestacks) + self.sg.hp_stacks = tuple(self.sg.hp_stacks) + # init the stack view + for stack in self.allstacks: + stack.prepareStack() + stack.assertStack() + if self.s.talon: + assert hasattr(self.s.talon, "round") + assert hasattr(self.s.talon, "max_rounds") + # optimize regions + self.optimizeRegions() + # create cards + ##print timer + if not self.cards: + self.cards = self.createCards(progress=self.app.intro.progress) + self.initBindings() + self.top.bind('', self.top._sleepEvent) + self.top.bind('<3>', self.top._sleepEvent) + ##print timer + # update display properties + self.top.wm_geometry("") # cancel user-specified geometry + self.canvas.setInitialSize(self.width, self.height) + self.stats.update_time = time.time() + self.busy = old_busy + ##print timer + self.showHelp() # just in case + + def initBindings(self): + # note: a Game is only allowed to bind self.canvas and not to self.top + bind(self.canvas, "<1>", self.clickHandler) + bind(self.canvas, "<2>", self.clickHandler) + bind(self.canvas, "<3>", self.clickHandler) + bind(self.top, '', self._unmapHandler) + + def __createCommon(self, app): + self.busy = 1 + self.app = app + self.top = app.top + self.canvas = app.canvas + self.filename = "" + self.drag = Struct( + event = None, # current event + timer = None, # current event timer + start_x = 0, # X coord of initial drag event + start_y = 0, # Y coord of initial drag event + stack = None, # + cards = [], # + shadows = [], # list of canvas images + shade_stack = None, # stack currently shaded + shade_img = None, # canvas image + canshade_stacks = [], # list of stacks already tested + noshade_stacks = [], # for this drag + ) + if self.gstats.start_player is None: + self.gstats.start_player = self.app.opt.player + # optional MfxCanvasText items + self.texts = Struct( + info = None, # misc info text + help = None, # a static help text + misc = None, # + score = None, # for displaying the score + base_rank = None, # for displaying the base_rank + ) + + def createPreview(self, app): + ##timer = Timer("Game.createPreview") + old_busy = self.busy + self.__createCommon(app) + self.preview = max(1, self.canvas.preview) + # create game + self.createGame() + ##print timer + # set some defaults + self.sg.openstacks = filter(lambda s: s.cap.max_accept >= s.cap.min_accept, self.sg.openstacks) + self.sg.hp_stacks = filter(lambda s: s.cap.max_move >= 2, self.sg.dropstacks) + # init the stack view + for stack in self.allstacks: + stack.prepareStack() + stack.assertStack() + # optimize regions + self.optimizeRegions() + # create cards + self.cards = self.createCards() + # + self.canvas.setInitialSize(self.width, self.height) + self.busy = old_busy + + def destruct(self): + # help breaking circular references + for obj in self.cards: + destruct(obj) + for obj in self.allstacks: + obj.destruct() + destruct(obj) + + # Do not destroy game structure (like stacks and cards) here ! + def reset(self, restart=0): + self.filename = "" + self.demo = None + self.hints = Struct( + list = None, # list of hints for the current move + index = -1, + level = -1, + ) + self.saveinfo = Struct( # needed for saving a game + stack_caps = [], + ) + self.loadinfo = Struct( # used when loading a game + stacks = None, + talon_round = 1, + ncards = 0, + ) + # local statistics are reset on each game restart + self.stats = Struct( + hints = 0, # number of hints consumed + highlight_piles = 0, # number of highlight piles consumed + highlight_cards = 0, # number of highlight matching cards consumed + highlight_samerank = 0, # number of highlight same rank consumed + undo_moves = 0, # number of undos + redo_moves = 0, # number of redos + total_moves = 0, # number of total moves in this game + player_moves = 0, # number of moves + demo_moves = 0, # number of moves while in demo mode + autoplay_moves = 0, # number of moves + quickplay_moves = 0, # number of quickplay moves + goto_bookmark_moves = 0, # number of goto bookmark + demo_updated = 0, # did this game already update the demo stats ? + update_time = time.time(), # for updateTime() + elapsed_time = 0.0, + pause_start_time = 0.0, + ) + self.startMoves() + if restart: + return + # global statistics survive a game restart + self.gstats = Struct( + holded = 0, # is this a holded game + loaded = 0, # number of times this game was loaded + saved = 0, # number of times this game was saved + restarted = 0, # number of times this game was restarted + goto_bookmark_moves = 0, # number of goto bookmark + updated = self.U_PLAY, # did this game already update the player stats ? + start_time = time.time(), # game start time + total_elapsed_time = 0.0, + start_player = None, + ) + # global saveinfo survives a game restart + self.gsaveinfo = Struct( + bookmarks = {}, + comment = "", + ) + + def getTitleName(self): + return self.app.getGameTitleName(self.id) + + def getGameNumber(self, format): + s = str(self.random) + if format: return "#" + s + return s + + # this is called from within createGame() + def setSize(self, w, h): + self.width, self.height = int(round(w)), int(round(h)) + + def setCursor(self, cursor): + if self.canvas: + self.canvas.config(cursor=cursor) + ##self.canvas.update_idletasks() + if self.app and self.app.toolbar: + self.app.toolbar.setCursor(cursor=cursor) + + + # + # game creation + # + + # start a new name + def newGame(self, random=None, restart=0, autoplay=1): + self.finished = False + old_busy, self.busy = self.busy, 1 + self.setCursor(cursor=CURSOR_WATCH) + self.disableMenus() + self.reset(restart=restart) + self.resetGame() + self.createRandom(random) + ##print self.random, self.random.__dict__ + self.shuffle() + assert len(self.s.talon.cards) == self.gameinfo.ncards + ##print self.app.starttimer + for stack in self.allstacks: + stack.updateText() + self.updateText() + self.updateStatus(player=self.app.opt.player, + gamenumber=self.getGameNumber(format=1), + moves=(0, 0), + stats=self.app.stats.getStats(self.app.opt.player, self.id)) + # unhide toplevel when we use a progress bar + if not self.preview: + wm_map(self.top, maximized=self.app.opt.wm_maximized) + self.top.busyUpdate() + self.stopSamples() + # let's go + self.moves.state = self.S_INIT + self.startGame() + if self.gameinfo.si.game_flags & GI.GT_OPEN: + if self.s.talon: + assert len(self.s.talon.cards) == 0 + for stack in self.allstacks: + if stack.is_visible: + for c in stack.cards: + assert c.face_up + self.startMoves() + for stack in self.allstacks: + stack.updateText() + self.updateText() + self.updateStatus(moves=(0, 0)) + self.updateMenus() + self.stopSamples() + if autoplay: + self.autoPlay() + self.stats.player_moves = 0 + self.setCursor(cursor=self.app.top_cursor) + self.stats.update_time = time.time() + if not self.preview: + self.startPlayTimer() + self.busy = old_busy + + # restore a loaded game (see load/save below) + def restoreGame(self, game, reset=1): + old_busy, self.busy = self.busy, 1 + if reset: + self.reset() + self.resetGame() + # 1) copy loaded variables + self.filename = game.filename + self.version = game.version + self.version_tuple = game.version_tuple + self.random = game.random + self.moves = game.moves + self.stats = game.stats + self.gstats = game.gstats + # 2) copy extra save-/loadinfo + self.saveinfo = game.saveinfo + self.gsaveinfo = game.gsaveinfo + self.s.talon.round = game.loadinfo.talon_round + self.finished = game.finished + # 3) move cards to stacks + assert len(self.allstacks) == len(game.loadinfo.stacks) + for i in range(len(self.allstacks)): + for t in game.loadinfo.stacks[i]: + card_id, face_up = t + card = self.cards[card_id] + if face_up: + card.showFace() + else: + card.showBack() + self.allstacks[i].addCard(card) + # 4) update settings + for stack_id, cap in self.saveinfo.stack_caps: + ##print stack_id, cap + self.allstacks[stack_id].cap.update(cap.__dict__) + # 5) subclass settings + self._restoreGameHook(game) + # 6) update view + for stack in self.allstacks: + stack.updateText() + self.updateText() + self.updateStatus(player=self.app.opt.player, + gamenumber=self.getGameNumber(format=1), + moves=(self.moves.index, self.stats.total_moves), + stats=self.app.stats.getStats(self.app.opt.player, self.id)) + if not self.preview: + self.updateMenus() + wm_map(self.top, maximized=self.app.opt.wm_maximized) + self.setCursor(cursor=self.app.top_cursor) + self.stats.update_time = time.time() + self.busy = old_busy + # + self.startPlayTimer() + + # restore a bookmarked game (e.g. after changing the cardset) + def restoreGameFromBookmark(self, bookmark): + old_busy, self.busy = self.busy, 1 + file = StringIO(bookmark) + p = Unpickler(file) + game = self._undumpGame(p, self.app) + assert game.id == self.id + self.restoreGame(game, reset=0) + destruct(game) + self.busy = old_busy + + def resetGame(self): + self.hints.list = None + self.s.talon.removeAllCards() + for stack in self.allstacks: + stack.resetGame() + if self.preview <= 1: + for t in (self.texts.score, self.texts.base_rank,): + if t: + t.config(text="") + + def nextGameFlags(self, id, random=None): + f = 0 + if id != self.id: + f = f | 1 + if self.app.nextgame.cardset is not self.app.cardset: + f = f | 2 + if random is not None: + if random.__class__ is not self.random.__class__: + f = f | 16 + elif random.initial_seed != self.random.initial_seed: + f = f | 16 + return f + + # quit to outer mainloop in class App, possibly restarting + # with another game from there + def quitGame(self, id=0, random=None, loadedgame=None, + startdemo=0, bookmark=0, holdgame=0): + self.updateTime() + if bookmark: + id, random = self.id, self.random + file = StringIO() + p = Pickler(file, 1) + self._dumpGame(p, bookmark=1) + self.app.nextgame.bookmark = file.getvalue() + if id > 0: + self.setCursor(cursor=CURSOR_WATCH) + self.app.nextgame.id = id + self.app.nextgame.random = random + self.app.nextgame.loadedgame = loadedgame + self.app.nextgame.startdemo = startdemo + self.app.nextgame.holdgame = holdgame + self.updateStatus(time=None, moves=None, gamenumber=None, stats=None) + self.top.mainquit() + + # This should be called directly before newGame(), + # restoreGame(), restoreGameFromBookmark() and quitGame(). + def endGame(self, restart=0, bookmark=0, holdgame=0): + if self.preview: + return + self.app.wm_save_state() + if holdgame: + return + if bookmark: + return + if restart: + if self.moves.index > 0 and self.getPlayerMoves() > 0: + self.gstats.restarted = self.gstats.restarted + 1 + return + self.updateStats() + stats = self.app.stats + if self.shallUpdateBalance(): + b = self.getGameBalance() + if b: + stats.total_balance[self.id] = stats.total_balance.get(self.id, 0) + b + stats.session_balance[self.id] = stats.session_balance.get(self.id, 0) + b + stats.gameid_balance = stats.gameid_balance + b + + # restart the current game + def restartGame(self): + self.endGame(restart=1) + self.newGame(restart=1, random=self.random) + + def createRandom(self, random): + if random is None: + if isinstance(self.random, PysolRandom): + state = self.random.getstate() + self.app.gamerandom.setstate(state) + # we want at least 17 digits + seed = self.app.gamerandom.randrange(10000000000000000L, + PysolRandom.MAX_SEED) + self.random = PysolRandom(seed) + self.random.origin = self.random.ORIGIN_RANDOM + else: + self.random = random + self.random.reset() + ##print 'createRandom:', self.random + ##print "createRandom: origin =", self.random.origin + + def enterState(self, state): + old_state = self.moves.state + if state < old_state: + self.moves.state = state + return old_state + + def leaveState(self, old_state): + self.moves.state = old_state + + + # + # card creation & shuffling + # + + # Create all cards for the game. + def createCards(self, progress=None): + ##timer = Timer("Game.createCards") + gi = self.gameinfo + pstep = 0 + if progress: + pstep = (100.0 - progress.percent) / gi.ncards + cards = [] + id = 0 + x, y = self.s.talon.x, self.s.talon.y + for deck in range(gi.decks): + for suit in gi.suits: + for rank in gi.ranks: + card = self._createCard(id, deck, suit, rank, x=x, y=y) + if card is None: + continue + cards.append(card) + id = id + 1 + if progress: progress.update(step=pstep) + trump_suit = len(gi.suits) + for rank in gi.trumps: + card = self._createCard(id, deck, trump_suit, rank, x=x, y=y) + if card is None: + continue + cards.append(card) + id = id + 1 + if progress: progress.update(step=pstep) + if progress: progress.update(percent=100) + assert len(cards) == gi.ncards + ##print timer + return cards + + def _createCard(self, id, deck, suit, rank, x, y): + return Card(id, deck, suit, rank, game=self, x=x, y=y) + + # shuffle cards + def shuffle(self): + # get a fresh copy of the original game-cards + cards = list(self.cards) + # init random generator + if isinstance(self.random, LCRandom31) and len(cards) == 52: + # FreeCell mode + fcards = [] + for i in range(13): + for j in (0, 39, 26, 13): + fcards.append(cards[i + j]) + cards = fcards + self.random.reset() # reset to initial seed + # shuffle + self.random.shuffle(cards) + # subclass hook + cards = self._shuffleHook(cards) + # finally add the shuffled cards to the Talon + for card in cards: + self.s.talon.addCard(card, update=0) + card.showBack(unhide=0) + + # shuffle cards, but keep decks together + def shuffleSeparateDecks(self): + cards = [] + self.random.reset() + n = self.gameinfo.ncards / self.gameinfo.decks + for deck in range(self.gameinfo.decks): + i = deck * n + deck_cards = list(self.cards)[i:i+n] + self.random.shuffle(deck_cards) + cards.extend(deck_cards) + cards = self._shuffleHook(cards) + for card in cards: + self.s.talon.addCard(card, update=0) + card.showBack(unhide=0) + + # subclass overrideable (must use self.random) + def _shuffleHook(self, cards): + return cards + + # utility for use by subclasses + def _shuffleHookMoveToTop(self, cards, func, ncards=999999): + # move cards to top of the Talon (i.e. first cards to be dealt) + cards, scards = self._shuffleHookMoveSorter(cards, func, ncards) + return cards + scards + + def _shuffleHookMoveToBottom(self, cards, func, ncards=999999): + # move cards to bottom of the Talon (i.e. last cards to be dealt) + cards, scards = self._shuffleHookMoveSorter(cards, func, ncards) + return scards + cards + + def _shuffleHookMoveSorter(self, cards, func, ncards): + # note that we reverse the cards, so that smaller sort_orders + # will be nearer to the top of the Talon + sitems, i = [], len(cards) + for c in cards[:]: + select, sort_order = func(c) + if select: + cards.remove(c) + sitems.append((sort_order, i, c)) + if len(sitems) >= ncards: + break + i = i - 1 + sitems.sort() + sitems.reverse() + scards = map(lambda item: item[2], sitems) + return cards, scards + + + # + # menu support + # + + def _finishDrag(self): + if self.demo: + self.stopDemo() + if self.busy: return 1 + if self.drag.stack: + self.drag.stack.finishDrag() + return 0 + + def _cancelDrag(self, break_pause=True): + if self.demo: + self.stopDemo() + if break_pause and self.pause: + self.doPause() + self.interruptSleep() + if self.busy: return 1 + if self.drag.stack: + self.drag.stack.cancelDrag() + return 0 + + def updateMenus(self): + if not self.preview: + self.app.menubar.updateMenus() + + def disableMenus(self): + if not self.preview: + self.app.menubar.disableMenus() + + + # + # UI & graphics support + # + + def clickHandler(self, *args): + self.interruptSleep() + if self.demo: + self.stopDemo() + return EVENT_PROPAGATE + + def updateStatus(self, **kw): + if self.preview: + return + tb, sb = self.app.toolbar, self.app.statusbar + for k, v in kw.items(): + if k == "gamenumber": + if v is None: + if sb: sb.updateText(gamenumber="") + continue + if type(v) is types.StringType: + if sb: sb.updateText(gamenumber=v) + continue + if k == "info": + ##print 'updateStatus info:', v + if v is None: + if sb: sb.updateText(info="") + continue + if type(v) is types.StringType: + if sb: sb.updateText(info=v) + continue + if k == "moves": + if v is None: + ##if tb: tb.updateText(moves="Moves\n") + if sb: sb.updateText(moves="") + continue + if type(v) is types.TupleType: + ##if tb: tb.updateText(moves="Moves\n%d/%d" % v) + if sb: sb.updateText(moves="%d/%d" % v) + continue + if type(v) is types.IntType: + ##if tb: tb.updateText(moves="Moves\n%d" % v) + if sb: sb.updateText(moves="%d" % v) + continue + if type(v) is types.StringType: + ##if tb: tb.updateText(moves=v) + if sb: sb.updateText(moves=v) + continue + if k == "player": + if v is None: + if tb: tb.updateText(player=_("Player\n")) + continue + if type(v) in types.StringTypes: + if tb: + #if self.app.opt.toolbar_size: + if self.app.toolbar.getSize(): + tb.updateText(player=_("Player\n") + v) + else: + tb.updateText(player=v) + continue + if k == "stats": + if v is None: + if sb: sb.updateText(stats="") + continue + if type(v) is types.TupleType: + t = "%d: %d/%d" % (v[0]+v[1], v[0], v[1]) + if sb: sb.updateText(stats=t) + continue + if k == "time": + if v is None: + if sb: sb.updateText(time='') + if type(v) in types.StringTypes: + if sb: sb.updateText(time=v) + continue + raise AttributeError, k + + def _unmapHandler(self, event): + # pause game if root window has been iconified + if event.widget is self.top and not self.pause: + self.doPause() + + + # + # sound support + # + + def playSample(self, name, priority=0, loop=0): + ##print "playSample:", name, priority, loop + if self.app.audio: + return self.app.audio.playSample(name, priority=priority, loop=loop) + return 0 + + def stopSamples(self): + if self.app.audio: + self.app.audio.stopSamples() + + def stopSamplesLoop(self): + if self.app.audio: + self.app.audio.stopSamplesLoop() + + def startDealSample(self, loop=999999): + a = self.app.opt.animations + if a and not self.preview: + self.canvas.update_idletasks() + if self.app.audio and self.app.opt.sound: + if a in (1, 2, 5): + self.playSample("deal01", priority=100, loop=loop) + elif a == 3: + self.playSample("deal04", priority=100, loop=loop) + elif a == 4: + self.playSample("deal08", priority=100, loop=loop) + + + # + # misc. methods + # + + def areYouSure(self, title=None, text=None, confirm=-1, default=0): + if self.preview: + return 1 + if confirm < 0: + confirm = self.app.opt.confirm + if confirm: + if not title: title = PACKAGE + if not text: text = _("Discard current game ?") + self.playSample("areyousure") + d = MfxDialog(self.top, title=title, text=text, + bitmap="question", + Default=default, strings=(_("OK"), _("Cancel"))) + if d.status != 0 or d.button != 0: + return 0 + return 1 + + def notYetImplemented(self): + # don't used + d = MfxDialog(self.top, title="Not yet implemented", + text="This function is\nnot yet implemented.", + bitmap="error") + + # main animation method + def animatedMoveTo(self, from_stack, to_stack, cards, x, y, tkraise=1, frames=-1, shadow=-1): + if self.app.opt.animations == 0 or frames == 0: + return + if self.app.debug and not self.top.winfo_ismapped(): + return + # init timer - need a high resolution for this to work + clock, delay, skip = None, 1, 1 + if self.app.opt.animations >= 2: + clock = uclock + SPF = 0.15 / 8 # animation speed - seconds per frame + if frames < 0: + frames = 8 + assert frames >= 2 + if self.app.opt.animations == 3: # slow + frames = frames * 8 + SPF = SPF / 2 + elif self.app.opt.animations == 4: # very slow + frames = frames * 16 + SPF = SPF / 2 + elif self.app.opt.animations == 5: + # this is used internally in game preview to speed up + # the initial dealing + if self.moves.state == self.S_INIT and frames > 4: + frames = frames / 2 + if shadow < 0: + shadow = self.app.opt.shadow + shadows = () + # start animation + if tkraise: + for card in cards: + card.tkraise() + c0 = cards[0] + dx, dy = (x - c0.x) / float(frames), (y - c0.y) / float(frames) + tx, ty = 0, 0 + i = 1 + if clock: starttime = clock() + while i < frames: + mx, my = int(round(dx * i)) - tx, int(round(dy * i)) - ty + tx, ty = tx + mx, ty + my + for s in shadows: + s.move(mx, my) + for card in cards: + card.moveBy(mx, my) + if i == 1 and shadow and from_stack: + # create shadows in the first frame + sx, sy = self.app.images.SHADOW_XOFFSET, self.app.images.SHADOW_YOFFSET + shadows = from_stack.createShadows(cards, sx, sy) + self.canvas.update_idletasks() + step = 1 + if clock: + endtime = starttime + i*SPF + sleep = endtime - clock() + if delay and sleep >= 0.005: + # we're fast - delay + ##print "Delay frame", i, sleep + usleep(sleep) + elif skip and sleep <= -0.75*SPF: + # we're slow - skip 1 or 2 frames + ##print "Skip frame", i, sleep + step = step + 1 + if frames > 4 and sleep < -1.5*SPF: step = step + 1 + ##print i, step, mx, my; time.sleep(0.5) + i = i + step + # last frame: delete shadows, move card to final position + for s in shadows: + s.delete() + dx, dy = x - c0.x, y - c0.y + for card in cards: + card.moveBy(dx, dy) + self.canvas.update_idletasks() + + def winAnimation(self, perfect=0): + # Stupid animation when you win a game. + # FIXME: make this interruptible by a key- or mousepress +### if not self.app.opt.win_animation: +### return + if not self.app.opt.animations: + return + if self.app.debug and not self.top.winfo_ismapped(): + return + self.top.busyUpdate() + old_a = self.app.opt.animations + if old_a == 0: + self.app.opt.animations = 1 # timer based + elif old_a == 4: # very slow + self.app.opt.animations = 3 # slow + cards = [] + for s in self.allstacks: + if s is not self.s.talon: + for c in s.cards: + cards.append((c,s)) + # select some random cards + acards = [] + for i in range(16): + c, s = self.app.miscrandom.choice(cards) + if not c in acards: + acards.append(c) + # animate + sx, sy = self.s.talon.x, self.s.talon.y + w, h = self.width, self.height + while cards: + # get and un-tuple a random card + t = self.app.miscrandom.choice(cards) + c, s = t + s.removeCard(c, update=0) + # animation + if c in acards or len(cards) <= 2: + self.animatedMoveTo(s, None, [c], w/2, h/2, tkraise=0, shadow=0) + self.animatedMoveTo(s, None, [c], sx, sy, tkraise=0, shadow=0) + else: + c.moveTo(sx, sy) + cards.remove(t) + self.app.opt.animations = old_a + + def sleep(self, seconds): +## if 0 and self.canvas: +## self.canvas.update_idletasks() + if seconds > 0: + if self.top: + self.top.interruptSleep() + self.top.sleep(seconds) + else: + time.sleep(seconds) + + def interruptSleep(self): + if self.top: + self.top.interruptSleep() + + # + # card image support + # + + def getCardFaceImage(self, deck, suit, rank): +## if self.app.cardset.type == CSI.TYPE_TAROCK: +## if rank >= 10: +## rank = rank + 1 + return self.app.images.getFace(deck, suit, rank) + + def getCardBackImage(self, deck, suit, rank): + return self.app.images.getBack(deck, suit, rank) + + + # + # layout support + # + + def _getClosestStack(self, cx, cy, stacks, dragstack): + closest, cdist = None, 999999999 + # Since we only compare distances, + # we don't bother to take the square root. + for stack in stacks: + dist = (stack.x - cx)**2 + (stack.y - cy)**2 + if dist < cdist: + closest, cdist = stack, dist + return closest + + def getClosestStack(self, card, dragstack): + cx, cy = card.x, card.y + for stacks, rect in self.regions.info: + if cx >= rect[0] and cx < rect[2] and cy >= rect[1] and cy < rect[3]: + return self._getClosestStack(cx, cy, stacks, dragstack) + return self._getClosestStack(cx, cy, self.regions.remaining, dragstack) + + # define a region for use in getClosestStack() + def setRegion(self, stacks, rect, priority=0): + assert len(stacks) > 0 + assert len(rect) == 4 and rect[0] < rect[2] and rect[1] < rect[3] + ##MfxCanvasRectangle(self.canvas, rect[0], rect[1], rect[2], rect[3], + ## width=2, fill=None, outline='red') + for s in stacks: + assert s and s in self.allstacks + # verify that the stack lies within the rectangle + x, y, r = s.x, s.y, rect + ##print x, y, r + assert r[0] <= x <= r[2] and r[1] <= y <= r[3] + # verify that the stack is not already in another region + # with the same priority + for d in self.regions.data: + if priority == d[0]: + assert not s in d[2] + # add to regions + self.regions.data.append((priority, -len(self.regions.data), tuple(stacks), tuple(rect))) + + # as getClosestStack() is called within the mouse motion handler + # event it is worth optimizing a little bit + def optimizeRegions(self): + # sort regions.data by priority + self.regions.data.sort() + self.regions.data.reverse() + # copy (stacks, rect) to regions.info + self.regions.info = [] + for d in self.regions.data: + self.regions.info.append((d[2], d[3])) + self.regions.info = tuple(self.regions.info) + # determine remaining stacks + remaining = list(self.sg.openstacks) + for stacks, rect in self.regions.info: + for stack in stacks: + while stack in remaining: + remaining.remove(stack) + self.regions.remaining = tuple(remaining) + ##print self.regions.info + + + # + # Game - subclass overridable actions - IMPORTANT FOR GAME LOGIC + # + + # create the game (create stacks, texts, etc.) + def createGame(self): + raise SubclassResponsibility + + # start the game (i.e. deal initial cards) + def startGame(self): + raise SubclassResponsibility + + # can we deal cards ? + def canDealCards(self): + # default: ask the Talon + return self.s.talon and self.s.talon.canDealCards() + + # deal cards - return number of cards dealt + def dealCards(self, sound=1): + # default: set state to deal and pass dealing to Talon + if self.s.talon and self.canDealCards(): + self.finishMove() + old_state = self.enterState(self.S_DEAL) + n = self.s.talon.dealCards(sound=sound) + self.leaveState(old_state) + self.finishMove() + if not self.checkForWin(): + self.autoPlay() + return n + return 0 + + # fill a stack if rules require it (e.g. Picture Gallery) + def fillStack(self, stack): + pass + + # the actual hint class (or None) + Hint_Class = DefaultHint + + def getHintClass(self): + return self.Hint_Class + + def getStrictness(self): + return 0 + + # can we save outself ? + def canSaveGame(self): + return 1 + # can we load this game ? + def canLoadGame(self, version_tuple, game_version): + return self.GAME_VERSION == game_version + # can we set a bookmark ? + def canSetBookmark(self): + return self.canSaveGame() + + # can we undo/redo ? + def canUndo(self): + return 1 + def canRedo(self): + return self.canUndo() + + + # + # Game - stats handlers + # + + # game changed - i.e. should we ask the player to discard the game + def changed(self, restart=0): + if self.gstats.updated < 0: + return 0 # already won or lost + if self.gstats.loaded > 0: + return 0 # loaded games account for no stats + if not restart: + if self.gstats.restarted > 0: + return 1 # game was restarted - always ask + if self.gstats.goto_bookmark_moves > 0: + return 1 + if self.moves.index == 0 or self.getPlayerMoves() == 0: + return 0 + return 2 + + def getWinStatus(self): + won = self.isGameWon() != 0 + if not won or self.stats.hints > 0 or self.stats.demo_moves > 0: + # sorry, you lose + return won, 0, self.U_LOST + if (self.stats.undo_moves == 0 and + self.stats.goto_bookmark_moves == 0 and +### self.stats.quickplay_moves == 0 and + self.stats.highlight_piles == 0 and + self.stats.highlight_cards == 0): + # perfect ! + return won, 2, self.U_PERFECT + return won, 1, self.U_WON + + # update statistics when a game was won/ended/canceled/... + def updateStats(self, demo=0): + if self.preview: + return '' + if not demo: + self.stopPlayTimer() + won, status, updated = self.getWinStatus() + if demo and self.getPlayerMoves() == 0: + # a pure demo game - update demo stats + self.stats.demo_updated = updated + self.app.stats.updateStats(None, self, won) + return '' + elif self.changed(): + # must update player stats + self.gstats.updated = updated + if self.app.opt.update_player_stats: + ret = self.app.stats.updateStats(self.app.opt.player, self, status) + self.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.id)) + top_msg = '' + if ret: + if ret[0]: # playing time + top_msg = _('\nYou have reached\n#%d in the %s of playing time') % (ret[0], TOP_TITLE) + if 1 and ret[1]: # moves + if top_msg: + top_msg += _('\nand #%d in the %s of moves') % (ret[1], TOP_TITLE) + else: + top_msg = _('\nYou have reached\n#%d in the %s of moves') % (ret[1], TOP_TITLE) + if 0 and ret[2]: # total moves + if top_msg: + top_msg += _('\nand #%d in the %s of total moves') % (ret[1], TOP_TITLE) + else: + top_msg = _('\nYou have reached\n#%d in the %s of total moves') % (ret[1], TOP_TITLE) + return top_msg + elif not demo: + # only update the session log + if self.app.opt.update_player_stats: + if self.gstats.loaded: + self.app.stats.updateLog(self.app.opt.player, self, -2) + elif self.gstats.updated == 0 and self.stats.demo_updated == 0: + self.app.stats.updateLog(self.app.opt.player, self, -1) + return '' + + def checkForWin(self): + won, status, updated = self.getWinStatus() + if not won: + return 0 + self.finishMove() # just in case + if self.preview: + return 1 + if self.finished: + return 1 + if self.demo: + return status + if status == 2: + top_msg = self.updateStats() + time = self.getTime() + self.finished = True + self.playSample("winperfect", priority=1000) + d = MfxDialog(self.top, title=_("Game won"), + text=_(''' +Congratulations, this +was a truly perfect game ! + +Your playing time is %s +for %d moves. +%s +''') % (time, self.moves.index, top_msg), + strings=(_("New game"), None, _("Cancel")), + image=self.app.gimages.logos[5], separatorwidth=2) + elif status == 1: + top_msg = self.updateStats() + time = self.getTime() + self.finished = True + self.playSample("winwon", priority=1000) + d = MfxDialog(self.top, title=_("Game won"), + text=_(''' +Congratulations, you did it ! + +Your playing time is %s +for %d moves. +%s +''') % (time, self.moves.index, top_msg), + strings=(_("New game"), None, _("Cancel")), + image=self.app.gimages.logos[4], separatorwidth=2) + elif self.gstats.updated < 0: + self.playSample("winfinished", priority=1000) + d = MfxDialog(self.top, title=_("Game finished"), bitmap="info", + text=_("\nGame finished\n"), + strings=(_("New game"), None, _("Cancel"))) + else: + self.playSample("winlost", priority=1000) + d = MfxDialog(self.top, title=_("Game finished"), bitmap="info", + text=_("\nGame finished, but not without my help...\n"), + strings=(_("New game"), _("Restart"), _("Cancel"))) + self.updateMenus() + if d.status == 0 and d.button == 0: + # new game + self.endGame() + if status == 2: + self.winAnimation(perfect=1) + elif status == 1: + self.winAnimation() + self.newGame() + elif d.status == 0 and d.button == 1: + # restart game + self.restartGame() + return 1 + + + # + # Game - subclass overridable methods (but usually not) + # + + def isGameWon(self): + # default: all Foundations must be filled + c = 0 + for s in self.s.foundations: + c = c + len(s.cards) + return c == len(self.cards) + + def getFoundationDir(self): + for s in self.s.foundations: + if len(s.cards) >= 2: + return s.getRankDir() + return 0 + + # determine the real number of player_moves + def getPlayerMoves(self): + player_moves = self.stats.player_moves +## if self.moves.index > 0 and self.stats.demo_moves == self.moves.index: +## player_moves = 0 + return player_moves + + def updateTime(self): + if self.finished: + return + if self.pause: + return + t = time.time() + d = t - self.stats.update_time + if d > 0: + self.stats.elapsed_time += d + self.gstats.total_elapsed_time += d + self.stats.update_time = t + + def getTime(self): + self.updateTime() + t = int(self.stats.elapsed_time) + return format_time(t) + + + # + # Game - subclass overridable intelligence + # + + def getAutoStacks(self, event=None): + # returns (flipstacks, dropstacks, quickplaystacks) + # default: sg.dropstacks + return (self.sg.dropstacks, self.sg.dropstacks, self.sg.dropstacks) + + # handles autofaceup, autodrop and autodeal + def autoPlay(self, autofaceup=-1, autodrop=-1, autodeal=-1, sound=1): + if self.demo: + return 0 + old_busy, self.busy = self.busy, 1 + if autofaceup < 0: autofaceup = self.app.opt.autofaceup + if autodrop < 0: autodrop = self.app.opt.autodrop + if autodeal < 0: autodeal = self.app.opt.autodeal + moves = self.stats.total_moves + n = self._autoPlay(autofaceup, autodrop, autodeal, sound=sound) + self.finishMove() + self.stats.autoplay_moves = self.stats.autoplay_moves + (self.stats.total_moves - moves) + self.busy = old_busy + return n + + def _autoPlay(self, autofaceup, autodrop, autodeal, sound): + flipstacks, dropstacks, quickstacks = self.getAutoStacks() + done_something = 1 + while done_something: + done_something = 0 + # a) flip top cards face-up + if autofaceup and flipstacks: + for s in flipstacks: + if s.canFlipCard(): + if sound: + self.playSample("autoflip", priority=5) + s.flipMove() + done_something = 1 + # each single flip is undo-able unless opt.autofaceup + self.finishMove() + if self.checkForWin(): + return 1 + # b) drop cards + if autodrop and dropstacks: + for s in dropstacks: + to_stack, ncards = s.canDropCards(self.s.foundations) + if to_stack: + # each single drop is undo-able (note that this call + # is before the acutal move) + self.finishMove() + if sound: + self.playSample("autodrop", priority=30) + s.moveMove(ncards, to_stack) + done_something = 1 + if self.checkForWin(): + return 1 + # c) deal + if autodeal: + if self._autoDeal(sound=sound): + done_something = 1 + self.finishMove() + if self.checkForWin(): + return 1 + return 0 + + def _autoDeal(self, sound=1): + # default: deal a card to the waste if the waste is empty + w = self.s.waste + if w and len(w.cards) == 0 and self.canDealCards(): + return self.dealCards(sound=sound) + return 0 + + + ### highlight all moveable piles + def getHighlightPilesStacks(self): + # default: dropstacks with min pile length = 2 + if self.sg.hp_stacks: + return ((self.sg.hp_stacks, 2),) + return () + + def _highlightCards(self, info, sleep=1.5): + if not info: + return 0 + items = [] + for s, c1, c2, color in info: + assert c1 in s.cards and c2 in s.cards + sy0 = s.CARD_YOFFSET[0] + if sy0 >= 0: + x1, y1 = s.getPositionFor(c1) + x2, y2 = s.getPositionFor(c2) + if c2 is not s.cards[-1] and sy0 > 0: + y2 = y2 + sy0 + else: + y2 = y2 + self.app.images.CARDH + else: + x1, y1 = s.getPositionFor(c2) + x2, y2 = s.getPositionFor(c1) + y2 = y2 + self.app.images.CARDH + if c2 is not s.cards[-1]: + y1 = y1 + (self.app.images.CARDH + sy0) + x2 = x2 + self.app.images.CARDW + ##print c1, c2, x1, y1, x2, y2 + r = MfxCanvasRectangle(self.canvas, x1-1, y1-1, x2+1, y2+1, + width=4, fill=None, outline=color) + r.tkraise(c2.item) + items.append(r) + if not items: + return 0 + self.canvas.update_idletasks() + self.sleep(sleep) + items.reverse() + for r in items: + r.delete() + self.canvas.update_idletasks() + return EVENT_HANDLED + + def highlightNotMatching(self): + if self.demo: + return + if not self.app.opt.highlight_not_matching: + return + # compute visible geometry + x = int(int(self.canvas.cget('width'))*(self.canvas.xview()[0])) + y = int(int(self.canvas.cget('height'))*(self.canvas.yview()[0])) + w, h = self.canvas.winfo_width(), self.canvas.winfo_height() + # + color = self.app.opt.highlight_not_matching_color + width = 6 + r = MfxCanvasRectangle(self.canvas, x+width/2, y+width/2, + x+w-width/2, y+h-width/2, + width=width, fill=None, outline=color) + self.canvas.update_idletasks() + self.sleep(self.app.opt.highlight_cards_sleep) + r.delete() + self.canvas.update_idletasks() + + def highlightPiles(self, stackinfo, sleep=1.5): + stackinfo = self.getHighlightPilesStacks() + if not stackinfo: + return 0 + col = self.app.opt.highlight_piles_colors + hi = [] + for si in stackinfo: + for s in si[0]: + pile = s.getPile() + if pile and len(pile) >= si[1]: + hi.append((s, pile[0], pile[-1], col[1])) + return self._highlightCards(hi, sleep) + + + ### highlight matching cards + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return 0 + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + # prefer non-empty piles in to_stack + return (len(to_stack.cards) != 0) + + + # + # Score (I really don't like scores in Patience games...) + # + + # update game-related canvas texts (i.e. self.texts) + def updateText(self): + pass + + def getGameScore(self): + return None + + # casino type scoring + def getGameScoreCasino(self): + v = -len(self.cards) + for s in self.s.foundations: + v = v + 5 * len(s.cards) + return v + + def shallUpdateBalance(self): + # Update the balance unless this is a loaded game or + # a manually selected game number. + if self.gstats.loaded: + return 0 + if self.random.origin == self.random.ORIGIN_SELECTED: + return 0 + return 1 + + def getGameBalance(self): + return 0 + + + # + # Hint - uses self.getHintClass() + # + + # compute all hints for the current position + # this is the only method that actually uses class Hint + def getHints(self, level, taken_hint=None): + hint_class = self.getHintClass() + if hint_class is None: + return None + hint = hint_class(self, level) # call constructor + return hint.getHints(taken_hint) # and return all hints + + # give a hint + def showHint(self, level=0, sleep=1.5, taken_hint=None): + if self.getHintClass() is None: + self.highlightNotMatching() + return None + # reset list if level has changed + if level != self.hints.level: + self.hints.level = level + self.hints.list = None + # compute all hints + if self.hints.list is None: + self.hints.list = self.getHints(level, taken_hint) + ###print self.hints.list + self.hints.index = 0 + # get next hint from list + if not self.hints.list: + self.highlightNotMatching() + return None + h = self.hints.list[self.hints.index] + self.hints.index = self.hints.index + 1 + if self.hints.index >= len(self.hints.list): + self.hints.index = 0 + # paranoia - verify hint + score, pos, ncards, from_stack, to_stack, text_color, forced_move = h + assert from_stack and len(from_stack.cards) >= ncards + if ncards == 0: + # a deal move, should not happen with level=0/1 + assert level >= 2 + assert from_stack is self.s.talon + return h + elif from_stack == to_stack: + # a flip move, should not happen with level=0/1 + assert level >= 2 + assert ncards == 1 and len(from_stack.cards) >= ncards + return h + else: + # a move move + assert to_stack + assert 1 <= ncards <= len(from_stack.cards) + assert to_stack.acceptsCards(from_stack, from_stack.cards[-ncards:]) + if sleep <= 0.0: + return h + info = (level == 1) or (level > 1 and self.app.opt.demo_score) + if info and self.app.statusbar and self.app.opt.statusbar: + self.app.statusbar.configLabel("info", text=_("Score %6d") % (score), fg=text_color) + else: + info = 0 + self.drawHintArrow(from_stack, to_stack, ncards, sleep) + if info: + self.app.statusbar.configLabel("info", text="", fg="#000000") + return h + + + def drawHintArrow(self, from_stack, to_stack, ncards, sleep): + # compute position for arrow + images = self.app.images + x1, y1 = from_stack.getPositionFor(from_stack.cards[-ncards]) + x2, y2 = to_stack.getPositionFor(to_stack.getCard()) + x1, y1 = x1 + images.CARD_DX, y1 + images.CARD_DY + x2, y2 = x2 + images.CARD_DX, y2 + images.CARD_DY + if ncards == 1: + x1 = x1 + images.CARDW / 2 + y1 = y1 + images.CARDH / 2 + elif from_stack.CARD_XOFFSET[0]: + x1 = x1 + from_stack.CARD_XOFFSET[0] / 2 + y1 = y1 + images.CARDH / 2 + else: + x1 = x1 + images.CARDW / 2 + y1 = y1 + from_stack.CARD_YOFFSET[0] / 2 + x2 = x2 + images.CARDW / 2 + y2 = y2 + images.CARDH / 2 + # draw the hint + arrow = MfxCanvasLine(self.canvas, x1, y1, x2, y2, width=7, + fill=self.app.opt.hintarrow_color, + arrow="last", arrowshape=(30,30,10)) + self.canvas.update_idletasks() + # wait + self.sleep(sleep) + # delete the hint + if arrow is not None: + arrow.delete() + self.canvas.update_idletasks() + + + # + # Demo - uses showHint() + # + + # start a demo + def startDemo(self, mixed=1, level=2): + assert level >= 2 # needed for flip/deal hints + if not self.top: + return + self.demo = Struct( + level = level, + mixed = mixed, + sleep = self.app.opt.demo_sleep, + last_deal = [], + hint = None, + keypress = None, + start_demo_moves = self.stats.demo_moves, + info_text = None, + ) + self.hints.list = None + self.createDemoInfoText() + self.createDemoLogo() + after_idle(self.top, self.demoEvent) # schedule first move + + # stop the demo + def stopDemo(self, event=None): + if not self.demo: + return + self.canvas.setTopImage(None) + self.demo_logo = None + self.demo = None + self.updateMenus() + + # demo event - play one demo move and check for win/loss + def demoEvent(self): + # note: other events are allowed to stop self.demo at any time + if not self.demo or self.demo.keypress: + self.stopDemo() + #self.updateMenus() + return + finished = self.playOneDemoMove(self.demo) + self.finishMove() + self.top.update_idletasks() + self.hints.list = None + player_moves = self.getPlayerMoves() + d, status = None, 0 + bitmap = "info" + timeout = 10000 + if player_moves == 0: + timeout = 5000 + if 0 and self.app.debug and self.demo.mixed: + timeout = 1000 + if self.isGameWon(): + finished = 1 + self.stopPlayTimer() + if not self.top.winfo_ismapped(): + status = 2 + elif player_moves == 0: + self.playSample("autopilotwon") + s = self.app.miscrandom.choice((_("Great"), _("Cool"), _("Yeah"), _("Wow"))) + d = MfxDialog(self.top, title=PACKAGE+_(" Autopilot"), + text=_("\nGame solved in %d moves.\n") % self.moves.index, + image=self.app.gimages.logos[4], strings=(s,), + separatorwidth=2, timeout=timeout) + status = d.status + else: + s = self.app.miscrandom.choice((_("OK"), _("OK"))) + text = _("\nGame finished\n") + if self.app.debug: + text = text + "\n%d %d\n" % (self.stats.player_moves, self.stats.demo_moves) + d = MfxDialog(self.top, title=PACKAGE+_(" Autopilot"), + text=text, bitmap=bitmap, strings=(s,), + padx=30, timeout=timeout) + status = d.status + elif finished: + ##self.stopPlayTimer() + if not self.top.winfo_ismapped(): + status = 2 + else: + if player_moves == 0: + self.playSample("autopilotlost") + s = self.app.miscrandom.choice((_("Oh well"), _("That's life"), _("Hmm"))) + d = MfxDialog(self.top, title=PACKAGE+_(" Autopilot"), + text=_("\nThis won't come out...\n"), + bitmap=bitmap, strings=(s,), + padx=30, timeout=timeout) + status = d.status + if finished: + self.updateStats(demo=1) + if self.demo and status == 2 and not self.app.debug: + # timeout in dialog + if self.stats.demo_moves > self.demo.start_demo_moves: + # we only increase the splash-screen counter if the last + # demo actually made a move + self.app.demo_counter = self.app.demo_counter + 1 + if self.app.demo_counter % 3 == 0: + if self.top.winfo_ismapped(): + status = helpAbout(self.app, timeout=10000) + if self.demo and status == 2: + # timeout in dialog - start another demo + demo = self.demo + id = self.id + if 1 and demo.mixed and self.app.debug: + # debug - advance game id to make sure we hit all games + gl = self.app.gdb.getGamesIdSortedById() + ##gl = self.app.gdb.getGamesIdSortedByName() + gl = list(gl) + index = (gl.index(self.id) + 1) % len(gl) + id = gl[index] + elif demo.mixed: + # choose a random game + gl = self.app.gdb.getGamesIdSortedById() + while len(gl) > 1: + id = self.app.getRandomGameId() + if 0 or id != self.id: # force change of game + break + if self.nextGameFlags(id) == 0: + self.endGame() + self.newGame(autoplay=0) + self.startDemo(mixed=demo.mixed) + else: + self.endGame() + self.stopDemo() + self.quitGame(id, startdemo=1) + else: + self.stopDemo() + if 0 and self.app.debug: + # debug - only for testing winAnimation() + self.endGame() + self.winAnimation() + self.newGame() + else: + # game not finished yet + self.top.busyUpdate() + if self.demo: + after_idle(self.top, self.demoEvent) # schedule next move + + # play one demo move while in the demo event + def playOneDemoMove(self, demo): + if self.moves.index > 2000: + # we're probably looping because of some bug in the hint code + return 1 + sleep = demo.sleep + if self.app.debug: + if not self.top.winfo_ismapped(): + sleep = -1.0 + # first try to deal cards to the Waste (unless there was a forced move) + if not demo.hint or not demo.hint[6]: + if self._autoDeal(sound=0): + return 0 + # display a hint + h = self.showHint(demo.level, sleep, taken_hint=demo.hint) + demo.hint = h + if not h: + return 1 + # now actually play the hint + score, pos, ncards, from_stack, to_stack, text_color, forced_move = h + if ncards == 0: + # a deal-move + if self.dealCards() == 0: + return 1 + # do not let games like Klondike and Canfield deal forever + c = self.s.talon.getCard() + if c in demo.last_deal: + # We went through the whole Talon. Give up. + return 1 + # Note that `None' is a valid entry in last_deal[] + # (this means that all cards are on the Waste). + demo.last_deal.append(c) + elif from_stack == to_stack: + # a flip-move + from_stack.flipMove() + demo.last_deal = [] + else: + # a move-move + from_stack.moveMove(ncards, to_stack, frames=-1) + demo.last_deal = [] + ##print self.moves.index + return 0 + + def createDemoInfoText(self): + ## TODO - the text placement is not fully ok + return + if not self.demo or self.demo.info_text or self.preview: + return + tinfo = [ + ("sw", 8, self.height - 8), + ("se", self.width - 8, self.height - 8), + ("nw", 8, 8), + ("ne", self.width - 8, 8), + ] + ta = self.getDemoInfoTextAttr(tinfo) + if ta: + font = self.app.getFont("canvas_large") + self.demo.info_text = MfxCanvasText(self.canvas, ta[1], ta[2], anchor=ta[0], + font=font, text=self.getDemoInfoText()) + + def getDemoInfoText(self): + return self.gameinfo.short_name + + def getDemoInfoTextAttr(self, tinfo): + items1, items2 = [], [] + for s in self.allstacks: + if s.is_visible: + items1.append(s) + items1.extend(list(s.cards)) + if not s.cards and s.cap.max_accept > 0: + items2.append(s) + else: + items2.extend(list(s.cards)) + ti = self.__checkFreeSpaceForDemoInfoText(items1) + if ti < 0: + ti = self.__checkFreeSpaceForDemoInfoText(items2) + if ti < 0: + return None + return tinfo[ti] + + def __checkFreeSpaceForDemoInfoText(self, items): + CW, CH = self.app.images.CARDW, self.app.images.CARDH + # note: these are translated by (-CW/2, -CH/2) + x1, x2 = 3*CW/2, self.width - 5*CW/2 + y1, y2 = CH/2, self.height - 3*CH/2 + # + m = [1, 1, 1, 1] + for c in items: + cx, cy = c.x, c.y + if cy >= y2: + if cx <= x1: + m[0] = 0 + elif cx >= x2: + m[1] = 0 + elif cy <= y1: + if cx <= x1: + m[2] = 0 + elif cx >= x2: + m[3] = 0 + for mm in m: + if mm: + return mm + return -1 + + + def createDemoLogo(self): + if not self.app.gimages.demo: + return + if self.demo_logo or not self.app.opt.demo_logo: + return + if self.width <= 100 or self.height <= 100: + return + ##self.demo_logo = self.app.miscrandom.choice(self.app.gimages.demo) + n = self.random.initial_seed % len(self.app.gimages.demo) + self.demo_logo = self.app.gimages.demo[int(n)] + self.canvas.setTopImage(self.demo_logo) + + + # + # Handle moves (with move history for undo/redo) + # Actual move is handled in a subclass of AtomicMove. + # + # Note: + # All playing moves (user actions, demo games) must get routed + # to Stack.moveMove() because the stack may add important + # triggers to a move (most notably fillStack and updateModel). + # + # Only low-level game (Game.startGame, Game.dealCards, Game.fillStack) + # or stack methods (Stack.moveMove) should call the functions below + # directly. + # + + def startMoves(self): + self.moves = Struct( + state = self.S_PLAY, + history = [], # list of lists of atomic moves + index = 0, + current = [], # atomic moves for the current move + ) + # reset statistics + self.stats.undo_moves = 0 + self.stats.redo_moves = 0 + self.stats.player_moves = 0 + self.stats.demo_moves = 0 + self.stats.total_moves = 0 + self.stats.quickplay_moves = 0 + self.stats.goto_bookmark_moves = 0 + + def __storeMove(self, am): + if self.S_DEAL <= self.moves.state <= self.S_PLAY: + self.moves.current.append(am) + + # move type 1 + def moveMove(self, ncards, from_stack, to_stack, frames=-1, shadow=-1): + assert from_stack and to_stack and from_stack is not to_stack + assert 0 < ncards <= len(from_stack.cards) + am = AMoveMove(ncards, from_stack, to_stack, frames, shadow) + self.__storeMove(am) + am.do(self) + self.hints.list = None + + # move type 2 + def flipMove(self, stack): + assert stack + am = AFlipMove(stack) + self.__storeMove(am) + am.do(self) + self.hints.list = None + + # move type 3 + def turnStackMove(self, from_stack, to_stack, update_flags=1): + assert from_stack and to_stack and (from_stack is not to_stack) + assert len(to_stack.cards) == 0 + am = ATurnStackMove(from_stack, to_stack, update_flags=update_flags) + self.__storeMove(am) + am.do(self) + self.hints.list = None + + # move type 4 + def nextRoundMove(self, stack): + assert stack + am = ANextRoundMove(stack) + self.__storeMove(am) + am.do(self) + self.hints.list = None + + # move type 5 + def saveSeedMove(self): + am = ASaveSeedMove(self) + self.__storeMove(am) + am.do(self) + ##self.hints.list = None + + # move type 6 + def shuffleStackMove(self, stack): + assert stack + am = AShuffleStackMove(stack, self) + self.__storeMove(am) + am.do(self) + self.hints.list = None + + # move type 7 + def updateStackMove(self, stack, flags): + assert stack + am = AUpdateStackMove(stack, flags) + self.__storeMove(am) + am.do(self) + ##self.hints.list = None + + # move type 8 + def flipAllMove(self, stack): + assert stack + am = AFlipAllMove(self, stack) + self.__storeMove(am) + am.do(self) + self.hints.list = None + + # move type 9 + def saveStateMove(self, flags): + am = ASaveStateMove(self, flags) + self.__storeMove(am) + am.do(self) + ##self.hints.list = None + + + # Finish the current move. + def finishMove(self): + current, moves, stats = self.moves.current, self.moves, self.stats + if not current: + return 0 + # invalidate hints + self.hints.list = None + # update stats + if self.demo: + stats.demo_moves += 1 + if moves.index == 0: + stats.player_moves = 0 # clear all player moves + else: + stats.player_moves += 1 + if moves.index == 0: + stats.demo_moves = 0 # clear all demo moves + stats.total_moves += 1 + + # try to detect a redo move in order to keep our history + redo = 0 + if moves.index + 1 < len(moves.history): + l, m = len(current), moves.history[moves.index] + if l == len(m): + for i in range(l): + a1 = current[i] + a2 = m[i] + if a1.__class__ is not a2.__class__ or a1.cmpForRedo(a2) != 0: + break + else: + redo = 1 + # add current move to history (which is a list of lists) + if redo: + ###print "detected redo:", current + # overwrite existing entry because minor things like + # shadow/frames may have changed + moves.history[moves.index] = current + moves.index += 1 + else: + # resize (i.e. possibly shorten list from previous undos) + moves.history[moves.index : ] = [current] + moves.index += 1 + assert moves.index == len(moves.history) + + moves.current = [] + # update view + self.updateText() + self.updateStatus(moves=(moves.index, self.stats.total_moves)) + self.updateMenus() + self.updatePlayTime(do_after=0) + + return 1 + + + # + # undo/redo layer + # + + def undo(self): + assert self.canUndo() + assert self.moves.state == self.S_PLAY and len(self.moves.current) == 0 + assert 0 <= self.moves.index <= len(self.moves.history) + if self.moves.index == 0: + return + self.moves.index -= 1 + m = self.moves.history[self.moves.index] + m = m[:] + m.reverse() + self.moves.state = self.S_UNDO + for atomic_move in m: + atomic_move.undo(self) + self.moves.state = self.S_PLAY + self.stats.undo_moves += 1 + self.stats.total_moves += 1 + self.hints.list = None + self.updateText() + self.updateStatus(moves=(self.moves.index, self.stats.total_moves)) + self.updateMenus() + + def redo(self): + assert self.canRedo() + assert self.moves.state == self.S_PLAY and len(self.moves.current) == 0 + assert 0 <= self.moves.index <= len(self.moves.history) + if self.moves.index == len(self.moves.history): + return + m = self.moves.history[self.moves.index] + self.moves.index += 1 + if self.moves.index == len(self.moves.history): + mm = self.moves.current + else: + mm = self.moves.history[self.moves.index] + self.moves.state = self.S_REDO + for atomic_move in m: + atomic_move.redo(self) + self.moves.state = self.S_PLAY + self.stats.redo_moves += 1 + self.stats.total_moves += 1 + self.hints.list = None + self.updateText() + self.updateStatus(moves=(self.moves.index, self.stats.total_moves)) + self.updateMenus() + + + # + # subclass hooks + # + + def setState(self, state): + # restore saved vars (from undo/redo) + pass + def getState(self): + # save vars (for undo/redo) + return [] + + + # + # bookmarks + # + + def setBookmark(self, n, confirm=1): + self.finishMove() # just in case + if not self.canSetBookmark(): + return 0 + if confirm < 0: + confirm = self.app.opt.confirm + if confirm and self.gsaveinfo.bookmarks.get(n): + if not self.areYouSure(_("Set bookmark"), + _("Replace existing bookmark %d ?") % (n+1)): + return 0 + file = StringIO() + p = Pickler(file, 1) + try: + self._dumpGame(p, bookmark=2) + bm = (file.getvalue(), self.moves.index) + except: + pass + else: + self.gsaveinfo.bookmarks[n] = bm + return 1 + return 0 + + def gotoBookmark(self, n, confirm=-1, update_stats=1): + self.finishMove() # just in case + bm = self.gsaveinfo.bookmarks.get(n) + if not bm: + return + if confirm < 0: + confirm = self.app.opt.confirm + if confirm: + if not self.areYouSure(_("Goto bookmark"), + _("Goto bookmark %d ?") % (n+1)): + return + try: + s, moves_index = bm + self.setCursor(cursor=CURSOR_WATCH) + file = StringIO(s) + p = Unpickler(file) + game = self._undumpGame(p, self.app) + assert game.id == self.id + # save state for undoGotoBookmark + self.setBookmark(-1, confirm=0) + except: + del self.gsaveinfo.bookmarks[n] + self.setCursor(cursor=self.app.top_cursor) + else: + if update_stats: + self.stats.goto_bookmark_moves = self.stats.goto_bookmark_moves + 1 + self.gstats.goto_bookmark_moves = self.gstats.goto_bookmark_moves + 1 + self.restoreGame(game, reset=0) + destruct(game) + + def undoGotoBookmark(self): + self.gotoBookmark(-1, update_stats=0) + + + # + # load/save + # + + def loadGame(self, filename): + if self.changed(): + if not self.areYouSure(_("Open game")): return + self.finishMove() # just in case + game = None + self.setCursor(cursor=CURSOR_WATCH) + self.disableMenus() + try: + game = self._loadGame(filename, self.app) + game.gstats.holded = 0 + except AssertionError, ex: + self.updateMenus() + self.setCursor(cursor=self.app.top_cursor) + d = MfxDialog(self.top, title=_("Load game error"), bitmap="error", + text=_("""\ +Error while loading game. + +Probably the game file is damaged, +but this could also be a bug you might want to report.""")) + except (Exception, UnpicklingError), ex: + self.updateMenus() + self.setCursor(cursor=self.app.top_cursor) + d = MfxExceptionDialog(self.top, ex, title=_("Load game error"), + text=_("Error while loading game")) + except: + self.updateMenus() + self.setCursor(cursor=self.app.top_cursor) + d = MfxDialog(self.top, title=_("Load game error"), bitmap="error", + text=_("""\ +Internal error while loading game. + +Please report this bug.""")) + else: + self.filename = filename + game.filename = filename + # now start the new game + ##print game.__dict__ + if self.nextGameFlags(game.id) == 0: + self.endGame() + self.restoreGame(game) + destruct(game) + else: + self.endGame() + self.quitGame(game.id, loadedgame=game) + + + def saveGame(self, filename, binmode=1): + self.finishMove() # just in case + self.setCursor(cursor=CURSOR_WATCH) + try: + self._saveGame(filename, binmode) + except Exception, ex: + self.setCursor(cursor=self.app.top_cursor) + d = MfxExceptionDialog(self.top, ex, title=_("Save game error"), + text=_("Error while saving game")) + else: + self.filename = filename + self.setCursor(cursor=self.app.top_cursor) + + + # + # low level load/save + # + + def _loadGame(self, filename, app): + game = None + f = None + try: + f = open(filename, "rb") + p = Unpickler(f) + game = self._undumpGame(p, app) + game.gstats.loaded = game.gstats.loaded + 1 + finally: + if f: f.close() + return game + + def _getUndumpVersion(self, version_tuple): + if version_tuple > (4, 41): return 4 + if version_tuple > (4, 30): return 3 + if version_tuple > (4, 20): return 2 + if version_tuple > (3, 20): return 1 + if version_tuple >= (2, 99): return 0 + return -1 + + def _undumpGame(self, p, app): + self.updateTime() + # + err_txt = "Invalid or damaged %s save file" % PACKAGE + # + def pload(t=None, p=p): + obj = p.load() + if type(t) is types.TypeType: + assert type(obj) is t, err_txt + return obj + # + package = pload() + assert type(package) is types.StringType and package == PACKAGE, err_txt + version = pload() + assert type(version) is types.StringType and len(version) <= 20, err_txt + version_tuple = get_version_tuple(version) + v = self._getUndumpVersion(version_tuple) + assert v >= 0 and version_tuple <= VERSION_TUPLE, "Cannot load games saved with\n" + PACKAGE + " version " + version + game_version = 1 + bookmark = 0 + if v >= 2: + vt = pload() + assert type(vt) is types.TupleType and vt == version_tuple, err_txt + bookmark = pload() + assert type(bookmark) is types.IntType and 0 <= bookmark <= 2, "Incompatible savegame format" + game_version = pload() + assert type(game_version) is types.IntType and game_version > 0, err_txt + if v <= 3: + bookmark = 0 + # + id = pload() + assert type(id) is types.IntType and id > 0, err_txt + if not GI.PROTECTED_GAMES.has_key(id): + game = app.constructGame(id) + if game: + if not game.canLoadGame(version_tuple, game_version): + destruct(game) + game = None + assert game is not None, "Cannot load this game from version " + version + "\nas the game rules have changed\nin the current implementation." + game.version = version + game.version_tuple = version_tuple + # + #game.random = pload() + #assert isinstance(game.random, PysolRandom), err_txt + initial_seed = pload() + assert type(initial_seed) is types.LongType + if initial_seed <= 32000: + game.random = LCRandom31(initial_seed) + else: + game.random = PysolRandom(initial_seed) + state = pload() + game.random.setstate(state) + #if not hasattr(game.random, "origin"): + # game.random.origin = game.random.ORIGIN_UNKNOWN + game.loadinfo.stacks = [] + game.loadinfo.ncards = 0 + nstacks = pload() + #assert type(nstacks) is types.IntType and 1 <= nstacks <= 255, err_txt + assert type(nstacks) is types.IntType and 1 <= nstacks, err_txt + for i in range(nstacks): + stack = [] + ncards = pload() + assert type(ncards) is types.IntType and 0 <= ncards <= 1024, err_txt + for j in range(ncards): + card_id = pload(types.IntType) + face_up = pload(types.IntType) + stack.append((card_id, face_up)) + game.loadinfo.stacks.append(stack) + game.loadinfo.ncards = game.loadinfo.ncards + ncards + assert game.loadinfo.ncards == game.gameinfo.ncards, err_txt + game.loadinfo.talon_round = pload() + game.finished = pload() + if 0 <= bookmark <= 1: + if v >= 3: + saveinfo = pload() + assert isinstance(saveinfo, Struct), err_txt + game.saveinfo.__dict__.update(saveinfo.__dict__) + if v >= 4: + gsaveinfo = pload() + assert isinstance(gsaveinfo, Struct), err_txt + game.gsaveinfo.__dict__.update(gsaveinfo.__dict__) + elif v >= 1: + # not used + talon_base_cards = pload(types.ListType) + moves = pload() + assert isinstance(moves, Struct), err_txt + game.moves.__dict__.update(moves.__dict__) + if 0 <= bookmark <= 1: + gstats = pload() + assert isinstance(gstats, Struct), err_txt + game.gstats.__dict__.update(gstats.__dict__) + stats = pload() + assert isinstance(stats, Struct), err_txt + game.stats.__dict__.update(stats.__dict__) + game._loadGameHook(p) + if v >= 4: + dummy = pload(types.StringType) + assert dummy == "EOF", err_txt + if bookmark == 2: + # copy back all variables that are not saved + game.stats = self.stats + game.gstats = self.gstats + game.saveinfo = self.saveinfo + game.gsaveinfo = self.gsaveinfo + return game + + def _saveGame(self, filename, binmode=1): + f = None + try: + if not self.canSaveGame(): + raise Exception, "Cannot save this game." + f = open(filename, "wb") + p = Pickler(f, binmode) + self._dumpGame(p) + finally: + if f: f.close() + + def _dumpGame(self, p, bookmark=0): + self.updateTime() + assert 0 <= bookmark <= 2 + p.dump(PACKAGE) + p.dump(VERSION) + p.dump(VERSION_TUPLE) + p.dump(bookmark) + p.dump(self.GAME_VERSION) + p.dump(self.id) + # + #p.dump(self.random) + p.dump(self.random.initial_seed) + p.dump(self.random.getstate()) + # + p.dump(len(self.allstacks)) + for stack in self.allstacks: + p.dump(len(stack.cards)) + for card in stack.cards: + p.dump(card.id) + p.dump(card.face_up) + p.dump(self.s.talon.round) + p.dump(self.finished) + if 0 <= bookmark <= 1: + p.dump(self.saveinfo) + p.dump(self.gsaveinfo) + p.dump(self.moves) + if 0 <= bookmark <= 1: + if bookmark == 0: + self.gstats.saved = self.gstats.saved + 1 + p.dump(self.gstats) + p.dump(self.stats) + self._saveGameHook(p) + p.dump("EOF") + + # + # Playing time + # + + def startPlayTimer(self): + self.updateStatus(time=None) + self.stopPlayTimer() + self.play_timer = after(self.top, PLAY_TIME_TIMEOUT, self.updatePlayTime) + + def stopPlayTimer(self): + if hasattr(self, 'play_timer') and self.play_timer: + after_cancel(self.play_timer) + self.play_timer = None + self.updatePlayTime(do_after=0) + + def updatePlayTime(self, do_after=1): + if not self.top: return + if self.pause or self.finished: return + if do_after: + self.play_timer = after(self.top, PLAY_TIME_TIMEOUT, self.updatePlayTime) + d = time.time() - self.stats.update_time + self.stats.elapsed_time + self.updateStatus(time=format_time(d)) + + + # + # Pause + # + + def doPause(self): + if self.finished: + return + if self.demo: + self.stopDemo() + if not self.pause: + self.updateTime() + self.pause = not self.pause + if self.pause: + ##self.updateTime() + self.canvas.hideAllItems() + n = self.random.initial_seed % len(self.app.gimages.pause) + self.pause_logo = self.app.gimages.pause[int(n)] + self.canvas.setTopImage(self.pause_logo) + else: + self.stats.update_time = time.time() + self.updatePlayTime() + self.canvas.setTopImage(None) + self.pause_logo = None + self.canvas.showAllItems() + + # + # Help + # + + def showHelp(self, *args): + if self.preview: + return + kw = dict([(args[i], args[i+1]) for i in range(0, len(args), 2)]) + if not kw: + kw = {'info': '', 'help': ''} + if kw.has_key('info') and self.app.opt.statusbar and self.app.opt.num_cards: + self.app.statusbar.updateText(info=kw['info']) + if kw.has_key('help') and self.app.opt.helpbar: + self.app.helpbar.updateText(info=kw['help']) + + + # + # subclass hooks + # + + def _restoreGameHook(self, game): + pass + + def _loadGameHook(self, p): + pass + + def _saveGameHook(self, p): + pass + diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py new file mode 100644 index 00000000..d889c3ff --- /dev/null +++ b/pysollib/gamedb.py @@ -0,0 +1,581 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import sys, imp, os, types + +# PySol imports +from mfxutil import Struct, latin1_to_ascii +from resource import CSI + +gettext = _ +n_ = lambda x: x + +# /*********************************************************************** +# // constants +# ************************************************************************/ + +# GameInfo constants +class GI: + # game category - these *must* match the cardset CSI.TYPE_xxx + GC_FRENCH = CSI.TYPE_FRENCH + GC_HANAFUDA = CSI.TYPE_HANAFUDA + GC_TAROCK = CSI.TYPE_TAROCK + GC_MAHJONGG = CSI.TYPE_MAHJONGG + GC_HEXADECK = CSI.TYPE_HEXADECK + GC_MUGHAL_GANJIFA = CSI.TYPE_MUGHAL_GANJIFA + GC_NAVAGRAHA_GANJIFA = CSI.TYPE_NAVAGRAHA_GANJIFA + GC_DASHAVATARA_GANJIFA = CSI.TYPE_DASHAVATARA_GANJIFA + GC_TRUMP_ONLY = CSI.TYPE_TRUMP_ONLY + + # game type + GT_1DECK_TYPE = 0 + GT_2DECK_TYPE = 1 + GT_3DECK_TYPE = 2 + GT_4DECK_TYPE = 3 + GT_BAKERS_DOZEN = 4 + GT_BELEAGUERED_CASTLE = 5 + GT_CANFIELD = 6 + GT_DASHAVATARA_GANJIFA = 7 + GT_FAN_TYPE = 8 + GT_FORTY_THIEVES = 9 + GT_FREECELL = 10 + GT_GOLF = 11 + GT_GYPSY = 12 + GT_HANAFUDA = 13 + GT_HEXADECK = 14 + GT_KLONDIKE = 15 + GT_MAHJONGG = 16 + GT_MATRIX = 17 + GT_MEMORY = 18 + GT_MONTANA = 19 + GT_MUGHAL_GANJIFA = 20 + GT_NAPOLEON = 21 + GT_NAVAGRAHA_GANJIFA = 22 + GT_NUMERICA = 23 + GT_PAIRING_TYPE = 24 + GT_POKER_TYPE = 25 + GT_PUZZLE_TYPE = 26 + GT_RAGLAN = 27 + GT_ROW_TYPE = 28 + GT_SIMPLE_TYPE = 29 + GT_SPIDER = 30 + GT_TAROCK = 31 + GT_TERRACE = 32 + GT_YUKON = 33 + GT_SHISEN_SHO = 34 + # extra flags + GT_BETA = 1 << 12 # beta version of game driver + GT_CHILDREN = 1 << 13 # *not used* + GT_CONTRIB = 1 << 14 # contributed games under the GNU GPL + GT_HIDDEN = 1 << 15 # not visible in menus, but games can be loaded + GT_OPEN = 1 << 16 + GT_ORIGINAL = 1 << 17 + GT_POPULAR = 1 << 18 # *not used* + GT_RELAXED = 1 << 19 + GT_SCORE = 1 << 20 # game has some type of scoring + GT_SEPARATE_DECKS = 1 << 21 + GT_XORIGINAL = 1 << 22 # original games by other people, not playable + TYPE_NAMES = { + GT_BAKERS_DOZEN: n_("Baker's Dozen"), + GT_BELEAGUERED_CASTLE: n_("Beleaguered Castle"), + GT_CANFIELD: n_("Canfield"), + GT_FAN_TYPE: n_("Fan"), + GT_FORTY_THIEVES: n_("Forty Thieves"), + GT_FREECELL: n_("FreeCell"), + GT_GOLF: n_("Golf"), + GT_GYPSY: n_("Gypsy"), + GT_KLONDIKE: n_("Klondike"), + GT_MONTANA: n_("Montana"), + GT_NAPOLEON: n_("Napoleon"), + GT_NUMERICA: n_("Numerica"), + GT_PAIRING_TYPE: n_("Pairing"), + GT_RAGLAN: n_("Raglan"), + GT_SIMPLE_TYPE: n_("Simple games"), + GT_SPIDER: n_("Spider"), + GT_TERRACE: n_("Terrace"), + GT_YUKON: n_("Yukon"), + GT_1DECK_TYPE: n_("One-Deck games"), + GT_2DECK_TYPE: n_("Two-Deck games"), + GT_3DECK_TYPE: n_("Three-Deck games"), + GT_4DECK_TYPE: n_("Four-Deck games"), + } + +## SELECT_GAME_BY_TYPE = [] +## for gt, name in TYPE_NAMES.items(): +## if not name.endswith('games'): +## name = name+n_(' type') +## SELECT_GAME_BY_TYPE.append( +## (name, lambda gi, gt=gt: gi.si.game_type == gt)) +## SELECT_GAME_BY_TYPE = tuple(SELECT_GAME_BY_TYPE) + + SELECT_GAME_BY_TYPE = ( + (n_("Baker's Dozen type"),lambda gi, gt=GT_BAKERS_DOZEN: gi.si.game_type == gt), + (n_("Beleaguered Castle type"),lambda gi, gt=GT_BELEAGUERED_CASTLE: gi.si.game_type == gt), + (n_("Canfield type"), lambda gi, gt=GT_CANFIELD: gi.si.game_type == gt), + (n_("Fan type"), lambda gi, gt=GT_FAN_TYPE: gi.si.game_type == gt), + (n_("Forty Thieves type"),lambda gi, gt=GT_FORTY_THIEVES: gi.si.game_type == gt), + (n_("FreeCell type"), lambda gi, gt=GT_FREECELL: gi.si.game_type == gt), + (n_("Golf type"), lambda gi, gt=GT_GOLF: gi.si.game_type == gt), + (n_("Gypsy type"), lambda gi, gt=GT_GYPSY: gi.si.game_type == gt), + (n_("Klondike type"), lambda gi, gt=GT_KLONDIKE: gi.si.game_type == gt), + (n_("Montana type"), lambda gi, gt=GT_MONTANA: gi.si.game_type == gt), + (n_("Napoleon type"), lambda gi, gt=GT_NAPOLEON: gi.si.game_type == gt), + (n_("Numerica type"), lambda gi, gt=GT_NUMERICA: gi.si.game_type == gt), + (n_("Pairing type"), lambda gi, gt=GT_PAIRING_TYPE: gi.si.game_type == gt), + (n_("Raglan type"), lambda gi, gt=GT_RAGLAN: gi.si.game_type == gt), + (n_("Simple games"), lambda gi, gt=GT_SIMPLE_TYPE: gi.si.game_type == gt), + (n_("Spider type"), lambda gi, gt=GT_SPIDER: gi.si.game_type == gt), + (n_("Terrace type"), lambda gi, gt=GT_TERRACE: gi.si.game_type == gt), + (n_("Yukon type"), lambda gi, gt=GT_YUKON: gi.si.game_type == gt), + (n_("One-Deck games"),lambda gi, gt=GT_1DECK_TYPE: gi.si.game_type == gt), + (n_("Two-Deck games"),lambda gi, gt=GT_2DECK_TYPE: gi.si.game_type == gt), + (n_("Three-Deck games"),lambda gi, gt=GT_3DECK_TYPE: gi.si.game_type == gt), + (n_("Four-Deck games"),lambda gi, gt=GT_4DECK_TYPE: gi.si.game_type == gt), + ) + + + +## SELECT_SPECIAL_GAME_BY_TYPE = ( +## ("Dashavatara Ganjifa type", lambda gi, gt=GT_DASHAVATARA_GANJIFA: gi.si.game_type == gt), +## ("Ganjifa type", lambda gi, gt=(GT_MUGHAL_GANJIFA, GT_NAVAGRAHA_GANJIFA, GT_DASHAVATARA_GANJIFA,): gi.si.game_type in gt), +## ("Hanafuda type", lambda gi, gt=GT_HANAFUDA: gi.si.game_type == gt), +## ("Hex A Deck type", lambda gi, gt=GT_HEXADECK: gi.si.game_type == gt), +## ("Mahjongg type", lambda gi, gt=GT_MAHJONGG: gi.si.game_type == gt), +## ("Matrix type", lambda gi, gt=GT_MATRIX: gi.si.game_type == gt), +## ("Mughal Ganjifa type", lambda gi, gt=GT_MUGHAL_GANJIFA: gi.si.game_type == gt), +## ("Navagraha Ganjifa type", lambda gi, gt=GT_NAVAGRAHA_GANJIFA: gi.si.game_type == gt), +## ("Memory type", lambda gi, gt=GT_MEMORY: gi.si.game_type == gt), +## ("Poker type", lambda gi, gt=GT_POKER_TYPE: gi.si.game_type == gt), +## ("Puzzle type", lambda gi, gt=GT_PUZZLE_TYPE: gi.si.game_type == gt), +## ("Tarock type", lambda gi, gt=GT_TAROCK: gi.si.game_type == gt), +## ) + + SELECT_ORIGINAL_GAME_BY_TYPE = ( + (n_("French type"), lambda gi, gf=GT_ORIGINAL, gt=(GT_HANAFUDA, GT_HEXADECK, GT_MUGHAL_GANJIFA, GT_NAVAGRAHA_GANJIFA, GT_DASHAVATARA_GANJIFA, GT_TAROCK,): gi.si.game_flags & gf and gi.si.game_type not in gt), + (n_("Ganjifa type"), lambda gi, gf=GT_ORIGINAL, gt=(GT_MUGHAL_GANJIFA, GT_NAVAGRAHA_GANJIFA, GT_DASHAVATARA_GANJIFA,): gi.si.game_flags & gf and gi.si.game_type in gt), + (n_("Hanafuda type"), lambda gi, gf=GT_ORIGINAL, gt=GT_HANAFUDA: gi.si.game_flags & gf and gi.si.game_type == gt), + (n_("Hex A Deck type"), lambda gi, gf=GT_ORIGINAL, gt=GT_HEXADECK: gi.si.game_flags & gf and gi.si.game_type == gt), + (n_("Tarock type"), lambda gi, gf=GT_ORIGINAL, gt=GT_TAROCK: gi.si.game_flags & gf and gi.si.game_type == gt), + ) + + SELECT_CONTRIB_GAME_BY_TYPE = ( + (n_("French type"), lambda gi, gf=GT_CONTRIB, gt=(GT_HANAFUDA, GT_HEXADECK, GT_MUGHAL_GANJIFA, GT_NAVAGRAHA_GANJIFA, GT_DASHAVATARA_GANJIFA, GT_TAROCK,): gi.si.game_flags & gf and gi.si.game_type not in gt), + (n_("Ganjifa type"), lambda gi, gf=GT_CONTRIB, gt=(GT_MUGHAL_GANJIFA, GT_NAVAGRAHA_GANJIFA, GT_DASHAVATARA_GANJIFA,): gi.si.game_flags & gf and gi.si.game_type in gt), + (n_("Hanafuda type"), lambda gi, gf=GT_CONTRIB, gt=GT_HANAFUDA: gi.si.game_flags & gf and gi.si.game_type == gt), + (n_("Hex A Deck type"), lambda gi, gf=GT_CONTRIB, gt=GT_HEXADECK: gi.si.game_flags & gf and gi.si.game_type == gt), + (n_("Tarock type"), lambda gi, gf=GT_CONTRIB, gt=GT_TAROCK: gi.si.game_flags & gf and gi.si.game_type == gt), + ) + + # ----- + SELECT_ORIENTAL_GAME_BY_TYPE = ( + (n_("Dashavatara Ganjifa type"), lambda gi, gt=GT_DASHAVATARA_GANJIFA: gi.si.game_type == gt), + (n_("Ganjifa type"), lambda gi, gt=(GT_MUGHAL_GANJIFA, GT_NAVAGRAHA_GANJIFA, GT_DASHAVATARA_GANJIFA,): gi.si.game_type in gt), + (n_("Hanafuda type"), lambda gi, gt=GT_HANAFUDA: gi.si.game_type == gt), + (n_("Mughal Ganjifa type"), lambda gi, gt=GT_MUGHAL_GANJIFA: gi.si.game_type == gt), + (n_("Navagraha Ganjifa type"), lambda gi, gt=GT_NAVAGRAHA_GANJIFA: gi.si.game_type == gt), + ) + + SELECT_SPECIAL_GAME_BY_TYPE = ( + (n_("Shisen-Sho"), lambda gi, gt=GT_SHISEN_SHO: gi.si.game_type == gt), + (n_("Hex A Deck type"), lambda gi, gt=GT_HEXADECK: gi.si.game_type == gt), + (n_("Matrix type"), lambda gi, gt=GT_MATRIX: gi.si.game_type == gt), + (n_("Memory type"), lambda gi, gt=GT_MEMORY: gi.si.game_type == gt), + (n_("Poker type"), lambda gi, gt=GT_POKER_TYPE: gi.si.game_type == gt), + (n_("Puzzle type"), lambda gi, gt=GT_PUZZLE_TYPE: gi.si.game_type == gt), + (n_("Tarock type"), lambda gi, gt=GT_TAROCK: gi.si.game_type == gt), + ) + + + + # These obsolete gameids have been used in previous versions of + # PySol and are no longer supported because of internal changes + # (mainly rule changes). The game has been assigned a new id. + PROTECTED_GAMES = { + 22: 106, # Double Canfield + 32: 901, # La Belle Lucie (Midnight Oil) + 52: 903, # Aces Up + 72: 115, # Little Forty + 75: 126, # Red and Black + 82: 901, # La Belle Lucie (Midnight Oil) +## 155: 5034, # Mahjongg - Flying Dragon +## 156: 5035, # Mahjongg - Fortress Towers + 262: 105, # Canfield + 902: 88, # Trefoil + 904: 68, # Lexington Harp + } + + GAMES_BY_COMPATIBILITY = ( + # Atari ST Patience game v2.13 (we have 10 out of 10 games) + ("Atari ST Patience", (1, 3, 4, 7, 12, 14, 15, 16, 17, 39,)), + + ## Gnome AisleRiot 1.0.51 (we have 28 out of 32 games) + ## still missing: Camelot, Clock, Thieves, Thirteen + ##("Gnome AisleRiot 1.0.51", ( + ## 2, 8, 11, 19, 27, 29, 33, 34, 35, 40, + ## 41, 42, 43, 58, 59, 92, 93, 94, 95, 96, + ## 100, 105, 111, 112, 113, 130, 200, 201, + ##)), + ## Gnome AisleRiot 1.4.0.1 (we have XX out of XX games) + ##("Gnome AisleRiot", ( + ## 1, 2, 8, 11, 19, 27, 29, 33, 34, 35, 40, + ## 41, 42, 43, 58, 59, 92, 93, 94, 95, 96, + ## 100, 105, 111, 112, 113, 130, 200, 201, + ##)), + # Gnome AisleRiot 2.2.0 (we have 57 out of 73 games) + # still missing: + # Clock, Cover, Diamond mine, Gay gordons, Helsinki + # Isabel, Labyrinth (!), Quatorze, Scuffle, Thieves, + # Treize, Valentine, Yeld, ??? + ("Gnome AisleRiot", ( + 1, 2, 8, 9, 11, 12, 19, 24, 27, 29, 31, 33, 34, 35, 36, 40, + 41, 42, 43, 45, 48, 58, 59, 67, 89, 91, 92, 93, 94, 95, 96, + 100, 105, 111, 112, 113, 130, 139, 144, 146, 147, 148, 200, + 201, 206, 224, 225, 229, 230, 233, 257, 258, 280, 281, 282, + 283, 284, + )), + + ## KDE Patience 0.7.3 from KDE 1.1.2 (we have 6 out of 9 games) + ##("KDE Patience 0.7.3", (2, 7, 8, 18, 256, 903,)), + ## KDE Patience 2.0 from KDE 2.1.2 (we have 11 out of 13 games) + ##("KDE Patience", (1, 2, 7, 8, 18, 19, 23, 50, 256, 261, 903,)), + ## KDE Patience 2.0 from KDE 2.2beta1 (we have 12 out of 14 games) + ##("KDE Patience", (1, 2, 7, 8, 18, 19, 23, 36, 50, 256, 261, 903,)), + # KDE Patience 2.0 from KDE 3.1.1 (we have 15 out of 15 games) + ("KDE Patience", (1, 2, 7, 8, 18, 19, 23, 36, 50, + 256, 261, 277, 278, 279, 903,)), + + # xpat2 1.06 (we have 14 out of 16 games) + # still missing: Michael's Fantasy, modCanfield + ("xpat2", ( + 1, 2, 8, 9, 11, 31, 54, 63, 89, 105, 901, 256, 345, 903, + )), + ) + + GAMES_BY_PYSOL_VERSION = ( + ("1.00", (1, 2, 3, 4)), + ("1.01", (5, 6)), + ("1.02", (7, 8, 9)), + ("1.03", (10, 11, 12, 13)), + ("1.10", (14,)), + ("1.11", (15, 16, 17)), + ("2.00", (256, 257)), + ("2.01", (258, 259, 260, 261)), + ("2.02", (105,)), + ("2.90", (18, 19, 20, 21, 106, 23, 24, 25, 26, 27, + 28, 29, 30, 31, 901, 33, 34, 35, 36)), + ("2.99", (37,)), + ("3.00", (38, 39, + 40, 41, 42, 43, 45, 46, 47, 48, 49, + 50, 51,903, 53, 54, 55, 56, 57, 58, 59, + 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, + 70, 71,115, 73, 74,126, 76, 77, 78, 79, + 80, 81, 83, 84, 85, 86, 87, 88, 89, + 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, + 100, 101, 102, 103, 104, 107, 108,)), + ("3.10", (109, 110, 111, 112, 113, 114, 116, 117, 118, 119, + 120,-121,-122, 123, 124, 125, 127)), + ("3.20", (128, 129, 130, 131, 132, 133, 134, 135, 136, 137, + 138, 139, 140, 141, 142, + 12345, 12346, 12347, 12348, 12349, 12350, 12351, 12352)), + ("3.21", (143, 144)), + ("3.30", (145, 146, 147, 148, 149, 150, 151)), + ("3.40", (152, 153, 154)), + ("4.00", ( 157, 158, 159, 160, 161, 162, 163, 164)), + ("4.20", (165, 166, 167, 168, 169, 170, 171, 172, 173, 174, + 175, 176, 177, 178)), + ("4.30", (179, 180, 181, 182, 183, 184)), + ("4.41", (185, 186,-187,-188,-189,-190,-191,-192, 193,-194, + 195, 196,-197,-198, 199)), + ("4.60", (200, 201, 202, 203, 204, 205, + 206, 207, 208, 209, + 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, + 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, + 230, 231, 232, 233, 234, 235, 236)), +## ## + tuple(range(353, 370)), +## ), + ("4.70", (237,)), + ) + + # deprecated - the correct way is to or a GI.GT_XXX flag + # in the registerGame() call + _CHILDREN_GAMES = [16, 33, 55, 90, 91, 96, 97, 176, 903,] + + _OPEN_GAMES = [] + #_OPEN_GAMES = [ 5, 6, 8, 9, 26, 31, 45, 46, 50, 53, 63, 64, 77, 85, 86, + # 96, 116, 117, 118, 258, ] + + _POPULAR_GAMES = [ + 1, # Gypsy + 2, # Klondike + 7, # Picture Galary + 8, # FreeCell + 11, # Spider + 12, # Braid + 13, # Forty Thieves + 14, # Ground for a Divorce + 19, # Yukon + 31, # Baker's Dozen + 36, # Golf + 38, # Pyramid + 105, # Canfield + 158, # Imperial Trumps + 279, # Kings + 903, # Ace Up + 5034, # Mahjongg Flying Dragon + 5401, # Mahjongg Taipei + 12345, # Oonsoo + ] + + +# /*********************************************************************** +# // core games database +# ************************************************************************/ + +class GameInfoException(Exception): + pass + + +class GameInfo(Struct): + def __init__(self, id, gameclass, name, + game_type, decks, redeals, + # keyword arguments: + si={}, category=0, short_name=None, altnames=(), + suits=range(4), ranks=range(13), trumps=(), + rules_filename=None): + def to_unicode(s): + if not type(s) is unicode: + return unicode(s, 'utf-8') + return s + # + ncards = decks * (len(suits) * len(ranks) + len(trumps)) + game_flags = game_type & ~1023 + game_type = game_type & 1023 + if os.name == "mac": + name = latin1_to_ascii(name) + name = to_unicode(name) + if not short_name: + short_name = name + short_name = to_unicode(short_name) + if type(altnames) in types.StringTypes: + altnames = (altnames,) + altnames = [to_unicode(n) for n in altnames] + # + if not (1 <= category <= 9): + if game_type == GI.GT_HANAFUDA: + category = GI.GC_HANAFUDA + elif game_type == GI.GT_TAROCK: + category = GI.GC_TAROCK + elif game_type == GI.GT_MAHJONGG: + category = GI.GC_MAHJONGG + elif game_type == GI.GT_HEXADECK: + category = GI.GC_HEXADECK + elif game_type == GI.GT_MUGHAL_GANJIFA: + category = GI.GC_MUGHAL_GANJIFA + elif game_type == GI.GT_NAVAGRAHA_GANJIFA: + category = GI.GC_NAVAGRAHA_GANJIFA + elif game_type == GI.GT_DASHAVATARA_GANJIFA: + category = GI.GC_DASHAVATARA_GANJIFA + else: + category = GI.GC_FRENCH + # + if not (1 <= id <= 999999): + raise GameInfoException, name + ": invalid game ID " + str(id) + if category == GI.GC_MAHJONGG: + if decks%4: + raise GameInfoException, name + ": invalid number of decks " + str(id) + else: + if not (1 <= decks <= 4): + raise GameInfoException, name + ": invalid number of decks " + str(id) + ##if not name or not (2 <= len(short_name) <= 30): + ## raise GameInfoException, name + ": invalid game name" + if not name: + raise GameInfoException, name + ": invalid game name" + if GI.PROTECTED_GAMES.get(id): + raise GameInfoException, name + ": protected game ID " + str(id) + # + for f, l in ((GI.GT_CHILDREN, GI._CHILDREN_GAMES), + (GI.GT_OPEN, GI._OPEN_GAMES), + (GI.GT_POPULAR, GI._POPULAR_GAMES)): + if (game_flags & f) and (id not in l): + l.append(id) + elif not (game_flags & f) and (id in l): + game_flags = game_flags | f + # si is the SelectionInfo struct that will be queried by + # the "select game" dialogs. It can be freely modified. + gi_si = Struct(game_type=game_type, game_flags=game_flags, + decks=decks, redeals=redeals, ncards=ncards) + gi_si.update(si) + # + Struct.__init__(self, id=id, gameclass=gameclass, + name=name, short_name=short_name, + altnames=tuple(altnames), + decks=decks, redeals=redeals, ncards=ncards, + category=category, + suits=tuple(suits), ranks=tuple(ranks), trumps=tuple(trumps), + si=gi_si, rules_filename=rules_filename, plugin=0) + + +class GameManager: + def __init__(self): + self.__selected_key = -1 + self.__games = {} + self.__gamenames = {} + self.__games_by_id = None + self.__games_by_name = None + self.__games_by_short_name = None + self.__games_by_altname = None + self.__all_games = {} # includes hidden games + self.__all_gamenames = {} # includes hidden games + self.loading_plugin = 0 + self.registered_game_types = {} + + def getSelected(self): + return self.__selected_key + + def setSelected(self, gameid): + assert self.__all_games.has_key(gameid) + self.__selected_key = gameid + + def get(self, key): + return self.__all_games.get(key) + + def register(self, gi): + ##print gi.id, gi.short_name + if not isinstance(gi, GameInfo): + raise GameInfoException, "wrong GameInfo class" + gi.plugin = self.loading_plugin + if self.__all_games.has_key(gi.id): + raise GameInfoException, "duplicate game ID " + str(gi.id) + if self.__all_gamenames.has_key(gi.name): + raise GameInfoException, "duplicate game name " + str(gi.id) + ": " + gi.name + if 1: + for id, game in self.__all_games.items(): + if gi.gameclass is game.gameclass: + raise GameInfoException, "duplicate game class " + str(gi.id) + for n in gi.altnames: + if self.__all_gamenames.has_key(n): + raise GameInfoException, "duplicate altgame name " + str(gi.id) + ": " + n + if 0 and gi.si.game_flags & GI.GT_XORIGINAL: + return + if 0 and (206 <= gi.id <= 236): + ##print gi.id + return + ##print gi.id, gi.name + self.__all_games[gi.id] = gi + self.__all_gamenames[gi.name] = gi + for n in gi.altnames: + self.__all_gamenames[n] = gi + if not (gi.si.game_flags & GI.GT_HIDDEN): + self.__games[gi.id] = gi + self.__gamenames[gi.name] = gi + for n in gi.altnames: + self.__gamenames[n] = gi + # invalidate sorted lists + self.__games_by_id = None + self.__games_by_name = None + # update registry + k = gi.si.game_type + self.registered_game_types[k] = self.registered_game_types.get(k, 0) + 1 + + + # + # access games database - we do not expose hidden games + # + + def getAllGames(self): return self.__all_games + + def getGamesIdSortedById(self): + if self.__games_by_id is None: + l = self.__games.keys() + l.sort() + self.__games_by_id = tuple(l) + return self.__games_by_id + + def getGamesIdSortedByName(self): + if self.__games_by_name is None: + l1, l2, l3 = [], [], [] + for id, gi in self.__games.items(): + #name = latin1_to_ascii(gi.name).lower() + name = gettext(gi.name).lower() + l1.append((name, id)) + if gi.name != gi.short_name: + #name = latin1_to_ascii(gi.short_name).lower() + name = gettext(gi.short_name).lower() + l2.append((name, id)) + for n in gi.altnames: + #name = latin1_to_ascii(n).lower() + name = gettext(n).lower() + l3.append((name, id, n)) + l1.sort() + l2.sort() + l3.sort() + self.__games_by_name = tuple(map(lambda item: item[1], l1)) + self.__games_by_short_name = tuple(map(lambda item: item[1], l2)) + self.__games_by_altname = tuple(map(lambda item: item[1:], l3)) + return self.__games_by_name + + def getGamesIdSortedByShortName(self): + if self.__games_by_name is None: + self.getGamesIdSortedByName() + return self.__games_by_short_name + + # note: this contains tuples as entries + def getGamesTuplesSortedByAlternateName(self): + if self.__games_by_name is None: + self.getGamesIdSortedByName() + return self.__games_by_altname + + +# /*********************************************************************** +# // +# ************************************************************************/ + +# the global game database (the single instance of class GameManager) +GAME_DB = GameManager() + + +def registerGame(gameinfo): + GAME_DB.register(gameinfo) + return gameinfo + + +def loadGame(modname, filename, plugin=1): + ##print "load game", modname, filename + GAME_DB.loading_plugin = plugin + module = imp.load_source(modname, filename) + ##execfile(filename, globals(), globals()) + diff --git a/pysollib/games/__init__.py b/pysollib/games/__init__.py new file mode 100644 index 00000000..e1de4c40 --- /dev/null +++ b/pysollib/games/__init__.py @@ -0,0 +1,59 @@ +import acesup +import algerian +import auldlangsyne +import bakersdozen +import bakersgame +import beleagueredcastle +import bisley +import braid +import bristol +import buffalobill +import calculation +import camelot +import canfield +import capricieuse +import curdsandwhey +import dieboesesieben +import diplomat +import doublets +import eiffeltower +import fan +import fortythieves +import freecell +import glenwood +import golf +import grandfathersclock +import gypsy +import harp +import headsandtails +import katzenschwanz +import klondike +import labyrinth +import matriarchy +import montana +import montecarlo +import napoleon +import needle +import numerica +import osmosis +import parallels +import pasdedeux +import picturegallery +import pileon +import poker +import pushpin +import pyramid +import royalcotillion +import royaleast +import siebenbisas +import simplex +import spider +import sthelena +import sultan +import takeaway +import terrace +import tournament +import unionsquare +import wavemotion +import windmill +import yukon diff --git a/pysollib/games/acesup.py b/pysollib/games/acesup.py new file mode 100644 index 00000000..5df310cf --- /dev/null +++ b/pysollib/games/acesup.py @@ -0,0 +1,265 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Aces Up +# ************************************************************************/ + +class AcesUp_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + c = cards[0] + for s in self.game.s.rows: + if s is not from_stack and s.cards and s.cards[-1].suit == c.suit: + if s.cards[-1].rank > c.rank or s.cards[-1].rank == ACE: + # found a higher rank or an Ace on the row stacks + return c.rank != ACE + return 0 + + +class AcesUp_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + return len(self.cards) == 0 + + clickHandler = BasicRowStack.doubleclickHandler + + +class AcesUp(Game): + Talon_Class = DealRowTalonStack + RowStack_Class = StackWrapper(AcesUp_RowStack, max_accept=1) + + # + # game layout + # + + def createGame(self, rows=4, **layout): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + (rows+3)*l.XS, l.YM + 4*l.YS) + + # create stacks + x, y, = l.XM, l.YM + s.talon = self.Talon_Class(x, y, self) + l.createText(s.talon, "ss") + x = x + 3*l.XS/2 + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self)) + x = x + l.XS + x = x + l.XS/2 + stack = AcesUp_Foundation(x, y, self, ANY_SUIT, max_move=0, + dir=0, base_rank=ANY_RANK, max_cards=48) + l.createText(stack, "ss") + s.foundations.append(stack) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + def isGameWon(self): + if len(self.s.foundations[0].cards) != 48: + return 0 + for s in self.s.rows: + if len(s.cards) != 1 or s.cards[0].rank != ACE: + return 0 + return 1 + + def getAutoStacks(self, event=None): + if event is None: + # disable auto drop - this would ruin the whole gameplay + return (self.sg.dropstacks, (), self.sg.dropstacks) + else: + # rightclickHandler + return (self.sg.dropstacks, self.sg.dropstacks, self.sg.dropstacks) + + +# /*********************************************************************** +# // Fortunes +# ************************************************************************/ + +class Fortunes(AcesUp): + RowStack_Class = StackWrapper(AcesUp_RowStack, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS) + + +# /*********************************************************************** +# // Russian Aces +# ************************************************************************/ + +class RussianAces_Talon(DealRowTalonStack): + def dealCards(self, sound=0): + rows = filter(lambda s: not s.cards, self.game.s.rows) + if not rows: + rows = self.game.s.rows + return self.dealRowAvail(rows=rows, sound=sound) + + +class RussianAces(AcesUp): + Talon_Class = RussianAces_Talon + + +# /*********************************************************************** +# // Perpetual Motion +# ************************************************************************/ + +class PerpetualMotion_Talon(DealRowTalonStack): + def canDealCards(self): + ## FIXME: this is to avoid loops in the demo + if self.game.demo and self.game.moves.index >= 500: + return 0 + return not self.game.isGameWon() + + def dealCards(self, sound=0): + if self.cards: + return DealRowTalonStack.dealCards(self, sound=sound) + game, num_cards = self.game, len(self.cards) + rows = list(game.s.rows)[:] + rows.reverse() + for r in rows: + while r.cards: + num_cards = num_cards + 1 + game.moveMove(1, r, self, frames=4) + if self.cards[-1].face_up: + game.flipMove(self) + assert len(self.cards) == num_cards + return DealRowTalonStack.dealCards(self, sound=sound) + + +class PerpetualMotion_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + return isRankSequence(cards, dir=0) + + +class PerpetualMotion_RowStack(RK_RowStack): + def canDropCards(self, stacks): + pile = self.getPile() + if not pile or len(pile) != 4: + return (None, 0) + for s in stacks: + if s is not self and s.acceptsCards(self, pile): + return (s, 4) + return (None, 0) + + +class PerpetualMotion(Game): + + # + # game layout + # + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 7*l.XS, l.YM + 4*l.YS) + + # create stacks + x, y, = l.XM, l.YM + s.talon = PerpetualMotion_Talon(x, y, self, max_rounds=-1) + l.createText(s.talon, "ss") + x = x + 3*l.XS/2 + for i in range(4): + s.rows.append(PerpetualMotion_RowStack(x, y, self, dir=0, base_rank=NO_RANK)) + x = x + l.XS + x = l.XM + 6*l.XS + stack = PerpetualMotion_Foundation(x, y, self, ANY_SUIT, base_rank=ANY_RANK, + max_cards=52, max_move=0, + min_accept=4, max_accept=4) + l.createText(stack, "ss") + s.foundations.append(stack) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank == card2.rank + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class AcesUp5(AcesUp): + + def createGame(self): + AcesUp.createGame(self, rows=5) + + def isGameWon(self): + return len(self.s.foundations[0].cards) == 48 + + +# register the game +registerGame(GameInfo(903, AcesUp, "Aces Up", # was: 52 + GI.GT_1DECK_TYPE, 1, 0, + altnames=("Aces High", "Drivel") )) +registerGame(GameInfo(206, Fortunes, "Fortunes", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(213, RussianAces, "Russian Aces", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(130, PerpetualMotion, "Perpetual Motion", + GI.GT_1DECK_TYPE, 1, -1, + altnames="First Law")) +registerGame(GameInfo(353, AcesUp5, "Aces Up 5", + GI.GT_1DECK_TYPE, 1, 0)) diff --git a/pysollib/games/algerian.py b/pysollib/games/algerian.py new file mode 100644 index 00000000..a7e20961 --- /dev/null +++ b/pysollib/games/algerian.py @@ -0,0 +1,169 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + + +# /*********************************************************************** +# // Carthage +# ************************************************************************/ + +class Carthage_Talon(DealRowTalonStack): + def dealCards(self, sound=0): + if sound: + self.game.startDealSample() + if len(self.cards) == len(self.game.s.rows): + n = self.dealRowAvail(rows=self.game.s.rows, sound=0) + else: + n = self.dealRowAvail(rows=self.game.s.reserves, sound=0) + n += self.dealRowAvail(rows=self.game.s.reserves, sound=0) + if sound: + self.game.stopSamples() + return n + + +class Carthage(Game): + + Hint_Class = CautiousDefaultHint + Talon_Class = Carthage_Talon + Foundation_Classes = (SS_FoundationStack, + SS_FoundationStack) + RowStack_Class = StackWrapper(SS_RowStack, max_move=1) + + # + # game layout + # + + def createGame(self, rows=8, reserves=6, playcards=12): + # create layout + l, s = Layout(self), self.s + + # set window + decks = self.gameinfo.decks + foundations = decks*4 + max_rows = max(foundations, rows) + w, h = l.XM+(max_rows+1)*l.XS, l.YM+3*l.YS+playcards*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM+l.XS+(max_rows-foundations)*l.XS/2, l.YM + for fclass in self.Foundation_Classes: + for i in range(4): + s.foundations.append(fclass(x, y, self, suit=i)) + x += l.XS + + x, y = l.XM+l.XS+(max_rows-rows)*l.XS/2, l.YM+l.YS + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self, + max_move=1, max_accept=1)) + x += l.XS + self.setRegion(s.rows, (-999, y-l.CH/2, 999999, h-l.YS-l.CH/2)) + + d = (w-reserves*l.XS)/reserves + x, y = l.XM, h-l.YS + for i in range(reserves): + stack = ReserveStack(x, y, self) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 2, 0 + s.reserves.append(stack) + x += l.XS+d + + s.talon = self.Talon_Class(l.XM, l.YM, self) + l.createText(s.talon, "ss") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.s.talon.dealRow(rows=self.s.rows, frames=0) + for i in range(5): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % 13 == card2.rank or + (card2.rank + 1) % 13 == card1.rank)) + + +# /*********************************************************************** +# // Algerian Patience +# ************************************************************************/ + +class AlgerianPatience(Carthage): + + Foundation_Classes = (SS_FoundationStack, + StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1)) + RowStack_Class = StackWrapper(UD_SS_RowStack, mod=13) + + def _shuffleHook(self, cards): + # move 4 Kings to top of the Talon + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == KING and c.deck == 0, c.suit)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations[4:], frames=0) + Carthage.startGame(self) + + +class AlgerianPatience3(Carthage): + Foundation_Classes = (SS_FoundationStack, + SS_FoundationStack, + SS_FoundationStack) + RowStack_Class = StackWrapper(UD_SS_RowStack, mod=13) + + def createGame(self): + Carthage.createGame(self, rows=8, reserves=8, playcards=20) + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, (c.deck, c.suit))) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + Carthage.startGame(self) + + + +# register the game +registerGame(GameInfo(321, Carthage, "Carthage", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(322, AlgerianPatience, "Algerian Patience", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(457, AlgerianPatience3, "Algerian Patience (3 decks)", + GI.GT_3DECK_TYPE, 3, 0)) + diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py new file mode 100644 index 00000000..a12f2d8d --- /dev/null +++ b/pysollib/games/auldlangsyne.py @@ -0,0 +1,460 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Tam O'Shanter +# ************************************************************************/ + +class TamOShanter(Game): + Talon_Class = DealRowTalonStack + RowStack_Class = StackWrapper(BasicRowStack, max_move=1, max_accept=0) + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 6*l.XS, l.YM + 4*l.YS) + + # create stacks + x, y, = l.XM, l.YM + s.talon = self.Talon_Class(x, y, self) + l.createText(s.talon, "ss") + x, y = l.XM+2*l.XS, l.YM + for i in range(4): + s.foundations.append(RK_FoundationStack(x, y, self)) + x += l.XS + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(4): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + def getAutoStacks(self, event=None): + return ((), (), self.sg.dropstacks) + + +# /*********************************************************************** +# // Auld Lang Syne +# ************************************************************************/ + +class AuldLangSyne(TamOShanter): + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + +# /*********************************************************************** +# // Strategy +# ************************************************************************/ + +class Strategy_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # we only accept cards if there are no cards in the talon + return len(self.game.s.talon.cards) == 0 + + +class Strategy_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + # this stack accepts any one card from the Talon + return from_stack is self.game.s.talon and len(cards) == 1 + + def canMoveCards(self, cards): + if self.game.s.talon.cards: + return 0 + return BasicRowStack.canMoveCards(self, cards) + + def clickHandler(self, event): + if self.game.s.talon.cards: + self.game.s.talon.playMoveMove(1, self) + return 1 + return BasicRowStack.clickHandler(self, event) + + def doubleclickHandler(self, event): + if self.game.s.talon.cards: + self.game.s.talon.playMoveMove(1, self) + return 1 + return BasicRowStack.doubleclickHandler(self, event) + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + def getHelp(self): + return _('Row. Build regardless of rank and suit.') + + +class Strategy(Game): + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 8*l.XS, l.YM + 4*l.YS) + + # create stacks + x, y, = l.XM, l.YM + s.talon = OpenTalonStack(x, y, self) + l.createText(s.talon, "se") + for i in range(4): + x, y = l.XM + (i+2)*l.XS, l.YM + s.foundations.append(Strategy_Foundation(x, y, self, suit=i, max_move=0)) + for i in range(8): + x, y = l.XM + i*l.XS, l.YM + l.YS + s.rows.append(Strategy_RowStack(x, y, self, max_move=1, max_accept=1)) + x = x + l.XS + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.fillStack() + + +# /*********************************************************************** +# // Interregnum +# ************************************************************************/ + +class Interregnum_Foundation(RK_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not RK_FoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if len(self.cards) == 12: + # the final card must come from the reserve above the foundation + return from_stack.id == self.id - 8 + else: + # card must come from rows + return from_stack in self.game.s.rows + + +class Interregnum(Game): + GAME_VERSION = 2 + + # + # game layout + # + + def createGame(self, rows=8): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + max(9,rows)*l.XS, l.YM + 5*l.YS) + + # extra settings + self.base_cards = None + + # create stacks + for i in range(8): + x, y, = l.XM + i*l.XS, l.YM + s.reserves.append(ReserveStack(x, y, self, max_accept=0)) + for i in range(8): + x, y, = l.XM + i*l.XS, l.YM + l.YS + s.foundations.append(Interregnum_Foundation(x, y, self, mod=13, max_move=0)) + for i in range(rows): + x, y, = l.XM + (2*i+8-rows)*l.XS/2, l.YM + 2*l.YS + s.rows.append(BasicRowStack(x, y, self, max_accept=0, max_move=1)) + s.talon = DealRowTalonStack(self.width-l.XS, self.height-l.YS, self) + l.createText(s.talon, "nn") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + # deal base_cards to reserves, update foundations cap.base_rank + self.base_cards = [] + for i in range(8): + self.base_cards.append(self.s.talon.getCard()) + self.s.foundations[i].cap.base_rank = (self.base_cards[i].rank + 1) % 13 + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, self.s.reserves[i]) + # deal other cards + self.s.talon.dealRow() + + def getAutoStacks(self, event=None): + return ((), (), self.sg.dropstacks) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank) + + def _restoreGameHook(self, game): + self.base_cards = [None] * 8 + for i in range(8): + id = game.loadinfo.base_card_ids[i] + self.base_cards[i] = self.cards[id] + self.s.foundations[i].cap.base_rank = (self.base_cards[i].rank + 1) % 13 + + def _loadGameHook(self, p): + ids = [] + for i in range(8): + ids.append(p.load()) + self.loadinfo.addattr(base_card_ids=ids) # register extra load var. + + def _saveGameHook(self, p): + for c in self.base_cards: + p.dump(c.id) + +# /*********************************************************************** +# // Colorado +# ************************************************************************/ + +class Colorado_RowStack(OpenStack): + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + # this stack accepts any one card from the Waste + return from_stack is self.game.s.waste and len(cards) == 1 + + +class Colorado(Game): + + Foundation_Class = SS_FoundationStack + RowStack_Class = Colorado_RowStack + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+10*l.XS, 3*l.YM+4*l.YS) + + # create stacks + x, y, = l.XS, l.YM + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, + suit=i, max_move=0)) + x = x + l.XS + x += 2*l.XM + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, + suit=i, max_move=0, base_rank=KING, dir=-1)) + x = x + l.XS + + y = l.YM+l.YS + for i in range(2): + x = l.XM + for j in range(10): + stack = self.RowStack_Class(x, y, self, + max_move=1, max_accept=1) + s.rows.append(stack) + stack.CARD_XOFFSET = stack.CARD_YOFFSET = 0 + x += l.XS + y += l.YS + + x, y = l.XM+9*l.XS, l.YM+3*l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + x -= l.XS + s.waste = WasteStack(x, y, self, max_cards=1) + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealRow() + self.s.talon.dealCards() + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, lambda c: (c.deck == 0 and c.rank in (0, 12), (c.rank, c.suit)), 8) + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards and self.s.waste.cards: + self.s.waste.moveMove(1, stack) + + +# /*********************************************************************** +# // Amazons +# ************************************************************************/ + +class Amazons_Talon(DealRowTalonStack): + def canDealCards(self): + ## FIXME: this is to avoid loops in the demo + if self.game.demo and self.game.moves.index >= 100: + return False + if self.round == self.max_rounds: + return False + return not self.game.isGameWon() + + def dealCards(self, sound=0): + self.game.startDealSample() + if not self.cards: + self.game.nextRoundMove(self) + n = self._moveAllToTalon() + self.game.stopSamples() + return n + n = self.dealRowAvail() + self.game.stopSamples() + return n + + def dealRowAvail(self, rows=None, flip=1, reverse=0, frames=-1, sound=0): + if rows is None: + rows = [] + i = 0 + for f in self.game.s.foundations: + if len(f.cards) < 7: + rows.append(self.game.s.rows[i]) + i += 1 + return DealRowTalonStack.dealRowAvail(self, rows=rows, flip=flip, + reverse=reverse, frames=frames, sound=sound) + + def _moveAllToTalon(self): + # move all cards to the Talon + num_cards = 0 + for r in self.game.s.rows: + for i in range(len(r.cards)): + num_cards += 1 + self.game.moveMove(1, r, self, frames=4) + self.game.flipMove(self) + return num_cards + + +class Amazons_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return False + if from_stack not in self.game.s.rows: + return False + if cards[0].rank == ACE: + return True + if not self.cards: + return False + rank = self.cards[-1].rank + if rank == ACE: + rank = 5 + if (rank + self.cap.dir) % self.cap.mod != cards[0].rank: + return False + i = list(self.game.s.foundations).index(self) + j = list(self.game.s.rows).index(from_stack) + return i == j + + +class Amazons(Game): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 6*l.XS, l.YM + 4*l.YS) + + # create stacks + x, y, = l.XM, l.YM + s.talon = Amazons_Talon(x, y, self, max_rounds=-1) + l.createText(s.talon, "ss") + x, y = l.XM+2*l.XS, l.YM + for i in range(4): + s.foundations.append(Amazons_Foundation(x, y, self, suit=i)) + x += l.XS + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(4): + s.rows.append(BasicRowStack(x, y, self, max_move=1, max_accept=0)) + x += l.XS + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + + def getAutoStacks(self, event=None): + return ((), (), self.sg.dropstacks) + + +# register the game +registerGame(GameInfo(172, TamOShanter, "Tam O'Shanter", + GI.GT_NUMERICA, 1, 0)) +registerGame(GameInfo(95, AuldLangSyne, "Auld Lang Syne", + GI.GT_NUMERICA, 1, 0)) +registerGame(GameInfo(173, Strategy, "Strategy", + GI.GT_NUMERICA, 1, 0)) +registerGame(GameInfo(123, Interregnum, "Interregnum", + GI.GT_NUMERICA, 2, 0)) +registerGame(GameInfo(296, Colorado, "Colorado", + GI.GT_NUMERICA, 2, 0)) +registerGame(GameInfo(406, Amazons, "Amazons", + GI.GT_NUMERICA, 1, -1, + ranks=(0, 6, 7, 8, 9, 10, 11), + )) + diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py new file mode 100644 index 00000000..f3cbf8d7 --- /dev/null +++ b/pysollib/games/bakersdozen.py @@ -0,0 +1,344 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Castles in Spain +# ************************************************************************/ + +class CastlesInSpain(Game): + Layout_Method = Layout.bakersDozenLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + Hint_Class = CautiousDefaultHint + + # + # game layout + # + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=13, playcards=9) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + max_move=1, max_accept=1)) + # default + l.defaultAll() + + def startGame(self, flip=(0, 0, 0)): + for f in flip: + self.s.talon.dealRow(flip=f, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Martha +# ************************************************************************/ + +class Martha_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return 0 + # when empty, only accept a single card + return self.cards or len(cards) == 1 + + +class Martha(CastlesInSpain): + RowStack_Class = FullStackWrapper(Martha_RowStack) + + def createGame(self): + CastlesInSpain.createGame(self, rows=12, playcards=13) + + def _shuffleHook(self, cards): + # move Aces to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + CastlesInSpain.startGame(self, flip=(0, 1, 0)) + self.s.talon.dealRow(rows=self.s.foundations) + + +# /*********************************************************************** +# // Baker's Dozen +# ************************************************************************/ + +class BakersDozen(CastlesInSpain): + RowStack_Class = StackWrapper(RK_RowStack, base_rank=NO_RANK) + + def _shuffleHook(self, cards): + # move Kings to bottom of each stack + i, n = 0, len(self.s.rows) + kings = [] + for c in cards: + if c.rank == KING: + kings.append(i) + i = i + 1 + for i in kings: + j = i % n + while j < i: + if cards[j].rank != KING: + cards[i], cards[j] = cards[j], cards[i] + break + j = j + n + cards.reverse() + return cards + + def startGame(self): + CastlesInSpain.startGame(self, flip=(1, 1, 1)) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank) + + +# /*********************************************************************** +# // Spanish Patience +# ************************************************************************/ + +class SpanishPatience(BakersDozen): + Foundation_Class = AC_FoundationStack + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Portuguese Solitaire +# ************************************************************************/ + +class PortugueseSolitaire(BakersDozen): + RowStack_Class = StackWrapper(RK_RowStack, base_rank=KING) + + +# /*********************************************************************** +# // Good Measure +# ************************************************************************/ + +class GoodMeasure(BakersDozen): + def createGame(self): + CastlesInSpain.createGame(self, rows=10) + + def _shuffleHook(self, cards): + cards = BakersDozen._shuffleHook(self, cards) + # move 2 Aces to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 0, c.suit), 2) + + def startGame(self): + CastlesInSpain.startGame(self, flip=(1, 1, 1, 1)) + for i in range(2): + c = self.s.talon.cards[-1] + assert c.rank == ACE + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, self.s.foundations[c.suit]) + assert len(self.s.talon.cards) == 0 + + +# /*********************************************************************** +# // Cruel +# ************************************************************************/ + +class Cruel_Talon(TalonStack): + def canDealCards(self): + ## FIXME: this is to avoid loops in the demo + if self.game.demo and self.game.moves.index >= 100: + return False + if self.round == self.max_rounds: + return False + return not self.game.isGameWon() + + def dealCards(self, sound=0): + lr = len(self.game.s.rows) + # move all cards to the Talon and redeal (no shuffling) + num_cards = 0 + assert len(self.cards) == 0 + rows = list(self.game.s.rows)[:] + rows.reverse() + for r in rows: + for i in range(len(r.cards)): + num_cards = num_cards + 1 + self.game.moveMove(1, r, self, frames=0) + assert len(self.cards) == num_cards + if num_cards == 0: # game already finished + return 0 + # redeal in packs of 4 cards + self.game.nextRoundMove(self) + n, i = num_cards, 0 + deal = [4] * lr + extra_cards = n - 4 * lr + while extra_cards > 0: + # note: this can only happen in Tarock games like Nasty + deal[i] = deal[i] + 1 + i = (i + 1) % lr + extra_cards = extra_cards - 1 + ##print n, deal + self.game.startDealSample() + for i in range(lr): + k = min(deal[i], n) + frames = (0, 4)[n <= 3*4] + for j in range(k): + self.game.moveMove(1, self, self.game.s.rows[i], frames=frames) + n = n - k + if n == 0: + break + # done + self.game.stopSamples() + assert n == len(self.cards) == 0 + return num_cards + + +class Cruel(CastlesInSpain): + Talon_Class = StackWrapper(Cruel_Talon, max_rounds=-1) + RowStack_Class = StackWrapper(SS_RowStack, base_rank=NO_RANK) + + def createGame(self): + CastlesInSpain.createGame(self, rows=12) + + def _shuffleHook(self, cards): + # move Aces to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + CastlesInSpain.startGame(self, flip=(1, 1, 1)) + self.s.talon.dealRow(rows=self.s.foundations) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + +# /*********************************************************************** +# // Royal Family +# ************************************************************************/ + +class RoyalFamily(Cruel): + + Foundation_Class = StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1) + Talon_Class = StackWrapper(Cruel_Talon, max_rounds=2) + RowStack_Class = UD_AC_RowStack + + def _shuffleHook(self, cards): + # move Kings to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 12, c.suit)) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Perseverance +# ************************************************************************/ + +class Perseverance(Cruel, BakersDozen): + Talon_Class = StackWrapper(Cruel_Talon, max_rounds=3) + RowStack_Class = StackWrapper(SS_RowStack, base_rank=NO_RANK, dir=-1, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS) + + def _shuffleHook(self, cards): + # move Kings to bottom of each stack (???) + #cards = BakersDozen._shuffleHook(self, cards) + # move Aces to bottom of the Talon (i.e. last cards to be dealt) + cards = Cruel._shuffleHook(self, cards) + return cards + +## def dealCards(self, sound=1): +## Cruel.dealCards(self, sound) + + +# /*********************************************************************** +# // Ripple Fan +# ************************************************************************/ + +class RippleFan(CastlesInSpain): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + Layout.bakersDozenLayout(l, rows=13) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = Cruel_Talon(l.s.talon.x, l.s.talon.y, self, max_rounds=-1) + for r in l.s.foundations: + s.foundations.append(SS_FoundationStack(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(SS_RowStack(r.x, r.y, self, base_rank=NO_RANK)) + # default + l.defaultAll() + + def startGame(self): + CastlesInSpain.startGame(self, flip=(1, 1, 1)) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +# register the game +registerGame(GameInfo(83, CastlesInSpain, "Castles in Spain", + GI.GT_BAKERS_DOZEN, 1, 0)) +registerGame(GameInfo(84, Martha, "Martha", + GI.GT_BAKERS_DOZEN, 1, 0)) +registerGame(GameInfo(31, BakersDozen, "Baker's Dozen", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(85, SpanishPatience, "Spanish Patience", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(86, GoodMeasure, "Good Measure", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(104, Cruel, "Cruel", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, -1)) +registerGame(GameInfo(291, RoyalFamily, "Royal Family", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 1)) +registerGame(GameInfo(308, PortugueseSolitaire, "Portuguese Solitaire", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(404, Perseverance, "Perseverance", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 2)) +registerGame(GameInfo(369, RippleFan, "Ripple Fan", + GI.GT_BAKERS_DOZEN, 1, -1)) + diff --git a/pysollib/games/bakersgame.py b/pysollib/games/bakersgame.py new file mode 100644 index 00000000..6ea1147d --- /dev/null +++ b/pysollib/games/bakersgame.py @@ -0,0 +1,366 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.hint import FreeCellType_Hint, FreeCellSolverWrapper + + +# /*********************************************************************** +# // Baker's Game +# ************************************************************************/ + +# To simplify playing we also consider the number of free rows. +# Note that this only is legal if the game.s.rows have a +# cap.base_rank == ANY_RANK. +# See also the "SuperMove" section in the FreeCell FAQ. +class BakersGame_RowStack(SS_RowStack): + def _getMaxMove(self, to_stack_ncards): + max_move = getNumberOfFreeStacks(self.game.s.reserves) + 1 + n = getNumberOfFreeStacks(self.game.s.rows) + if to_stack_ncards == 0: + n = n - 1 + while n > 0 and max_move < 1000: + max_move = max_move * 2 + n = n - 1 + return max_move + + def canMoveCards(self, cards): + max_move = self._getMaxMove(1) + return len(cards) <= max_move and SS_RowStack.canMoveCards(self, cards) + + def acceptsCards(self, from_stack, cards): + max_move = self._getMaxMove(len(self.cards)) + return len(cards) <= max_move and SS_RowStack.acceptsCards(self, from_stack, cards) + + +class BakersGame(Game): + Layout_Method = Layout.freeCellLayout + Foundation_Class = SS_FoundationStack + RowStack_Class = BakersGame_RowStack + ##Hint_Class = FreeCellType_Hint + Hint_Class = FreeCellSolverWrapper(FreeCellType_Hint, {'sbb' : "suit" }) + + # + # game layout + # + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=8, reserves=4, texts=0) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = InitialDealTalonStack(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + self.s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + for r in l.s.reserves: + self.s.reserves.append(ReserveStack(r.x, r.y, self)) + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + r = self.s.rows + ##self.s.talon.dealRow(rows=(r[0], r[1], r[6], r[7])) + self.s.talon.dealRow(rows=r[:4]) + assert len(self.s.talon.cards) == 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class KingOnlyBakersGame(BakersGame): + RowStack_Class = StackWrapper(FreeCell_SS_RowStack, base_rank=KING) + Hint_Class = FreeCellSolverWrapper(FreeCellType_Hint, {'sbb' : "suit", 'esf' : "kings" }) + + +# /*********************************************************************** +# // Eight Off (Baker's Game in a different layout) +# ************************************************************************/ + +class EightOff(KingOnlyBakersGame): + + # + # game layout + # + + def createGame(self, rows=8, reserves=8): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 16 cards are playable without overlap in default window size) + h = max(2*l.YS, l.YS+(16-1)*l.YOFFSET) + maxrows = max(rows, reserves) + self.setSize(l.XM + maxrows*l.XS, l.YM + l.YS + h + l.YS) + + # create stacks + x, y = l.XM + (maxrows-4)*l.XS/2, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, i)) + x = x + l.XS + x, y = l.XM + (maxrows-rows)*l.XS/2, y + l.YS + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self)) + x = x + l.XS + x, y = l.XM + (maxrows-reserves)*l.XS/2, self.height - l.YS + for i in range(reserves): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + self.setRegion(s.reserves, (-999, y - l.CH / 2, 999999, 999999)) + s.talon = InitialDealTalonStack(l.XM, l.YM, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + r = self.s.reserves + self.s.talon.dealRow(rows=[r[0],r[2],r[4],r[6]]) + assert len(self.s.talon.cards) == 0 + + +# /*********************************************************************** +# // Seahaven Towers (Baker's Game in a different layout) +# ************************************************************************/ + +class SeahavenTowers(KingOnlyBakersGame): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 20 cards are playable in default window size) + h = max(3*l.YS, 20*l.YOFFSET) + self.setSize(l.XM + 10*l.XS, l.YM + l.YS + h) + + # create stacks + x, y = l.XM, l.YM + for i in range(4): + s.reserves.append(ReserveStack(x + (i+3)*l.XS, y, self)) + for suit in range(4): + i = (9, 0, 1, 8)[suit] + s.foundations.append(SS_FoundationStack(x + i*l.XS, y, self, suit)) + x, y = l.XM, l.YM + l.YS + for i in range(10): + s.rows.append(self.RowStack_Class(x, y, self)) + x = x + l.XS + self.setRegion(s.rows, (-999, y - l.YM / 2, 999999, 999999)) + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + # define stack-groups + self.sg.openstacks = s.foundations + s.rows + s.reserves + self.sg.talonstacks = [s.talon] + self.sg.dropstacks = s.rows + s.reserves + self.sg.reservestacks = s.reserves + + # + # game overrides + # + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=(self.s.reserves[1:3])) + assert len(self.s.talon.cards) == 0 + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class RelaxedSeahavenTowers(SeahavenTowers): + RowStack_Class = KingSS_RowStack + Hint_Class = FreeCellSolverWrapper(FreeCellType_Hint, {'sbb' : "suit", 'esf' : "kings", 'sm' : "unlimited",}) + + +# /*********************************************************************** +# // Penguin +# // Opus +# ************************************************************************/ + +class Penguin(Game): + GAME_VERSION = 2 + + RowStack_Class = SS_RowStack + Hint_Class = FreeCellType_Hint + + # + # game layout + # + + def createGame(self, rows=7, reserves=7): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 16 cards are playable without overlap in default window size) + h = max(3*l.YS, l.YS+(16-1)*l.YOFFSET) + maxrows = max(rows, reserves) + self.setSize(l.XM + (maxrows+1)*l.XS, l.YM + h + l.YS) + + # extra settings + self.base_card = None + + # create stacks + x, y = self.width - l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, i, mod=13, max_move=0)) + y = y + l.YS + self.setRegion(s.foundations, (x - l.CW/2, -999, 999999, 999999)) + x, y = l.XM + (maxrows-rows)*l.XS/2, l.YM + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self, mod=13)) + x = x + l.XS + x, y = l.XM + (maxrows-reserves)*l.XS/2, self.height - l.YS + for i in range(reserves): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + self.setRegion(s.reserves, (-999, y - l.CH / 2, 999999, 999999)) + s.talon = InitialDealTalonStack(l.XM+1, y, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move base cards to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c, rank=cards[-1].rank: (c.rank == rank, 0)) + + def startGame(self): + self.base_card = self.s.talon.cards[-4] + self._updateStacks() + # deal base cards to Foundations + for i in range(3): + c = self.s.talon.getCard() + assert c.rank == self.base_card.rank + to_stack = self.s.foundations[c.suit * self.gameinfo.decks] + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, to_stack, frames=0) + # deal rows + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + assert len(self.s.talon.cards) == 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + self._updateStacks() + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + # + # game extras + # + + def _updateStacks(self): + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + for s in self.s.rows: + s.cap.base_rank = (self.base_card.rank - 1) % 13 + + +class Opus(Penguin): + def createGame(self): + Penguin.createGame(self, reserves=5) + + +# register the game +registerGame(GameInfo(45, BakersGame, "Baker's Game", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(26, KingOnlyBakersGame, "King Only Baker's Game", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(258, EightOff, "Eight Off", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(9, SeahavenTowers, "Seahaven Towers", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, + altnames=("Sea Towers", "Towers") )) +registerGame(GameInfo(6, RelaxedSeahavenTowers, "Relaxed Seahaven Towers", + GI.GT_FREECELL | GI.GT_RELAXED | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(64, Penguin, "Penguin", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, + altnames=("Beak and Flipper",) )) +registerGame(GameInfo(427, Opus, "Opus", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py new file mode 100644 index 00000000..b8012d3b --- /dev/null +++ b/pysollib/games/beleagueredcastle.py @@ -0,0 +1,659 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import CautiousDefaultHint, FreeCellType_Hint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // +# ************************************************************************/ + +class BeleagueredCastleType_Hint(CautiousDefaultHint): + # FIXME: demo is not too clever in this game + pass + + +# /*********************************************************************** +# // Streets and Alleys +# ************************************************************************/ + +class StreetsAndAlleys(Game): + Hint_Class = BeleagueredCastleType_Hint + + # + # game layout + # + + def createGame(self, playcards=13, reserves=0): + # create layout + l, s = Layout(self), self.s + + # set window + # (set size so that at least 13 cards are fully playable) + w = max(3*l.XS, l.XS+(playcards-1)*l.XOFFSET) + x0 = l.XM + x1 = x0 + w + 2*l.XM + x2 = x1 + l.XS + 2*l.XM + x3 = x2 + w + l.XM + self.setSize(x3, l.YM + (4+int(reserves!=0))*l.YS) + + # create stacks + y = l.YM + if reserves: + x = x1 - int(l.XS*(reserves-1)/2) + for i in range(reserves): + s.reserves.append(ReserveStack(x, y, self)) + x += l.XS + y += l.YS + x = x1 + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, i, max_move=0)) + y = y + l.YS + for x in (x0, x2): + y = l.YM+l.YS*int(reserves!=0) + for i in range(4): + stack = RK_RowStack(x, y, self, max_move=1, max_accept=1) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.rows.append(stack) + y = y + l.YS + x, y = self.width - l.XS, self.height - l.YS + s.talon = InitialDealTalonStack(x, y, self) + if reserves: + l.setRegion(s.rows[:4], (-999, l.YM+l.YS-l.CH/2, x1-l.CW/2, 999999)) + + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + for i in range(3): + self.s.talon.dealRowAvail() + assert len(self.s.talon.cards) == 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank - card2.rank) == 1 + + +# /*********************************************************************** +# // Beleaguered Castle +# ************************************************************************/ + +class BeleagueredCastle(StreetsAndAlleys): + def _shuffleHook(self, cards): + # move Aces to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + for i in range(2): + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations) + assert len(self.s.talon.cards) == 0 + + +# /*********************************************************************** +# // Citadel +# ************************************************************************/ + +class Citadel(StreetsAndAlleys): + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) + + # move cards to the Foundations during dealing + def startGame(self): + frames = 4 + talon = self.s.talon + self.startDealSample() + talon.dealRow(rows=self.s.foundations, frames=frames) + while talon.cards: + for r in self.s.rows: + self.flipMove(talon) + for s in self.s.foundations: + if s.acceptsCards(self, talon.cards[-1:]): + self.moveMove(1, talon, s, frames=frames) + break + else: + self.moveMove(1, talon, r, frames=frames) + if not talon.cards: + break + + +# /*********************************************************************** +# // Fortress +# ************************************************************************/ + +class Fortress(Game): + Layout_Method = Layout.klondikeLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = UD_SS_RowStack + Hint_Class = BeleagueredCastleType_Hint + + # + # game layout + # + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=10, waste=0, texts=0, playcards=16) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + if l.s.waste: + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + # default + l.defaultAll() + return l + + + # + # game overrides + # + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + for i in range(3): + self.s.talon.dealRowAvail() + assert len(self.s.talon.cards) == 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % 13 == card2.rank or + (card2.rank + 1) % 13 == card1.rank)) + +# /*********************************************************************** +# // Bastion +# // Ten by One +# ************************************************************************/ + +class Bastion(Game): + Layout_Method = Layout.freeCellLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = UD_SS_RowStack + ReserveStack_Class = ReserveStack + Hint_Class = BeleagueredCastleType_Hint + + # + # game layout + # + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=10, reserves=2, texts=0, playcards=16) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + for r in l.s.reserves: + s.reserves.append(self.ReserveStack_Class(r.x, r.y, self)) + # default + l.defaultAll() + return l + + + # + # game overrides + # + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + for i in range(2): + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + + +class TenByOne(Bastion): + def createGame(self): + Bastion.createGame(self, reserves=1) + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + for i in range(3): + self.s.talon.dealRowAvail() + + +# /*********************************************************************** +# // Chessboard +# ************************************************************************/ + +class Chessboard_Foundation(SS_FoundationStack): + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, mod=13, min_cards=1, max_move=0) + apply(SS_FoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + if not self.cards: + if len(cards) != 1 or not cards[0].face_up: + return 0 + if cards[0].suit != self.cap.base_suit: + return 0 + for s in self.game.s.foundations: + if s.cards: + return cards[0].rank == s.cards[0].rank + return 1 + return SS_FoundationStack.acceptsCards(self, from_stack, cards) + + +class Chessboard_RowStack(UD_SS_RowStack): + def canDropCards(self, stacks): + if self.game.demo: + return UD_SS_RowStack.canDropCards(self, stacks) + for s in self.game.s.foundations: + if s.cards: + return UD_SS_RowStack.canDropCards(self, stacks) + return (None, 0) + + +class Chessboard(Fortress): + Foundation_Class = Chessboard_Foundation + RowStack_Class = StackWrapper(Chessboard_RowStack, mod=13) + + def createGame(self): + l = Fortress.createGame(self) + tx, ty, ta, tf = l.getTextAttr(self.s.foundations[-1], "e") + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx + l.XM, ty, anchor=ta, font=font) + + def updateText(self): + if self.preview > 1: + return + t = "" + for s in self.s.foundations: + if s.cards: + t = RANKS[s.cards[0].rank] + break + self.texts.info.config(text=t) + + +# /*********************************************************************** +# // Stronghold +# // Fastness +# ************************************************************************/ + +class Stronghold(StreetsAndAlleys): + Hint_Class = FreeCellType_Hint + def createGame(self): + StreetsAndAlleys.createGame(self, reserves=1) + +class Fastness(StreetsAndAlleys): + Hint_Class = FreeCellType_Hint + def createGame(self): + StreetsAndAlleys.createGame(self, reserves=2) + + +# /*********************************************************************** +# // Zerline +# ************************************************************************/ + +class Zerline_ReserveStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return False + return not from_stack is self.game.s.waste + +class Zerline(Game): + Hint_Class = BeleagueredCastleType_Hint + + # + # game layout + # + + def createGame(self, rows=8, playcards=13, reserve_max_cards=4): + # create layout + l, s = Layout(self), self.s + decks = self.gameinfo.decks + + # set window + # (set size so that at least 13 cards are fully playable) + w = max(3*l.XS, l.XS+playcards*l.XOFFSET) + self.setSize(l.XM+2*w+decks*l.XS, 4*l.YM + (rows/2+1)*l.YS) + + # create stacks + y = l.YM + x = l.XM + w + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + x += l.XS + stack = Zerline_ReserveStack(x, y, self, max_cards=reserve_max_cards) + s.reserves.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + l.createText(stack, "ss") + x = l.XM + w + for j in range(decks): + y = 4*l.YM+l.YS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, i, + base_rank=KING, dir=1, max_move=0, mod=13)) + y += l.YS + x += l.XS + x = l.XM + for j in range(2): + y = 4*l.YM+l.YS + for i in range(rows/2): + stack = RK_RowStack(x, y, self, max_move=1, max_accept=1, base_rank=QUEEN) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.rows.append(stack) + y += l.YS + x += l.XM + w +decks*l.XS + + l.setRegion(s.rows[:4], (-999, 4*l.YM+l.YS-l.CH/2, w-l.CW/2, 999999)) + + # define stack-groups + l.defaultStackGroups() + # set regions + l.defaultRegions() + + # + # game overrides + # + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank - card2.rank) == 1 + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + return int(to_stack in self.s.rows) + + +class Zerline3Decks(Zerline): + def createGame(self): + Zerline.createGame(self, rows=8, reserve_max_cards=6) + + +# /*********************************************************************** +# // Chequers +# ************************************************************************/ + +class Chequers(Fortress): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (set size so that at least 7 cards are fully playable) + dx = l.XM+l.XS+7*l.XOFFSET + w = l.XM+max(5*dx, 9*l.XS+2*l.XM) + h = l.YM+6*l.YS + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + s.talon = TalonStack(x, y, self) + l.createText(s.talon, "se") + x = max(l.XS+3*l.XM, (self.width-l.XM-8*l.XS)/2) + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=KING, dir=-1)) + x += l.XS + y = l.YM+l.YS + for i in range(5): + x = l.XM + for j in range(5): + stack = UD_SS_RowStack(x, y, self) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + x += dx + y += l.YS + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def fillStack(self, stack): + if self.s.talon.cards and stack in self.s.rows and not stack.cards: + self.s.talon.dealToStacks([stack]) + + +# /*********************************************************************** +# // Castle of Indolence +# ************************************************************************/ + +class CastleOfIndolence(Game): + Hint_Class = BeleagueredCastleType_Hint + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (set size so that at least 13 cards are fully playable) + w = max(3*l.XS, l.XS+13*l.XOFFSET) + self.setSize(l.XM+2*w+2*l.XS, l.YM + 5*l.YS) + + # create stacks + x, y = l.XM, l.YM+4*l.YS + s.talon = InitialDealTalonStack(x, y, self) + x, y = l.XM+w-l.XS, l.YM+4*l.YS + for i in range(4): + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + x += l.XS + + x = l.XM + w + for x in (l.XM + w, l.XM + w + l.XS): + y = l.YM + for i in range(4): + s.foundations.append(RK_FoundationStack(x, y, self, + max_move=0)) + y += l.YS + + for x in (l.XM, l.XM + w +2*l.XS): + y = l.YM + for i in range(4): + stack = RK_RowStack(x, y, self, max_move=1, max_accept=1, base_rank=ANY_RANK) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.rows.append(stack) + y += l.YS + l.setRegion(s.rows[:4], (-999, -999, w-l.CW/2, l.YM+4*l.YS-l.CH/2)) + + # define stack-groups + l.defaultStackGroups() + # set regions + l.defaultRegions() + + def startGame(self): + for i in range(13): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow() + self.s.talon.dealRowAvail() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank - card2.rank) == 1 + + +# /*********************************************************************** +# // Rittenhouse +# ************************************************************************/ + +class Rittenhouse_Foundation(RK_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not RK_FoundationStack.acceptsCards(self, from_stack, cards): + return False + if from_stack in self.game.s.rows: + ri = list(self.game.s.rows).index(from_stack) + fi = list(self.game.s.foundations).index(self) + if ri < 4: + return ri == fi + if ri == 4: + return True + return ri-1 == fi + return False + + +class Rittenhouse(Game): + Hint_Class = BeleagueredCastleType_Hint + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+9*l.XS, l.YM+3*l.YS+12*l.YOFFSET) + + # create stacks + x, y = l.XM, l.YM + for i in range(4): + s.foundations.append(Rittenhouse_Foundation(x, y, self, max_move=0)) + x += l.XS + x += l.XS + for i in range(4): + s.foundations.append(Rittenhouse_Foundation(x, y, self, + base_rank=KING, dir=-1, max_move=0)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(9): + s.rows.append(UD_RK_RowStack(x, y, self)) + x += l.XS + + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + # default + l.defaultAll() + + + def startGame(self): + # move cards to the Foundations during dealing + talon = self.s.talon + self.startDealSample() + while talon.cards: + talon.dealRowAvail() + self.fillAll() + + def fillAll(self): + while True: + if not self._fillOne(): + break + + def _fillOne(self): + for r in self.s.rows: + for s in self.s.foundations: + if s.acceptsCards(r, r.cards[-1:]): + self.moveMove(1, r, s) + return 1 + return 0 + + def fillStack(self, stack): + self.fillAll() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank - card2.rank) == 1 + + + +# register the game +registerGame(GameInfo(146, StreetsAndAlleys, "Streets and Alleys", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(34, BeleagueredCastle, "Beleaguered Castle", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(145, Citadel, "Citadel", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(147, Fortress, "Fortress", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(148, Chessboard, "Chessboard", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(300, Stronghold, "Stronghold", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(301, Fastness, "Fastness", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(306, Zerline, "Zerline", + GI.GT_BELEAGUERED_CASTLE, 2, 0)) +registerGame(GameInfo(324, Bastion, "Bastion", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(325, TenByOne, "Ten by One", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(351, Chequers, "Chequers", + GI.GT_BELEAGUERED_CASTLE, 2, 0)) +registerGame(GameInfo(393, CastleOfIndolence, "Castle of Indolence", + GI.GT_BELEAGUERED_CASTLE, 2, 0)) +registerGame(GameInfo(395, Zerline3Decks, "Zerline (3 decks)", + GI.GT_BELEAGUERED_CASTLE, 3, 0)) +registerGame(GameInfo(400, Rittenhouse, "Rittenhouse", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 2, 0)) + diff --git a/pysollib/games/bisley.py b/pysollib/games/bisley.py new file mode 100644 index 00000000..559baf57 --- /dev/null +++ b/pysollib/games/bisley.py @@ -0,0 +1,257 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + + +# /*********************************************************************** +# // Bisley +# ************************************************************************/ + +class Bisley(Game): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = 2*l.XM+8*l.XS, max(2*(l.YM+l.YS+8*l.YOFFSET), l.YM+5*l.YS) + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + for i in range(6): + s.rows.append(UD_SS_RowStack(x, y, self, base_rank=NO_RANK)) + x += l.XS + x, y = l.XM, l.YM+l.YS+8*l.YOFFSET + for i in range(6): + s.rows.append(UD_SS_RowStack(x, y, self, base_rank=NO_RANK)) + x += l.XS + y = l.YM + for i in range(4): + x = l.XM+6*l.XS+l.XM + s.foundations.append(SS_FoundationStack(x, y, self, i, max_move=0)) + x += l.XS + s.foundations.append(SS_FoundationStack(x, y, self, i, + base_rank=KING, max_move=0, dir=-1)) + y += l.YS + + s.talon = InitialDealTalonStack(w-l.XS, h-l.YS, self) + + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations[::2]) + + def _shuffleHook(self, cards): + # move Aces to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == ACE, c.suit)) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Double Bisley +# ************************************************************************/ + +class DoubleBisley(Bisley): + + Hint_Class = CautiousDefaultHint + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+(8+4)*l.XS, l.YM+max(3*(l.YS+8*l.YOFFSET), 8*l.YS) + self.setSize(w, h) + + # create stacks + y = l.YM + for i in range(3): + x = l.XM + for j in range(8): + s.rows.append(UD_SS_RowStack(x, y, self, base_rank=NO_RANK)) + x += l.XS + y += l.YS+8*l.YOFFSET + + y = l.YM + for j in range(2): + for i in range(4): + x = l.XM+8*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, + suit=j*2+i/2, max_move=0)) + x += l.XS + s.foundations.append(SS_FoundationStack(x, y, self, + suit=j*2+i/2, base_rank=KING, max_move=0, dir=-1)) + y += l.YS + + s.talon = InitialDealTalonStack(l.XM, h-l.YS, self) + + # default + l.defaultAll() + + +# /*********************************************************************** +# // Gloria +# ************************************************************************/ + +class Gloria(Game): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+12*l.XS, l.YM+2*l.YS+2*(l.YS+5*l.YOFFSET) + self.setSize(w, h) + + # create stacks + y = l.YM+2*l.YS + for i in range(2): + x = l.XM + for j in range(12): + s.rows.append(BasicRowStack(x, y, self, max_accept=0)) + x += l.XS + y += l.YS+5*l.YOFFSET + + x = l.XM+2*l.XS + for j in range(2): + for i in range(4): + y = l.YM + s.foundations.append(SS_FoundationStack(x, y, self, suit=j*2+i/2)) + y += l.YS + s.foundations.append(SS_FoundationStack(x, y, self, + suit=j*2+i/2, base_rank=KING, dir=-1)) + x += l.XS + + s.reserves.append(ReserveStack(l.XM, l.YM, self)) + s.reserves.append(ReserveStack(w-l.XS, l.YM, self)) + + s.talon = InitialDealTalonStack(l.XM, l.YM+l.YS, self) + + # default + l.defaultAll() + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations[1::2]) + + def _shuffleHook(self, cards): + # move Kings to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == KING, c.suit)) + + +# /*********************************************************************** +# // Adelaide +# // Mancunian +# ************************************************************************/ + +class Adelaide(Game): + + Hint_Class = CautiousDefaultHint + RowStack_Class = StackWrapper(UD_AC_RowStack, base_rank=NO_RANK) + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+8*l.XS, l.YM+2*l.YS+15*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = 2*l.XM, l.YM+l.YS + for i in range(8): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + y = l.YM + for i in range(4): + x = l.XM+i*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, i, max_move=0)) + x += 2*l.XM+4*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, i, + base_rank=KING, max_move=0, dir=-1)) + + s.talon = InitialDealTalonStack(w-l.XS, h-l.YS, self) + + # default + l.defaultAll() + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRowAvail() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + +class Mancunian(Adelaide): + RowStack_Class = StackWrapper(UD_RK_RowStack, base_rank=NO_RANK) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + +# register the game +registerGame(GameInfo(290, Bisley, "Bisley", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(372, DoubleBisley, "Double Bisley", + GI.GT_2DECK_TYPE | GI.GT_OPEN, 2, 0)) +registerGame(GameInfo(373, Gloria, "Gloria", + GI.GT_2DECK_TYPE | GI.GT_OPEN, 2, 0)) +registerGame(GameInfo(374, Adelaide, "Adelaide", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(375, Mancunian, "Mancunian", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py new file mode 100644 index 00000000..ea59bf4b --- /dev/null +++ b/pysollib/games/braid.py @@ -0,0 +1,382 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys, math + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Braid_Hint(DefaultHint): + # FIXME: demo is not too clever in this game + pass + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Braid_Foundation(AbstractFoundationStack): + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, mod=13, dir=0, base_rank=NO_RANK, max_move=0) + apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if not self.cards: + return 1 + stack_dir = self.game.getFoundationDir() + if stack_dir == 0: + card_dir = self.getRankDir(cards=(self.cards[-1], cards[0])) + return card_dir in (1, -1) + else: + return (self.cards[-1].rank + stack_dir) % self.cap.mod == cards[0].rank + + +class Braid_BraidStack(OpenStack): + def __init__(self, x, y, game, sine=0): + OpenStack.__init__(self, x, y, game) + self.CARD_YOFFSET = self.game.app.images.CARD_YOFFSET + CW = self.game.app.images.CARDW + if sine: + # use a sine wave for the x offsets + self.CARD_XOFFSET = [] + n = 9 + dx = 0.4 * CW * (2*math.pi/n) + last_x = 0 + for i in range(n): + x = int(round(dx * math.sin(i + 1))) + ##print x, x - last_x + self.CARD_XOFFSET.append(x - last_x) + last_x = x + else: + self.CARD_XOFFSET = (-0.45*CW, 0.35*CW, 0.55*CW, -0.45*CW) + + +class Braid_RowStack(ReserveStack): + def fillStack(self): + if not self.cards and self.game.s.braid.cards: + self.game.moveMove(1, self.game.s.braid, self) + + def getBottomImage(self): + return self.game.app.images.getBraidBottom() + + +class Braid_ReserveStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if from_stack is self.game.s.braid or from_stack in self.game.s.rows: + return 0 + return ReserveStack.acceptsCards(self, from_stack, cards) + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + +# /*********************************************************************** +# // Braid +# ************************************************************************/ + +class Braid(Game): + Hint_Class = Braid_Hint + Foundation_Class_1 = Braid_Foundation + Foundation_Class_2 = Braid_Foundation + + BRAID_CARDS = 20 + RANKS = RANKS # pull into class Braid + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 20 cards are playable - needed for Braid_BraidStack) + h = max(4*l.YS + 30, l.YS+(self.BRAID_CARDS-1)*l.YOFFSET) + self.setSize(10*l.XS+l.XM, l.YM + h) + + # extra settings + self.base_card = None + + # create stacks + s.addattr(braid=None) # register extra stack variable + x, y = l.XM, l.YM + for i in range(2): + s.rows.append(Braid_RowStack(x + 0.5*l.XS, y, self)) + s.rows.append(Braid_RowStack(x + 4.5*l.XS, y, self)) + y = y + 3 * l.YS + y = l.YM + l.YS + for i in range(2): + s.rows.append(Braid_ReserveStack(x, y, self)) + s.rows.append(Braid_ReserveStack(x + l.XS, y, self)) + s.rows.append(Braid_ReserveStack(x, y + l.YS, self)) + s.rows.append(Braid_ReserveStack(x + l.XS, y + l.YS, self)) + x = x + 4 * l.XS + x, y = l.XM + l.XS * 5/2, l.YM + s.braid = Braid_BraidStack(x, y, self) + x, y = l.XM + 7 * l.XS, l.YM + l.YS * 3/2 + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, "ss") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + x + l.CW / 2, y - l.YM, + anchor="s", + font=self.app.getFont("canvas_default")) + x = x - l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + x = l.XM + 8 * l.XS + y = l.YM + for i in range(4): + s.foundations.append(self.Foundation_Class_1(x, y, self, suit=i)) + s.foundations.append(self.Foundation_Class_2(x + l.XS, y, self, suit=i)) + y = y + l.YS + self.texts.info = MfxCanvasText(self.canvas, + x + l.CW + l.XM / 2, y, + anchor="n", + font=self.app.getFont("canvas_default")) + + # define stack-groups + self.sg.talonstacks = [s.talon] + [s.waste] + self.sg.openstacks = s.foundations + s.rows + self.sg.dropstacks = [s.braid] + s.rows + [s.waste] + + + # + # game overrides + # + + def _shuffleHook(self, cards): + # do not play a trump as the base_card + n = m = -1 - self.BRAID_CARDS - len(self.s.rows) + while cards[n].suit >= len(self.gameinfo.suits): + n = n - 1 + cards[n], cards[m] = cards[m], cards[n] + return cards + + def startGame(self): + self.base_card = None + self.updateText() + self.startDealSample() + for i in range(self.BRAID_CARDS): + self.s.talon.dealRow(rows=[self.s.braid], frames=4) + self.s.talon.dealRow(frames=4) + # deal base_card to foundations + self.base_card = self.s.talon.cards[-1] + to_stack = self.s.foundations[2 * self.base_card.suit] + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, to_stack) + self.updateText() + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + # deal first card to WasteStack + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + + # + # game extras + # + + def updateText(self): + if self.preview > 1 or not self.texts.info: + return + if not self.base_card: + t = "" + else: + t = self.RANKS[self.base_card.rank] + dir = self.getFoundationDir() + if dir == 1: + t = t + _(" Ascending") + elif dir == -1: + t = t + _(" Descending") + self.texts.info.config(text=t) + + +class LongBraid(Braid): + BRAID_CARDS = 24 + + +# /*********************************************************************** +# // Fort +# ************************************************************************/ + +class Fort(Braid): + + Foundation_Class_1 = SS_FoundationStack + Foundation_Class_2 = StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1) + + BRAID_CARDS = 21 + + def _shuffleHook(self, cards): + # move 4 Kings and 4 Aces to top of the Talon + # (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, KING) and c.deck == 0, (c.suit, c.rank))) + + def _restoreGameHook(self, game): + pass + def _loadGameHook(self, p): + pass + def _saveGameHook(self, p): + pass + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + for i in range(self.BRAID_CARDS): + self.s.talon.dealRow(rows=[self.s.braid], frames=4) + self.s.talon.dealRow(frames=4) + self.s.talon.dealCards() + + +# /*********************************************************************** +# // Backbone +# ************************************************************************/ + +class Backbone_BraidStack(OpenStack): + def __init__(self, x, y, game, **cap): + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = self.game.app.images.CARD_YOFFSET + + def basicIsBlocked(self): + return len(self.game.s.reserves[2].cards) != 0 + + +class Backbone(Game): + + Hint_Class = CautiousDefaultHint + + def createGame(self, rows=8): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+(rows+2)*l.XS, l.YM+3*l.XS+10*l.YOFFSET + self.setSize(w, h) + + # create stacks + y = l.YM + for i in range(4): + x = l.XM+(rows-8)*l.XS/2 +i*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x = l.XM+(rows/2+2)*l.XS +i*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + + x, y = l.XM+rows*l.XS/2, l.YM + s.reserves.append(Backbone_BraidStack(x, y, self, max_accept=0)) + x += l.XS + s.reserves.append(Backbone_BraidStack(x, y, self, max_accept=0)) + x, y = l.XM+(rows+1)*l.XS/2, l.YM+11*l.YOFFSET + s.reserves.append(BasicRowStack(x, y, self, max_accept=0)) + + x, y = l.XM, l.YM+l.YS + for i in range(rows/2): + s.rows.append(SS_RowStack(x, y, self, max_move=1)) + x += l.XS + x, y = l.XM+(rows/2+2)*l.XS, l.YM+l.YS + for i in range(rows/2): + s.rows.append(SS_RowStack(x, y, self, max_move=1)) + x += l.XS + + x, y = l.XM+rows*l.XS/2, h-l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "nn") + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "nn") + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self): + for i in range(10): + self.s.talon.dealRow(rows=self.s.reserves[:2], frames=0) + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +class BackbonePlus(Backbone): + def createGame(self): + Backbone.createGame(self, rows=10) + + +# register the game +registerGame(GameInfo(12, Braid, "Braid", + GI.GT_NAPOLEON, 2, 2, + altnames=("Der Zopf", "Plait", "Pigtail") )) +registerGame(GameInfo(175, LongBraid, "Long Braid", + GI.GT_NAPOLEON, 2, 2, + altnames=("Der lange Zopf",) )) +registerGame(GameInfo(358, Fort, "Fort", + GI.GT_NAPOLEON, 2, 2)) +registerGame(GameInfo(376, Backbone, "Backbone", + GI.GT_NAPOLEON, 2, 0)) +registerGame(GameInfo(377, BackbonePlus, "Backbone +", + GI.GT_NAPOLEON, 2, 0)) diff --git a/pysollib/games/bristol.py b/pysollib/games/bristol.py new file mode 100644 index 00000000..e98f6377 --- /dev/null +++ b/pysollib/games/bristol.py @@ -0,0 +1,327 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Bristol_Hint(CautiousDefaultHint): + # FIXME: demo is not too clever in this game + + BONUS_CREATE_EMPTY_ROW = 0 # 0..9000 + BONUS_CAN_DROP_ALL_CARDS = 0 # 0..4000 + BONUS_CAN_CREATE_EMPTY_ROW = 0 # 0..4000 + + # Score for moving a pile from stack r to stack t. + # Increased score must be in range 0..9999 + def _getMovePileScore(self, score, color, r, t, pile, rpile): + # prefer reserves + if not r in self.game.s.reserves: + score = score - 10000 + # an empty pile doesn't gain anything + if len(pile) == len(r.cards): + return -1, color + return CautiousDefaultHint._getMovePileScore(self, score, color, r, t, pile, rpile) + + +# /*********************************************************************** +# // Bristol +# ************************************************************************/ + +class Bristol_Talon(TalonStack): + def dealCards(self, sound=0): + return self.dealRowAvail(rows=self.game.s.reserves, sound=sound) + + +class Bristol(Game): + Layout_Method = Layout.klondikeLayout + Hint_Class = Bristol_Hint + + # + # game layout + # + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 10*l.XS, l.YM + 5*l.YS) + + # create stacks + x, y, = l.XM + 3*l.XS, l.YM + for i in range(4): + s.foundations.append(RK_FoundationStack(x, y, self, max_move=0)) + x = x + l.XS + for i in range(2): + y = l.YM + (i*2+3)*l.YS/2 + for j in range(4): + x = l.XM + (j*5)*l.XS/2 + stack = RK_RowStack(x, y, self, base_rank=NO_RANK, max_move=1) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.rows.append(stack) + x, y, = l.XM + 3*l.XS, l.YM + 4*l.YS + s.talon = Bristol_Talon(x, y, self) + l.createText(s.talon, "sw") + for i in range(3): + x = x + l.XS + s.reserves.append(ReserveStack(x, y, self, max_accept=0, max_cards=UNLIMITED_CARDS)) + + # define stack-groups + self.sg.openstacks = s.foundations + s.rows + self.sg.talonstacks = [s.talon] + self.sg.dropstacks = s.rows + s.reserves + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move Kings to bottom of each stack + i, n = 0, len(self.s.rows) + kings = [] + for c in cards[:24]: # search the first 24 cards only + if c.rank == KING: + kings.append(i) + i = i + 1 + for i in kings: + j = i % n # j = card index of rowstack bottom + while j < i: + if cards[j].rank != KING: + cards[j], cards[i] = cards[i], cards[j] + break + j = j + n + cards.reverse() + return cards + + def startGame(self): + r = self.s.rows + for i in range(2): + self.s.talon.dealRow(rows=r, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=r) + self.s.talon.dealCards() # deal first cards to Reserves + + +# /*********************************************************************** +# // Belvedere +# ************************************************************************/ + +class Belvedere(Bristol): + def _shuffleHook(self, cards): + # remove 1 Ace + for c in cards: + if c.rank == 0: + cards.remove(c) + break + # move Kings to bottom + cards = Bristol._shuffleHook(self, cards) + # re-insert Ace + return cards[:-24] + [c] + cards[-24:] + + def startGame(self): + r = self.s.rows + for i in range(2): + self.s.talon.dealRow(rows=r, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=r) + assert self.s.talon.cards[-1].rank == ACE + self.s.talon.dealRow(rows=self.s.foundations[:1]) + self.s.talon.dealCards() # deal first cards to Reserves + + +# /*********************************************************************** +# // Dover +# ************************************************************************/ + +class Dover_RowStack(RK_RowStack): + + def acceptsCards(self, from_stack, cards): + if not self.cards and from_stack in self.game.s.reserves: + return True + return RK_RowStack.acceptsCards(self, from_stack, cards) + + +class Dover(Bristol): + + Talon_Class = Bristol_Talon + Foundation_Class = SS_FoundationStack + RowStack_Class = Dover_RowStack + ReserveStack_Class = StackWrapper(ReserveStack, max_accept=0, max_cards=UNLIMITED_CARDS) + + def createGame(self, text=False): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(2*l.XM+9*l.XS, l.YM+20+5*l.YS) + + # create stacks + x, y, = l.XM+l.XM+l.XS, l.YM + for i in range(8): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i/2, max_move=0)) + x += l.XS + if text: + x, y = l.XM+8*l.XS, l.YM + tx, ty, ta, tf = l.getTextAttr(None, "s") + tx, ty = x+tx+l.XM, y+ty + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) + + x, y = l.XM+l.XM, l.YM+l.YS + if text: + y += 20 + for i in range(8): + x += l.XS + stack = self.RowStack_Class(x, y, self, base_rank=NO_RANK, max_move=1) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.rows.append(stack) + x, y, = l.XM, l.YM + s.talon = self.Talon_Class(x, y, self) + l.createText(s.talon, "s") + y += 20 + for i in range(3): + y += l.YS + s.reserves.append(self.ReserveStack_Class(x, y, self)) + + # define stack-groups + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return cards + + +# /*********************************************************************** +# // New York +# ************************************************************************/ + +class NewYork_Talon(OpenTalonStack): + rightclickHandler = OpenStack.rightclickHandler + doubleclickHandler = OpenStack.doubleclickHandler + + +class NewYork_ReserveStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return False + return from_stack is self.game.s.talon + + +class NewYork_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return (from_stack is self.game.s.talon or + from_stack in self.game.s.reserves) + return True + + +class NewYork(Dover): + + Foundation_Class = StackWrapper(SS_FoundationStack, mod=13) + Talon_Class = NewYork_Talon + RowStack_Class = StackWrapper(NewYork_RowStack, base_rank=ANY_RANK, mod=13) + ReserveStack_Class = StackWrapper(NewYork_ReserveStack, max_accept=1, max_cards=UNLIMITED_CARDS, mod=13) + + def createGame(self): + # extra settings + self.base_card = None + Dover.createGame(self, text=True) + self.sg.dropstacks.append(self.s.talon) + + def updateText(self): + if self.preview > 1: + return + if not self.base_card: + t = "" + else: + t = RANKS[self.base_card.rank] + self.texts.info.config(text=t) + + def startGame(self): + self.startDealSample() + self.base_card = None + self.updateText() + # deal base_card to Foundations, update foundations cap.base_rank + self.base_card = self.s.talon.getCard() + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + n = self.base_card.suit * self.gameinfo.decks + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, self.s.foundations[n]) + ##self.updateText() + self.s.talon.dealRow() + self.s.talon.fillStack() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + ((card1.rank + 1) % 13 == card2.rank or + (card2.rank + 1) % 13 == card1.rank)) + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + +# register the game +registerGame(GameInfo(42, Bristol, "Bristol", + GI.GT_FAN_TYPE, 1, 0)) +registerGame(GameInfo(214, Belvedere, "Belvedere", + GI.GT_FAN_TYPE, 1, 0)) +registerGame(GameInfo(266, Dover, "Dover", + GI.GT_FAN_TYPE, 2, 0)) +registerGame(GameInfo(425, NewYork, "New York", + GI.GT_FAN_TYPE, 2, 0)) + diff --git a/pysollib/games/buffalobill.py b/pysollib/games/buffalobill.py new file mode 100644 index 00000000..aad131ee --- /dev/null +++ b/pysollib/games/buffalobill.py @@ -0,0 +1,111 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Buffalo Bill +# // Little Billie +# ************************************************************************/ + +class BuffaloBill(Game): + + # + # game layout + # + + def createGame(self, rows=(7, 7, 7, 5)): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+max(max(rows)*(l.XS+3*l.XOFFSET), 9*l.XS), l.YM+(len(rows)+2)*l.YS + self.setSize(w, h) + + # create stacks + x, y = l.XM+(w-l.XM-8*l.XS)/2, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, + base_rank=KING, suit=i, dir=-1)) + x += l.XS + n = 0 + y = l.YM+l.YS + for i in rows: + x = l.XM + for j in range(i): + stack = BasicRowStack(x, y, self, max_move=1, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.rows.append(stack) + x += l.XS+3*l.XOFFSET + n += 1 + y += l.YS + + x, y = l.XM+(w-l.XM-8*l.XS)/2, h-l.YS + for i in range(8): + s.reserves.append(ReserveStack(x, y, self)) + x += l.XS + s.talon = InitialDealTalonStack(w-l.XS, h-l.YS, self) + + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +class LittleBillie(BuffaloBill): + def createGame(self): + #BuffaloBill.createGame(self, rows=(8, 8, 8)) + BuffaloBill.createGame(self, rows=(6,6,6,6)) + def startGame(self): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + BuffaloBill.startGame(self) + + +# register the game +registerGame(GameInfo(338, BuffaloBill, "Buffalo Bill", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(421, LittleBillie, "Little Billie", + GI.GT_2DECK_TYPE, 2, 0)) + + diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py new file mode 100644 index 00000000..35de5cb4 --- /dev/null +++ b/pysollib/games/calculation.py @@ -0,0 +1,278 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Calculation_Hint(DefaultHint): + # FIXME: demo logic is a complete nonsense + def _getMoveWasteScore(self, score, color, r, t, pile, rpile): + assert r is self.game.s.waste and len(pile) == 1 + score = 30000 + if len(t.cards) == 0: + score = score - (KING - r.cards[0].rank) * 1000 + elif t.cards[-1].rank < r.cards[0].rank: + score = 10000 + t.cards[-1].rank - len(t.cards) + elif t.cards[-1].rank == r.cards[0].rank: + score = 20000 + else: + score = score - (t.cards[-1].rank - r.cards[0].rank) * 1000 + return score, color + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class BetsyRoss_Foundation(RK_FoundationStack): + def updateText(self): + if self.game.preview > 1: + return + if self.texts.misc: + if len(self.cards) == 0: + rank = self.cap.base_rank + self.texts.misc.config(text=RANKS[rank]) + elif len(self.cards) == self.cap.max_cards: + self.texts.misc.config(text="") + else: + rank = (self.cards[-1].rank + self.cap.dir) % self.cap.mod + self.texts.misc.config(text=RANKS[rank]) + + +class Calculation_Foundation(BetsyRoss_Foundation): + def getBottomImage(self): + return self.game.app.images.getLetter(self.cap.base_rank) + + +class Calculation_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + # this stack accepts any one card from the Waste pile + return from_stack is self.game.s.waste and len(cards) == 1 + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + def getHelp(self): + return _('Row. Build regardless of rank and suit.') + + +# /*********************************************************************** +# // Calculation +# ************************************************************************/ + +class Calculation(Game): + Hint_Class = Calculation_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 20 cards are playable in default window size) + h = max(2*l.YS, 20*l.YOFFSET) + self.setSize(5.5*l.XS+l.XM+200, l.YM + l.YS + 30 + h) + + # create stacks + x0 = l.XM + l.XS * 3 / 2 + x, y = x0, l.YM + for i in range(4): + stack = Calculation_Foundation(x, y, self, base_rank=i, mod=13, dir=i+1) + s.foundations.append(stack) + stack.texts.misc = MfxCanvasText(self.canvas, + x + l.CW / 2, y + l.YS, + anchor="n", + font=self.app.getFont("canvas_default")) + x = x + l.XS + help = (_('''\ +1: 2 3 4 5 6 7 8 9 T J Q K +2: 4 6 8 T Q A 3 5 7 9 J K +3: 6 9 Q 2 5 8 J A 4 7 T K +4: 8 Q 3 7 J 2 6 T A 5 9 K''')) + self.texts.help = MfxCanvasText(self.canvas, x + l.XM, y + l.CH / 2, text=help, + anchor="w", font=self.app.getFont("canvas_fixed")) + x = x0 + y = l.YM + l.YS + 30 + for i in range(4): + s.rows.append(Calculation_RowStack(x, y, self, max_move=1, max_accept=1)) + x = x + l.XS + self.setRegion(s.rows, (-999, y, 999999, 999999)) + x = l.XM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "nn") + y = y + l.YS + s.waste = WasteStack(x, y, self, max_cards=1) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + # prepare first cards + topcards = [ None ] * 4 + for c in cards[:]: + if c.rank <= 3 and topcards[c.rank] is None: + topcards[c.rank] = c + cards.remove(c) + topcards.reverse() + return cards + topcards + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealCards() # deal first card to WasteStack + + def getHighlightPilesStacks(self): + return () + + +# /*********************************************************************** +# // Hopscotch +# ************************************************************************/ + +class Hopscotch(Calculation): + def _shuffleHook(self, cards): + # prepare first cards + topcards = [ None ] * 4 + for c in cards[:]: + if c.suit == 0 and c.rank <= 3 and topcards[c.rank] is None: + topcards[c.rank] = c + cards.remove(c) + topcards.reverse() + return cards + topcards + + +# /*********************************************************************** +# // Betsy Ross +# ************************************************************************/ + +class BetsyRoss(Calculation): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(5.5*l.XS+l.XM+200, l.YM + l.YS + 30 + 3*l.YS) + + # create stacks + x0 = l.XM + l.XS * 3 / 2 + x, y = x0, l.YM + for i in range(4): + stack = BetsyRoss_Foundation(x, y, self, base_rank=i, + max_cards=1, max_move=0, max_accept=0) + s.foundations.append(stack) + x = x + l.XS + x = x0 + y = l.YM + l.YS + 30 + for i in range(4): + stack = BetsyRoss_Foundation(x, y, self, base_rank=2*i+1, mod=13, dir=i+1, + max_cards=12, max_move=0) + stack.texts.misc = MfxCanvasText(self.canvas, x + l.CW / 2, y - l.YM, + anchor="s", font=self.app.getFont("canvas_default")) + s.foundations.append(stack) + x = x + l.XS + help = (_('''\ +1: 2 3 4 5 6 7 8 9 T J Q K +2: 4 6 8 T Q A 3 5 7 9 J K +3: 6 9 Q 2 5 8 J A 4 7 T K +4: 8 Q 3 7 J 2 6 T A 5 9 K''')) + self.texts.help = MfxCanvasText(self.canvas, x + l.XM, y + l.CH / 2, text=help, + anchor="w", font=self.app.getFont("canvas_fixed")) + x = l.XM + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, "nn") + y = y + l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # define stack-groups + l.defaultStackGroups() + + + # + # game overrides + # + + def _shuffleHook(self, cards): + # prepare first cards + topcards = [ None ] * 8 + for c in cards[:]: + if c.rank <= 3 and topcards[c.rank] is None: + topcards[c.rank] = c + cards.remove(c) + elif c.rank in (1, 3, 5, 7): + i = 4 + (c.rank - 1) / 2 + if topcards[i] is None: + topcards[i] = c + cards.remove(c) + topcards.reverse() + return cards + topcards + + +# register the game +registerGame(GameInfo(256, Calculation, "Calculation", + GI.GT_1DECK_TYPE, 1, 0, + altnames=("Progression",) )) +registerGame(GameInfo(94, Hopscotch, "Hopscotch", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(134, BetsyRoss, "Betsy Ross", + GI.GT_1DECK_TYPE, 1, 2, + altnames=("Fairest", "Four Kings", "Musical Patience", + "Quadruple Alliance", "Plus Belle") )) + diff --git a/pysollib/games/camelot.py b/pysollib/games/camelot.py new file mode 100644 index 00000000..16ed9edb --- /dev/null +++ b/pysollib/games/camelot.py @@ -0,0 +1,219 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + + +# /*********************************************************************** +# // Camelot +# ************************************************************************/ + +class Camelot_Hint(AbstractHint): + + def computeHints(self): + game = self.game + if game.is_fill: + nhints = 0 + i = 0 + for r in game.s.rows: + i += 1 + if not r.cards: + continue + if r.cards[0].rank == 9: + self.addHint(5000, 1, r, game.s.foundations[0]) + nhints += 1 + continue + for t in game.s.rows[i:]: + if t.acceptsCards(r, [r.cards[0]]): + self.addHint(5000, 1, r, t) + nhints += 1 + if nhints: + return + if game.s.talon.cards: + for r in game.s.rows: + if r.acceptsCards(game.s.talon, [game.s.talon.cards[-1]]): + self.addHint(5000, 1, game.s.talon, r) + + +class Camelot_RowStack(ReserveStack): + + def acceptsCards(self, from_stack, cards): + if from_stack is self.game.s.talon: + if len(self.cards) > 0: + return False + cr = cards[0].rank + if cr == KING: + return self.id in (0, 3, 12, 15) + elif cr == QUEEN: + return self.id in (1, 2, 13, 14) + elif cr == JACK: + return self.id in (4, 7, 8, 11) + return True + else: + if len(self.cards) == 0: + return False + return self.cards[-1].rank + cards[0].rank == 8 + + def canMoveCards(self, cards): + if not self.game.is_fill: + return False + return cards[0].rank not in (KING, QUEEN, JACK) + + def clickHandler(self, event): + game = self.game + if game.is_fill and self.cards and self.cards[0].rank == 9: + game.playSample("autodrop", priority=20) + self.playMoveMove(1, game.s.foundations[0], sound=0) + self.fillStack() + return True + return False + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + if not to_stack is self.game.s.foundations[0]: + self._dropPairMove(ncards, to_stack, frames=-1, shadow=shadow) + else: + ReserveStack.moveMove(self, ncards, to_stack, frames=frames, shadow=shadow) + + def _dropPairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + old_state = game.enterState(game.S_FILL) + f = game.s.foundations[0] + game.updateStackMove(game.s.talon, 2|16) # for undo + if not game.demo: + game.playSample("droppair", priority=200) + game.moveMove(n, self, f, frames=frames, shadow=shadow) + game.moveMove(n, other_stack, f, frames=frames, shadow=shadow) + self.fillStack() + other_stack.fillStack() + game.updateStackMove(game.s.talon, 1|16) # for redo + game.leaveState(old_state) + + +class Camelot_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + return True + + +class Camelot_Talon(OpenTalonStack): + def fillStack(self): + old_state = self.game.enterState(self.game.S_FILL) + self.game.saveStateMove(2|16) # for undo + self.game.is_fill = self.game.isRowsFill() + self.game.saveStateMove(1|16) # for redo + self.game.leaveState(old_state) + OpenTalonStack.fillStack(self) + + +class Camelot(Game): + + Talon_Class = Camelot_Talon + RowStack_Class = StackWrapper(Camelot_RowStack, max_move=0) + Hint_Class = Camelot_Hint + + # game variables + is_fill = False + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + # set window + w = l.XS + self.setSize(l.XM + w + 4*l.XS + w + l.XS, l.YM + 4*l.YS) + # create stacks + for i in range(4): + for j in range(4): + k = i+j*4 + x, y = l.XM + w + j*l.XS, l.YM + i*l.YS + s.rows.append(self.RowStack_Class(x, y, self)) + x, y = l.XM, l.YM + s.talon = self.Talon_Class(x, y, self) + x, y = l.XM + w + 4*l.XS + w, l.YM + s.foundations.append(Camelot_Foundation(x, y, self, + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_accept=0, max_move=0, max_cards=52)) + # define stack-groups + l.defaultStackGroups() + return l + + # + # game overrides + # + + def startGame(self): + self.is_fill = False + self.nnn = 0 + self.s.talon.fillStack() + + + def isGameWon(self): + for i in (5, 6, 9, 10): + if len(self.s.rows[i].cards) != 0: + return False + return len(self.s.talon.cards) == 0 + + + def isRowsFill(self): + for i in range(16): + if len(self.s.rows[i].cards) == 0: + return False + return True + + def _restoreGameHook(self, game): + self.is_fill = game.loadinfo.is_fill + + def _loadGameHook(self, p): + self.loadinfo.addattr(is_fill=p.load()) + + def _saveGameHook(self, p): + p.dump(self.is_fill) + + def getAutoStacks(self, event=None): + return ((), (), ()) + + def setState(self, state): + # restore saved vars (from undo/redo) + self.is_fill = state[0] + + def getState(self): + # save vars (for undo/redo) + return [self.is_fill] + + + +# register the game +registerGame(GameInfo(280, Camelot, "Camelot", + GI.GT_1DECK_TYPE, 1, 0)) + diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py new file mode 100644 index 00000000..13d8538b --- /dev/null +++ b/pysollib/games/canfield.py @@ -0,0 +1,710 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Andrew Csillag +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Canfield_Hint(CautiousDefaultHint): + # FIXME: demo is not too clever in this game + + # Score for moving a pile (usually a single card) from the WasteStack. + def _getMoveWasteScore(self, score, color, r, t, pile, rpile): + score, color = CautiousDefaultHint._getMovePileScore(self, score, color, r, t, pile, rpile) + # we prefer moving cards from the waste over everything else + return score + 100000, color + + +# /*********************************************************************** +# // a Canfield row stack only accepts a full other row stack +# // (cannot move part of a sequence from row to row) +# ************************************************************************/ + +class Canfield_AC_RowStack(AC_RowStack): + def basicAcceptsCards(self, from_stack, cards): + if from_stack in self.game.s.rows: + if len(cards) != 1 and len(cards) != len(from_stack.cards): + return 0 + return AC_RowStack.basicAcceptsCards(self, from_stack, cards) + + +class Canfield_SS_RowStack(SS_RowStack): + def basicAcceptsCards(self, from_stack, cards): + if from_stack in self.game.s.rows: + if len(cards) != 1 and len(cards) != len(from_stack.cards): + return 0 + return SS_RowStack.basicAcceptsCards(self, from_stack, cards) + + +class Canfield_RK_RowStack(RK_RowStack): + def basicAcceptsCards(self, from_stack, cards): + if from_stack in self.game.s.rows: + if len(cards) != 1 and len(cards) != len(from_stack.cards): + return 0 + return RK_RowStack.basicAcceptsCards(self, from_stack, cards) + + +# /*********************************************************************** +# // Canfield +# ************************************************************************/ + +class Canfield(Game): + Foundation_Class = SS_FoundationStack + RowStack_Class = StackWrapper(Canfield_AC_RowStack, mod=13) + ReserveStack_Class = OpenStack + Hint_Class = Canfield_Hint + + INITIAL_RESERVE_CARDS = 13 + INITIAL_RESERVE_FACEUP = 0 + FILL_EMPTY_ROWS = 1 + + # + # game layout + # + + def createGame(self, rows=4, max_rounds=-1, num_deal=3, text=True): + # create layout + l, s = Layout(self), self.s + decks = self.gameinfo.decks + + # set window + # (piles up to 20 cards are playable in default window size) + h = max(3*l.YS, l.YS+self.INITIAL_RESERVE_CARDS*l.YOFFSET) + self.setSize(l.XM + (2+max(rows, 4*decks))*l.XS + l.XM, l.YM + l.YS + 20 + h) + + # extra settings + self.base_card = None + + # create stacks + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds, num_deal=num_deal) + l.createText(s.talon, "s") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "s") + x = x + l.XM + for i in range(4): + for j in range(decks): + x = x + l.XS + s.foundations.append(self.Foundation_Class(x, y, self, i, mod=13, max_move=0)) + if text: + if rows >= 4 * decks: + tx, ty, ta, tf = l.getTextAttr(None, "se") + tx, ty = x + tx + l.XM, y + ty + else: + tx, ty, ta, tf = l.getTextAttr(None, "s") + tx, ty = x + tx, y + ty + l.YM + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) + x, y = l.XM, l.YM + l.YS + 20 + s.reserves.append(self.ReserveStack_Class(x, y, self)) + if self.INITIAL_RESERVE_FACEUP == 1: + s.reserves[0].CARD_YOFFSET = l.YOFFSET ##min(l.YOFFSET, 14) + else: + s.reserves[0].CARD_YOFFSET = 10 + x = l.XM + 2 * l.XS + l.XM + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self)) + x = x + l.XS + + # define stack-groups + l.defaultStackGroups() + + # + # game extras + # + + def updateText(self): + if self.preview > 1: + return + if not self.texts.info: + return + if not self.base_card: + t = "" + else: + t = RANKS[self.base_card.rank] + self.texts.info.config(text=t) + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.base_card = None + self.updateText() + # deal base_card to Foundations, update foundations cap.base_rank + self.base_card = self.s.talon.getCard() + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + n = self.base_card.suit * self.gameinfo.decks + if self.s.foundations[n].cards: + assert self.gameinfo.decks > 1 + n = n + 1 + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, self.s.foundations[n]) + self.updateText() + # fill the Reserve + for i in range(self.INITIAL_RESERVE_CARDS): + if self.INITIAL_RESERVE_FACEUP: + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, self.s.reserves[0], frames=4, shadow=0) + if self.s.reserves[0].canFlipCard(): + self.flipMove(self.s.reserves[0]) + self.s.talon.dealRow(reverse=1) + self.s.talon.dealCards() # deal first 3 cards to WasteStack + + def fillStack(self, stack): + if stack in self.s.rows and self.s.reserves: + if self.FILL_EMPTY_ROWS: + if not stack.cards and self.s.reserves[0].cards: + if not self.s.reserves[0].cards[-1].face_up: + self.s.reserves[0].flipMove() + self.s.reserves[0].moveMove(1, stack) + elif stack in self.s.reserves: + if stack.canFlipCard(): + stack.flipMove() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + +# /*********************************************************************** +# // Superior Canfield +# ************************************************************************/ + +class SuperiorCanfield(Canfield): + INITIAL_RESERVE_FACEUP = 1 + FILL_EMPTY_ROWS = 0 + + +# /*********************************************************************** +# // Rainfall +# ************************************************************************/ + +class Rainfall(Canfield): + def createGame(self): + Canfield.createGame(self, max_rounds=3, num_deal=1) + + +# /*********************************************************************** +# // Rainbow +# ************************************************************************/ + +class Rainbow(Canfield): + RowStack_Class = StackWrapper(Canfield_RK_RowStack, mod=13) + + def createGame(self): + Canfield.createGame(self, max_rounds=1, num_deal=1) + + +# /*********************************************************************** +# // Storehouse (aka Straight Up) +# ************************************************************************/ + +class Storehouse(Canfield): + RowStack_Class = StackWrapper(Canfield_SS_RowStack, mod=13) + + def createGame(self): + Canfield.createGame(self, max_rounds=3, num_deal=1) + + def _shuffleHook(self, cards): + # move Twos to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 1, c.suit)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations[:3]) + Canfield.startGame(self) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + + def updateText(self): + pass + + +# /*********************************************************************** +# // Chameleon (aka Kansas) +# ************************************************************************/ + +class Chameleon(Canfield): + RowStack_Class = StackWrapper(Canfield_RK_RowStack, mod=13) + + INITIAL_RESERVE_CARDS = 12 + + def createGame(self): + Canfield.createGame(self, rows=3, max_rounds=1, num_deal=1) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank) + + +# /*********************************************************************** +# // Double Canfield (Canfield with 2 decks and 5 rows) +# ************************************************************************/ + +class DoubleCanfield(Canfield): + def createGame(self): + Canfield.createGame(self, rows=5) + + +# /*********************************************************************** +# // American Toad +# ************************************************************************/ + +class AmericanToad(Canfield): + RowStack_Class = StackWrapper(Canfield_SS_RowStack, mod=13) + + INITIAL_RESERVE_CARDS = 20 + INITIAL_RESERVE_FACEUP = 1 + + def createGame(self): + Canfield.createGame(self, rows=8, max_rounds=2, num_deal=1) + + +# /*********************************************************************** +# // Variegated Canfield +# ************************************************************************/ + +class VariegatedCanfield(Canfield): + RowStack_Class = Canfield_AC_RowStack + + INITIAL_RESERVE_FACEUP = 1 + + def createGame(self): + Canfield.createGame(self, rows=5, max_rounds=3) + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations[:7]) + Canfield.startGame(self) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + ((card1.rank + 1) == card2.rank or (card2.rank + 1) == card1.rank)) + + def updateText(self): + pass + + +# /*********************************************************************** +# // Eagle Wing +# ************************************************************************/ + +class EagleWing_ReserveStack(OpenStack): + def canFlipCard(self): + return len(self.cards) == 1 and not self.cards[-1].face_up + + +class EagleWing(Canfield): + RowStack_Class = StackWrapper(SS_RowStack, mod=13, max_move=1, max_cards=3) + ReserveStack_Class = EagleWing_ReserveStack + + def createGame(self): + ##Canfield.createGame(self, rows=8, max_rounds=3, num_deal=1) + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 9*l.XS + l.XM, l.YM + 4*l.YS) + + # extra settings + self.base_card = None + + # create stacks + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=3, num_deal=1) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + for i in range(4): + x = l.XM + (i+3)*l.XS + s.foundations.append(self.Foundation_Class(x, y, self, i, mod=13, max_move=0)) + tx, ty, ta, tf = l.getTextAttr(None, "se") + tx, ty = x + tx + l.XM, y + ty + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) + ry = l.YM + 2*l.YS + for i in range(8): + x = l.XM + (i + (i >= 4))*l.XS + y = ry - (0.2, 0.4, 0.6, 0.4, 0.4, 0.6, 0.4, 0.2)[i]*l.CH + s.rows.append(self.RowStack_Class(x, y, self)) + x, y = l.XM + 4*l.XS, ry + s.reserves.append(self.ReserveStack_Class(x, y, self)) + ##s.reserves[0].CARD_YOFFSET = 0 + l.createText(s.reserves[0], "ss") + + # define stack-groups + l.defaultStackGroups() + + +# /*********************************************************************** +# // Gate +# // Little Gate +# ************************************************************************/ + +class Gate(Game): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+max(8*l.XS, 6*l.XS+8*l.XOFFSET), l.YM+3*l.YS+12*l.YOFFSET + self.setSize(w, h) + + # create stacks + y = l.YM + for x in (l.XM+(w-(l.XM+8*l.XS))/2, w-l.XS-4*l.XOFFSET): + stack = OpenStack(x, y, self, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.reserves.append(stack) + x, y = l.XM+2*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(8): + s.rows.append(AC_RowStack(x, y, self)) + x += l.XS + s.talon = WasteTalonStack(l.XM, h-l.YS, self, max_rounds=1) + l.createText(s.talon, "n") + s.waste = WasteStack(l.XM+l.XS, h-l.YS, self) + l.createText(s.waste, "n") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def fillStack(self, stack): + r1, r2 = self.s.reserves + if stack in self.s.rows and not stack.cards: + from_stack = None + if r1.cards or r2.cards: + from_stack = r1 + if len(r1.cards) < len(r2.cards): + from_stack = r2 + elif self.s.waste.cards: + from_stack = self.s.waste + if from_stack: + from_stack.moveMove(1, stack) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + abs(card1.rank-card2.rank) == 1) + + +class LittleGate(Gate): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+7*l.XS, l.YM+2*l.YS+12*l.YOFFSET + self.setSize(w, h) + + # create stacks + y = 4*l.YM+l.YS + for x in (l.XM, w-l.XS): + stack = OpenStack(x, y, self, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.reserves.append(stack) + x, y = l.XM+3*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + x, y = int(l.XM+1.5*l.XS), 4*l.YM+l.YS + for i in range(4): + s.rows.append(AC_RowStack(x, y, self)) + x += l.XS + s.talon = WasteTalonStack(l.XM, l.YM, self, max_rounds=1) + l.createText(s.talon, "s") + s.waste = WasteStack(l.XM+l.XS, l.YM, self) + l.createText(s.waste, "s") + + # define stack-groups + l.defaultStackGroups() + + +# /*********************************************************************** +# // Munger +# ************************************************************************/ + +class Munger(Canfield): + + RowStack_Class = StackWrapper(AC_RowStack, base_rank=KING) + + FILL_EMPTY_ROWS = 0 + + def createGame(self): + Canfield.createGame(self, rows=7, max_rounds=1, num_deal=1) + + def startGame(self): + self.s.talon.dealRow(frames=0, flip=0) + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0, flip=0) + self.startDealSample() + self.s.talon.dealRow() + for i in range(7): + self.moveMove(1, self.s.talon, self.s.reserves[0], frames=4, shadow=0) + self.flipMove(self.s.reserves[0]) + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + abs(card1.rank-card2.rank) == 1) + + def _restoreGameHook(self, game): + pass + def _loadGameHook(self, p): + pass + def _saveGameHook(self, p): + pass + + +# /*********************************************************************** +# // Triple Canfield +# ************************************************************************/ + +class TripleCanfield(Canfield): + INITIAL_RESERVE_CARDS = 26 + def createGame(self): + Canfield.createGame(self, rows=7) + + +# /*********************************************************************** +# // Acme +# ************************************************************************/ + +class Acme(Canfield): + Foundation_Class = SS_FoundationStack + RowStack_Class = StackWrapper(SS_RowStack, max_move=1) + Hint_Class = Canfield_Hint + + def createGame(self): + Canfield.createGame(self, max_rounds=2, num_deal=1) + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + for i in range(13): + self.moveMove(1, self.s.talon, self.s.reserves[0], frames=4, shadow=0) + self.flipMove(self.s.reserves[0]) + self.s.talon.dealRow(reverse=1) + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + abs(card1.rank-card2.rank) == 1) + + def updateText(self): + pass + def _restoreGameHook(self, game): + pass + def _loadGameHook(self, p): + pass + def _saveGameHook(self, p): + pass + + +# /*********************************************************************** +# // Duke +# ************************************************************************/ + +class Duke(Game): + + def createGame(self): + l, s = Layout(self), self.s + + w, h = l.XM+6*l.XS+4*l.XOFFSET, l.YM+2*l.YS+12*l.YOFFSET + self.setSize(w, h) + + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, 's') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 's') + x += l.XS+4*l.XOFFSET + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + x0, y0, w = l.XM, 3*l.YM+l.YS, l.XS+2*l.XOFFSET + for i, j in ((0,0), (0,1), (1,0), (1,1)): + x, y = x0+i*w, y0+j*l.YS + stack = OpenStack(x, y, self, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.reserves.append(stack) + x, y = l.XM+2*l.XS+4*l.XOFFSET, l.YM+l.YS + for i in range(4): + s.rows.append(AC_RowStack(x, y, self)) + x += l.XS + + l.defaultStackGroups() + + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + abs(card1.rank-card2.rank) == 1) + + +# /*********************************************************************** +# // Minerva +# ************************************************************************/ + +class Minerva(Canfield): + RowStack_Class = StackWrapper(AC_RowStack, base_rank=KING) + + INITIAL_RESERVE_CARDS = 11 + INITIAL_RESERVE_FACEUP = 1 + FILL_EMPTY_ROWS = 0 + + def createGame(self): + Canfield.createGame(self, rows=7, max_rounds=2, num_deal=1, text=False) + + def startGame(self): + for i in range(self.INITIAL_RESERVE_CARDS): + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, self.s.reserves[0], frames=0, shadow=0) + flip = False + for i in range(3): + self.s.talon.dealRow(flip=flip, frames=0) + flip = not flip + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + +# register the game +registerGame(GameInfo(105, Canfield, "Canfield", # was: 262 + GI.GT_CANFIELD | GI.GT_CONTRIB, 1, -1)) +registerGame(GameInfo(101, SuperiorCanfield, "Superior Canfield", + GI.GT_CANFIELD, 1, -1)) +registerGame(GameInfo(99, Rainfall, "Rainfall", + GI.GT_CANFIELD | GI.GT_ORIGINAL, 1, 2)) +registerGame(GameInfo(108, Rainbow, "Rainbow", + GI.GT_CANFIELD, 1, 0)) +registerGame(GameInfo(100, Storehouse, "Storehouse", + GI.GT_CANFIELD, 1, 2, + altnames=("Provisions", "Straight Up", "Thirteen Up") )) +registerGame(GameInfo(43, Chameleon, "Chameleon", + GI.GT_CANFIELD, 1, 0, + altnames="Kansas")) +registerGame(GameInfo(106, DoubleCanfield, "Double Canfield", # was: 22 + GI.GT_CANFIELD, 2, -1)) +registerGame(GameInfo(103, AmericanToad, "American Toad", + GI.GT_CANFIELD, 2, 1)) +registerGame(GameInfo(102, VariegatedCanfield, "Variegated Canfield", + GI.GT_CANFIELD, 2, 2)) +registerGame(GameInfo(112, EagleWing, "Eagle Wing", + GI.GT_CANFIELD, 1, 2)) +registerGame(GameInfo(315, Gate, "Gate", + GI.GT_CANFIELD, 1, 0)) +registerGame(GameInfo(316, LittleGate, "Little Gate", + GI.GT_CANFIELD, 1, 0)) +registerGame(GameInfo(360, Munger, "Munger", + GI.GT_CANFIELD, 1, 0)) +registerGame(GameInfo(396, TripleCanfield, "Triple Canfield", + GI.GT_CANFIELD, 3, -1)) +registerGame(GameInfo(403, Acme, "Acme", + GI.GT_CANFIELD, 1, 1)) +registerGame(GameInfo(413, Duke, "Duke", + GI.GT_CANFIELD, 1, 2)) +registerGame(GameInfo(422, Minerva, "Minerva", + GI.GT_CANFIELD, 1, 1)) + diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py new file mode 100644 index 00000000..dac3860d --- /dev/null +++ b/pysollib/games/capricieuse.py @@ -0,0 +1,145 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + + +# /*********************************************************************** +# // Capricieuse +# ************************************************************************/ + +class Capricieuse_Talon(TalonStack): + + def canDealCards(self): + if self.round == self.max_rounds: + return False + return not self.game.isGameWon() + + def dealCards(self, sound=0): + # move all cards to the Talon, shuffle and redeal + lr = len(self.game.s.rows) + num_cards = 0 + assert len(self.cards) == 0 + for r in self.game.s.rows[::-1]: + for i in range(len(r.cards)): + num_cards = num_cards + 1 + self.game.moveMove(1, r, self, frames=0) + assert len(self.cards) == num_cards + if num_cards == 0: # game already finished + return 0 + # shuffle + self.game.shuffleStackMove(self) + # redeal + self.game.nextRoundMove(self) + self.game.startDealSample() + for i in range(lr): + k = min(lr, len(self.cards)) + for j in range(k): + self.game.moveMove(1, self, self.game.s.rows[j], frames=4) + # done + self.game.stopSamples() + assert len(self.cards) == 0 + return num_cards + + +class Capricieuse(Game): + + Talon_Class = StackWrapper(Capricieuse_Talon, max_rounds=3) + RowStack_Class = UD_SS_RowStack + + # + # game layout + # + + def createGame(self, **layout): + + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+12*l.XS, l.YM+l.YS+20*l.YOFFSET) + + # create stacks + x, y, = l.XM+2*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x = x + l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=KING, dir=-1)) + x = x + l.XS + x, y, = l.XM, y + l.YS + for i in range(12): + s.rows.append(self.RowStack_Class(x, y, self, + max_move=1, max_accept=1)) + x = x + l.XS + s.talon = self.Talon_Class(l.XM, l.YM, self) + + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(7): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(self.s.foundations) + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToBottom(cards, lambda c: (c.deck == 0 and c.rank in (0, 12), (c.rank, c.suit)), 8) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % stack1.cap.mod == card2.rank or + (card2.rank + 1) % stack1.cap.mod == card1.rank)) + + +# /*********************************************************************** +# // Nationale +# ************************************************************************/ + +class Nationale(Capricieuse): + Talon_Class = InitialDealTalonStack + RowStack_Class = StackWrapper(UD_SS_RowStack, mod=13) + + +# register the game +registerGame(GameInfo(292, Capricieuse, "Capricieuse", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 2)) +registerGame(GameInfo(293, Nationale, "Nationale", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0)) + diff --git a/pysollib/games/contrib/__init__.py b/pysollib/games/contrib/__init__.py new file mode 100644 index 00000000..bec3b914 --- /dev/null +++ b/pysollib/games/contrib/__init__.py @@ -0,0 +1 @@ +import sanibel diff --git a/pysollib/games/contrib/sanibel.py b/pysollib/games/contrib/sanibel.py new file mode 100644 index 00000000..6760987f --- /dev/null +++ b/pysollib/games/contrib/sanibel.py @@ -0,0 +1,75 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## Copyright (C) 1998-2000 Markus Franz Xaver Johannes Oberhumer +## +## Sanibel +## Copyright (C) 1998,2000 John Stoneham +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.games.gypsy import Gypsy +from pysollib.games.yukon import Yukon_Hint + +# /************************************************************************ +# // Sanibel +# // play similar to Yukon +# *************************************************************************/ + +class Sanibel(Gypsy): + Layout_Method = Layout.klondikeLayout + Talon_Class = StackWrapper(WasteTalonStack, max_rounds=1) + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + RowStack_Class = Yukon_AC_RowStack + Hint_Class = Yukon_Hint + + def createGame(self): + Gypsy.createGame(self, rows=10, waste=1, playcards=23) + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(flip=0, frames=0) + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def getHighlightPilesStacks(self): + return () + + +registerGame(GameInfo(201, Sanibel, "Sanibel", + GI.GT_YUKON | GI.GT_CONTRIB | GI.GT_ORIGINAL, 2, 0)) + diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py new file mode 100644 index 00000000..26235fdb --- /dev/null +++ b/pysollib/games/curdsandwhey.py @@ -0,0 +1,327 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Curds and Whey +# // Miss Muffet +# // Nordic +# ************************************************************************/ + +class CurdsAndWhey_RowStack(BasicRowStack): + + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return True + c1, c2 = self.cards[-1], cards[0] + if c1.suit == c2.suit: + return c1.rank == c2.rank+1 + return c1.rank == c2.rank + + def canMoveCards(self, cards): + return isSameSuitSequence(cards) or isRankSequence(cards, dir=0) + + def getHelp(self): + return _('Row. Build down by suit or of the same rank.') + + +class CurdsAndWhey(Game): + + Hint_Class = CautiousDefaultHint + RowStack_Class = StackWrapper(CurdsAndWhey_RowStack, base_rank=KING, + max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS) + + # + # game layout + # + + def createGame(self, rows=13): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+rows*l.XS, l.YM+l.YS+16*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + for i in range(rows): + stack = self.RowStack_Class(x, y, self) + s.rows.append(stack) + x += l.XS + + s.talon = InitialDealTalonStack(w-l.XS, h-l.YS, self) + + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def isGameWon(self): + for s in self.s.rows: + if s.cards: + if len(s.cards) != 13 or not isSameSuitSequence(s.cards): + return False + return True + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank == card2.rank or ( + card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1) + + +class MissMuffet(CurdsAndWhey): + + def createGame(self): + CurdsAndWhey.createGame(self, rows=10) + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(rows=[self.s.rows[0], self.s.rows[-1]], frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +class Nordic(MissMuffet): + RowStack_Class = StackWrapper(CurdsAndWhey_RowStack, base_rank=ANY_RANK, + max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS) + + +# /*********************************************************************** +# // Dumfries +# // Galloway +# // Robin +# ************************************************************************/ + +class Dumfries_TalonStack(OpenTalonStack): + rightclickHandler = OpenStack.rightclickHandler + +class Dumfries_RowStack(BasicRowStack): + + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return True + c1, c2 = self.cards[-1], cards[0] + if c1.color == c2.color: + return False + return c1.rank == c2.rank or c1.rank == c2.rank+1 + + def canMoveCards(self, cards): + return len(cards) == 1 or len(cards) == len(self.cards) + +class Dumfries(Game): + + ##Hint_Class = KlondikeType_Hint + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=8, waste=0, texts=1, playcards=20) + apply(Layout.klondikeLayout, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = Dumfries_TalonStack(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(SS_FoundationStack(r.x, r.y, self, + suit=r.suit)) + for r in l.s.rows: + s.rows.append(Dumfries_RowStack(r.x, r.y, self, + max_move=UNLIMITED_MOVES, + max_accept=UNLIMITED_ACCEPTS)) + # default + l.defaultAll() + self.sg.dropstacks.append(s.talon) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.fillStack() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) in (0, 1) + + +class Galloway(Dumfries): + def createGame(self): + Dumfries.createGame(self, rows=7) + + +class Robin(Dumfries): + def createGame(self): + Dumfries.createGame(self, rows=12) + + + +# /*********************************************************************** +# // Arachnida +# ************************************************************************/ + +class Arachnida_RowStack(BasicRowStack): + + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return True + c1, c2 = self.cards[-1], cards[0] + if c1.rank == c2.rank+1: + return True + return c1.rank == c2.rank + + def canMoveCards(self, cards): + return isSameSuitSequence(cards) or isRankSequence(cards, dir=0) + + +class Arachnida(CurdsAndWhey): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+11*l.XS, l.YM+l.YS+16*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + s.talon = DealRowTalonStack(x, y, self) + l.createText(s.talon, "ss") + x += l.XS + for i in range(10): + stack = Arachnida_RowStack(x, y, self, base_rank=ANY_RANK, + max_move=UNLIMITED_MOVES, + max_accept=UNLIMITED_ACCEPTS) + s.rows.append(stack) + x += l.XS + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(flip=0, frames=0) + self.s.talon.dealRow(rows=self.s.rows[:4], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank == card2.rank or abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // German Patience +# // Bavarian Patience +# ************************************************************************/ + +class GermanPatience(Game): + + def createGame(self, rows=8): + + l, s = Layout(self), self.s + + w, h = l.XM+rows*l.XS, l.YM+2*l.YS+14*l.YOFFSET + self.setSize(w, h) + + x, y = l.XM, l.YM + for i in range(rows): + s.rows.append(RK_RowStack(x, y, self, max_cards=13, mod=13, dir=1, max_move=1)) + x += l.XS + x, y = l.XM, h-l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 'nn') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'nn') + + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + def isGameWon(self): + if self.s.waste.cards or self.s.talon.cards: + return False + for s in self.s.rows: + if s.cards: + if len(s.cards) != 13: # or not isRankSequence(s.cards): + return False + return True + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1) % 13 == card2.rank or + (card2.rank + 1) % 13 == card1.rank) + + +class BavarianPatience(GermanPatience): + def createGame(self, rows=10): + GermanPatience.createGame(self, rows=10) + + +# register the game +registerGame(GameInfo(294, CurdsAndWhey, "Curds and Whey", + GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(311, Dumfries, "Dumfries", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(312, Galloway, "Galloway", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(313, Robin, "Robin", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(348, Arachnida, "Arachnida", + GI.GT_SPIDER, 2, 0)) +registerGame(GameInfo(349, MissMuffet, "Miss Muffet", + GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(352, Nordic, "Nordic", + GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(414, GermanPatience, "German Patience", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(415, BavarianPatience, "Bavarian Patience", + GI.GT_2DECK_TYPE, 2, 0)) + diff --git a/pysollib/games/dieboesesieben.py b/pysollib/games/dieboesesieben.py new file mode 100644 index 00000000..2fb6f884 --- /dev/null +++ b/pysollib/games/dieboesesieben.py @@ -0,0 +1,126 @@ +## -*- coding: utf-8 -*- +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +from pysollib.games.gypsy import DieKoenigsbergerin_Talon, DieRussische_Foundation + +# /*********************************************************************** +# // Die böse Sieben +# ************************************************************************/ + +class DieBoeseSieben_Talon(DieKoenigsbergerin_Talon): + def canDealCards(self): + return len(self.cards) or self.round != self.max_rounds + + def dealCards(self, sound=0): + if self.cards: + return DieKoenigsbergerin_Talon.dealCards(self, sound=sound) + game, num_cards = self.game, len(self.cards) + for r in game.s.rows: + while r.cards: + num_cards = num_cards + 1 + if r.cards[-1].face_up: + game.flipMove(r) + game.moveMove(1, r, self, frames=0) + assert len(self.cards) == num_cards + if sound: + game.startDealSample() + # shuffle + game.shuffleStackMove(self) + # redeal + game.nextRoundMove(self) + n = len(game.s.rows) + flip = (num_cards / n) & 1 + while self.cards: + if len(self.cards) <= n: + flip = 1 + self.dealRow(flip=flip) + flip = not flip + # done + if sound: + game.stopSamples() + return num_cards + + +class DieBoeseSieben(Game): + # + # game layout + # + + def createGame(self, rows=7): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + max(8,rows)*l.XS, l.YM + 5*l.YS) + + # create stacks + for i in range(8): + x, y, = l.XM + i*l.XS, l.YM + s.foundations.append(DieRussische_Foundation(x, y, self, i/2, max_move=0)) + for i in range(rows): + x, y, = l.XM + (2*i+8-rows)*l.XS/2, l.YM + l.YS + s.rows.append(AC_RowStack(x, y, self)) + s.talon = DieBoeseSieben_Talon(l.XM, self.height-l.YS, self, max_rounds=2) + l.createText(s.talon, "se") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + for flip in (1, 0, 1, 0, 1, 0, 1): + self.s.talon.dealRow(flip=flip) + + +# register the game +registerGame(GameInfo(120, DieBoeseSieben, "Bad Seven", + GI.GT_2DECK_TYPE, 2, 1, + ranks=(0, 6, 7, 8, 9, 10, 11, 12), + altnames=("Die böse Sieben",) )) + diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py new file mode 100644 index 00000000..3e05366d --- /dev/null +++ b/pysollib/games/diplomat.py @@ -0,0 +1,183 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +from pysollib.games.fortythieves import FortyThieves_Hint + +# /*********************************************************************** +# // Diplomat +# ************************************************************************/ + +class Diplomat(Game): + Foundation_Class = SS_FoundationStack + RowStack_Class = StackWrapper(RK_RowStack, max_move=1) + Hint_Class = FortyThieves_Hint + + DEAL = (3, 1) + FILL_EMPTY_ROWS = 0 + + # + # game layout + # + + def createGame(self, max_rounds=1): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 8*l.XS, l.YM + 5*l.YS) + + # create stacks + x, y = l.XM, l.YM + for i in range(8): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i/2)) + x = x + l.XS + x, y = l.XM, y + l.YS + for i in range(8): + s.rows.append(self.RowStack_Class(x, y, self)) + x = x + l.XS + x, y, = l.XM, self.height - l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds) + l.createText(s.talon, "nn") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "nn") + + # define stack-groups + l.defaultStackGroups() + + + # + # game overrides + # + + def startGame(self): + for i in range(self.DEAL[0]): + self.s.talon.dealRow(frames=0) + self.startDealSample() + for i in range(self.DEAL[1]): + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def fillStack(self, stack): + if self.FILL_EMPTY_ROWS and stack in self.s.rows and not stack.cards: + old_state = self.enterState(self.S_FILL) + if self.s.waste.cards: + self.s.waste.moveMove(1, stack) + elif self.s.talon.canDealCards(): + self.s.talon.dealCards() + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank + + +# /*********************************************************************** +# // Lady Palk +# ************************************************************************/ + +class LadyPalk(Diplomat): + RowStack_Class = RK_RowStack + + +# /*********************************************************************** +# // Congress +# ************************************************************************/ + +class Congress(Diplomat): + DEAL = (0, 1) + FILL_EMPTY_ROWS = 1 + + # + # game layout (just rearrange the stacks a little bit) + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 7*l.XS, l.YM + 4*l.YS) + + # create stacks + for i in range(4): + for j in range(2): + x, y = l.XM + (4+j)*l.XS, l.YM + i*l.YS + s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) + for i in range(4): + for j in range(2): + x, y = l.XM + (3+3*j)*l.XS, l.YM + i*l.YS + stack = self.RowStack_Class(x, y, self) + stack.CARD_YOFFSET = 0 + s.rows.append(stack) + x, y, = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # define stack-groups + l.defaultStackGroups() + + +# /*********************************************************************** +# // Rows of Four +# ************************************************************************/ + +class RowsOfFour(Diplomat): + def createGame(self): + Diplomat.createGame(self, max_rounds=3) + + +# register the game +registerGame(GameInfo(149, Diplomat, "Diplomat", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(151, LadyPalk, "Lady Palk", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(150, Congress, "Congress", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(433, RowsOfFour, "Rows of Four", + GI.GT_FORTY_THIEVES, 2, 2)) + diff --git a/pysollib/games/doublets.py b/pysollib/games/doublets.py new file mode 100644 index 00000000..6b1f1ed3 --- /dev/null +++ b/pysollib/games/doublets.py @@ -0,0 +1,142 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // Doublets +# ************************************************************************/ + +class Doublets_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if self.cards: + # check the rank + if (2 * self.cards[-1].rank + 1) % self.cap.mod != cards[0].rank: + return 0 + return 1 + + +class Doublets(Game): + Hint_Class = CautiousDefaultHint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 5.5*l.XS, l.YM + 4*l.YS) + + # create stacks + for dx, dy in ((0, 0), (1, 0), (2, 0), (0, 1), (2, 1), (0, 2), (2, 2)): + x, y = l.XM + (2*dx+5)*l.XS/2, l.YM + (2*dy+1)*l.YS/2 + s.rows.append(ReserveStack(x, y, self)) + dx, dy = 1, 2 + x, y = l.XM + (2*dx+5)*l.XS/2, l.YM + (2*dy+1)*l.YS/2 + s.foundations.append(Doublets_Foundation(x, y, self, ANY_SUIT, + dir=0, mod=13, + max_move=0, max_cards=48)) + l.createText(s.foundations[0], "ss") +## help = "A, 2, 4, 8, 3, 6, Q, J, 9, 5, 10, 7, A, ..." +## self.texts.help = MfxCanvasText(self.canvas, x + l.CW/2, y + l.YS + l.YM, anchor="n", text=help) + x, y = l.XM, l.YM + 3*l.YS/2 + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move all Kings in the first 8 cards to the bottom + kings, topcards = [], [] + for c in cards[:]: + cards.remove(c) + if c.rank == KING: + kings.append(c) + else: + topcards.append(c) + if len(topcards) == 8: + break + return kings + cards + topcards + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealCards() # deal first card to WasteStack + + def isGameWon(self): + if self.s.talon.cards or self.s.waste.cards: + return 0 + return len(self.s.foundations[0].cards) == 48 + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + old_state = self.enterState(self.S_FILL) + if self.s.waste.cards: + self.s.waste.moveMove(1, stack) + elif self.s.talon.canDealCards(): + self.s.talon.dealCards() + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + def getAutoStacks(self, event=None): + return ((), (), self.sg.dropstacks) + + +# register the game +registerGame(GameInfo(111, Doublets, "Doublets", + GI.GT_1DECK_TYPE, 1, 2)) + diff --git a/pysollib/games/eiffeltower.py b/pysollib/games/eiffeltower.py new file mode 100644 index 00000000..9e53595a --- /dev/null +++ b/pysollib/games/eiffeltower.py @@ -0,0 +1,126 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Eiffel Tower +# ************************************************************************/ + +class EiffelTower_RowStack(OpenStack): + def __init__(self, x, y, game): + OpenStack.__init__(self, x, y, game, max_move=0, max_accept=1) + self.CARD_YOFFSET = 1 + + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + return self.cards[-1].rank + cards[0].rank == 12 + + +class EiffelTower(Game): + Talon_Class = WasteTalonStack + Waste_Class = WasteStack + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 8.5*l.XS, l.YM + 6*l.YS) + + # create stacks + y = l.YM + for d in ((1, 2.5), (2, 2), (3, 1.5), (4, 1), (5, 0.5), (5, 0.5)): + x = l.XM + d[1] * l.XS + for i in range(d[0]): + s.rows.append(EiffelTower_RowStack(x, y, self)) + x = x + l.XS + y = y + l.YS + x = l.XM + 6 * l.XS + y = l.YM + 5 * l.YS / 2 + s.waste = self.Waste_Class(x, y, self) + l.createText(s.waste, "ss") + x = x + l.XS + s.talon = self.Talon_Class(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def isGameWon(self): + return len(self.s.talon.cards) == 0 and len(self.s.waste.cards) == 0 + + def getAutoStacks(self, event=None): + return ((), (), ()) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank + card2.rank == 12 + + +# /*********************************************************************** +# // Strict Eiffel Tower +# ************************************************************************/ + +class StrictEiffelTower(EiffelTower): + Waste_Class = StackWrapper(WasteStack, max_cards=2) + + +# register the game +registerGame(GameInfo(16, EiffelTower, "Eiffel Tower", + GI.GT_PAIRING_TYPE, 2, 0)) +##registerGame(GameInfo(801, StrictEiffelTower, "Strict Eiffel Tower", +## GI.GT_PAIRING_TYPE, 2, 0)) + diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py new file mode 100644 index 00000000..cc02c783 --- /dev/null +++ b/pysollib/games/fan.py @@ -0,0 +1,598 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Fan_Hint(CautiousDefaultHint): + # FIXME: demo is not too clever in this game + pass + + +# /*********************************************************************** +# // Fan +# ************************************************************************/ + +class Fan(Game): + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + Foundation_Class_2 = None + ReserveStack_Class = ReserveStack + RowStack_Class = KingSS_RowStack + Hint_Class = Fan_Hint + + # + # game layout + # + + def createGame(self, rows=(5,5,5,3), playcards=9, reserves=0): + # create layout + l, s = Layout(self), self.s + + # set window + # (set size so that at least 9 cards are fully playable) + w = max(2*l.XS, l.XS+(playcards-1)*l.XOFFSET) + w = min(3*l.XS, w) + w = (w + 1) & ~1 + ##print 2*l.XS, w + self.setSize(l.XM + max(rows)*w, l.YM + (1+len(rows))*l.YS) + + # create stacks + if reserves: + x, y = l.XM, l.YM + for r in range(reserves): + s.reserves.append(self.ReserveStack_Class(x, y, self)) + x += l.XS + x = (self.width - self.gameinfo.decks*4*l.XS - 2*l.XS) / 2 + dx = l.XS + else: + dx = (self.width - self.gameinfo.decks*4*l.XS)/(self.gameinfo.decks*4+1) + x, y = l.XM + dx, l.YM + dx += l.XS + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) + x += dx + if self.gameinfo.decks == 2: + for i in range(4): + s.foundations.append(self.Foundation_Class_2(x, y, self, suit=i)) + x += dx + for i in range(len(rows)): + x, y = l.XM, y + l.YS + for j in range(rows[i]): + stack = self.RowStack_Class(x, y, self, max_move=1, max_accept=1) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.rows.append(stack) + x += w + x, y = self.width - l.XS, self.height - l.YS + s.talon = self.Talon_Class(x, y, self) + + # define stack-groups + l.defaultStackGroups() + return l + + # + # game overrides + # + + def startGame(self): + for i in range(2): + self.s.talon.dealRow(rows=self.s.rows[:17], frames=0) + self.startDealSample() + self.s.talon.dealRow() + assert len(self.s.talon.cards) == 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + +# /*********************************************************************** +# // Scotch Patience +# ************************************************************************/ + +class ScotchPatience(Fan): + Foundation_Class = AC_FoundationStack + RowStack_Class = StackWrapper(RK_RowStack, base_rank=NO_RANK) + + +# /*********************************************************************** +# // Shamrocks +# ************************************************************************/ + +class Shamrocks(Fan): + RowStack_Class = StackWrapper(UD_RK_RowStack, base_rank=NO_RANK, max_cards=3) + + def createGame(self): + Fan.createGame(self, playcards=4) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // La Belle Lucie (Midnight Oil) +# ************************************************************************/ + +class LaBelleLucie_Talon(TalonStack): + def canDealCards(self): + return self.round != self.max_rounds and not self.game.isGameWon() + + def dealCards(self, sound=0): + n = self.redealCards1() + if n == 0: + return 0 + self.redealCards2() + if sound: + self.game.startDealSample() + self.redealCards3() + if sound: + self.game.stopSamples() + return n + + # redeal step 1) - collect all cards, move them to the Talon + def redealCards1(self): + assert len(self.cards) == 0 + num_cards = 0 + for r in self.game.s.rows: + if r.cards: + num_cards = num_cards + len(r.cards) + self.game.moveMove(len(r.cards), r, self, frames=0) + assert len(self.cards) == num_cards + return num_cards + + # redeal step 2) - shuffle + def redealCards2(self): + assert self.round != self.max_rounds + assert self.cards + self.game.shuffleStackMove(self) + self.game.nextRoundMove(self) + + # redeal step 3) - redeal cards to stacks + def redealCards3(self, face_up=1): + # deal 3 cards to each row, and 1-3 cards to last row + to_stacks = self.game.s.rows + n = min(len(self.cards), 3*len(to_stacks)) + for i in range(3): + j = (n/3, (n+1)/3, (n+2)/3) [i] + frames = (0, 0, 4) [i] + for r in to_stacks[:j]: + if self.cards[-1].face_up != face_up: + self.game.flipMove(self) + self.game.moveMove(1, self, r, frames=frames) + + +class LaBelleLucie(Fan): + Talon_Class = StackWrapper(LaBelleLucie_Talon, max_rounds=3) + RowStack_Class = StackWrapper(SS_RowStack, base_rank=NO_RANK) + + +# /*********************************************************************** +# // Super Flower Garden +# ************************************************************************/ + +class SuperFlowerGarden(LaBelleLucie): + RowStack_Class = StackWrapper(RK_RowStack, base_rank=NO_RANK) + + +# /*********************************************************************** +# // Three Shuffles and a Draw +# ************************************************************************/ + +class ThreeShufflesAndADraw_RowStack(SS_RowStack): + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + game, r = self.game, self.game.s.reserves[0] + if to_stack is not r: + SS_RowStack.moveMove(self, ncards, to_stack, frames=frames, shadow=shadow) + return + f = self._canDrawCard() + assert f and game.draw_done == 0 and ncards == 1 + # 1) top card from self to reserve + game.updateStackMove(r, 2|16) # update view for undo + game.moveMove(1, self, r, frames=frames, shadow=shadow) + game.updateStackMove(r, 3|64) # update model + game.updateStackMove(r, 1|16) # update view for redo + # 2) second card from self to foundation/row + if 1 or not game.demo: + game.playSample("drop", priority=200) + if frames == 0: + frames = -1 + game.moveMove(1, self, f, frames=frames, shadow=shadow) + # 3) from reserve back to self + # (need S_FILL because the move is normally not valid) + old_state = game.enterState(game.S_FILL) + game.moveMove(1, r, self, frames=frames, shadow=shadow) + game.leaveState(old_state) + + def _canDrawCard(self): + if len(self.cards) >= 2: + pile = self.cards[-2:-1] + for s in self.game.s.foundations + self.game.s.rows: + if s is not self and s.acceptsCards(self, pile): + return s + return None + + +class ThreeShufflesAndADraw_ReserveStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return 0 + if not from_stack in self.game.s.rows: + return 0 + if self.game.draw_done or not from_stack._canDrawCard(): + return 0 + return 1 + + def updateModel(self, undo, flags): + assert undo == self.game.draw_done + self.game.draw_done = not self.game.draw_done + + def updateText(self): + if self.game.preview > 1 or self.texts.misc is None: + return + t = (_("X"), _("Draw")) [self.game.draw_done == 0] + self.texts.misc.config(text=t) + + def prepareView(self): + ReserveStack.prepareView(self) + if not self.is_visible or self.game.preview > 1: + return + images = self.game.app.images + x, y = self.x + images.CARDW/2, self.y + images.CARDH/2 + self.texts.misc = MfxCanvasText(self.game.canvas, x, y, + anchor="center", + font=self.game.app.getFont("canvas_default")) + + +class ThreeShufflesAndADraw(LaBelleLucie): + RowStack_Class = StackWrapper(ThreeShufflesAndADraw_RowStack, base_rank=NO_RANK) + + def createGame(self): + l = LaBelleLucie.createGame(self) + s = self.s + # add a reserve stack + x, y = s.rows[3].x, s.rows[-1].y + s.reserves.append(ThreeShufflesAndADraw_ReserveStack(x, y, self)) + # redefine the stack-groups + l.defaultStackGroups() + # extra settings + self.draw_done = 0 + + def startGame(self): + self.draw_done = 0 + self.s.reserves[0].updateText() + LaBelleLucie.startGame(self) + + def _restoreGameHook(self, game): + self.draw_done = game.loadinfo.draw_done + + def _loadGameHook(self, p): + self.loadinfo.addattr(draw_done=p.load()) + + def _saveGameHook(self, p): + p.dump(self.draw_done) + + +# /*********************************************************************** +# // Trefoil +# ************************************************************************/ + +class Trefoil(LaBelleLucie): + GAME_VERSION = 2 + Foundation_Class = StackWrapper(SS_FoundationStack, min_cards=1) + + def createGame(self): + return Fan.createGame(self, rows=(5,5,5,1)) + + def _shuffleHook(self, cards): + # move Aces to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + for i in range(2): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations) + + +# /*********************************************************************** +# // Intelligence +# ************************************************************************/ + +class Intelligence_Talon(LaBelleLucie_Talon): + # all Aces go to Foundations + dealToStacks = TalonStack.dealToStacksOrFoundations + + # redeal step 1) - collect all cards, move them to the Talon (face down) + def redealCards1(self): + assert len(self.cards) == 0 + r = self.game.s.reserves[0] + num_cards = len(r.cards) + if num_cards > 0: + self.game.moveMove(len(r.cards), r, self, frames=0) + for r in self.game.s.rows: + num_cards = num_cards + len(r.cards) + while r.cards: + self.game.moveMove(1, r, self, frames=0) + self.game.flipMove(self) + assert len(self.cards) == num_cards + return num_cards + + # redeal step 3) - redeal cards to stacks + def redealCards3(self, face_up=1): + for r in self.game.s.rows: + while len(r.cards) < 3: + self.dealToStacks([r], frames=4) + if not self.cards: + return + # move all remaining cards to the reserve + self.game.moveMove(len(self.cards), self, self.game.s.reserves[0], frames=0) + + +# up or down in suit +class Intelligence_RowStack(UD_SS_RowStack): + def fillStack(self): + if not self.cards: + r = self.game.s.reserves[0] + if r.cards: + r.dealRow((self,self,self), sound=1) + + +class Intelligence_ReserveStack(ReserveStack, DealRow_StackMethods): + # all Aces go to Foundations (used in r.dealRow() above) + dealToStacks = DealRow_StackMethods.dealToStacksOrFoundations + + def canFlipCard(self): + return 0 + + +class Intelligence(Fan): + + Foundation_Class = SS_FoundationStack + Foundation_Class_2 = SS_FoundationStack + Talon_Class = StackWrapper(Intelligence_Talon, max_rounds=3) + RowStack_Class = StackWrapper(Intelligence_RowStack, base_rank=NO_RANK) + + def createGame(self, rows=(5,5,5,3)): + l = Fan.createGame(self, rows) + s = self.s + # add a reserve stack + x, y = s.talon.x - l.XS, s.talon.y + s.reserves.append(Intelligence_ReserveStack(x, y, self, max_move=0, max_accept=0, max_cards=UNLIMITED_CARDS)) + l.createText(s.reserves[0], "sw") + # redefine the stack-groups + l.defaultStackGroups() + + def startGame(self): + talon = self.s.talon + for i in range(2): + talon.dealRow(frames=0) + self.startDealSample() + talon.dealRow() + # move all remaining cards to the reserve + self.moveMove(len(talon.cards), talon, self.s.reserves[0], frames=0) + + +class IntelligencePlus(Intelligence): + def createGame(self): + Intelligence.createGame(self, rows=(5,5,5,4)) + + +# /*********************************************************************** +# // House in the Wood +# // House on the Hill +# // (2 decks variants of Fan) +# ************************************************************************/ + +class HouseInTheWood(Fan): + Foundation_Class = Foundation_Class_2 = SS_FoundationStack + RowStack_Class = UD_SS_RowStack + + def createGame(self): + Fan.createGame(self, rows=(6,6,6,6,6,5)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.rows[:34], frames=0) + self.s.talon.dealRow(rows=self.s.rows[:35], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:35]) + assert len(self.s.talon.cards) == 0 + +class HouseOnTheHill(HouseInTheWood): + Foundation_Class = SS_FoundationStack + Foundation_Class_2 = StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1) + + +# /*********************************************************************** +# // Clover Leaf +# ************************************************************************/ + +class CloverLeaf_RowStack(UD_SS_RowStack): + def acceptsCards(self, from_stack, cards): + if not UD_SS_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return cards[0].rank in (ACE, KING) + return True + + +class CloverLeaf(Game): + + Hint_Class = Fan_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + playcards = 7 + w, h = l.XM+l.XS+4*(l.XS+(playcards-1)*l.XOFFSET), l.YM+4*l.YS + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + for i in range(2): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + y += l.YS + for i in range(2): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i+2, + base_rank=KING, dir=-1)) + y += l.YS + + x = l.XM+l.XS + for i in range(4): + y = l.YM + for j in range(4): + stack = CloverLeaf_RowStack(x, y, self, + max_move=1, max_accept=1) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + y += l.YS + x += l.XS+(playcards-1)*l.XOFFSET + + s.talon = InitialDealTalonStack(w-l.XS, h-l.YS, self) + + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + #self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations) + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToBottom(cards, + lambda c: ((c.rank == ACE and c.suit in (0,1)) or + (c.rank == KING and c.suit in (2,3)), + c.suit)) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + abs(card1.rank-card2.rank) == 1) + + +# /*********************************************************************** +# // Free Fan +# ************************************************************************/ + +class FreeFan(Fan): + def createGame(self): + Fan.createGame(self, reserves=2) + + +# /*********************************************************************** +# // Box Fan +# ************************************************************************/ + +class BoxFan(Fan): + + RowStack_Class = KingAC_RowStack + + def createGame(self): + Fan.createGame(self, rows=(4,4,4,4)) + + def startGame(self): + for i in range(2): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations) + + def _shuffleHook(self, cards): + # move Aces to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 0, c.suit)) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# register the game +registerGame(GameInfo(56, Fan, "Fan", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(87, ScotchPatience, "Scotch Patience", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(57, Shamrocks, "Shamrocks", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(901, LaBelleLucie, "La Belle Lucie", # was: 32, 82 + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2, + altnames=("Fair Lucy", "Midnight Oil") )) +registerGame(GameInfo(132, SuperFlowerGarden, "Super Flower Garden", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2)) +registerGame(GameInfo(128, ThreeShufflesAndADraw, "Three Shuffles and a Draw", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2)) +registerGame(GameInfo(88, Trefoil, "Trefoil", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2)) +registerGame(GameInfo(227, Intelligence, "Intelligence", + GI.GT_FAN_TYPE, 2, 2)) +registerGame(GameInfo(340, IntelligencePlus, "Intelligence +", + GI.GT_FAN_TYPE, 2, 2)) +registerGame(GameInfo(268, HouseInTheWood, "House in the Wood", + GI.GT_FAN_TYPE | GI.GT_OPEN, 2, 0)) +registerGame(GameInfo(317, HouseOnTheHill, "House on the Hill", + GI.GT_FAN_TYPE | GI.GT_OPEN, 2, 0, + rules_filename='houseinthewood.html')) +registerGame(GameInfo(320, CloverLeaf, "Clover Leaf", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(347, FreeFan, "Free Fan", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(385, BoxFan, "Box Fan", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) + diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py new file mode 100644 index 00000000..fd67d7b2 --- /dev/null +++ b/pysollib/games/fortythieves.py @@ -0,0 +1,786 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // +# ************************************************************************/ + +class FortyThieves_Hint(CautiousDefaultHint): + # FIXME: demo is not too clever in this game + pass + + +# /*********************************************************************** +# // Forty Thieves +# // rows build down by suit +# ************************************************************************/ + +class FortyThieves(Game): + Foundation_Class = SS_FoundationStack + RowStack_Class = SS_RowStack + Hint_Class = FortyThieves_Hint + + FOUNDATION_MAX_MOVE = 1 + ROW_MAX_MOVE = 1 + DEAL = (0, 4) + FILL_EMPTY_ROWS = 0 + + # + # game layout + # + + def createGame(self, max_rounds=1, num_deal=1, rows=10, playcards=12, XCARDS=64, XOFFSET=None): + # create layout + XM = (10, 4)[rows > 10] + if XOFFSET is None: + l, s = Layout(self, XM=XM, YBOTTOM=16), self.s + else: + l, s = Layout(self, XM=XM, XOFFSET=XOFFSET, YBOTTOM=16), self.s + + # set window + # (compute best XOFFSET - up to 64/72 cards can be in the Waste) + decks = self.gameinfo.decks + maxrows = max(rows, 4*decks+2) + w1, w2 = maxrows*l.XS+l.XM, 2*l.XS + if w2 + XCARDS * l.XOFFSET > w1: + l.XOFFSET = int((w1 - w2) / XCARDS) + # (piles up to 12 cards are playable without overlap in default window size) + h = max(2*l.YS, l.YS+(playcards-1)*l.YOFFSET) + self.setSize(w1, l.YM + l.YS + h + l.YS + l.YBOTTOM) + + # create stacks + x = l.XM + (maxrows - 4*decks) * l.XS / 2 + y = l.YM + for i in range(4*decks): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i/decks, max_move=self.FOUNDATION_MAX_MOVE)) + x = x + l.XS + x = l.XM + (maxrows - rows) * l.XS / 2 + y = l.YM + l.YS + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self, max_move=self.ROW_MAX_MOVE)) + x = x + l.XS + x = self.width - l.XS + y = self.height - l.YS - l.YBOTTOM + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds, num_deal=num_deal) + l.createText(s.talon, "s") + if max_rounds > 1: + s.talon.texts.rounds = MfxCanvasText(self.canvas, + x + l.CW / 2, y - l.YM, + anchor="s", + font=self.app.getFont("canvas_default")) + x = x - l.XS + s.waste = WasteStack(x, y, self) + s.waste.CARD_XOFFSET = -l.XOFFSET + l.createText(s.waste, "s") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + for i in range(self.DEAL[0]): + self.s.talon.dealRow(flip=0, frames=0) + for i in range(self.DEAL[1] - 1): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def fillStack(self, stack): + if self.FILL_EMPTY_ROWS and stack in self.s.rows and not stack.cards: + old_state = self.enterState(self.S_FILL) + if self.s.waste.cards: + self.s.waste.moveMove(1, stack) + elif self.s.talon.canDealCards(): + self.s.talon.dealCards() + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Busy Aces +# // Limited +# // Courtyard +# // Waning Moon +# // Lucas +# // Napoleon's Square +# // Carre Napoleon +# // Josephine +# // rows build down by suit +# ************************************************************************/ + +class BusyAces(FortyThieves): + DEAL = (0, 1) + + def createGame(self): + FortyThieves.createGame(self, rows=12) + + +class Limited(BusyAces): + DEAL = (0, 3) + + +class Courtyard(BusyAces): + ROW_MAX_MOVE = UNLIMITED_MOVES + FILL_EMPTY_ROWS = 1 + + +class WaningMoon(FortyThieves): + def createGame(self): + FortyThieves.createGame(self, rows=13) + + +class Lucas(WaningMoon): + ROW_MAX_MOVE = UNLIMITED_MOVES + + +class NapoleonsSquare(FortyThieves): + ROW_MAX_MOVE = UNLIMITED_MOVES + def createGame(self): + FortyThieves.createGame(self, rows=12) + + +class CarreNapoleon(FortyThieves): + RowStack_Class = StackWrapper(SS_RowStack, base_rank=KING) + + def createGame(self): + FortyThieves.createGame(self, rows=12) + + def _fillOne(self): + for r in self.s.rows: + if r.cards: + c = r.cards[-1] + for f in self.s.foundations: + if f.acceptsCards(r, [c]): + self.moveMove(1, r, f, frames=4, shadow=0) + return 1 + return 0 + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + for i in range(4): + self.s.talon.dealRow() + while True: + if not self._fillOne(): + break + self.s.talon.dealCards() + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == 0, c.suit)) + + +class Josephine(FortyThieves): + ROW_MAX_MOVE = UNLIMITED_MOVES + + +# /*********************************************************************** +# // Deuces +# ************************************************************************/ + +class Deuces(FortyThieves): + Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, base_rank=1) + RowStack_Class = StackWrapper(SS_RowStack, mod=13) + + DEAL = (0, 1) + + def _shuffleHook(self, cards): + # move Twos to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 1, c.suit)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + FortyThieves.startGame(self) + + +# /*********************************************************************** +# // Corona +# // Quadrangle +# ************************************************************************/ + +class Corona(FortyThieves): + FOUNDATION_MAX_MOVE = 0 + DEAL = (0, 3) + FILL_EMPTY_ROWS = 1 + + def createGame(self): + FortyThieves.createGame(self, rows=12) + + +class Quadrangle(Corona): + Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, base_rank=NO_RANK) + RowStack_Class = StackWrapper(SS_RowStack, mod=13) + + def startGame(self): + FortyThieves.startGame(self) + self.s.talon.dealSingleBaseCard() + + +# /*********************************************************************** +# // Forty and Eight +# ************************************************************************/ + +class FortyAndEight(FortyThieves): + def createGame(self): + FortyThieves.createGame(self, max_rounds=2, rows=8, XCARDS=72) + + +# /*********************************************************************** +# // Little Forty +# ************************************************************************/ + +class LittleForty(FortyThieves): + RowStack_Class = Spider_SS_RowStack + + ROW_MAX_MOVE = UNLIMITED_MOVES + FILL_EMPTY_ROWS = 1 + + def createGame(self): + FortyThieves.createGame(self, max_rounds=4, num_deal=3, XOFFSET=0) + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack.cards: + return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 + return 0 + + +# /*********************************************************************** +# // Streets +# // Maria +# // Number Ten +# // Rank and File +# // Emperor +# // Triple Line +# // rows build down by alternate color +# ************************************************************************/ + +class Streets(FortyThieves): + RowStack_Class = AC_RowStack + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +class Maria(Streets): + def createGame(self): + Streets.createGame(self, rows=9) + + +class NumberTen(Streets): + ROW_MAX_MOVE = UNLIMITED_MOVES + DEAL = (2, 2) + + +class RankAndFile(Streets): + ROW_MAX_MOVE = UNLIMITED_MOVES + DEAL = (3, 1) + + +class Emperor(Streets): + DEAL = (3, 1) + + +class TripleLine(Streets): + GAME_VERSION = 2 + + FOUNDATION_MAX_MOVE = 0 + ROW_MAX_MOVE = UNLIMITED_MOVES + DEAL = (0, 3) + FILL_EMPTY_ROWS = 1 + + def createGame(self): + Streets.createGame(self, max_rounds=2, rows=12) + + +# /*********************************************************************** +# // Red and Black +# // Zebra +# // rows build down by alternate color, foundations up by alternate color +# ************************************************************************/ + +class RedAndBlack(Streets): + Foundation_Class = AC_FoundationStack + + ROW_MAX_MOVE = UNLIMITED_MOVES + DEAL = (0, 1) + + def createGame(self): + FortyThieves.createGame(self, rows=8) + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + Streets.startGame(self) + + +class Zebra(RedAndBlack): + FOUNDATION_MAX_MOVE = 0 + ROW_MAX_MOVE = 1 + FILL_EMPTY_ROWS = 1 + + def createGame(self): + FortyThieves.createGame(self, max_rounds=2, rows=8, XOFFSET=0) + + +# /*********************************************************************** +# // Indian +# // Midshipman +# // Mumbai +# // rows build down by any suit but own +# ************************************************************************/ + +class Indian_RowStack(SequenceRowStack): + def _isSequence(self, cards): + return isAnySuitButOwnSequence(cards, self.cap.mod, self.cap.dir) + def getHelp(self): + return _('Row. Build down in any suit but the same.') + + +class Indian(FortyThieves): + RowStack_Class = Indian_RowStack + DEAL = (1, 2) + + def createGame(self): + FortyThieves.createGame(self, XCARDS=74) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit != card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +class Midshipman(Indian): + DEAL = (2, 2) + + def createGame(self): + FortyThieves.createGame(self, rows=9) + + +class Mumbai(Indian): + def createGame(self): + FortyThieves.createGame(self, XCARDS=84, rows=13) + + +# /*********************************************************************** +# // Napoleon's Exile +# // Double Rail +# // Single Rail (1 deck) +# // rows build down by rank +# ************************************************************************/ + +class NapoleonsExile(FortyThieves): + RowStack_Class = RK_RowStack + + DEAL = (0, 4) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank + + +class DoubleRail(NapoleonsExile): + ROW_MAX_MOVE = UNLIMITED_MOVES + DEAL = (0, 1) + + def createGame(self): + FortyThieves.createGame(self, rows=5) + + +class SingleRail(DoubleRail): + def createGame(self): + FortyThieves.createGame(self, rows=4, XCARDS=48) + + +# /*********************************************************************** +# // Octave +# ************************************************************************/ + +class Octave_Talon(WasteTalonStack): + + def dealCards(self, sound=0): + if self.round == self.max_rounds: + # last round + old_state = self.game.enterState(self.game.S_DEAL) + num_cards = 0 + wastes = [self.waste]+list(self.game.s.reserves) + if self.cards: + if sound and not self.game.demo: + self.game.startDealSample() + num_cards = min(len(self.cards), 8) + for i in range(num_cards): + if not self.cards[-1].face_up: + self.game.flipMove(self) + self.game.moveMove(1, self, wastes[i], frames=4, shadow=0) + if sound and not self.game.demo: + self.game.stopSamples() + self.game.leaveState(old_state) + return num_cards + return WasteTalonStack.dealCards(self, sound) + + +class Octave(Game): + + # + # game layout + # + + def createGame(self): + + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+9*l.XS, l.YM+3*l.YS+12*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, + suit=int(i/2), max_cards=10)) + x += l.XS + + x, y = l.XM, l.YM+l.YS + for i in range(8): + s.rows.append(AC_RowStack(x, y, self, + base_rank=ANY_RANK, max_move=1)) + x += l.XS + + x, y = l.XM, h-l.YS + s.talon = Octave_Talon(x, y, self, max_rounds=2) + l.createText(s.talon, "n") + x += l.XS + s.waste = WasteStack(x, y, self) + x += l.XS + for i in range(7): + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + x += l.XS + + # define stack-groups + l.defaultStackGroups() + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(2): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def isGameWon(self): + for s in self.s.foundations: + if len(s.cards) != 10: + return False + for s in self.s.reserves: + if s.cards: + return False + return not self.s.waste.cards + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + def _autoDeal(self, sound=1): + ncards = len(self.s.waste.cards) + sum([len(i.cards) for i in self.s.reserves]) + if ncards == 0: + return self.dealCards(sound=sound) + return 0 + + +# /*********************************************************************** +# // Fortune's Favor +# ************************************************************************/ + +class FortunesFavor(Game): + + def createGame(self): + + l, s = Layout(self), self.s + + w, h = l.XM+7*l.XS, 2*l.YM+3*l.YS + self.setSize(w, h) + + x, y = l.XM+3*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 's') + y += l.YS+2*l.YM + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 's') + y = 2*l.YM+l.YS + for i in range(2): + x = l.XM+l.XS + for j in range(6): + stack = SS_RowStack(x, y, self, max_move=1) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + s.rows.append(stack) + x += l.XS + y += l.YS + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, c.suit)) + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + + def fillStack(self, stack): + if len(stack.cards) == 0: + if stack is self.s.waste and self.s.talon.cards: + self.s.talon.dealCards() + elif stack in self.s.rows and self.s.waste.cards: + self.s.waste.moveMove(1, stack) + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Octagon +# ************************************************************************/ + +class Octagon(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self): + + l, s = Layout(self), self.s + + w1 = l.XS+12*l.XOFFSET + w, h = l.XM+2*l.XS+2*w1, l.YM+3*l.YS + self.setSize(w, h) + + for x, y in ((l.XM, l.YM), + (l.XM+w1+2*l.XS+l.XM, l.YM), + (l.XM, l.YM+2*l.YS), + (l.XM+w1+2*l.XS+l.XM, l.YM+2*l.YS),): + stack = SS_RowStack(x, y, self, max_move=1) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.rows.append(stack) + i = 0 + for x, y in ((l.XM+w1, l.YM), + (l.XM+w1+l.XS, l.YM), + (l.XM+w1-2*l.XS-l.XM, l.YM+l.YS), + (l.XM+w1-l.XS-l.XM, l.YM+l.YS), + (l.XM+w1+2*l.XS+l.XM, l.YM+l.YS), + (l.XM+w1+3*l.XS+l.XM, l.YM+l.YS), + (l.XM+w1, l.YM+2*l.YS), + (l.XM+w1+l.XS, l.YM+2*l.YS),): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i%4)) + i += 1 + x, y = l.XM+w1, l.YM+l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=4) + x += l.XS + s.waste = WasteStack(x, y, self) + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, (c.deck, c.suit))) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + for i in range(5): + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + if not self.s.waste.cards: + self.s.talon.dealCards() + if self.s.waste.cards: + self.s.waste.moveMove(1, stack) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Squadron +# ************************************************************************/ + +class Squadron(FortyThieves): + + def createGame(self): + l, s = Layout(self), self.s + + self.setSize(l.XM+12*l.XS, l.YM+max(4.5*l.YS, 2*l.YS+12*l.YOFFSET)) + + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 's') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 's') + x += 2*l.XS + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i/2)) + x += l.XS + x, y = l.XM, l.YM+l.YS*3/2 + for i in range(3): + s.reserves.append(ReserveStack(x, y, self)) + y += l.YS + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(10): + s.rows.append(SS_RowStack(x, y, self, max_move=1)) + x += l.XS + + l.defaultStackGroups() + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + + +# register the game +registerGame(GameInfo(13, FortyThieves, "Forty Thieves", + GI.GT_FORTY_THIEVES, 2, 0, + altnames=("Napoleon at St.Helena", + "Big Forty", "Le Cadran"))) +registerGame(GameInfo(80, BusyAces, "Busy Aces", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(228, Limited, "Limited", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(79, WaningMoon, "Waning Moon", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(125, Lucas, "Lucas", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(109, Deuces, "Deuces", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(196, Corona, "Corona", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(195, Quadrangle, "Quadrangle", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(110, Courtyard, "Courtyard", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(23, FortyAndEight, "Forty and Eight", + GI.GT_FORTY_THIEVES, 2, 1)) +registerGame(GameInfo(115, LittleForty, "Little Forty", # was: 72 + GI.GT_FORTY_THIEVES, 2, 3)) +registerGame(GameInfo(76, Streets, "Streets", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(73, Maria, "Maria", + GI.GT_FORTY_THIEVES, 2, 0, + altnames=("Maria Luisa",) )) +registerGame(GameInfo(70, NumberTen, "Number Ten", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(71, RankAndFile, "Rank and File", + GI.GT_FORTY_THIEVES, 2, 0, + altnames=("Dress Parade") )) +registerGame(GameInfo(197, TripleLine, "Triple Line", + GI.GT_FORTY_THIEVES | GI.GT_XORIGINAL, 2, 1)) +registerGame(GameInfo(126, RedAndBlack, "Red and Black", # was: 75 + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(113, Zebra, "Zebra", + GI.GT_FORTY_THIEVES, 2, 1)) +registerGame(GameInfo(69, Indian, "Indian", + GI.GT_FORTY_THIEVES, 2, 0, + altnames=("Indian Patience",) )) +registerGame(GameInfo(74, Midshipman, "Midshipman", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(198, NapoleonsExile, "Napoleon's Exile", + GI.GT_FORTY_THIEVES | GI.GT_XORIGINAL, 2, 0)) +registerGame(GameInfo(131, DoubleRail, "Double Rail", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(199, SingleRail, "Single Rail", + GI.GT_FORTY_THIEVES, 1, 0)) +registerGame(GameInfo(295, NapoleonsSquare, "Napoleon's Square", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(310, Emperor, "Emperor", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(323, Octave, "Octave", + GI.GT_FORTY_THIEVES, 2, 1)) +registerGame(GameInfo(332, Mumbai, "Mumbai", + GI.GT_FORTY_THIEVES, 3, 0)) +registerGame(GameInfo(411, CarreNapoleon, "Carre Napoleon", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(416, FortunesFavor, "Fortune's Favor", + GI.GT_FORTY_THIEVES, 1, 0)) +registerGame(GameInfo(426, Octagon, "Octagon", + GI.GT_FORTY_THIEVES, 2, 3)) +registerGame(GameInfo(440, Squadron, "Squadron", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(462, Josephine, "Josephine", + GI.GT_FORTY_THIEVES, 2, 0)) diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py new file mode 100644 index 00000000..dce7fd75 --- /dev/null +++ b/pysollib/games/freecell.py @@ -0,0 +1,530 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.hint import FreeCellType_Hint, FreeCellSolverWrapper + +from spider import Spider_AC_Foundation + + +# /*********************************************************************** +# // FreeCell +# ************************************************************************/ + +# To simplify playing we also consider the number of free rows. +# Note that this only is legal if the game.s.rows have a +# cap.base_rank == ANY_RANK. +# See also the "SuperMove" section in the FreeCell FAQ. +class FreeCell_RowStack(AC_RowStack): + def _getMaxMove(self, to_stack_ncards): + max_move = getNumberOfFreeStacks(self.game.s.reserves) + 1 + n = getNumberOfFreeStacks(self.game.s.rows) + if to_stack_ncards == 0: + n = n - 1 + while n > 0 and max_move < 1000: + max_move = max_move * 2 + n = n - 1 + return max_move + + def canMoveCards(self, cards): + max_move = self._getMaxMove(1) + return len(cards) <= max_move and AC_RowStack.canMoveCards(self, cards) + + def acceptsCards(self, from_stack, cards): + max_move = self._getMaxMove(len(self.cards)) + return len(cards) <= max_move and AC_RowStack.acceptsCards(self, from_stack, cards) + + +class FreeCell(Game): + Layout_Method = Layout.freeCellLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = FreeCell_RowStack + Hint_Class = FreeCellSolverWrapper(FreeCellType_Hint, {}) + + + # + # game layout + # + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=8, reserves=4, texts=0) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + for r in l.s.reserves: + s.reserves.append(ReserveStack(r.x, r.y, self)) + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + r = self.s.rows + ##self.s.talon.dealRow(rows=(r[0], r[2], r[4], r[6])) + self.s.talon.dealRow(rows=r[:4]) + assert len(self.s.talon.cards) == 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Relaxed FreeCell +# ************************************************************************/ + +class RelaxedFreeCell(FreeCell): + RowStack_Class = AC_RowStack + Hint_Class = FreeCellSolverWrapper(FreeCellType_Hint, {'sm' : "unlimited"}) + + +# /*********************************************************************** +# // ForeCell +# ************************************************************************/ + +class ForeCell(FreeCell): + RowStack_Class = StackWrapper(FreeCell_AC_RowStack, base_rank=KING) + Hint_Class = FreeCellSolverWrapper(FreeCellType_Hint, {'esf' : "kings"}) + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + assert len(self.s.talon.cards) == 0 + + +# /*********************************************************************** +# // Challenge FreeCell +# // Super Challenge FreeCell +# ************************************************************************/ + +class ChallengeFreeCell(FreeCell): + def _shuffleHook(self, cards): + # move Aces and Twos to top of the Talon + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, 1), (-c.rank, c.suit))) + +class SuperChallengeFreeCell(ChallengeFreeCell): + RowStack_Class = StackWrapper(FreeCell_AC_RowStack, base_rank=KING) + Hint_Class = FreeCellSolverWrapper(FreeCellType_Hint, {'esf' : "kings"}) + + +# /*********************************************************************** +# // Stalactites +# ************************************************************************/ + +class Stalactites(FreeCell): + Foundation_Class = StackWrapper(RK_FoundationStack, suit=ANY_SUIT, mod=13, min_cards=1) + RowStack_Class = StackWrapper(BasicRowStack, max_move=1, max_accept=0) + Hint_Class = FreeCellType_Hint + + def createGame(self): + FreeCell.createGame(self, reserves=2) + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations) + assert len(self.s.talon.cards) == 0 + self._restoreGameHook(None) + + def _restoreGameHook(self, game): + for s in self.s.foundations: + s.cap.base_rank = s.cards[0].rank + + +# /*********************************************************************** +# // Double Freecell +# ************************************************************************/ + +class DoubleFreecell(FreeCell): + Hint_Class = FreeCellType_Hint + + # + # game layout + # + + def createGame(self): + + # create layout + l, s = Layout(self), self.s + + # set window + w, h = 3*l.XM+10*l.XS, 2*l.YM+2*l.YS+16*l.YOFFSET + self.setSize(w, h) + + # create stacks + s.talon = self.Talon_Class(l.XM, h-l.YS, self) + x, y = 3*l.XM + 6*l.XS, l.YM + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i, mod=13, max_cards=26)) + x += l.XS + x, y = 2*l.XM, l.YM + l.YS + l.YM + for i in range(10): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + x, y = l.XM, l.YM + for i in range(6): + s.reserves.append(ReserveStack(x, y, self)) + x += l.XS + # default + l.defaultAll() + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move 4 Aces to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, + lambda c: (c.rank == ACE and c.deck == 0, c.suit)) + + def startGame(self): + for i in range(9): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations) + assert len(self.s.talon.cards) == 0 + + +# /*********************************************************************** +# // Triple Freecell +# ************************************************************************/ + +class TripleFreecell(FreeCell): + Hint_Class = FreeCellType_Hint + + # + # game layout + # + + def createGame(self, rows=13, reserves=10, playcards=20): + + # create layout + l, s = Layout(self), self.s + + # set window + max_rows = max(12, rows, reserves) + w, h = l.XM+max_rows*l.XS, l.YM+3*l.YS+playcards*l.YOFFSET + self.setSize(w, h) + + # create stacks + s.talon = self.Talon_Class(l.XM, h-l.YS, self) + + x, y = l.XM+(max_rows-12)*l.XS/2, l.YM + for i in range(3): + for j in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, suit=j)) + x += l.XS + x, y = l.XM+(max_rows-reserves)*l.XS/2, l.YM+l.YS + for i in range(reserves): + s.reserves.append(ReserveStack(x, y, self)) + x += l.XS + x, y = l.XM+(max_rows-rows)*l.XS/2, l.YM+2*l.YS + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(11): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +class Cell11(TripleFreecell): + def createGame(self): + TripleFreecell.createGame(self, rows=12, reserves=11) + + def startGame(self): + for i in range(12): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[1:-1]) + self.s.talon.dealRow(rows=[self.s.reserves[0],self.s.reserves[-1]]) + + +# /*********************************************************************** +# // Spidercells +# ************************************************************************/ + +class Spidercells_RowStack(FreeCell_RowStack): + def canMoveCards(self, cards): + if len(cards) == 13 and isAlternateColorSequence(cards): + return True + return FreeCell_RowStack.canMoveCards(self, cards) + + +class Spidercells(FreeCell): + + Hint_Class = FreeCellType_Hint + Foundation_Class = Spider_AC_Foundation + RowStack_Class = Spidercells_RowStack + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=8, reserves=4, texts=0) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=ANY_SUIT)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + for r in l.s.reserves: + s.reserves.append(ReserveStack(r.x, r.y, self)) + # default + l.defaultAll() + + +# /*********************************************************************** +# // Seven by Four +# // Seven by Five +# // Bath +# ************************************************************************/ + +class SevenByFour(FreeCell): + Hint_Class = FreeCellSolverWrapper(FreeCellType_Hint, {}) + #Hint_Class = FreeCellType_Hint + def createGame(self): + FreeCell.createGame(self, rows=7) + def startGame(self): + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.rows[:3]) + +class SevenByFive(SevenByFour): + def createGame(self): + FreeCell.createGame(self, rows=7, reserves=5) + +class Bath(FreeCell): + Hint_Class = FreeCellSolverWrapper(FreeCellType_Hint, {'esf' : 'kings'}) + #Hint_Class = FreeCellType_Hint + RowStack_Class = StackWrapper(FreeCell_RowStack, base_rank=KING) + def createGame(self): + FreeCell.createGame(self, rows=10, reserves=2) + def startGame(self): + for i in range(6): + self.s.talon.dealRow(rows=self.s.rows[i:], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[6:]) + self.s.talon.dealRow(rows=self.s.rows[7:]) + + +# /*********************************************************************** +# // Clink +# ************************************************************************/ + +class Clink(FreeCell): + Hint_Class = FreeCellType_Hint + + def createGame(self): + # create layout + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+2*l.YS+12*l.YOFFSET) + # create stacks + x, y = l.XM, self.height-l.YS + s.talon = InitialDealTalonStack(x, y, self) + x, y = l.XM+l.XS, l.YM + for i in range(2): + s.reserves.append(ReserveStack(x, y, self)) + x += l.XS + x += 2*l.XS + for i in range(2): + s.foundations.append(AC_FoundationStack(x, y, self, suit=ANY_SUIT, + max_cards=26, mod=13, max_move=0)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(8): + s.rows.append(AC_RowStack(x, y, self)) + x += l.XS + # default + l.defaultAll() + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow(rows=self.s.foundations) + + def _shuffleHook(self, cards): + # move two Aces to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, + lambda c: (c.rank == ACE and c.suit in (0, 2), (c.suit))) + + +# /*********************************************************************** +# // Repair +# ************************************************************************/ + +class Repair(FreeCell): + Hint_Class = FreeCellType_Hint + RowStack_Class = AC_RowStack + + def createGame(self): + FreeCell.createGame(self, rows=10, reserves=4, playcards=26) + + def startGame(self): + for i in range(9): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + + +# /*********************************************************************** +# // Four Colours +# ************************************************************************/ + +class FourColours_RowStack(AC_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + +class FourColours(FreeCell): + Hint_Class = FreeCellType_Hint + RowStack_Class = AC_RowStack + + def createGame(self): + # create layout + l, s = Layout(self), self.s + self.setSize(l.XM+9*l.XS, l.YM+2*l.YS+12*l.YOFFSET) + # create stacks + x, y = self.width-l.XS, self.height-l.YS + s.talon = InitialDealTalonStack(x, y, self) + x, y = l.XM, l.YM + for i in range(4): + s.reserves.append(ReserveStack(x, y, self, base_suit=i)) + x += l.XS + x += l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(7): + s.rows.append(FourColours_RowStack(x, y, self)) + x += l.XS + # default + l.defaultAll() + + def dealOne(self, frames): + suit = self.s.talon.cards[-1].suit + self.s.talon.dealRow(rows=[self.s.rows[suit]], frames=frames) + + def startGame(self): + for i in range(40): + self.dealOne(frames=0) + self.startDealSample() + while self.s.talon.cards: + self.dealOne(frames=-1) + + + +# register the game +registerGame(GameInfo(5, RelaxedFreeCell, "Relaxed FreeCell", + GI.GT_FREECELL | GI.GT_RELAXED | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(8, FreeCell, "FreeCell", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(46, ForeCell, "ForeCell", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(77, Stalactites, "Stalactites", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, + altnames=("Grampus", "Old Mole") )) +registerGame(GameInfo(264, DoubleFreecell, "Double FreeCell", + GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) +registerGame(GameInfo(265, TripleFreecell, "Triple FreeCell", + GI.GT_FREECELL | GI.GT_OPEN, 3, 0)) +registerGame(GameInfo(336, ChallengeFreeCell, "Challenge FreeCell", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, + rules_filename='freecell.html')) +registerGame(GameInfo(337, SuperChallengeFreeCell, "Super Challenge FreeCell", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(363, Spidercells, "Spidercells", + GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(364, SevenByFour, "Seven by Four", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(365, SevenByFive, "Seven by Five", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(383, Bath, "Bath", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(394, Clink, "Clink", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(448, Repair, "Repair", + GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) +registerGame(GameInfo(451, Cell11, "Cell 11", + GI.GT_FREECELL | GI.GT_OPEN, 3, 0)) +registerGame(GameInfo(464, FourColours, "Four Colours", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + diff --git a/pysollib/games/glenwood.py b/pysollib/games/glenwood.py new file mode 100644 index 00000000..fd54bf72 --- /dev/null +++ b/pysollib/games/glenwood.py @@ -0,0 +1,186 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +from canfield import Canfield_Hint + +# /*********************************************************************** +# // Glenwood +# ************************************************************************/ + +class Glenwood_Talon(WasteTalonStack): + def canDealCards(self): + if self.game.base_rank is None: + return False + return WasteTalonStack.canDealCards(self) + +class Glenwood_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if self.game.base_rank is None: + return 1 + if not self.cards: + return cards[-1].rank == self.game.base_rank + # check the rank + return (self.cards[-1].rank + self.cap.dir) % self.cap.mod == cards[0].rank + +class Glenwood_RowStack(AC_RowStack): + def canMoveCards(self, cards): + if self.game.base_rank is None: + return False + if not AC_RowStack.canMoveCards(self, cards): + return False + if len(cards) == 1 or len(self.cards) == len(cards): + return True + return False + + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return 0 + if not self.cards and from_stack is self.game.s.waste: + for stack in self.game.s.reserves: + if stack.cards: + return False + return True + if from_stack in self.game.s.rows and len(cards) != len(from_stack.cards): + return False + return True + + +class Glenwood_ReserveStack(OpenStack): + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + OpenStack.moveMove(self, ncards, to_stack, frames, shadow) + if self.game.base_rank is None and to_stack in self.game.s.foundations: + old_state = self.game.enterState(self.game.S_FILL) + self.game.saveStateMove(2|16) # for undo + self.game.base_rank = to_stack.cards[-1].rank + self.game.saveStateMove(1|16) # for redo + self.game.leaveState(old_state) + + +class Glenwood(Game): + + Foundation_Class = Glenwood_Foundation + RowStack_Class = Glenwood_RowStack + ReserveStack_Class = Glenwood_ReserveStack #OpenStack + Hint_Class = Canfield_Hint + + base_rank = None + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 8*l.XS + l.XM, 3*l.YM + 5*l.YS) + + # create stacks + x, y = l.XM, l.YM + s.talon = Glenwood_Talon(x, y, self, max_rounds=2, num_deal=1) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + for i in range(4): + x = 2*l.XM + (i+2)*l.XS + s.foundations.append(self.Foundation_Class(x, y, self, i, dir=1, + mod=13, base_rank=ANY_RANK, max_move=0)) + + tx, ty, ta, tf = l.getTextAttr(None, "se") + tx, ty = x + tx + l.XM, y + ty + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) + + for i in range(4): + x = 2*l.XM + (i+2)*l.XS + y = 3*l.YM + l.YS + s.rows.append(self.RowStack_Class(x, y, self, mod=13)) + for i in range(4): + x = l.XM + y = 3*l.YM + (i+1)*l.YS + stack = self.ReserveStack_Class(x, y, self) + s.reserves.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.base_rank = None + for i in range(3): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + # + # game extras + # + + def updateText(self): + if self.preview > 1: + return + if self.base_rank is None: + t = "" + else: + t = RANKS[self.base_rank] + self.texts.info.config(text=t) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color + and ((card1.rank + 1) % 13 == card2.rank + or (card2.rank + 1) % 13 == card1.rank)) + + def _restoreGameHook(self, game): + self.base_rank = game.loadinfo.base_rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_rank=p.load()) + + def _saveGameHook(self, p): + p.dump(self.base_rank) + + def setState(self, state): + # restore saved vars (from undo/redo) + self.base_rank = state[0] + + def getState(self): + # save vars (for undo/redo) + return [self.base_rank] + + +# register the game +registerGame(GameInfo(282, Glenwood, "Glenwood", + GI.GT_CANFIELD, 1, 1)) + diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py new file mode 100644 index 00000000..648dd1c7 --- /dev/null +++ b/pysollib/games/golf.py @@ -0,0 +1,634 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys, types + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Golf_Hint(AbstractHint): + # FIXME: this is very simple + + def computeHints(self): + game = self.game + # for each stack + for r in game.sg.dropstacks: + # try if we can drop a card to the Waste + w, ncards = r.canDropCards(game.s.foundations) + if not w: + continue + # this assertion must hold for Golf + assert ncards == 1 + # clone the Waste (including the card that will be dropped) to + # form our new foundations + ww = (self.ClonedStack(w, stackcards=w.cards+[r.cards[-1]]), ) + # now search for a stack that would benefit from this card + score, color = 10000 + r.id, None + for t in game.sg.dropstacks: + if not t.cards: + continue + if t is r: + t = self.ClonedStack(r, stackcards=r.cards[:-1]) + if t.canFlipCard(): + score = score + 100 + elif t.canDropCards(ww)[0]: + score = score + 100 + # add hint + self.addHint(score, ncards, r, w, color) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Golf_Talon(WasteTalonStack): + def canDealCards(self): + if not WasteTalonStack.canDealCards(self): + return 0 + return not self.game.isGameWon() + + +class Golf_Waste(WasteStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=0, max_accept=1) + apply(WasteStack.__init__, (self, x, y, game), cap) + + def acceptsCards(self, from_stack, cards): + if not WasteStack.acceptsCards(self, from_stack, cards): + return 0 + # check cards + r1, r2 = self.cards[-1].rank, cards[0].rank + if self.game.getStrictness() == 1: + # nothing on a King + if r1 == KING: + return 0 + return (r1 + 1) % self.cap.mod == r2 or (r2 + 1) % self.cap.mod == r1 + + +class Golf_RowStack(BasicRowStack): + def clickHandler(self, event): + return self.doubleclickHandler(event) + def getHelp(self): + return _('Row. No building.') + + +# /*********************************************************************** +# // Golf +# ************************************************************************/ + +class Golf(Game): + Waste_Class = Golf_Waste + Hint_Class = Golf_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w1, w2 = 8*l.XS+l.XM, 2*l.XS + if w2 + 52*l.XOFFSET > w1: + l.XOFFSET = int((w1 - w2) / 52) + self.setSize(w1, 4*l.YS+l.YM) + + # create stacks + x, y = l.XM + l.XS / 2, l.YM + for i in range(7): + s.rows.append(Golf_RowStack(x, y, self)) + x = x + l.XS + x, y = l.XM, self.height - l.YS + s.talon = Golf_Talon(x, y, self, max_rounds=1) + l.createText(s.talon, "nn") + x = x + l.XS + s.waste = self.Waste_Class(x, y, self) + s.waste.CARD_XOFFSET = l.XOFFSET + l.createText(s.waste, "nn") + # the Waste is also our only Foundation in this game + s.foundations.append(s.waste) + + # define stack-groups (non default) + self.sg.openstacks = [s.waste] + self.sg.talonstacks = [s.talon] + self.sg.dropstacks = s.rows + + # + # game overrides + # + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def isGameWon(self): + for r in self.s.rows: + if r.cards: + return 0 + return 1 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank) + + def getHighlightPilesStacks(self): + return () + + def getAutoStacks(self, event=None): + if event is None: + # disable auto drop - this would ruin the whole gameplay + return (self.sg.dropstacks, (), ()) + else: + # rightclickHandler + return (self.sg.dropstacks, self.sg.dropstacks, ()) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class DeadKingGolf(Golf): + def getStrictness(self): + return 1 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + if card1.rank == KING: + return 0 + return Golf.shallHighlightMatch(self, stack1, card1, stack2, card2) + + +class RelaxedGolf(Golf): + Waste_Class = StackWrapper(Golf_Waste, mod=13) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank) + + +# /*********************************************************************** +# // Elevator - Relaxed Golf in a Pyramid layout +# ************************************************************************/ + +class Elevator_RowStack(Golf_RowStack): + STEP = (1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6) + + def basicIsBlocked(self): + r, step = self.game.s.rows, self.STEP + i, n, l = self.id, 1, len(step) + while i < l: + i = i + step[i] + n = n + 1 + for j in range(i, i+n): + if r[j].cards: + return 1 + return 0 + + +class Elevator(RelaxedGolf): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(9*l.XS+l.XM, 4*l.YS+l.YM) + + # create stacks + for i in range(7): + x = l.XM + (8-i) * l.XS / 2 + y = l.YM + i * l.YS / 2 + for j in range(i+1): + s.rows.append(Elevator_RowStack(x, y, self)) + x = x + l.XS + x, y = l.XM, l.YM + s.talon = Golf_Talon(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = self.Waste_Class(x, y, self) + l.createText(s.waste, "ss") + # the Waste is also our only Foundation in this game + s.foundations.append(s.waste) + + # define stack-groups (non default) + self.sg.openstacks = [s.waste] + self.sg.talonstacks = [s.talon] + self.sg.dropstacks = s.rows + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:21], flip=0) + self.s.talon.dealRow(rows=self.s.rows[21:]) + self.s.talon.dealCards() # deal first card to WasteStack + +class Escalator(Elevator): + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + +# /*********************************************************************** +# // Tri Peaks - Relaxed Golf in a Pyramid layout +# ************************************************************************/ + +class TriPeaks_RowStack(Elevator_RowStack): + STEP = (1, 2, 2, 3+12, 3+12, 3+12, + 1, 2, 2, 3+ 9, 3+ 9, 3+ 9, + 1, 2, 2, 3+ 6, 3+ 6, 3+ 6) + + +class TriPeaks(RelaxedGolf): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + l.XOFFSET = int(l.XS * 9 / self.gameinfo.ncards) + self.setSize(10*l.XS+l.XM, 4*l.YS+l.YM) + + # extra settings + self.talon_card_ids = {} + + # create stacks + for i in range(3): + for d in ((2, 0), (1, 1), (3, 1), (0, 2), (2, 2), (4, 2)): + x = l.XM + (6*i+1+d[0]) * l.XS / 2 + y = l.YM + d[1] * l.YS / 2 + s.rows.append(TriPeaks_RowStack(x, y, self)) + x, y = l.XM, 3*l.YS/2 + for i in range(10): + s.rows.append(Golf_RowStack(x, y, self)) + x = x + l.XS + x, y = l.XM, self.height - l.YS + s.talon = Golf_Talon(x, y, self, max_rounds=1) + l.createText(s.talon, "nn") + x = x + l.XS + s.waste = self.Waste_Class(x, y, self) + s.waste.CARD_XOFFSET = l.XOFFSET + l.createText(s.waste, "nn") + # the Waste is also our only Foundation in this game + s.foundations.append(s.waste) + + self.texts.score = MfxCanvasText(self.canvas, + self.width - 8, self.height - 8, + anchor="se", + font=self.app.getFont("canvas_large")) + + # define stack-groups (non default) + self.sg.openstacks = [s.waste] + self.sg.talonstacks = [s.talon] + self.sg.dropstacks = s.rows + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:18], flip=0) + self.s.talon.dealRow(rows=self.s.rows[18:]) + # extra settings: remember cards from the talon + self.talon_card_ids = {} + for c in self.s.talon.cards: + self.talon_card_ids[c.id] = 1 + self.s.talon.dealCards() # deal first card to WasteStack + + def getGameScore(self): + v = -24 * 5 + if not self.s.waste.cards: + return v + # compute streaks for cards on the waste + streak = 0 + for c in self.s.waste.cards: + if self.talon_card_ids.get(c.id): + streak = 0 + else: + streak = streak + 1 + v = v + streak + # each cleared peak gains $15 bonus, and all 3 gain extra $30 + extra = 30 + for i in (0, 6, 12): + if not self.s.rows[i].cards: + v = v + 15 + else: + extra = 0 + return v + extra + + getGameBalance = getGameScore + + def updateText(self): + if self.preview > 1: + return + b1, b2 = self.app.stats.gameid_balance, 0 + if self.shallUpdateBalance(): + b2 = self.getGameBalance() + t = _("Balance $%4d") % (b1 + b2) + self.texts.score.config(text=t) + + def _restoreGameHook(self, game): + self.talon_card_ids = game.loadinfo.talon_card_ids + + def _loadGameHook(self, p): + self.loadinfo.addattr(talon_card_ids=p.load(types.DictType)) + + def _saveGameHook(self, p): + p.dump(self.talon_card_ids) + + +# /*********************************************************************** +# // Black Hole +# ************************************************************************/ + +class BlackHole_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # check the rank + if self.cards: + r1, r2 = self.cards[-1].rank, cards[0].rank + return (r1 + 1) % self.cap.mod == r2 or (r2 + 1) % self.cap.mod == r1 + return 1 + + +class BlackHole_RowStack(ReserveStack): + def clickHandler(self, event): + return self.doubleclickHandler(event) + def getHelp(self): + return _('Row. No building.') + + +class BlackHole(Game): + RowStack_Class = StackWrapper(BlackHole_RowStack, max_accept=0, max_cards=3) + Hint_Class = Golf_Hint + + # + # game layout + # + + def createGame(self, playcards=5): + # create layout + l, s = Layout(self), self.s + + # set window + w = max(2*l.XS, l.XS+(playcards-1)*l.XOFFSET) + self.setSize(l.XM + 5*w, l.YM + 4*l.YS) + + # create stacks + y = l.YM + for i in range(5): + x = l.XM + i*w + s.rows.append(self.RowStack_Class(x, y, self)) + for i in range(2): + y = y + l.YS + for j in (0, 1, 3, 4): + x = l.XM + j*w + s.rows.append(self.RowStack_Class(x, y, self)) + y = y + l.YS + for i in range(4): + x = l.XM + i*w + s.rows.append(self.RowStack_Class(x, y, self)) + for r in s.rows: + r.CARD_XOFFSET = l.XOFFSET + r.CARD_YOFFSET = 0 + x, y = l.XM + 2*w, l.YM + 3*l.YS/2 + s.foundations.append(BlackHole_Foundation(x, y, self, ANY_SUIT, dir=0, mod=13, max_move=0, max_cards=52)) + l.createText(s.foundations[0], "ss") + x, y = l.XM + 4*w, self.height - l.YS + s.talon = InitialDealTalonStack(x, y, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move Ace to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.id == 13, c.suit), 1) + + def startGame(self): + for i in range(2): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations) + + def getAutoStacks(self, event=None): + if event is None: + # disable auto drop - this would ruin the whole gameplay + return ((), (), self.sg.dropstacks) + else: + # rightclickHandler + return ((), self.sg.dropstacks, self.sg.dropstacks) + + + +# /*********************************************************************** +# // Four Leaf Clovers +# ************************************************************************/ + +class FourLeafClovers_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # check the rank + if self.cards: + r1, r2 = self.cards[-1].rank, cards[0].rank + return (r1 + 1) % self.cap.mod == r2 + return 1 + def getHelp(self): + return _('Foundation. Build up regardless of suit.') + +class FourLeafClovers(Game): + + Hint_Class = CautiousDefaultHint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + h = l.YS + 6*l.YOFFSET + self.setSize(l.XM + 7*l.XS, l.YM + 2*h) + + # create stacks + y = l.YM + for i in range(7): + x = l.XM + i*l.XS + s.rows.append(UD_RK_RowStack(x, y, self, mod=13, base_rank=NO_RANK)) + y = l.YM+h + for i in range(6): + x = l.XM + i*l.XS + s.rows.append(UD_RK_RowStack(x, y, self, mod=13, base_rank=NO_RANK)) + + s.foundations.append(FourLeafClovers_Foundation(l.XM+6*l.XS, self.height-l.YS, self, ANY_SUIT, dir=0, mod=13, max_move=0, max_cards=52)) + x, y = l.XM + 7*l.XS, self.height - l.YS + s.talon = InitialDealTalonStack(x, y, self) + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // All in a Row +# ************************************************************************/ + + + +class AllInARow(BlackHole): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + h = l.YM+l.YS+4*l.YOFFSET + self.setSize(l.XM+7*l.XS, 3*l.YM+2*h+l.YS) + + # create stacks + x, y = l.XM, l.YM + for i in range(7): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + x, y = l.XM, l.YM+h + for i in range(6): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + for r in s.rows: + r.CARD_XOFFSET, r.CARD_YOFFSET = 0, l.YOFFSET + + x, y = l.XM, self.height-l.YS + stack = BlackHole_Foundation(x, y, self, ANY_SUIT, dir=0, mod=13, max_move=0, max_cards=52, base_rank=ANY_RANK) + s.foundations.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = (self.width-l.XS)/51, 0 + l.createText(stack, 'n') + x = self.width-l.XS + s.talon = InitialDealTalonStack(x, y, self) + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Robert +# ************************************************************************/ + +class Robert(Game): + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+4*l.XS, l.YM+2*l.YS) + x, y = l.XM+3*l.XS/2, l.YM + s.foundations.append(BlackHole_Foundation(x, y, self, ANY_SUIT, dir=0, mod=13, max_move=0, max_cards=52)) + x, y = l.XM+l.XS, l.YM+l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, 'sw') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'se') + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealCards() + + +# register the game +registerGame(GameInfo(36, Golf, "Golf", + GI.GT_GOLF, 1, 0)) +registerGame(GameInfo(259, DeadKingGolf, "Dead King Golf", + GI.GT_GOLF, 1, 0)) +registerGame(GameInfo(260, RelaxedGolf, "Relaxed Golf", + GI.GT_GOLF | GI.GT_RELAXED, 1, 0)) +registerGame(GameInfo(40, Elevator, "Elevator", + GI.GT_GOLF, 1, 0, + altnames=("Egyptian Solitaire", "Pyramid Golf") )) +registerGame(GameInfo(237, TriPeaks, "Tri Peaks", + GI.GT_GOLF | GI.GT_SCORE, 1, 0)) +registerGame(GameInfo(98, BlackHole, "Black Hole", + GI.GT_GOLF | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(267, FourLeafClovers, "Four Leaf Clovers", + GI.GT_GOLF | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(281, Escalator, "Escalator", + GI.GT_GOLF, 1, 0)) +registerGame(GameInfo(405, AllInARow, "All in a Row", + GI.GT_GOLF | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(432, Robert, "Robert", + GI.GT_GOLF, 1, 2)) diff --git a/pysollib/games/grandfathersclock.py b/pysollib/games/grandfathersclock.py new file mode 100644 index 00000000..d2993ada --- /dev/null +++ b/pysollib/games/grandfathersclock.py @@ -0,0 +1,142 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class GrandfathersClock_Hint(CautiousDefaultHint): + # FIXME: demo is not too clever in this game + + def _getDropCardScore(self, score, color, r, t, ncards): + # drop all cards immediately + return 92000, color + + +# /*********************************************************************** +# // Grandfather's Clock +# ************************************************************************/ + +class GrandfathersClock(Game): + Hint_Class = GrandfathersClock_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 9 cards are fully playable in default window size) + dh = max(3*l.YS/2+l.CH, l.YS+(9-1)*l.YOFFSET) + self.setSize(10*l.XS+l.XM, l.YM+2*dh) + + # create stacks + for i in range(2): + x, y = l.XM, l.YM + i*dh + for j in range(4): + s.rows.append(RK_RowStack(x, y, self, max_move=1, max_accept=1)) + x = x + l.XS + y = l.YM + dh - l.CH / 2 + self.setRegion(s.rows[:4], (-999, -999, x - l.XM / 2, y)) + self.setRegion(s.rows[4:], (-999, y, x - l.XM / 2, 999999)) + d = [ (0,0), (1,0.15), (2,0.5), (2.5,1.5), (2,2.5), (1,2.85) ] + for i in range(len(d)): + d.append( (0 - d[i][0], 3 - d[i][1]) ) + x0, y0 = l.XM, l.YM + dh - l.CH + for i in range(12): + j = (i + 5) % 12 + x = int(round(x0 + ( 6.5+d[j][0]) * l.XS)) + y = int(round(y0 + (-1.5+d[j][1]) * l.YS)) + suit = (1, 2, 0, 3) [i % 4] + s.foundations.append(SS_FoundationStack(x, y, self, suit, + base_rank=i+1, mod=13, + max_move=0)) + s.talon = InitialDealTalonStack(self.width-l.XS, self.height-l.YS, self) + + # define stack-groups + self.sg.openstacks = s.foundations + s.rows + self.sg.talonstacks = [s.talon] + self.sg.dropstacks = s.rows + + # + # game overrides + # + def _shuffleHook(self, cards): + # move clock cards to bottom of the Talon (i.e. last cards to be dealt) + C, S, H, D = 0*13, 1*13, 2*13, 3*13 + ids = (1+S, 2+H, 3+C, 4+D, 5+S, 6+H, 7+C, 8+D, 9+S, 10+H, 11+C, 12+D) + clocks = [] + for c in cards[:]: + if c.id in ids: + clocks.append(c) + cards.remove(c) + # sort clocks reverse by rank + clocks.sort(lambda a, b: cmp(b.rank, a.rank)) + return clocks + cards + + def startGame(self): + self.playSample("grandfathersclock", loop=1) + for i in range(4): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank + + def getHighlightPilesStacks(self): + return () + + def getAutoStacks(self, event=None): + # disable auto drop - this would ruin the whole gameplay + return ((), (), ()) + + +# register the game +registerGame(GameInfo(261, GrandfathersClock, "Grandfather's Clock", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py new file mode 100644 index 00000000..cf6ff610 --- /dev/null +++ b/pysollib/games/gypsy.py @@ -0,0 +1,510 @@ +## -*- coding: utf-8 -*- +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.hint import KlondikeType_Hint, YukonType_Hint + +# /*********************************************************************** +# // Gypsy +# ************************************************************************/ + +class Gypsy(Game): + Layout_Method = Layout.gypsyLayout + Talon_Class = DealRowTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + Hint_Class = KlondikeType_Hint + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=8, waste=0, texts=1) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + if l.s.waste: + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + # default + l.defaultAll() + + def startGame(self): + for i in range(2): + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Giant +# ************************************************************************/ + +class Giant_Foundation(SS_FoundationStack): + def canMoveCards(self, cards): + if not SS_FoundationStack.canMoveCards(self, cards): + return 0 + # can only move cards if the Talon is empty + return len(self.game.s.talon.cards) == 0 + + +class Giant(Gypsy): + Foundation_Class = Giant_Foundation + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Irmgard +# ************************************************************************/ + +class Irmgard_Talon(TalonStack): + # A single click deals 9 (or 7) new cards to the RowStacks. + def dealCards(self, sound=0): + if self.cards: + if len(self.cards) > 7: + c = self.dealRow(sound=sound) + else: + c = self.dealRow(self.game.s.rows[1:8], sound=sound) + return c + return 0 + + +class Irmgard(Gypsy): + GAME_VERSION = 2 + + Layout_Method = Layout.harpLayout + Talon_Class = Irmgard_Talon + RowStack_Class = KingAC_RowStack + + def createGame(self): + Gypsy.createGame(self, rows=9, playcards=19) + + def startGame(self): + r = self.s.rows + for i in range(1, 5): + self.s.talon.dealRow(rows=r[i:len(r)-i], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Die Königsbergerin +# ************************************************************************/ + +class DieKoenigsbergerin_Talon(DealRowTalonStack): + # all Aces go to Foundations + dealToStacks = DealRowTalonStack.dealToStacksOrFoundations + + +class DieKoenigsbergerin(Gypsy): + Talon_Class = DieKoenigsbergerin_Talon + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + + def startGame(self): + self.startDealSample() + for i in range(3): + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Die Russische +# ************************************************************************/ + +class DieRussische_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if self.cards: + # check the rank - an ACE equals a Six + rank = self.cards[-1].rank + if rank == ACE: + rank = 5 + if (rank + self.cap.dir) % self.cap.mod != cards[0].rank: + return 0 + return 1 + + +class DieRussische_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return 0 + # when empty, only accept a single card + return self.cards or len(cards) == 1 + + +class DieRussische(Gypsy): + Talon_Class = InitialDealTalonStack + Foundation_Class = StackWrapper(DieRussische_Foundation, min_cards=1) + RowStack_Class = DieRussische_RowStack + + def createGame(self): + Gypsy.createGame(self, rows=7, texts=0) + + def _shuffleHook(self, cards): + # move one Ace to bottom of the Talon (i.e. last card to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 0, c.suit), 1) + + def startGame(self): + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + for i in range(3): + self.s.talon.dealRow() + c = self.s.talon.cards[-1] + self.s.talon.dealRow(rows=(self.s.foundations[c.suit*2],)) + + +# /*********************************************************************** +# // Miss Milligan +# ************************************************************************/ + +class MissMilligan_ReserveStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return 0 + # Note that this reserve stack accepts sequences if both + # the reserve stack and the Talon are empty. + return len(self.cards) == 0 and len(self.game.s.talon.cards) == 0 + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class MissMilligan(Gypsy): + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + RowStack_Class = KingAC_RowStack + ReserveStack_Class = MissMilligan_ReserveStack + + def createGame(self, rows=8, reserves=1): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + (1+max(8,rows))*l.XS, l.YM + (1+max(4, reserves))*l.YS) + + # create stacks + x, y = l.XM, l.YM + s.talon = self.Talon_Class(x, y, self) + for i in range(8): + x = x + l.XS + s.foundations.append(self.Foundation_Class(x, y, self, suit=i/2)) + x, y = l.XM, y + l.YS + rx, ry = x + l.XS - l.XM/2, y - l.YM/2 + for i in range(reserves): + s.reserves.append(self.ReserveStack_Class(x, y, self)) + y = y + l.YS + if s.reserves: + self.setRegion(s.reserves, (-999, ry, rx - 1, 999999)) + else: + l.createText(s.talon, "ss") + rx = -999 + x, y = l.XM + (8-rows)*l.XS/2, l.YM + l.YS + for i in range(rows): + x = x + l.XS + s.rows.append(self.RowStack_Class(x, y, self)) + self.setRegion(s.rows, (rx, ry, 999999, 999999)) + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Nomad +# ************************************************************************/ + +class Nomad(MissMilligan): + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + ReserveStack_Class = ReserveStack + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Milligan Cell +# ************************************************************************/ + +class MilliganCell(MissMilligan): + ReserveStack_Class = ReserveStack + + def createGame(self): + MissMilligan.createGame(self, reserves=4) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Milligan Harp +# // Carlton +# ************************************************************************/ + +class MilliganHarp(Gypsy): + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + + def startGame(self, flip=0): + for i in range(len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=flip, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +class Carlton(MilliganHarp): + def startGame(self): + MilliganHarp.startGame(self, flip=1) + + +# /*********************************************************************** +# // Lexington Harp +# // Brunswick +# // Mississippi +# // Griffon +# ************************************************************************/ + +class LexingtonHarp(MilliganHarp): + GAME_VERSION = 2 + RowStack_Class = Yukon_AC_RowStack + Hint_Class = YukonType_Hint + + +class Brunswick(LexingtonHarp): + def startGame(self): + LexingtonHarp.startGame(self, flip=1) + + +class Mississippi(LexingtonHarp): + def createGame(self): + LexingtonHarp.createGame(self, rows=7) + + +class Griffon(Mississippi): + def startGame(self): + Mississippi.startGame(self, flip=1) + + +# /*********************************************************************** +# // Blockade +# ************************************************************************/ + +class Blockade(Gypsy): + Layout_Method = Layout.klondikeLayout + RowStack_Class = SS_RowStack + + def createGame(self): + Gypsy.createGame(self, rows=12) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards and self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) + + +# /*********************************************************************** +# // Cone +# ************************************************************************/ + +class Cone_Talon(DealRowTalonStack): + def canDealCards(self): + if not DealRowTalonStack.canDealCards(self): + return False + for r in self.game.s.rows: + if not r.cards: + return False + return True + + def dealCards(self, sound=0): + rows = self.game.s.rows + if len(self.cards) == 4: + rows = self.game.s.reserves + self.dealRowAvail(rows=rows, sound=sound) + + +class Cone(Gypsy): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+9*l.XS, 3*l.YM+5*l.YS) + + # create stacks + x, y = l.XM, l.YM + s.talon = Cone_Talon(x, y, self) + l.createText(s.talon, 's') + y += l.YS+2*l.YM + for i in range(4): + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + y += l.YS + x, y = l.XM+l.XS, l.YM + for i in range(7): + s.rows.append(AC_RowStack(x, y, self, mod=13)) + x += l.XS + #y += l.YS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + mod=13, max_cards=26)) + y += l.YS + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + for i in (1, 2, 3): + self.s.talon.dealRow(rows=self.s.rows[i:-i]) + + +# /*********************************************************************** +# // Surprise +# ************************************************************************/ + +class Surprise_ReserveStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return False + return len(self.game.s.talon.cards) == 0 + +class Surprise(Gypsy): + + def createGame(self, rows=8, reserves=1): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+11*l.XS, l.YM+2*l.YS+12*l.YOFFSET+20) + + # create stacks + x, y = l.XM, l.YM + s.talon = self.Talon_Class(x, y, self) + l.createText(s.talon, 's') + x += l.XS + stack = Surprise_ReserveStack(x, y, self, max_cards=3) + xoffset = min(l.XOFFSET, l.XS/3) + stack.CARD_XOFFSET = xoffset + s.reserves.append(stack) + x += 2*l.XS + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i/2)) + x += l.XS + x, y = l.XM, l.YM+l.YS+20 + for i in range(11): + s.rows.append(KingAC_RowStack(x, y, self)) + x += l.XS + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + for i in range(1, 6): + self.s.talon.dealRow(rows=self.s.rows[i:-i], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# register the game +registerGame(GameInfo(1, Gypsy, "Gypsy", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(65, Giant, "Giant", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(3, Irmgard, "Irmgard", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(119, DieKoenigsbergerin, "Die Königsbergerin", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(174, DieRussische, "Russian Patience", + GI.GT_2DECK_TYPE | GI.GT_OPEN, 2, 0, + ranks=(0, 6, 7, 8, 9, 10, 11, 12), + altnames=("Die Russische",) )) +registerGame(GameInfo(62, MissMilligan, "Miss Milligan", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(200, Nomad, "Nomad", + GI.GT_GYPSY | GI.GT_CONTRIB | GI.GT_ORIGINAL, 2, 0)) +registerGame(GameInfo(78, MilliganCell, "Milligan Cell", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(217, MilliganHarp, "Milligan Harp", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(218, Carlton, "Carlton", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(68, LexingtonHarp, "Lexington Harp", + GI.GT_YUKON, 2, 0)) +registerGame(GameInfo(154, Brunswick, "Brunswick", + GI.GT_YUKON, 2, 0)) +registerGame(GameInfo(121, Mississippi, "Mississippi", + GI.GT_YUKON | GI.GT_XORIGINAL, 2, 0)) +registerGame(GameInfo(122, Griffon, "Griffon", + GI.GT_YUKON | GI.GT_XORIGINAL, 2, 0)) +registerGame(GameInfo(226, Blockade, "Blockade", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(412, Cone, "Cone", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(463, Surprise, "Surprise", + GI.GT_GYPSY, 2, 0)) + diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py new file mode 100644 index 00000000..c7fd281c --- /dev/null +++ b/pysollib/games/harp.py @@ -0,0 +1,185 @@ +# -*- mode: python; coding: utf-8 -*- +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.hint import KlondikeType_Hint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // Double Klondike (Klondike with 2 decks and 9 rows) +# ************************************************************************/ + +class DoubleKlondike(Game): + Layout_Method = Layout.harpLayout + RowStack_Class = KingAC_RowStack + Hint_Class = KlondikeType_Hint + + def createGame(self, max_rounds=-1, num_deal=1, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=9, waste=1, texts=1, playcards=19) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = WasteTalonStack(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + for r in l.s.foundations: + s.foundations.append(SS_FoundationStack(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + # default + l.defaultAll() + # extra + if max_rounds > 1: + assert s.talon.texts.rounds is None + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") + if layout.get("texts"): + ty = ty - 2*l.YM + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, + font=self.app.getFont("canvas_default")) + return l + + def startGame(self): + for i in range(len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Double Klondike by Threes +# ************************************************************************/ + +class DoubleKlondikeByThrees(DoubleKlondike): + def createGame(self): + DoubleKlondike.createGame(self, num_deal=3) + + +# /*********************************************************************** +# // Gargantua (Double Klondike with one redeal) +# ************************************************************************/ + +class Gargantua(DoubleKlondike): + def createGame(self): + DoubleKlondike.createGame(self, max_rounds=2) + + +# /*********************************************************************** +# // Harp (Double Klondike with 10 non-king rows and no redeal) +# ************************************************************************/ + +class BigHarp(DoubleKlondike): + RowStack_Class = AC_RowStack + + def createGame(self): + DoubleKlondike.createGame(self, max_rounds=1, rows=10) + + # + # game overrides + # + + # no real need to override, but this way the layout + # looks a little bit different + def startGame(self): + for i in range(len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Steps (Harp with 7 rows) +# ************************************************************************/ + +class Steps(DoubleKlondike): + RowStack_Class = AC_RowStack + + def createGame(self): + DoubleKlondike.createGame(self, max_rounds=2, rows=7) + + +# /*********************************************************************** +# // Triple Klondike +# ************************************************************************/ + +class TripleKlondike(DoubleKlondike): + def createGame(self): + DoubleKlondike.createGame(self, rows=13) + + +# /*********************************************************************** +# // Triple Klondike by Threes +# ************************************************************************/ + +class TripleKlondikeByThrees(DoubleKlondike): + def createGame(self): + DoubleKlondike.createGame(self, rows=13, num_deal=3) + + +# register the game +registerGame(GameInfo(21, DoubleKlondike, "Double Klondike", + GI.GT_KLONDIKE, 2, -1)) +registerGame(GameInfo(28, DoubleKlondikeByThrees, "Double Klondike by Threes", + GI.GT_KLONDIKE, 2, -1)) +registerGame(GameInfo(25, Gargantua, "Gargantua", + GI.GT_KLONDIKE, 2, 1)) +registerGame(GameInfo(15, BigHarp, "Big Harp", + GI.GT_KLONDIKE, 2, 0, + altnames=("Die große Harfe",) )) +registerGame(GameInfo(51, Steps, "Steps", + GI.GT_KLONDIKE, 2, 1)) +registerGame(GameInfo(273, TripleKlondike, "Triple Klondike", + GI.GT_KLONDIKE, 3, -1)) +registerGame(GameInfo(274, TripleKlondikeByThrees, "Triple Klondike by Threes", + GI.GT_KLONDIKE, 3, -1)) + diff --git a/pysollib/games/headsandtails.py b/pysollib/games/headsandtails.py new file mode 100644 index 00000000..77d8c703 --- /dev/null +++ b/pysollib/games/headsandtails.py @@ -0,0 +1,142 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // Heads and Tails +# ************************************************************************/ + +class HeadsAndTails_Reserve(TalonStack): + def clickHandler(self, event): + # no deal + return True + + +class HeadsAndTails(Game): + + # + # game layout + # + + def createGame(self): + + # create layout + l, s = Layout(self), self.s + + # set window + h = l.YS + 7*l.YOFFSET + self.setSize(l.XM+10*l.XS, l.YM+l.YS+2*h) + + # create stacks + x, y = self.width - l.XS, self.height - l.YS + s.talon = InitialDealTalonStack(x, y, self) + + x, y = l.XM+l.XS, l.YM + for i in range(8): + s.rows.append(SS_RowStack(x, y, self, + dir=1, max_move=1, max_accept=1)) + x += l.XS + x, y = l.XM+l.XS, l.YM+l.YS+h + for i in range(8): + s.rows.append(SS_RowStack(x, y, self, + dir=-1, max_move=1, max_accept=1)) + x += l.XS + + x, y = l.XM+l.XS, l.YM+h + for i in range(8): + stack = HeadsAndTails_Reserve(x, y, self) + s.reserves.append(stack) + l.createText(stack, "n") + x += l.XS + + x, y = l.XM, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + y += l.YS + x, y = l.XM+9*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, + suit=i, base_rank=KING, dir=-1)) + y += l.YS + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + for i in range(11): + self.s.talon.dealRow(rows=self.s.reserves, frames=0, flip=0) + self.startDealSample() + self.s.talon.dealRow() + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + reserves = self.s.reserves + si = list(self.s.rows).index(stack)%8 + from_stack = None + if reserves[si].cards: + from_stack = reserves[si] + else: + for i in range(1, 8): + n = si+i + if n < 8 and reserves[n].cards: + from_stack = reserves[n] + break + n = si-i + if n >= 0 and reserves[n].cards: + from_stack = reserves[n] + break + if not from_stack: + return + old_state = self.enterState(self.S_FILL) + from_stack.moveMove(1, stack) + #stack.flipMove() + self.leaveState(old_state) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank - card2.rank) == 1 + + +# register the game + +registerGame(GameInfo(307, HeadsAndTails, "Heads and Tails", + GI.GT_2DECK_TYPE, 2, 0)) + + + diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py new file mode 100644 index 00000000..b987ab50 --- /dev/null +++ b/pysollib/games/katzenschwanz.py @@ -0,0 +1,352 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import DefaultHint, FreeCellType_Hint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class DerKatzenschwanz(Game): + RowStack_Class = StackWrapper(AC_RowStack, base_rank=NO_RANK) + Hint_Class = FreeCellType_Hint + + # + # game layout + # + + def createGame(self, rows=9, reserves=8): + # create layout + l, s = Layout(self), self.s + + # set size + maxrows = max(rows, reserves) + self.setSize(l.XM + (maxrows+2)*l.XS, l.YM + 6*l.YS) + + # + playcards = 4*l.YS / l.YOFFSET + xoffset, yoffset = [], [] + for i in range(playcards): + xoffset.append(0) + yoffset.append(l.YOFFSET) + for i in range(104-playcards): + xoffset.append(l.XOFFSET) + yoffset.append(0) + + # create stacks + x, y = l.XM + (maxrows-reserves)*l.XS/2, l.YM + for i in range(reserves): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + x, y = l.XM + (maxrows-rows)*l.XS/2, l.YM + l.YS + self.setRegion(s.reserves, (-999, -999, 999999, y - l.XM / 2)) + for i in range(rows): + stack = self.RowStack_Class(x, y, self) + stack.CARD_XOFFSET = xoffset + stack.CARD_YOFFSET = yoffset + s.rows.append(stack) + x = x + l.XS + x, y = l.XM + maxrows*l.XS, l.YM + for suit in range(4): + for i in range(2): + s.foundations.append(SS_FoundationStack(x+i*l.XS, y, self, suit=suit)) + y = y + l.YS + self.setRegion(self.s.foundations, (x - l.CW / 2, -999, 999999, y), priority=1) + s.talon = InitialDealTalonStack(self.width-3*l.XS/2, self.height-l.YS, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + i = 0 + while self.s.talon.cards: + if self.s.talon.cards[-1].rank == KING: + if self.s.rows[i].cards: + i = i + 1 + self.s.talon.dealRow(rows=[self.s.rows[i]], frames=4) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + # must look at cards + def _getClosestStack(self, cx, cy, stacks, dragstack): + closest, cdist = None, 999999999 + for stack in stacks: + if stack.cards and stack is not dragstack: + dist = (stack.cards[-1].x - cx)**2 + (stack.cards[-1].y - cy)**2 + else: + dist = (stack.x - cx)**2 + (stack.y - cy)**2 + if dist < cdist: + closest, cdist = stack, dist + return closest + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class DieSchlange(DerKatzenschwanz): + + RowStack_Class = StackWrapper(FreeCell_AC_RowStack, base_rank=NO_RANK) + + def createGame(self): + DerKatzenschwanz.createGame(self, rows=9, reserves=7) + + def startGame(self): + self.startDealSample() + i = 0 + while self.s.talon.cards: + c = self.s.talon.cards[-1] + if c.rank == ACE: + to_stack = self.s.foundations[c.suit*2] + if to_stack.cards: + to_stack = self.s.foundations[c.suit*2+1] + else: + if c.rank == KING and self.s.rows[i].cards: + i = i + 1 + to_stack = self.s.rows[i] + self.s.talon.dealRow(rows=(to_stack,), frames=4) + + +# /*********************************************************************** +# // Kings +# ************************************************************************/ + +class Kings(DerKatzenschwanz): + + ##RowStack_Class = StackWrapper(AC_RowStack, base_rank=NO_RANK) + RowStack_Class = StackWrapper(FreeCell_AC_RowStack, base_rank=NO_RANK) + + def createGame(self): + return DerKatzenschwanz.createGame(self, rows=8, reserves=8) + + def _shuffleHook(self, cards): + for c in cards[:]: + if c.rank == 12: + cards.remove(c) + break + cards.append(c) + return cards + + +# /*********************************************************************** +# // Retinue +# ************************************************************************/ + +class Retinue(DieSchlange, Kings): + + ##RowStack_Class = StackWrapper(AC_RowStack, base_rank=NO_RANK) + RowStack_Class = StackWrapper(FreeCell_AC_RowStack, base_rank=NO_RANK) + + def createGame(self): + return DerKatzenschwanz.createGame(self, rows=8, reserves=8) + def _shuffleHook(self, cards): + return Kings._shuffleHook(self, cards) + def startGame(self): + return DieSchlange.startGame(self) + + +# /*********************************************************************** +# // Salic Law +# ************************************************************************/ + +class SalicLaw_Hint(DefaultHint): + + # Score for dropping ncards from stack r to stack t. + def _getDropCardScore(self, score, color, r, t, ncards): + return score+len(r.cards), color + + +class SalicLaw_Talon(OpenTalonStack): + + def canDealCards(self): + return True + + def canFlipCard(self): + return False + + def dealCards(self, sound=0): + if len(self.cards) == 0: + return 0 + old_state = self.game.enterState(self.game.S_DEAL) + rows = self.game.s.rows + c = self.cards[-1] + ri = len([r for r in rows if r.cards]) + if c.rank == KING: + to_stack = rows[ri] + else: + to_stack = rows[ri-1] + ##frames = (3, 4)[ri > 4] + frames = 3 + if not self.game.demo: + self.game.startDealSample() + self.game.moveMove(1, self, to_stack, frames=frames) + self.game.flipMove(to_stack) + if not self.game.demo: + self.game.stopSamples() + self.game.leaveState(old_state) + return 1 + + +class SalicLaw(DerKatzenschwanz): + + Hint_Class = SalicLaw_Hint + + # + # game layout + # + + def createGame(self): #, rows=9, reserves=8): + # create layout + l, s = Layout(self), self.s + + # set size + self.setSize(l.XM + 10*l.XS, l.YM + 7*l.YS) + + # + playcards = 4*l.YS / l.YOFFSET + xoffset, yoffset = [], [] + for i in range(playcards): + xoffset.append(0) + yoffset.append(l.YOFFSET) + for i in range(104-playcards): + xoffset.append(l.XOFFSET) + yoffset.append(0) + + # create stacks + x, y = l.XM, l.YM + for i in range(8): + s.foundations.append(AbstractFoundationStack(x, y, self, + suit=ANY_SUIT, max_cards=1, max_move=0, base_rank=QUEEN)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(8): + s.foundations.append(RK_FoundationStack(x, y, self, + suit=ANY_SUIT, base_rank=ACE, max_cards=11)) + x += l.XS + + x, y = l.XM, l.YM+2*l.YS + self.setRegion(s.foundations[8:], (-999, -999, 999999, y - l.XM / 2)) + for i in range(8): + stack = OpenStack(x, y, self, max_move=1) + stack.CARD_XOFFSET = xoffset + stack.CARD_YOFFSET = yoffset + s.rows.append(stack) + x += l.XS + s.talon = SalicLaw_Talon(l.XM+9*l.XS, l.YM, self) + l.createText(s.talon, "ss") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + for c in cards[:]: + if c.rank == KING: + cards.remove(c) + break + cards.append(c) + return cards + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(self.s.rows[:1]) # deal King + + def isGameWon(self): + for s in self.s.foundations[8:]: + if len(s.cards) != 11: + return False + return True + + def getAutoStacks(self, event=None): + if event is None: + # disable auto drop + return (self.sg.dropstacks, (), self.sg.dropstacks) + else: + # rightclickHandler + return (self.sg.dropstacks, self.sg.dropstacks, self.sg.dropstacks) + + +# /*********************************************************************** +# // Deep +# ************************************************************************/ + +class Deep(DerKatzenschwanz): + RowStack_Class = StackWrapper(AC_RowStack, base_rank=ANY_RANK) + + def createGame(self): + return DerKatzenschwanz.createGame(self, rows=8, reserves=8) + + def startGame(self): + for i in range(12): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + + +# register the game +registerGame(GameInfo(141, DerKatzenschwanz, "Cat's Tail", + GI.GT_FREECELL | GI.GT_OPEN, 2, 0, + altnames=("Der Katzenschwanz",) )) +registerGame(GameInfo(142, DieSchlange, "Snake", + GI.GT_FREECELL | GI.GT_OPEN, 2, 0, + altnames=("Die Schlange",) )) +registerGame(GameInfo(279, Kings, "Kings", + GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) +registerGame(GameInfo(286, Retinue, "Retinue", + GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) +registerGame(GameInfo(299, SalicLaw, "Salic Law", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(442, Deep, "Deep", + GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) + + diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py new file mode 100644 index 00000000..f24009e5 --- /dev/null +++ b/pysollib/games/klondike.py @@ -0,0 +1,1040 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault, Struct +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.hint import KlondikeType_Hint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // Klondike +# ************************************************************************/ + +class Klondike(Game): + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = KingAC_RowStack + Hint_Class = KlondikeType_Hint + + def createGame(self, max_rounds=-1, num_deal=1, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=7, waste=1, texts=1, playcards=16) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + if l.s.waste: + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + # default + l.defaultAll() + return l + + def startGame(self, flip=0, reverse=1): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=flip, frames=0, reverse=reverse) + self.startDealSample() + self.s.talon.dealRow(reverse=reverse) + if self.s.waste: + self.s.talon.dealCards() # deal first card to WasteStack + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Vegas Klondike +# ************************************************************************/ + +class VegasKlondike(Klondike): + getGameScore = Game.getGameScoreCasino + getGameBalance = Game.getGameScoreCasino + + def createGame(self, max_rounds=1): + Klondike.createGame(self, max_rounds=max_rounds) + self.texts.score = MfxCanvasText(self.canvas, + 8, self.height - 8, anchor="sw", + font=self.app.getFont("canvas_large")) + + def updateText(self): + if self.preview > 1: + return + b1, b2 = self.app.stats.gameid_balance, 0 + if self.shallUpdateBalance(): + b2 = self.getGameBalance() + if 0 and self.app.debug: + t = "Balance %d/%d" % (b1, b2) + else: + t = _("Balance $%d") % (b1 + b2) + self.texts.score.config(text=t) + + def getDemoInfoTextAttr(self, tinfo): + return tinfo[1] # "se" corner + + +# /*********************************************************************** +# // Casino Klondike +# ************************************************************************/ + +class CasinoKlondike(VegasKlondike): + def createGame(self): + VegasKlondike.createGame(self, max_rounds=3) + + +# /*********************************************************************** +# // Klondike by Threes +# ************************************************************************/ + +class KlondikeByThrees(Klondike): + def createGame(self): + Klondike.createGame(self, num_deal=3) + + +# /*********************************************************************** +# // Thumb and Pouch +# ************************************************************************/ + +class ThumbAndPouch_RowStack(SequenceRowStack): + def _isSequence(self, cards): + return isAnySuitButOwnSequence(cards, self.cap.mod, self.cap.dir) + def getHelp(self): + return _('Row. Build down in any suit but the same.') + + +class ThumbAndPouch(Klondike): + RowStack_Class = ThumbAndPouch_RowStack + + def createGame(self): + Klondike.createGame(self, max_rounds=1) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit != card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Whitehead +# ************************************************************************/ + +class Whitehead(Klondike): + RowStack_Class = SC_RowStack + Hint_Class = CautiousDefaultHint + + def createGame(self): + Klondike.createGame(self, max_rounds=1) + + def startGame(self): + Klondike.startGame(self, flip=1) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Small Harp (Klondike in a different layout) +# ************************************************************************/ + +class SmallHarp(Klondike): + Layout_Method = Layout.gypsyLayout + + def startGame(self): + for i in range(len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Eastcliff +# // Easthaven +# ************************************************************************/ + +class Eastcliff(Klondike): + RowStack_Class = AC_RowStack + + def createGame(self): + Klondike.createGame(self, max_rounds=1) + + def startGame(self): + for i in range(2): + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + if self.s.waste: + self.s.talon.dealCards() # deal first card to WasteStack + + +class Easthaven(Eastcliff): + Talon_Class = DealRowTalonStack + def createGame(self): + Klondike.createGame(self, max_rounds=1, waste=0) + +class DoubleEasthaven(Easthaven): + def createGame(self): + Klondike.createGame(self, rows=8, max_rounds=1, waste=0, playcards=20) + +class TripleEasthaven(Easthaven): + def createGame(self): + Klondike.createGame(self, rows=12, max_rounds=1, waste=0, playcards=26) + + +# /*********************************************************************** +# // Westcliff +# // Westhaven +# ************************************************************************/ + +class Westcliff(Eastcliff): + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + + def createGame(self): + Klondike.createGame(self, max_rounds=1, rows=10) + + +class Westhaven(Westcliff): + Talon_Class = DealRowTalonStack + + def createGame(self): + Klondike.createGame(self, max_rounds=1, rows=10, waste=0) + + +# /*********************************************************************** +# // Pas Seul +# ************************************************************************/ + +class PasSeul(Eastcliff): + def createGame(self): + Klondike.createGame(self, max_rounds=1, rows=6) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Blind Alleys +# ************************************************************************/ + +class BlindAlleys(Eastcliff): + def createGame(self): + Klondike.createGame(self, max_rounds=2, rows=6) + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + Eastcliff.startGame(self) + + +# /*********************************************************************** +# // Somerset +# // Morehead +# ************************************************************************/ + +class Somerset(Klondike): + Talon_Class = InitialDealTalonStack + RowStack_Class = StackWrapper(AC_RowStack, max_move=1) + Hint_Class = CautiousDefaultHint + + def createGame(self): + Klondike.createGame(self, max_rounds=1, rows=10, waste=0, texts=0) + + def startGame(self): + for i in range(6): + self.s.talon.dealRow(rows=self.s.rows[i:], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[6:]) + self.s.talon.dealRow(rows=self.s.rows[7:]) + + +class Morehead(Somerset): + RowStack_Class = StackWrapper(ThumbAndPouch_RowStack, max_move=1) + + +# /*********************************************************************** +# // Canister +# ************************************************************************/ + +class Canister(Klondike): + Talon_Class = InitialDealTalonStack + RowStack_Class = RK_RowStack + ###Hint_Class = CautiousDefaultHint + + def createGame(self): + Klondike.createGame(self, max_rounds=1, rows=8, waste=0, texts=0) + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.rows[2:6]) + + +# /*********************************************************************** +# // Agnes Sorel +# ************************************************************************/ + +class AgnesSorel(Klondike): + Talon_Class = DealRowTalonStack + Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, base_rank=NO_RANK, max_move=0) + RowStack_Class = StackWrapper(SC_RowStack, mod=13, base_rank=NO_RANK) + + def createGame(self): + Klondike.createGame(self, max_rounds=1, waste=0) + + def startGame(self): + Klondike.startGame(self, flip=1) + c = self.s.talon.dealSingleBaseCard() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color == card2.color and + ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + + +# /*********************************************************************** +# // 8 x 8 +# // Achtmal Acht +# ************************************************************************/ + +class EightTimesEight(Klondike): + Layout_Method = Layout.gypsyLayout + RowStack_Class = AC_RowStack + + def createGame(self): + Klondike.createGame(self, rows=8) + + def startGame(self): + for i in range(7): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +class AchtmalAcht(EightTimesEight): + def createGame(self): + l = Klondike.createGame(self, rows=8, max_rounds=3) + s = self.s + x, y = s.waste.x - l.XM, s.waste.y + s.talon.texts.rounds = MfxCanvasText(self.canvas, x, y, + anchor="ne", + font=self.app.getFont("canvas_default")) + + +# /*********************************************************************** +# // Batsford +# ************************************************************************/ + +class Batsford_ReserveStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return 0 + # must be a King + return cards[0].rank == KING + def getHelp(self): + return _('Reserve. Only Kings are acceptable.') + +class Batsford(Klondike): + def createGame(self, **layout): + l = Klondike.createGame(self, rows=10, max_rounds=1, playcards=22) + s = self.s + x, y = l.XM, self.height - l.YS + s.reserves.append(Batsford_ReserveStack(x, y, self, max_cards=3)) + self.setRegion(s.reserves, (-999, y - l.YM, x + l.XS, 999999), priority=1) + l.createText(s.reserves[0], "se") + l.defaultStackGroups() + + +# /*********************************************************************** +# // Jumbo +# ************************************************************************/ + +class Jumbo(Klondike): + def createGame(self): + Klondike.createGame(self, rows=9, max_rounds=2) + + def startGame(self, flip=0): + for i in range(9): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=flip, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + +class OpenJumbo(Jumbo): + def startGame(self): + Jumbo.startGame(self, flip=1) + + +# /*********************************************************************** +# // Stonewall +# // Flower Garden +# ************************************************************************/ + +class Stonewall(Klondike): + Talon_Class = InitialDealTalonStack + RowStack_Class = AC_RowStack + + DEAL = (0, 1, 0, 1, -1, 0, 1) + + def createGame(self): + l = Klondike.createGame(self, rows=6, max_rounds=1, texts=0) + s = self.s + h = max(self.height, l.YM+4*l.YS) + self.setSize(self.width + l.XM+4*l.XS, h) + for i in range(4): + for j in range(4): + x, y = self.width + (j-4)*l.XS, l.YM + i*l.YS + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + l.defaultStackGroups() + + def startGame(self): + frames = 0 + for flip in self.DEAL: + if flip < 0: + frames = -1 + self.startDealSample() + else: + self.s.talon.dealRow(flip=flip, frames=frames) + self.s.talon.dealRow(rows=self.s.reserves) + assert len(self.s.talon.cards) == 0 + + +class FlowerGarden(Stonewall): + RowStack_Class = StackWrapper(RK_RowStack, max_move=1) + Hint_Class = CautiousDefaultHint + + DEAL = (1, 1, 1, 1, -1, 1, 1) + + +# /*********************************************************************** +# // King Albert +# // Raglan +# // Brigade +# ************************************************************************/ + +class KingAlbert(Klondike): + Talon_Class = InitialDealTalonStack + RowStack_Class = StackWrapper(AC_RowStack, max_move=1) + Hint_Class = CautiousDefaultHint + + ROWS = 9 + RESERVES = (2, 2, 2, 1) + + def createGame(self): + l = Klondike.createGame(self, max_rounds=1, rows=self.ROWS, waste=0, texts=0) + s = self.s + rw, rh = max(self.RESERVES), len(self.RESERVES) + h = max(self.height, l.YM+rh*l.YS) + self.setSize(self.width + 2*l.XM+rw*l.XS, h) + for i in range(rh): + for j in range(self.RESERVES[i]): + x, y = self.width + (j-rw)*l.XS, l.YM + i*l.YS + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + l.defaultStackGroups() + + def startGame(self): + Klondike.startGame(self, flip=1, reverse=0) + self.s.talon.dealRow(rows=self.s.reserves) + + +class Raglan(KingAlbert): + RESERVES = (2, 2, 2) + + def _shuffleHook(self, cards): + # move Aces to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + for i in range(6): + self.s.talon.dealRow(rows=self.s.rows[i:], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[6:]) + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow(rows=self.s.foundations) + + +class Brigade(Raglan): + RowStack_Class = StackWrapper(RK_RowStack, max_move=1) + + ROWS = 7 + RESERVES = (4, 4, 4, 1) + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow(rows=self.s.foundations) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank) + + +# /*********************************************************************** +# // Jane +# // Agnes Bernauer +# ************************************************************************/ + +class Jane_Talon(OpenTalonStack): + def canFlipCard(self): + return 0 + + def canDealCards(self): + return len(self.cards) >= 2 + + def dealCards(self, sound=0): + c = 0 + if len(self.cards) > 2: + c = self.dealRow(self.game.s.reserves, sound=sound) + if len(self.cards) == 2: + self.game.flipMove(self) + self.game.moveMove(1, self, self.game.s.waste, frames=4, shadow=0) + self.game.flipMove(self) + c = c + 1 + return c + + +class Jane(Klondike): + Talon_Class = Jane_Talon + Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, base_rank=NO_RANK, min_cards=1) + RowStack_Class = StackWrapper(AC_RowStack, mod=13, base_rank=NO_RANK) + + def createGame(self, max_rounds=1, reserves=7, **layout): + kwdefault(layout, texts=0) + l = apply(Klondike.createGame, (self, max_rounds), layout) + s = self.s + h = max(self.height, l.YM+4*l.YS) + self.setSize(self.width + l.XM+2*l.XS, h) + x0, y = self.width - 2*l.XS, l.YM + for i in range(reserves): + x = x0 + ((i+1) & 1) * l.XS + stack = OpenStack(x, y, self, max_accept=0) + stack.CARD_YOFFSET = l.YM / 3 + stack.is_open = 1 + s.reserves.append(stack) + y = y + l.YS / 2 + # not needed, as no cards may be placed on the reserves + ##self.setRegion(s.reserves, (x0-l.XM/2, -999, 999999, 999999), priority=1) + l.defaultStackGroups() + self.sg.dropstacks.append(s.talon) + x, y = l.XM, self.height - l.YM + # ??? + self.texts.info = MfxCanvasText(self.canvas, x, y, anchor="sw", + font=self.app.getFont("canvas_default")) + + def startGame(self, flip=0, reverse=1): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=flip, frames=0, reverse=reverse) + self.startDealSample() + self.s.talon.dealRow(reverse=reverse) + self.s.talon.dealRow(rows=self.s.reserves) + c = self.s.talon.dealSingleBaseCard() + # update base rank of row stacks + cap = Struct(base_rank=(c.rank - 1) % 13) + for s in self.s.rows: + s.cap.update(cap.__dict__) + self.saveinfo.stack_caps.append((s.id, cap)) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + + def _autoDeal(self, sound=1): + return 0 + + +class AgnesBernauer_Talon(DealRowTalonStack): + def dealCards(self, sound=0): + return self.dealRowAvail(self.game.s.reserves, sound=sound) + + +class AgnesBernauer(Jane): + Talon_Class = AgnesBernauer_Talon + Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, base_rank=NO_RANK, max_move=0) + + def createGame(self): + Jane.createGame(self, max_rounds=1, waste=0, texts=1) + + def startGame(self): + Jane.startGame(self, flip=1) + + +# /*********************************************************************** +# // Senate +# ************************************************************************/ + +class Senate(Jane): + + def createGame(self, rows=4): + + playcards = 10 + + l, s = Layout(self), self.s + self.setSize(3*l.XM+(rows+6)*l.XS, l.YM+2*(l.YS+playcards*l.YOFFSET)) + + x, y = l.XM, l.YM + for i in range(rows): + s.rows.append(SS_RowStack(x, y, self)) + x += l.XS + + for y in l.YM, l.YM+l.YS+playcards*l.YOFFSET: + x = 2*l.XM+rows*l.XS + for i in range(4): + stack = OpenStack(x, y, self, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.reserves.append(stack) + x += l.XS + x = 3*l.XM+(rows+4)*l.XS + for i in range(2): + y = l.YM+l.YS + for j in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=j)) + y += l.YS + x += l.XS + x, y = 3*l.XM+(rows+5)*l.XS, l.YM + s.talon = AgnesBernauer_Talon(x, y, self) + l.createText(s.talon, 'sw') + + l.defaultStackGroups() + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow() + + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, (c.deck, c.suit))) + +class SenatePlus(Senate): + def createGame(self): + Senate.createGame(self, rows=5) + +# /*********************************************************************** +# // Phoenix +# // Arizona +# ************************************************************************/ + +class Phoenix(Klondike): + + Hint_Class = CautiousDefaultHint + RowStack_Class = AC_RowStack + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM + 10*l.XS, l.YM + 4*(l.YS+l.YM)) + + for i in range(2): + x = l.XM + i*l.XS + for j in range(4): + y = l.YM + j*(l.YS+l.YM) + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + for i in range(2): + x = l.XM + (8+i)*l.XS + for j in range(4): + y = l.YM + j*(l.YS+l.YM) + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + for i in range(4): + s.foundations.append(SS_FoundationStack(l.XM+(3+i)*l.XS, l.YM, self, i)) + for i in range(6): + s.rows.append(self.RowStack_Class(l.XM+(2+i)*l.XS, l.YM+l.YS, self)) + s.talon = InitialDealTalonStack(l.XM+int(4.5*l.XS), l.YM+3*(l.YS+l.YM), self) + + l.defaultStackGroups() + + def startGame(self): + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + + +class Arizona(Phoenix): + RowStack_Class = RK_RowStack + + +# /*********************************************************************** +# // Alternation +# ************************************************************************/ + +class Alternation(Klondike): + + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + RowStack_Class = StackWrapper(AC_RowStack, base_rank=ANY_RANK) + + def createGame(self): + Klondike.createGame(self, max_rounds=1) + + def startGame(self): + for i in range(6): + self.s.talon.dealRow(rows=self.s.rows, flip=(i+1)%2, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Lanes +# ************************************************************************/ + +class Lanes(Klondike): + + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + RowStack_Class = StackWrapper(AC_RowStack, base_rank=ANY_RANK, max_move=1) + + def createGame(self): + Klondike.createGame(self, rows=6, max_rounds=2) + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, c.suit)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(2): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Thirty Six +# ************************************************************************/ + +class ThirtySix(Klondike): + + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + RowStack_Class = StackWrapper(RK_RowStack, base_rank=ANY_RANK) + + def createGame(self): + Klondike.createGame(self, rows=6, max_rounds=1) + + def _fillOne(self): + for r in self.s.rows: + if r.cards: + c = r.cards[-1] + for f in self.s.foundations: + if f.acceptsCards(r, [c]): + self.moveMove(1, r, f, frames=4, shadow=0) + return 1 + return 0 + + def startGame(self): + self.startDealSample() + for i in range(6): + self.s.talon.dealRow() + while True: + if not self._fillOne(): + break + self.s.talon.dealCards() # deal first card to WasteStack + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Q.C. +# ************************************************************************/ + +class Q_C_(Klondike): + + Hint_Class = CautiousDefaultHint + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + RowStack_Class = StackWrapper(SS_RowStack, base_rank=ANY_RANK, max_move=1) + + def createGame(self): + Klondike.createGame(self, rows=6, max_rounds=2) + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + self.fillAll() + + def fillOne(self, stack): + if stack.cards: + c = stack.cards[-1] + for f in self.s.foundations: + if f.acceptsCards(stack, [c]): + stack.moveMove(1, f) + return 1 + return 0 + + def fillAll(self): + # rows + for r in self.s.rows: + if self.fillOne(r): + self.fillAll() + return + # waste + if self.fillOne(self.s.waste): + self.fillAll() + + def fillStack(self, stack): + if stack in self.s.rows: + if not stack.cards and self.s.waste.cards: + self.s.waste.moveMove(1, stack) + self.fillAll() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Northwest Territory +# ************************************************************************/ + +class NorthwestTerritory(KingAlbert): + RowStack_Class = StackWrapper(AC_RowStack, base_rank=KING) + RESERVES = (4, 4, 4, 4) + ROWS = 8 + + def startGame(self): + Klondike.startGame(self, flip=0, reverse=0) + self.s.talon.dealRow(rows=self.s.reserves) + + +# /*********************************************************************** +# // Aunt Mary +# ************************************************************************/ + +class AuntMary(Klondike): + def createGame(self): + Klondike.createGame(self, rows=6, max_rounds=1) + def startGame(self): + for i in range(5): + j = i+1 + self.s.talon.dealRow(rows=self.s.rows[:j], frames=0, flip=1) + self.s.talon.dealRow(rows=self.s.rows[j:], frames=0, flip=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + +# /*********************************************************************** +# // Double Dot +# ************************************************************************/ + +class DoubleDot(Klondike): + Talon_Class = DealRowTalonStack + RowStack_Class = StackWrapper(RK_RowStack, dir=-2, mod=13) + Foundation_Class = StackWrapper(SS_FoundationStack, dir=2, mod=13) + + def createGame(self): + Klondike.createGame(self, max_rounds=1, rows=8, waste=0) + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: ((c.rank == ACE and c.suit in (0,1)) or + (c.rank == 1 and c.suit in (2,3)), c.suit)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Seven Devils +# ************************************************************************/ + +class SevenDevils_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return False + return not from_stack in self.game.s.reserves + + +class SevenDevils(Klondike): + + Hint_Class = CautiousDefaultHint + RowStack_Class = StackWrapper(SevenDevils_RowStack, max_move=1) + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM + 10*l.XS, l.YM+3*l.YS+12*l.YOFFSET) + + x, y = l.XM, l.YM + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i/2)) + x += l.XS + x, y = l.XM+l.XS/2, l.YM+l.YS + for i in range(7): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + x0, y = self.width - 2*l.XS, l.YM + for i in range(7): + x = x0 + ((i+1) & 1) * l.XS + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + y = y + l.YS / 2 + x, y = l.XM, self.height-l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 'n') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'n') + + l.defaultStackGroups() + + + def startGame(self, flip=0, reverse=1): + Klondike.startGame(self) + self.s.talon.dealRow(rows=self.s.reserves) + + + +# register the game +registerGame(GameInfo(2, Klondike, "Klondike", + GI.GT_KLONDIKE, 1, -1)) +registerGame(GameInfo(61, CasinoKlondike, "Casino Klondike", + GI.GT_KLONDIKE | GI.GT_SCORE, 1, 2)) +registerGame(GameInfo(129, VegasKlondike, "Vegas Klondike", + GI.GT_KLONDIKE | GI.GT_SCORE, 1, 0)) +registerGame(GameInfo(18, KlondikeByThrees, "Klondike by Threes", + GI.GT_KLONDIKE, 1, -1)) +registerGame(GameInfo(58, ThumbAndPouch, "Thumb and Pouch", + GI.GT_KLONDIKE, 1, 0)) +registerGame(GameInfo(67, Whitehead, "Whitehead", + GI.GT_KLONDIKE, 1, 0)) +registerGame(GameInfo(39, SmallHarp, "Small Harp", + GI.GT_KLONDIKE, 1, -1, + altnames=("Die kleine Harfe",) )) +registerGame(GameInfo(66, Eastcliff, "Eastcliff", + GI.GT_KLONDIKE, 1, 0)) +registerGame(GameInfo(224, Easthaven, "Easthaven", + GI.GT_GYPSY, 1, 0)) +registerGame(GameInfo(33, Westcliff, "Westcliff", + GI.GT_KLONDIKE, 1, 0)) +registerGame(GameInfo(225, Westhaven, "Westhaven", + GI.GT_GYPSY, 1, 0)) +registerGame(GameInfo(107, PasSeul, "Pas Seul", + GI.GT_KLONDIKE, 1, 0)) +registerGame(GameInfo(81, BlindAlleys, "Blind Alleys", + GI.GT_KLONDIKE, 1, 1)) +registerGame(GameInfo(215, Somerset, "Somerset", + GI.GT_KLONDIKE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(231, Canister, "Canister", + GI.GT_KLONDIKE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(229, AgnesSorel, "Agnes Sorel", + GI.GT_GYPSY, 1, 0)) +registerGame(GameInfo(4, EightTimesEight, "8 x 8", + GI.GT_KLONDIKE, 2, -1)) +registerGame(GameInfo(127, AchtmalAcht, "Eight Times Eight", + GI.GT_KLONDIKE, 2, 2, + altnames=("Achtmal Acht",) )) +registerGame(GameInfo(133, Batsford, "Batsford", + GI.GT_KLONDIKE, 2, 0)) +registerGame(GameInfo(221, Stonewall, "Stonewall", + GI.GT_RAGLAN, 1, 0)) +registerGame(GameInfo(222, FlowerGarden, "Flower Garden", + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, + altnames=("The Bouquet", "The Garden",) )) +registerGame(GameInfo(233, KingAlbert, "King Albert", + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, + altnames=("Idiot's Delight",) )) +registerGame(GameInfo(232, Raglan, "Raglan", + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(223, Brigade, "Brigade", + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(230, Jane, "Jane", + GI.GT_RAGLAN, 1, 0)) +registerGame(GameInfo(236, AgnesBernauer, "Agnes Bernauer", + GI.GT_RAGLAN, 1, 0)) +registerGame(GameInfo(263, Phoenix, "Phoenix", + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(283, Jumbo, "Jumbo", + GI.GT_KLONDIKE, 2, 1)) +registerGame(GameInfo(333, OpenJumbo, "Open Jumbo", + GI.GT_KLONDIKE, 2, 1)) +registerGame(GameInfo(297, Alternation, "Alternation", + GI.GT_KLONDIKE, 2, 0)) +registerGame(GameInfo(326, Lanes, "Lanes", + GI.GT_KLONDIKE, 1, 1)) +registerGame(GameInfo(327, ThirtySix, "Thirty Six", + GI.GT_KLONDIKE, 1, 0)) +registerGame(GameInfo(350, Q_C_, "Q.C.", + GI.GT_KLONDIKE, 2, 1)) +registerGame(GameInfo(361, NorthwestTerritory, "Northwest Territory", + GI.GT_RAGLAN, 1, 0)) +registerGame(GameInfo(362, Morehead, "Morehead", + GI.GT_KLONDIKE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(388, Senate, "Senate", + GI.GT_RAGLAN, 2, 0)) +registerGame(GameInfo(389, SenatePlus, "Senate +", + GI.GT_RAGLAN, 2, 0)) +registerGame(GameInfo(390, Arizona, "Arizona", + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(407, AuntMary, "Aunt Mary", + GI.GT_KLONDIKE, 1, 0)) +registerGame(GameInfo(420, DoubleDot, "Double Dot", + GI.GT_KLONDIKE, 1, 0)) +registerGame(GameInfo(434, SevenDevils, "Seven Devils", + GI.GT_RAGLAN, 2, 0)) +registerGame(GameInfo(452, DoubleEasthaven, "Double Easthaven", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(453, TripleEasthaven, "Triple Easthaven", + GI.GT_GYPSY, 3, 0)) + diff --git a/pysollib/games/labyrinth.py b/pysollib/games/labyrinth.py new file mode 100644 index 00000000..5fab2fc2 --- /dev/null +++ b/pysollib/games/labyrinth.py @@ -0,0 +1,140 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // Labyrinth +# ************************************************************************/ + +class Labyrinth_Talon(DealRowTalonStack): + def dealCards(self, sound=0): + top_stacks = [] + for i in range(8): + for r in self.game.s.rows[i::8]: + if not r.cards: + top_stacks.append(r) + break + return self.dealRowAvail(rows=top_stacks, sound=sound) + +class Labyrinth_RowStack(BasicRowStack): + + def clickHandler(self, event): + BasicRowStack.doubleclickHandler(self, event) + return True + + def basicIsBlocked(self): + if self in self.game.s.rows[:8]: + return False + if self.id+8 >= len(self.game.allstacks): + return False + r = self.game.allstacks[self.id+8] + if r in self.game.s.rows and r.cards: + return True + return False + + + +class Labyrinth(Game): + + # + # game layout + # + + def createGame(self): + + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+8*l.XS, l.YM+l.YS+20*l.YOFFSET) + + # create stacks + s.talon = Labyrinth_Talon(l.XM, l.YM, self) + + x, y, = l.XM+2*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + + x, y = l.XM, l.YM+l.YS + for i in range(6): + x = l.XM + for j in range(8): + s.rows.append(Labyrinth_RowStack(x, y, self, max_move=1)) + x += l.XS + y += l.YOFFSET + + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealRow(rows=self.s.rows[:8]) + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) + + def fillStack(self, stack): + if stack in self.s.rows[:8] and not stack.cards: + rows = self.s.rows + to_stack = stack + #if not self.demo: + # self.startDealSample() + old_state = self.enterState(self.S_FILL) + for r in rows[list(rows).index(stack)+8::8]: + if r.cards: + self.moveMove(1, r, to_stack, frames=0) + to_stack = r + else: + break + if not stack.cards and self.s.talon.cards: + self.s.talon.dealRow(rows=[stack]) + self.leaveState(old_state) + #if not self.demo: + # self.stopSamples() + + +# register the game + +#registerGame(GameInfo(400, Labyrinth, "Labyrinth", +# GI.GT_1DECK_TYPE, 1, 0)) + diff --git a/pysollib/games/mahjongg/__init__.py b/pysollib/games/mahjongg/__init__.py new file mode 100644 index 00000000..f92860b0 --- /dev/null +++ b/pysollib/games/mahjongg/__init__.py @@ -0,0 +1,4 @@ +import mahjongg1 +import mahjongg2 +import mahjongg3 +import shisensho diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py new file mode 100644 index 00000000..6f26e6f0 --- /dev/null +++ b/pysollib/games/mahjongg/mahjongg.py @@ -0,0 +1,719 @@ +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys, string, re +#from tkFont import Font + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault, Struct +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText, MfxCanvasImage, bind, \ + EVENT_HANDLED, ANCHOR_NW + + +def factorial(x): + if x < 1: + return 1 + a = 1 + for i in xrange(x): + a *= (i+1) + return a + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Mahjongg_Hint(AbstractHint): + # FIXME: no intelligence whatsoever is implemented here + def computeHints(self): + game = self.game + # get free stacks + stacks = [] + for r in game.s.rows: + if r.cards and not r.basicIsBlocked(): + stacks.append(r) + # find matching tiles + i = 0 + for r in stacks: + for t in stacks[i+1:]: + if game.cardsMatch(r.cards[0], t.cards[0]): + # simple scoring... + score = 10000 + r.id + t.id + self.addHint(score, 1, r, t) + i = i + 1 + + +# /*********************************************************************** +# // +# ************************************************************************/ + +#class Mahjongg_Foundation(AbstractFoundationStack): +class Mahjongg_Foundation(OpenStack): + + def __init__(self, x, y, game, suit=ANY_SUIT, **cap): + kwdefault(cap, max_move=0, max_accept=0, max_cards=game.NCARDS) + #apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + apply(OpenStack.__init__, (self, x, y, game), cap) + + def acceptsCards(self, from_stack, cards): + # We do not accept any cards - pairs will get + # delivered by _dropPairMove() below. + return 0 + + def basicIsBlocked(self): + return 1 + + def initBindings(self): + pass + + def _position(self, card): + #AbstractFoundationStack._position(self, card) + OpenStack._position(self, card) + + fnds = self.game.s.foundations + + cols = (3, 2, 1, 0) + for i in cols: + for j in range(9): + n = i*9+j + if fnds[n].cards: + fnds[n].group.tkraise() + return + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Mahjongg_RowStack(OpenStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=1, max_accept=1, max_cards=2, + base_rank=NO_RANK) + apply(OpenStack.__init__, (self, x, y, game), cap) + + def basicIsBlocked(self): + # any of above blocks + for stack in self.blockmap.above: + if stack.cards: + return 1 + # any of left blocks - but we can try right as well + for stack in self.blockmap.left: + if stack.cards: + break + else: + return 0 + # any of right blocks + for stack in self.blockmap.right: + if stack.cards: + return 1 + return 0 + + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + return self.game.cardsMatch(self.cards[0], cards[-1]) + + def canFlipCard(self): + return 0 + + def canDropCards(self, stacks): + return (None, 0) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + self._dropPairMove(ncards, to_stack, frames=-1, shadow=shadow) + + def _dropPairMove(self, n, other_stack, frames=-1, shadow=-1): + ##print 'drop:', self.id, other_stack.id + assert n == 1 and self.acceptsCards(other_stack, [other_stack.cards[-1]]) + if not self.game.demo: + self.game.playSample("droppair", priority=200) + old_state = self.game.enterState(self.game.S_FILL) + c = self.cards[0] + if c.suit == 3: + if c.rank >= 8: + i = 35 + elif c.rank >= 4: + i = 34 + else: + i = 30+c.rank + elif c.rank == 9: + i = 27+c.suit + else: + i = c.suit*9+c.rank + f = self.game.s.foundations[i] + self.game.moveMove(n, self, f, frames=frames, shadow=shadow) + self.game.moveMove(n, other_stack, f, frames=frames, shadow=shadow) + self.game.leaveState(old_state) + self.fillStack() + other_stack.fillStack() + + # + # Mahjongg special overrides + # + + # Mahjongg special: we must preserve the relative stacking order + # to keep our pseudo 3D look. + def _position(self, card): + OpenStack._position(self, card) + # + rows = filter(lambda s: s.cards, self.game.s.rows[:self.id]) + if rows: + self.group.tkraise(rows[-1].group) + return + rows = filter(lambda s: s.cards, self.game.s.rows[self.id+1:]) + if rows: + self.group.lower(rows[0].group) + return + + # In Mahjongg games type there are a lot of stacks, so we optimize + # and don't create bindings that are not used anyway. + def initBindings(self): + group = self.group + # FIXME: dirty hack to access the Stack's private methods + #bind(group, "<1>", self._Stack__clickEventHandler) + #bind(group, "<3>", self._Stack__controlclickEventHandler) + #bind(group, "", self._Stack__controlclickEventHandler) + # + bind(group, "<1>", self.__clickEventHandler) + bind(group, "<3>", self.__controlclickEventHandler) + bind(group, "", self.__controlclickEventHandler) + + def __defaultClickEventHandler(self, event, handler): + if self.game.demo: + self.game.stopDemo(event) + if self.game.busy: + return EVENT_HANDLED + handler(event) + return EVENT_HANDLED + + def __clickEventHandler(self, event): + ##print 'click:', self.id + return self.__defaultClickEventHandler(event, self.clickHandler) + + def __controlclickEventHandler(self, event): + return self.__defaultClickEventHandler(event, self.controlclickHandler) + + def clickHandler(self, event): + game = self.game + drag = game.drag + # checks + if not self.cards: + return 1 + from_stack = drag.stack + if from_stack is self: + # remove selection + self.game.playSample("nomove") + self._stopDrag() + return 1 + if self.basicIsBlocked(): + ### remove selection + ##self.game.playSample("nomove") + return 1 + # possible move + if from_stack: + if self.acceptsCards(from_stack, from_stack.cards): + self._stopDrag() + # this code actually moves the tiles + from_stack.playMoveMove(1, self, frames=0, sound=1) + return 1 + drag.stack = self + self.game.playSample("startdrag") + # move or create the shade image (see stack.py, _updateShade) + if drag.shade_img: + img = drag.shade_img + img.dtag(drag.shade_stack.group) + img.moveTo(self.x, self.y) + else: + img = game.app.images.getShade() + if img is None: + return 1 + img = MfxCanvasImage(game.canvas, self.x, self.y, + image=img, anchor=ANCHOR_NW) + drag.shade_img = img + # raise/lower the shade image to the correct stacking order + img.tkraise(self.cards[-1].item) + img.addtag(self.group) + drag.shade_stack = self + return 1 + + def cancelDrag(self, event=None): + if event is None: + self._stopDrag() + + def _findCard(self, event): + # we need to override this because the shade may be hiding + # the tile (from Tk's stacking view) + return len(self.cards) - 1 + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class AbstractMahjonggGame(Game): + Hint_Class = Mahjongg_Hint + RowStack_Class = Mahjongg_RowStack + + GAME_VERSION = 2 + + NCARDS = 144 + + # For i18n + text_free_matching_pairs_0 = _("No Free\nMatching\nPairs") + text_free_matching_pairs_1 = _("1 Free\nMatching\nPair") + text_free_matching_pairs_2 = _(" Free\nMatching\nPairs") + text_tiles_removed = _("\nTiles\nRemoved\n\n") + text_tiles_remaining = _("\nTiles\nRemaining\n\n") + + + def getTiles(self): + # decode tile positions + L = self.L + + assert L[0] == "0" + assert (len(L) - 1) % 3 == 0 + + tiles = [] + max_tl, max_tx, max_ty = -1, -1, -1 + t = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' + for i in range(1, len(L), 3): + n = t.find(L[i]) + level, height = n / 7, n % 7 + 1 + tx = t.find(L[i+1]) + ty = t.find(L[i+2]) + assert n >= 0 and tx >= 0 and ty >= 0 + max_tl = max(level + height - 1, max_tl) + max_tx = max(tx, max_tx) + max_ty = max(ty, max_ty) + for tl in range(level, level + height): + tiles.append((tl, tx, ty)) + assert len(tiles) == self.NCARDS + #tiles.sort() + #tiles = tuple(tiles) + return tiles, max_tl, max_tx, max_ty + + + # + # game layout + # + + def createGame(self): + tiles, max_tl, max_tx, max_ty = self.getTiles() + + # start layout + l, s = Layout(self), self.s + show_removed = self.app.opt.mahjongg_show_removed + + ##dx, dy = 2, -2 + ##dx, dy = 3, -3 + cs = self.app.cardset + if cs.version >= 6: + dx = l.XOFFSET + dy = -l.YOFFSET + d_x = cs.SHADOW_XOFFSET + d_y = cs.SHADOW_YOFFSET + if self.preview: + # Fixme + dx, dy, d_x, d_y = dx/2, dy/2, d_x/2, d_y/2 + else: + dx = 3 + dy = -3 + d_x = 0 + d_y = 0 + #print dx, dy, d_x, d_y, cs.version + + font = self.app.getFont("canvas_default") + + # width of self.texts.info + #ti_width = Font(self.canvas, font).measure(_('Remaining')) + ti_width = 80 + + # set window size + dxx, dyy = abs(dx) * (max_tl+1), abs(dy) * (max_tl+1) + # foundations dxx dyy + if self.NCARDS > 144: + fdxx = abs(dx)*8 + fdyy = abs(dy)*8 + else: + fdxx = abs(dx)*4 + fdyy = abs(dy)*4 + cardw, cardh = l.CW - d_x, l.CH - d_y + if show_removed: + left_margin = l.XM + 4*cardw+fdxx+d_x + l.XM + else: + left_margin = l.XM + w = left_margin + (max_tx+2)*cardw/2+dxx+d_x + l.XM+ti_width+l.XM + # left margin | tiles | right margin + h = l.YM + dyy + (max_ty + 2) * cardh / 2 + d_y + l.YM + if show_removed: + h = max(h, l.YM+fdyy+cardh*9+d_y+l.YM) + self.setSize(w, h) + + # set game extras + self.check_dist = l.CW*l.CW + l.CH*l.CH # see _getClosestStack() + + # sort tiles (for 3D) + tiles.sort(lambda a, b: + cmp(a[0], b[0]) or + cmp(-a[1]+a[2], -b[1]+b[2]) + ) + + # create a row stack for each tile and compute the tilemap + tilemap = {} + x0 = left_margin + y0 = l.YM + dyy + for level, tx, ty in tiles: + #print level, tx, ty + x = x0 + (tx * cardw) / 2 + level * dx + y = y0 + (ty * cardh) / 2 + level * dy + stack = self.RowStack_Class(x, y, self) + ##stack.G = (level, tx, ty) + stack.CARD_XOFFSET = dx + stack.CARD_YOFFSET = dy + s.rows.append(stack) + # tilemap - each tile covers 4 positions + tilemap[(level, tx, ty)] = stack + tilemap[(level, tx+1, ty)] = stack + tilemap[(level, tx, ty+1)] = stack + tilemap[(level, tx+1, ty+1)] = stack + + # compute blockmap + for stack in s.rows: + level, tx, ty = tiles[stack.id] + above, left, right, up, bottom = {}, {}, {}, {}, {} + # above blockers + for tl in range(level+1, level+2): + above[tilemap.get((tl, tx, ty))] = 1 + above[tilemap.get((tl, tx+1, ty))] = 1 + above[tilemap.get((tl, tx, ty+1))] = 1 + above[tilemap.get((tl, tx+1, ty+1))] = 1 + # left blockers + left[tilemap.get((level, tx-1, ty))] = 1 + left[tilemap.get((level, tx-1, ty+1))] = 1 + # right blockers + right[tilemap.get((level, tx+2, ty))] = 1 + right[tilemap.get((level, tx+2, ty+1))] = 1 + # up blockers + ##up[tilemap.get((level, tx, ty-1))] = 1 + ##up[tilemap.get((level, tx+1, ty-1))] = 1 + # bottom blockers + ##bottom[tilemap.get((level, tx, ty+2))] = 1 + ##bottom[tilemap.get((level, tx+1, ty+2))] = 1 + # sanity check - assert that there are no overlapping tiles + assert tilemap.get((level, tx, ty)) is stack + assert tilemap.get((level, tx+1, ty)) is stack + assert tilemap.get((level, tx, ty+1)) is stack + assert tilemap.get((level, tx+1, ty+1)) is stack + # + above = tuple(filter(None, above.keys())) + left = tuple(filter(None, left.keys())) + right = tuple(filter(None, right.keys())) + ##up = tuple(filter(None, up.keys())) + ##bottom = tuple(filter(None, bottom.keys())) + # assemble + stack.blockmap = Struct( + above = above, + left = left, + right = right, + ##up = up, + ##bottom = bottom, + ) + + # create other stacks + for i in range(4): + for j in range(9): + if show_removed: + x = l.XM+i*cardw + y = l.YM+fdyy+j*cardh + else: + x = -l.XS + y = l.YM+dyy + stack = Mahjongg_Foundation(x, y, self) + if show_removed: + stack.CARD_XOFFSET = dx + stack.CARD_YOFFSET = dy + s.foundations.append(stack) + + self.texts.info = MfxCanvasText(self.canvas, + self.width - l.XM - ti_width, + l.YM + dyy, + anchor="nw", font=font) + # the Talon is invisble + s.talon = InitialDealTalonStack(-l.XS, self.height - dyy, self) + + # Define stack groups + l.defaultStackGroups() + + + # + # game overrides + # + + def _shuffleHook(self, cards): + if not self.app.opt.mahjongg_create_solvable: + return cards + # try to create a solvable game + old_cards = cards[:] + rows = self.s.rows + + def is_blocked(s, new_cards): + # any of above blocks + for stack in s.blockmap.above: + if new_cards[stack.id] is None: + return True + # any of left blocks - but we can try right as well + for stack in s.blockmap.left: + if new_cards[stack.id] is None: + break + else: + return False + # any of right blocks + for stack in s.blockmap.right: + if new_cards[stack.id] is None: + return True + return False + + def create_solvable(cards, new_cards): + if not cards: + return new_cards + # select two matching cards + c1 = cards[0] + del cards[0] + c2 = None + for i in xrange(len(cards)): + if self.cardsMatch(c1, cards[i]): + c2 = cards[i] + del cards[i] + break + # + free_stacks = [] + for r in rows: + if new_cards[r.id] is None and not is_blocked(r, new_cards): + free_stacks.append(r) + if len(free_stacks) < 2: + return None + # + i = factorial(len(free_stacks))/2/factorial(len(free_stacks)-2) + old_pairs = [] + for _ in xrange(i): + nc = new_cards[:] + while True: + # create uniq pair + r1 = self.random.randrange(0, len(free_stacks)) + r2 = self.random.randrange(0, len(free_stacks)-1) + if r2 >= r1: + r2 += 1 + if (r1, r2) not in old_pairs and (r2, r1) not in old_pairs: + old_pairs.append((r1, r2)) + break + s1 = free_stacks[r1] + s2 = free_stacks[r2] + nc[s1.id] = c1 + nc[s2.id] = c2 + nc = create_solvable(cards[:], nc) + if nc: + return nc + + return None + + new_cards = create_solvable(cards, [None]*len(cards)) + if new_cards: + new_cards.reverse() + return new_cards + print 'oops! can\'t create a solvable game' + return old_cards + + + def startGame(self): + assert len(self.s.talon.cards) == self.NCARDS + #self.s.talon.dealRow(rows = self.s.rows, frames = 0) + n = 12 + self.s.talon.dealRow(rows = self.s.rows[:self.NCARDS-n], frames = 0) + self.startDealSample() + self.s.talon.dealRow(rows = self.s.rows[self.NCARDS-n:]) + assert len(self.s.talon.cards) == 0 + + def isGameWon(self): + return sum([len(f.cards) for f in self.s.foundations]) == self.NCARDS + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + if stack1.basicIsBlocked() or stack2.basicIsBlocked(): + return 0 + return self.cardsMatch(card1, card2) + + def getAutoStacks(self, event=None): + return ((), (), ()) + + def updateText(self): + if self.preview > 1 or self.texts.info is None: + return + # find matching tiles + stacks = [] + for r in self.s.rows: + if r.cards and not r.basicIsBlocked(): + stacks.append(r) + f, i = 0, 0 + for r in stacks: + n = 0 + for t in stacks[i+1:]: + if self.cardsMatch(r.cards[0], t.cards[0]): + n += 1 + #if n == 3: n = 1 + #elif n == 2: n = 0 + n = n % 2 + f += n + i += 1 + + if f == 0: + f = self.text_free_matching_pairs_0 + elif f == 1: + f = self.text_free_matching_pairs_1 + else: + f = str(f) + self.text_free_matching_pairs_2 + t = sum([len(i.cards) for i in self.s.foundations]) + t = str(t) + self.text_tiles_removed \ + + str(self.NCARDS - t) + self.text_tiles_remaining \ + + f + self.texts.info.config(text = t) + + # + # Mahjongg special overrides + # + + def getHighlightPilesStacks(self): + # Mahjongg special: highlight all moveable tiles + return ((self.s.rows, 1),) + + def getCardFaceImage(self, deck, suit, rank): + if suit == 3: + cs = self.app.cardset + if len(cs.ranks) >= 12 and len(cs.suits) >= 4: + # make Mahjongg type games playable with other cardsets + if rank >= 8: # flower + suit = 1 + rank = len(cs.ranks) - 2 + elif rank >= 4: # season + rank = max(10, len(cs.ranks) - 3) + else: # wind + suit = rank + rank = len(cs.ranks) - 1 + return self.app.images.getFace(deck, suit, rank) + + def getCardBackImage(self, deck, suit, rank): + # We avoid screen updates caused by flipping cards - all + # cards are face up anyway. The Talon should be invisible + # or else the top tile of the Talon will be visible during + # game start. + return self.getCardFaceImage(deck, suit, rank) + + def _createCard(self, id, deck, suit, rank, x, y): + ##if deck >= 1 and suit == 3 and rank >= 4: + if deck%4 and suit == 3 and rank >= 4: + return None + return Game._createCard(self, id, deck, suit, rank, x, y) + + def _getClosestStack(self, cx, cy, stacks, dragstack): + closest, cdist = None, 999999999 + # Since we only compare distances, + # we don't bother to take the square root. + for stack in stacks: + dist = (stack.x - cx)**2 + (stack.y - cy)**2 + if dist < cdist: + # Mahjongg special: if the stack is very close, do + # not consider blocked stacks + if dist > self.check_dist or not stack.basicIsBlocked(): + closest, cdist = stack, dist + return closest + + # + # Mahjongg extras + # + + def cardsMatch(self, card1, card2): + if card1.suit != card2.suit: + return 0 + if card1.suit == 3: + if card1.rank >= 8: + return card2.rank >= 8 + if card1.rank >= 4: + return 7 >= card2.rank >= 4 + return card1.rank == card2.rank + +## mahjongg util +def comp_cardset(ncards): + # calc decks, ranks & trumps + assert ncards % 4 == 0 + assert 0 < ncards <= 288 # ??? + decks = 1 + cards = ncards/4 + if ncards > 144: + assert ncards % 8 == 0 + decks = 2 + cards = cards/2 + ranks, trumps = divmod(cards, 3) + if ranks > 10: + trumps += (ranks-10)*3 + ranks = 10 + if trumps > 4: + trumps = 4+(trumps-4)*4 + assert 0 <= ranks <= 10 and 0 <= trumps <= 12 + return decks, ranks, trumps + +# /*********************************************************************** +# // register a Mahjongg type game +# ************************************************************************/ + +from new import classobj + +def r(id, short_name, name=None, ncards=144, layout=None): + assert layout + if not name: + name = "Mahjongg " + short_name + classname = re.sub('\W', '', name) + # create class + gameclass = classobj(classname, (AbstractMahjonggGame,), {}) + gameclass.L = layout + gameclass.NCARDS = ncards + decks, ranks, trumps = comp_cardset(ncards) + gi = GameInfo(id, gameclass, name, + GI.GT_MAHJONGG, 4*decks, 0, + category=GI.GC_MAHJONGG, short_name=short_name, + suits=range(3), ranks=range(ranks), trumps=range(trumps), + si={"decks": decks, "ncards": ncards}) + gi.ncards = ncards + gi.rules_filename = "mahjongg.html" + registerGame(gi) + return gi + diff --git a/pysollib/games/mahjongg/mahjongg1.py b/pysollib/games/mahjongg/mahjongg1.py new file mode 100644 index 00000000..cc4c4eed --- /dev/null +++ b/pysollib/games/mahjongg/mahjongg1.py @@ -0,0 +1,149 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +from mahjongg import r + +# /*********************************************************************** +# // game definitions +# ************************************************************************/ + +r(5001, "Altar", layout="0aaaacaaiaakaamaaoaaqaasaauaawaaCaaEaaacaccaicckccmccoccqccsccucawcaCcaEcaieckecmecoecqecsecueaweaigckgcmgcogcqgcsgcugawgaiiakiamiaoiaqiasiauiawiaokaqkaamacmaomaqmaCmaEmaaoacoaooaqoaCoaEohabhcbhCbhEbkpijpkipmhanhcnhCnhEnhpoobboDbobnoDnvlcvncvpcvrcvtcvlevnevpevrevtevlgwngwpgwrgvtgCocCqcCmeCoeCqeCse") +r(5002, "Arena", layout="0eaadcaceabgaaiaaqabsacuadwaeyadaccccbecagcakcbmcaocascbuccwcdyccaebceaeeameauebwecyebagacgakgbmgaogawgbygcaibciaeiamiauibwicyidakcckbekagkakkbmkaokaskbukcwkdykeamdcmcembgmaimaqmbsmcumdwmeym") +r(5003, "Arena 2", layout="0daadcabeabgaaiaakaamaaoaaqaasabuabwadyadAadaccccbecagcaucbwccycdAcdaecceaeeawecyedAedagccgaegawgcygdAgdaicciaeiawicyidAidakcckbekagkaukbwkcykdAkdamdcmbembgmaimasmbumbwmdymdAm") +# +r(5004, "Arrow", layout="0aaaaqbaacaccascaqdaudaaeaceaeeageaieakeameaoeaseaweaqfaufayfaagacgaegaggaigakgamgaogasgawgaAgaCgaqhauhayhaaiaciaeiagiaiiakiamiaoiasiawiaqjaujaakackaskaqlaamhbchrdhbehdehfehhehjehlehnehpehtehrfhvfhbghdghfghhghjghlghnghpghtghxghrhhvhhbihdihfihhihjihlihnihpihtihrjhbkoceoeeogeoieokeomeooeoqeosfocgoegoggoigokgomgoogoqgougoshocioeiogioiiokiomiooioqivfevhevjevlevnevpevfgvhgvjgvlgvngvpgvrgvfivhivjivlivnivpiCkeCmeCoeCkgCmgCogCqgCkiCmiCoi") +r(5005, "Art Moderne", layout="0acaaeaagaaiaakaamaaoaauaawaaabalcapcatcavcaxcaadaddaleapeaseauebxeaafacfalgangapgargatgavgaxgaahachaliapiasiauibxiaajadjalkapkatkavkaxkaalacmaemagmaimakmammaomaumawmhdahfahhahjahlahnahvahxahuchwchychedhldhpdhaehtehvehdfhlfhpfhaghsghughwghdhhlhhphhaihtihvihejhljhpjhukhwkhykhdmhfmhhmhjmhlmhnmhvmhxmowaoyaovcoxcozcofdokdoueoweoyeoefokfomgotgovgoehokhouiowioyiofjokjovkoxkozkowmoymvgdvjdvffvjfvlgvfhvjhvgjvjjChdCgfCifCkgCghCihChj") +r(5006, "Balance", layout="0eoaeebbgbbibbkbbmbbqbbsbbubbwbeybeoccedcydcoeccfaefcgfcwfayfcAfcogachaghawhaAhcoiaajacjaejagjaijaujawjayjaAjaCjcokadlaflaxlazlcomagoaioakoamoaooaqoasoauoawohbjhdjhfjhhjhvjhxjhzjhBjjeljylhhoijojloknokpojroitohvoocjoejogjowjoyjoAjvdjvfjvxjvzjCejCyj") +r(5007, "Bat", layout="0ecaeAaaabalbanbapbarbaCbcccaecayccAcaadandapdaCdcceaeebgeaieauebweayecAeaafanfapfaCfbcgbegaggbigakgasgbugawgbygbAgaahamhbohaqhaChbcibeiagibiiakiasibuiawibyibAiaajamjbojaqjaCjcckaekbgkaikakkaskaukbwkaykcAkaalaolaClccmaemaimakmasmaumaymcAmaanaCnecobkobsoeAohobhodhofhaghCghaihCi") +# +r(5008, "Beatle", layout="0aeaagaauaawaaicakcamcaocaqcascaeeageaieakeameaoeaqeaseaueadgafgahgajgalgangapgargatgavgaeiagiaiiakiamiaoiaqiasiauiaikakkamkaokaqkaskaemagmaumawmhhbhtbhjchlchnchpchrchdehfehhehjehlehnehpehrehteiegiggiigikgimgiogiqgisghughdihfihhihjihlihnihpihrihtihjkhlkhnkhpkhrkhhlhtloceogeoieokeomeooeoqeoseociogioiiokiomiooioqiosivbdvhevjevlevnevpevrevfgvhgvjgvlgvngvpgvrgvhivjivlivnivpivrivbjCaaCacCggCigCkgCmgCogCqgCakCam") +r(5009, "Big Hole", layout="0daadcadeadgadiadkadmadoaaaccccdecdgcdicdkccmcaocaaeccedeedkecmeaoeaagccgdegdkgcmgaogaaiccideidgidiidkicmiaoidakdckdekdgkdikdkkdmkdok") +r(5010, "Bizarre", layout="0aaaaGadkbdmbdobdqbdsbdubdwbdkdcmdcodcqdcsdcuddwddkfcmfbofbqfbsfcufdwfdkhcmhbohaqhbshcuhdwhakjbmjcojdqjcsjbujawjaklbmlcolcqlcslbulawlaknbmnbonbqnbsnbunawnakpampaopaqpaspaupawpaaqaGq") +r(5011, "Boat", layout="0alaapaataajcblcapcbtcavcahebjecleapectebveaxeafgbhgcjgdlgapgdtgcvgbxgazgadibfichidjieliapietidvicxibziaBiapkaambcmbembgmbimbkmbmmbombqmbsmbumbwmbymbAmbCmaEmadobfobhobjoblobnobpobrobtobvobxobzoaBoaiqbkqbmqboqbqqbsqbuqawq") +r(5012, "Bug", layout="0bhabnabtaajbapbavbcadaidakdamdaodaqdasdaudawdaceayeagfbifbkfbmfbofbqfbsfbufbwfaAfdegaygbchbghcihckhcmhcohcqhcshcuhbwhaAhdeiayiagjbijbkjbmjbojbqjbsjbujbwjaAjackaykcalailaklamlaolaqlaslaulawlajnapnavnbhobnobtohyhojfolfonfopforfotfovfojjoljonjopjorjotjovjvjhvlhvnhvphvrhvthCkhCmhCohCqhCsh") +r(5013, "Butterfly", layout="0dmadqaaabaebaybaCbagccocawcaadaedaidaudaydaCdaceageakedoeaseaweaAeaafaefbifamfaqfbufayfaCfacgaggbkgeogbsgawgaAgaahaehbihbmhbqhbuhayhaChaciagibkieoibsiawiaAiaajaejbijamjaqjbujayjaCjackagkakkeokaskawkaAkaalaelailaulaylaClacmagmeomawmaAmaanaenaynaCncoohgdhwdheehyehcfhgfhwfhAfhaghCghaihCihcjhgjhwjhAjhekhykhglhwl") +# +r(5014, "Castle", layout="0eaaccaceacgaciackaemacacaccaecagcaicakccmcdaeaceaeeageaieakedmeaoecagacgaegaggaigakgcmgbogaqgdaiaciaeiagiaiiakidmiaoicakackaekagkaikakkcmkeamccmcemcgmcimckmemmhddhfdhhdhjdhdfhffhhfhjfhdhhfhhhhhjhhdjhfjhhjhjjoeeogeoieoegoggoigoeiogioiivffvhfvfhvhhCgg") +r(5015, "Cat and Mouse", layout="0cfabhacjablacnabpacrabtacBacFabdbbvbbbcbxcbBccDcbFcahdajdaldbzdbaecBebDecFeahfajfalfbagahhajhalhbuhbBhbbibsibwibFibqjbBjbckbokbxkbFkcelbglcilbklcmlbsmbwmbunbAocCocEocGohiehkehighkgohdojdoldohfojfolfohhojholhoBkoFloAnvievkevigvkgvBlvFmCjdChfClfCjh") +r(5016, "Ceremonial", layout="0bcabeaajaalaanaapaaraataavabAabCabdcbfcbzcbBcaadapdaEdbeebgeanearebyebAeaafbifbkfapfbufbwfaEfbmgbsgaahaphaEhbmibsiaajbijbkjapjbujbwjaEjbekbgkankarkbykbAkaalaplaElbdmbfmbzmbBmbcobeoajoaloanoapoaroatoavobAobCohkahmahoahqahsahuahaehoehqehEehagipghEghaiipihEihakhokhqkhEkhkohmohoohqohsohuoonaopaoraopeoahoEhopkonoopoorovph") +r(5017, "Checkered", layout="0baabCaacbbebagbbibakbbmbaobbqbasbbubawbbybaAbbcdaedbgdaidbkdamdbodaqdbsdaudbwdaydbAdacfbefagfbifakfbmfaofbqfasfbufawfbyfaAfbchaehbghaihbkhamhbohaqhbshauhbwhayhbAhacjbejagjbijakjbmjaojbqjasjbujawjbyjaAjbclaelbglailbklamlbolaqlbslaulbwlaylbAlacnbenagnbinaknbmnaonbqnasnbunawnbynaAnbaobCo") +# +r(5018, "Chip", layout="0aeaaiaamaaqaatabecbgcbicbkcbmcbocbqcbscbucbwcaadbcdbydaAdbeecgecieckecmecoecqecsecuebweaagbcgbegdggbigakgamgaogaqgbsgdugbwgbygaAgbeicgiciickicmicoicqicsicuibwiaajbcjbyjaAjbekbgkbikbkkbmkbokbqkbskbukbwkaemaimammaqmaum") +r(5019, "Columns", layout="0egaaiaakaamaaoaaqaasaauaewaaebaybagcaicaocaucawceadbcdaedaydbAdeCdageekeameaoeaqeeseawebafbCfaggakgasgawgaahamheohaqhaChagiakiasiawibajbCjagkdkkamkaokaqkeskawkealbclaelaylbAleClagmaimaomaumawmaenaynegoaioakoamoaooaqoasoauoewohgfhwfjghjwhhgjhwj") +r(5020, "Crown", layout="0baabcabeabgabkabmaboabqabsabwabyabAabCabacaccaecbgcbkcamcbocaqcbscbwcaycaAcbCcbaeaeebgebkeameaqebsebweayebCebagaegbggbigbkgamgaqgbsgbugbwgaygbCgbaiaeiagiaiiakiamiaqiasiauiawiayibCibakbCkbamacmaemagmaimakmbomasmaumawmaymaAmbCmbaobcobeobgobiobkoamobooaqobsobuobwobyobAobCo") +# +r(5021, "Cupola", layout="0aiaakaamaaoaaqaasaagbaubaecawcacdaydabfeofazfaahajhalhanhapharhathaAhaajeojaAjablazlacnaynaeoawoagpaupaiqakqamqaoqaqqasqhjbhlbhnbhpbhrbhhchtchfdhvdhdehxehcghyghkhhmhhohhqhhshhbihzihckhykhdmhxmhfnhvnhhohtohjphlphnphpphrpokcomcoocoqcoidosdogeoueoefowfodholhonhophorhoxhodjoxjoelowlogmoumoinosnokoomoooooqovldvndvpdvjevrevhfvtfvfgvvgvmhvohvqhveivwivfkvvkvhlvtlvjmvrmvlnvnnvpnCifCsfCggCugCnhCphCfiCviCgkCukCilCsl") +r(5022, "Deep Well", layout="0acaaeaagaaiaakaamaaaccccceccgccicckccmcaocaaecceeeeegeeieekecmeaoeaagccgeegekgcmgaogaaiccieeiekicmiaoiaakcckeekegkeikekkcmkaokaamccmcemcgmcimckmcmmaomacoaeoagoaioakoamo") +r(5023, "Dragon", layout="0bgaaiaegceicdkccmcbocbqcbscbucawcaycaceaeeageaieakebmeboeaqeaseaueaweayeadgbfgahgajgalgangapgaEgayhaChaaiaciaeiagiaiiakiamiaoiaqiasiauiaAiaEiaCjabkadkafkahkajkalkaEkaamacmaemagmbimakmaaoacobeoagoaiockoamoixchdejhejigkkgjmghEhhbihdikhikjijliiniipihrihtihCihEjhckhgkhkkhbmhfmhboihopneocioEiobn") +r(5024, "Dude", layout="0bfabtabhbbjbblbbrbaBbatcavcaxcazcaedagdbldbndbpdbrdacebjebueayeaAeaCeaafbhfcmfcofcqfcsfbwfaEfbfgckgcugbygcphbAhbeickicuicpjbBjcjkclkcnkcrkctkcvkcjmclmcnmcrmctmcvmcpncjocvockqcmqcoqcqqcsqcuq") +#r(5025, "Eagle", layout="0cmadoacqaasbbmcbocaedagdaudawdbcebieakebmeboeaqebsebyeaefagfaufawfbcgbigakgbmgbogaqgbsgbygaehaghauhawhaaiacibmiboiayiaAibejbwjaakackbmkbokaykaAkaambkmanmbqmaAmcioclocpocsoheehgehuehweheghgghughwghbihzihbkhzkomdoododeofeoheoteoveoxeomfoofodgofgohgotgovgoxgomhoohobjomjoojozjvndveevgevuevwevnfvegvggvugvwgvnhvnjCfeCveCfgCvg") +r(5026, "Enterprise", layout="0agaaiaakaamaaoaaqaasaauaawaayaaacbccbecbgcbicbkcbmcbocbqcbscbucbwcbycbAcbCcaEcdqedogdmhaAiaajbcjcejdgjeijekjemjeojcqjayjaCjaAkhhaijailainaipairaitaivahxaiAjodcofcohcojcolconcopcorcotcovcoxcozcoBcvkavmavoavqavsavecvgcvicvkcvmcvocvqcvscvucvwcvycChcCjcClcCncCpcCrcCtcCvc") +# +r(5027, "Eye", layout="0amaaoaakbaqbaicamcaocascagdakdaqdaudaeeaieameaoeaseaweacfagfakfaqfaufayfaagaegaigamgaogasgawgaAgachaghakhaqhauhayhaeiaiiamiaoiasiawiagjakjaqjaujaikamkaokaskaklaqlammaomhlbhobhjchqchhdhldhodhsdhfehjehqehuehdfhhfhlfhofhsfhwfhfghjghqghughdhhhhhlhhohhshhwhhfihjihqihuihhjhljhojhsjhjkhqkhllhololcoocojdoqdoheoleooeoseoffojfoqfoufohgolgoogosgowgofhojhoqhouhohioliooiosiojjoqjolkookvldvodvjevqevhfvlfvofvsfvfgvjgvqgvhhvlhvohvshvjivqivljvoj") +r(5028, "F-15 Eagle", layout="0aobaqbasbaubbEcbGcandapdardatdalebDebFeajfanfapfarfalgatgavgaxgazgaBgaDgabhadhafhahhajhanhapharhaliatiaviaxiaziaBiaDiajjanjapjarjalkbDkbFkanlaplarlatlbEmbGmaonaqnasnaunhpahrahtahvahochqchschuchmehoehqehsehifhkfhmghoghqghsghughwghyghAghCgiahichjehjghjihjkhhmihoihqihsihuihwihyihAihCihijhkjhmkhokhqkhskhomhqmhsmhumhpohrohtohvoozfoBfoDfomhozjoBjoDjvAfvCfvAjvCjCBfCDfCfhChhCjhCBjCDj") +r(5029, "Farandole", layout="0beabgabmaboabqabwabyabcbbibbkbbsbbubbAbafcaxcbbdbBdckecmecqecsebbfbgfcifcufbwfbBfbegbygbahbchajhblhcnhcphbrhathbAhbChbeibyibbjbgjcijcujbwjbBjckkcmkcqkcskbblbBlafmaxmbcnbinbknbsnbunbAnbeobgobmoboobqobwobyo") +r(5030, "Fish", layout="0afaajaasaauaawabhbaobaqbaybaccamcbscbucbwcaAcakdbodbqdaydaCdaceaeeaiebmebsebuebweaEeagfbkfbofbqfayfaCfacgaegaigbmgbsgbugbwgaAgaEgakhbohbqhbyhaChaciamibsibuibwiaAiaojaqjayjahkaskaukawkbjlcemalmbcndgnbCnaaoeioaqoasodAoaEodkpbopbupdypcmqcwqhcdhcfhefhifhchoreoteolfonfopfovforgotgovhoxh") +# +r(5031, "Five Pyramids", layout="0aaaacaaeaagaayaaAaaCaaEaaacaccaecagcapcaycaAcaCcaEcaaeaceaeeageapeayeaAeaCeaEeaagacgaegaggangapgargaygaAgaCgaEgalhathaniapiariaakackaekagkapkaykaAkaCkaEkaamacmaemagmapmaymaAmaCmaEmaaoacoaeoagoayoaAoaCoaEoaaqacqaeqagqayqaAqaCqaEqhbbhdbhfbhzbhBbhDbhbdhddhfdhpdhzdhBdhDdhbfhdfhffipfhzfhBfhDfhnhhphhrhipjhblhdlhflhplhzlhBlhDlhbnhdnhfnhznhBnhDnhbphdphfphzphBphDpoccoecoAcoCcoceoeeoAeoCeoohoqhocmoemoAmoCmocooeooAooCovddvBdvphvdnvBn") +#r(5032, "Five Pyramids 2", layout="0aoaaabacbaebagbawbaybaAbaCbbocaadacdaedagdaidakdamdaqdasdaudawdaydaAdaCdcoeaafacfaefagfawfayfaAfaCfamgdogaqgadhazhagibiickidmidoidqicsibuiawiadjazjamkdokaqkaalaclaelaglawlaylaAlaClcomaanacnaenagnainaknamnaqnasnaunawnaynaAnaCnbooaapacpaepagpawpaypaApaCpaoqhbchdchfchxchzchBchbehdehfehxehzehBehbmhdmhfmhxmhzmhBmhbohdohfohxohzohBoocdoedoydoAdocnoenoynoAn") +r(5033, "Flowers", layout="0baaccaceabgaakabmaboaaqaauabwabyaaAadacdgcckccqccuccAcbaecceceebgeakebmeboeaqeauebwebyeaAeadgangaxgafhahhajhalhapharhathavhadianiaxiaakbckbekagkakkbmkbokaqkaukbwkbykaAkcamcgmckmcqmcumcAmaaobcobeoagoakobmobooaqoauobwobyoaAoonaoxaoneoxeodkonkoxkodoonooxovdavde") +r(5034, "Flying Dragon", layout="0acaaeaagaaiaakaamaaoaaqaasaauaawaayaagcbicbkcbmcbocbqcbscaucaeeagebieckecmecoecqebseaueaweacgaegaggbigckgdmgdogcqgbsgaugawgaygaahaAhaChaciaeiagibiickidmidoicqibsiauiawiayiaekagkbikckkcmkcokcqkbskaukawkagmbimbkmbmmbombqmbsmaumacoaeoagoaioakoamoaooaqoasoauoawoayoCnh") +r(5035, "Fortress Towers", layout="0faaecadeacgabiabkacmadoaeqafsaeacaccagcaicakcamcaqcescdaeaceageaieakeameaqedsedagacgaggaigakgamgaqgdsgeaiaciagiaiiakiamiaqiesifakeckdekcgkbikbkkcmkdokeqkfskhjchjehjghji") +# +r(5036, "Full Vision", layout="0aaaaiaamaaoaaqaasaawaaEaacbaebagbaybaAbaCbaacaicamcaocaqcascawcaEcacdaedagdaydaAdaCdaaeaieaweaEeaefamfasfaAfaggaigakgaugawgaygaehamhashaAhagiaiiakiauiawiayiaejamjasjaAjaakaikawkaEkaclaelaglaylaAlaClaamaimaomaqmawmaEmacnaenagnamnasnaynaAnaCnaaoaioaooaqoawoaEohpahbbhhbhnbhrbhxbhDbhdchfchpchzchBchbdhhdhxdhDdhfghlghtghzghhhhjhhvhhxhhfihlihtihzihblhhlhxlhDlhdmhfmhzmhBmhbnhhnhnnhpnhrnhxnhDnooboqboccogcoycoCcoghokhouhoyhocmogmoymoCmvpb") +# +r(5037, "Full Vision 2", layout="0aaaacaafaahaakaamaapaaraauaawaazaaBaaacaccafcahcakcamcapcarcaucawcazcaBcaaeaceafeaheakeameapeareaueaweazeaBeaagacgafgahgakgamgapgargaugawgazgaBgaajacjaejagjakjamjapjarjavjaxjazjaBjaalaclaelaglaklamlaplarlavlaxlazlaBlaeoagoaioakoamoapoaroatoavoaxohbbhgbhlbhqbhvbhAbhadhcdhfdhhdhkdhmdhpdhrdhudhwdhzdhBdhbfhgfhlfhqfhvfhAfhdjhyjhbkhfkhkkhmkhpkhrkhwkhAkhdlhylobcogcolcoqcovcoAcobeogeoleoqeoveoAeockoekolkoqkoxkozkvbdvgdvldvqdvvdvAdvdkvyk") +r(5038, "Future", layout="0cgaaiaakaamaboaaqaasaauacwaagccicakcamcbocaqcasccucawcaeeageaiebkebmeboebqebseaueaweayeacfaAfaagcegcggdigdkgdmgdogdqgdsgdugcwgcygaCgachaAhaeiagiaiibkibmiboibqibsiauiawiayiagkcikakkamkbokaqkaskcukawkcgmaimakmammbomaqmasmaumcwmhcghAgoneopeoniopiClgCngCpgCrg") +r(5039, "Garden", layout="0adaafaaoaaqaazaaBaaabaibalbatbawbaEbaccaecagcancapcarcaycaAcaCcaadaidaldatdawdaEdaceaeeageaneapeareayeaAeaCeaafaifalfatfawfaEfachaehaghanhapharhayhaAhaChaajaijaljatjawjaEjackaekagkankapkarkaykaAkaCkaalailallatlawlaElacmaemagmanmapmarmaymaAmaCmaanainalnatnawnaEnadoafoaooaqoazoaBoheahpahAahcdhedhgdhndhpdhrdhydhAdhCdhdhhfhhohhqhhzhhBhhclhelhglhnlhplhrlhylhAlhClheohpohAooddofdoodoqdozdoBdoehophoAhodloflooloqlozloBlvedvpdvAdvelvplvAl") +r(5040, "Gayle's", layout="0dcaceabgaaiaakaamaaoaaqaasabuacwadyaagcbicckccmccoccqcbscaucakebmeboeaqeacgaegaggbigbkgbmgbogbqgbsgaugawgaygaahaAhaciaeiagibiibkibmiboibqibsiauiawiayiakkbmkbokaqkagmbimckmcmmcomcqmbsmaumdcoceobgoaioakoamoaooaqoasobuocwodyoojholhonhophorhvncvmhvohvnmCnh") +r(5041, "Glade", layout="0aaaacaaCaaEaaacaccaCcaEcahdejdcldcndbpdcrdctdevdaxddhfcjfblfbnfbpfbrfbtfcvfdxfchhbjhblhanharhbthbvhcxhdhjcjjbljbnjbpjbrjbtjcvjdxjahlejlcllcnlbplcrlctlevlaxlaamacmaCmaEmaaoacoaCoaEohbahDahbchDchbmhDmhbohDoobboDbobnoDn") +r(5042, "H for Haga", layout="0aaaacaaeaagaakaamaaoaaqaaacaccaecagcakcamcaocaqcaaeaceaeeageakeameaoeaqeaifaagacgaegaggakgamgaogaqgaihaaiaciaeiagiakiamiaoiaqiaijaakackaekagkakkamkaokaqkaamacmaemagmakmammaomaqmaaoacoaeoagoakoamoaooaqohbbhdbhfbhlbhnbhpbhbdhddhfdhldhndhpdhbfhdfhffhlfhnfhpfhhghjghbhhdhhfhhlhhnhhphhhihjihbjhdjhfjhljhnjhpjhblhdlhflhllhnlhplhbnhdnhfnhlnhnnhpnoccoecomcoococeoeeomeooeocgoegomgoogoghoihokhocioeiomiooiockoekomkookocmoemommoomvddvndvdlvnl") +#r(5043, "H for Haga Traditional", layout="0acaaeaagaaiaakaamaaoaaqaasaauaawaayabgcbicakcamcaocaqcbscbucaeebgebieakeameaoeaqebsebueaweacgaegbggbigbkgbmgbogbqgbsgbugawgaygaahaAhaciaeibgibiibkibmiboibqibsibuiawiayiaekbgkbikakkamkaokaqkbskbukawkbgmbimakmammaomaqmbsmbumacoaeoagoaioakoamoaooaqoasoauoawoayoklcknckpchdhhxhklmknmkpm") +r(5044, "Helios", layout="0eaadcaduaewadacbccbucdwcbaeaceaeeaiedkedmeaoeaseauebwebagacgaegaggdigdogaqgasgaugbwgblhbaiaciaeiagidiidoiaqiasiauibwibakackaekaikdkkdmkaokaskaukbwkdambcmbumdwmeaodcoduoewohchhehhghhqhhshhuhCleCihCohClk") +r(5045, "High and Low", layout="0eaadcaceabgaaiabkacmadoaeqadaccccdecagcbicckcbmceocdqccaebceeeebgeciedkeamedoecqebagacgdegcggdigekgbmgcogbqgaaibciceidgieiidkicmiboiaqiaekagkbikakkamkahmajmhim") +# +#r(5046, "Hourglass", layout="0aaaacaaeaagaaiaakaamaaoaaqaasaauaawaayaaacamcaycacdawdaaeaeeameaueayeacfagfasfawfaagaegaigamgaqgaugaygachaghbkhbohashawhaaiaeiaiiamiaqiauiayiacjagjasjawjaakaekamkaukaykaclawlaamammaymaaoacoaeoagoaioakoamoaooaqoasoauoawoayohabhmbhybhadhmdhydhcehwehafhefhufhyfhcghgghsghwghahhehhihhqhhuhhyhhcihgihsihwihajhejhujhyjhckhwkhalhmlhylhanhmnhynoacoycoaeoyeoagoygoaioyioakoykoamoymvadvydvafvyfvahvyhvajvyjvalvylCaeCyeCagCygCaiCyiCakCyk") +r(5047, "Inca", layout="0aoaaqaaibakbambasbaubawbbocbqcaidbkdbmdbsdbudawdcoecqeaifbkfcmfcsfbufawfaagacgdogdqgaCgaEgahhbjhclhcthbvhaxhaaiacidoidqiaCiaEiahjbjjcljctjbvjaxjaakackdokdqkaCkaEkailbklcmlcslbulawlcomcqmainbknbmnbsnbunawnboobqoaipakpampaspaupawpaoqaqqhbihDiCphCpj") +r(5048, "Inner Circle", layout="0aaaacaayaaAaaaceccceccgcbicbkcamcaocbqcbsccuccwceycaAcccecyedgfcifbkfbqfcsfdufbcgbygaghbuhbcibyiegjdijckjbmjbojcqjdsjeujcckcykaamecmcemcgmbimbkmbqmbsmcumcwmdymaAmaaoacoakoaqoayoaAo") +r(5049, "Joker", layout="0aaaaAaadbafbahbajbalbanbapbarbatbavbaxbabdbddbfdbhdbjdbldbndbpdbrdbtdbvdbxdazdcbfbdfaffahfajfalfanfapfarfatfavfbxfczfcbhbdhafhavhbxhczhajiamiapiasicbjbdjafjavjbxjczjcblbdlaflahlajlallanlaplarlatlavlbxlczlabnbdnbfnbhnbjnblnbnnbpnbrnbtnbvnbxnaznadpafpahpajpalpanpapparpatpavpaxpaaqaAqhgghughgkhuk") +r(5050, "K for Kyodai", layout="0caaccaceacmacoacqacacbcccecckcbmccoccaebceceeciebkecmecagbcgcegcggbigckgcaibcibeibgiciicakbckcekcgkbikckkcambcmcemcimbkmcmmcaobcoceockobmocoocaqccqceqcmqcoqcqq") +#r(5051, "K for Kyodai Traditional", layout="0acaaeaagaaiaakaamaaoaaqaasaauaawaayaagcaicakcamcaocaqcascaucaeeageaieakeameaoeaqeaseaueaweacgaegaggaigakgamgaogaqgasgaugawgaygaahaAhaciaeiagiaiiakiamiaoiaqiasiauiawiayiaekagkaikakkamkaokaqkaskaukawkagmaimakmammaomaqmasmaumacoaeoagoaioakoamoaooaqoasoauoawoayokjckrckpdkjehgfknfhufkjghghklhhuhkjihgjknjhujkjkkplkjmkrm") +r(5052, "Km", layout="0baabcabiaakaboacqacyabAabacaccbgcaicbocaqcdscdwcaycbAcdudbaeacebeeageboeaqeaseaweayebAeeufbagacgbegaggbogaqgaygbAgduhbaiacibgiaiiboiaqiayibAibakbckbikakkbokbqkbykbAkjcfhgfoabooboAboadoodoAdoafoefoofoAfoahoohoAhoajoojoAjvacvocvAcvaevoevAevagvogvAgvaivoivAiCadCodCAdCafCofCAfCahCohCAh") +r(5053, "Kujaku", layout="0bnabpabrabtabvabxablbczbaBbbhcbjcancapcarcatcavcaxcaddbfdaldazddBdaDdaheajeabfcdfaffaAfdCfaEfbahcchaehakhamhaohashaAhdChaEhabjcdjafjaAjdCjaEjahkajkadlbflallazldBlaDlbhmbjmanmapmarmatmavmaxmblncznaBnbnobpobrobtobvobxohnghpghtghjhhnihpihtioofoqfoufoihoojoqjoujvpevrevvfvhhvvjvpkvrkCwgCCgCghCwiCCi") +r(5054, "Labyrinth", layout="0caaacaaeaagaaiaakaamaaoaaqaasaauaawaayaaAaaCacEaaacbkcbocbucaEcaaebcebeebgebkeboebsebuebyebAeaEeaagbkgbygaEgaaibeibiibkiboibqibsibuibwibyibAiaEiaakbekbokbwkaEkaambembgmbimbkmbombqmbsmbwmbAmbCmaEmaaobkobwoaEocaqacqbeqdgqdkqbmqaoqaqqasqauqbwqdyqdCqbEq") +r(5055, "Lion", layout="0bdbbfbcjbclbawbaybbbcbhcaucaAccjdcldasdaCdbaeaqecvfczfaDfbbgapgaEhcbiceichickiaoicxiaFjcckcfkcikclkbokcwkcykbulbAlaElcbmcemchmckmcnmbqmaDnccocfocioclocooaroatoavoaxoazoaBohvahxahzahtbhBbhrchDdhpehEfhoghFhhnihGjhFlhEnhsohCohuphwphyphApwkc") +r(5056, "Lost ", layout="0afaaxaabbadbahbajbblbbnbbpbbrbatbavbazbaBbafcaxcabdaddbkdcodbsdazdaBdbiebmebqebueaafacfaefbgfdofbwfayfaAfaCfaahaehbghcihckhdmhdohdqhcshcuhbwhayhaChaajacjaejbgjdojbwjayjaAjaCjbikbmkbqkbukabladlbklcolbslazlaBlafmaxmabnadnahnajnblnbnnbpnbrnatnavnaznaBnafoaxoombooboqbomnoonoqn") +r(5057, "Maya", layout="0aaaacaaeaagaaiaaqaasaauaawaayaaacaccaecagcaicaqcascaucawcaycaaeaceaeeageaieakeameaoeaqeaseaueaweayeaigakgamgaogaqgaiiakiamiaoiaqiaakackaekagkaikakkamkaokaqkaskaukawkaykaamacmaemagmaimaqmasmaumawmaymaaoacoaeoagoaioaqoasoauoawoayohcbhebhgbhsbhubhwbhcdhedhgdhsdhudhwdhkfhmfhofhkhhmhhohhkjhmjhojhclhelhglhslhulhwlhcnhenhgnhsnhunhwnoccoecogcoscoucowcolfonfolhonholjonjocmoemogmosmoumowmvdcvfcvtcvvcvmfvmhvmjvdmvfmvtmvvmCecCucCmgCmiCemCum") +r(5058, "Mesh", layout="0baabcabeabiabkabmabqabsabuabyabAabCabacbecbicbmcbqcbucbycbCcbaebcebeeagebiebkebmeaoebqebsebueawebyebAebCeaegbigbmgbqgbugaygbaibcibeiagibiibkibmiaoibqibsibuiawibyibAibCibakbekbikbmkbqkbukbykbCkbambcmbembimbkmbmmbqmbsmbumbymbAmbCm") +r(5059, "Moth", layout="0baaccaceabgaanaapaarabyacAacCabEaaibawbbccagcakccpcaucaycbCcaidamdasdawdadeakeboebqeaueaBeamfasfacgaegahgajgbogbqgavgaxgaAgaCgamhashadiakiboibqiauiaBiaijamjasjawjbckagkakkcpkaukaykbCkailawlccmcembgmbpmbymcAmcCmbanbEnhoahqahichwchmehsehdghighwghBghmihsihikhwkopaoneopeoreppgoniopiorivdavBavoevqevoivqivdmvBmCpeCpi") +r(5060, "N for Namida", layout="0caaccaceacgacqacsacuacacbccbecbgcbiccqcbsccuccaebcebeebgebiebkecqebsecuecagbcgcegbigbkgbmgcqgbsgcugcaibciceibkibmiboibqibsicuicakbckcekbmkbokbqkbskcukcamccmcemcomcqmcsmcum") +#r(5061, "N for Namida Traditional", layout="0acaaeaagaaiaakaamaaoaaqaasaauaawaayacgcaicakcbmccoccqcasccucaeecgecieakeameaoeaqeasecueaweacgaegcggcigakgcmgaogaqgasgcugawgaygaahaAhaciaeicgiaiiakicmiaoicqiasicuiawiayiaekcgkaikakkamkaokcqkaskcukawkcgmaimckmcmmbomaqmasmcumacoaeoagoaioakoamoaooaqoasoauoawoayoikfikhiohiojisjisl") +#r(5062, "Naoki Haga Traditional", layout="0acaaeaagaaiaakaamaaoaaqaasaauaawaayadgcaicakcdmcaocaqcascaucaeedgeaiedkedmeaoecqecseaueaweacgaegdggaigakgdmgaogaqgasgaugawgaygaahaAhaciaeiagiaiiakiamidoiaqiasiduiawiayiaekagkcikckkamkdokdqkdskdukawkagmaimakmammdomaqmasmdumacoaeoagoaioakoamoaooaqoasoauoawoayojidvrevjk") +# +r(5063, "New Layout", layout="0aeaagaaiaakabpaauaawaayaaAaaccaCcahdajdavdaxdaaeacealeateaCeaEeanfarfaagacgahgapgaCgaEganharhaaiacialiatiaCiaEiahjajjavjaxjackaCkaemagmaimakmbpmaumawmaymaAmhfahhahjahvahxahzahcdhidhwdhCdhkehuehafhcfhmfhofhqfhsfhCfhEfhahhchhmhhohhqhhshhChhEhhkihuihcjhijhwjhCjhfmhhmhjmhvmhxmhzmogaoiaowaoyaoceojeoveoCeolfotfoagocgongopgorgoCgoEgolhothociojiovioCiogmoimowmoymvhavxavcfvkfvufvCfvmgvogvqgvsgvchvkhvuhvChvhmvxmCcgClgCngCpgCrgCtgCCg") +r(5064, "Order", layout="0afaahaajaalaanaapaaraataaabaybaicakcamcaocaqcbadacdaedaudawdbydakebmeaoecafbcfaefaufbwfcyfaggaigakgbmgaogaqgasgcahcchbehbuhcwhcyhagiaiiakibmiaoiaqiasicajbcjaejaujbwjcyjakkbmkaokbalaclaelaulawlbylaimakmammaomaqmaanaynafoahoajoaloanoapoaroatohgahiaikaimaioahqahsahlchnchghhihhkhhohhqhhshhlmhnmhgohioikoimoioohqohsoomcpmhomm") +r(5065, "Pattern", layout="0aaaacaafaahaakaamaapaaraauabwabzaaBaaacaccafcahcakcamcapcarcbuccwcczcbBccafacfaffchfckfcmfapfarfcufawfazfcBfaahcchcfhahhakhamhcphcrhcuhawhazhcBhaakackafkahkakkcmkcpkarkcukcwkczkcBkaamacmafmahmckmammapmcrmaumcwmczmaBmibailaifbihbibciqciqfilhialihl") +#r(5066, "Phoenix", layout="0aaaacaapaaraaEaaGaaebatbaCbaacagcapcarcaAcaGcaidaydakeboebqebseaweaafacfaefamfaufaCfaEfaGfaggbpgbrgaAgaahaihamhauhayhaGhaeiakicpicriawiaCiaajamjaujaGjbpkbrkaclaelaglailamlaulaylaAlaClaElakmbpmbrmawmacnafnamnaunaBnaEnaioaooasoayoacpafpaBpaEpakqawqhbbhFbhdchDchfdhBdhhehzehjfhxfhdghlghvghDghfhhBhhhihnihtihzihjjhxjhdkhlkhvkhDkhflhnlhtlhBlhhmhzmhjnhxnhlohvohnphtponfppfprfotfoplorlvqivqlCqf") +r(5067, "Portal", layout="0accagcawcaAcaedaydaceageaweaAeamgaqgamiaqiackagkawkaAkaelaylacmagmawmaAmhbbhdbhfbhhbhvbhxbhzbhBbhbdhhdhvdhBdhbfhdfhffhhfhlfhnfhpfhrfhvfhxfhzfhBfhlhhrhhbjhdjhfjhhjhljhnjhpjhrjhvjhxjhzjhBjhblhhlhvlhBlhbnhdnhfnhhnhvnhxnhznhBnoaaocaoeaogaoiaouaowaoyaoAaoCaoacoicoucoCcoaeoieokeomeooeoqeoseoueoCeoagocgoegoggoigokgosgougowgoygoAgoCgoaiocioeiogioiiokiosiouiowioyioAioCioakoikokkomkookoqkoskoukoCkoamoimoumoCmoaoocooeoogooioouoowooyooAooCo") +r(5068, "Rocket", layout="0amaaoaaqaazaaBaaDaakbaicamcaocaqcascaxcazcaBcaDcagdakdaudaeeaieameaqeaseaweayeacfagfakfaofaufaBfaegasgawgaygaahbchbghbihbkhbmhbohcqhauhaAhaChaeiasiawiayiacjagjakjaojaujaBjaekaikamkaqkaskawkaykaglaklaulaimammaomaqmasmaxmazmaBmaDmaknamoaooaqoazoaBoaDohnahpahlbhBbhjchnchpchhdhsdhfehxehdfhsfhughehhshiwhhyhhuihdjhsjhfkhxkhhlhslhjmhnmhpmhlnhBnhnohpoonbopbosgodhofhohhojholhonhouhosionnopnvobvehvghvihvshvonCfh") +r(5069, "Scorpion", layout="0avaacbaebagbaibaacaxcazcagdaidakdaoeaseayeaAeaafacfaefagfaifakfcmgaogcqgasgcugawgbygbAgckhciidmiaoicqiasiduiawibyibAickjcmkaokcqkaskcukawkbykaalaclaelaglailaklaomasmawmagnainaknaaoacpaepagpaiphdbhfbhhbhwbhbchychhdhzehbfhdfhffhhfhjfhofhsfhohhshhwhhojhsjhwjhblhdlhflhhlhjlholhslhwlhhnhbohdphfphhpoogosgoyhooiosiowioyjookoskvohvqhvshvojvqjvsj") +r(5070, "Screw Up", layout="0ciackacmabgbbobcecbicbkcbmccqcbgdbodcceceeakeamecqecsebgfbofccgcegakgamgcqgcsgbghbohcciceiaiiakicqicsibgjbojcckcekaikakkcqkcskbglbolcembimbkmbmmcqmbgnbonciockocmoilfikhijjvbfvtfvbhvthvbjvtjCafCufCahCuhCajCuj") +# +r(5071, "Seven", layout="0aaaacaafaahaakaamaapaaraauaawaazaaBaaEaaGaaacaccafcahcakcamcapcarcaucawcazcaBcaEcaGcaaeaceafeaheakeameapeareaueaweazeaBeaEeaGeaagacgafgahgakgamgapgargaugawgazgaBgaEgaGgaaiaciafiahiakiamiapiariauiawiaziaBiaEiaGiaakackafkahkakkamkapkarkaukawkazkaBkaEkaGkaamacmafmahmakmammapmarmaumawmazmaBmaEmaGmaaoacoafoahoakoamoapoaroauoawoazoaBoaEoaGoaaqacqafqahqakqamqapqarqauqawqazqaBqaEqaGqhqchlehvehggiqghAghbihlihvihFihgkiqkhAkhlmhvmhqo") +# +r(5072, "Seven Pyramids", layout="0aaaacaaeaagaaoaaqaayaaAaaCaaEaaacaccaecagcaocaqcaycaAcaCcaEcaaeaceaeeageayeaAeaCeaEeaagacgaegaggangapgargaygaAgaCgaEganiapiariaakackaekagkankapkarkaykaAkaCkaEkaamacmaemagmaymaAmaCmaEmaaoacoaeoagoaooaqoayoaAoaCoaEoaaqacqaeqagqaoqaqqayqaAqaCqaEqhbbhdbhfbhpbhzbhBbhDbhbdhddhfdhzdhBdhDdhbfhdfhffhzfhBfhDfhohhqhhojhqjhblhdlhflhzlhBlhDlhbnhdnhfnhznhBnhDnhbphdphfphpphzphBphDpoccoecoAcoCcoceoeeoAeoCeopiocmoemoAmoCmocooeooAooCovddvBdvdnvBn") +r(5073, "Shield", layout="0aaaacaaeaagaaiaakaamaaoaaxaaacaccaecagcaicakcamcaocbxcaaeaceaeeageaieakeameaoecxeabgadgafgahgajgalgangdxgaciaeiagiaiiakiamidxietjeBjaekagkaikakkbvkexkbzkagmaimcxmahodxohcbhebhgbhibhkbhmbhcdhedhgdhidhkdhmdhcfiefigfiifikfhmfhdhifhihhijhhlhhejigjiijhkjhglhilodbofbohbojbolboddofdohdojdoldohlvfcvhcvjcvfevhevjevggvigvhiChdChf") +r(5074, "Siam", layout="0afaazaadbahbaxbaBbacdaedagdaidandardawdaydaAdaCdaleateabfadfaffahfajfavfaxfazfaBfaDfaahachaehaghaihakhamhaohaqhashauhawhayhaAhaChaEhabjadjafjahjajjavjaxjazjaBjaDjalkatkaclaelaglailanlarlawlaylaAlaCladnahnaxnaBnafoazohddhfdhhdhxdhzdhBdhcfhefhgfhifhwfhyfhAfhCfhbhhdhhfhhhhhjhhlhhnhiphhrhhthhvhhxhhzhhBhhDhhcjhejhgjhijhwjhyjhAjhCjhdlhflhhlhxlhzlhBloedogdoydoAdodfoffohfoxfozfoBfochoehoghoihowhoyhoAhoChodjofjohjoxjozjoBjoelogloyloAl") +# +#r(5075, "Space Ship", layout="0afaahaajaalaanaapaaraataavaadbaxbabcancazcaaeafeaheajealeaneapeareateaveaAeadfaxfangadhaxhaniadjaxjankadlaxlanmadnaxnanohgahiahkahmahoahqahsahuahebhwbhcchychadhmdhodhAdhgehiehkehqehsehuehmfhofhdghxghnhhdihxihnjhdkhxkhnlhdmhxmhnnohaojaolaonaopaoraotaofbovbodcoxcobdozdoheojeoleoneopeoreoteqngodhoxhqniodjoxjqnkodloxlqnmviavkavmavoavqavsavgbvubvecvwcvcdvydvievkevmevoevqevsevdivxivdkvxkCnaCjeCleCneCpeCreCdjCxj") +# +r(5076, "Square", layout="0daadcadeadgadiadkadacdccdecdgcdicdkcdaedcedeedgediedkedagdcgdegdggdigdkgdaidcideidgidiidkidakdckdekdgkdikdkk") +r(5077, "Squares", layout="0caabcaceabgaciabkacmaboacqabsacuaaacauccddafdahdajdaldandapdcrdaaeauebdfbrfaagbggcigckgcmgbogaugcdhcrhaaibgiciickicmiboiauibdjbrjaakaukcdlaflahlajlallanlaplcrlaamaumcaobcoceobgociobkocmoboocqobsocuohidikdhmdhiliklhmlvjgvlgvjivli") +r(5078, "Squaring", layout="0caaacaceaciaakacmacqaasacuacyaaAacCaaacaecaicdkcamcaqcaucaycdAcaCccaeaceceecieakecmecqeasecuecyeaAecCecahachcehcihakhcmhcqhashcuhcyhaAhcChaajdcjaejaijamjaqjdsjaujayjaCjcalaclcelcilaklcmlcqlaslculcylaAlcCl") +r(5079, "Stairs", layout="0aoaaebaybeacdccagcaicakcbmccocbqcascaucawcdAceCcaedayddaeaieaoeauedCebefbyfaagaigaogaugaCgbchcehbghakhbmhbqhashbwhcyhbAhaaiaiiaoiauiaCibejbyjdakaikaokaukdCkaelayleamdcmagmaimakmbmmcombqmasmaumawmdAmeCmaenaynaoohechychofhahkohhChhojhemhym") +r(5080, "Star Ship", layout="0eoaaabdmbdqbaCbaccckccscaAcaadbidbudaCdbceagecoeawebAeaafaefamfaqfayfaCfecgaggaigbkgdogbsgaugawgeAgaahaehamhaqhayhaChbciagicoiawibAiaajbijbujaCjackckkcskaAkaaldmldqlaCleomhachCchaehCehaghegimgiqghyghCghaihCihakhCkoadoCdoafoCfoahoChoajoCjvaevCevagvCgvaivCiCafCCfCahCCh") +# +r(5081, "Step Pyramid", layout="0aaaacaaeaagaaiaakaamaaoaaqaaacaccaecagcaicakcamcaocaqcaaeaceaoeaqeaagacgaogaqgaaiaciaoiaqiaakackaekagkaikakkamkaokaqkaamacmaemagmaimakmammaomaqmhbbhdbhfbhhbhjbhlbhnbhpbhbdhddhfdhhdhjdhldhndhpdhbfhdfhnfhpfhbhhdhhnhhphhbjhdjhfjhhjhjjhljhnjhpjhblhdlhflhhlhjlhllhnlhplpccoecogcoicokcomcpococepeepgepiepkepmeooeocgpegpmgoogocipeipgipiipkipmiooipckoekogkoikokkomkpokCffChfCjfClfCfhChhCjhClh") +r(5082, "Stonehenge", layout="0cdachackacoacracvacyacCacaccFcajeaneareavecagcFgddhdhhdlhdphdthdxhdBhcajcFjajkankarkavkcancFncdpchpckpcopcrpcvpcypcCpveavgavlavnavsavuavzavBavadvFdvafvFfvakvFkvamvFmvepvgpvlpvnpvspvupvzpvBpCehCghCihCkhCmhCohCqhCshCuhCwhCyhCAh") +r(5083, "SunMoon", layout="0dgaciabkaamabyadebbrbbBbdccbvccaddcecheckecnebDecafbtfbAfdcgdjgdlgbxgcahchhcnhdcidjidlibribDicajbvjdckchkckkcnkbAkcalbsldcmbxmdenbBndgociobkoamobuovaevagvaivakCkh") +r(5084, "Temple", layout="0baaacaaeaalaanaapaaraataaAaaCabEaaacaccalcbncbpcbrcatcaCcaEcajdavdaaeblebnebpebrebteaEeaffahfajfavfaxfazfblgbngbpgbrgbtgadhafhahhajhavhaxhazhaBhblibnibpibribtiafjahjajjavjaxjazjaakblkbnkbpkbrkbtkaEkajlavlaamacmalmbnmbpmbrmatmaCmaEmbaoacoaeoaloanoapoaroatoaAoaCobEohhghjghvghxghhihjihvihxiooeoqeokgomgoogoqgosgougokiomiooioqiosiouiookoqkvpgvpi") +# +#r(5085, "Teotihucan", layout="0aaaacaaeaagaaiaakaamaaoaaqaasaaacascaaeaseaagcggckgcogasgaaicgickicoiasiaakaskaamasmaaoacoaeoagoaioakoamoaooaqoasoajqhbbhdbhfbhhbhjbhlbhnbhpbhrbhbdhrdhbfhrfhbhhrhhbjhrjhblhrlhbnhdnhfnhhnhjnhlnhnnhpnhrnhjpoccoecogcoicokcomcoocoqcoceoqeocgoqgocioqiockoqkocmoemogmoimokmommoomoqmojovddvfdvhdvjdvldvndvpdvdfvffvhfvjfvlfvnfvpfvdhwfhvhhwjhvlhwnhvphvdjvfjvhjvjjvljvnjvpjvdlvflvhlvjlvllvnlvplvjn") +r(5086, "The Door", layout="0amaaoaaqaeicekcemceoceqcesceucagediedueaweaegaggdigdugawgaygaeibgidiiduibwiayiackaekcgkdikakkaskdukcwkaykaAkaamacmbemcgmdimakmasmdumcwmbymaAmaCmaaobcobeocgodioakoasoduocwobyobAoaCo") +# +r(5087, "The Great Wall", layout="0aaaacaaeaagaaiaakaamaaoaaqaasaauaawaayaaAaaCaaEaaacaccaecagcaicakcamcaocaqcascaucawcaycaAcaCcaEcaaeaceaeeageaieakeameaoeaqeaseaueaweayeaAeaCeaEeaagacgaegaggaigakgamgaogaqgasgaugawgaygaAgaCgaEgaaiaciaeiagiaiiakiamiaoiaqiasiauiawiayiaAiaCiaEiaakackaekagkaikakkamkaokaqkaskaukawkaykaAkaCkaEkaamacmaemagmaimakmammaomaqmasmaumawmaymaAmaCmaEmaaoacoaeoagoaioakoamoaooaqoasoauoawoayoaAoaCoaEoaaqacqaeqagqaiqakqamqaoqaqqasqauqawqayqaAqaCqaEq") +r(5088, "Theater", layout="0baaccaceabgaaiaamaaqabsacuacwabyacaccccbecagcakcbmcaocascbuccwccyccaebceaeeaiebkebmeboeaqeauebwecyebagacgaggaigakgbmgaogaqgasgawgbygcaibciaeiaiibkibmiboiaqiauibwicyicakcckbekagkakkbmkaokaskbukcwkcykbamccmcembgmaimammaqmbsmcumcwmbym") +r(5089, "Tile Fighter", layout="0bfaahaatabvadccbecakcbmcbocaqcbwcdycbaecceaiebkebmeboebqeasecyebAebagbigckgamgaogcqgbsgbAgcchaehaghauhawhcyhbaibiickiamiaoicqibsibAibakcckaikbkkbmkbokbqkaskcykbAkdcmbemakmbmmbomaqmbwmcymbfoahoatobvohnhonepafpAfpahpAhpajpAjonk") +r(5090, "Tilepiles", layout="0aaaacaaeaagaaiaaobaqbasbaubaybaAbaCbaEbahcajcalcacdaedardatdaxdazdaBdakeameaoeaffahfaufawfayfangapgargaihakhaxhazhaqiasiauiajjaljanjaAjaCjatkavkaxkaelaglailaklaolaqlawmaymaAmaCmaEmabnadnafnahnajnhbahdahfahhahpbhrbhtbhzbhBbhDbhichkchddhsdhydhAdhlehnehgfhvfhxfhoghqghjhhyhhrihtihkjhmjhBjhukhwkhflhhlhjlhplhxmhzmhBmhDmhcnhenhgnhinocaoeaogaoqbosboAboCbojcozdomeowfopgosioljovkogloiloymoAmoCmodnofnohnvdavfavrbvBbvhlvzmvBmvenvgnCeaCAmCfn") +r(5091, "Time Tunnel", layout="0aaabcaceaegaeiaekaemacoabqaasaaacccceeceoccqcascaaecceeeeeoecqeaseaagccgeegeogcqgasgaaiccieeieoicqiasiaakbckcekegkeikekkemkcokbqkaskvcdvqdwcfwqfvchvqh") +r(5092, "Tomb", layout="0eaabcabeabgabiabkabmaboabqaesabaccccceccgccicckccmccoccqcbscaaedcebeeageaieakeameboedqeasebagccgcegeggaigakgemgcogcqgbsgdaibcibeidgiaiiakidmiboibqidsibgkaikakkbmkaimakmhjevfcvhcvjcvlcvncCgcCicCkcCmc") +# +#r(5093, "Tower and Walls", layout="0ekadmaeoadqaesadkccmccoccqcdscdaeecedeeegedieekecmedoecqeesedueewedyeeAedCedkgcmgcogcqgdsgekidmieoidqiesi") +r(5094, "Traditional Reviewed", layout="0acaaeaaiaakaamaaoaaqaasaawaayaagcaicbkccmccocbqcascaucaeeagebiebkecmecoebqebseaueaweacgaegbggcigckgcmgcogcqgcsgbugawgaygaahaAhaciaeibgiciickicmicoicqicsibuiawiayiaekagkbikbkkcmkcokbqkbskaukawkagmaimbkmcmmcombqmasmaumacoaeoaioakoamoaooaqoasoawoayovnfvlhwnhvphvnj") +r(5095, "Tree of Life", layout="0ababdacfadhacjablaanaapabractadvacxabzaaBaaccaAcaadbfdajdaldandapdardatdbxdaCdaceaAeaafaefagfaifbkfbsfaufawfayfaCfacgamgaqgaAgaehaihauhayhaliboiariagjawjblkaokbrkaambcmcembgmaimclmaomcrmaumbwmcymbAmaCmacoagocloaoocroawoaAoaiqakqamqcoqaqqasqauqhoaicdimdiqdiAdhdfiffhhfixfhzfilqirq") +# +r(5096, "Twin Temples", layout="0aaaacaaeaagaaiaakaaqaasaauaawaayaaAaaacakcaqcaAcamdaodaaeakeaqeaAeagfaifamfaofasfaufaagakgaqgaAgamhaohaaiakiaqiaAiaakackaekagkaikakkaqkaskaukawkaykaAkhbbhdbhfbhhbhjbhrbhtbhvbhxbhzbhbdhjdhldhpdhrdhzdhbfhffhvfhzfhbhhjhhlhhphhrhhzhhbjhdjhfjhhjhjjhrjhtjhvjhxjhzjoccoecogcoicoscoucowcoycokdoqdoceoieoseoyeocgoigosgoygokhoqhocioeiogioiiosiouiowioyivddvfdvhdvjdvrdvtdvvdvxdvdfvhfvjfvrfvtfvxfvdhvfhvhhvjhvrhvthvvhvxhCeeCgeCueCweCegCggCugCwg") +r(5097, "Vi", layout="0aaaaEaaacaccaCcaEcbaeaceaeeaAeaCebEecagbcgaegaggaygaAgbCgcEgcaibcibeiagiaiiawiayibAibCicEicakcckbekbgkaikakkaukawkbykbAkcCkcEkdamccmcembgmbimakmammasmaumbwmbymcAmcCmdEmeaodcoceocgobiobkoamoaooaqoasobuobwocyocAodCoeEo") +r(5098, "Victory Arrow", layout="0ataaabbcbbebbgbbibbkbambavbaxcaadamdbvdazdadebfebheajeaBeaafamfaofbvfbxfbzfaDfadgajgaqgaahaghamhaohbshbuhbwhbyhbAhbChbEhadiajiaqiaajamjaojbvjbxjbzjaDjadkbfkbhkajkaBkaalamlbvlazlaxmaanbcnbenbgnbinbknamnavnatohachmchaehmehdfhjfhaghmghoghdhhjhhqhhaihmihoihdjhjjhakhmkhamhmmodbofbohbojboadomdoafomfoahonhophorhothovhoxhozhoBhoajomjoalomlodnofnohnojn") +r(5099, "Wavelets", layout="0agaaqaaAaagcaqcaAccaeaeeaieaoeaseayeaCecGeaggaqgaAgcaiaeiaiiaoiasiayiaCicGiagkaqkaAkcamaemaimaomasmaymaCmcGmagoaqoaAoagqaqqaAqhgbhqbhAbhdehjehnehtehxehDehghhqhhAhhdihjihnihtihxihDihgjhqjhAjhdmhjmhnmhtmhxmhDmhgphqphApogcoqcoAcoceokeomeoueoweoEeoggoqgoAgociokiomiouiowioEiogkoqkoAkocmokmommoumowmoEmogooqooAovgdvqdvAdvbevlevvevFevgfvqfvAfvghvqhvAhvbivlivvivFivgjvqjvAjvglvqlvAlvbmvlmvvmvFmvgnvqnvAn") +r(5100, "Well", layout="0aiaakaamaaoaagcaicakcamcaocaqcacebeeegeeieekeemeeoeeqebseaueaafawfacgbegeggaigakgamgaogeqgbsgaugaahawhacibeiegiaiiakiamiaoieqibsiauiaajawjackbekegkeikekkemkeokeqkbskaukbimakmammbomaioakoamoaoohcfhufhchhuhhcjhuj") +#r(5101, "What a Pyramid", layout="0aaaacaaeaagaaiaakaamaaoaaqaasaauaawaaacaccbecbgcbicbkcbmcbocbqcbscaucawcaceaeebgeciedkedmecoebqeaseaueaegbggdigbkgbmgdogbqgasgaeibgidiibkibmidoibqiasiackaekbgkcikdkkdmkcokbqkaskaukaamacmbembgmbimbkmbmmbombqmbsmaumawmaaoacoaeoagoaioakoamoaooaqoasoauoawo") +r(5102, "Yummy", layout="0aoaaibakbbmbbqbasbaubaocagdbidbkdbmdbqdbsdbudawdaoeaefbgfcifckfdmfdqfcsfcufbwfayfaogaahachbehcghbihakhashbuhcwhbyhaAhaChaoiaejbgjcijckjdmjdqjcsjcujbwjayjaokaglbilbklbmlbqlbslbulawlaomainaknbmnbqnasnaunaooiobiodkofkohkojiolion") diff --git a/pysollib/games/mahjongg/mahjongg2.py b/pysollib/games/mahjongg/mahjongg2.py new file mode 100644 index 00000000..bd609944 --- /dev/null +++ b/pysollib/games/mahjongg/mahjongg2.py @@ -0,0 +1,138 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +# This layouts converted from Kyodai Mahjongg game +# http://www.kyodai.com/index.en.html +# http://files.cyna.net/layouts.zip + +from mahjongg import r + +# /*********************************************************************** +# // game definitions +# ************************************************************************/ + +# +r(5200, "Another Round", ncards=140, layout="0aagaaihbhacfachacjhdghdiaecaeeaegoehaeiaekaemhfdhffhfhhfjhflagaagcageogeaggoggagiogiagkogkagmagohhbhhdhhfhhhhhjhhlhhnaiaaicoicaieoieaigoigaiioiiaikoikaimoimaiohjbhjdhjfhjhhjjhjlhjnakaakcakeakgakiakkakmakoamaamcammamoaoaaocaoeaogaoiaokaomaoohpbhpdhpfhphhpjhplhpnaqaaqcoqcaqeoqeaqgoqgaqioqiaqkoqkaqmoqmaqohrbhrdhrfhrhhrjhrlhrnasaascaseoseasgosgasiosiaskoskasmasohtdhtfhthhtjhtlaucaueaugouhauiaukaumhvghviawfawhawjhxhaygayi") +r(5201, "Aqab's", layout="0caedagcaicccbcgcckceabegcembggahdahjbigbkabkeckgbkibkmbmabmccmedmgcmibmkbmmboacocdoedogdoicokbombqabqccqedqgcqibqkbqmbsabsecsgbsibsmbugawdbwgawjcyabygcymcAcbAgcAkcCedCgcCi") +# +r(5202, "Big Mountain", layout="0aaaaaqaeihfiaghogiagjhhhvhihhjaigoihaiiCiioijaikhjgvjhhjivjjhjkakfokgakhCkhokiakjCkjokkaklhlfvlghlhvlihljvlkhllameomfamgomhCmhamiomjCmjamkomlammhnehngvnghnivnihnkvnkhnmaodaofoofaohoohCohaojoojCojaoloolaonhpehpgvpghpivpihpkvpkhpmaqdaqfoqfaqhoqhCqhaqjoqjCqjaqloqlaqnhrehrgvrghrivrihrkvrkhrmaseosfasgoshCshasiosjCsjaskoslasmhtfvtghthvtihtjvtkhtlaufougauhCuhouiaujCujoukaulhvgvvhhvivvjhvkawgowhawiCwiowjawkhxhvxihxjayhoyiayjhziaAiaGaaGq") +# +r(5203, "Bridge", layout="0aaaaacaaeaagaaihbahbchbehbghbiocaoccoceocgociwdavdcvdevdgwdioeboedoefoehvfahfcvfchfevfehfgvfgvfiogbagdogdagfogfoghvhahhcvhchhevhehhgvhgvhioibaidoidaifoifoihvjahjcvjchjevjehjgvjgvjiokbokdokfokhvlavlcvlevlgvliCmaCmivnavncvnevngvniooboodoofoohvpahpcvpchpevpehpgvpgvpioqbaqdoqdaqfoqfoqhvrahrcvrchrevrehrgvrgvriosbasdosdasfosfoshvtahtcvtchtevtehtgvtgvtiouboudoufouhwvavvcvvevvgwviowaowcoweowgowihxahxchxehxghxiayaaycayeaygayi") +r(5204, "Butterfly 2", layout="0aaeaagabcabiadbadjhefvefaenafaafeofeafgofgaflafphgdvgdwgfhghvghahaaheoheahgohgahkahqhifvifcinbjbbjjajqblcbliblqbmocndcnhcnmapbbpdapfbphapjbplapnhqbpqdiqfpqhiqjpqlhqnarbbrdarfbrharjbrlarnctdcthctmbuobvcbvibvqbxbbxjaxqhyfvyfcynazaazeozeazgozgazkazqhAdvAdwAfhAhvAhaBaaBeoBeaBgoBgaBlaBphCfvCfaCnaDbaDjaFcaFiaGeaGg") +r(5205, "ChessMania", layout="0aaaaacaaeaagaajaalaanaapacaacgbcmaeaaegaejaelaenaepaibbidaifbihaijbilainbipbkbakdbkfakhbkjaklbknakpambbmdamfbmhamjbmlamnbmponfonhonjonlbobaodbofaohbojaolbonaopopfppioplaqbbqdaqfbqhaqjbqlaqnbqporforlbsbasdbsfashbsjaslbsnaspaubbudaufbuhaujbulaunbupbwbawdbwfawhbwjawlbwnawpaBaaBcaBgaBjaBlaBpaDabDdaDgaDjbDmaDpaFaaFeaFgaFjaFnaFp") +r(5206, "Cross", layout="0baebagbaiaccdcebcgdciackaeacecdeebegdeicekaemcgadgcdgebggdgidgkcgmbiabicaiebigaiibikbimbkabkcakebkgakibkkbkmcmadmcdmebmgdmidmkcmmaoacocdoebogdoicokaomaqcdqebqgdqiaqkbsebsgbsi") +r(5207, "Cupido's Heart", layout="0aadaalbbfbbjcchaddadlbefcehbejcghdhfdidcihdjbdjjckhdkldlacmhdmndnbdodcohdopeqedqqdsddspdtbdundvadwldxbdxjdyddyhdzfcAhaCecChaCkbEfcEhbEjcGh") +r(5208, "Diamond", ncards=140, layout="0aaiaakacgbcibckacmaeebegceicekbemaeoagcbgecggdgidgkcgmbgoagqaiabicciedigeiieikdimciobiqaisakabkcckedkgekiekkdkmckobkqaksamcbmecmgdmidmkcmmbmoamqaoebogcoicokbomaooaqgbqibqkaqmasiask") +r(5209, "Dragon 2", layout="0bafbbdobeobgbbhbcfbcmbdkodlodnbdobecaegbemofcbgabgcbghbgjaglohavhbohcbiabicbijbilojbbjhojjojlbkbbkfokhbkjvkjbklvklolbolfblholjollbmbcmdbmfbmjbmlboioojbokaoohpobqhbqjaqobrforhorjasdosfbshvshbsjvsjbslbsnhtdbtfothotjaubaudbuhbujbwgbwkbwmbydoyebyfbymayohzobAcaAobBjbCdoCebCfoCgbCh") +r(5210, "Empty Pyramids", layout="0aaiabghbiabkaccacehcgocihckacmacoadghdiadkaeiahiaighiiaikajehjgojihjkajmakchkeokgvkiokkhkmakoalahlcolevlgClivlkolmhloalqhmaamchmeomgvmiomkhmmamohmqonahncanehngonihnkanmhnoonqvoaoochoeaoghoiaokhomooovoqCpavpcopehpgapiopihpkopmvpoCpqvqaoqchqeaqghqiaqkhqmoqovqqorahrcarehrgorihrkarmhroorqhsaaschseosgvsioskhsmasohsqatahtcotevtgCtivtkotmhtoatqauchueougvuioukhumauoavehvgovihvkavmawghwiawkaxiaAiaBghBiaBkaCcaCehCgoCihCkaCmaCoaDghDiaDkaEi") +r(5211, "Fish face", layout="0bajbciocjbckvdjbehoeibejoekbelcggcgmchichkcifcincjhcjlckebkjckoclgclmcmebmiomjbmkcmocnccnqcoeboioojbokcoobpbcpgcpmbprcqebqjcqoaracrhcrlarsbsfbsnbtiotjbtkbugbumbwhbwlbyibykcAjcBhcBlbDgbDmaFfaFn") +r(5212, "Floating City", layout="0oagoaiocdocfochocjoclocphdahdchdmhdoaeboebaedaefaehaejaelaenoenhfahfcvfchfmvfmhfoagbagnahdvheahfahhahjvhkahlaibainvjgvjiakbCkhaknhlfhlhhljambamdamfomgamhCmhomiamjamlamnomphnfhnhhnjjoaaobCobaodCodaofCofoogaohCohooiaojCojaolColaonConjooCopooqhpfhphhpjaqbaqdaqfoqgaqhCqhoqiaqjaqlaqnoqphrfhrhhrjasbCshasnvtgvtiaubaunavdvveavfavhavjvvkavlawbawnhxahxcvxchxmvxmhxoayboybaydayfayhayjaylaynoynhzahzchzmhzooAdoAfoAhoAjoAloApoCgoCi") +#r(5213, "Flowers 2", layout="0aaiacgbciackadcadoaeiafabfcafeafmbfoafqahcahoaihaijhjiakfakhakjaklhlghlihlkamdamfamhomhamjomjamlamnhnehnghnivnihnkhnmaobaodaofoofaohoohaojoojaoloolaonaophpchpehpgvpghpivpihpkvpkhpmhpoaqbaqdoqdaqfoqfaqhoqhCqhaqjoqjCqjaqloqlaqnoqnaqphrchrehrgvrghrivrihrkvrkhrmhroasbasdasfosfashoshasjosjasloslasnasphtehtghtivtihtkhtmaudaufauhouhaujoujaulaunhvghvihvkawfawhawjawlhxiayhayjazcazoaBabBcaBeaBmbBoaBqaCiaDcaDoaEgbEiaEkaGi") +#r(5214, "Full Vision 3", layout="0aaeaagaaihbehbiacbhccacdacfhcgachacjhckaclacnhcoacpaeahebaecaeeaegaeiaekhelaemagbhgcagdagfhggaghagjhgkaglagnhgoagphhehhiaieaigaiiainhioaiphjgakeakgakiaknhkoakphlehliambhmcamdamfhmgamhamjhmkamlamnhmoampaoahobaocaoehofaogaoiaokholaomaqbhqcaqdaqfhqgaqhaqjhqkaqlaqnhqoaqphrehriaseasgasiasnhsoasphtgaueaugauiaunhuoauphvehviawbhwcawdawfhwgawhawjhwkawlawnhwoawpayahybaycayeaygayiaykhylaymaAbhAcaAdaAfhAgaAhaAjhAkaAlaAnhAoaAphBehBiaCeaCgaCi") +r(5215, "Hidden Words", layout="0haahachaehaghalabaabcobdabeabgabjablbbnabphcahcchceocghchhckhcqadgadmodohefheihemheoafgafjofjaflafnafphgfogghgkhgmhgohichiehikhinajaojaajcojdajeajghjhajjajlajnajphkbhkfokjhklhkpalaalghlialjalmombhmchmehmnanaancanebnganjanlannbnphochoiholhqchqfhqihqkaraarcarearjhschshhslhsnhspatgatjatlatnatphuchuhhunavaavcaveavjhvkhwdhwfhxihxmhxqayahybaycayeaygayjaylaynhyoayphzfhzkaAabAdaAghAhaAjaAmaAphBlhBnhBqaCahCbaCghCiaCjaCphDfhDp") +r(5216, "Hovercraft", layout="0aadaafaahaajjbgdccdceacgdcidckjdgaedaefaehaejhfgagfpggaghhhgaigajajjgajmhkaakghkmalaolaalmolmhmavmaemghmmvmmanaonaCnaenceneenienkanmonmCnmhoavoaeoghomvomapaopaapmopmhqaaqghqmarajrgarmasghtgaufpugauhhvgawdawfawhawjjxgdycdyeaygdyidykjzgaAdaAfaAhaAj") +r(5217, "Hurdles", layout="0aaaaacaaeaagaaiaakaamaaohbahbchbehbghbihbkhbmhboacaocaaccoccaceoceacgocgaciociackockacmocmacoocohdahdchdehdghdihdkhdmhdoaeaaecaeeaegaeiaekaemaeoagaagcageaggagiagkagmagohhahhchhehhghhihhkhhmhhoaiaoiaaicoicaieoieaigoigaiioiiaikoikaimoimaiooiohjahjchjehjghjihjkhjmhjoakaakcakeakgakiakkakmakoamaamcameamgamiamkammamohnahnchnehnghnihnkhnmhnoaoaooaaocoocaoeooeaogoogaoiooiaokookaomoomaooooohpahpchpehpghpihpkhpmhpoaqaaqcaqeaqgaqiaqkaqmaqo") +r(5218, "Hurricane", layout="0babaadaambaoabibegbekofdbfeoffafiofioflbfmofnbgchgibgoahaahiohiahqhibhiihipajbajeijfajgvjgajiojiajkvjkijlajmajphkbhkihkpalcalialohmchmoandineanfanianlinmannapbipdapevpeipfapgapkiplapmvpmipnappardirearfariarlirmarnhschsoatcatiatohubhuihupavbaveivfavgvvgavioviavkvvkivlavmavphwbhwihwpaxaaxioxiaxqbychyibyoozdbzeozfazioziozlbzmoznbAgbAkaDibEbaEdaEmbEo") +# +r(5219, "IloveU", layout="0caddafcahdaldandapdcbcciceacejcgacgkdibcilckdckmcmecmndngdnpcoeconcqdcqmdsbcslcuacukcwacwjdybcyidzldzndzpcAddAfcAhdBpdDldDndDp") +r(5220, "Inazuma", layout="0caaaaocaqcccacmccoacqceebeiaekcemaeoagacggcgkagmciaaicciibimakackcakeckkamccmeamgcmmaoecogaoicoocqaaqgdqiaqkcqqcscasicskasmcueaukcumauocwgawmcwoawqbyecyiayocyqaAecAgcAkaAqaCccCeaCgbCicCmaEacEcaEecEocGaaGccGq") +r(5221, "JPs", layout="0baabakbbmbcabckbcobdmbdqbeabeobfqbgabhobhqbiabicbiebigbiibikbimbjobkabkcbkebkgbkibkkbkmamqbqabqcbqebqgbqibqkbqmbqobqqbsabscbsebsgbsibskbsmbsobsqbuabuhbujbwabwhbwjaxqbyabyhbyjbAabAcbAgbAibCabCcbCebCgbCibEabEcbEebEgbEibGe") +r(5222, "Japan", ncards=96, layout="0baabacbaebagbaibcaacebcibeaaeebeibgabgcbgebggbgiahoajkajoalgalialkhllalmaloangbnibnkanmapebpgbpiapkapmbrebrgariarkatehtfatgatiavaavcavebwibwoaxaaxcbxmbyiaykazabAgbAibAkbAmbAobCiaCkbDmbEibEo") +r(5223, "Krebs", layout="0aaaaacaaeaagbaibalaanaapaaraatacaactaeaaetagaagtaiaCikaitvjkakaCkjokkCklaktvljhlkvllamaCmiomjamkCmkomlCmmamtvnihnjvnkhnlvnmaoaCohooiaojCojookaolColoomConaotvphhpivpjhpkvplhpmvpnbqaCqgoqhaqiCqioqjaqkCqkoqlaqmCqmoqnCqobqtvrhhrivrjhrkvrlhrmvrnCshosiasjCsjoskaslCslosmCsnbtavtihtjvtkhtlvtmbttCuioujaukCukoulCumavavvjhvkvvlavtCwjowkCwlaxavxkaxtCykazaaztaBaaBtaDaaDtaFaaFtaHaaHcaHeaHgdHidHlaHnaHpaHraHt") +r(5224, "Kumo", layout="0caadaccaecagbaibamdaqdcacccacebcgbckdcoceaaecceebeidembeqcgabgccggdgkbgobiabiediibimbiqbkcdkgckkbkockqbmadmebmicmmamocmqdocbogbokaomcoodoqdqabqebqicqkcqmdqocqq") +r(5225, "Kyodai 14", layout="0aaiachhciacjodiaefhegaehheiveiaejhekaelofhCfiofjagchgdagehgfagghghagivgihgjagkhglagmhgnagoohiaibhicaidaihhiiaijainhioaipakcbkgokhbkivkiokjbkkakohlchloamcbmfbmlamoaoahobaochodaoeooehofvofaogooghohvohaoiooihojvojaokookholvolaomoomhonaoohopaoqaqcbqfbqlaqohrchroascbsgoshbsivsiosjbskasoaubhucaudauhhuiaujaunhuoaupoviawchwdawehwfawghwhawivwihwjawkhwlawmhwnawooxhCxioxjayfhygayhhyivyiayjhykayloziaAhhAiaAjaCi") +r(5226, "Kyodai 17", layout="0daacaccaecagcaicakdamccaccgccmceacegcemcgacgccgecggcgicgkcgmciadigcimckadkgckmcmacmccmecmgcmicmkcmmcoacogcomcqacqgcqmdsacsccsecsgcsicskdsm") +# +r(5227, "Kyodai 18", layout="0daidchdcjdegdekdgfdgldiedimdkdakidkndmcamhamjdmodobaogaoiaokdopdqaaqfaqhaqjaqldqqdsbasgasiaskdspducauhaujduodwdawidwndyedymdAfdAldCgdCkdEhdEjdGi") +r(5228, "Kyodai 20", layout="0aaeaagaaiaakaamaaohbjacdaciackacpaecbehbelaeqagbaggagmagraiaaifhigaihoihhiiviiaijoijCijhikvikailoilhimainaisakaakebkjakoaksamaamdcmhamjcmlampamsaoahobaocoochodvodaoeooeCoehofvofaogooghohaoikojaokholaomoomhonvonaoooooCoohopvopaoqooqhoraosaqaaqdcqhaqjcqlaqpaqsasaasebsjasoassauaaufhugauhouhhuivuiaujoujCujhukvukauloulhumaunausawbawgawmawraycbyhbylayqaAdaAiaAkaAphBjaCeaCgaCiaCkaCmaCo") +# +r(5229, "Kyodai 23", layout="0aaehbeacdoceacfhdevdeaecaeeoeeaeghfdvfehffagaagcageogeaggagihhbhhdhhfhhhaiaaicoicaieoieaigoigaiihjbhjdvjdhjfvjfhjhakaakcokcakeokeCkeakgokgakihlbhldvldhlfvlfhlhamaamcomcameomeamgomgamihnbhndhnfhnhaoaaocaoeooeaogaoihpdhpfaqaaqcaqeoqeaqgaqihrbhrdhrfhrhasaascoscaseoseasgosgasihtbhtdvtdhtfvtfhthauaaucoucaueoueCueaugougauihvbhvdvvdhvfvvfhvhawaawcowcaweoweawgowgawihxbhxdhxfhxhayaaycayeoyeaygayihzdvzehzfaAcaAeoAeaAghBevBeaCdoCeaCfhDeaEe") +# +r(5230, "Kyodai 24", layout="0aaaiabaacaaejafaagaaiiajaakvbcibdCbfibhvbiacaicbaccacevceicfacgvcgaciicjackvdciddCddCdfidhCdhvdiaeaiebaecaeeveeiefaegvegaeiiejaekvfcifdCfdifhCfhvfiagaigbagcagevgeigfaggvggagiigjagkvhcihdChdihhChhvhiaiaiibaicaievieiifaigvigaiiiijaikvjcijdCjdCjfijhCjhvjiakaikbakcakevkeikfakgvkgakiikjakkvlcildClfilhvliamaimbamcamejmfamgamiimjamk") +r(5231, "Kyodai 25", layout="0cagbaicakbcgbckodgodkbegbekcggcgkbieoifbigciibikoilbimbkiolicmabmicmqboabogdoibokboqcqabqcoqdbqedqgdqkbqmoqnbqocqqbsabsgdsibskbsqcuabuicuqovibwibyeoyfbygcyibykoylbymcAgcAkbCgbCkoDgoDkbEgbEkcGgbGicGk") +# +r(5232, "Kyodai 26", layout="0aahhbhacgacihdghdiaefaehaejhffhfhhfjageaggagiagkhhehhghhihhkaidaifaihaijailhjdhjhhjlakcakeakgakiakkakmhlchlehlghlihlkhlmambamdamfamhamjamlamnhnbhnfhnhhnjhnnaoaaocaoeaogaoiaokaomaoohpahpchpehpghpihpkhpmhpoaqaaqcaqeaqgaqiaqkaqmaqohrahrchrehrghrihrkhrmhroasaascaseasgasiaskasmasohtbhtfhthhtjhtnaubaudaufauhaujaulaunhvchvehvghvihvkhvmawcaweawgawiawkawmhxdhxhhxlaydayfayhayjaylhzehzghzihzkaAeaAgaAiaAkhBfhBhhBjaCfaChaCjhDghDiaEgaEihFhaGh") +# +r(5233, "Kyodai 27", layout="0aagacfhcgachaeehefaegoeghehaeivfgagdhgeagfogfhggCggaghoghhgiagjvhfvhhaichidaieoiehifCifaigoighihCihaiioiihijaikvjevjgvjiakbhkcakdokdhkeCkeakfokfhkgCkgakhokhhkiCkiakjokjhkkaklvldvlfvlhvljamahmbamcomchmdameomehmfCmfamgomghmhCmhamiomihmjamkomkhmlammvndvnfvnhvnjaobhocaodoodhoeCoeaofoofhogCogaohoohhoiCoiaojoojhokaolvpevpgvpiaqchqdaqeoqehqfCqfaqgoqghqhCqhaqioqihqjaqkvrfvrhasdhseasfosfhsgCsgashoshhsiasjvtgauehufaugoughuhauiawfhwgawhayg") +# +r(5234, "Kyodai 28", layout="0baibbgbbkbcebcibcmbdcbdobeabeibeqbgacggvghcgiCgivgjcgkbgqbiacifciicilbiqbkackeakhakjckmbkqhlhhljbmacmdamgamiomiamkcmnbmqhnhhnjboacoeaohaojcomboqbqacqfcqicqlbqqbsacsgvshcsiCsivsjcskbsqbuabuibuqbvcbvobwebwibwmbxgbxkbyi") +# +r(5235, "Kyodai 41", layout="0CaeCagCaivbevbgvbiCcdoceocgociCcjvddhdevdfhdgCdgvdhhdivdjCecaeeoeeCeeaegoegaeioeiCeiCekCfavfbofchfdvfdhffvffCfghfhvfhhfjvfjofkvflCfmCgdageogeaggoggagiogiCgjChavhbohchhdvhdhhfvhfChghhhvhhhhjvhjohkvhlChmCicaieoieCieaigoigaiioiiCiiCikCjavjbojchjdvjdhjfvjfCjghjhvjhhjjvjjojkvjlCjmCkdakeokeakgokgakiokiCkjClavlbolchldvldhlfvlfClghlhvlhhljvljolkvllClmCmcameomeCmeamgomgamiomiCmiCmkvndhnevnfhngCngvnhhnivnjCodooeoogooiCojvpevpgvpiCqeCqgCqi") +# +r(5236, "Kyodai 42", layout="0oaboadCagoajoalhbahbcvbchbeobfvbgobhhbihbkvbkhbmacbacdacjaclhdbhddodevdfCdgvdhodihdjhdlaecaekhfchfeoffvfgofhhfihfkagdCggagjhhdhhfhhhhhjaieaiihjehjghjiakfCkgakhhlfvlghlhCmfamgomgCmhhnfvnghnhaogCoghpfhphCqcvqdoqeCqeaqgoqgoqiCqivqjCqkhrfhrhasgCsghtfvtghthCufaugougCuhhvfvvghvhawfCwgawhhxehxghxiayeayihzdhzfhzhhzjaAdCAgaAjhBchBeoBfvBgoBhhBihBkaCcaCkhDbhDdoDevDfCDgvDhoDihDjhDlaEbaEdaEjaElhFahFcvFchFeoFfvFgoFhhFihFkvFkhFmoGboGdCGgoGjoGl") +r(5237, "Lattice", layout="0aaiacebciacmaecbeeaegbeiaekbemaeoagecgiagmaicbieaigciiaikbimaioakeckiakmamcbmebmgdmibmkbmmamoboeeoibomaqabqccqeeqgdqieqkcqmbqoaqqbseesibsmaucbuebugduibukbumauoawecwiawmaycbyeaygcyiaykbymayoaAecAiaAmaCcbCeaCgbCiaCkbCmaCoaEebEiaEmaGi") +# +r(5238, "Leo", layout="0aapabiablhbphcfacghchhclacnocpadjodladpvdpheeaefheiaelvelhepCepofihflCflafnofphgdagevgiagjoglagpvgphhiChiahlvhlhhpChphicaidoiihilCilainoipvjiajjojlajpvjpbkabkchkiCkiaklvklhkpCkpolbolihllalnolpbmabmcvmiamjomlampvmphnianlhnpooiholaonoophpfaphapjappaqfhqiaqlhqphrdarnasehsqhtcatpaudbumhuphvbcvgavqawccwlhwqhxbcxjaxpayccylhyphzbczgazqaAdbAmhAqhBcaBpaCehCphDeaDgaDohEgaEiaEmhEohFiaFkhFmhGk") +# +r(5239, "Loose Ends", layout="0aaaoabaaioapaaqhbahbihbqacboccachociacjocoacphdbhdivdihdpaecoedaegaeioeiaekoenaeohfchfivfihfoagdogeaghogiagjogmagnhhdhhivhihhnaieoifaiioiioilaimhjfhjihjlakgokgakiakkokkhlholihljamahmbamcomchmdvmdameomehmfvmfamgvmhamiCmivmjamkhmlvmlammommhmnvmnamoomohmpamqhnhonihnjaogoogaoiaokookhpfhpihplaqeoqfaqioqioqlaqmhrdhrivrihrnasdoseashosiasjosmasnhtchtivtihtoaucoudaugauiouiaukounauohvbhvivvihvpawbowcawhowiawjowoawphxahxihxqayaoybayioypayq") +r(5240, "Mini Traditional", ncards=48, layout="0aaeacdacfhdeaecaeeoeeaeghfdvfehffagbagdogeagfaghhhchhevhehhgaiaaicoicaieoieaigoigaiihjchjevjehjgakbakdokeakfakhhldvlehlfamcameomeamghneaodaofaqe") +r(5241, "Mini-Layout", ncards=8, layout="0aabaadacahcbhcdaceaebaed") +r(5242, "Mission Impossible", layout="0baabamaapccaccmacpdeacecbeeaegbeicekdemaepcgacgmagpbiabimaipakpbmacmcdmeemgdmicmkbmmampcocaopdqeaqpcscaspbuacucdueeugduicukbumaupawpbyabycbyebygbyibykbymaypcAacAgaApdCadCgaCpeEaaEp") +# +r(5243, "Multi X", layout="0aaaaaiaaqhbbhbhhbjhbpoccocgockocovddvdfvdlvdnceeCeecemCemvfdvffvflvfnogcoggogkogohhbhhhhhjhhpaiaaiiaiqhjbojcvjdCjevjfojghjhojihjjojkvjlCjmvjnojohjpakaakiakqhlbhlhhljhlpomcomgomkomovndvnfvnlvnncoeCoecomComvpdvpfvplvpnoqcoqgoqkoqohrbhrhhrjhrpasaasiasqhtbotcvtdCtevtfotghthotihtjotkvtlCtmvtnotohtpauaauiauqhvbhvhhvjhvpowcowgowkowovxdvxfvxlvxncyeCyecymCymvzdvzfvzlvznoAcoAgoAkoAohBbhBhhBjhBpaCaaCiaCq") +#r(5244, "New Layout 2", layout="0CabCadCafacapcahccvccacepcehcgvcgheaveaaecpecheeveeaegpegCfaCfcCfeCfgagapgahgcvgcagepgehggvggChaChcCheChghiaviaaicpichievieaigpigakaqkahkcwkcakeqkehkgwkghmawmaamcqmchmewmeamgqmgaoaqoahocwocaoeqoehogwoghqavqaaqcpqchqevqeaqgpqgCraCrcCreCrgasapsahscvscasepsehsgvsgCtaCtcCteCtghuavuaaucpuchuevueaugpugawapwahwcvwcawepwehwgvwgCybCydCyf") +r(5245, "Okie's Nitemare", layout="0aaoaaqbbeabmhbpacoacqcddbdgadmhdpaeoaeqbfccffafmhfpagoagqbhehhpaiiaioaiqhjihjqakiakqalohlqammhmoamqandankhnmanoonohnqaobaoihokaompomhooaoqapghpiapkopkhpmapoopohpqaqabqcoqdbqeoqfhqgaqioqihqkvqkCqlaqmpqmhqoaqqarghriarkorkhrmaroorohrqasbasihskasmpsmhsoasqatdatkhtmatootohtqaumhuoauqavohvqawiawqhxihxqbyeayiayoayqhzpbAccAfaAoaAqaBmhBpcCdbCgaCoaCqaDmhDpbEeaEoaEqaFmhFpaGoaGq") +r(5246, "Orbital", ncards=84, layout="0dafdahdajdchcehbghbihbkhclablfbljclocnabncbnebnkbnmcnocpabpfbpjcpobqhbshbuhcwhdyhdAfdAhdAj") +r(5247, "Owl", layout="0baebagbaibakbambcdbcncecbejbeocgbbghcgjbglbgpcicbijbiobkdbknclablpbmebmmcnbanpcodaofbohbojbolbonhopipfappoppcqdaqfbqhbqjbqlbqnhqpcrbarpbsebsmctabtpbudbuncwcbwjbwocybbyhcyjbylbypcAcbAjbAobCdbCnbEebEgbEibEkbEm") +r(5248, "Pantheon", layout="0baebcebdgbdqbeeaeiaekaemaeobfcbfgbfqbgebhcbiebjcojdbjgbjqbkabkeakiakkakmakoolbblcoldblgblqbmabmeonbbncboaoodboeopbbpcbpgbpqbqabqeaqiaqkaqmaqoorbbrcbrgbrqbsaosdbseotbbtcbuabueovbbvcovdbvgbvqbwabweawiawkawmawobxcoxdbxgbxqbyebzcbAebBcbBgbBqbCeaCiaCkaCmaCobDgbDqbEebGe") +# +r(5249, "Papillon", layout="0bagbaibakobhobjbcfbchbcjbclodhodjbecbeebegbeibekbembeoofdofnbgdbgnbiebimojeojmbkdbkfbklbknbmcbmgbmkbmobobbohbojbopopibqabqibqqoribsbbshbsjbspbucbugbukbuobwdbwfbwlbwnoxeoxmbyebymbAdbAnoBdoBnbCcbCebCgbCibCkbCmbCooDhoDjbEfbEhbEjbEloFhoFjbGgbGibGk") +r(5250, "Pyramid 1", layout="0aagaaiaceacghchaciackaecbeebegbeibekaemagabgcbgecggcgibgkbgmagoaiabicciecigvihciicikbimaioakabkcckedkgdkickkbkmakoamabmccmedmgdmicmkbmmamoaoaboccoecogvohcoicokbomaooaqabqcbqecqgcqibqkbqmaqoascbsebsgbsibskasmaueaughuhauiaukawgawi") +r(5251, "Pyramid 2", layout="0aaeaagaaiaccbcebcgbciackaeabecbeeoefbegoehbeibekaemagacgcdgedggdgicgkagmbiadiceieeigeiidikbimbkadkcekeekgekidkkbkmamacmcdmedmgdmicmkammaoabocboeoofbogoohboibokaomaqcbqebqgbqiaqkaseasgasi") +# +r(5252, "Quad", layout="0baabacbaeaagbaibakbamobbobdobjoblbcabccvccbceacgbcibckvckbcmodboddodjodlbeabecvecbeeaegbeibekvekbemofbofdofjoflbgabgcbgeaggbgibgkbgmaiaaicaiebigaiiaikaimbkabkcbkeakgbkibkkbkmolboldoljollbmabmcvmcbmeamgbmibmkvmkbmmonbondonjonlboabocvocboeaogboibokvokbomopbopdopjoplbqabqcbqeaqgbqibqkbqm") +# +r(5253, "Rectangle", layout="0daadacdaedagdcadccdcedcgdeadecdeedegdgadgcdgedggdiadicdiedigdkadkcdkedkgdmadmcdmedmgdoadocdoedogdqadqcdqedqg") +r(5254, "Reindeer", ncards=64, layout="0haeabdocchdbadnaecheehemaffaflafohgkahfahhahjajfajjalfalhaljallhmmanfanjonnaooapfaphapjarfarjaslatfathatjhtmouahufounhvbhvjavoawchwfawkhxdaxghxhhxlayioymazevznaAiaBchBdaBgaBohCbhChaCioDaoDivEh") +r(5255, "Rings", layout="0aahabfhbhabjacdhcfachochhcjaclhddadfodfhdhvdhadjodjhdlaebaedhefaehoehhejaelaenhfcaffhfhafjhfmagcaghagmhhchhmaicaihaimhjcajfhjhajjhjmakbakdhkfakhokhhkjaklaknhldalfolfhlhvlhaljoljhllamdhmfamhomhhmjamlanfhnhanjaoaaohaooaqaaqhaqoarfhrharjasdhsfashoshhsjaslhtdatfotfhthvthatjotjhtlaubaudhufauhouhhujaulaunhvcavfhvhavjhvmawcawhawmhxchxmaycayhaymhzcazfhzhazjhzmaAbaAdhAfaAhoAhhAjaAlaAnhBdaBfoBfhBhvBhaBjoBjhBlaCdhCfaChoChhCjaClaDfhDhaDjaEh") +r(5256, "River Bridge", ncards=116, layout="0aafaalacfachacjaclhdfhdhhdjhdloefoehoejoelvffvfloggogiogkvhfhhhhhjvhloigaiioiioikvjfhjhhjjvjlajoakcokgakiokiokkakmakqalavlfhlhhljvllomgamiomiomkvnfhnhhnjvnloogaoiooiookvpfhphhpjvploqgaqioqioqkvrfhrhhrjvrlosgasiosioskvtfhthhtjvtlaucougauiouioukauoavavvfhvhhvjvvlavmavqowgawiowiowkvxfhxhhxjvxloygoyioykvzfvzloAfoAhoAjoAlhBfhBhhBjhBlaCfaChaCjaClaEfaEl") +# +r(5257, "Roman Arena", layout="0CaaCacCaeCagCaivbbvbdvbfvbhCcaoccoceocgCcivdbhddadehdfvdhCeaoecoegCeivfbhfdafehffvfhCgaogcoggCgivhbhhdahehhfvhhCiaoicoigCiivjbhjdajehjfvjhCkaokcokgCkivlbhldalehlfvlhCmaomcCmcCmeomgCmgCmivnbhndvndanehnfvnfvnhCoaoocooeCoeoogCoivpbhpdvpdapehpfvpfvphCqaoqcCqcCqeoqgCqgCqivrbhrdarehrfvrhCsaoscosgCsivtbhtdatehtfvthCuaoucougCuivvbhvdavehvfvvhCwaowcowgCwivxbhxdaxehxfvxhCyaoycoygCyivzbhzdazehzfvzhCAaoAcoAeoAgCAivBbvBdvBfvBhCCaCCcCCeCCgCCi") +r(5258, "Rugby", layout="0aafaahaceacgaciaecaeeaegaeiaekagaagcagehgfagghghagiagkagmaiaaichidaiehifaighihaiihijaikaimakahkbakchkdakeikfakgikhakihkjakkhklakmamahmbamchmdameimfamgvmgimhamihmjamkhmlammondonjaoahobaochodaoevoeiofaogvogiohaoivoihojaokholaomopdopjaqahqbaqchqdaqeiqfaqgvqgiqhaqihqjaqkhqlaqmasahsbaschsdaseisfasgishasihsjaskhslasmauaauchudauehufaughuhauihujaukaumawaawcawehwfawghwhawiawkawmaycayeaygayiaykaAeaAgaAiaCfaCh") +r(5259, "Shapeshifter", layout="0aaoacmhcnacoaekhemaenheoaepagihgkaglogmhgnagohgpaiaaighiiaijoijhilaimoinbiohjaakaokaakehkgakhokhhkjakkokkokmhknakohkphlavlaamaomaamchmeamfomghmhamiomiomkhmlammomnbmohnavnavngvnivnkaoaooaCoahocaodooehofaogoogCogooiCoihojaokookCokoomhonaoohophpavpavpgvpivpkaqaoqaaqchqeaqfoqghqhaqioqioqkhqlaqmoqnbqohravraasaosaasehsgashoshhsjaskoskosmhsnasohsphtaauaaughuiaujoujhulaumounbuoawihwkawlowmhwnawohwpaykhymaynhyoaypaAmhAnaAoaCo") +# +r(5260, "Space Bridge", layout="0aaaaacaaeaagaaiaakaamaaoaaqhbbhbdhbfhbhhbjhblhbnhbpacaoccoceocgociockocmocoacqhdbvddvdfvdivdlvdnhdpaeaoecCeeCeiCemoeoaeqhfbvfdvfnhfpagaogcogoagqhhbhhpaiaoicoioaiqhjbajfajlhjpakaokchkghkkokoakqhlbvldClealholhaljoljClmvlnhlpamaomchmivmiomoamqhnbanhonhanjonjhnpaoaoochoghokoooaoqhpbapfaplhppaqaoqcoqoaqqhrbvrdvrnhrpasaoscCseCsiCsmosoasqhtbvtdvtfvtivtlvtnhtpauaoucoueougouioukoumouoauqhvbhvdhvfhvhhvjhvlhvnhvpawaawcaweawgawiawkawmawoawq") +r(5261, "Space Shuttle", layout="0aalaanacibckbcmaeebegbeibekbembgcbgecggcgicgkcgmbiacicciedigdiidikdimckadkcekeekgekiekkekmbmacmccmedmgdmidmkdmmbocboecogcoicokcomaqebqgbqibqkbqmasibskbsmaulaun") +r(5262, "Stage 1", layout="0aaebagaaiaccbceccgbciackaeabecceevefcegvehceibekaemagacgcdgedggdgicgkagmaiadicdiedigdiidikaimakadkcdkedkgdkidkkakmamacmcdmedmgdmicmkammaoaboccoevofcogvohcoibokaomaqcbqecqgbqiaqkasebsgasi") +r(5263, "Stage 2", layout="0aafaahaceacgaciaeeaegaeiagcbgebggbgiagkaiabicciecigciibikaimbkackcckeckgckickkbkmbmaombbmcomdbmepmfbmgpmhbmiomjbmkomlbmmboaoobbocoodboepofbogpohboioojbokoolbombqacqccqecqgcqicqkbqmasabsccsecsgcsibskasmaucbuebugbuiaukaweawgawiayeaygayiaAfaAh") +r(5264, "Stairs 2", layout="0aaadacaaedagaaidakacadccacedcgacidckbeadecbeedegbeidekbgacgcbgecggbgicgkciacicciecigciicikckabkcckebkgckibkkdmabmcdmebmgdmibmkdoaaocdoeaogdoiaokdqaaqcdqeaqgdqiaqk") +r(5265, "Stairs 3", layout="0eaeeageaieakeamdcfdchdcjdclcegceicekbgabghbgjbgqaicaiiaioalfaliallhmibnaanibnqaocioiaoobpaapibpqhqiarfariarlaucauiauobwabwhbwjbwqcygcyicykdAfdAhdAjdAleCeeCgeCieCkeCm") +r(5266, "Stargate", layout="0hagobeabgobgobihcehcghcjoddadeodgadiodkhechelafcofcafgpfgafkofmhgbhgghgnahaohaphgahmohohiahilhipajaojavjcvjevjgvjivjkajoojphkavkaokdokfokhokjhkpalaolaClavlchlehlghlivlkolpalqhmavmaomdamfamhomjhmpanaonaCnavnchnehnivnkanopnphoavoaoodaofaohoojhopapaopaCpavpchpehpghpivpkoppapqhqavqaoqdoqfoqhoqjhqparaoravrcvrevrgvrivrkaroorphsahslhspataotaptgatmotohubhughunavcovcavgpvgavkovmhwchwloxdaxeoxgaxioxkhyehyghyjozeazgozgozihAg") +# +r(5267, "Sukis", layout="0aaaaacaaeaagaaiaakaamaaoaaqhbbhbfhbjhbnacaaccaceacgaciackacmacoacqafaafcafeafgafiafkafmafoafqhgbhgpahaahcaheahgahiahkahmahoahqakahkbakcakeakgakiakkakmakoakqhlpamaamcameamgamiamkammamoamqapaapcapeapgapiapkapmapoapqhqbhqparaarcareargariarkarmaroarqauaaucaueaugauiaukaumauoauqhvpawahwbawcaweawgawiawkawmawoawqazaazcazeazgaziazkazmazoazqhAbhApaBaaBcaBeaBgaBiaBkaBmaBoaBqaEaaEcaEeaEgaEiaEkaEmaEoaEqhFbhFfhFjhFnaGaaGcaGeaGgaGiaGkaGmaGoaGq") +# +r(5268, "Temple 1", layout="0aaaaaeaaiabchbdabghbhacahcboccacehcfocgaciadchddodeadghdhaeaheboecaeehefoegaeiafchfdpfeafghfhagahgbogcagehgfoggagiahchhdvhdohevhfahghhhaiahiboicaiehifoigaiiajchjdvjdojeCjevjfajghjhakahkbokcakehkfokgakialchldvldoleClevlfalghlhamahmbomcamehmfomgamianchndvndoneCnevnfanghnhaoahoboocaoehofoogaoiapchpdvpdopevpfapghphaqahqboqcaqehqfoqgaqiarchrdprearghrhasahsboscasehsfosgasiatchtdoteatghthauahuboucauehufougauiavchvdavghvhawaaweawi") +# +r(5269, "Temple 2", layout="0aacaagaakabahbbabehbfabihbjaccocchcdacgocghchackadahdbadeodehdfadiodihdjaecoechedaegoeghehaekafahfbafeofehffafiofihfjagcogchgdaggpgghghagkahahhbahephehhfahiohihhjaicoichidaigpighihaikajahjbajepjehjfajiojihjjakcokchkdakgpkghkhakkalahlbaleplehlfaliolihljamcomchmdamgpmghmhamkanahnbaneonehnfanionihnjaocoochodaogooghohaokapahpbapeopehpfapiopihpjaqcoqchqdaqgoqghqhaqkarahrbareorehrfariorihrjaschsdasghshaskataateati") +r(5270, "Totally Random-Made", layout="0aaevajaaoabbhbhobioceCceacgaclCclpcmhddvddwdhhdmoecaedCedoeghejoenhffafgCfhafjofjCfkvfmagaCgfvggvgjhgkCgnahfohhChjahlohlahoaibhichieaihvihhiiojcajdojeCjiojjwjlojookmhkovkoClcClfvlgolhvliCljplkhlmvlmalpClpvmdhmghmjammCmmCncondCnganhCniankhodvodaoeCoehofhohvohvokoolvomaooCphopibplCpnvqharahreorfCrharkhrlormasfashvsiCsjhtfCthotiatjptnhtoaucoufhuhvuhauohvbavgovjCvjavkvvkhwghwjawnawpbxdaxjoxkayfaymayoaCdaCiaEiaFe") +r(5271, "Trika", layout="0hagaahiaiaajhakabfablhceicihcmaddoddodfadhvdhCdiadjvdjodladnodnheeieihemaffaflhggaghigiagjhgkciiakgokghkhakiokihkjakkokkhlfhllameomeamiammommhndhnnaocoocaogaoiaokaooooohpbhphhpjhppaqapqaaqehqfaqioqihqlaqmaqqpqqhrbhrhhrjhrpascoscasgasiaskasoosohtdhtnaueoueauiaumoumhvfhvlawgowghwhawiowihwjawkowkcyihAgaAhiAiaAjhAkaBfaBlhCeiCihCmaDdoDdoDfaDhvDhCDiaDjvDjoDlaDnoDnhEeiEihEmaFfaFlhGgaGhiGiaGjhGk") +r(5272, "Twin", layout="0aaeaagaaibccbcebcgbcibckaeabecceecegceibekaemagabgccgedggcgibgkagmaiabicciecigciibikaimbkcbkebkgbkibkkbmebmgbmibocboebogboibokaqabqccqecqgcqibqkaqmasabsccsedsgcsibskasmauabuccuecugcuibukaumbwcbwebwgbwibwkayeaygayi") +# +r(5273, "Two Domes", layout="0aaiabghbiabkacehcghckacmhdeodhodjhdmaecoefveioelaeohfdvfgvfkhfnagbogeCghCgjogmagphhcvhfvhlhhoaiaoidCigCikoinaiqhjcvjfajhvjlhjoakbokeCkhCkjokmakphldvlgvlkhlnamcomfvmiomlamohneonhonjhnmaoehoghokaomapghpiapkaqehqgoqhaqivqioqjhqkaqmarghriarkasehsghskasmhteothotjhtmaucoufvuioulauohvdvvgvvkhvnawboweCwhCwjowmawphxcvxfvxlhxoayaoydCygCykoynayqhzcvzfazhvzlhzoaAboAeCAhCAjoAmaAphBdvBgvBkhBnaCcoCfvCioClaCohDeoDhoDjhDmaEehEghEkaEmaFghFiaFkaGi") +# +r(5274, "Vagues", layout="0aacCaeaagCaiaakCamhbcvbehbgvbihbkvbmoccoceocgociockocmvdchdevdghdivdkhdmCecaeeCegaeiCekaemvfchfevfghfivfkhfmagaogcogeoggogiogkogmagohhahhcvhehhgvhihhkvhmhhooiaaicCieaigCiiaikCimoiovjahjcvjehjgvjihjkvjmvjoCkaokcokeokgokiokkokmCkovlavlchlevlghlivlkhlmvloomaCmcameCmgamiCmkammomohnavnchnevnghnivnkhnmhnoaoaoocooeoogooiookoomaoohpcvpehpgvpihpkvpmaqcCqeaqgCqiaqkCqmhrcvrehrgvrihrkvrmoscoseosgosioskosmvtchtevtghtivtkhtmCucaueCugauiCukaum") +r(5275, "Well2", layout="0aaaaacaaeaagaaiaakaamaaoacaccccceccgccicckccmacoaeadecdeedegdeidekdemaeoagadgcdgedgkdgmagoaiadicdiedikdimaioakadkcdkedkgdkidkkdkmakoamacmccmecmgcmicmkcmmamoaoaaocaoeaogaoiaokaomaoo") +# +r(5276, "Whatever", layout="0oaeoaghbdhbfhbhhcbaceoceacgocghcjadcadiheboeeoeghejafcafihgbogeogghgjahcwhfahioiahiboicoieoigoiihijoikajcvjdwjfvjhajiokahkbokcCkdokeokgCkhokihkjokkalcvldwlfvlhaliomahmbvmbomcCmdomeomgCmhomihmjvmjomkancvndwnfvnhaniooahobvoboocCodooeoogCohooihojvojookapcvpdwpfvphapioqahqboqcCqdoqeoqgCqhoqihqjoqkarcvrdwrfvrhariosahsboscoseosgosihsjoskatcwtfatihuboueoughujavcavihwboweowghwjaxcaxihybayeoyeaygoyghyjhzdhzfhzhoAeoAg") +r(5277, "Win", layout="0aaeaahaakaanbedbegbejbembepbhebhhbhkbhnbhqbjdbjgbjjbjmbjpbmcbmebmgbmibmkbmmbmococcoicoocqbcqhcqncsbcshcsncuacuccuecugcuicukcumcwbcwhcwncybcyhcyncAccAicAocCccCecCgcCicCkcCmcCo") +r(5278, "X-Files", layout="0aaaaaiaaqhbiacbacgaciociackacphdibecaeiaeoegdegneieeiidimdkfcklekpelbbmgbmkaocbohooibojaooaqahqbaqcoqchqdaqeaqiaqmhqnaqooqohqpaqqascbshosibsjasobugbukewbcwfcwlewpdyeeyidymeAdeAnaCcaCiaCohDiaEbaEgaEioEiaEkaEphFiaGaaGiaGq") +r(5279, "X-Shape", layout="0aaibbabbqcdabdcbdocdqaeicfacfcbfebfmcfocfqchabhcchebhgbhkchmbhochqbjabjecjgbjicjkbjmbjqblgdliblkbnabnecngbnicnkbnmbnqcpabpccpebpgbpkcpmbpocpqcracrcbrebrmcrocrqasictabtcbtoctqbvabvqawi") + diff --git a/pysollib/games/mahjongg/mahjongg3.py b/pysollib/games/mahjongg/mahjongg3.py new file mode 100644 index 00000000..8d7c3797 --- /dev/null +++ b/pysollib/games/mahjongg/mahjongg3.py @@ -0,0 +1,87 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +from mahjongg import r + +# test +#r(5991, "AAA 1", ncards=4, layout="0daa") +#r(5992, "AAA 2", ncards=8, layout="0daadca") +#r(5993, "AAA 3", ncards=20, layout="0daaCabdacKbbdcaCcbdcc") +#r(5994, "AAA 4", ncards=20, layout="0daaDabdacdcaDcbdcc") + +# /*********************************************************************** +# // game definitions +# ************************************************************************/ + +r(5401, "Taipei", layout="0aagabbabdabjablhccacfachhckadbaddhdehdghdiadjadlhecaefoegaehhekafcifehfgvfgifiafkagahgcageaggoggagihgkagmhhaahcohehhfvhfhhhvhhohiahkhhmaiahidaieaigoigCigaiihijaimhjbajcojehjfvjfJjghjhvjhojiajkhjlakahkdakeakgokgCkgQkgakihkjakmhlbalcolehlfvlfJlghlhvlholialkhllamahmdameamgomgCmgamihmjammhnaanconehnfvnfhnhvnhoniankhnmaoahocaoeaogoogaoihokaomapcipehpgvpgipiapkhqcaqfoqgaqhhqkarbardhrehrghriarjarlhscasfashhskatbatdatjatlaug") +r(5402, "Hare", layout="0aacaamacabccaceackbcmacobeacecbeebekcembeoofavfcofeofkvfmofobgacgcbgebgkcgmbgoaiabicbiebikbimaioakcakebkhakkakmamebmgbmiamkbogoohboicqfcqhcqjasejsfasgjshasijsjaskCtgCtibuddufduhdujbulovdCvgCviovlbwddwfdwhdwjbwlcyfcyhcyjbAhbCh") +r(5403, "Horse", layout="0bafbahbajbcdbchbclaedbefbehbejaelagfaghagjaifhigaihhiiaijakfhkgakhhkiakjbmecmgcmibmkcodcofcohcojcolcqdcqfvqgcqhvqicqjcqlbsbcsfvsgcshvsicsjbsnotbotnbubcudcufvugcuhvuicujculbunbwbcwdcwfcwhcwjcwlbwnbycayfbyhayjbymaAbaAnaCaaCo") +r(5404, "Rat", layout="0aaabacoadbaeaagbcacccccebcgvddodgbeacecceebegagabgcbggagmbicbieaigaimckeckgckiakmblcblkcmevmfcmgvmhcmibmmamobncCngbnkhnocoevofcogvohcoibomaoobpcbpkcqecqgcqiaqmbscbseasgasmauabucbugaumbwacwccwebwgvxdoxgbyacyccyebygaAabAcoAdbAeaAg") +r(5405, "Tiger", layout="0baabacbambaobcabccbcmbcobebaeghehaeibenbgbbggbgibgnaibbidcifcihdijbilainakdhkeakfokfhkgakhpkhhkiakjokjhkkaklbmepmfbmgomhbmiomjbmkboeoofbogoohboipojbokbqeoqfbqgpqhbqioqjbqkbsddsfcshcsjbslbubbudbuhbulbunbwbbwibwnbybbygbynbAbbAibAnbCbbCgbCn") +r(5406, "Ram", layout="0aacaaeaagaaihbehbghbibccaceoceacgaciociackadaodchdehdihdkheabecaeepeeaeioeiaekafaofchfehfihfkhgabgcageogeaggagiogiagkahahhehhghhibicaieaigaiibkcblgbmcbmeamionehniankanmcocboevoebogaoiooihokhombooopehpiapkapmbqcbqeaqibrgbscbucaueaugauiavahvehvghvihwabwcaweoweawgawiowiawkaxaoxchxehxihxkhyabycayepyeayioyiaykazaozchzehzihzkbAcaAeoAeaAgaAioAiaAkhBehBghBiaCcaCeaCgaCi") +r(5407, "Wedges", layout="0aagbaicakdamacaacibckccmbeaaecaekbemcgabgcageagmdiacicbieaigekadkcckebkgakiakohlofmaemcdmecmgbmiamkammamoomohnoeoaeocdoecogaoiaoodqadqccqeaqgcsacscaseasmbuaaucaukbumawaawibwkcwmaygbyicykdym") +r(5408, "Monkey", layout="0aaahabaacoachadaaeaakbcaaceackhclacmocmhcnacoodabeabeoofoagahgbagcaghbgobicbigbiiaimhinaioojgbkcdkebkgvkgdkibkkbkmolgdmebmgvmgdmiongdoebogvogdoiaokholaomaooopghpobqcdqebqgvqgdqiaqooqoorghroasahsbascbsgasmasoauaaughuhauiawihwjawkowkhwlawmbymaAchAdaAeoAehAfvAfaAgoAgCAghAhvAhaAioAiCAihAjvAjaAkoAkhAlaAmaCahCbaCc") +r(5409, "Rooster", layout="0aaaaagabchcccceccgadcvdfadiceecegaeohfoageagoogohhoaiehifaigaimaiohjmbkeokfbkgokhbkiakkakmamccmevmfcmgvmhcmiamkanahncCnghoaaocooccoevofcogvohcoiapaopahpchqaaqcoqcbqeoqfbqgvqgoqhbqiaqkaqmaraorahrchrmhsaascbsgoshbsiaskasmasoataotahtohuaaufhugauhauoavabweowfbwgowhbwivxgayabycoydbyeoyfbygoyhbyihzaaAaaAeaAjhAkaAlhBaaCaaCehCfaCgaCl") +r(5410, "Dog", layout="0aaeaaghbehbgaccaceoceacgocgaciackhdchdehdghdihdkaecoecaeeaegaeiaekhfcagcaichidaieoiehifaigvjebkackcckeckgbkibkkvlcoliolkbmacmccmgbmibmkamoonavnconkboacoccoecogbokaomaooopavpcopkbqacqccqgbqibqkvrcoriorkbsacsccsecsgbsibskvteauchudaueouehufaugawchxcaycoycayeaygayiaykhzchzehzghzihzkaAcaAeoAeaAgoAgaAiaAkhBehBgaCeaCg") +r(5411, "Snake", layout="0bagbaiobhbcgbcibdebecbegbfebgcbhabicbiicikcimbjavjlbkcbkebkgbkickkckmakooleolgolivllhlobmcbmebmgbmicmkcmmamoomovnlhnocokcomaooooovplhpobqcbqebqgbqicqkcqmaqooreorgorivrlbscbsebsgbsicskcsmbtabucbvabwcbwebwgbwibwkbycbyebygbyibykbAjaCj") +r(5412, "Boar", layout="0aacaaehafaagoaghahaaiaakhbchbkaccoccaciackockacmhdchdkhdmaecaeeaekoekaemoemhfkhfmagiagkogkagmhhkaiiaikakcbkgbkiakmolgolibmcbmebmgbmibmkbmmonconepngpnionkonmanoaoabocvocboevoebogboibokvokbomvomhooopcopeppgppiopkopmapobqcbqebqgbqibqkbqmorgoriascbsgbsiasmauiaukhvkawiawkowkawmhxkhxmaycayeaykoykaymoymhzchzkhzmaAcoAcaAiaAkoAkaAmhBchBkaCcaCehCfaCgoCghChaCiaCk") +r(5413, "Ox", layout="0aahabeabkbcgochbciaeaaecbegbeiaemaeohfbhfnagaagcagebggbgiagkagmagoaicbiebigbiibikaimakcbkeckgckibkkakmbmecmgcmibmkaodioeaofjogaohjoiaojiokaolcqedqgdqicqkcsedsgdsicskaucbuecugcuibukaumawcbwecwgcwibwkawmayaaycayebygbyiaykaymayohzbhznaAaaAcaAhaAmaAo") +r(5414, "Bridge 2", layout="0daadacdaedagdaidakdamdaoccccceccgccicckccmbeebegbeibekaggagiaihhjhakhokhhlhvlhamfamhomhCmhhnhvnhJnhanjaofaohoohCohhphvphaqhoqhhrhashaugauibwebwgbwibwkcyccyecygcyicykcymdAadAcdAedAgdAidAkdAmdAo") + +##---------------------------------------------------------------------- + +#r(5501, "Big X", layout="0aacaamhbchbmacboccacdaclocmacnhdbhddhdlhdnaeaaecoedaeeaekoelaemaeohfchfehfkhfmagbagdogeagfagjogkaglagnhhdhhfhhjhhlaicaieoifaigaiioijaikaimhjehjghjihjkakdakfokgakhokiakjaklhlfhlhhljameamgomgamiomiamkhnfhnhhnjaofoofaohoohaojoojhpfhphhpjaqeaqgoqgaqioqiaqkhrfhrhhrjasdasfosgashosiasjaslhtehtghtihtkaucaueoufaugauioujaukaumhvdhvfhvjhvlawbawdoweawfawjowkawlawnhxchxehxkhxmayaaycoydayeaykoylaymayohzbhzdhzlhznaAboAcaAdaAloAmaAnhBchBmaCcaCm") +#r(5502, "Axis", layout="0bafcahbajbbdvbhbblcchCchbdcvdhbdmcehCehbfbvfhbfncghahaahohiahioajabjhajohkabkfbkjhkoalabldbllalohmacmhhmoanaancvnhanmanoiobcohionapbwphapniqbcqhiqnaraarcvrharmarohsacshhsoatabtdbtlatohuabufbujhuoavabvhavohwahwoaxaaxocyhbzbvzhbzncAhCAhbBcvBhbBmcChCChbDdvDhbDlbEfcEhbEj") +#r(5503, "Cobweb", layout="0aacaafhagaahoahhaiaajaamacbhccacdaclhcmacnadfhdgadhodhhdiadjaeaaeohfaafcafeafhafkafmhfoagaogaagoogohhaahcahhahmhhoaiaoiaaiooiohjaajdajhajlhjoakaakoalealhalkamaamoancanfhnganhhnianjanmaoahoboogooihonaooopbapcbpgvpgbpivpiapmopnaqahqboqgoqihqnaqoarcarfhrgarhhriarjarmasaasoateathatkauaauohvaavdavhavlhvoawaowaawoowohxaaxcaxhaxmhxoayaoyaayooyohzaazcazeazhazkazmhzoaAaaAoaBfhBgaBhoBhhBiaBjaCbhCcaCdaClhCmaCnaEcaEfhEgaEhoEhhEiaEjaEm") +#r(5504, "Pyramids", layout="0aaaaacaakaamhbbabeabgabihblacaaccackacmhdbadeadgadihdlaeaaecaekaemaffhfgafhahbaheahiahlhibhiehiihilajbojbajdojeajfajhojiajjajlojlhkbvkbhkevkehkghkivkihklvklalbolbClbaldoleClealfolgalholiClialjallollCllhmbvmbhmevmehmgvmghmivmihmlvmlanbonbCnbandoneCneanfonganhoniCnianjanlonlCnlhobvobhoevoehoghoivoiholvolapbopbapdopeapfaphopiapjaploplhqbhqehqihqlarbareariarlatfhtgathauaaucaukaumhvbaveavgavihvlawaawcawkawmhxbaxeaxgaxihxlayaaycaykaym") +#r(5505, "Wicker", layout="0bafbakbbcbbhbbmbcebcjbdbbdgbdlbedbeibenbfabffbfkbgcbghbgmbhebhjbibbigbilbjdbjibjnbkabkfbkkblcblhblmbmebmjbnbbngbnlbodboibonbpabpfbpkbqcbqhbqmbrebrjbsbbsgbslbtdbtibtnbuabufbukbvcbvhbvmbwebwjbxbbxgbxlbydbyibynbzfbzkbAh") + +##---------------------------------------------------------------------- + +r(5801, "Faro", name="Double Mahjongg Faro", ncards=288, layout="0aaahabaachadaaeoaehafaagiahaaihajaakoakhalaamhanaaoobcvbhobmacbhccvccacdacgichCchaciaclhcmvcmacnodcCdcvdhodmCdmaebhecvecaedheeaefcehCehaejhekaelhemvemaenofcvfhofmbgcagfhggaghoghhgiagjbgmahaahohiahioajapjaajccjebjhcjkajmajopjohkahkcokhhkmhkoalaalcqlcalfhlgalhvlhhlialjalmqlmalohmcomhCmhhmmanbqncandhneanfbnhvnhanjhnkanlqnmannhocooeoohookhomapcppcCpdbpevpebphwphbpkvpkCplapmppmhqcoqeoqhoqkhqmarbqrcardhrearfbrhvrharjhrkarlqrmarnhscoshCshhsmataatcqtcatfhtgathvthhtiatjatmqtmatohuahucouhhumhuoavapvaavccvebvhcvkavmavopvohwahwoaxaaxobycayfhygayhoyhhyiayjbymozcvzhozmaAbhAcvAcaAdhAeaAfcAhCAhaAjhAkaAlhAmvAmaAnoBcCBcvBhoBmCBmaCbhCcvCcaCdaCgiChCChaCiaClhCmvCmaCnoDcvDhoDmaEahEbaEchEdaEeoEehEfaEgiEhaEihEjaEkoEkhElaEmhEnaEo") +#r(5802, "Big Square", name="Double Mahjongg Big Square", ncards=288, layout="0daadacdaedagdaidakdcadccdcedcgdcidckdeadecdeedegdeidekdgadgcdgedggdgidgkdiadicdiedigdiidikdkadkcdkedkgdkidkkdmadmcdmedmgdmidmkdoadocdoedogdoidokdqadqcdqedqgdqidqkdsadscdsedsgdsidskduaducduedugduidukdwadwcdwedwgdwidwk") +r(5803, "Two Squares", name="Double Mahjongg Two Squares", ncards=288, layout="0daadacdaedagdaidakdcadccdcedcgdcidckdeadecdeedegdeidekdgadgcdgedggdgidgkdiadicdiedigdiidikdkadkcdkedkgdkidkkdoadocdoedogdoidokdqadqcdqedqgdqidqkdsadscdsedsgdsidskduaducduedugduidukdwadwcdwedwgdwidwkdyadycdyedygdyidyk") +#r(5804, "Rows", name="Double Mahjongg Rows", ncards=288, layout="0daadacCaddaeCafdagCahdaidakdcadckeeadeceeeeegdeieekegaegkeiadiceieeigdiieikekaekkemadmcemeemgdmiemkeoaeokeqadqceqeeqgdqieqkesaeskeuaduceueeugduieukewaewkeyadyceyeeygdyieykdAadAkdCadCcCCddCeCCfdCgCChdCidCk") +r(5805, "Twin Picks", name="Double Mahjongg Twin Picks", ncards=288, layout="0aacaaeaagaaiaakaamhbdhbfhbhhbjhblacaaccaceoceacgocgaciociackockacmacohdbhddhdfvdfhdhvdhhdjvdjhdlhdnaeaaecoecaeeoeeaegoegCegaeioeiCeiaekoekaemoemaeohfbhfdvfdhffvffhfhvfhhfjvfjhflvflhfnagaagcogcageogeCgeaggoggCggagiogiCgiagkogkCgkagmogmagohhbhhdvhdhhfvhfhhhvhhhhjvhjhhlvhlhhnaiaaicoicaieoieaigoigCigaiioiiCiiaikoikaimoimaiohjbhjdhjfvjfhjhvjhhjjvjjhjlhjnakaakcakeokeakgokgakiokiakkokkakmakohldhlfhlhhljhllamcameamgamiamkammapaapcapeapgapiapkapmapoascaseasgasiaskasmhtdhtfhthhtjhtlauaaucaueoueaugougauiouiaukoukaumauohvbhvdhvfvvfhvhvvhhvjvvjhvlhvnawaawcowcaweoweawgowgCwgawiowiCwiawkowkawmowmawohxbhxdvxdhxfvxfhxhvxhhxjvxjhxlvxlhxnayaaycoycayeoyeCyeaygoygCygayioyiCyiaykoykCykaymoymayohzbhzdvzdhzfvzfhzhvzhhzjvzjhzlvzlhznaAaaAcoAcaAeoAeaAgoAgCAgaAioAiCAiaAkoAkaAmoAmaAohBbhBdhBfvBfhBhvBhhBjvBjhBlhBnaCaaCcaCeoCeaCgoCgaCioCiaCkoCkaCmaCohDdhDfhDhhDjhDlaEcaEeaEgaEiaEkaEm") +r(5806, "Roost", name="Double Mahjongg Roost", ncards=288, layout="0aaahabaacoachadvadaaeoaehafvafaagoaghahvahaaioaihajaakaamaaoCbfhblhbnacbhccacdocdhcevceacfocfhcgvcgachochhciacjaclocmacnhdkhdmaeiaekoelaemaeoafaafcafehfjhflvflhfnhgchgeaghagjogkaglCglogmagnahbohcahdoheahfhhihhkvhlhhmhibhidviehifaiioijaikoilaimajaajcojdajeCjeojfajghjjvjkhjlajohkcvkdhkevkfhkgakjokkaklalbolcaldolealfClfolgalhhlkblnhmbhmdvmehmfvmghmhamkomnanaancondaneonfangCngonhanianmhnnanohochoevofhogvohhoiapbapdopeapfopgaphCphopiapjhpkaploplhpmapnhqchqevqfhqgvqhhqiaraarcordareorfargCrgorhariarmhrnarohsbhsdvsehsfvsghshaskosnatbotcatdoteatfCtfotgathhtkbtnhucvudhuevufhugaujoukaulavaavcovdaveCveovfavghvjvvkhvlavohwbhwdvwehwfawiowjawkowlawmaxboxcaxdoxeaxfhxihxkvxlhxmhychyeayhayjoykaylCyloymaynazaazcazehzjhzlvzlhznaAiaAkoAlaAmaAohBkhBmaCbhCcaCdoCdhCevCeaCfoCfhCgvCgaChoChhCiaCjaCloCmaCnCDfhDlhDnaEahEbaEcoEchEdvEdaEeoEehEfvEfaEgoEghEhvEhaEioEihEjaEkaEmaEo") +r(5807, "Castle", name="Double Mahjongg Big Castle", ncards=288, layout="0eaadacdaeeageaidakdameaodcadcocddvdecdfvdgcdhCdhvdicdjvdkcdldeadeoafdaflcgacgoahdahlciacioajdajlckahkdhklckoaldelfblheljallcmahmdhmlcmoandbnfbnjanleoahodoofoojholeooapdbpfvpfbpjvpjapleqahqdoqfoqjhqleqoardbrfbrjarlcsahsdhslcsoatdetfbthetjatlcuahudhulcuoavdavlcwacwoaxdaxlcyacyoazdazldAadAocBdvBecBfvBgcBhCBhvBicBjvBkcBldCadCoeEadEcdEeeEgeEidEkdEmeEo") +r(5808, "Eight Squares", name="Double Mahjongg Eight Squares", ncards=288, layout="0daadacdaedahdajdaldcadccdcedchdcjdcldeadecdeedehdejdeldhadhcdhedhhdhjdhldjadjcdjedjhdjjdjldladlcdledlhdljdlldoadocdoedohdojdoldqadqcdqedqhdqjdqldsadscdsedshdsjdsldvadvcdvedvhdvjdvldxadxcdxedxhdxjdxldzadzcdzedzhdzjdzl") +r(5809, "Big Flying Dragon", name="Double Mahjongg Big Flying Dragon", ncards=288, layout="0aajacaaciackacsaeaaegaeihejaekaemaesagaageaggbgibgkagmagoagsaiaaicaiebigbiibikbimaioaiqaisakabkcbkebkgbkibkkbkmbkobkqaksbmabmccmecmgcmicmkcmmcmobmqbmsboaboccoedogdoidokdomcooboqbosbqabqccqedqgeqieqkdqmcqobqqbqsJrjbsabsccsedsgesieskdsmcsobsqbssbuabuccuedugduidukdumcuobuqbusbwabwccwecwgcwicwkcwmcwobwqbwsayabycbyebygbyibykbymbyobyqaysaAaaAcaAebAgbAibAkbAmaAoaAqaAsaCaaCeaCgbCibCkaCmaCoaCsaEaaEgaEihEjaEkaEmaEsaGaaGiaGkaGsaIaaIjaIsaKj") +r(5810, "Sphere", name="Double Mahjongg Sphere", ncards=288, layout="0aajaalaanabhhbkhbmabpacfhciacjockaclocmacnhcoacraddhdgadhodivdkhdlvdmodoadphdqadtaefoegveihejaekoekaemoemhenveooeqaerafchfdhffhfhafiafohfphfrhftafuageogeaggpggpgihgjpgkbglpgmhgnpgoagqpgqagsogsahbhhchhfhhhahjahnhhphhrhhuahvaidoidvieaifoigaihoiihijoikbiloimhinoioaipoiqairvisaitoitajahjbhjdhjfhjhvjlhjphjrhjthjvajwakcokcvkdakeokeakgokgakiokiakkokkakmokmakookoakqokqaksoksvktakuokualahlbhldhlfvlfhlhvlhhljvljhllvllhlnvlnhlpvlphlrvlrhlthlvalwamcomcvmdameomeamgomgamiomiamkomkammommamoomoamqomqamsomsvmtamuomuanahnbhndhnfhnhvnlhnphnrhnthnvanwaodoodvoeaofoogaohooihojookboloomhonoooaopooqaorvosaotootapbhpchpfhphapjapnhpphprhpuapvaqeoqeaqgpqgpqihqjpqkbqlpqmhqnpqoaqqpqqaqsoqsarchrdhrfhrhariarohrphrrhrtaruasfosgvsihsjaskoskasmosmhsnvsoosqasratdhtgathotivtkhtlvtmotoatphtqattaufhuiaujoukauloumaunhuoauravhhvkhvmavpawjawlawn") + +##---------------------------------------------------------------------- + +r(5901, "Happy New Year", name="Half Mahjongg Happy New Year", ncards=72, layout="0aafaajaanaceaciacmbedbehaelofdofhhflbgdbghaglohdohhaibbidaighihaiiailhimainojmakaakeckhakjbkmbkoolmambbmdamghmhamiamlhmmamnondonhbodbohaolopdophhplbqdbqhaqlaseasiasmaufaujaun") +#r(5902, "K 2", name="Half Mahjongg K 2", ncards=72, layout="0aagabcabehbfobghbhabiabkacgvcgadbidgadlaegvegbfaifgbfmaggbhaihgbhmaigbjahjgbjmakgokgblahlgblmamgbnaingbnmaogbpaipgbpmaqgvqgarbirgarlasgvsgatcatehtfotghthatiatkaug") +#r(5903, "Abstract", name="Half Mahjongg Abstract", ncards=72, layout="0aaaaagabcabebddadgadioedhehafchfdafeafhagahhaahdahgaiahjaojbbjcajfakaalcamfamhanbhncandhngaogboiapdhqdaqiarcordarehrihsdasgasiatdauaaufhvbavcaviawaawehxeaxiaycayebyghzdaAdaAhaBbaBfhCfaCiaDcaDeaDghDhaEaaEi") +r(5904, "Smile", name="Half Mahjongg Smile", ncards=72, layout="0bagoahbaibbebbkbccbcmbebbenaffbfjbgahgfbgoahfbhkbiabiobjlbkabkobllbmabmoanfbnkboahofbooapfbpjbqbbqnbscbsmbtebtkbugouhbui") +r(5905, "Wall", name="Half Mahjongg Wall", ncards=72, layout="0eaabacbaebagbaibakbameaoacaacoaeaaeoagaagoaiaaioakaakoamaamoaoaaooaqaaqoasaasoauaauoawaawoayaayoaAaaAoaCaaCoeEabEcbEebEgbEibEkbEmeEo") + +##---------------------------------------------------------------------- + +#r(5601, "Skomoroh 1", ncards=28, layout="0aacaaeaaghbdhbfacaacdoceacfacihddhdfaebaeeoeeaehhfdhffagaagdogeagfagihhdhhfaicaieaig") +#r(5602, "Skomoroh 2", ncards=116, layout="0aaeaaghahaaiaakabaaboacfbchacjadaadoaeghehaeiafaafocghahaahcahfvhhahjahmahohidcihhilajaajdajfwjhajjajlajohkdhkgakhokhhkihklalaalcalewlhalkalmalohmfamgimhamihmjanaancanewnhankanmanohodhogaohoohhoiholapaapdapfwphapjaplapohqdcqhhqlaraarcarfvrharjarmarocshataatoaughuhauiavaavoawfbwhawjaxaaxoayeayghyhayiayk") +#r(5603, "Skomoroh 3", ncards=132, layout="0aachadaaeoaeXaehafyafaagoagXaghahaaiabaabkhcahckadaadeadgadkheahefhekafaafeafgafkhgahgfhgkahaaheahgahkhiahifhikajaajeajgajkhkahkfhkkalaalealgalkhmahmfhmkanaaneonfangankhofXofapbapdapfspfaphapjhqfXqfaraareorfargarkhsahsfhskataateatgatkhuahufhukavaaveavgavkhwahwfhwkaxaaxeaxgaxkhyahyfhykazaazeazgazkhAahAfhAkaBaaBeaBgaBkhCahCkaDaaDkaEchEdaEeoEeXEehEfyEfaEgoEgXEghEhaEi") +#r(5604, "Skomoroh 4", ncards=52, layout="0aajaalaanabhabpacfacnacraddadladtaejafcafuagiahbbhoahvaiiajaajwakjalaalwamkammanaanwaonapaapwaqoarbbriarvasoatcatuaunavdavlavtawfawjawraxhaxpayjaylayn") +#r(5605, "Skomoroh 5", ncards=208, layout="0aahaajaalaanaaphbihbkoblhbmhboaccaceacgaciackacmacoacqacsacuaecaeuagdagjaglagnagthhkhhmaieaijailoilainaishjkhjmakfakjakloklaknakrhlkhlmameamgamjamlomlamnamqamsanchndhnkhnmhntanuaoeaohaojaoloolaonaopaosapchpdhpkhpmhptapuaqeaqhaqjaqlaqnaqpaqsaraarchrdhrtaruarwaseasgasiaskasmasoasqassatahtbatchtdhtfithitjitlitnitphtrhttatuhtvatwaueaugauiaukaumauoauqausavaavchvdhvtavuavwaweawhawjawlawnawpawsaxchxdhxkhxmhxtaxuayeayhayjayloylaynaypaysazchzdhzkhzmhztazuaAeaAgaAjaAloAlaAnaAqaAshBkhBmaCfaCjaCloClaCnaCrhDkhDmaEeaEjaEloElaEnaEshFkhFmaGdaGjaGlaGnaGtaIcaIuaKcaKeaKgaKiaKkaKmaKoaKqaKsaKuhLihLkoLlhLmhLoaMhaMjaMlaMnaMp") +#r(5606, "Skomoroh 6", layout="0aadaafaahaajaalaanaapadaaddadfadhadjadladnadpadsheehegheihekhemheoafaafdaffoffafhofhafjofjafloflafnofnafpafshgehggvgghgivgihgkvgkhgmvgmhgoahaChhChjChlahsaidaifoifaihoihJiiaijoijJikailoilainoinaipajahjehjgvjgCjhhjivjihjkvjkCjlhjmvjmhjoajsakdakfokfakhokhJkiakjokjJkkakloklaknoknakpalaClhCljCllalshmehmgvmghmivmihmkvmkhmmvmmhmoanaandanfonfanhonhanjonjanlonlannonnanpanshoehoghoihokhomhooapaapdapfaphapjaplapnappapsasdasfashasjaslasnasp") +#r(5607, "Skomoroh 7", ncards=56, layout="0aabaadaafaahaajaapaaraatablabwadaadmadwafaafnafwahaahnahwajfajhajmajwakdakjalbdllalvamnamtanaankanpanrapaapjapwaraarjarwataatkatwavaavlawdawfawhawnawpawrawtawv") + diff --git a/pysollib/games/mahjongg/shisensho.py b/pysollib/games/mahjongg/shisensho.py new file mode 100644 index 00000000..5a231de3 --- /dev/null +++ b/pysollib/games/mahjongg/shisensho.py @@ -0,0 +1,468 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys +#from tkFont import Font + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText, MfxCanvasLine + +from mahjongg import Mahjongg_RowStack, AbstractMahjonggGame, comp_cardset + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Shisen_Hint(AbstractHint): + # FIXME: no intelligence whatsoever is implemented here + def computeHints(self): + game = self.game + # get free stacks + stacks = [] + for r in game.s.rows: + if r.cards: + stacks.append(r) + # find matching tiles + i = 0 + for r in stacks: + for t in stacks[i+1:]: + #if game.cardsMatch(r.cards[0], t.cards[0]): + if r.acceptsCards(t, t.cards): + # simple scoring... + score = 1000 + r.rown + t.rown + self.addHint(score, 1, r, t) + i = i + 1 + + +# /*********************************************************************** +# // Shisen-Sho +# ************************************************************************/ + + +class Shisen_Foundation(AbstractFoundationStack): + def __init__(self, x, y, game, suit=ANY_SUIT, **cap): + kwdefault(cap, max_move=0, max_accept=0, max_cards=game.NCARDS) + apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + # We do not accept any cards - pairs will get + # delivered by _dropPairMove() below. + return 0 + + def basicIsBlocked(self): + return 1 + + def initBindings(self): + pass + + +class Shisen_RowStack(Mahjongg_RowStack): + + def basicIsBlocked(self): + return 0 + + def acceptsCards(self, from_stack, cards): + if not self.game.cardsMatch(self.cards[0], cards[-1]): + return 0 + + cols, rows = self.game.L + game_cols = self.game.cols + x1, y1 = self.coln+1, self.rown+1 + x2, y2 = from_stack.coln+1, from_stack.rown+1 + dx, dy = x2 - x1, y2 - y1 + + a = [] + for i in xrange(cols+2): + a.append([5]*(rows+2)) + + def can_move(x, y, nx, ny, direct, d, direct_chng_cnt): + if nx == x2 and ny == y2: + return 1 + if nx < 0 or ny < 0 or nx > cols+1 or ny > rows+1: + return 0 + if nx in (0, cols+1) or ny in (0, rows+1) \ + or not game_cols[nx-1][ny-1].cards: + if direct_chng_cnt == 0: + return 1 + elif direct_chng_cnt == 1: + if direct != d: + if d == 1 and dy > 0: + return 1 + elif d == 2 and dy < 0: + return 1 + elif d == 3 and dx > 0: + return 1 + elif d == 4 and dx < 0: + return 1 + else: + return 1 + elif direct_chng_cnt == 2: + if direct != d: + if d in (1, 2) and x == x2: + return 1 + elif y == y2: + return 1 + else: + if d == 1 and y < y2: + return 1 + elif d == 2 and y > y2: + return 1 + elif d == 3 and x < x2: + return 1 + elif d == 4 and x > x2: + return 1 + elif direct_chng_cnt == 3: + if direct == d: + return 1 + + return 0 + + res_path = [None] + def do_accepts(x, y, direct, direct_chng_cnt, path): + #if direct_chng_cnt > 3: + # return + if a[x][y] < direct_chng_cnt: + return + #if res_path[0]: + # return + a[x][y] = direct_chng_cnt + if x == x2 and y == y2: + res_path[0] = path + return + + if can_move(x, y, x, y+1, direct, 1, direct_chng_cnt): #### 1 + #dcc = direct == 1 and direct_chng_cnt or direct_chng_cnt+1 + p = path[:] + if direct == 1: + dcc = direct_chng_cnt + else: + dcc = direct_chng_cnt+1 + p.append((x, y)) + do_accepts(x, y+1, 1, dcc, p) + if can_move(x, y, x, y-1, direct, 2, direct_chng_cnt): #### 2 + #dcc = direct == 2 and direct_chng_cnt or direct_chng_cnt+1 + p = path[:] + if direct == 2: + dcc = direct_chng_cnt + else: + dcc = direct_chng_cnt+1 + p.append((x, y)) + do_accepts(x, y-1, 2, dcc, p) + if can_move(x, y, x+1, y, direct, 3, direct_chng_cnt): #### 3 + #dcc = direct == 3 and direct_chng_cnt or direct_chng_cnt+1 + p = path[:] + if direct == 3: + dcc = direct_chng_cnt + else: + dcc = direct_chng_cnt+1 + p.append((x, y)) + do_accepts(x+1, y, 3, dcc, p) + if can_move(x, y, x-1, y, direct, 4, direct_chng_cnt): #### 4 + #dcc = direct == 4 and direct_chng_cnt or direct_chng_cnt+1 + p = path[:] + if direct == 4: + dcc = direct_chng_cnt + else: + dcc = direct_chng_cnt+1 + p.append((x, y)) + do_accepts(x-1, y, 4, dcc, p) + + do_accepts(x1, y1, 0, 0, []) + #from pprint import pprint + #pprint(a) + + if a[x2][y2] > 3: + return None + + res_path = res_path[0] + res_path.append((x2, y2)) + #print res_path + return res_path + + return a[x2][y2] < 4 + + + def fillStack(self): + self.game.fillStack(self) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + assert ncards == 1 and to_stack in self.game.s.rows + if to_stack.cards: + self._dropPairMove(ncards, to_stack, frames=-1, shadow=shadow) + else: + Mahjongg_RowStack.moveMove(self, ncards, to_stack, frames=frames, shadow=shadow) + + def _dropPairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + old_state = game.enterState(game.S_FILL) + f = game.s.foundations[0] + game.updateStackMove(game.s.talon, 2|16) # for undo + if not game.demo: + if game.app.opt.shisen_show_hint: + self.drawArrow(other_stack, game.app.opt.hint_sleep) + game.playSample("droppair", priority=200) + # + game.moveMove(n, self, f, frames=frames, shadow=shadow) + game.moveMove(n, other_stack, f, frames=frames, shadow=shadow) + self.fillStack() + other_stack.fillStack() + game.updateStackMove(game.s.talon, 1|16) # for redo + game.leaveState(old_state) + + + def drawArrow(self, other_stack, sleep): + game = self.game + path = self.acceptsCards(other_stack, [other_stack.cards[-1]]) + #print path + x0, y0 = game.XMARGIN, game.YMARGIN + #print x0, y0 + images = game.app.images + cs = game.app.cardset + if cs.version >= 6: + cardw = images.CARDW-cs.SHADOW_XOFFSET + cardh = images.CARDH-cs.SHADOW_YOFFSET + else: + cardw = images.CARDW + cardh = images.CARDH + coords = [] + for x, y in path: + if x == 0: + coords.append(6) + elif x == game.L[0]+1: + coords.append(x0+cardw*(x-1)+10) + else: + coords.append(x0+cardw/2+cardw*(x-1)) + if y == 0: + coords.append(6) + elif y == game.L[1]+1: + coords.append(y0+cardh*(y-1)+6) + else: + coords.append(y0+cardh/2+cardh*(y-1)) + #print coords + ##s1 = min(cardw/2, cardh/2, 30) + ##w = min(s1/3, 7) + ##s2 = min(w, 10) + w = 7 + arrow = MfxCanvasLine(game.canvas, + coords, + {'width': w, + 'fill': game.app.opt.hintarrow_color, + ##'arrow': 'last', + ##'arrowshape': (s1, s1, s2) + } + ) + game.canvas.update_idletasks() + game.sleep(sleep) + if arrow is not None: + arrow.delete() + game.canvas.update_idletasks() + + +class AbstractShisenGame(AbstractMahjonggGame): + Hint_Class = Shisen_Hint + RowStack_Class = Shisen_RowStack + + #NCARDS = 144 + GRAVITY = True + + def createGame(self): + cols, rows = self.L + assert cols*rows == self.NCARDS + + # start layout + l, s = Layout(self), self.s + ##dx, dy = 3, -3 + + cs = self.app.cardset + if cs.version >= 6: + dx = l.XOFFSET + dy = -l.YOFFSET + d_x = cs.SHADOW_XOFFSET + d_y = cs.SHADOW_YOFFSET + else: + dx = 3 + dy = -3 + d_x = 0 + d_y = 0 + + font = self.app.getFont("canvas_default") + + # width of self.texts.info + #ti_width = Font(self.canvas, font).measure(_('Remaining')) + ti_width = 80 + + # set window size + dxx, dyy = abs(dx), abs(dy) + cardw, cardh = l.CW - d_x, l.CH - d_y + w = l.XM+dxx + cols*cardw+d_x + l.XM+ti_width+l.XM + h = l.YM+dyy + rows*cardh+d_y + l.YM + self.setSize(w, h) + self.XMARGIN = l.XM+dxx + self.YMARGIN = l.YM+dyy + + # set game extras + self.check_dist = l.CW*l.CW + l.CH*l.CH # see _getClosestStack() + + # + self.cols = [[] for i in xrange(cols)] + cl = range(cols) + if dx > 0: + cl.reverse() + for col in cl: + for row in xrange(rows): + x = l.XM + dxx + col * cardw + y = l.YM + dyy + row * cardh + stack = self.RowStack_Class(x, y, self) + stack.CARD_XOFFSET = 0 + stack.CARD_YOFFSET = 0 + stack.coln, stack.rown = col, row + s.rows.append(stack) + self.cols[col].append(stack) + #from pprint import pprint + #pprint(self.cols) + self.cols_len = [rows]*cols + + # create other stacks + y = l.YM + dyy + s.foundations.append(Shisen_Foundation(-l.XS, y, self)) + self.texts.info = MfxCanvasText(self.canvas, + self.width - l.XM - ti_width, y, + anchor="nw", font=font) + x = self.width + l.XS + y = self.height - l.YS - dxx + # the Talon is invisble + s.talon = InitialDealTalonStack(x, y + l.YS, self) + + # Define stack groups + l.defaultStackGroups() + + def fillStack(self, stack): + if not self.GRAVITY: return + to_stack = stack + for from_stack in self.cols[stack.coln][stack.rown+1::-1]: + if not from_stack.cards: + continue + self.moveMove(1, from_stack, to_stack, frames=0) + to_stack = from_stack + + def updateText(self): + if self.preview > 1 or self.texts.info is None: + return + game = self.app.game + if 0: + # find matching tiles + stacks = game.s.rows + f, i = 0, 0 + for r in stacks: + i = i + 1 + if not r.cards: + continue + for t in stacks[i:]: + if not t.cards: + continue + if r.acceptsCards(t, t.cards): + f += 1 + if f == 0: + f = self.text_free_matching_pairs_0 + elif f == 1: + f = self.text_free_matching_pairs_1 + else: + f = str(f) + self.text_free_matching_pairs_2 + else: + f = '' + + t = len(self.s.foundations[0].cards) + t = str(t) + self.text_tiles_removed \ + + str(self.NCARDS - t) + self.text_tiles_remaining \ + + f + self.texts.info.config(text = t) + + + def drawHintArrow(self, from_stack, to_stack, ncards, sleep): + from_stack.drawArrow(to_stack, sleep) + + + def _shuffleHook(self, cards): + return cards + + +class Shisen_18x8(AbstractShisenGame): + L = (18, 8) + +class Shisen_14x6(AbstractShisenGame): + L = (14, 6) + NCARDS = 84 + +class Shisen_24x12(AbstractShisenGame): + L = (24, 12) + NCARDS = 288 + +class Shisen_18x8_NoGravity(AbstractShisenGame): + L = (18, 8) + GRAVITY = False + +class Shisen_14x6_NoGravity(AbstractShisenGame): + L = (14, 6) + NCARDS = 84 + GRAVITY = False + +class Shisen_24x12_NoGravity(AbstractShisenGame): + L = (24, 12) + NCARDS = 288 + GRAVITY = False + +# /*********************************************************************** +# // register a Shisen-Sho type game +# ************************************************************************/ + +def r(id, gameclass, short_name, name=None, decks=1, ranks=10, trumps=12): + if not name: + name = short_name + decks, ranks, trumps = comp_cardset(gameclass.NCARDS) + gi = GameInfo(id, gameclass, name, + GI.GT_SHISEN_SHO, 4*decks, 0, + category=GI.GC_MAHJONGG, short_name=name, + suits=range(3), ranks=range(ranks), trumps=range(trumps), + si={"decks": decks, "ncards": gameclass.NCARDS}) + gi.ncards = gameclass.NCARDS + gi.rules_filename = "shisensho.html" + registerGame(gi) + return gi + +r(11001, Shisen_14x6, "Shisen-Sho 14x6") +r(11002, Shisen_18x8, "Shisen-Sho 18x8") +r(11003, Shisen_24x12, "Shisen-Sho 24x12") +r(11004, Shisen_14x6_NoGravity, "Shisen-Sho (No Gra) 14x6") +r(11005, Shisen_18x8_NoGravity, "Shisen-Sho (No Gra) 18x8") +r(11006, Shisen_24x12_NoGravity, "Shisen-Sho (No Gra) 24x12") + +del r diff --git a/pysollib/games/matriarchy.py b/pysollib/games/matriarchy.py new file mode 100644 index 00000000..ee704826 --- /dev/null +++ b/pysollib/games/matriarchy.py @@ -0,0 +1,229 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // Talon +# ************************************************************************/ + +class Matriarchy_Waste(WasteStack): + def updateText(self): + WasteStack.updateText(self) + if self.game.s.talon._updateMaxRounds(): + self.game.s.talon.updateText() + + +class Matriarchy_Talon(WasteTalonStack): + DEAL = (2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 11, 10, 9, 8, 7, 6, 5) + + def _updateMaxRounds(self): + # recompute max_rounds + old = self.max_rounds + self.max_rounds = 11 + rows = self.game.s.rows + for i in (0, 2, 4, 6): + l1 = len(rows[i+0].cards) + len(rows[i+8].cards) + l2 = len(rows[i+1].cards) + len(rows[i+9].cards) + assert l1 + l2 <= 26 + if l1 + l2 == 26: + self.max_rounds = self.max_rounds + 2 + elif l1 >= 13 or l2 >= 13: + self.max_rounds = self.max_rounds + 1 + if self.max_rounds == 19: + # game is won + self.max_rounds = 18 + return old != self.max_rounds + + def canDealCards(self): + if self._updateMaxRounds(): + self.updateText() + if not self.cards and not self.game.s.waste.cards: + return 0 + ncards = self.DEAL[self.round-1] + assert ncards > 0 + return len(self.cards) >= ncards or self.round < self.max_rounds + + def dealCards(self, sound=0): + # get number of cards to deal + ncards = self.DEAL[self.round-1] + assert ncards > 0 + # init + waste = self.game.s.waste + n = 0 + update_flags = 1 + # deal + while n < ncards: + # from self to waste + while n < ncards: + card = self.getCard() + if not card: + break + assert not card.face_up + self.game.flipMove(self) + self.game.moveMove(1, self, waste, frames=3, shadow=0) + n = n + 1 + # turn from waste to self + if n < ncards and len(waste.cards) > 0: + assert len(self.cards) == 0 + assert self.round < self.max_rounds or update_flags == 0 + self.game.turnStackMove(waste, self, update_flags=update_flags) + # do not update self.round anymore in this deal + update_flags = 0 + assert self.round <= self.max_rounds + assert n == ncards + assert len(self.game.s.waste.cards) > 0 + # done + return n + + def updateText(self): + if self.game.preview > 1: + return + WasteTalonStack.updateText(self, update_rounds=0) + ## t = "Round %d" % self.round + t = _("Round %d/%d") % (self.round, self.max_rounds) + self.texts.rounds.config(text=t) + t = _("Deal %d") % self.DEAL[self.round-1] + self.texts.misc.config(text=t) + + +# /*********************************************************************** +# // Rows +# ************************************************************************/ + +class Matriarchy_UpRowStack(SS_RowStack): + def __init__(self, x, y, game, suit): + SS_RowStack.__init__(self, x, y, game, suit=suit, + base_rank=KING, mod=13, dir=1, + min_cards=1, max_cards=12) + self.CARD_YOFFSET = -self.CARD_YOFFSET + + def getBottomImage(self): + return self.game.app.images.getSuitBottom(self.cap.suit) + + +class Matriarchy_DownRowStack(SS_RowStack): + def __init__(self, x, y, game, suit): + SS_RowStack.__init__(self, x, y, game, suit=suit, + base_rank=QUEEN, mod=13, dir=-1, + min_cards=1, max_cards=12) + + def getBottomImage(self): + return self.game.app.images.getSuitBottom(self.cap.suit) + + +# /*********************************************************************** +# // Matriarchy +# ************************************************************************/ + +class Matriarchy(Game): + Hint_Class = CautiousDefaultHint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (set piles so that at least 2/3 of a card is visible with 12 cards) + h = max(2*l.YS, (12-1)*l.YOFFSET + l.CH*2/3) + self.setSize(10*l.XS+l.XM, h + l.YM + h) + + # create stacks + center, c1, c2 = self.height / 2, h, self.height - h + x, y = l.XM, c1 - l.CH + for i in range(8): + s.rows.append(Matriarchy_UpRowStack(x, y, self, i/2)) + x = x + l.XS + x, y = l.XM, c2 + for i in range(8): + s.rows.append(Matriarchy_DownRowStack(x, y, self, i/2)) + x = x + l.XS + x, y = x + l.XS / 2, c1 - l.CH / 2 - l.CH + tx = x + l.CW / 2 + s.waste = Matriarchy_Waste(x, y, self) + l.createText(s.waste, "ss") + y = c2 + l.CH / 2 + s.talon = Matriarchy_Talon(x, y, self, max_rounds=VARIABLE_REDEALS) + l.createText(s.talon, "nn") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + tx, y + l.YS, anchor="n", + font=self.app.getFont("canvas_default")) + s.talon.texts.misc = MfxCanvasText(self.canvas, + tx, center, anchor="center", + font=self.app.getFont("canvas_large")) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move Queens to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 11, c.suit), 8) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(self.s.rows[8:]) + self.s.talon.dealCards() # deal first cards to WasteStack + + def isGameWon(self): + return len(self.s.talon.cards) == 0 and len(self.s.waste.cards) == 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + if card1.rank + card2.rank == QUEEN + KING: + return 0 + return (card1.suit == card2.suit and + ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + + +# register the game +registerGame(GameInfo(17, Matriarchy, "Matriarchy", + GI.GT_2DECK_TYPE, 2, VARIABLE_REDEALS)) + diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py new file mode 100644 index 00000000..4b29dee4 --- /dev/null +++ b/pysollib/games/montana.py @@ -0,0 +1,407 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Montana_Hint(DefaultHint): + def computeHints(self): + game = self.game + RLEN, RSTEP, RBASE = game.RLEN, game.RSTEP, game.RBASE + freerows = filter(lambda s: not s.cards, game.s.rows) + # for each stack + for r in game.s.rows: + if not r.cards: + continue + assert len(r.cards) == 1 and r.cards[-1].face_up + c, pile, rpile = r.cards[0], r.cards, [] + if r.id % RSTEP > 0: + left = game.s.rows[r.id - 1] + else: + left = None + if c.rank == RBASE: + # do not move the leftmost card of a row if the rank is correct + continue + for t in freerows: + if self.shallMovePile(r, t, pile, rpile): + # FIXME: this scoring is completely simple + if left and left.cards: + # prefer low-rank left neighbours + score = 40000 + (self.K - left.cards[-1].rank) + else: + score = 50000 + self.addHint(score, 1, r, t) + + +# /*********************************************************************** +# // Montana +# ************************************************************************/ + +class Montana_Talon(TalonStack): + def canDealCards(self): + return self.round != self.max_rounds and not self.game.isGameWon() + + def dealCards(self, sound=0): + # move cards to the Talon, shuffle and redeal + game = self.game + RLEN, RSTEP, RBASE = game.RLEN, game.RSTEP, game.RBASE + num_cards = 0 + assert len(self.cards) == 0 + rows = game.s.rows + # move out-of-sequence cards from the Tableau to the Talon + stacks = [] + gaps = [None] * 4 + for g in range(4): + i = g * RSTEP + r = rows[i] + if r.cards and r.cards[-1].rank == RBASE: + in_sequence, suit = 1, r.cards[-1].suit + else: + in_sequence, suit = 0, NO_SUIT + for j in range(RSTEP): + r = rows[i + j] + if in_sequence: + if not r.cards or r.cards[-1].suit != suit or r.cards[-1].rank != RBASE + j: + in_sequence = 0 + if not in_sequence: + stacks.append(r) + if gaps[g] is None: + gaps[g] = r + if r.cards: + game.moveMove(1, r, self, frames=0) + num_cards = num_cards + 1 + assert len(self.cards) == num_cards + assert len(stacks) == num_cards + len(gaps) + if num_cards == 0: # game already finished + return 0 + if sound: + game.startDealSample() + # shuffle + game.shuffleStackMove(self) + # redeal + game.nextRoundMove(self) + spaces = self.getRedealSpaces(stacks, gaps) + for r in stacks: + if not r in spaces: + self.game.moveMove(1, self, r, frames=4) + # done + assert len(self.cards) == 0 + if sound: + game.stopSamples() + return num_cards + + def getRedealSpaces(self, stacks, gaps): + # the spaces are directly after the sorted sequence in each row + return gaps + + +class Montana_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + if self.id % self.game.RSTEP == 0: + return cards[0].rank == self.game.RBASE + left = self.game.s.rows[self.id - 1] + return left.cards and left.cards[-1].suit == cards[0].suit and left.cards[-1].rank + 1 == cards[0].rank + + def clickHandler(self, event): + if not self.cards: + return self.quickPlayHandler(event) + return BasicRowStack.clickHandler(self, event) + + # bottom to get events for an empty stack + prepareBottom = Stack.prepareInvisibleBottom + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class Montana(Game): + Talon_Class = StackWrapper(Montana_Talon, max_rounds=3) + RowStack_Class = Montana_RowStack + Hint_Class = Montana_Hint + + RLEN, RSTEP, RBASE = 52, 13, 1 + + def createGame(self): + # create layout + l, s = Layout(self, XM=4), self.s + + # set window + self.setSize(l.XM + self.RSTEP*l.XS, l.YM + 5*l.YS) + + # create stacks + for i in range(4): + x, y, = l.XM, l.YM + i*l.YS + for j in range(self.RSTEP): + s.rows.append(self.RowStack_Class(x, y, self, max_accept=1, max_cards=1)) + x = x + l.XS + x = l.XM + (self.RSTEP-1)*l.XS/2 + s.talon = self.Talon_Class(x, self.height-l.YS, self) + if self.RBASE: + # create an invisible stack to hold the four Aces + s.internals.append(InvisibleStack(self)) + + # define stack-groups + l.defaultStackGroups() + + + # + # game overrides + # + + def startGame(self): + frames = 0 + for i in range(52): + c = self.s.talon.cards[-1] + if c.rank == ACE: + self.s.talon.dealRow(rows=self.s.internals, frames=0) + else: + if frames == 0 and i >= 39: + self.startDealSample() + frames = 4 + self.s.talon.dealRow(rows=(self.s.rows[i],), frames=frames) + assert len(self.s.talon.cards) == 0 + + def isGameWon(self): + rows = self.s.rows + for i in range(0, self.RLEN, self.RSTEP): + if not rows[i].cards: + return 0 + suit = rows[i].cards[-1].suit + for j in range(self.RSTEP - 1): + r = rows[i + j] + if not r.cards or r.cards[-1].rank != self.RBASE + j or r.cards[-1].suit != suit: + return 0 + return 1 + + def getHighlightPilesStacks(self): + return () + + def getAutoStacks(self, event=None): + return (self.sg.dropstacks, (), self.sg.dropstacks) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if from_stack.cards: + if from_stack.id % self.RSTEP == 0 and from_stack.cards[-1].rank == self.RBASE: + # do not move the leftmost card of a row if the rank is correct + return -1 + return 1 + + +# /*********************************************************************** +# // Spaces +# ************************************************************************/ + +class Spaces_Talon(Montana_Talon): + def getRedealSpaces(self, stacks, gaps): + # use four random spaces, ignore gaps + # note: the random.seed is already saved in shuffleStackMove + spaces = [] + while len(spaces) != 4: + r = self.game.random.choice(stacks) + if not r in spaces: + spaces.append(r) + return spaces + +class Spaces(Montana): + Talon_Class = StackWrapper(Spaces_Talon, max_rounds=3) + + +# /*********************************************************************** +# // Blue Moon +# ************************************************************************/ + +class BlueMoon(Montana): + RLEN, RSTEP, RBASE = 56, 14, 0 + + def startGame(self): + frames = 0 + j = 0 + for i in range(52): + if j % 14 == 0: + j = j + 1 + if i == 39: + self.startDealSample() + frames = 4 + self.s.talon.dealRow(rows=(self.s.rows[j],), frames=frames) + j = j + 1 + assert len(self.s.talon.cards) == 0 + ace_rows = filter(lambda r: r.cards and r.cards[-1].rank == ACE, self.s.rows) + j = 0 + for r in ace_rows: + self.moveMove(1, r, self.s.rows[j]) + j = j + 14 + + +# /*********************************************************************** +# // Red Moon +# ************************************************************************/ + +class RedMoon(BlueMoon): + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + frames = 0 + r = self.s.rows + self.s.talon.dealRow(rows=(r[0],r[14],r[28],r[42]), frames=frames) + for i in range(4): + if i == 3: + self.startDealSample() + frames = 4 + n = i * 14 + 2 + self.s.talon.dealRow(rows=r[n:n+12], frames=frames) + + +# /*********************************************************************** +# // Galary +# ************************************************************************/ + + +class Galary_Hint(Montana_Hint): + # TODO + shallMovePile = DefaultHint._cautiousShallMovePile + + +class Galary_RowStack(Montana_RowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + if self.id % self.game.RSTEP == 0: + return cards[0].rank == self.game.RBASE + r = self.game.s.rows + left = r[self.id - 1] + if left.cards and left.cards[-1].suit == cards[0].suit \ + and left.cards[-1].rank + 1 == cards[0].rank: + return 1 + if self.id < len(r)-1: + right = r[self.id + 1] + if right.cards and right.cards[-1].suit == cards[0].suit \ + and right.cards[-1].rank - 1 == cards[0].rank: + return 1 + return 0 + + +class Galary(RedMoon): + RowStack_Class = Galary_RowStack + Hint_Class = Galary_Hint + +# /*********************************************************************** +# // Moonlight +# ************************************************************************/ + +class Moonlight(Montana): + RowStack_Class = Galary_RowStack + Hint_Class = Galary_Hint + + +# /*********************************************************************** +# // Jungle +# ************************************************************************/ + +class Jungle_RowStack(Montana_RowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + if self.id % self.game.RSTEP == 0: + return cards[0].rank == self.game.RBASE + left = self.game.s.rows[self.id - 1] + return left.cards and left.cards[-1].rank + 1 == cards[0].rank + +class Jungle(BlueMoon): + Talon_Class = StackWrapper(Montana_Talon, max_rounds=2) + RowStack_Class = Jungle_RowStack + + +# /*********************************************************************** +# // Spaces and Aces +# ************************************************************************/ + +class SpacesAndAces_RowStack(Montana_RowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + if self.id % self.game.RSTEP == 0: + return cards[0].rank == self.game.RBASE + left = self.game.s.rows[self.id - 1] + return left.cards and left.cards[-1].suit == cards[0].suit and left.cards[-1].rank < cards[0].rank + + +class SpacesAndAces(BlueMoon): + Hint_Class = Galary_Hint + Talon_Class = InitialDealTalonStack + RowStack_Class = SpacesAndAces_RowStack + + + + +# register the game +registerGame(GameInfo(53, Montana, "Montana", + GI.GT_MONTANA | GI.GT_OPEN, 1, 2, + si={"ncards": 48}, altnames="Gaps")) +registerGame(GameInfo(116, Spaces, "Spaces", + GI.GT_MONTANA | GI.GT_OPEN, 1, 2, + si={"ncards": 48})) +registerGame(GameInfo(63, BlueMoon, "Blue Moon", + GI.GT_MONTANA | GI.GT_OPEN, 1, 2, + altnames=("Rangoon",) )) +registerGame(GameInfo(117, RedMoon, "Red Moon", + GI.GT_MONTANA | GI.GT_OPEN, 1, 2)) +registerGame(GameInfo(275, Galary, "Galary", + GI.GT_MONTANA | GI.GT_OPEN, 1, 2)) +registerGame(GameInfo(276, Moonlight, "Moonlight", + GI.GT_MONTANA | GI.GT_OPEN, 1, 2, + si={"ncards": 48})) +registerGame(GameInfo(380, Jungle, "Jungle", + GI.GT_MONTANA | GI.GT_OPEN, 1, 1)) +registerGame(GameInfo(381, SpacesAndAces, "Spaces and Aces", + GI.GT_MONTANA | GI.GT_OPEN, 1, 0)) + diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py new file mode 100644 index 00000000..708008cb --- /dev/null +++ b/pysollib/games/montecarlo.py @@ -0,0 +1,798 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MonteCarlo_Hint(DefaultHint): + # FIXME: demo is not too clever in this game + pass + + +# /*********************************************************************** +# // Monte Carlo +# // Monaco +# ************************************************************************/ + +class MonteCarlo_Talon(TalonStack): + def canDealCards(self): + free = 0 + for r in self.game.s.rows: + if not r.cards: + free = 1 + elif free: + return 1 + return free and len(self.cards) + + def dealCards(self, sound=0): + self.game.updateStackMove(self.game.s.talon, 2|16) # for undo + n = self.game.fillEmptyStacks() + self.game.updateStackMove(self.game.s.talon, 1|16) # for redo + return n + + +class MonteCarlo_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + # check the rank + if self.cards[-1].rank != cards[0].rank: + return 0 + # now look if the stacks are neighbours + return self.game.isNeighbour(from_stack, self) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + assert ncards == 1 and to_stack in self.game.s.rows + if to_stack.cards: + self._dropPairMove(ncards, to_stack, frames=-1, shadow=shadow) + else: + BasicRowStack.moveMove(self, ncards, to_stack, frames=frames, shadow=shadow) + + def _dropPairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + old_state = game.enterState(game.S_FILL) + f = game.s.foundations[0] + game.updateStackMove(game.s.talon, 2|16) # for undo + if not game.demo: + game.playSample("droppair", priority=200) + game.moveMove(n, self, f, frames=frames, shadow=shadow) + game.moveMove(n, other_stack, f, frames=frames, shadow=shadow) + self.fillStack() + other_stack.fillStack() + if self.game.FILL_STACKS_AFTER_DROP: + game.fillEmptyStacks() + game.updateStackMove(game.s.talon, 1|16) # for redo + game.leaveState(old_state) + + +class MonteCarlo(Game): + Talon_Class = MonteCarlo_Talon + Foundation_Class = StackWrapper(AbstractFoundationStack, max_accept=0) + RowStack_Class = MonteCarlo_RowStack + Hint_Class = MonteCarlo_Hint + + FILL_STACKS_AFTER_DROP = 0 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 6.5*l.XS, l.YM + 5*l.YS) + + # create stacks + for i in range(5): + for j in range(5): + x, y = l.XM + j*l.XS, l.YM + i*l.YS + s.rows.append(self.RowStack_Class(x, y, self, + max_accept=1, max_cards=2, + dir=0, base_rank=NO_RANK)) + x, y = l.XM + 11*l.XS/2, l.YM + s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, + max_move=0, max_cards=52, base_rank=ANY_RANK)) + l.createText(s.foundations[0], "ss") + y = y + 2*l.YS + s.talon = self.Talon_Class(x, y, self, max_rounds=1) + l.createText(s.talon, "ss", text_format="%D") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + def getAutoStacks(self, event=None): + return ((), (), self.sg.dropstacks) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank == card2.rank + + + # + # game extras + # + + def isNeighbour(self, stack1, stack2): + if not (0 <= stack1.id <= 24 and 0 <= stack2.id <= 24): + return 0 + column = stack2.id % 5 + diff = stack1.id - stack2.id + if column == 0: + return diff in (-5, -4, 1, 5, 6) + elif column == 4: + return diff in (-6, -5, -1, 4, 5) + else: + return diff in (-6, -5, -4, -1, 1, 4, 5, 6) + + def fillEmptyStacks(self): + free, n = 0, 0 + self.startDealSample() + for r in self.s.rows: + assert len(r.cards) <= 1 + if not r.cards: + free = free + 1 + elif free > 0: + to_stack = self.allstacks[r.id - free] + self.moveMove(1, r, to_stack, frames=4, shadow=0) + if free > 0: + for r in self.s.rows: + if not r.cards: + if not self.s.talon.cards: + break + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, r) + n = n + 1 + self.stopSamples() + return n + + +class Monaco(MonteCarlo): + pass + + +# /*********************************************************************** +# // Weddings +# ************************************************************************/ + +class Weddings_Talon(MonteCarlo_Talon): + def canDealCards(self): + free = 0 + for r in self.game.s.rows: + if not r.cards: + free = 1 + else: + k = r.id + while k >= 5 and not self.game.allstacks[k - 5].cards: + k = k - 5 + if k != r.id: + return 1 + return free and len(self.cards) + + +class Weddings(MonteCarlo): + Talon_Class = Weddings_Talon + + def fillEmptyStacks(self): + free, n = 0, 0 + self.startDealSample() + for r in self.s.rows: + assert len(r.cards) <= 1 + if not r.cards: + free = free + 1 + else: + k = r.id + while k >= 5 and not self.allstacks[k - 5].cards: + k = k - 5 + if k != r.id: + to_stack = self.allstacks[k] + self.moveMove(1, r, to_stack, frames=4, shadow=0) + if free > 0: + for r in self.s.rows: + if not r.cards: + if not self.s.talon.cards: + break + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, r) + n = n + 1 + self.stopSamples() + return n + + +# /*********************************************************************** +# // Simple Carlo (Monte Carlo for Children, stacks do not +# // have to be neighbours) +# ************************************************************************/ + +class SimpleCarlo(MonteCarlo): + FILL_STACKS_AFTER_DROP = 1 + + def getAutoStacks(self, event=None): + return ((), (), ()) + + def isNeighbour(self, stack1, stack2): + return 0 <= stack1.id <= 24 and 0 <= stack2.id <= 24 + + +# /*********************************************************************** +# // Simple Pairs +# ************************************************************************/ + +class SimplePairs(MonteCarlo): + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 6*l.XS, l.YM + 4*l.YS) + + # create stacks + for i in range(3): + for j in range(3): + x, y = l.XM + (2*j+3)*l.XS/2, l.YM + (2*i+1)*l.YS/2 + s.rows.append(self.RowStack_Class(x, y, self, + max_accept=1, max_cards=2, + dir=0, base_rank=NO_RANK)) + x, y = l.XM, l.YM + 3*l.YS/2 + s.talon = TalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + x = x + 5*l.XS + s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, + max_move=0, max_cards=52, base_rank=ANY_RANK)) + l.createText(s.foundations[0], "ss") + + # define stack-groups + l.defaultStackGroups() + + def fillStack(self, stack): + if stack in self.s.rows: + if len(stack.cards) == 0 and len(self.s.talon.cards) > 0: + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, stack) + + def isNeighbour(self, stack1, stack2): + return 0 <= stack1.id <= 15 and 0 <= stack2.id <= 15 + + +# /*********************************************************************** +# // Neighbour +# ************************************************************************/ + +class Neighbour_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # We accept any King. Pairs will get delivered by _dropPairMove. + return cards[0].rank == KING + + +class Neighbour_RowStack(MonteCarlo_RowStack): + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + # check the rank + if self.cards[-1].rank + cards[0].rank != 11: + return 0 + # now look if the stacks are neighbours + return self.game.isNeighbour(from_stack, self) + + def clickHandler(self, event): + if self._dropKingClickHandler(event): + return 1 + return MonteCarlo_RowStack.clickHandler(self, event) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + assert ncards == 1 + if self.cards[-1].rank == KING: + assert to_stack in self.game.s.foundations + BasicRowStack.moveMove(self, ncards, to_stack, frames=frames, shadow=shadow) + else: + MonteCarlo_RowStack.moveMove(self, ncards, to_stack, frames=frames, shadow=shadow) + + def _dropKingClickHandler(self, event): + if not self.cards: + return 0 + c = self.cards[-1] + if c.face_up and c.rank == KING and not self.basicIsBlocked(): + self.game.playSample("autodrop", priority=20) + self.playMoveMove(1, self.game.s.foundations[0], sound=0) + return 1 + return 0 + + def fillStack(self): + if not self.cards and self.game.s.talon.canDealCards(): + old_state = self.game.enterState(self.game.S_FILL) + self.game.s.talon.dealCards() + self.game.leaveState(old_state) + + +class Neighbour(MonteCarlo): + Foundation_Class = Neighbour_Foundation + RowStack_Class = Neighbour_RowStack + + FILL_STACKS_AFTER_DROP = 1 + + def getAutoStacks(self, event=None): + return ((), self.sg.dropstacks, ()) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank + card2.rank == 11 + + +# /*********************************************************************** +# // Fourteen +# ************************************************************************/ + +class Fourteen_RowStack(MonteCarlo_RowStack): + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + # check the rank + return self.cards[-1].rank + cards[0].rank == 12 + + +class Fourteen(Game): + Foundation_Class = StackWrapper(AbstractFoundationStack, max_accept=0) + RowStack_Class = Fourteen_RowStack + + FILL_STACKS_AFTER_DROP = 0 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 7*l.XS, l.YM + 5*l.YS) + + # create stacks + for i in (0, 2.5): + for j in range(6): + x, y = l.XM + j*l.XS, l.YM + i*l.YS + s.rows.append(self.RowStack_Class(x, y, self, + max_move=1, max_accept=1, + dir=0, base_rank=NO_RANK)) + x, y = l.XM + 6*l.XS, l.YM + s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, + max_move=0, max_cards=52, base_rank=ANY_RANK)) + l.createText(s.foundations[0], "ss") + x, y = self.width - l.XS, self.height - l.YS + s.talon = InitialDealTalonStack(x, y, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.rows[:4]) + + def getAutoStacks(self, event=None): + return ((), (), self.sg.dropstacks) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank + card2.rank == 12 + + +# /*********************************************************************** +# // Nestor +# ************************************************************************/ + +class Nestor_RowStack(MonteCarlo_RowStack): + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + # check the rank + return self.cards[-1].rank == cards[0].rank + + +class Nestor(Game): + Foundation_Class = StackWrapper(AbstractFoundationStack, max_accept=0) + RowStack_Class = Nestor_RowStack + + FILL_STACKS_AFTER_DROP = 0 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+8*l.XS, l.YM+2*l.YS+12*l.YOFFSET) + + # create stacks + x, y = l.XM, l.YM + for i in range(8): + s.rows.append(self.RowStack_Class(x, y, self, + max_move=1, max_accept=1, + dir=0, base_rank=NO_RANK)) + x += l.XS + x, y = l.XM+2*l.XS, self.height-l.YS + for i in range(4): + s.rows.append(self.RowStack_Class(x, y, self, + max_move=1, max_accept=1, + dir=0, base_rank=NO_RANK)) + x += l.XS + x, y = self.width-l.XS, self.height-l.YS + s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, + max_move=0, max_cards=52, base_rank=ANY_RANK)) + l.createText(s.foundations[0], "nn") + x, y = l.XM, self.height - l.YS + s.talon = InitialDealTalonStack(x, y, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _checkRow(self, cards): + for i in range(len(cards)): + for j in range(i): + if cards[i].rank == cards[j].rank: + return j + return -1 + + def _shuffleHook(self, cards): + # no row will have two cards of the same rank + for i in range(8): + for t in range(1000): # just in case + j = self._checkRow(cards[i*6:(i+1)*6]) + if j < 0: + break + j += i*6 + k = self.random.choice(range((i+1)*6, 52)) + cards[j], cards[k] = cards[k], cards[j] + cards.reverse() + return cards + + def startGame(self): + for r in self.s.rows[:8]: + for j in range(6): + self.s.talon.dealRow(rows=[r], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[8:]) + + def getAutoStacks(self, event=None): + return ((), (), self.sg.dropstacks) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank == card2.rank + + +# /*********************************************************************** +# // Vertical +# ************************************************************************/ + +class Vertical(Nestor): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+9*l.XS, l.YM+2*l.YS+12*l.YOFFSET) + + # create stacks + x, y = l.XM, l.YM + for i in range(7): + s.rows.append(self.RowStack_Class(x, y, self, + max_move=1, max_accept=1, + dir=0, base_rank=NO_RANK)) + x += l.XS + x, y = l.XM, self.height-l.YS + for i in range(9): + s.rows.append(self.RowStack_Class(x, y, self, + max_move=1, max_accept=1, + dir=0, base_rank=NO_RANK)) + x += l.XS + x, y = self.width-l.XS, l.YM + s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, + max_move=0, max_cards=52, base_rank=ANY_RANK)) + l.createText(s.foundations[0], "ss") + x -= l.XS + s.talon = InitialDealTalonStack(x, y, self) + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self): + self.s.talon.dealRow(frames=0) + for i in range(4): + self.s.talon.dealRow(rows=self.s.rows[:7], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:7]) + self.s.talon.dealRow(rows=[self.s.rows[3]]) + + + +# /*********************************************************************** +# // The Wish +# ************************************************************************/ + +class TheWish(Game): + + FILL_STACKS_AFTER_DROP = 0 + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+6*l.XS, 2*l.YM+2*l.YS+6*l.YOFFSET) + + # create stacks + for i in range(2): + for j in range(4): + x, y = l.XM + j*l.XS, l.YM+i*(l.YM+l.YS+3*l.YOFFSET) + s.rows.append(Nestor_RowStack(x, y, self, + max_move=1, max_accept=1, + dir=0, base_rank=NO_RANK)) + + x, y = self.width - l.XS, l.YM + s.talon = InitialDealTalonStack(x, y, self) + + x, y = self.width - l.XS, self.height - l.YS + s.foundations.append(AbstractFoundationStack(x, y, self, suit=ANY_SUIT, + max_move=0, max_cards=52, max_accept=0, base_rank=ANY_RANK)) + l.createText(s.foundations[0], "nn") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def fillStack(self, stack): + if stack.cards: + self.flipMove(stack) + + def getAutoStacks(self, event=None): + return ((), (), self.sg.dropstacks) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank == card2.rank + +class TheWishOpen(TheWish): + def fillStack(self, stack): + pass + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + +# /*********************************************************************** +# // Der letzte Monarch (The last Monarch) +# ************************************************************************/ + +class DerLetzteMonarch_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if cards is None: + # special hack for _getDropStack() below + return SS_FoundationStack.acceptsCards(self, from_stack, from_stack.cards) + # + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # We only accept cards from a Reserve. Other cards will get + # delivered by _handlePairMove. + return from_stack in self.game.s.reserves + + +class DerLetzteMonarch_RowStack(ReserveStack): + def canDropCards(self, stacks): + return (None, 0) + + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return 0 + # must be neighbours + if not self.game.isNeighbour(from_stack, self): + return 0 + # must be able to move our card to the foundations or reserves + return self._getDropStack() is not None + + def _getDropStack(self): + if len(self.cards) != 1: + return None + for s in self.game.s.foundations: + if s.acceptsCards(self, None): # special hack + return s + for s in self.game.s.reserves: + if not s.cards: + return s + return None + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + assert ncards == 1 and to_stack in self.game.s.rows + assert len(to_stack.cards) == 1 + self._handlePairMove(ncards, to_stack, frames=-1, shadow=0) + + def _handlePairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + old_state = game.enterState(game.S_FILL) + s = other_stack._getDropStack() + assert s is not None + game.moveMove(n, other_stack, s, frames=frames, shadow=shadow) + game.moveMove(n, self, other_stack, frames=0) + game.leaveState(old_state) + + +class DerLetzteMonarch_ReserveStack(ReserveStack): + def clickHandler(self, event): + return self.doubleclickHandler(event) + + +class DerLetzteMonarch(Game): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self, XM=4), self.s + + # set window + self.setSize(l.XM + 13*l.XS, l.YM + 5*l.YS) + + # create stacks + for i in range(4): + for j in range(13): + x, y, = l.XM + j*l.XS, l.YM + (i+1)*l.YS + s.rows.append(DerLetzteMonarch_RowStack(x, y, self, max_accept=1, max_cards=2)) + for i in range(4): + x, y, = l.XM + (i+2)*l.XS, l.YM + s.reserves.append(DerLetzteMonarch_ReserveStack(x, y, self, max_accept=0)) + for i in range(4): + x, y, = l.XM + (i+7)*l.XS, l.YM + s.foundations.append(DerLetzteMonarch_Foundation(x, y, self, i, max_move=0)) + s.talon = InitialDealTalonStack(l.XM, l.YM, self) + + # define stack-groups (non default) + self.sg.talonstacks = [s.talon] + self.sg.openstacks = s.foundations + s.rows + self.sg.dropstacks = s.rows + s.reserves + self.sg.reservestacks = s.reserves + + # + # game overrides + # + + def startGame(self): + self.s.talon.dealRow(rows=self.s.rows[:39], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[39:]) + + def isGameWon(self): + c = 0 + for s in self.s.foundations: + c = c + len(s.cards) + return c == 51 + + def getAutoStacks(self, event=None): + return ((), self.s.reserves, ()) + + def getDemoInfoText(self): + return "Der letzte\nMonarch" + + + # + # game extras + # + + def isNeighbour(self, stack1, stack2): + if not (0 <= stack1.id <= 51 and 0 <= stack2.id <= 51): + return 0 + column = stack2.id % 13 + diff = stack1.id - stack2.id + if column == 0: + return diff in (-13, 1, 13) + elif column == 12: + return diff in (-13, -1, 13) + else: + return diff in (-13, -1, 1, 13) + + +# register the game +registerGame(GameInfo(89, MonteCarlo, "Monte Carlo", + GI.GT_PAIRING_TYPE, 1, 0, + altnames=("Quilt",) )) +registerGame(GameInfo(216, Monaco, "Monaco", + GI.GT_PAIRING_TYPE, 2, 0)) +registerGame(GameInfo(212, Weddings, "Weddings", + GI.GT_PAIRING_TYPE, 1, 0)) +registerGame(GameInfo(90, SimpleCarlo, "Simple Carlo", + GI.GT_PAIRING_TYPE, 1, 0)) +registerGame(GameInfo(91, SimplePairs, "Simple Pairs", + GI.GT_PAIRING_TYPE, 1, 0, + altnames=("Jamestown",))) +registerGame(GameInfo(92, Neighbour, "Neighbour", + GI.GT_PAIRING_TYPE, 1, 0)) +registerGame(GameInfo(96, Fourteen, "Fourteen", + GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(235, Nestor, "Nestor", + GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(152, DerLetzteMonarch, "The last Monarch", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, + altnames=("Der letzte Monarch",) )) +registerGame(GameInfo(328, TheWish, "The Wish", + GI.GT_PAIRING_TYPE, 1, 0, + ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) +registerGame(GameInfo(329, TheWishOpen, "The Wish (open)", + GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, + ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) +registerGame(GameInfo(368, Vertical, "Vertical", + GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0)) + diff --git a/pysollib/games/napoleon.py b/pysollib/games/napoleon.py new file mode 100644 index 00000000..69ee4696 --- /dev/null +++ b/pysollib/games/napoleon.py @@ -0,0 +1,273 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +from pysollib.games.braid import Braid_Foundation + + +# /*********************************************************************** +# // stacks +# ************************************************************************/ + +class Napoleon_Talon(InitialDealTalonStack): + pass + + +class Napoleon_Foundation(Braid_Foundation): + pass + + +class Napoleon_RowStack(UD_SS_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class Napoleon_ReserveStack(BasicRowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=1, max_accept=0) + apply(BasicRowStack.__init__, (self, x, y, game), cap) + + +class Napoleon_SingleFreeCell(ReserveStack): + def acceptsCards(self, from_stack, cards): +## if from_stack.id >= 8: +## # from_stack must be a Napoleon_RowStack +## return 0 + return ReserveStack.acceptsCards(self, from_stack, cards) + + def canMoveCards(self, cards): + if self.game.s.rows[8].cards and self.game.s.rows[9].cards: + return 0 + return ReserveStack.canMoveCards(self, cards) + + +class Napoleon_FreeCell(ReserveStack): + def canMoveCards(self, cards): + if self.game.s.rows[self.id-2].cards: + return 0 + return ReserveStack.canMoveCards(self, cards) + + +# /*********************************************************************** +# // Der kleine Napoleon +# ************************************************************************/ + +class DerKleineNapoleon(Game): + + RowStack_Class = StackWrapper(Napoleon_RowStack, mod=13) + + # + # game layout + # + + def createGame(self, reserves=1): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 2*24 + 2*l.XM + 11*l.XS, l.YM + 5*l.YS + 2*l.XM) + x0 = l.XM + 24 + 4*l.XS + x1 = x0 + l.XS + l.XM + x2 = x1 + l.XS + l.XM + + # create stacks + y = l.YM + for i in range(4): + s.rows.append(self.RowStack_Class(x0, y, self)) + s.rows.append(self.RowStack_Class(x2, y, self)) + y = y + l.YS + y = self.height - l.YS + if reserves == 1: + s.rows.append(Napoleon_ReserveStack(x0, y, self)) + s.rows.append(Napoleon_ReserveStack(x2, y, self)) + s.reserves.append(Napoleon_SingleFreeCell(x1, y, self)) + else: + s.rows.append(Napoleon_ReserveStack(x0 - l.XS, y, self)) + s.rows.append(Napoleon_ReserveStack(x2 + l.XS, y, self)) + s.reserves.append(Napoleon_FreeCell(x0, y, self)) + s.reserves.append(Napoleon_FreeCell(x2, y, self)) + # foundations + x, y = x1, l.YM + for i in range(4): + s.foundations.append(Napoleon_Foundation(x, y, self, i)) + y = y + l.YS + # talon + if reserves == 1: + ##x, y = l.XM, self.height - l.YS + y = self.height + l.YS + else: + y = self.height - l.YS + s.talon = Napoleon_Talon(x, y, self) + + # update stack building direction + for r in s.rows: + if r.id & 1 == 0: + r.CARD_XOFFSET = 4*[-l.XS] + 13*[-2] + else: + r.CARD_XOFFSET = 4*[l.XS] + 13*[2] + r.CARD_YOFFSET = 0 + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move 4 cards of the same rank to bottom of the Talon (i.e. last cards to be dealt) + rank = cards[-1].rank + return self._shuffleHookMoveToBottom(cards, lambda c, rank=rank: (c.rank == rank, c.suit)) + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(rows=self.s.rows[:8], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:8]) + for i in range(4): + self.s.talon.dealRow(rows=self.s.rows[8:]) + self.s.talon.dealBaseCards(ncards=4) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + + # + # game extras + # + + def updateText(self): + if self.preview > 1 or not self.texts.info: + return + t = "" + f = self.s.foundations[0] + if f.cards: + t = RANKS[f.cards[0].rank] + dir = self.getFoundationDir() + if dir == 1: + t = t + _(" Ascending") + elif dir == -1: + t = t + _(" Descending") + self.texts.info.config(text=t) + + +# /*********************************************************************** +# // Der freie Napoleon (completely equivalent to Der kleine Napoleon, +# // just a different layout) +# ************************************************************************/ + +class DerFreieNapoleon(DerKleineNapoleon): + + RowStack_Class = StackWrapper(Napoleon_RowStack, mod=13) + # + # game layout + # + + def createGame(self, reserves=1): + # create layout + l, s = Layout(self), self.s + + # set window + # set size so that at least 2/3 of a card is visible with 15 cards + h = l.CH*2/3 + (15-1)*l.YOFFSET + h = l.YS + max(h, 3*l.YS) + self.setSize(l.XM + 2*l.XM + 10*l.XS, l.YM + h) + x1 = l.XM + 8*l.XS + 2*l.XM + + # create stacks + y = l.YM + l.YS + for j in range(8): + x = l.XM + j*l.XS + s.rows.append(self.RowStack_Class(x, y, self)) + for j in range(2): + x = x1 + j*l.XS + s.rows.append(Napoleon_ReserveStack(x, y, self)) + self.setRegion(s.rows, (-999, y - l.YM/2, 999999, 999999)) + y = l.YM + if reserves == 1: + s.reserves.append(Napoleon_SingleFreeCell(x1 + l.XS/2, y, self)) + else: + s.reserves.append(Napoleon_FreeCell(x1, y, self)) + s.reserves.append(Napoleon_FreeCell(x1 + l.XS, y, self)) + # foundations + x = l.XM + 2*l.XS + for i in range(4): + s.foundations.append(Napoleon_Foundation(x, y, self, i)) + x = x + l.XS + tx, ty, ta, tf = l.getTextAttr(s.foundations[-1], "se") + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) + # talon + x, y = l.XM, self.height - l.YS + s.talon = Napoleon_Talon(x, y, self) + + # define stack-groups + l.defaultStackGroups() + + +# /*********************************************************************** +# // Napoleon (two FreeCells instead of one SingleFreeCell) +# ************************************************************************/ + +class Napoleon(DerKleineNapoleon): + def createGame(self): + DerKleineNapoleon.createGame(self, reserves=2) + + +class FreeNapoleon(DerFreieNapoleon): + def createGame(self): + DerFreieNapoleon.createGame(self, reserves=2) + + +# register the game +registerGame(GameInfo(167, DerKleineNapoleon, "Der kleine Napoleon", + GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(168, DerFreieNapoleon, "Der freie Napoleon", + GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(169, Napoleon, "Napoleon", + GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(170, FreeNapoleon, "Free Napoleon", + GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0)) + diff --git a/pysollib/games/needle.py b/pysollib/games/needle.py new file mode 100644 index 00000000..f95eb6f0 --- /dev/null +++ b/pysollib/games/needle.py @@ -0,0 +1,121 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + + +# /*********************************************************************** +# // Needle +# // Haystack +# // Pitchfork +# ************************************************************************/ + +class Needle(Game): + + Hint_Class = CautiousDefaultHint + ReserveStack_Class = StackWrapper(ReserveStack, max_cards=18) + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+max(9*l.XS, 5*l.XS+18*l.XOFFSET), l.YM+2*l.YS+12*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + stack = self.ReserveStack_Class(x, y, self) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.reserves.append(stack) + self.setRegion(s.reserves, (-999, -999, w-4*l.XS-l.CW/2, l.YM+l.YS-l.CH/2)) + + x = w-4*l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + + x, y = l.XM+(w-(l.XM+9*l.XS))/2, l.YM+l.YS + for i in range(9): + s.rows.append(AC_RowStack(x, y, self, max_move=1)) + x += l.XS + + s.talon = InitialDealTalonStack(w-l.XS, h-l.YS, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + for i in range(8): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + for i in (4, 4, 3, 3): + self.s.talon.dealRow(rows=self.s.rows[:i], frames=0) + self.s.talon.dealRow(rows=self.s.rows[-i:], frames=0) + self.startDealSample() + for i in (2, 2, 2, 2): + self.s.talon.dealRow(rows=self.s.rows[:i]) + self.s.talon.dealRow(rows=self.s.rows[-i:]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack in self.s.reserves: + return 0 + return 1+int(len(to_stack.cards) != 0) + + +class Haystack(Needle): + ReserveStack_Class = StackWrapper(ReserveStack, max_cards=8) + + +class Pitchfork(Needle): + ReserveStack_Class = StackWrapper(OpenStack, max_accept=0) + + +# register the game +registerGame(GameInfo(318, Needle, "Needle", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(319, Haystack, "Haystack", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(367, Pitchfork, "Pitchfork", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py new file mode 100644 index 00000000..7c321c9a --- /dev/null +++ b/pysollib/games/numerica.py @@ -0,0 +1,544 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Galen Brooks +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText +from pysollib.mfxutil import kwdefault + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Numerica_Hint(DefaultHint): + # FIXME: demo is clueless + + #def _getDropCardScore(self, score, color, r, t, ncards): + #FIXME: implement this method + + def _getMoveWasteScore(self, score, color, r, t, pile, rpile): + assert r is self.game.s.waste and len(pile) == 1 + score = 30000 + if len(t.cards) == 0: + score = score - (KING - r.cards[0].rank) * 1000 + elif t.cards[-1].rank < r.cards[0].rank: + # FIXME: add intelligence here + score = 10000 + t.cards[-1].rank - len(t.cards) + elif t.cards[-1].rank == r.cards[0].rank: + score = 20000 + else: + score = score - (t.cards[-1].rank - r.cards[0].rank) * 1000 + return score, color + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Numerica_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + # this stack accepts any one card from the Waste pile + return from_stack is self.game.s.waste and len(cards) == 1 + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + def getHelp(self): + ##return _('Row. Accepts any one card from the Waste.') + return _('Row. Build regardless of rank and suit.') + + +# /*********************************************************************** +# // Numerica +# ************************************************************************/ + +class Numerica(Game): + Hint_Class = Numerica_Hint + Foundation_Class = StackWrapper(RK_FoundationStack, suit=ANY_SUIT) + RowStack_Class = StackWrapper(Numerica_RowStack, max_accept=1) + + # + # game layout + # + + def createGame(self, rows=4): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 20 cards are playable in default window size) + h = max(2*l.YS, 20*l.YOFFSET) + self.setSize(l.XM+(1.5+rows)*l.XS+l.XM, l.YM + l.YS + h) + + # create stacks + x0 = l.XM + l.XS * 3 / 2 + x, y = x0 + (rows-4)*l.XS/2, l.YM + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) + x = x + l.XS + x, y = x0, l.YM + l.YS + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self)) + x = x + l.XS + self.setRegion(s.rows, (x0 - l.XS / 2, y, 999999, 999999)) + x = l.XM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + s.talon.texts.ncards = MfxCanvasText(self.canvas, + x + l.CW / 2, y - l.YM, + anchor="s", + font=self.app.getFont("canvas_default")) + y = y + l.YS + s.waste = WasteStack(x, y, self, max_cards=1) + + # define stack-groups + self.sg.openstacks = s.foundations + s.rows + self.sg.talonstacks = [s.talon] + [s.waste] + self.sg.dropstacks = s.rows + [s.waste] + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealCards() # deal first card to WasteStack + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + +# /*********************************************************************** +# // Lady Betty +# ************************************************************************/ + +class LadyBetty(Numerica): + Foundation_Class = SS_FoundationStack + + def createGame(self): + Numerica.createGame(self, rows=6) + + +# /*********************************************************************** +# // Puss in the Corner +# ************************************************************************/ + +class PussInTheCorner_Foundation(SS_FoundationStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, base_suit=ANY_SUIT) + apply(SS_FoundationStack.__init__, (self, x, y, game, ANY_SUIT), cap) + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return False + if self.cards: + # check the color + if cards[0].color != self.cards[-1].color: + return False + return True + def getHelp(self): + return _('Foundation. Build up by color.') + + +class PussInTheCorner_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + # this stack accepts any one card from the Talon + return from_stack is self.game.s.talon and len(cards) == 1 + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + def getHelp(self): + ##return _('Row. Accepts any one card from the Waste.') + return _('Row. Build regardless of rank and suit.') + + +class PussInTheCorner(Numerica): + + def createGame(self, rows=4): + l, s = Layout(self), self.s + self.setSize(l.XM+4*l.XS, l.YM+4*l.YS) + for x, y in ((l.XM, l.YM ), + (l.XM+3*l.XS, l.YM ), + (l.XM, l.YM+3*l.YS), + (l.XM+3*l.XS, l.YM+3*l.YS), + ): + stack = PussInTheCorner_RowStack(x, y, self, + max_accept=1, max_move=1) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + s.rows.append(stack) + for x, y in ((l.XM+ l.XS, l.YM+ l.YS), + (l.XM+ l.XS, l.YM+2*l.YS), + (l.XM+2*l.XS, l.YM+ l.YS), + (l.XM+2*l.XS, l.YM+2*l.YS), + ): + s.foundations.append(PussInTheCorner_Foundation(x, y, self, + max_move=0)) + x, y = l.XM+3*l.XS/2, l.YM + s.talon = OpenTalonStack(x, y, self) + l.createText(s.talon, 'se') + + # define stack-groups + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, c.suit)) + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.fillStack() + + +# /*********************************************************************** +# // Frog +# // Fly +# ************************************************************************/ + +class Frog(Game): + + Hint_Class = Numerica_Hint + Foundation_Class = SS_FoundationStack + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 8*l.XS, l.YM + 2*l.YS+16*l.YOFFSET) + + # create stacks + x, y, = l.XM, l.YM + for i in range(8): + if self.Foundation_Class is RK_FoundationStack: + suit = ANY_SUIT + else: + suit = int(i/2) + s.foundations.append(self.Foundation_Class(x, y, self, + suit=suit, max_move=0)) + x += l.XS + x, y = l.XM, l.YM+l.YS + stack = OpenStack(x, y, self, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.reserves.append(stack) + x += l.XS + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + x += l.XS + s.waste = WasteStack(x, y, self, max_cards=1) + x += l.XS + for i in range(5): + stack = Numerica_RowStack(x, y, self, max_accept=UNLIMITED_ACCEPTS) + #stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.rows.append(stack) + x = x + l.XS + + # define stack-groups + l.defaultStackGroups() + + def _shuffleHook(self, cards): + for c in cards[:]: + if c.rank == ACE: + cards.remove(c) + cards.append(c) + return cards + + def startGame(self): + tc = self.s.talon.cards[-1] + self.startDealSample() + self.s.talon.dealRow(rows=[self.s.foundations[tc.suit*2]]) + for i in range(13): + self.s.talon.dealRow(self.s.reserves, flip=0) + self.flipMove(self.s.reserves[0]) + self.s.talon.dealCards() + + +class Fly(Frog): + + Foundation_Class = RK_FoundationStack + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, c.suit)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + for i in range(13): + self.s.talon.dealRow(self.s.reserves, flip=0) + self.flipMove(self.s.reserves[0]) + self.s.talon.dealCards() + + +# /*********************************************************************** +# // Gnat +# ************************************************************************/ + +class Gnat(Game): + + Hint_Class = Numerica_Hint + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 8*l.XS, l.YM + 2*l.YS+16*l.YOFFSET) + + # create stacks + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + x += l.XS + s.waste = WasteStack(x, y, self, max_cards=1) + x += l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(4): + s.rows.append(Numerica_RowStack(x, y, self, max_accept=UNLIMITED_ACCEPTS)) + x += l.XS + x = l.XM+6*l.XS + for i in range(2): + y = l.YM + l.YS/2 + for j in range(3): + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + y += l.YS + x += l.YS + + # define stack-groups + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, c.suit)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealCards() + + +# /*********************************************************************** +# // Gloaming +# // Chamberlain +# ************************************************************************/ + +class Gloaming_RowStack(Numerica_RowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + # this stack accepts any one card from reserves + return from_stack in self.game.s.reserves + + +class Gloaming(Game): + + Hint_Class = Numerica_Hint + Foundation_Class = SS_FoundationStack + + def createGame(self, reserves=3, rows=5): + # create layout + l, s = Layout(self), self.s + + # set window + n = 52/reserves+1 + w, h = l.XM + (reserves+rows+1)*l.XS, l.YM + 2*l.YS+n*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM+(reserves+rows+1-4)*l.XS/2, l.YM + for i in range(4): + if self.Foundation_Class is RK_FoundationStack: + suit = ANY_SUIT + else: + suit = i + s.foundations.append(self.Foundation_Class(x, y, self, + suit=suit, max_move=0)) + x += l.XS + + x, y = l.XM, l.YM+l.YS + for i in range(reserves): + stack = OpenStack(x, y, self, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.reserves.append(stack) + x += l.XS + + x += l.XS + for i in range(rows): + s.rows.append(Gloaming_RowStack(x, y, self, max_accept=UNLIMITED_ACCEPTS)) + x += l.XS + + s.talon = InitialDealTalonStack(w-l.XS, h-l.YS, self) + + # default + l.defaultAll() + + + def startGame(self): + n = 52/len(self.s.reserves)+1 + for i in range(n-3): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRowAvail(rows=self.s.reserves) + + +class Chamberlain(Gloaming): + Foundation_Class = RK_FoundationStack + def createGame(self, reserves=3, rows=5): + Gloaming.createGame(self, reserves=4, rows=3) + + +# /*********************************************************************** +# // Toad +# ************************************************************************/ + +class Toad_TalonStack(DealRowTalonStack): + def canDealCards(self): + if not DealRowTalonStack.canDealCards(self): + return False + for r in self.game.s.reserves: + if r.cards: + return False + return True + def dealCards(self, sound=0): + self.dealRow(rows=self.game.s.reserves, sound=sound) + + +class Toad(Game): + #Hint_Class = Numerica_Hint + + def createGame(self, reserves=3, rows=5): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+11*l.XS, l.YM+6*l.YS + self.setSize(w, h) + + # create stacks + x, y = w-l.XS, h-l.YS + s.talon = Toad_TalonStack(x, y, self) + l.createText(s.talon, "n") + x, y = l.XM, l.YM + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i/2)) + x += l.XS + x, y = l.XM+3*l.XS/2, l.YM+l.YS + for i in range(5): + s.rows.append(Gloaming_RowStack(x, y, self, max_accept=UNLIMITED_ACCEPTS)) + x += l.XS + y = l.YM+l.YS/2 + for i in (3, 3, 3, 3, 1): + x = l.XM+8*l.XS + for j in range(i): + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + x += l.XS + y += l.YS + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + +# /*********************************************************************** +# // Shifting +# ************************************************************************/ + +class Shifting_RowStack(Numerica_RowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return False + if from_stack is self.game.s.waste: + return True + if not self.cards: + return cards[0].rank == KING + if (from_stack in self.game.s.rows and + self.cards[-1].rank-cards[0].rank == 1): + return True + return False + + +class Shifting(Numerica): + RowStack_Class = StackWrapper(Shifting_RowStack, max_accept=1) + + + +# register the game +registerGame(GameInfo(257, Numerica, "Numerica", + GI.GT_NUMERICA | GI.GT_CONTRIB, 1, 0, + altnames="Sir Tommy")) +registerGame(GameInfo(171, LadyBetty, "Lady Betty", + GI.GT_NUMERICA, 1, 0)) +registerGame(GameInfo(355, Frog, "Frog", + GI.GT_NUMERICA, 2, 0)) +registerGame(GameInfo(356, Fly, "Fly", + GI.GT_NUMERICA, 2, 0)) +registerGame(GameInfo(357, Gnat, "Gnat", + GI.GT_NUMERICA, 1, 0)) +registerGame(GameInfo(378, Gloaming, "Gloaming", + GI.GT_NUMERICA | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(379, Chamberlain, "Chamberlain", + GI.GT_NUMERICA | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(402, Toad, "Toad", + GI.GT_NUMERICA, 2, 0)) +registerGame(GameInfo(430, PussInTheCorner, "Puss in the Corner", + GI.GT_NUMERICA, 1, 0)) +registerGame(GameInfo(435, Shifting, "Shifting", + GI.GT_NUMERICA, 1, 0)) + diff --git a/pysollib/games/osmosis.py b/pysollib/games/osmosis.py new file mode 100644 index 00000000..75d74a98 --- /dev/null +++ b/pysollib/games/osmosis.py @@ -0,0 +1,302 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Osmosis +# ************************************************************************/ + +class Osmosis_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # search foundation with max number of cards + assert len(cards) == 1 + max_s, max_cards = None, -1 + for s in self.game.s.foundations: + if len(s.cards) > max_cards: + max_s, max_cards = s, len(s.cards) + # if we have less cards, then rank must match the card in this foundation + if len(self.cards) < max_cards: + if cards[0].rank != max_s.cards[len(self.cards)].rank: + return 0 + # + return 1 + + +class Osmosis(Game): + + # + # game layout + # + + def createGame(self, max_rounds=-1, num_deal=1): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = 3*l.XM+3*l.XS+(4+13)*l.XOFFSET, l.YM+4*l.YS + self.setSize(w, h) + + # create stacks + x, y, = l.XM, l.YM + for i in range(4): + stack = BasicRowStack(x, y, self, max_move=1, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.rows.append(stack) + y = y + l.YS + x, y, = 2*l.XM+l.XS+4*l.XOFFSET, l.YM + for i in range(4): + stack = Osmosis_Foundation(x, y, self, i, base_rank=ANY_RANK, max_move=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.foundations.append(stack) + y = y + l.YS + x, y, = self.width - l.XS, l.YM + l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds, num_deal=num_deal) + l.createText(s.talon, "sw") + y = y + l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "sw") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self, flip=0): + # deal first card to foundation + base_card = self.s.talon.getCard() + n = base_card.suit * self.gameinfo.decks + to_stack = self.s.foundations[n] + self.startDealSample() + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, to_stack) + # deal cards + for i in range(3): + self.s.talon.dealRow(flip=flip) + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Peek +# ************************************************************************/ + +class Peek(Osmosis): + def startGame(self): + Osmosis.startGame(self, flip=1) + +# /*********************************************************************** +# // Open Peek +# ************************************************************************/ + +class OpenPeek(Game): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = max(2*l.XM+2*l.XS+(5+13)*l.XOFFSET, l.XM + 8*l.XS), l.YM+8*l.YS + self.setSize(w, h) + + # create stacks + x, y, = l.XM, l.YM + for i in range(4): + stack = BasicRowStack(x, y, self, max_move=1, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.rows.append(stack) + y += l.YS + x, y, = 2*l.XM+l.XS+5*l.XOFFSET, l.YM + for i in range(4): + stack = Osmosis_Foundation(x, y, self, i, base_rank=ANY_RANK, max_move=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.foundations.append(stack) + y += l.YS + y = l.YM + 4*l.YS + for i in range(4): + x = l.XM + for j in range(8): + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + x += l.XS + y += l.YS + + x, y = w-l.XS, l.YM + s.talon = InitialDealTalonStack(x, y, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + + +# /*********************************************************************** +# // Genesis +# ************************************************************************/ + +class Genesis(Game): + + def createGame(self, rows=13, reserves=False): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+rows*l.XS, l.YM+2*l.YS+20*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y, = l.XM+(rows-4)*l.XS/2, l.YM + for i in range(4): + stack = Osmosis_Foundation(x, y, self, i, base_rank=ANY_RANK, max_move=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.foundations.append(stack) + x += l.XS + + x, y, = l.XM, h-2*l.YS-3*l.YOFFSET + for i in range(rows): + s.rows.append(BasicRowStack(x, y, self)) + x += l.XS + + x, y, = l.XM, h-l.YS-3*l.YOFFSET + for i in range(rows): + s.rows.append(BasicRowStack(x, y, self)) + x += l.XS + + if reserves: + s.reserves.append(ReserveStack(l.XM, l.YM, self)) + s.reserves.append(ReserveStack(w-l.XS, l.YM, self)) + + s.talon = InitialDealTalonStack(l.XM, l.YM, self) + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(rows=self.s.rows[13:], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:13]) + + +class GenesisPlus(Genesis): + def createGame(self): + Genesis.createGame(self, reserves=True) + + +# /*********************************************************************** +# // Bridesmaids +# ************************************************************************/ + +class Bridesmaids(Game): + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+3*l.XS+12*l.XOFFSET, l.YM+4*l.YS + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=UNLIMITED_REDEALS, + num_deal=3) + l.createText(s.talon, 'se') + y += l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'se') + + x, y = l.XM+2*l.XS, l.YM + for i in range(4): + stack = Osmosis_Foundation(x, y, self, suit=i, + base_rank=ANY_RANK, max_move=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.foundations.append(stack) + y = y + l.YS + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self, flip=0): + # deal first card to foundation + base_card = self.s.talon.getCard() + n = base_card.suit * self.gameinfo.decks + to_stack = self.s.foundations[n] + self.startDealSample() + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, to_stack) + self.s.talon.dealCards() # deal first card to WasteStack + + + + + +# register the game +registerGame(GameInfo(59, Osmosis, "Osmosis", + GI.GT_1DECK_TYPE, 1, -1, + altnames=("Treasure Trove",) )) +registerGame(GameInfo(60, Peek, "Peek", + GI.GT_1DECK_TYPE, 1, -1)) +registerGame(GameInfo(298, OpenPeek, "Open Peek", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(370, Genesis, "Genesis", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(371, GenesisPlus, "Genesis +", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(409, Bridesmaids, "Bridesmaids", + GI.GT_1DECK_TYPE, 1, -1)) + diff --git a/pysollib/games/parallels.py b/pysollib/games/parallels.py new file mode 100644 index 00000000..1c196788 --- /dev/null +++ b/pysollib/games/parallels.py @@ -0,0 +1,176 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + + +# /*********************************************************************** +# // Parallels +# ************************************************************************/ + +class Parallels_RowStack(BasicRowStack): + def basicIsBlocked(self): + index = self.index + rows = self.game.s.rows + if index < 10: + return False + if not rows[index-10].cards: + return False + if index >= 60: # last row + return False + if not rows[index+10].cards: + return False + return True + + +class Parallels_TalonStack(DealRowTalonStack): + def dealCards(self, sound=0): + return self.dealRow(sound=sound) + + def dealRow(self, rows=None, flip=1, reverse=0, frames=-1, sound=0): + if not rows is None: + return DealRowTalonStack.dealRowAvail(self, rows=rows, flip=flip, + reverse=reverse, frames=frames, sound=sound) + rows = self.game.s.rows + for r in rows[:10]: + if not r.cards: + return self._fillRow(frames=frames, sound=sound) + column_ncards = [] + for i in range(10): + column = [r for r in rows[i::10] if r.cards] + column_ncards.append(len(column)) + max_col = max(column_ncards) + if max(column_ncards) != min(column_ncards): + return self._fillRow(frames=frames, sound=sound) + r = rows[max_col*10:max_col*10+10] + return DealRowTalonStack.dealRowAvail(self, rows=r, flip=flip, + reverse=reverse, frames=frames, sound=sound) + + def _fillRow(self, frames=-1, sound=0): + rows = self.game.s.rows + column_ncards = [] + for i in range(10): + column = [r for r in rows[i::10] if r.cards] + column_ncards.append(len(column)) + max_col = max(column_ncards) + n = 0 + rr = self.game.s.rows[:max_col*10] + while True: + filled = False + for i in range(10): + prev_s = None + for s in rr[i::10]: + if not self.cards: + filled = False + break + if s.cards: + if prev_s: + DealRowTalonStack.dealRow(self, rows=[prev_s], + frames=frames, sound=sound) + n += 1 + filled = True + break + prev_s = s + if not filled: + break + while True: + filled = False + for i in range(10): + for s in rr[i::10]: + if not self.cards: + filled = False + break + if not s.cards: + DealRowTalonStack.dealRow(self, rows=[s], + frames=frames, sound=sound) + n += 1 + filled = True + break + if not filled: + break + + return n + + +class Parallels(Game): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + # set window + self.setSize(l.XM+12*l.XS, l.YM+7*l.YS) + # create stacks + s.talon = Parallels_TalonStack(l.XM, l.YM, self) + l.createText(s.talon, 'ss') + n = 0 + y = l.YM + for i in range(7): + x = l.XM+l.XS + for j in range(10): + stack = Parallels_RowStack(x, y, self, max_accept=0) + stack.index = n + s.rows.append(stack) + n += 1 + x += l.XS + y += l.YS + x, y = l.XM, l.YM+l.YS+l.YS/2 + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + y += l.YS + x, y = l.XM+11*l.XS, l.YM+l.YS+l.YS/2 + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=KING, dir=-1)) + y += l.YS + + # define stack-groups + l.defaultStackGroups() + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, KING) and c.deck == 0, + (c.rank, c.suit))) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:10]) + + +# register the game +registerGame(GameInfo(428, Parallels, "Parallels", + GI.GT_2DECK_TYPE, 2, 0)) + + + + + diff --git a/pysollib/games/pasdedeux.py b/pysollib/games/pasdedeux.py new file mode 100644 index 00000000..38bab75c --- /dev/null +++ b/pysollib/games/pasdedeux.py @@ -0,0 +1,230 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PasDeDeux_Hint(AbstractHint): + # FIXME: this is very simple + + def getDistance(self, stack, card): + d = 0 + if card.rank != stack.id % 13: + d = d + 1 + if card.suit != stack.id / 13: + d = d + 1 + return d + + def computeHints(self): + # find the single stack that can currently move a card + rows = [] + for r in self.game.s.rows: + if r.canMoveCards(r.cards): + rows.append(r) + break + # for each stack + for r in rows: + r1_d = self.getDistance(r, r.cards[-1]) + column, row = r.id % 13, r.id / 13 + stack_ids = range(column, 52, 13) + range(13*row, 13*row+13) + for i in stack_ids: + t = self.game.s.rows[i] + if t is r: + continue + assert t.acceptsCards(r, r.cards) + t1_d = self.getDistance(t, t.cards[-1]) + # compute distances after swap + r2_d = self.getDistance(t, r.cards[-1]) + t2_d = self.getDistance(r, t.cards[-1]) + # + rw, tw = 3, 2 + if self.game.s.talon.round >= 2: + rw, tw = 4, 2 + c = self.game.cards[t.cards[-1].id - 52] + if 1 and c in self.game.s.waste.cards: + rw = rw - 1 + # + score = int(((rw*r1_d + tw*t1_d) - (rw*r2_d + tw*t2_d)) * 1000) + if score > 0: + self.addHint(score, 1, r, t) + + +# /*********************************************************************** +# // Pas de Deux +# ************************************************************************/ + +class PasDeDeux_Waste(WasteStack): + def canFlipCard(self): + return 0 + + +class PasDeDeux_RowStack(ReserveStack): + def canMoveCards(self, cards): + if not ReserveStack.canMoveCards(self, cards): + return 0 + if not self.game.s.waste.cards: + return 0 + c = self.game.s.waste.cards[-1] + return c.face_up and cards[0].suit == c.suit and cards[0].rank == c.rank + + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return 0 + # must be neighbours + return self.game.isNeighbour(from_stack, self) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + assert ncards == 1 and to_stack in self.game.s.rows + assert len(to_stack.cards) == 1 + self._swapPairMove(ncards, to_stack, frames=-1, shadow=0) + if self.game.s.talon.canDealCards(): + self.game.s.talon.dealCards() + else: + # mark game as finished by turning the Waste face down + assert self.game.s.waste.cards[-1].face_up + self.game.flipMove(self.game.s.waste) + + def _swapPairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + old_state = game.enterState(game.S_FILL) + swap = game.s.internals[0] + game.moveMove(n, self, swap, frames=0) + game.moveMove(n, other_stack, self, frames=frames, shadow=shadow) + game.moveMove(n, swap, other_stack, frames=0) + game.leaveState(old_state) + + def getBottomImage(self): + suit = self.id / 13 + return self.game.app.images.getSuitBottom(suit) + + def quickPlayHandler(self, event, from_stacks=None, to_stacks=None): + # find the single stack that can currently move a card + for r in self.game.s.rows: + if r.canMoveCards(r.cards): + if self.acceptsCards(r, r.cards): + r.playMoveMove(len(r.cards), self) + return 1 + break + return 0 + + +class PasDeDeux(Game): + Hint_Class = PasDeDeux_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self, XM=4), self.s + + # set window + self.setSize(l.XM + 13*l.XS, l.YM + 5*l.YS) + + # create stacks + for i in range(4): + for j in range(13): + x, y, = l.XM + j*l.XS, l.YM + i*l.YS + s.rows.append(PasDeDeux_RowStack(x, y, self, max_accept=1, max_cards=2)) + x, y = self.width - 2*l.XS, self.height - l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=2) + l.createText(s.talon, "se") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + x + l.XS, y, + anchor="nw", + font=self.app.getFont("canvas_default")) + x = x - l.XS + s.waste = PasDeDeux_Waste(x, y, self, max_move=0) + l.createText(s.waste, "sw") + s.internals.append(InvisibleStack(self)) # for _swapPairMove() + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def shuffle(self): + self.shuffleSeparateDecks() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(frames=4) + self.s.talon.dealCards() # deal first card to WasteStack + + def getAutoStacks(self, event=None): + return ((), (), (self.sg.dropstacks)) + + def isGameWon(self): + for r in self.s.rows: + if len(r.cards) != 1: + return 0 + c = r.cards[-1] + if c.suit != r.id / 13 or c.rank != r.id % 13: + return 0 + return 1 + + # + # game extras + # + + def isNeighbour(self, stack1, stack2): + column1, row1 = stack1.id % 13, stack1.id / 13 + column2, row2 = stack2.id % 13, stack2.id / 13 + return column1 == column2 or row1 == row2 + + def getHighlightPilesStacks(self): + # Pas de Deux special: highlight all moveable cards + return ((self.s.rows, 1),) + + +# register the game +registerGame(GameInfo(153, PasDeDeux, "Pas de Deux", + GI.GT_MONTANA | GI.GT_SEPARATE_DECKS, 2, 1)) + diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py new file mode 100644 index 00000000..f120b5eb --- /dev/null +++ b/pysollib/games/picturegallery.py @@ -0,0 +1,436 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PictureGallery_Hint(AbstractHint): + def computeHints(self): + game = self.game + + # 1) try if we can drop a card (i.e. an Ace) + for r in game.sg.dropstacks: + t, n = r.canDropCards(game.s.foundations) + if t and n == 1: + c = r.getCard() + assert t is not r and c + assert c.rank == ACE + if r in game.s.tableaux: + base_score = 90000 + (4 - r.cap.base_rank) + else: + base_score = 90000 + score = base_score + 100 * (self.K - c.rank) + self.addHint(score, 1, r, t) + + # 2) try if we can move a card to the tableaux + if not self.hints: + for r in game.sg.dropstacks: + pile = r.getPile() + if not pile or len(pile) != 1: + continue + if r in game.s.tableaux: + rr = self.ClonedStack(r, stackcards=r.cards[:-1]) + if rr.acceptsCards(None, pile): + # do not move a card that is already in correct place + continue + base_score = 80000 + (4 - r.cap.base_rank) + else: + base_score = 80000 + # find a stack that would accept this card + for t in game.s.tableaux: + if t is not r and t.acceptsCards(r, pile): + score = base_score + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 3) Try if we can move a card from the tableaux + # to a row stack. This can only happen if there are + # no more cards to deal. + if not self.hints: + for r in game.s.tableaux: + pile = r.getPile() + if not pile or len(pile) != 1: + continue + rr = self.ClonedStack(r, stackcards=r.cards[:-1]) + if rr.acceptsCards(None, pile): + # do not move a card that is already in correct place + continue + # find a stack that would accept this card + for t in game.s.rows: + if t is not r and t.acceptsCards(r, pile): + score = 70000 + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 4) try if we can move a card within the row stacks + if not self.hints: + for r in game.s.rows: + pile = r.getPile() + if not pile or len(pile) != 1 or len(pile) == len(r.cards): + continue + base_score = 60000 + # find a stack that would accept this card + for t in game.s.rows: + if t is not r and t.acceptsCards(r, pile): + score = base_score + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 5) try if we can deal cards + if self.level >= 2: + if game.canDealCards(): + self.addHint(self.SCORE_DEAL, 0, game.s.talon, None) + + +# /*********************************************************************** +# // Picture Gallery +# ************************************************************************/ + +# this Foundation only accepts Aces +class PictureGallery_Foundation(RK_FoundationStack): + def __init__(self, x, y, game): + RK_FoundationStack.__init__(self, x, y, game, base_rank=ACE, dir=0, max_move=0, max_cards=8) + self.CARD_YOFFSET = min(30, self.game.app.images.CARD_YOFFSET + 10) + + def getBottomImage(self): + return self.game.app.images.getLetter(ACE) + + +class PictureGallery_TableauStack(SS_RowStack): + def __init__(self, x, y, game, base_rank, yoffset, dir=3): + SS_RowStack.__init__(self, x, y, game, base_rank=base_rank, dir=dir, max_accept=1) + self.CARD_YOFFSET = yoffset + + def acceptsCards(self, from_stack, cards): + if not SS_RowStack.acceptsCards(self, from_stack, cards): + return 0 + # check that the base card is correct + if self.cards and self.cards[0].rank != self.cap.base_rank: + return 0 + return 1 + + def getBottomImage(self): + return self.game.app.images.getLetter(self.cap.base_rank) + + +class PictureGallery_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + # check + if self.cards or self.game.s.talon.cards: + return 0 + return 1 + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PictureGallery(Game): + Hint_Class = PictureGallery_Hint + + Foundation_Class = PictureGallery_Foundation + TableauStack_Class = PictureGallery_TableauStack + RowStack_Class = StackWrapper(PictureGallery_RowStack, max_accept=1) + Talon_Class = DealRowTalonStack + + # + # game layout + # + + def createGame(self, rows=3, waste=False, dir=3): + # create layout + l, s = Layout(self), self.s + TABLEAU_YOFFSET = min(9, max(3, l.YOFFSET / 3)) + + # set window + th = l.YS + (12/rows-1) * TABLEAU_YOFFSET + # (set piles so that at least 2/3 of a card is visible with 10 cards) + h = (10-1)*l.YOFFSET + l.CH*2/3 + self.setSize(10*l.XS+l.XM, l.YM + 3*th + l.YM + h) + + # create stacks + s.addattr(tableaux=[]) # register extra stack variable + x = l.XM + 8 * l.XS + l.XS / 2 + y = l.YM + l.CH / 2 + s.foundations.append(self.Foundation_Class(x, y, self)) + y = l.YM + for i in range(rows,0,-1): #(3, 2, 1): + x = l.XM + for j in range(8): + s.tableaux.append(self.TableauStack_Class(x, y, self, i, yoffset=TABLEAU_YOFFSET, dir=dir)) + x = x + l.XS + y = y + th + x, y = l.XM, y + l.YM + for i in range(8): + s.rows.append(self.RowStack_Class(x, y, self)) + x = x + l.XS + ##self.setRegion(s.rows, (-999, -999, x - l.CW / 2, 999999)) + x = l.XM + 8 * l.XS + l.XS / 2 + y = self.height - l.YS + s.talon = self.Talon_Class(x, y, self) + l.createText(s.talon, "se") + if waste: + y -= l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "se") + self.setRegion(s.foundations, (x - l.CW / 2, -999, 999999, y - l.CH)) + + # define stack-groups + if waste: + ws = [s.waste] + else: + ws = [] + self.sg.openstacks = s.foundations + s.tableaux + s.rows + ws + self.sg.talonstacks = [s.talon] + ws + self.sg.dropstacks = s.tableaux + s.rows + ws + + + # + # game overrides + # + + def startGame(self): + self.s.talon.dealRow(rows=self.s.tableaux, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def isGameWon(self): + if len(self.s.foundations[0].cards) != 8: + return 0 + for stack in self.s.tableaux: + if len(stack.cards) != 4: + return 0 + return 1 + + def fillStack(self, stack): + if self.s.talon.cards: + if stack in self.s.rows and len(stack.cards) == 0: + self.s.talon.dealRow(rows=[stack]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + if card1.rank == ACE or card2.rank == ACE: + return 0 + return (card1.suit == card2.suit and + (card1.rank + 3 == card2.rank or card2.rank + 3 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + + +# /*********************************************************************** +# // Great Wheel +# ************************************************************************/ + +class GreatWheel_Foundation(PictureGallery_Foundation): + def acceptsCards(self, from_stack, cards): + if not PictureGallery_Foundation.acceptsCards(self, from_stack, cards): + return False + if self.cards and self.cards[-1].color == cards[0].color: + return False + return True + + +class GreatWheel_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return False + if self.game.s.talon.cards: + return False + if not self.cards: + return True + c1, c2 = self.cards[-1], cards[0] + return c1.suit == c2.suit and c1.rank == c2.rank+1 + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + + +class GreatWheel(PictureGallery): + + Foundation_Class = GreatWheel_Foundation + TableauStack_Class = PictureGallery_TableauStack + RowStack_Class = StackWrapper(GreatWheel_RowStack, max_accept=1) + Talon_Class = StackWrapper(WasteTalonStack, max_rounds=1) + + def createGame(self): + PictureGallery.createGame(self, rows=2, waste=True, dir=2) + + def fillStack(self, stack): + if stack is self.s.waste and not stack.cards : + self.s.talon.dealCards() + if self.s.talon.cards or self.s.waste.cards: + if stack in self.s.rows and len(stack.cards) == 0: + old_state = self.enterState(self.S_FILL) + for i in range(4): + if not self.s.waste.cards: + self.s.talon.dealCards() + if self.s.waste.cards: + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + def startGame(self): + self.startDealSample() + for i in range(4): + self.s.talon.dealRow() + self.s.talon.dealCards() + + + def isGameWon(self): + if len(self.s.foundations[0].cards) != 8: + return False + if self.s.talon.cards or self.s.waste.cards: + return False + for stack in self.s.rows: + if stack.cards: + return False + return True + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + if card1.rank == ACE or card2.rank == ACE: + return 0 + return (card1.suit == card2.suit and + (card1.rank + 2 == card2.rank or card2.rank + 2 == card1.rank)) + +# /*********************************************************************** +# // Mount Olympus +# // Zeus +# ************************************************************************/ + +class MountOlympus_Foundation(SS_FoundationStack): + + #def getBottomImage(self): + # return self.game.app.images.getLetter(self.cap.base_rank) + + def getHelp(self): + return 'Build up in suit by twos.' + + +class MountOlympus_RowStack(SS_RowStack): + def getHelp(self): + return 'Build down in suit by twos.' + + +class MountOlympus(Game): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+9*l.XS, l.YM+3*l.YS+12*l.YOFFSET) + + # create stacks + x, y = l.XM+l.XS, l.YM + for i in range(8): + s.foundations.append(MountOlympus_Foundation(x, y, self, + suit=i/2, base_rank=ACE, dir=2, max_move=0)) + x += l.XS + x, y = l.XM+l.XS, l.YM+l.YS + for i in range(8): + s.foundations.append(MountOlympus_Foundation(x, y, self, + suit=i/2, base_rank=1, dir=2, max_move=0)) + x += l.XS + x, y = l.XM, l.YM+2*l.YS + for i in range(9): + s.rows.append(MountOlympus_RowStack(x, y, self, dir=-2)) + x += l.XS + s.talon=DealRowTalonStack(l.XM, l.YM, self) + l.createText(s.talon, 's') + + # define stack-groups + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, 1), (c.rank, c.suit))) + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealRow() + + + def fillStack(self, stack): + if self.s.talon.cards: + if stack in self.s.rows and len(stack.cards) == 0: + self.s.talon.dealRow(rows=[stack]) + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 2 == card2.rank or card2.rank + 2 == card1.rank)) + + +class Zeus(MountOlympus): + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + for i in range(4): + self.s.talon.dealRow() + + +# register the game +registerGame(GameInfo(7, PictureGallery, "Picture Gallery", + GI.GT_2DECK_TYPE, 2, 0, + altnames=("Die Bildgallerie", "Mod-3") )) +registerGame(GameInfo(397, GreatWheel, "Great Wheel", + GI.GT_2DECK_TYPE, 2, 0, + ranks=range(12) # without Kings + )) +registerGame(GameInfo(398, MountOlympus, "Mount Olympus", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(399, Zeus, "Zeus", + GI.GT_2DECK_TYPE, 2, 0)) + diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py new file mode 100644 index 00000000..789d6ec6 --- /dev/null +++ b/pysollib/games/pileon.py @@ -0,0 +1,140 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PileOn_RowStack(RK_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class PileOn(Game): + Hint_Class = DefaultHint + ##Hint_Class = CautiousDefaultHint + TWIDTH = 4 + NSTACKS = 15 + PLAYCARDS = 4 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (set size so that at least 4 cards are fully playable) + #w = max(2*l.XS, l.XS+(self.PLAYCARDS-1)*l.XOFFSET+2*l.XM) + w = l.XS+(self.PLAYCARDS-1)*l.XOFFSET+3*l.XM + twidth, theight = self.TWIDTH, int((self.NSTACKS-1)/self.TWIDTH+1) + self.setSize(l.XM+twidth*w, l.YM+theight*l.YS) + + # create stacks + y = l.YM + for i in range(theight): + x = l.XM + for j in range(twidth): + if i*twidth+j >= self.NSTACKS: + break + stack = PileOn_RowStack(x, y, self, dir=0, max_cards=self.PLAYCARDS) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + s.rows.append(stack) + x = x + w + y = y + l.YS + x, y = self.width - l.XS, self.height - l.YS + s.talon = InitialDealTalonStack(x, y, self) + + # define stack-groups + self.sg.openstacks = s.rows + self.sg.talonstacks = [s.talon] + self.sg.dropstacks = s.rows + + # + # game overrides + # + + def startGame(self): + r = self.s.rows[:-2] + for i in range(self.PLAYCARDS-1): + self.s.talon.dealRow(rows=r, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=r) + assert len(self.s.talon.cards) == 0 + + def isGameWon(self): + for r in self.s.rows: + if r.cards: + if len(r.cards) != 4 or not r._isSequence(r.cards): + return 0 + return 1 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank == card2.rank + +class SmallPileOn(PileOn): + TWIDTH = 3 + NSTACKS = 11 + PLAYCARDS = 4 + +class PileOn2Decks(PileOn): + TWIDTH = 4 + NSTACKS = 15 + PLAYCARDS = 8 + + +# register the game +registerGame(GameInfo(41, PileOn, "PileOn", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, + altnames=("Fifteen Puzzle",) )) +registerGame(GameInfo(289, SmallPileOn, "Small PileOn", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, + ranks=(0, 5, 6, 7, 8, 9, 10, 11, 12), + rules_filename = "pileon.html")) +## registerGame(GameInfo(341, PileOn2Decks, "PileOn (2 decks)", +## GI.GT_2DECK_TYPE | GI.GT_OPEN,, 2, 0)) + + diff --git a/pysollib/games/poker.py b/pysollib/games/poker.py new file mode 100644 index 00000000..daea0437 --- /dev/null +++ b/pysollib/games/poker.py @@ -0,0 +1,294 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // Poker Square +# ************************************************************************/ + +class PokerSquare_RowStack(ReserveStack): + def clickHandler(self, event): + if not self.cards: + self.game.s.talon.playMoveMove(1, self) + return 1 + return ReserveStack.clickHandler(self, event) + + rightclickHandler = clickHandler + + +class PokerSquare(Game): + Talon_Class = OpenTalonStack + RowStack_Class = StackWrapper(PokerSquare_RowStack, max_move=0) + Hint_Class = None + + WIN_SCORE = 100 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # create texts 1) + ta = "ss" + x, y = l.XM, l.YM + 2*l.YS + if self.preview <= 1: + t = MfxCanvasText(self.canvas, x, y, anchor="nw", + font=self.app.getFont("canvas_default"), + text=_('''\ +Royal Flush +Straight Flush +Four of a Kind +Full House +Flush +Straight +Three of a Kind +Two Pair +One Pair''')) + bb = t.bbox() + x = bb[1][0] + 16 + h = bb[1][1] - bb[0][1] + if h >= 2*l.YS: + ta = "e" + t.move(0, -l.YS) + y = y - l.YS + t = MfxCanvasText(self.canvas, x, y, anchor="nw", + font=self.app.getFont("canvas_default"), + text="100\n75\n50\n25\n20\n15\n10\n5\n2") + x = t.bbox()[1][0] + 16 + self.texts.misc = MfxCanvasText(self.canvas, x, y, anchor="nw", + font=self.app.getFont("canvas_default"), + text="0\n"*8+"0") + x = self.texts.misc.bbox()[1][0] + 32 + + # set window + w = max(2*l.XS, x) + self.setSize(l.XM + w + 5*l.XS + 50, l.YM + 5*l.YS + 30) + + # create stacks + for i in range(5): + for j in range(5): + x, y = l.XM + w + j*l.XS, l.YM + i*l.YS + s.rows.append(self.RowStack_Class(x, y, self)) + x, y = l.XM, l.YM + s.talon = self.Talon_Class(x, y, self) + l.createText(s.talon, anchor=ta) + s.internals.append(InvisibleStack(self)) # for _swapPairMove() + + # create texts 2) + if self.preview <= 1: + self.texts.addattr(hands=[]) + for i in (4, 9, 14, 19, 24): + tx, ty, ta, tf = l.getTextAttr(s.rows[i], anchor="e") + t = MfxCanvasText(self.canvas, tx+8, ty, + anchor=ta, + font=self.app.getFont("canvas_default")) + self.texts.hands.append(t) + for i in range(20, 25): + tx, ty, ta, tf = l.getTextAttr(s.rows[i], anchor="ss") + t = MfxCanvasText(self.canvas, tx, ty, anchor=ta, + font=self.app.getFont("canvas_default")) + self.texts.hands.append(t) + self.texts.score = MfxCanvasText(self.canvas, l.XM, 5*l.YS, anchor="sw", + font=self.app.getFont("canvas_large")) + + # define hands for scoring + r = s.rows + self.poker_hands = [ + r[0:5], r[5:10], r[10:15], r[15:20], r[20:25], + (r[0], r[0+5], r[0+10], r[0+15], r[0+20]), + (r[1], r[1+5], r[1+10], r[1+15], r[1+20]), + (r[2], r[2+5], r[2+10], r[2+15], r[2+20]), + (r[3], r[3+5], r[3+10], r[3+15], r[3+20]), + (r[4], r[4+5], r[4+10], r[4+15], r[4+20]), + ] + self.poker_hands = map(tuple, self.poker_hands) + + # define stack-groups + l.defaultStackGroups() + return l + + # + # game overrides + # + + def startGame(self): + self.moveMove(27, self.s.talon, self.s.internals[0], frames=0) + self.s.talon.fillStack() + + def isGameWon(self): + return len(self.s.talon.cards) == 0 and self.getGameScore() >= self.WIN_SCORE + + def getAutoStacks(self, event=None): + return ((), (), ()) + + # + # scoring + # + + def updateText(self): + if self.preview > 1: + return + score = 0 + count = [0] * 9 + for i in range(10): + type, value = self.getHandScore(self.poker_hands[i]) + if 0 <= type <= 8: + count[type] = count[type] + 1 + self.texts.hands[i].config(text=str(value)) + score = score + value + t = '\n'.join(map(str, count)) + self.texts.misc.config(text=t) + # + t = "" + if score >= self.WIN_SCORE: + t = _("WON\n\n") + if self.s.talon.cards: + t = t + _("Points: %d") % score + else: + t = t + _("Total: %d") % score + self.texts.score.config(text=t) + + def getGameScore(self): + score = 0 + for hand in self.poker_hands: + type, value = self.getHandScore(hand) + score = score + value + return score + + def getHandScore(self, hand): + same_rank = [0] * 13 + same_suit = [0] * 4 + ranks = [] + for s in hand: + if s.cards: + rank, suit = s.cards[0].rank, s.cards[0].suit + same_rank[rank] = same_rank[rank] + 1 + same_suit[suit] = same_suit[suit] + 1 + ranks.append(rank) + # + straight = 0 + if same_rank.count(1) == 5: + d = max(ranks) - min(ranks) + if d == 4: + straight = 1 # normal straight + elif d == 12 and same_rank[-4:].count(1) == 4: + straight = 2 # straight with Ace ranked high + # + if max(same_suit) == 5: + if straight: + if straight == 2: + return 0, 100 # Royal Flush + return 1, 75 # Straight Flush + return 4, 20 # Flush + # + if straight: + return 5, 15 # Straight + # + if max(same_rank) >= 2: + same_rank.sort() + if same_rank[-1] == 4: + return 2, 50 # Four of a Kind + if same_rank[-1] == 3: + if same_rank[-2] == 2: + return 3, 25 # Full House + return 6, 10 # Three of a Kind + if same_rank[-2] == 2: + return 7, 5 # Two Pairs + return 8, 2 # Pair + # + return -1, 0 + + +# /*********************************************************************** +# // Poker Shuffle +# ************************************************************************/ + +class PokerShuffle_RowStack(ReserveStack): + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + assert ncards == 1 and to_stack in self.game.s.rows + assert len(to_stack.cards) == 1 + self._swapPairMove(ncards, to_stack, frames=-1, shadow=0) + + def _swapPairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + old_state = game.enterState(game.S_FILL) + swap = game.s.internals[0] + game.moveMove(n, self, swap, frames=0) + game.moveMove(n, other_stack, self, frames=frames, shadow=shadow) + game.moveMove(n, swap, other_stack, frames=0) + game.leaveState(old_state) + + +class PokerShuffle(PokerSquare): + Talon_Class = InitialDealTalonStack + RowStack_Class = StackWrapper(PokerShuffle_RowStack, max_accept=1, max_cards=2) + + WIN_SCORE = 200 + + def createGame(self): + l = PokerSquare.createGame(self) + if self.s.talon.texts.ncards: + self.s.talon.texts.ncards.text_format="%D" + + def startGame(self): + self.moveMove(27, self.s.talon, self.s.internals[0], frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def checkForWin(self): + return 0 + + +# register the game +registerGame(GameInfo(139, PokerSquare, "Poker Square", + GI.GT_POKER_TYPE | GI.GT_SCORE, 1, 0, + si={"ncards": 25})) +registerGame(GameInfo(140, PokerShuffle, "Poker Shuffle", + GI.GT_POKER_TYPE | GI.GT_SCORE | GI.GT_OPEN, 1, 0, + si={"ncards": 25})) + diff --git a/pysollib/games/pushpin.py b/pysollib/games/pushpin.py new file mode 100644 index 00000000..4ce6f23a --- /dev/null +++ b/pysollib/games/pushpin.py @@ -0,0 +1,231 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys, types + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PushPin_Hint(AbstractHint): + + def computeHints(self): + game = self.game + rows = game.s.rows + for i in range(len(rows)-3): + r = rows[i+1] + if not rows[i+2].cards: + break + if r._checkPair(i, i+2): + self.addHint(5000, 1, r, game.s.foundations[0]) + if not rows[i+3].cards: + break + if r._checkPair(i, i+3): + self.addHint(5000, 1, r, rows[i+2]) + + +class PushPin_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + return True + +class PushPin_Talon(DealRowTalonStack): + def dealCards(self, sound=0): + for r in self.game.s.rows: + if not r.cards: + return self.dealRowAvail(rows=[r], sound=sound) + return self.dealRowAvail(rows=[self.game.s.rows[0]], sound=sound) + def getBottomImage(self): + return None + +class PushPin_RowStack(ReserveStack): + + def _checkPair(self, ps, ns): + if ps < 0 or ns > 51: + return False + rows = self.game.allstacks + pc, nc = rows[ps].cards, rows[ns].cards + if pc and nc: + if pc[0].suit == nc[0].suit or pc[0].rank == nc[0].rank: + return True + return False + + def clickHandler(self, event): + ps, ns = self.id - 1, self.id + 1 + if self._checkPair(ps, ns): + if not self.game.demo: + self.game.playSample("autodrop", priority=20) + self.playMoveMove(1, self.game.s.foundations[0], sound=0) + return True + return False + + def acceptsCards(self, from_stack, cards): + if not self.cards: + return from_stack.id > self.id + return True + if abs(self.id - from_stack.id) != 1: + return False + ps = min(self.id, from_stack.id)-1 + ns = ps + 3 + return self._checkPair(ps, ns) + + def fillStack(self): + self.game.fillEmptyStacks() + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + if not to_stack is self.game.s.foundations[0]: + self._dropPairMove(ncards, to_stack, frames=-1, shadow=shadow) + else: + ReserveStack.moveMove(self, ncards, to_stack, frames=frames, shadow=shadow) + + def _dropPairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + old_state = game.enterState(game.S_FILL) + f = game.s.foundations[0] + game.updateStackMove(game.s.talon, 2|16) # for undo + if not game.demo: + game.playSample("droppair", priority=200) + game.moveMove(n, self, f, frames=frames, shadow=shadow) + game.moveMove(n, other_stack, f, frames=frames, shadow=shadow) + self.fillStack() + game.updateStackMove(game.s.talon, 1|16) # for redo + game.leaveState(old_state) + + def getBottomImage(self): + return None + + +class PushPin(Game): + + Hint_Class = PushPin_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + xx, yy = 9, 6 + w, h = l.XM+xx*l.XS, l.YM+yy*l.YS + self.setSize(w, h) + + # create stacks + for i in range(yy): + for j in range(xx): + n = j+xx*i + if n < 1: + continue + if n > 52: + break + k = j + if i%2: + k = xx-j-1 + x, y = l.XM + k*l.XS, l.YM + i*l.YS + s.rows.append(PushPin_RowStack(x, y, self)) + s.talon = PushPin_Talon(l.XM, l.YM, self) + s.foundations.append(PushPin_Foundation(l.XM, h-l.YS, self, + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_accept=0, max_move=0, max_cards=52)) + + # define stack-groups + l.defaultStackGroups() + return l + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:3]) + + def isGameWon(self): + return len(self.s.foundations[0].cards) == 50 + + def fillEmptyStacks(self): + if not self.demo: + self.startDealSample() + rows = self.s.rows + i = 0 + for r in rows: + if not r.cards: + break + i += 1 + j = i + for r in rows[i:]: + if r.cards: + break + j += 1 + for r in rows[j:]: + if not r.cards: + break + self.moveMove(1, r, rows[i], frames=2, shadow=0) + i += 1 + if not self.demo: + self.stopSamples() + return 0 + + def getAutoStacks(self, event=None): + return ((), (), ()) + + +class RoyalMarriage(PushPin): + def _shuffleHook(self, cards): + qi, ki = -1, -1 + for i in range(len(cards)): + c = cards[i] + if c.suit == 2 and c.rank == 11: + qi = i + if c.suit == 2 and c.rank == 12: + ki = i + if qi >= 0 and ki >= 0: + break + q, k = cards[qi], cards[ki] + del cards[max(qi, ki)] + del cards[min(qi, ki)] + cards.insert(0, k) + cards.append(q) + return cards + + +class Queens(PushPin): + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + +registerGame(GameInfo(287, PushPin, "Push Pin", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(288, RoyalMarriage, "Royal Marriage", + GI.GT_1DECK_TYPE, 1, 0)) +## registerGame(GameInfo(303, Queens, "Queens", +## GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py new file mode 100644 index 00000000..22972373 --- /dev/null +++ b/pysollib/games/pyramid.py @@ -0,0 +1,301 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Pyramid_Hint(DefaultHint): + # consider moving card to the Talon as well + def step010(self, dropstacks, rows): + rows = rows + (self.game.s.talon,) + return DefaultHint.step010(self, dropstacks, rows) + + +# /*********************************************************************** +# // basic logic for Talon, Waste and Rows +# ************************************************************************/ + +class Pyramid_StackMethods: + def acceptsCards(self, from_stack, cards): + if self.basicIsBlocked(): + return 0 + if from_stack is self or not self.cards or len(cards) != 1: + return 0 + c = self.cards[-1] + return c.face_up and cards[0].face_up and cards[0].rank + c.rank == 11 + + def _dropKingClickHandler(self, event): + if not self.cards: + return 0 + c = self.cards[-1] + if c.face_up and c.rank == KING and not self.basicIsBlocked(): + self.game.playSample("autodrop", priority=20) + self.playMoveMove(1, self.game.s.foundations[0], sound=0) + return 1 + return 0 + + def _dropPairMove(self, n, other_stack, frames=-1, shadow=-1): + if not self.game.demo: + self.game.playSample("droppair", priority=200) + assert n == 1 and self.acceptsCards(other_stack, [other_stack.cards[-1]]) + old_state = self.game.enterState(self.game.S_FILL) + f = self.game.s.foundations[0] + self.game.moveMove(n, self, f, frames=frames, shadow=shadow) + self.game.moveMove(n, other_stack, f, frames=frames, shadow=shadow) + self.game.leaveState(old_state) + self.fillStack() + other_stack.fillStack() + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + if to_stack in self.game.s.foundations: + self.game.moveMove(ncards, self, to_stack, frames=frames, shadow=shadow) + self.fillStack() + else: + self._dropPairMove(ncards, to_stack, frames=-1, shadow=shadow) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Pyramid_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # We accept any King. Pairs will get delivered by _dropPairMove. + return cards[0].rank == KING + + +# note that this Talon can accept and drop cards +class Pyramid_Talon(Pyramid_StackMethods, FaceUpWasteTalonStack): + def clickHandler(self, event): + if self._dropKingClickHandler(event): + return 1 + return FaceUpWasteTalonStack.clickHandler(self, event) + + def canDealCards(self): + if not FaceUpWasteTalonStack.canDealCards(self): + return 0 + return not self.game.isGameWon() + + def canDropCards(self, stacks): + if self.cards: + cards = self.cards[-1:] + for s in stacks: + if s is not self and s.acceptsCards(self, cards): + return (s, 1) + return (None, 0) + + +class Pyramid_Waste(Pyramid_StackMethods, WasteStack): + def clickHandler(self, event): + if self._dropKingClickHandler(event): + return 1 + return WasteStack.clickHandler(self, event) + + +class Pyramid_RowStack(Pyramid_StackMethods, OpenStack): + def __init__(self, x, y, game): + OpenStack.__init__(self, x, y, game, max_accept=1, max_cards=2) + self.CARD_YOFFSET = 1 + + STEP = (1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6) + + def basicIsBlocked(self): + r, step = self.game.s.rows, self.STEP + i, n = self.id, 1 + while i < 21: + i = i + step[i] + n = n + 1 + for j in range(i, i+n): + if r[j].cards: + return 1 + return 0 + + def clickHandler(self, event): + if self._dropKingClickHandler(event): + return 1 + return OpenStack.clickHandler(self, event) + + +# /*********************************************************************** +# // Pyramid +# ************************************************************************/ + +class Pyramid(Game): + Hint_Class = Pyramid_Hint + + # + # game layout + # + + def createGame(self, rows=4): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 9*l.XS, l.YM + 4*l.YS) + + # create stacks + for i in range(7): + x = l.XM + (8-i) * l.XS / 2 + y = l.YM + i * l.YS / 2 + for j in range(i+1): + s.rows.append(Pyramid_RowStack(x, y, self)) + x = x + l.XS + + x, y = l.XM, l.YM + s.talon = Pyramid_Talon(x, y, self, max_rounds=3, max_accept=1) + l.createText(s.talon, "se") + tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, + font=self.app.getFont("canvas_default")) + y = y + l.YS + s.waste = Pyramid_Waste(x, y, self, max_accept=1) + l.createText(s.waste, "se") + x, y = self.width - l.XS, l.YM + s.foundations.append(Pyramid_Foundation(x, y, self, + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_move=0, max_cards=52)) + + # define stack-groups + self.sg.talonstacks = [s.talon] + [s.waste] + self.sg.openstacks = s.rows + self.sg.talonstacks + self.sg.dropstacks = s.rows + self.sg.talonstacks + + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def getAutoStacks(self, event=None): + return (self.sg.dropstacks, self.sg.dropstacks, ()) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank + card2.rank == 11 + + +# /*********************************************************************** +# // Relaxed Pyramid +# ************************************************************************/ + +class RelaxedPyramid(Pyramid): + # the pyramid must be empty + def isGameWon(self): + return getNumberOfFreeStacks(self.s.rows) == len(self.s.rows) + + +# /*********************************************************************** +# // Thirteen +# // FIXME: UNFINISHED +# // (this doesn't work yet as 2 cards of the Waste should be playable) +# ************************************************************************/ +# Thirteen #89404422185320919548 + +class Thirteen(Pyramid): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(7*l.XS+l.XM, 5*l.YS+l.YM) + + # create stacks + for i in range(7): + x = l.XM + (6-i) * l.XS / 2 + y = l.YM + l.YS + i * l.YS / 2 + for j in range(i+1): + s.rows.append(Pyramid_RowStack(x, y, self)) + x = x + l.XS + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "s") + x = x + l.XS + s.waste = Pyramid_Waste(x, y, self) + l.createText(s.waste, "s") + s.waste.CARD_XOFFSET = 14 + x, y = self.width - l.XS, l.YM + s.foundations.append(Pyramid_Foundation(x, y, self, + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_move=0, max_cards=UNLIMITED_CARDS)) + + # define stack-groups + self.sg.talonstacks = [s.talon] + [s.waste] + self.sg.openstacks = s.rows + self.sg.talonstacks + self.sg.dropstacks = s.rows + self.sg.talonstacks + + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:21], flip=0) + self.s.talon.dealRow(rows=self.s.rows[21:]) + self.s.talon.dealCards() # deal first card to WasteStack + + +# register the game +registerGame(GameInfo(38, Pyramid, "Pyramid", + GI.GT_PAIRING_TYPE, 1, 2)) +registerGame(GameInfo(193, RelaxedPyramid, "Relaxed Pyramid", + GI.GT_PAIRING_TYPE | GI.GT_RELAXED, 1, 2)) +##registerGame(GameInfo(44, Thirteen, "Thirteen", +## GI.GT_PAIRING_TYPE, 1, 0)) + diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py new file mode 100644 index 00000000..a1ef2122 --- /dev/null +++ b/pysollib/games/royalcotillion.py @@ -0,0 +1,510 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Royal Cotillion +# ************************************************************************/ + +class RoyalCotillion_Foundation(SS_FoundationStack): + def getBottomImage(self): + if self.cap.base_rank == 1: + return self.game.app.images.getLetter(1) + return self.game.app.images.getSuitBottom(self.cap.base_suit) + + +class RoyalCotillion(Game): + Foundation_Class = RoyalCotillion_Foundation + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 10*l.XS, l.YM + 4*l.YS) + + # create stacks + for i in range(4): + x, y, = l.XM + i*l.XS, l.YM + s.rows.append(BasicRowStack(x, y, self, max_accept=0)) + for i in range(4): + x, y, = l.XM + 4*l.XS, l.YM + i*l.YS + s.foundations.append(self.Foundation_Class(x, y, self, i, dir=2, mod=13)) + x = x + l.XS + s.foundations.append(self.Foundation_Class(x, y, self, i, dir=2, mod=13, base_rank=1)) + for i in range(4): + for j in range(4): + x, y, = l.XM + (j+6)*l.XS, l.YM + i*l.YS + s.reserves.append(ReserveStack(x, y, self, max_accept=0)) + x, y = l.XM + l.XS, self.height - l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "sw") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "se") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + for i in range(3): + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def fillStack(self, stack): + if not stack.cards: + old_state = self.enterState(self.S_FILL) + if stack is self.s.waste and self.s.talon.cards: + self.s.talon.dealCards() + elif stack in self.s.reserves and self.s.waste.cards: + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + def getHighlightPilesStacks(self): + return () + + def getAutoStacks(self, event=None): + if event is None: + # disable auto drop - this would ruin the whole gameplay + return (self.sg.dropstacks, (), self.sg.dropstacks) + else: + # rightclickHandler + return (self.sg.dropstacks, self.sg.dropstacks, self.sg.dropstacks) + + +# /*********************************************************************** +# // Odd and Even +# ************************************************************************/ + +class OddAndEven(RoyalCotillion): + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 8*l.XS, l.YM + 4*l.YS) + + # create stacks + x, y, = l.XM, l.YM + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, i, dir=2, mod=13)) + x = x + l.XS + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, i, dir=2, mod=13, base_rank=1)) + x = x + l.XS + for i in range(2): + x, y, = l.XM + ((4,3)[i])*l.XS, l.YM + (i+1)*l.YS + for j in range((4,5)[i]): + s.reserves.append(ReserveStack(x, y, self, max_accept=0)) + x = x + l.XS + x, y = l.XM, self.height - l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=2) + l.createText(s.talon, "nn") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "nn") + + # define stack-groups + l.defaultStackGroups() + + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Kingdom +# ************************************************************************/ + +class Kingdom(RoyalCotillion): + Foundation_Class = RK_FoundationStack + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 8*l.XS, l.YM + 4*l.YS) + + # create stacks + x, y, = l.XM, l.YM + for i in range(8): + s.foundations.append(self.Foundation_Class(x, y, self, ANY_SUIT)) + x = x + l.XS + x, y, = l.XM, y + l.YS + for i in range(8): + s.reserves.append(ReserveStack(x, y, self, max_accept=0)) + x = x + l.XS + x, y = l.XM + 3*l.XS, y + 3*l.YS/2 + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "sw") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "se") + + # define stack-groups + l.defaultStackGroups() + + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move one Ace to top of the Talon (i.e. first card to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit), 1) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=(self.s.foundations[0],)) + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Alhambra +# ************************************************************************/ + +class Alhambra_Waste(WasteStack): + def acceptsCards(self, from_stack, cards): + if not WasteStack.acceptsCards(self, from_stack, cards): + return 0 + # check cards + if not self.cards: + return 0 + c1, c2 = self.cards[-1], cards[0] + return c1.suit == c2.suit and ((c1.rank + 1) % self.cap.mod == c2.rank or (c2.rank + 1) % self.cap.mod == c1.rank) + + +class Alhambra(Game): + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 8*l.XS, l.YM + 4*l.YS) + + # create stacks + x, y, = l.XM, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, max_move=0)) + x = x + l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, max_move=0, + base_rank=KING, dir=-1)) + x = x + l.XS + x, y, = l.XM, y + l.YS + for i in range(8): + s.reserves.append(BasicRowStack(x, y, self, max_accept=0)) + x = x + l.XS + x, y = l.XM + 3*l.XS, y + 2*l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, "sw") + x = x + l.XS + s.waste = Alhambra_Waste(x, y, self, mod=13, max_accept=1) + l.createText(s.waste, "se") + + # define stack-groups (non default) + s.rows.append(s.waste) + l.defaultStackGroups() + + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move one Aces and Kings of first deck to top of the Talon (i.e. first card to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.deck == 0 and c.rank in (0, 12), (c.rank, c.suit)), 8) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(3): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealCards() + + +# /*********************************************************************** +# // Carpet +# ************************************************************************/ + +class Carpet(Game): + Foundation_Class = SS_FoundationStack + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 9*l.XS, l.YM + 4*l.YS) + + # create stacks + for i in range(4): + for j in range(5): + x, y = l.XM + (j+3)*l.XS, l.YM + i*l.YS + s.rows.append(ReserveStack(x, y, self)) + for i in range(4): + dx, dy = ((2,1), (8,1), (2,2), (8,2))[i] + x, y = l.XM + dx*l.XS, l.YM + dy*l.YS + s.foundations.append(self.Foundation_Class(x, y, self, i)) + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "se") + y = y + l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "se") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // British Constitution +# ************************************************************************/ + +class BritishConstitution_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return False + if self in self.game.s.rows[:8] and from_stack in self.game.s.rows[8:16]: + return True + if self in self.game.s.rows[8:16] and from_stack in self.game.s.rows[16:24]: + return True + if self in self.game.s.rows[16:24] and from_stack in self.game.s.rows[24:]: + return True + if self in self.game.s.rows[24:] and from_stack is self.game.s.waste: + return True + return False + + +class BritishConstitution_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return False + if from_stack in self.game.s.rows[:8]: + return True + return False + + +class BritishConstitution(Game): + RowStack_Class = BritishConstitution_RowStack + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 9*l.XS, l.YM + 5*l.YS) + + # create stacks + x, y = l.XM+l.XS, l.YM + for i in range(8): + s.foundations.append(BritishConstitution_Foundation(x, y, self, suit=int(i/2))) + x += l.XS + + y = l.YM+l.YS + for i in range(4): + x = l.XM+l.XS + for j in range(8): + stack = self.RowStack_Class(x, y, self, max_move=1) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + s.rows.append(stack) + x += l.XS + y += l.YS + + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "s") + y += l.YS+2*l.YM + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "s") + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == ACE, c.suit)) + + def fillStack(self, stack): + if not stack.cards: + if stack in self.s.rows[:24]: + return + old_state = self.enterState(self.S_FILL) + if stack is self.s.waste and self.s.talon.cards: + self.s.talon.dealCards() + elif stack in self.s.rows[24:] and self.s.waste.cards: + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + +class NewBritishConstitution(BritishConstitution): + RowStack_Class = StackWrapper(BritishConstitution_RowStack, base_rank=JACK) + + + +# /*********************************************************************** +# // Twenty +# ************************************************************************/ + +class Twenty_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + #if not BasicRowStack.acceptsCards(self, from_stack, cards): + # return False + return len(self.cards) == 0 + +class Twenty(Game): + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+10*l.XS, l.YM+3*l.XS+10*l.YOFFSET) + + # create stacks + x, y = l.XM, l.YM + s.talon = DealRowTalonStack(x, y, self) + l.createText(s.talon, 'se') + x += 2*l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=KING, dir=-1)) + x += l.XS + + for y in (l.YM+l.YS, l.YM+2*l.XS+5*l.YOFFSET): + x = l.XM + for i in range(10): + s.rows.append(Twenty_RowStack(x, y, self)) + x += l.XS + + # define stack-groups + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, KING) and c.deck == 1, (c.rank, c.suit))) + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + + def fillStack(self, stack): + if not stack.cards and stack in self.s.rows and self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.flipMove(self.s.talon) + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) + + + +# register the game +registerGame(GameInfo(54, RoyalCotillion, "Royal Cotillion", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(55, OddAndEven, "Odd and Even", + GI.GT_2DECK_TYPE, 2, 1)) +registerGame(GameInfo(143, Kingdom, "Kingdom", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(234, Alhambra, "Alhambra", + GI.GT_2DECK_TYPE, 2, 2)) +registerGame(GameInfo(97, Carpet, "Carpet", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(391, BritishConstitution, "British Constitution", + GI.GT_2DECK_TYPE, 2, 0, + ranks=range(11) # without Queens and Kings + )) +registerGame(GameInfo(392, NewBritishConstitution, "New British Constitution", + GI.GT_2DECK_TYPE, 2, 0, + ranks=range(11) # without Queens and Kings + )) +registerGame(GameInfo(443, Twenty, "Twenty", + GI.GT_2DECK_TYPE, 2, 0)) + diff --git a/pysollib/games/royaleast.py b/pysollib/games/royaleast.py new file mode 100644 index 00000000..076350b9 --- /dev/null +++ b/pysollib/games/royaleast.py @@ -0,0 +1,123 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Royal East +# ************************************************************************/ + +class RoyalEast(Game): + Hint_Class = CautiousDefaultHint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 5.5*l.XS, l.YM + 4*l.YS) + + # extra settings + self.base_card = None + + # create stacks + for i in range(4): + dx, dy = ((0, 0), (2, 0), (0, 2), (2, 2))[i] + x, y = l.XM + (2*dx+5)*l.XS/2, l.YM + (2*dy+1)*l.YS/2 + stack = SS_FoundationStack(x, y, self, i, mod=13, max_move=0) + stack.CARD_YOFFSET = 0 + s.foundations.append(stack) + for i in range(5): + dx, dy = ((1, 0), (0, 1), (1, 1), (2, 1), (1, 2))[i] + x, y = l.XM + (2*dx+5)*l.XS/2, l.YM + (2*dy+1)*l.YS/2 + stack = RK_RowStack(x, y, self, mod=13, max_move=1) + stack.CARD_YOFFSET = 0 + s.rows.append(stack) + x, y = l.XM, l.YM + 3*l.YS/2 + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.base_card = self.s.talon.cards[-1] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + # deal base card to Foundations + c = self.s.talon.getCard() + to_stack = self.s.foundations[c.suit * self.gameinfo.decks] + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, to_stack, frames=0) + # deal rows + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + +# register the game +registerGame(GameInfo(93, RoyalEast, "Royal East", + GI.GT_1DECK_TYPE, 1, 0)) + diff --git a/pysollib/games/siebenbisas.py b/pysollib/games/siebenbisas.py new file mode 100644 index 00000000..a722b9cd --- /dev/null +++ b/pysollib/games/siebenbisas.py @@ -0,0 +1,268 @@ +#!/usr/bin/env python +# -*- mode: python; coding: iso8859-1; -*- +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class SiebenBisAs_Hint(CautiousDefaultHint): + def computeHints(self): + game = self.game + freerows = filter(lambda s: not s.cards, game.s.rows) + # for each stack + for r in game.sg.dropstacks: + if not r.cards: + continue + assert len(r.cards) == 1 and r.cards[-1].face_up + c, pile, rpile = r.cards[0], r.cards, [] + # try if we can drop the card + t, ncards = r.canDropCards(self.game.s.foundations) + if t: + score, color = 0, None + score, color = self._getDropCardScore(score, color, r, t, ncards) + self.addHint(score, ncards, r, t, color) + # try if we can move the card + for t in freerows: + if self.shallMovePile(r, t, pile, rpile): + # FIXME: this scoring + score = 50000 + self.addHint(score, 1, r, t) + + +# /*********************************************************************** +# // Sieben bis As (Seven to Ace) +# ************************************************************************/ + +class SiebenBisAs_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # this stack accepts only a card from a rowstack with an empty + # left neighbour + if not from_stack in self.game.s.rows: + return 0 + if from_stack.id % 10 == 0: + return 0 + return len(self.game.s.rows[from_stack.id - 1].cards) == 0 + + +class SiebenBisAs_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + if self.id % 10 != 0: + # left neighbour + s = self.game.s.rows[self.id - 1] + if s.cards and s.cards[-1].suit == cards[0].suit and (s.cards[-1].rank + 1) % 13 == cards[0].rank: + return 1 + if self.id % 10 != 10 - 1: + # right neighbour + s = self.game.s.rows[self.id + 1] + if s.cards and s.cards[-1].suit == cards[0].suit and (s.cards[-1].rank - 1) % 13 == cards[0].rank: + return 1 + return 0 + + # bottom to get events for an empty stack + ###prepareBottom = Stack.prepareInvisibleBottom + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class SiebenBisAs(Game): + Hint_Class = SiebenBisAs_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM + 10*l.XS, l.YM + 5*l.YS) + + # create stacks + for i in range(3): + for j in range(10): + x, y, = l.XM + j*l.XS, l.YM + (i+1)*l.YS + s.rows.append(SiebenBisAs_RowStack(x, y, self, max_accept=1, max_cards=1)) + for i in range(2): + x, y, = l.XM + (i+4)*l.XS, l.YM + s.reserves.append(ReserveStack(x, y, self, max_accept=0)) + for i in range(4): + x, y, = l.XM + (i+3)*l.XS, l.YM + 4*l.YS + s.foundations.append(SiebenBisAs_Foundation(x, y, self, i, base_rank=6, mod=13, max_move=0)) + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + stacks = filter(lambda r: r.cards[-1].rank == 6, self.s.rows) + for r in stacks: + self.moveMove(1, r, self.s.foundations[r.cards[-1].suit]) + + +# /*********************************************************************** +# // Maze +# ************************************************************************/ + +class Maze_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + # left neighbour + s = self.game.s.rows[(self.id - 1) % 54] + if s.cards: + if s.cards[-1].suit == cards[0].suit and s.cards[-1].rank + 1 == cards[0].rank: + return 1 + if s.cards[-1].rank == QUEEN and cards[0].rank == ACE: + return 1 + # right neighbour + s = self.game.s.rows[(self.id + 1) % 54] + if s.cards: + if s.cards[-1].suit == cards[0].suit and s.cards[-1].rank - 1 == cards[0].rank: + return 1 + return 0 + + # bottom to get events for an empty stack + prepareBottom = Stack.prepareInvisibleBottom + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class Maze(Game): + GAME_VERSION = 2 + + Hint_Class = SiebenBisAs_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self, XM=4, YM=4), self.s + + # set window + self.setSize(l.XM + 9*l.XS, l.YM + 6*l.YS) + + # create stacks + for i in range(6): + for j in range(9): + x, y, = l.XM + j*l.XS, l.YM + i*l.YS + s.rows.append(Maze_RowStack(x, y, self, max_accept=1, max_cards=1)) + ##s.talon = InitialDealTalonStack(-2*l.XS, l.YM+5*l.YS/2, self) + s.talon = InitialDealTalonStack(self.width-l.XS+1, self.height-l.YS, self) + # create an invisble stack to hold the four Kings + s.internals.append(InvisibleStack(self)) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + frames = 0 + for i in range(54): +## if i == 8 or i == 17: # these stay empty + if i >= 52: # these stay empty + continue + c = self.s.talon.cards[-1] + if c.rank == KING: + self.s.talon.dealRow(rows=self.s.internals, frames=0) + else: + if frames == 0 and i >= 36: + self.startDealSample() + frames = -1 + self.s.talon.dealRow(rows=(self.s.rows[i],), frames=frames) + assert len(self.s.talon.cards) == 0 + + def isGameWon(self): + rows = filter(lambda s: s.cards, self.s.rows) + if len(rows) != 48: + return 0 # no cards dealt yet + i = 0 + if 1: + # allow wrap around: search first Ace + while rows[i].cards[-1].rank != ACE: + i = i + 1 + rows = rows + rows + # now check for 4 sequences + for j in (i+0, i+12, i+24, i+36): + r1 = rows[j] + r2 = rows[j+11] + if (r2.id - r1.id) % 54 != 11: + # found a space within the sequence + return 0 + if r1.cards[-1].rank != ACE or r2.cards[-1].rank != QUEEN: + return 0 + pile = getPileFromStacks(rows[j:j+12]) + if not pile or not isSameSuitSequence(pile, dir=1): + return 0 + return 1 + + +# register the game +registerGame(GameInfo(118, SiebenBisAs, "Sieben bis As", + GI.GT_MONTANA | GI.GT_OPEN, 1, 0, + ranks=(0, 6, 7, 8, 9, 10, 11, 12))) +registerGame(GameInfo(144, Maze, "Maze", + GI.GT_MONTANA | GI.GT_OPEN, 1, 0, + si={"ncards": 48})) + diff --git a/pysollib/games/simplex.py b/pysollib/games/simplex.py new file mode 100644 index 00000000..7a3cc4fc --- /dev/null +++ b/pysollib/games/simplex.py @@ -0,0 +1,103 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + + +# /*********************************************************************** +# // Simplex +# ************************************************************************/ + +def isSameRankSequence(cards): + c0 = cards[0] + for c in cards[1:]: + if c0.rank != c.rank: + return False + return True + + +class Simplex_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if len(cards) != 4: + return False + return isSameRankSequence(cards) + + +class Simplex_RowStack(SequenceRowStack): + def _isSequence(self, cards): + return isSameRankSequence(cards) + + +class Simplex(Game): + + def createGame(self, reserves=6): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+10*l.XS, l.YM+2*l.YS+9*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + x += l.XS + s.waste = WasteStack(x, y, self) + x += l.XS + stack = Simplex_Foundation(x, y, self, + suit=ANY_SUIT, base_rank=ANY_RANK, max_cards=52) + xoffset = (self.width-3*l.XS)/51 + stack.CARD_XOFFSET, stack.CARD_YOFFSET = xoffset, 0 + s.foundations.append(stack) + x, y = l.XM, l.YM+l.YS + for i in range(9): + s.rows.append(Simplex_RowStack(x, y, self)) + x += l.XS + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank == card2.rank + + +# register the game +registerGame(GameInfo(436, Simplex, "Simplex", + GI.GT_1DECK_TYPE, 1, 0)) diff --git a/pysollib/games/special/__init__.py b/pysollib/games/special/__init__.py new file mode 100644 index 00000000..7e17ccf0 --- /dev/null +++ b/pysollib/games/special/__init__.py @@ -0,0 +1,4 @@ +import hanoi +import memory +import pegged +import tarock diff --git a/pysollib/games/special/hanoi.py b/pysollib/games/special/hanoi.py new file mode 100644 index 00000000..8b39c70f --- /dev/null +++ b/pysollib/games/special/hanoi.py @@ -0,0 +1,165 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Tower of Hanoy +# ************************************************************************/ + +class TowerOfHanoy_Hint(CautiousDefaultHint): + # FIXME: demo is completely clueless + pass + + +class TowerOfHanoy_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + if not self.cards: + return 1 + return self.cards[-1].rank > cards[0].rank + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class TowerOfHanoy(Game): + RowStack_Class = TowerOfHanoy_RowStack + Hint_Class = TowerOfHanoy_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to XX cards are fully playable in default window size) + h = max(2*l.YS, l.YS + (len(self.cards)-1)*l.YOFFSET + l.YM) + self.setSize(l.XM + 5*l.XS, l.YM + l.YS + h) + + # create stacks + for i in range(3): + x, y, = l.XM + (i+1)*l.XS, l.YM + s.rows.append(self.RowStack_Class(x, y, self, max_accept=1, max_move=1)) + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + for i in range(3): + self.s.talon.dealRow() + + def isGameWon(self): + for s in self.s.rows: + if len(s.cards) == len(self.cards): + return 1 + return 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank + + def getAutoStacks(self, event=None): + return ((), (), self.sg.dropstacks) + + +# /*********************************************************************** +# // Hanoi Puzzle +# ************************************************************************/ + +class HanoiPuzzle_RowStack(TowerOfHanoy_RowStack): + def getBottomImage(self): + if self.id == len(self.game.s.rows) - 1: + return self.game.app.images.getSuitBottom() + return self.game.app.images.getReserveBottom() + + +class HanoiPuzzle4(TowerOfHanoy): + RowStack_Class = HanoiPuzzle_RowStack + + def _shuffleHook(self, cards): + # no shuffling + return self._shuffleHookMoveToTop(cards, lambda c: (1, -c.id)) + + def startGame(self): + self.startDealSample() + for i in range(len(self.cards)): + self.s.talon.dealRow(rows=self.s.rows[:1]) + + def isGameWon(self): + return len(self.s.rows[-1].cards) == len(self.cards) + + +class HanoiPuzzle5(HanoiPuzzle4): + pass + + +class HanoiPuzzle6(HanoiPuzzle4): + pass + + +# register the game +registerGame(GameInfo(124, TowerOfHanoy, "Tower of Hanoy", + GI.GT_PUZZLE_TYPE, 1, 0, + suits=(2,), ranks=range(9))) +registerGame(GameInfo(207, HanoiPuzzle4, "Hanoi Puzzle 4", + GI.GT_PUZZLE_TYPE, 1, 0, + suits=(2,), ranks=range(4), + rules_filename="hanoipuzzle.html")) +registerGame(GameInfo(208, HanoiPuzzle5, "Hanoi Puzzle 5", + GI.GT_PUZZLE_TYPE, 1, 0, + suits=(2,), ranks=range(5), + rules_filename="hanoipuzzle.html")) +registerGame(GameInfo(209, HanoiPuzzle6, "Hanoi Puzzle 6", + GI.GT_PUZZLE_TYPE, 1, 0, + suits=(2,), ranks=range(6), + rules_filename="hanoipuzzle.html")) + diff --git a/pysollib/games/special/memory.py b/pysollib/games/special/memory.py new file mode 100644 index 00000000..2d1e18f1 --- /dev/null +++ b/pysollib/games/special/memory.py @@ -0,0 +1,324 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Memory_RowStack(OpenStack): + def clickHandler(self, event): + game = self.game + if len(self.cards) != 1 or self.cards[-1].face_up: + return 1 + if game.other_stack is None: + game.playSample("flip", priority=5) + self.flipMove() + game.other_stack = self + else: + assert len(game.other_stack.cards) == 1 and game.other_stack.cards[-1].face_up + c1, c2 = self.cards[-1], game.other_stack.cards[0] + self.flipMove() + if self.game.cardsMatch(c1, c2): + self._dropPairMove(1, game.other_stack) + else: + game.playSample("flip", priority=5) + game.score = game.score - 1 + game.updateStatus(moves=game.moves.index+1) # update moves now + game.updateText() + game.canvas.update_idletasks() + game.sleep(0.5) + game.other_stack.flipMove() + game.canvas.update_idletasks() + game.sleep(0.2) + self.flipMove() + game.other_stack = None + self.game.finishMove() + return 1 + + def _dropPairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + game.playSample("droppair", priority=200) + game.closed_cards = game.closed_cards - 2 + game.score = game.score + 5 + + rightclickHandler = clickHandler + doubleclickHandler = clickHandler + + def controlclickHandler(self, event): + return 0 + def shiftclickHandler(self, event): + return 0 + + +# /*********************************************************************** +# // Memory +# ************************************************************************/ + +class Memory24(Game): + Hint_Class = None + + COLUMNS = 6 + ROWS = 4 + WIN_SCORE = 40 + PERFECT_SCORE = 60 # 5 * (6*4)/2 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # game extras + self.other_stack = None + self.closed_cards = -1 + self.score = 0 + + # create text + x, y = l.XM, self.ROWS*l.YS + if self.preview <= 1: + self.texts.score = MfxCanvasText(self.canvas, x, y, anchor="sw", + font=self.app.getFont("canvas_large")) + x = self.texts.score.bbox()[1][0] + 16 + + # set window + w = max(2*l.XS, x) + self.setSize(l.XM + w + self.COLUMNS*l.XS, l.YM + self.ROWS*l.YS) + + # create stacks + for i in range(self.ROWS): + for j in range(self.COLUMNS): + x, y = l.XM + w + j*l.XS, l.YM + i*l.YS + s.rows.append(Memory_RowStack(x, y, self, + max_move=0, max_accept=0, max_cards=1)) + x, y = l.XM, l.YM + s.talon = InitialDealTalonStack(x, y, self) + l.createText(s.talon, anchor="nn", text_format="%D") + s.internals.append(InvisibleStack(self)) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + n = self.COLUMNS * self.ROWS + assert len(self.s.talon.cards) == n + self.other_stack = None + self.closed_cards = n + self.score = 0 + self.updateText() + n = n - self.COLUMNS + self.s.talon.dealRow(rows=self.s.rows[:n], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[n:], flip=0) + assert len(self.s.talon.cards) == 0 + + def isGameWon(self): + return self.closed_cards == 0 and self.score >= self.WIN_SCORE + + def getAutoStacks(self, event=None): + return ((), (), ()) + + # + # scoring + # + + def updateText(self): + if self.preview > 1 or not self.texts.score: + return + t = "" + if self.closed_cards: + t = _("Points: %d") % self.score + else: + if self.score >= self.WIN_SCORE: + t = _("WON\n\n") + t = t + _("Total: %d") % self.score + self.texts.score.config(text=t) + + def getGameScore(self): + return self.score + + # Memory special: check score for a perfect game + def getWinStatus(self): + won, status, updated = Game.getWinStatus(self) + if status == 2 and self.score < self.PERFECT_SCORE: + return won, 1, self.U_WON + return won, status, updated + + # + # game extras + # + + def cardsMatch(self, card1, card2): + return card1.suit == card2.suit and card1.rank == card2.rank + + def canSaveGame(self): + return 0 + + def canUndo(self): + return 0 + + def _restoreGameHook(self, game): + if game.loadinfo.other_stack_id >= 0: + self.other_stack = self.allstacks[game.loadinfo.other_stack_id] + else: + self.other_stack = None + self.closed_cards = game.loadinfo.closed_cards + self.score = game.loadinfo.score + + def _loadGameHook(self, p): + self.loadinfo.addattr(other_stack_id=p.load()) + self.loadinfo.addattr(closed_cards=p.load()) + self.loadinfo.addattr(score=p.load()) + + def _saveGameHook(self, p): + if self.other_stack: + p.dump(self.other_stack.id) + else: + p.dump(-1) + p.dump(self.closed_cards) + p.dump(self.score) + + +class Memory30(Memory24): + COLUMNS = 6 + ROWS = 5 + WIN_SCORE = 45 + PERFECT_SCORE = 75 # 5 * (6*5)/2 + + +class Memory40(Memory24): + COLUMNS = 8 + ROWS = 5 + WIN_SCORE = 50 + PERFECT_SCORE = 100 # 5 * (8*5)/2 + + +# /*********************************************************************** +# // Concentration +# ************************************************************************/ + +class Concentration_RowStack(Memory_RowStack): + def _dropPairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + game.playSample("droppair", priority=200) + game.closed_cards = game.closed_cards - 2 + game.score = game.score + 5 + # + old_state = game.enterState(game.S_FILL) + f = game.s.talon + game.moveMove(n, self, f, frames=frames, shadow=shadow) + game.moveMove(n, other_stack, f, frames=frames, shadow=shadow) + game.leaveState(old_state) + + +class Concentration(Memory24): + COLUMNS = 13 + ROWS = 4 + WIN_SCORE = 50 + PERFECT_SCORE = 130 # 5 * (13*4)/2 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self, XM=4), self.s + + # game extras + self.other_stack = None + self.closed_cards = -1 + self.score = 0 + + # set window + self.setSize(l.XM + self.COLUMNS*l.XS, l.YM + (self.ROWS+1)*l.YS) + + # create stacks + for i in range(self.ROWS): + for j in range(self.COLUMNS): + x, y = l.XM + j*l.XS, l.YM + i*l.YS + s.rows.append(Concentration_RowStack(x, y, self, + max_move=0, max_accept=0, max_cards=1)) + x, y = l.XM + self.COLUMNS*l.XS/2, self.height - l.YS + s.talon = InitialDealTalonStack(x, y, self) + l.createText(s.talon, dx=-10, anchor="sw", text_format="%D") + + # create text + x, y = l.XM, self.height - l.YM + if self.preview <= 1: + self.texts.score = MfxCanvasText(self.canvas, x, y, + anchor="sw", + font=self.app.getFont("canvas_large")) + + # define stack-groups + l.defaultStackGroups() + + # + # game extras + # + + def cardsMatch(self, card1, card2): + return card1.rank == card2.rank + + +# register the game +registerGame(GameInfo(176, Memory24, "Memory 24", + GI.GT_MEMORY | GI.GT_SCORE, 2, 0, + suits=(0,2), ranks=(0,8,9,10,11,12))) +registerGame(GameInfo(219, Memory30, "Memory 30", + GI.GT_MEMORY | GI.GT_SCORE, 2, 0, + suits=(0,2,3), ranks=(0,9,10,11,12))) +registerGame(GameInfo(177, Memory40, "Memory 40", + GI.GT_MEMORY | GI.GT_SCORE, 2, 0, + suits=(0,2), ranks=(0,4,5,6,7,8,9,10,11,12))) +registerGame(GameInfo(178, Concentration, "Concentration", + GI.GT_MEMORY | GI.GT_SCORE, 1, 0)) + diff --git a/pysollib/games/special/pegged.py b/pysollib/games/special/pegged.py new file mode 100644 index 00000000..08d304b4 --- /dev/null +++ b/pysollib/games/special/pegged.py @@ -0,0 +1,261 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Pegged_Hint(AbstractHint): + # FIXME: no intelligence whatsoever is implemented here + def computeHints(self): + game = self.game + # get free stacks + stacks = filter(lambda r: not r.cards, game.s.rows) + # + for t in stacks: + for dx, dy in game.STEPS: + r = game.map.get((t.pos[0] + dx, t.pos[1] + dy)) + if not r or not r.cards or not t.acceptsCards(r, r.cards): + continue + # braindead scoring... + score = 10000 + game.app.miscrandom.randint(0, 9999) + self.addHint(score, 1, r, t) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Pegged_RowStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return 0 + return self._getMiddleStack(from_stack) is not None + + def canDropCards(self, stacks): + return (None, 0) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + other_stack = to_stack._getMiddleStack(self) + old_state = self.game.enterState(self.game.S_FILL) + f = self.game.s.foundations[0] + self.game.moveMove(ncards, self, to_stack, frames=0) + self.game.playSample("drop", priority=200) + self.game.moveMove(ncards, other_stack, f, frames=-1, shadow=shadow) + self.game.leaveState(old_state) + self.fillStack() + other_stack.fillStack() + + def _getMiddleStack(self, from_stack): + dx, dy = from_stack.pos[0] - self.pos[0], from_stack.pos[1] - self.pos[1] + if not self.game.STEP_MAP.get((dx, dy)): + return None + s = self.game.map.get((self.pos[0] + dx/2, self.pos[1] + dy/2)) + if not s or not s.cards: + return None + return s + + def copyModel(self, clone): + ReserveStack.copyModel(self, clone) + clone.pos = self.pos + + +# /*********************************************************************** +# // Pegged +# ************************************************************************/ + +class Pegged(Game): + Hint_Class = Pegged_Hint + + STEPS = ((-4, 0), (4, 0), (0, -4), (0, 4)) + ROWS = (3, 5, 7, 7, 7, 5, 3) + EMPTY_STACK_ID = -1 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + n = m = max(self.ROWS) + if self.ROWS[0] == m or self.ROWS[-1] == m: + n = n + 1 + self.setSize(l.XM + n*l.XS, l.YM + len(self.ROWS)*l.YS) + + # game extras 1) + self.map = {} + + # create stacks + for i in range(len(self.ROWS)): + r = self.ROWS[i] + for j in range(r): + d = m - r + 2*j + x, y = l.XM + d*l.XS/2, l.YM + i*l.YS + stack = Pegged_RowStack(x, y, self) + stack.pos = (d, 2*i) + ##print stack.id, stack.pos + s.rows.append(stack) + self.map[stack.pos] = stack + x, y = self.width - l.XS, l.YM + s.foundations.append(AbstractFoundationStack(x, y, self, ANY_SUIT, max_move=0, max_accept=0)) + l.createText(s.foundations[0], "ss") + y = self.height - l.YS + s.talon = InitialDealTalonStack(x, y, self) + s.internals.append(InvisibleStack(self)) + + # game extras 2) + self.STEP_MAP = {} + for step in self.STEPS: + self.STEP_MAP[step] = 1 + if self.EMPTY_STACK_ID < 0: + self.EMPTY_STACK_ID = len(s.rows) / 2 + + # Define stack groups + l.defaultStackGroups() + + + # + # game overrides + # + + def startGame(self): + n = len(self.cards) - len(self.s.rows) + 1 + if n > 0: + self.moveMove(n, self.s.talon, self.s.internals[0], frames=0) + self.startDealSample() + rows = list(self.s.rows[:]) + rows.remove(rows[self.EMPTY_STACK_ID]) + self.s.talon.dealRow(rows=rows, frames=4) + assert len(self.s.talon.cards) == 0 + + def isGameWon(self): + c = 0 + for s in self.s.foundations: + c = c + len(s.cards) + return c + 2 == self.gameinfo.si.ncards + + def getAutoStacks(self, event=None): + return ((), (), ()) + + # Pegged special: check for a perfect game + def getWinStatus(self): + won, status, updated = Game.getWinStatus(self) + if status == 2: + stacks = filter(lambda r: r.cards, self.s.rows) + assert len(stacks) == 1 + if stacks[0].id != self.EMPTY_STACK_ID: + # not perfect + return won, 1, self.U_WON + return won, status, updated + + # Pegged special: highlight all moveable cards + def getHighlightPilesStacks(self): + rows = [] + for r in self.s.rows: + if not r.cards: + continue + rx, ry = r.pos + for dx, dy in self.STEPS: + s = self.map.get((rx + dx, ry + dy)) + if s and not s.cards: + m = self.map.get((rx + dx/2, ry + dy/2)) + if m and m.cards: + rows.append(r) + return ((rows, 1),) + + +class PeggedCross1(Pegged): + ROWS = (3, 3, 7, 7, 7, 3, 3) + +class PeggedCross2(Pegged): + ROWS = (3, 3, 3, 9, 9, 9, 3, 3, 3) + +class Pegged6x6(Pegged): + EMPTY_STACK_ID = 14 + ROWS = (6, 6, 6, 6, 6, 6) + +class Pegged7x7(Pegged): + ROWS = (7, 7, 7, 7, 7, 7, 7) + + +# /*********************************************************************** +# // Pegged Triangle +# ************************************************************************/ + +class PeggedTriangle1(Pegged): + STEPS = ((-2, -4), (-2, 4), (-4, 0), (4, 0), (2, -4), (2, 4)) + ROWS = (1, 2, 3, 4, 5) + EMPTY_STACK_ID = 4 + +class PeggedTriangle2(PeggedTriangle1): + ROWS = (1, 2, 3, 4, 5, 6) + + +# /*********************************************************************** +# // register the games +# ************************************************************************/ + +def r(id, gameclass, name): + si_ncards = 0 + for n in gameclass.ROWS: + si_ncards = si_ncards + n + gi = GameInfo(id, gameclass, name, + GI.GT_PUZZLE_TYPE, 1, 0, + si={"ncards": si_ncards}, + rules_filename = "pegged.html") + registerGame(gi) + return gi + +r(180, Pegged, "Pegged") +r(181, PeggedCross1, "Pegged Cross 1") +r(182, PeggedCross2, "Pegged Cross 2") +r(183, Pegged6x6, "Pegged 6x6") +r(184, Pegged7x7, "Pegged 7x7") +r(210, PeggedTriangle1, "Pegged Triangle 1") +r(211, PeggedTriangle2, "Pegged Triangle 2") + +del r diff --git a/pysollib/games/special/tarock.py b/pysollib/games/special/tarock.py new file mode 100644 index 00000000..f3bd38fc --- /dev/null +++ b/pysollib/games/special/tarock.py @@ -0,0 +1,943 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 by T. Kirk +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +## T. Kirk +## +## http://www.inetarena.com/~grania +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +from pysollib.games.braid import Braid_Foundation, Braid_BraidStack, \ + Braid_RowStack, Braid_ReserveStack, Braid +from pysollib.games.bakersdozen import Cruel_Talon + + +# /*********************************************************************** +# // Tarock Talon Stacks +# ************************************************************************/ + +class Wicked_Talon(Cruel_Talon): + pass + + +# /*********************************************************************** +# // Tarock Foundation Stacks +# ************************************************************************/ + +class ImperialTrump_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return 0 + return cards[-1].rank < len(self.game.s.foundations[4].cards) + + +class Ponytail_Foundation(Braid_Foundation): + pass + + +# /*********************************************************************** +# // Tarock Row Stacks +# ************************************************************************/ + +class Tarock_OpenStack(OpenStack): + def __init__(self, x, y, game, yoffset=-1, **cap): + kwdefault(cap, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS) + apply(OpenStack.__init__, (self, x, y, game), cap) + if yoffset < 0: + yoffset = game.app.images.CARD_YOFFSET + self.CARD_YOFFSET = yoffset + + +class Tarock_AC_RowStack(Tarock_OpenStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + if not self.cards: + return 1 + if cards[0].rank != self.cards[-1].rank - 1: + return 0 + elif cards[0].color == 2 or self.cards[-1].color == 2: + return 1 + else: + return cards[0].color != self.cards[-1].color + + +class Skiz_RowStack(RK_RowStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + if not self.cards: + if cards[0].suit == len(self.game.gameinfo.suits): + return cards[0].rank == len(self.game.gameinfo.trumps) - 1 + else: + return cards[0].rank == len(self.game.gameinfo.ranks) - 1 + return self.cards[-1].suit == cards[0].suit and self.cards[-1].rank - 1 == cards[0].rank + + +class Pagat_RowStack(RK_RowStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + if not self.cards: + return 1 + return self.cards[-1].suit == cards[0].suit and self.cards[-1].rank - 1 == cards[0].rank + + +class TrumpWild_RowStack(Tarock_OpenStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + if not self.cards: + if cards[0].suit == len(self.game.gameinfo.suits): + return cards[0].rank == len(self.game.gameinfo.trumps) - 1 + else: + return cards[0].rank == len(self.game.gameinfo.ranks) - 1 + if cards[0].rank != self.cards[-1].rank - 1: + return 0 + elif cards[0].color == 2 or self.cards[-1].color == 2: + return 1 + else: + return cards[0].color != self.cards[-1].color + + +class TrumpOnly_RowStack(Tarock_OpenStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + if not self.cards: + return cards[0].suit == len(self.game.gameinfo.suits) + return cards[0].color == 2 and cards[0].rank == self.cards[-1].rank - 1 + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class Excuse_RowStack(Tarock_OpenStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + if not self.cards: + return 0 + return cards[0].rank == self.cards[-1].rank - 1 + + +class WheelOfFortune_RowStack(Tarock_OpenStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + if not self.cards: + return 1 + return ((cards[0].suit == self.cards[-1].suit) + and (cards[0].rank == self.cards[-1].rank - 1)) + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class Ponytail_PonytailStack(Braid_BraidStack): + pass + + +class Ponytail_RowStack(Braid_RowStack): + pass + + +class Ponytail_ReserveStack(Braid_ReserveStack): + pass + + +class Cavalier_RowStack(Tarock_AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not Tarock_AC_RowStack.acceptsCards(self, from_stack, cards): + return 0 + return self.cards or len(cards) == 1 + + def canMoveCards(self, cards): + for i in range(len(cards) - 1): + if not cards[i].suit == 4: + if cards[i].color == cards[i + 1].color: + return 0 + if cards[i].rank - 1 != cards[i + 1].rank: + return 0 + return 1 + + +class Nasty_RowStack(SS_RowStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + if self.cards: + return (cards[0].rank == self.cards[-1].rank - 1 + and cards[0].suit == self.cards[-1].suit) + return cards[0].rank == 13 + 8 * (cards[0].suit == 4) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Tarock_GameMethods: + SUITS = (_("Wand"), _("Sword"), _("Cup"), _("Coin"), _("Trump")) + RANKS = (_("Ace"), "2", "3", "4", "5", "6", "7", "8", "9", "10", + _("Page"), _("Valet"), _("Queen"), _("King")) + + def getCardFaceImage(self, deck, suit, rank): + return self.app.images.getFace(deck, suit, rank) + + +class AbstractTarockGame(Tarock_GameMethods, Game): + pass + + +# /*********************************************************************** +# // Wheel of Fortune +# ************************************************************************/ + +class WheelOfFortune(AbstractTarockGame): + Hint_Class = CautiousDefaultHint + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + self.setSize(l.XM + l.XS * 11.5, l.YM + l.YS * 5.5) + + # Create wheel + xoffset = (1, 2, 3, 3.9, 3, 2, 1, 0, -1, -2, -3, + -3.9, -3, -2, -1, 0, -2, -1, 0, 1, 2) + yoffset = (0.2, 0.5, 1.1, 2.2, 3.3, 3.9, 4.2, 4.4, + 4.2, 3.9, 3.3, 2.2, 1.1, 0.5, 0.2, 0, + 1.8, 2.1, 2.2, 2.4, 2.6) + x = l.XM + l.XS * 4 + y = l.YM + for i in range(21): + x0 = x + xoffset[i] * l.XS + y0 = y + yoffset[i] * l.YS + s.rows.append(WheelOfFortune_RowStack(x0, y0, self, yoffset=l.CH/4, + max_cards=2, max_move=1, max_accept=1)) + self.setRegion(s.rows, (-999, -999, l.XS * 9, 999999)) + + # Create foundations + x = self.width - l.XS * 2 + y = l.YM + s.foundations.append(SS_FoundationStack(x, y, self, 0, max_cards=14)) + x = x + l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 1, max_cards=14)) + y = y + l.YS + s.foundations.append(SS_FoundationStack(x, y, self, 3, max_cards=14)) + x = x - l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 2, max_cards=14)) + x = x + l.XS * 0.5 + y = y + l.YS + s.foundations.append(SS_FoundationStack(x, y, self, 4, max_cards=22)) + + # Create talon + x = self.width - l.XS + y = self.height - l.YS * 1.5 + s.talon = WasteTalonStack(x, y, self, num_deal=2, max_rounds=1) + l.createText(s.talon, "nn") + x = x - l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "nn") + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 78 + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[-5:]) + self.s.talon.dealRow(rows=self.s.rows[4:-5]) + self.s.talon.dealRow(rows=self.s.rows[:4]) + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return 0 + + +# /*********************************************************************** +# // Imperial Trumps +# ************************************************************************/ + +class ImperialTrumps(AbstractTarockGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + self.setSize(l.XM + l.XS * 8, l.YM + l.YS * 5) + + + # Create foundations + x = l.XM + l.XS * 3 + y = l.YM + for i in range(4): + s.foundations.append(ImperialTrump_Foundation(x, y, self, i, max_cards=14)) + x = x + l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 4, max_cards=22)) + + # Create talon + x = l.XM + s.talon = WasteTalonStack(x, y, self, num_deal=1, max_rounds=-1) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # Create rows + x = l.XM + y = l.YM + int(round(l.YS * 1.25)) + for i in range(8): + s.rows.append(TrumpWild_RowStack(x, y, self)) + x = x + l.XS + self.setRegion(s.rows, (-999, y, 999999, 999999)) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self, reverse=1): + assert len(self.s.talon.cards) == 78 + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow(reverse=reverse) + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return 0 + + +# /*********************************************************************** +# // Pagat +# ************************************************************************/ + +class Pagat(AbstractTarockGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + h = max(3 * l.YS, 20 * l.YOFFSET) + self.setSize(l.XM + 12 * l.XS, l.YM + l.YS + h) + + # Create foundations + x = l.XM + l.XS * 3.5 + y = l.YM + s.foundations.append(SS_FoundationStack(x, y, self, 0, max_cards=14)) + x = x + l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 1, max_cards=14)) + x = x + l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 4, max_cards=22)) + x = x + l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 2, max_cards=14)) + x = x + l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 3, max_cards=14)) + + # Create reserves + x = l.XM + for i in range(3): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + x = x + l.XS * 6 + for i in range(3): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + + # Create rows + x = l.XM + y = l.YM + l.YS * 1.1 + for i in range(12): + s.rows.append(Pagat_RowStack(x, y, self)) + x = x + l.XS + self.setRegion(s.rows, (-999, int(y), 999999, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 78 + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[3:9]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Skiz +# ************************************************************************/ + +class Skiz(AbstractTarockGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + h = max(3 * l.YS, 20 * l.YOFFSET) + self.setSize(l.XM + 12 * l.XS, l.YM + l.YS + h) + + # Create foundations + x = l.XM + l.XS * 3.5 + y = l.YM + s.foundations.append(SS_FoundationStack(x, y, self, 0, max_cards=14)) + x = x + l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 1, max_cards=14)) + x = x + l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 4, max_cards=22)) + x = x + l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 2, max_cards=14)) + x = x + l.XS + s.foundations.append(SS_FoundationStack(x, y, self, 3, max_cards=14)) + + # Create reserves + x = l.XM + for i in range(3): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + x = x + l.XS * 6 + for i in range(3): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + + # Create rows + x = l.XM + y = l.YM + l.YS * 1.1 + for i in range(12): + s.rows.append(Skiz_RowStack(x, y, self)) + x = x + l.XS + self.setRegion(s.rows, (-999, int(y), 999999, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 78 + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[3:9]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Fifteen Plus +# ************************************************************************/ + +class FifteenPlus(AbstractTarockGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + h = max(5 * l.YS, 20 * l.YOFFSET) + self.setSize(l.XM + 9 * l.XS, l.YM + l.YS + h) + + # Create foundations + x = self.width - l.XS + y = l.YM + s.foundations.append(SS_FoundationStack(x, y, self, 4, max_cards=22)) + y = y + l.YS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, i, max_cards=14)) + y = y + l.YS + + # Create rows + x = l.XM + y = l.YM + for j in range(2): + for i in range(8): + s.rows.append(Tarock_AC_RowStack(x, y, self, max_move=1, max_accept=1)) + x = x + l.XS + x = l.XM + y = y + l.YS * 3 + self.setRegion(s.rows, (-999, -999, l.XM + l.XS * 8, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 78 + for i in range(2): + self.s.talon.dealRow(flip=0, frames=0) + for i in range(2): + self.s.talon.dealRow(rows=self.s.rows[:15], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Excuse +# ************************************************************************/ + +class Excuse(AbstractTarockGame): + Hint_Class = CautiousDefaultHint + GAME_VERSION = 2 + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + h = max(5 * l.YS, 20 * l.YOFFSET) + self.setSize(l.XM + 9 * l.XS, l.YM + l.YS + h) + + # Create foundations + x = self.width - l.XS + y = l.YM + s.foundations.append(SS_FoundationStack(x, y, self, 4, max_cards=22)) + y = y + l.YS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, i, max_cards=14)) + y = y + l.YS + + # Create rows + x = l.XM + y = l.YM + for j in range(2): + for i in range(8): + s.rows.append(Excuse_RowStack(x, y, self, + max_move=1, max_accept=1, base_rank=NO_RANK)) + x = x + l.XS + x = l.XM + y = y + l.YS * 3 + self.setRegion(s.rows, (-999, -999, l.XM + l.XS * 8, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def _shuffleHook(self, cards): + # move Kings to bottom of each stack (see Baker's Dozen) + def isKing(c): + return (c.suit < 4 and c.rank == 13) or (c.suit == 4 and c.rank == 21) + i, n = 0, len(self.s.rows) + kings = [] + for c in cards: + if isKing(c): + kings.append(i) + i = i + 1 + for i in kings: + j = i % n + while j < i: + if not isKing(cards[j]): + cards[i], cards[j] = cards[j], cards[i] + break + j = j + n + cards.reverse() + return cards + + def startGame(self): + assert len(self.s.talon.cards) == 78 + for i in range(3): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(rows=self.s.rows[:15], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:15]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank + 1 == card2.rank + or card1.rank - 1 == card2.rank) + + +# /*********************************************************************** +# // Grasshopper +# // Double Grasshopper +# ************************************************************************/ + +class Grasshopper(AbstractTarockGame): + GAME_VERSION = 2 + MAX_ROUNDS = 2 + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + decks = self.gameinfo.decks + self.setSize(2*l.XM + (2 + 5*decks)*l.XS, 3*l.YM + 5*l.YS) + yoffset = min(l.YOFFSET, max(10, l.YOFFSET / 2)) + + # Create talon + x = l.XM + y = l.YM + s.talon = WasteTalonStack(x, y, self, num_deal=1, max_rounds=self.MAX_ROUNDS) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # Create foundations + x = x + l.XM + l.XS + for j in range(4): + for i in range(decks): + s.foundations.append(SS_FoundationStack(x, y, self, j, max_cards=14)) + x = x + l.XS + for i in range(decks): + s.foundations.append(SS_FoundationStack(x, y, self, 4, max_cards=22)) + x = x + l.XS + + # Create reserve + x = l.XM + y = l.YM * 3 + l.YS + s.reserves.append(OpenStack(x, y, self)) + s.reserves[0].CARD_YOFFSET = (l.YOFFSET, yoffset)[decks == 2] + + # Create rows + x = x + l.XM + l.XS + for i in range(decks): + s.rows.append(TrumpOnly_RowStack(x, y, self, yoffset=yoffset)) + x = x + l.XS + for i in range(4*decks+1): + s.rows.append(Tarock_AC_RowStack(x, y, self)) + x = x + l.XS + self.setRegion(s.rows, (-999, y - l.YS, 999999, 999999)) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + decks = self.gameinfo.decks + assert len(self.s.talon.cards) == 78 * decks + self.startDealSample() + for i in range(14 * decks): + self.s.talon.dealRow(rows=self.s.reserves, flip=0, frames=4) + self.s.reserves[0].flipMove() + self.s.talon.dealRow(rows = self.s.rows[decks:]) + self.s.talon.dealCards() # deal first card to WasteStack + + def fillStack(self, stack): + r = self.s.reserves[0] + if not stack.cards and stack in self.s.rows: + if r.cards and stack.acceptsCards(r, r.cards[-1:]): + r.moveMove(1, stack) + if r.canFlipCard(): + r.flipMove() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1 == card2.rank + or card1.rank - 1 == card2.rank) + and card1.color != card2.color) + + +class DoubleGrasshopper(Grasshopper): + pass + + +# /*********************************************************************** +# // Ponytail +# ************************************************************************/ + +class Ponytail(Tarock_GameMethods, Braid): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 20 cards are playable - needed for Ponytail_PonytailStack) + h = max(5*l.YS + 30, l.YS+(self.BRAID_CARDS-1)*l.YOFFSET) + self.setSize(10*l.XS+l.XM, l.YM + h) + + # extra settings + self.base_card = None + + # create stacks + s.addattr(braid=None) # register extra stack variable + x, y = l.XM, l.YM + for i in range(2): + s.rows.append(Ponytail_RowStack(x + 0.5 * l.XS, y, self)) + s.rows.append(Ponytail_RowStack(x + 4.5 * l.XS, y, self)) + s.rows.append(Ponytail_RowStack(x + 5.5 * l.XS, y, self)) + s.rows.append(Ponytail_RowStack(x + 6.5 * l.XS, y, self)) + y = y + 4 * l.YS + y = l.YM + l.YS + for i in range(2): + s.rows.append(Ponytail_ReserveStack(x, y, self)) + s.rows.append(Ponytail_ReserveStack(x + l.XS, y, self)) + s.rows.append(Ponytail_ReserveStack(x, y + l.YS, self)) + s.rows.append(Ponytail_ReserveStack(x + l.XS, y + l.YS, self)) + s.rows.append(Ponytail_ReserveStack(x, y + 2 * l.YS, self)) + s.rows.append(Ponytail_ReserveStack(x + l.XS, y + 2 * l.YS, self)) + x = x + 4 * l.XS + x = l.XM + 5*l.XS/2 + y = l.YM + s.braid = Ponytail_PonytailStack(x, y, self, sine=1) + x = l.XM + 7 * l.XS + y = l.YM + 2*l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, "ss") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + x + l.CW / 2, y - l.YM, + anchor="s", + font=self.app.getFont("canvas_default")) + x = x - l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + x = l.XM + 8 * l.XS + y = l.YM + for i in range(4): + s.foundations.append(Ponytail_Foundation(x, y, self, i, mod=14, max_cards=14)) + s.foundations.append(Ponytail_Foundation(x + l.XS, y, self, i, mod=14, max_cards=14)) + y = y + l.YS + s.foundations.append(Ponytail_Foundation(x, y, self, 4, mod=22, max_cards=22)) + s.foundations.append(Ponytail_Foundation(x + l.XS, y, self, 4, mod=22, max_cards=22)) + # ??? + self.texts.info = MfxCanvasText(self.canvas, + x + l.CW + l.XM / 2, y + l.YS, + anchor="n", + font=self.app.getFont("canvas_default")) + + # define stack-groups + self.sg.openstacks = s.foundations + s.rows + self.sg.talonstacks = [s.talon] + [s.waste] + self.sg.dropstacks = [s.braid] + s.rows + [s.waste] + + +# /*********************************************************************** +# // Cavalier +# // Five Aces +# // Wicked +# // Nasty +# ************************************************************************/ + +class Cavalier(AbstractTarockGame): + Layout_Method = Layout.bakersDozenLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = Cavalier_RowStack + + # + # Game layout + # + + def createGame(self, **layout): + # Create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=18, playcards=19) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create foundations + for r in l.s.foundations: + n = 14 + 8 * (r.suit == 4) + s.foundations.append(self.Foundation_Class(r.x, r.y, self, r.suit, + mod=n, max_cards=n)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + + # Define stack groups + l.defaultAll() + + + # + # Game over rides + # + + def startGame(self, flip=(0, 1, 0), foundations=0): + assert len(self.s.talon.cards) == 78 + for f in flip: + self.s.talon.dealRow(flip=f, frames=0) + self.startDealSample() + self.s.talon.dealRow() + if foundations: + self.s.talon.dealRow(rows=self.s.rows[0:1]) + self.s.talon.dealRow(rows=self.s.foundations) + else: + self.s.talon.dealRow(rows=self.s.rows[:6]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1 == card2.rank + or card1.rank - 1 == card2.rank) + and ((card1.suit == 4 or card2.suit == 4) + or card1.color != card2.color)) + + +class FiveAces(Cavalier): + def _shuffleHook(self, cards): + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 0, c.suit)) + + def startGame(self): + Cavalier.startGame(self, foundations=1) + + +class Wicked(FiveAces): + Talon_Class = StackWrapper(Wicked_Talon, max_rounds=-1) + RowStack_Class = StackWrapper(SS_RowStack, max_move=1, max_accept=1, base_rank=NO_RANK) + Hint_Class = CautiousDefaultHint + + def startGame(self): + Cavalier.startGame(self, flip=(1, 1, 1), foundations=1) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1 == card2.rank + or card1.rank - 1 == card2.rank) + and card1.suit == card2.suit) + + +class Nasty(Wicked): + RowStack_Class = StackWrapper(Nasty_RowStack, max_move=1, max_accept=1, base_rank=ANY_RANK) + + +# /*********************************************************************** +# // register the games +# ************************************************************************/ + +def r(id, gameclass, name, game_type, decks, redeals): + game_type = game_type | GI.GT_TAROCK | GI.GT_CONTRIB | GI.GT_ORIGINAL + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + ranks=range(14), trumps=range(22)) + registerGame(gi) + return gi + +r(157, WheelOfFortune, "Wheel of Fortune", GI.GT_TAROCK, 1, 0) +r(158, ImperialTrumps, "Imperial Trumps", GI.GT_TAROCK, 1, -1) +r(159, Pagat, "Pagat", GI.GT_TAROCK | GI.GT_OPEN, 1, 0) +r(160, Skiz, "Skiz", GI.GT_TAROCK | GI.GT_OPEN, 1, 0) +r(161, FifteenPlus, "Fifteen plus", GI.GT_TAROCK, 1, 0) +r(162, Excuse, "Excuse", GI.GT_TAROCK | GI.GT_OPEN, 1, 0) +r(163, Grasshopper, "Grasshopper", GI.GT_TAROCK, 1, 1) +r(164, DoubleGrasshopper, "Double Grasshopper", GI.GT_TAROCK, 2, 1) +r(179, Ponytail, "Ponytail", GI.GT_TAROCK, 2, 2) +r(202, Cavalier, "Cavalier", GI.GT_TAROCK, 1, 0) +r(203, FiveAces, "Five Aces", GI.GT_TAROCK, 1, 0) +r(204, Wicked, "Wicked", GI.GT_TAROCK | GI.GT_OPEN, 1, -1) +r(205, Nasty, "Nasty", GI.GT_TAROCK | GI.GT_OPEN, 1, -1) + +del r + diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py new file mode 100644 index 00000000..06c3d5ea --- /dev/null +++ b/pysollib/games/spider.py @@ -0,0 +1,1051 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.hint import SpiderType_Hint, YukonType_Hint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Spider_Hint(SpiderType_Hint): + # FIXME: demo is not too clever in this game + + BONUS_SAME_SUIT_MOVE = 400 + + def _preferHighRankMoves(self): + return 1 + + def shallMovePile(self, r, t, pile, rpile): + if not SpiderType_Hint.shallMovePile(self, r, t, pile, rpile): + return 0 + rr = self.ClonedStack(r, stackcards=rpile) + if rr.acceptsCards(t, pile): + # the pile we are going to move from r to t + # could be moved back from t ro r - this is + # dangerous for as we can create loops... + if len(t.cards) == 0: + return 1 + if pile[0].suit == t.cards[-1].suit: + # The pile will get moved onto the correct suit + if len(rpile) == 0 or pile[0].suit != rpile[-1].suit: + return 1 + if self.level <= 1 and len(rpile) == 0: + return 1 + return 0 + return 1 + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Spider_SS_Foundation(AbstractFoundationStack): + def __init__(self, x, y, game, suit=ANY_SUIT, **cap): + kwdefault(cap, dir=-1, base_rank=KING, + min_accept=13, max_accept=13, max_move=0) + apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # now check the cards + return isSameSuitSequence(cards, self.cap.mod, self.cap.dir) + + +class Spider_AC_Foundation(Spider_SS_Foundation): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # now check the cards + return isAlternateColorSequence(cards, self.cap.mod, self.cap.dir) + + +class Spider_RowStack(Spider_SS_RowStack): + def canDropCards(self, stacks): + if len(self.cards) < 13: + return (None, 0) + cards = self.cards[-13:] + for s in stacks: + if s is not self and s.acceptsCards(self, cards): + return (s, 13) + return (None, 0) + + +# /*********************************************************************** +# // Relaxed Spider +# ************************************************************************/ + +class RelaxedSpider(Game): + Layout_Method = Layout.klondikeLayout + Talon_Class = DealRowTalonStack + Foundation_Class = Spider_SS_Foundation + RowStack_Class = Spider_RowStack + Hint_Class = Spider_Hint + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=10, waste=0, texts=1, playcards=23) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + if l.s.waste: + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=ANY_SUIT)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + # default + l.defaultAll() + + def startGame(self, flip=0): + for i in range(4): + self.s.talon.dealRow(flip=flip, frames=0) + r = self.s.rows + rows = (r[0], r[3], r[6], r[9]) + self.s.talon.dealRow(rows=rows, flip=flip, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1) % stack1.cap.mod == card2.rank or + (card2.rank + 1) % stack1.cap.mod == card1.rank) + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack.cards: + return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 + return 0 + +# /*********************************************************************** +# // Spider +# ************************************************************************/ + +class Spider(RelaxedSpider): + def canDealCards(self): + if not RelaxedSpider.canDealCards(self): + return 0 + # no row may be empty + for r in self.s.rows: + if not r.cards: + return 0 + return 1 + +class Spider1Suit(Spider): + pass +class Spider2Suits(Spider): + pass + +class OpenSpider(Spider): + def startGame(self, flip=0): + Spider.startGame(self, flip=1) + + +# /*********************************************************************** +# // Black Widow +# ************************************************************************/ + +class BlackWidow_RowStack(RK_RowStack, Spider_RowStack): + def canDropCards(self, stacks): + return Spider_RowStack.canDropCards(self, stacks) + + +class BlackWidow(Spider): + RowStack_Class = BlackWidow_RowStack + + +# /*********************************************************************** +# // Scheidungsgrund (aka Ground for a Divorce) +# ************************************************************************/ + +class GroundForADivorce_Talon(TalonStack): + # A single click deals a new cards to each non-empty row. + def dealCards(self, sound=1): + if self.cards: + rows = filter(lambda r: r.cards, self.game.s.rows) + if not rows: + # deal one card to first row if all rows are emtpy + rows = self.game.s.rows[:1] + return self.dealRowAvail(rows=rows, sound=sound) + return 0 + + +class GroundForADivorce(RelaxedSpider): + Layout_Method = Layout.harpLayout + Talon_Class = GroundForADivorce_Talon + Foundation_Class = StackWrapper(Spider_SS_Foundation, base_rank=ANY_RANK, mod=13) + RowStack_Class = StackWrapper(Spider_RowStack, mod=13) + + def createGame(self): + RelaxedSpider.createGame(self, playcards=22) + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Grandmother's Game +# ************************************************************************/ + +class GrandmothersGame(RelaxedSpider): + Layout_Method = Layout.harpLayout + + def createGame(self): + RelaxedSpider.createGame(self, playcards=22) + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Spiderette (Spider with one deck and 7 rows) +# ************************************************************************/ + +class Spiderette(Spider): + def createGame(self): + Spider.createGame(self, rows=7, playcards=20) + + def startGame(self): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Baby Spiderette +# ************************************************************************/ + +class BabySpiderette(Spiderette): + RowStack_Class = BlackWidow_RowStack + + +# /*********************************************************************** +# // Will o' the Wisp (just like Spiderette) +# ************************************************************************/ + +class WillOTheWisp(Spiderette): + def startGame(self): + for i in range(2): + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Simple Simon +# ************************************************************************/ + +class SimpleSimon(Spider): + Talon_Class = InitialDealTalonStack + + def createGame(self): + Spider.createGame(self, rows=10, texts=0) + + def startGame(self): + for l in (9, 8, 7, 6, 5, 4, 3): + self.s.talon.dealRow(rows=self.s.rows[:l], frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Rachel +# ************************************************************************/ + +class Rachel(RelaxedSpider): + Talon_Class = StackWrapper(WasteTalonStack, max_rounds=1) + RowStack_Class = RK_RowStack + + def createGame(self): + RelaxedSpider.createGame(self, waste=1, rows=6, texts=1) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Scorpion - move cards like in Russian Solitaire +# // Scorpion Tail - building down by alternate color +# ************************************************************************/ + +class Scorpion_RowStack(Yukon_SS_RowStack, Spider_RowStack): + canDropCards = Spider_RowStack.canDropCards + +class Scorpion(RelaxedSpider): + + Hint_Class = YukonType_Hint + RowStack_Class = StackWrapper(Scorpion_RowStack, base_rank=KING) + + def createGame(self): + RelaxedSpider.createGame(self, rows=7, playcards=20) + + def startGame(self): + for i in (4, 4, 4, 0, 0, 0): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0) + self.s.talon.dealRow(rows=self.s.rows[i:], flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + def getHighlightPilesStacks(self): + return () + + +class ScorpionTail_RowStack(Yukon_AC_RowStack, Spider_RowStack): + canDropCards = Spider_RowStack.canDropCards + +class ScorpionTail(Scorpion): + Foundation_Class = Spider_AC_Foundation + RowStack_Class = StackWrapper(ScorpionTail_RowStack, base_rank=KING) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Wasp +# ************************************************************************/ + +class Wasp(Scorpion): + RowStack_Class = Scorpion_RowStack # anything on an empty space + + def startGame(self): + for i in (3, 3, 3, 0, 0, 0): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0) + self.s.talon.dealRow(rows=self.s.rows[i:], flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Three Blind Mice +# ************************************************************************/ + +class ThreeBlindMice(Scorpion): + + Talon_Class = InitialDealTalonStack + + def createGame(self): + # create layout + l, s = Layout(self), self.s + # set window + w, h = l.XM+10*l.XS, l.XM+2*l.XS+15*l.YOFFSET + self.setSize(w, h) + # create stacks + s.talon = self.Talon_Class(w-l.XS, h-l.YS, self) + x, y = l.XM+6*l.XS, l.YM + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(10): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + x, y = l.XM, l.YM + for i in range(2): + s.reserves.append(OpenStack(x, y, self, max_move=1, max_accept=0)) + x += l.XS + # default + l.defaultAll() + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(rows=self.s.rows[:7], flip=1, frames=0) + self.s.talon.dealRow(rows=self.s.rows[7:], flip=0, frames=0) + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + + +# /*********************************************************************** +# // Rouge et Noir +# ************************************************************************/ + +class RougeEtNoir_RowStack(KingAC_RowStack): + def canDropCards(self, stacks): + if not self.cards: + return (None, 0) + for s in stacks: + for cards in (self.cards[-1:], self.cards[-13:]): + if s is not self and s.acceptsCards(self, cards): + return (s, len(cards)) + return (None, 0) + + +class RougeEtNoir(Game): + Layout_Method = Layout.klondikeLayout + Talon_Class = DealRowTalonStack + RowStack_Class = RougeEtNoir_RowStack + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=10, waste=0, texts=1, playcards=23) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + if l.s.waste: + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + for i in range(4): + r = l.s.foundations[i] + s.foundations.append(AC_FoundationStack(r.x, r.y, self, suit=i, max_move=0)) + for i in range(4): + r = l.s.foundations[i+4] + s.foundations.append(Spider_AC_Foundation(r.x, r.y, self)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + # default + l.defaultAll() + return l + + def startGame(self, flip=0, reverse=1): + for i in range(3, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[:-i], flip=flip, frames=0, reverse=reverse) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:-1], reverse=reverse) + + +# /*********************************************************************** +# // Mrs. Mop +# ************************************************************************/ + +class MrsMop(RelaxedSpider): + + Talon_Class = InitialDealTalonStack + RowStack_Class = Spider_RowStack + + def createGame(self): + RelaxedSpider.createGame(self, rows=13, playcards=24, texts=0) + + def startGame(self): + for i in range(7): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Cicely +# ************************************************************************/ + +class Cicely_Talon(DealRowTalonStack): + def dealCards(self, sound=0): + n = 0 + if sound: + self.game.startDealSample() + for i in range(4): + n += self.dealRow(rows=self.game.s.rows, sound=0) + if sound: + self.game.stopSamples() + return n + + +class Cicely(Game): + + Hint_Class = CautiousDefaultHint + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+10*l.XS, l.YM+max(5*l.YS, 2*l.YS+16*l.YOFFSET) + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM+l.YS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + y += l.YS + x, y = l.XM+9*l.XS, l.YM+l.YS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, base_rank=KING, dir=-1)) + y += l.YS + x, y = l.XM+l.XS, l.YM + for i in range(8): + s.reserves.append(ReserveStack(x, y, self)) + x += l.XS + x, y = l.XM+l.XS, l.YM+l.YS + for i in range(8): + s.rows.append(UD_SS_RowStack(x, y, self)) + x += l.XS + s.talon = Cicely_Talon(l.XM, l.YM, self) + l.setRegion(s.rows, (l.XM+l.XS-l.CW/2, l.YM+l.YS-l.CH/2, + w-l.XS-l.CW/2, 999999)) + + # default + l.defaultAll() + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Trillium +# // Lily +# ************************************************************************/ + +class Trillium(Game): + + Hint_Class = Spider_Hint + RowStack_Class = StackWrapper(AC_RowStack, base_rank=ANY_RANK) + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+13*l.XS, l.YM+l.YS+24*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + for i in range(13): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + + s.talon = DealRowTalonStack(l.XM+6*l.XS, h-l.YS, self) + l.createText(s.talon, "se") + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.s.talon.dealRow(frames=0, flip=0) + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0, flip=0) + self.startDealSample() + self.s.talon.dealRow() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + def isGameWon(self): + for s in self.s.rows: + if s.cards: + if len(s.cards) != 13 or not isAlternateColorSequence(s.cards): + return False + return True + + +class Lily(Trillium): + RowStack_Class = StackWrapper(AC_RowStack, base_rank=KING) + + +# /*********************************************************************** +# // Chelicera +# ************************************************************************/ + +class Chelicera_RowStack(Yukon_SS_RowStack): + def fillStack(self): + if not self.cards: + sound = self.game.app.opt.sound and self.game.app.opt.animations + talon = self.game.s.talon + if sound: + self.game.startDealSample() + for i in range(3): + if talon.cards: + talon.dealToStacks([self], flip=1, frames=4) + if sound: + self.game.stopSamples() + + +class Chelicera(Game): + + Hint_Class = YukonType_Hint + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+8*l.XS, l.YM+l.YS+16*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + s.talon = TalonStack(x, y, self) + l.createText(s.talon, "ss") + x += l.XS + for i in range(7): + s.rows.append(Chelicera_RowStack(x, y, self, base_rank=KING)) + x += l.XS + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + for i in range(3): + self.s.talon.dealRow(rows=self.s.rows[4:]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + def isGameWon(self): + for s in self.s.rows: + if s.cards: + if len(s.cards) != 13 or not isSameSuitSequence(s.cards): + return False + return True + + +# /*********************************************************************** +# // Scorpion Head +# ************************************************************************/ + +class ScorpionHead(Scorpion): + + Layout_Method = Layout.freeCellLayout + + def createGame(self, **layout): + + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=7, reserves=4) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # create stacks + s.talon = InitialDealTalonStack(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(Spider_SS_Foundation(r.x, r.y, self, + suit=ANY_SUIT)) + for r in l.s.rows: + s.rows.append(Scorpion_RowStack(r.x, r.y, self, + base_rank=KING)) + for r in l.s.reserves: + s.reserves.append(ReserveStack(r.x, r.y, self)) + + # default + l.defaultAll() + + def startGame(self): + rows = self.s.rows + for i in (3,3,3,3,7,7): + self.s.talon.dealRow(rows=rows[:i], flip=1, frames=0) + self.s.talon.dealRow(rows=rows[i:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=rows[:3]) + + +# /*********************************************************************** +# // Spider Web +# ************************************************************************/ + +class SpiderWeb(RelaxedSpider): + + def createGame(self): + + # create layout + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+2*l.YS+16*l.YOFFSET) + + # create stacks + x, y = l.XM, l.YM + s.talon = DealRowTalonStack(x, y, self) + l.createText(s.talon, "ss") + x += 2*l.XS + s.reserves.append(ReserveStack(x, y, self)) + x += 2*l.XS + for r in range(4): + s.foundations.append(Spider_SS_Foundation(x, y, self, + suit=ANY_SUIT)) + x += l.XS + x, y = l.XM+l.XS, l.YM+l.YS + for r in range(7): + s.rows.append(Spider_RowStack(x, y, self, + base_rank=ANY_RANK)) + x += l.XS + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.rows[:3]) + + +# /*********************************************************************** +# // Simon Jester +# ************************************************************************/ + +class SimonJester(Spider): + Talon_Class = InitialDealTalonStack + + def createGame(self): + Spider.createGame(self, rows=14, texts=0) + + def startGame(self): + for l in range(1, 14): + self.s.talon.dealRow(rows=self.s.rows[:l], frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[1:]) + +# /*********************************************************************** +# // Applegate +# ************************************************************************/ + +class Applegate(Game): + Hint_Class = YukonType_Hint + + def createGame(self): + + # create layout + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+max(l.YS+16*l.YOFFSET, 4*l.YS)) + + x, y = l.XM, l.YM + s.talon = InitialDealTalonStack(x, y, self) + x += l.XS + for i in range(7): + s.rows.append(Yukon_SS_RowStack(x, y, self, base_rank=KING, mod=13)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(3): + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + y += l.YS + + # default + l.defaultAll() + + def startGame(self): + for i in (6, 6, 0, 0, 0): + self.s.talon.dealRow(rows=self.s.rows[:7-i], frames=0) + if i: + self.s.talon.dealRow(rows=self.s.rows[7-i:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + + def isGameWon(self): + for s in self.s.rows: + if len(s.cards) == 0: + continue + if len(s.cards) != 13 or not isSameSuitSequence(s.cards): + return False + return True + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % stack1.cap.mod == card2.rank or + (card2.rank + 1) % stack1.cap.mod == card1.rank)) + + +# /*********************************************************************** +# // Big Spider +# // Spider 3x3 +# // Ground for a Divorce (3 decks) +# // Spider (4 decks) +# // Ground for a Divorce (4 decks) +# ************************************************************************/ + +class BigSpider(Spider): + def createGame(self): + Spider.createGame(self, rows=13, playcards=28) + def startGame(self): + for l in range(5): + self.s.talon.dealRow(frames=0, flip=0) + self.startDealSample() + self.s.talon.dealRow() + + +class BigSpider1Suit(BigSpider): + pass +class BigSpider2Suits(BigSpider): + pass + + +class Spider3x3(BigSpider): + def startGame(self): + for l in range(4): + self.s.talon.dealRow(frames=0, flip=0) + self.startDealSample() + self.s.talon.dealRow() + + +class GroundForADivorce3Decks(BigSpider): + Talon_Class = GroundForADivorce_Talon + Foundation_Class = StackWrapper(Spider_SS_Foundation, base_rank=ANY_RANK, mod=13) + RowStack_Class = StackWrapper(Spider_RowStack, mod=13) + def canDealCards(self): + return Game.canDealCards(self) + + +class Spider4Decks(BigSpider): + + def createGame(self, rows=13): + + l, s = Layout(self), self.s + w, h = l.XM+(rows+2)*l.XS, l.YM+max(l.YS+24*l.YOFFSET, 9*l.YS) + self.setSize(w, h) + + x, y = l.XM, l.YM + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + l.setRegion(s.rows, (-999, -999, l.XM+rows*l.XS-l.CW/2, 999999)) + x = l.XM+rows*l.XS + for i in range(2): + y = l.YM + for j in range(8): + s.foundations.append(self.Foundation_Class(x, y, self)) + y += l.YS + x += l.XS + + x, y = w-1.5*l.XS, h-l.YS + s.talon = self.Talon_Class(x, y, self) + l.createText(s.talon, 'sw') + + l.defaultStackGroups() + l.defaultRegions() + + +class GroundForADivorce4Decks(Spider4Decks): + Talon_Class = GroundForADivorce_Talon + Foundation_Class = StackWrapper(Spider_SS_Foundation, base_rank=ANY_RANK, mod=13) + RowStack_Class = StackWrapper(Spider_RowStack, mod=13) + def createGame(self): + Spider4Decks.createGame(self, rows=12) + def canDealCards(self): + return Game.canDealCards(self) + + +# /*********************************************************************** +# // York +# ************************************************************************/ + +class York(RelaxedSpider): + + Talon_Class = InitialDealTalonStack + Foundation_Class = StackWrapper(Spider_SS_Foundation, base_rank=ANY_RANK, mod=13) + RowStack_Class = StackWrapper(Spider_RowStack, mod=13) + + def createGame(self): + RelaxedSpider.createGame(self, rows=12, playcards=26, texts=0) + + def startGame(self): + for i in range(8): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[2:-2]) + +class TripleYork(York): + + def createGame(self): + RelaxedSpider.createGame(self, rows=14, playcards=26, texts=0) + + def startGame(self): + for i in range(10): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=[self.s.rows[0],self.s.rows[-1]]) + +# /*********************************************************************** +# // Spidike +# // Fred's Spider +# ************************************************************************/ + +class Spidike(RelaxedSpider): + RowStack_Class = StackWrapper(Spider_SS_RowStack, base_rank=KING) + + def createGame(self, rows=7, playcards=18): + l, s = Layout(self), self.s + self.Layout_Method(l, rows=rows, waste=0, playcards=playcards) + self.setSize(l.size[0], l.size[1]) + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(SS_FoundationStack(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + l.defaultAll() + + def startGame(self): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +class FredsSpider(Spidike): + RowStack_Class = Spider_SS_RowStack + + def createGame(self): + Spidike.createGame(self, rows=10, playcards=23) + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +class FredsSpider3Decks(FredsSpider): + + def createGame(self): + Spidike.createGame(self, rows=13, playcards=26) + + +# register the game +registerGame(GameInfo(10, RelaxedSpider, "Relaxed Spider", + GI.GT_SPIDER | GI.GT_RELAXED, 2, 0)) +registerGame(GameInfo(11, Spider, "Spider", + GI.GT_SPIDER, 2, 0, + altnames=("Tarantula",) )) +registerGame(GameInfo(49, BlackWidow, "Black Widow", + GI.GT_SPIDER, 2, 0, + altnames=("Scarab",) )) +registerGame(GameInfo(14, GroundForADivorce, "Ground for a Divorce", + GI.GT_SPIDER, 2, 0, + altnames=('Scheidungsgrund',) )) +registerGame(GameInfo(114, GrandmothersGame, "Grandmother's Game", + GI.GT_SPIDER, 2, 0)) +registerGame(GameInfo(24, Spiderette, "Spiderette", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(47, BabySpiderette, "Baby Spiderette", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(48, WillOTheWisp, "Will o' the Wisp", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(50, SimpleSimon, "Simple Simon", + GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(194, Rachel, "Rachel", + GI.GT_SPIDER | GI.GT_XORIGINAL, 1, 0)) +registerGame(GameInfo(29, Scorpion, "Scorpion", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(185, Wasp, "Wasp", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(220, RougeEtNoir, "Rouge et Noir", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(269, Spider1Suit, "Spider (1 suit)", + GI.GT_SPIDER, 2, 0, + suits=(0, 0, 0, 0), + rules_filename = "spider.html")) +registerGame(GameInfo(270, Spider2Suits, "Spider (2 suits)", + GI.GT_SPIDER, 2, 0, + suits=(0, 0, 2, 2), + rules_filename = "spider.html")) +registerGame(GameInfo(305, ThreeBlindMice, "Three Blind Mice", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(309, MrsMop, "Mrs. Mop", + GI.GT_SPIDER | GI.GT_OPEN, 2, 0)) +registerGame(GameInfo(341, Cicely, "Cicely", + GI.GT_SPIDER, 2, 0)) +registerGame(GameInfo(342, Trillium, "Trillium", + GI.GT_SPIDER, 2, 0)) +registerGame(GameInfo(343, Lily, "Lily", + GI.GT_SPIDER, 2, 0)) +registerGame(GameInfo(344, Chelicera, "Chelicera", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(345, ScorpionHead, "Scorpion Head", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(346, ScorpionTail, "Scorpion Tail", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(359, SpiderWeb, "Spider Web", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(366, SimonJester, "Simon Jester", + GI.GT_SPIDER | GI.GT_OPEN, 2, 0)) +registerGame(GameInfo(382, Applegate, "Applegate", + GI.GT_SPIDER, 1, 0)) +registerGame(GameInfo(384, BigSpider, "Big Spider", + GI.GT_SPIDER, 3, 0)) +registerGame(GameInfo(401, GroundForADivorce3Decks, + "Ground for a Divorce (3 decks)", + GI.GT_SPIDER, 3, 0)) +registerGame(GameInfo(441, York, "York", + GI.GT_SPIDER | GI.GT_OPEN, 2, 0)) +registerGame(GameInfo(444, TripleYork, "Triple York", + GI.GT_SPIDER | GI.GT_OPEN, 3, 0)) +registerGame(GameInfo(445, BigSpider1Suit, "Big Spider (1 suit)", + GI.GT_SPIDER, 3, 0, + suits=(0, 0, 0, 0), + rules_filename = "bigspider.html")) +registerGame(GameInfo(446, BigSpider2Suits, "Big Spider (2 suits)", + GI.GT_SPIDER, 3, 0, + suits=(0, 0, 2, 2), + rules_filename = "bigspider.html")) +registerGame(GameInfo(449, Spider3x3, "Spider 3x3", + GI.GT_SPIDER, 3, 0, + suits=(0, 1, 2), + rules_filename = "bigspider.html")) +registerGame(GameInfo(454, Spider4Decks, "Spider (4 decks)", + GI.GT_SPIDER, 4, 0)) +registerGame(GameInfo(455, GroundForADivorce4Decks, + "Ground for a Divorce (4 decks)", + GI.GT_SPIDER, 4, 0)) +registerGame(GameInfo(458, Spidike, "Spidike", + GI.GT_SPIDER, 1, 0)) # GT_GYPSY ? +registerGame(GameInfo(459, FredsSpider, "Fred's Spider", + GI.GT_SPIDER, 2, 0)) +registerGame(GameInfo(460, FredsSpider3Decks, "Fred's Spider (3 decks)", + GI.GT_SPIDER, 3, 0)) +registerGame(GameInfo(461, OpenSpider, "Open Spider", + GI.GT_SPIDER, 2, 0)) + diff --git a/pysollib/games/sthelena.py b/pysollib/games/sthelena.py new file mode 100644 index 00000000..a1030513 --- /dev/null +++ b/pysollib/games/sthelena.py @@ -0,0 +1,176 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys, types + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class StHelena_Talon(TalonStack): + + def canDealCards(self): + if self.round == self.max_rounds: + return False + return not self.game.isGameWon() + + def dealCards(self, sound=0): + # move all cards to the Talon and redeal + lr = len(self.game.s.rows) + num_cards = 0 + assert len(self.cards) == 0 + for r in self.game.s.rows[::-1]: + for i in range(len(r.cards)): + num_cards = num_cards + 1 + self.game.moveMove(1, r, self, frames=0) + assert len(self.cards) == num_cards + if num_cards == 0: # game already finished + return 0 + # redeal + self.cards.reverse() + self.game.nextRoundMove(self) + self.game.startDealSample() + for i in range(lr): + k = min(lr, len(self.cards)) + for j in range(k): + self.game.moveMove(1, self, self.game.s.rows[j], frames=4) + # done + self.game.stopSamples() + assert len(self.cards) == 0 + return num_cards + + +class StHelena_FoundationStack(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return False + if self.game.s.talon.round == 1: + if (self.cap.base_rank == KING and + from_stack in self.game.s.rows[6:10:]): + return False + if (self.cap.base_rank == ACE and + from_stack in self.game.s.rows[:4]): + return False + return True + + +class StHelena(Game): + + Hint_Class = CautiousDefaultHint + Talon_Class = StackWrapper(StHelena_Talon, max_rounds=3) + Foundation_Class = StHelena_FoundationStack + RowStack_Class = StackWrapper(UD_RK_RowStack, base_rank=NO_RANK) + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = 3*l.XM+6*l.XS, 3*l.YM+4*l.YS + self.setSize(w, h) + + # create stacks + lay = ( + (2, 1, 1, 0), + (2, 2, 1, 0), + (2, 3, 1, 0), + (2, 4, 1, 0), + (3, 5, 2, 1), + (3, 5, 2, 2), + (2, 4, 3, 3), + (2, 3, 3, 3), + (2, 2, 3, 3), + (2, 1, 3, 3), + (1, 0, 2, 2), + (1, 0, 2, 1), + ) + for xm, xs, ym, ys in lay: + x, y = xm*l.XM+xs*l.XS, ym*l.YM+ys*l.YS + stack = self.RowStack_Class(x, y, self, max_move=1, max_accept=1) + stack.CARD_XOFFSET = stack.CARD_YOFFSET = 0 + s.rows.append(stack) + x, y = 2*l.XM+l.XS, 2*l.YM+l.YS + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i, + base_rank=KING, dir=-1)) + x = x + l.XS + x, y = 2*l.XM+l.XS, 2*l.YM+2*l.YS + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) + x = x + l.XS + + s.talon = self.Talon_Class(l.XM, l.YM, self) + + # default + l.defaultAll() + + # + # game overrides + # + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToBottom(cards, lambda c: (c.deck == 0 and c.rank in (0, 12), (-c.rank, c.suit)), 8) + + def startGame(self): + for i in range(7): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(self.s.foundations) + + +# /*********************************************************************** +# // Box Kite +# ************************************************************************/ + +class BoxKite(StHelena): + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = StackWrapper(UD_RK_RowStack, base_rank=NO_RANK, mod=13) + + +# register the game +registerGame(GameInfo(302, StHelena, "St. Helena", + GI.GT_2DECK_TYPE, 2, 2, + altnames=("Napoleon's Favorite", + "Washington's Favorite") + )) +registerGame(GameInfo(408, BoxKite, "Box Kite", + GI.GT_2DECK_TYPE, 2, 0)) + diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py new file mode 100644 index 00000000..1d44bf30 --- /dev/null +++ b/pysollib/games/sultan.py @@ -0,0 +1,656 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // Sultan +# ************************************************************************/ + +class Sultan(Game): + + # + # game layout + # + + def createGame(self, reserves=6): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = 3*l.XM+5*l.XS, 3*l.YM+4*l.YS + self.setSize(w, h) + + # create stacks + lay = ((0,0,0,1), + (2,0,0,1), + (0,1,1,1), + (2,1,1,1), + (1,1,2,0), + (1,2,2,1), + (0,2,3,1), + (2,2,3,1), + (1,0,2,1), + ) + for i, j, suit, max_accept in lay: + x, y = 2*l.XM+l.XS+i*l.XS, l.YM+j*l.YS + stack = SS_FoundationStack(x, y, self, suit=suit, + max_move=0, max_accept=max_accept, mod=13) + s.foundations.append(stack) + + x, y = l.XM, l.YM + for i in range(reserves/2): + s.rows.append(ReserveStack(x, y, self)) + y += l.YS + + x, y = 3*l.XM+4*l.XS, l.YM + for i in range(reserves/2): + s.rows.append(ReserveStack(x, y, self)) + y += l.YS + + x, y = 2*l.XM+1.5*l.XS, l.YM+3*l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, "s") + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "s") + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + cards = self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE and c.suit == 2 and c.deck == 0, c.suit)) + cards = self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == KING, c.suit)) + return cards + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def getAutoStacks(self, event=None): + return (self.sg.dropstacks, (), self.sg.dropstacks) + + +class SultanPlus(Sultan): + def createGame(self): + Sultan.createGame(self, reserves=8) + + +# /*********************************************************************** +# // Boudoir +# ************************************************************************/ + +class Boudoir(Game): + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+5*l.XS, l.YM+4*l.YS) + + x, y = l.XM+l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, max_cards=13)) + x += l.XS + + x, y = l.XM, l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + s.talon.texts.rounds = MfxCanvasText(self.canvas, + x + l.CW / 2, y - l.YM, + anchor="s", + font=self.app.getFont("canvas_default")) + l.createText(s.talon, "s") + x += l.XS + y += l.YM + for i in range(4): + s.rows.append(AbstractFoundationStack(x, y, self, suit=i, + max_cards=1, max_move=0, base_rank=QUEEN)) + x += l.XS + + x, y = l.XM, 2*l.YM+2*l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "s") + x += l.XS + y -= l.YM + for i in range(4): + s.rows.append(AbstractFoundationStack(x, y, self, suit=i, + max_cards=1, max_move=0, base_rank=JACK)) + x += l.XS + + x, y = l.XM+l.XS, l.YM+3*l.YS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + mod=13, max_cards=11, base_rank=9, dir=-1)) + x += l.XS + + l.defaultStackGroups() + + def _shuffleHook(self, cards): + # move 4 Queens to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == QUEEN and c.deck == 0, c.suit)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:4]) + self.s.talon.dealCards() # deal first card to WasteStack + + def isGameWon(self): + return (len(self.s.talon.cards) + len(self.s.waste.cards)) == 0 + + +# /*********************************************************************** +# // Captive Queens +# ************************************************************************/ + +class CaptiveQueens(Game): + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+5*l.XS, l.YM+3*l.YS) + + x, y = l.XM, 4*l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + s.talon.texts.rounds = MfxCanvasText(self.canvas, + x + l.CW / 2, y - l.YM, + anchor="s", + font=self.app.getFont("canvas_default")) + l.createText(s.talon, "s") + y += 2*l.YM+l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "s") + + x, y = l.XM+l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + mod=13, max_cards=6, base_rank=4, dir=-1)) + x += l.XS + + x, y = l.XM+l.XS, l.YM+l.YS + for i in range(4): + s.rows.append(AbstractFoundationStack(x, y, self, suit=i, + max_cards=1, max_move=0, base_rank=QUEEN)) + x += l.XS + + x, y = l.XM+l.XS, l.YM+2*l.YS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + mod=13, max_cards=6, base_rank=5)) + x += l.XS + + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealCards() # deal first card to WasteStack + + def isGameWon(self): + return (len(self.s.talon.cards) + len(self.s.waste.cards)) == 0 + + +# /*********************************************************************** +# // Contradance +# ************************************************************************/ + +class Contradance(Game): + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+4*l.YS) + + x, y = l.XM, l.YM + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i/2, + base_rank=4, dir=-1, mod=13, max_cards=6)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i/2, + base_rank=5, max_cards=7)) + x += l.XS + + x, y = l.XM+3*l.XS, l.YM+3*l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=2) + l.createText(s.talon, 'nn') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'nn') + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + # move 5's and 6's to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (4, 5), (c.rank, c.suit))) + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Idle Aces +# ************************************************************************/ + +class IdleAces_AceFoundation(AbstractFoundationStack): + + def getBottomImage(self): + return self.game.app.images.getLetter(ACE) + + +class IdleAces(Game): + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+4*l.YS) + + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, 'ss') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'ss') + x0, y0 = l.XM+l.XS, l.YM + k = 0 + for i, j in((2, 0), (0, 1.5), (4, 1.5), (2, 3)): + x, y = x0+i*l.XS, y0+j*l.YS + s.foundations.append(RK_FoundationStack(x, y, self, + ##suit=ANY_SUIT, + base_rank=KING, dir=-1, max_move=0)) + k += 1 + k = 0 + for i, j in((2, 1), (1, 1.5), (3, 1.5), (2, 2)): + x, y = x0+i*l.XS, y0+j*l.YS + s.foundations.append(RK_FoundationStack(x, y, self, + ##suit=ANY_SUIT, + base_rank=1, max_move=0)) + k += 1 + k = 0 + for i, j in((1, 0.2), (3, 0.2), (1, 2.8), (3, 2.8)): + x, y = x0+i*l.XS, y0+j*l.YS + s.foundations.append(IdleAces_AceFoundation(x, y, self, + suit=k, max_cards=1, max_move=0)) + k += 1 + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (1, KING) and c.deck == 0, (-c.rank, c.suit))) + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations[:8]) + self.s.talon.dealCards() + + +# /*********************************************************************** +# // Lady of the Manor +# ************************************************************************/ + +class LadyOfTheManor_RowStack(BasicRowStack): + clickHandler = BasicRowStack.doubleclickHandler + + +class LadyOfTheManor_Reserve(OpenStack): + clickHandler = OpenStack.doubleclickHandler + + +class LadyOfTheManor(Game): + Foundation_Class_1 = RK_FoundationStack + Foundation_Class_2 = RK_FoundationStack + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+max(4*l.YS, 3*l.YS+14*l.YOFFSET)) + + x, y = l.XM, self.height-l.YS + for i in range(4): + suit = i + if self.Foundation_Class_1 is RK_FoundationStack: suit = ANY_SUIT + s.foundations.append(self.Foundation_Class_1(x, y, self, suit=suit)) + x += l.XS + for i in range(4): + suit = i + if self.Foundation_Class_1 is RK_FoundationStack: suit = ANY_SUIT + s.foundations.append(self.Foundation_Class_2(x, y, self, suit=suit)) + x += l.XS + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(4): + s.rows.append(LadyOfTheManor_RowStack(x, y, self, max_accept=0)) + x += l.XS + for i, j in ((0,2), (0,1), (0,0), + (1,0), (2,0), (3,0), (4,0), (5,0), (6,0), + (7,0), (7,1), (7,2),): + x, y = l.XM+i*l.XS, l.YM+j*l.YS + s.reserves.append(LadyOfTheManor_Reserve(x, y, self, max_accept=0)) + + s.talon = InitialDealTalonStack(self.width-l.XS, self.height-2*l.YS, self) + + l.defaultAll() + + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, c.suit)) + + + def startGame(self, flip=False): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(11): + self.s.talon.dealRow(frames=0, flip=flip) + self.s.talon.dealRow(frames=0) + self.startDealSample() + while self.s.talon.cards: + self.flipMove(self.s.talon) + c = self.s.talon.cards[-1] + r = self.s.reserves[c.rank-1] + self.moveMove(1, self.s.talon, r, frames=4) + + +# /*********************************************************************** +# // Matrimony +# ************************************************************************/ + +class Matrimony(Game): + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+4*l.YS) + + s.talon = DealRowTalonStack(l.XM, l.YM, self) + l.createText(s.talon, 'ss') + x, y = l.XM+2*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=JACK, dir=-1, mod=13)) + x += l.XS + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=QUEEN, dir=1, mod=13)) + x += l.XS + y = l.YM+2*l.YS + for i in range(2): + x = l.XM + for j in range(8): + stack = LadyOfTheManor_RowStack(x, y, self, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + s.rows.append(stack) + x += l.XS + y += l.YS + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (JACK, QUEEN) and c.deck == 0 and c.suit == 3, + (c.rank, c.suit))) + + + def startGame(self): + self.s.talon.dealRow(rows=[self.s.foundations[3], + self.s.foundations[7]], frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Patriarchs +# ************************************************************************/ + +class Patriarchs(Game): + + def createGame(self, max_rounds=2): + + l, s = Layout(self), self.s + self.setSize(3*l.XM+5*l.XS, l.YM+4*l.YS) + + x, y = l.XM, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + y += l.YS + x, y = 3*l.XM+4*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=KING, dir=-1)) + y += l.YS + y = l.YM + for i in range(3): + x = 2*l.XM+l.XS + for j in range(3): + s.rows.append(BasicRowStack(x, y, self, + max_cards=1, max_accept=1)) + x += l.XS + y += l.YS + x, y = 2*l.XM+l.XS+l.XS/2, l.YM+3*l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds) + l.createText(s.talon, 'sw') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'se') + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, KING) and c.deck == 0, + (c.rank, c.suit))) + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + if not self.s.waste.cards: + self.s.talon.dealCards() + if self.s.waste.cards: + self.s.waste.moveMove(1, stack) + + +# /*********************************************************************** +# // Simplicity +# ************************************************************************/ + +class Simplicity(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self, max_rounds=2): + + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+4*l.YS) + + self.base_card = None + + i = 0 + for x, y in ((l.XM, l.YM), + (l.XM+7*l.XS, l.YM), + (l.XM, l.YM+3*l.YS), + (l.XM+7*l.XS, l.YM+3*l.YS), + ): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, mod=13)) + i += 1 + y = l.YM+l.YS + for i in range(2): + x = l.XM+l.XS + for j in range(6): + stack = AC_RowStack(x, y, self, max_move=1, mod=13) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + s.rows.append(stack) + x += l.XS + y += l.YS + x, y = l.XM+3*l.XS, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 'sw') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'se') + + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + # deal base_card to Foundations, update foundations cap.base_rank + self.base_card = self.s.talon.getCard() + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, self.s.foundations[self.base_card.suit]) + self.s.talon.dealRow() + self.s.talon.dealCards() + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + ((card1.rank + 1) % 13 == card2.rank or + (card2.rank + 1) % 13 == card1.rank)) + + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + +# /*********************************************************************** +# // Sixes and Sevens +# ************************************************************************/ + +class SixesAndSevens(Game): + def createGame(self, max_rounds=2): + + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+4*l.YS) + + y = l.YM + for i in range(2): + x = l.XM + for j in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=j, base_rank=6)) + x += l.XS + y += l.YS + for i in range(2): + x = l.XM + for j in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=j, + base_rank=5, dir=-1)) + x += l.XS + y += l.YS + y = l.YM + for i in range(3): + x = l.XM+5*l.XS + for j in range(3): + s.rows.append(ReserveStack(x, y, self)) + x += l.XS + y += l.YS + x, y = l.XM+5*l.XS, l.YM+3*l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 'sw') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'se') + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (5, 6), (-c.rank, c.deck, c.suit))) + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + +# register the game +registerGame(GameInfo(330, Sultan, "Sultan", + GI.GT_2DECK_TYPE, 2, 2, + altnames=("Sultan of Turkey",) )) +registerGame(GameInfo(331, SultanPlus, "Sultan +", + GI.GT_2DECK_TYPE, 2, 2)) +registerGame(GameInfo(354, Boudoir, "Boudoir", + GI.GT_2DECK_TYPE, 2, 2)) +registerGame(GameInfo(410, CaptiveQueens, "Captive Queens", + GI.GT_1DECK_TYPE, 1, 2)) +registerGame(GameInfo(418, Contradance, "Contradance", + GI.GT_2DECK_TYPE, 2, 1)) +registerGame(GameInfo(419, IdleAces, "Idle Aces", + GI.GT_2DECK_TYPE, 2, 2)) +registerGame(GameInfo(423, LadyOfTheManor, "Lady of the Manor", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(424, Matrimony, "Matrimony", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(429, Patriarchs, "Patriarchs", + GI.GT_2DECK_TYPE, 2, 1)) +registerGame(GameInfo(437, Simplicity, "Simplicity", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(438, SixesAndSevens, "Sixes and Sevens", + GI.GT_2DECK_TYPE, 2, 0)) diff --git a/pysollib/games/takeaway.py b/pysollib/games/takeaway.py new file mode 100644 index 00000000..e425c406 --- /dev/null +++ b/pysollib/games/takeaway.py @@ -0,0 +1,114 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Take Away +# ************************************************************************/ + +class TakeAway_Foundation(AbstractFoundationStack): + + def acceptsCards(self, from_stack, cards): + if not self.cards: + return True + c1, c2, mod = self.cards[-1], cards[0], self.cap.mod + return (c1.rank == (c2.rank + 1) % mod or + c2.rank == (c1.rank + 1) % mod) + +class TakeAway(Game): + + RowStack_Class = BasicRowStack + Foundation_Class = StackWrapper(TakeAway_Foundation, max_move=0, mod=13) + + # + # game layout + # + + def createGame(self, reserves=6): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = 2*l.XM+10*l.XS, l.YM+l.YS+16*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + for i in range(4): + s.rows.append(self.RowStack_Class(x, y, self, + max_move=1, max_accept=0)) + x += l.XS + x += l.XM + for i in range(6): + stack = self.Foundation_Class(x, y, self, suit=ANY_SUIT, + base_rank=ANY_RANK) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.foundations.append(stack) + x += l.XS + s.talon = InitialDealTalonStack(w-l.XS, h-l.YS, self) + + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(10): + self.s.talon.dealRow(frames=0) + self.startDealSample() + for i in range(3): + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Four Stacks +# ************************************************************************/ + +class FourStacks(TakeAway): + RowStack_Class = StackWrapper(AC_RowStack, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS) + Foundation_Class = StackWrapper(AC_FoundationStack, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS, dir=-1) + + +# register the game +registerGame(GameInfo(334, TakeAway, "Take Away", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(335, FourStacks, "Four Stacks", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + + + + + diff --git a/pysollib/games/terrace.py b/pysollib/games/terrace.py new file mode 100644 index 00000000..11ce931c --- /dev/null +++ b/pysollib/games/terrace.py @@ -0,0 +1,279 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Terrace_Talon(WasteTalonStack): + def canDealCards(self): + if self.game.getState() == 0: + return 0 + return WasteTalonStack.canDealCards(self) + + +class Terrace_AC_Foundation(AC_FoundationStack): + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, mod=13, min_cards=1, max_move=0) + apply(AC_FoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + if self.game.getState() == 0: + if len(cards) != 1 or not cards[0].face_up: + return 0 + if cards[0].suit != self.cap.base_suit: + return 0 + return from_stack in self.game.s.rows + return AC_FoundationStack.acceptsCards(self, from_stack, cards) + + +class Terrace_SS_Foundation(SS_FoundationStack): + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, mod=13, min_cards=1, max_move=0) + apply(SS_FoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + if self.game.getState() == 0: + if len(cards) != 1 or not cards[0].face_up: + return 0 + if cards[0].suit != self.cap.base_suit: + return 0 + return from_stack in self.game.s.rows + return SS_FoundationStack.acceptsCards(self, from_stack, cards) + + +class Terrace_RowStack(AC_RowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, mod=13, max_move=1) + apply(AC_RowStack.__init__, (self, x, y, game), cap) + + def acceptsCards(self, from_stack, cards): + if self.game.getState() == 0: + return 0 + if from_stack in self.game.s.reserves: + return 0 + return AC_RowStack.acceptsCards(self, from_stack, cards) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + state = self.game.getState() + if state > 0: + AC_RowStack.moveMove(self, ncards, to_stack, frames=frames, shadow=shadow) + return + assert to_stack in self.game.s.foundations + assert ncards == 1 + assert not self.game.s.waste.cards + self.game.moveMove(ncards, self, to_stack, frames=frames, shadow=shadow) + for s in self.game.s.foundations: + s.cap.base_rank = to_stack.cards[0].rank + freerows = filter(lambda s: not s.cards, self.game.s.rows) + self.game.s.talon.dealRow(rows=freerows, sound=1) + self.game.s.talon.dealCards() # deal first card to WasteStack + + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +# /*********************************************************************** +# // Terrace +# ************************************************************************/ + +class Terrace(Game): + Foundation_Class = Terrace_AC_Foundation + RowStack_Class = Terrace_RowStack + ReserveStack_Class = OpenStack + Hint_Class = CautiousDefaultHint + + INITIAL_RESERVE_CARDS = 11 + + # + # game layout + # + + def createGame(self, rows=9, max_rounds=1, num_deal=1): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 20 cards are playable in default window size) + maxrows = max(rows, 9) + w1, w2 = (maxrows - 8)*l.XS/2, (maxrows - rows)*l.XS/2 + h = max(3*l.YS, 20*l.YOFFSET) + self.setSize(l.XM + maxrows*l.XS + l.XM, l.YM + 2*l.YS + h) + + # extra settings + self.base_card = None + + # create stacks + x, y = l.XM + w1, l.YM + s.talon = Terrace_Talon(x, y, self, max_rounds=max_rounds, num_deal=num_deal) + l.createText(s.talon, "sw") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "se", text_format="%D") + x = x + 2*l.XS + stack = self.ReserveStack_Class(x, y, self) + stack.CARD_XOFFSET = l.XOFFSET + l.createText(stack, "sw") + s.reserves.append(stack) + x, y = l.XM + w1, y + l.YS + for i in range(8): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i/2)) + x = x + l.XS + x, y = l.XM + w2, y + l.YS + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self)) + x = x + l.XS + + # define stack-groups + l.defaultStackGroups() + + # + # game extras + # + + def getState(self): + for s in self.s.foundations: + if s.cards: + return 1 + return 0 + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + for i in range(self.INITIAL_RESERVE_CARDS): + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow(rows=self.s.rows[:4]) + + def fillStack(self, stack): + if not stack.cards: + old_state = self.enterState(self.S_FILL) + if stack is self.s.waste and self.s.talon.cards: + self.s.talon.dealCards() + elif stack in self.s.rows and self.s.waste.cards: + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + def _restoreGameHook(self, game): + for s in self.s.foundations: + s.cap.base_rank = game.loadinfo.base_rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_rank=p.load()) + + def _saveGameHook(self, p): + base_rank = NO_RANK + for s in self.s.foundations: + if s.cards: + base_rank = s.cards[0].rank + break + p.dump(base_rank) + + +# /*********************************************************************** +# // Queen of Italy +# ************************************************************************/ + +class QueenOfItaly(Terrace): + Foundation_Class = StackWrapper(Terrace_AC_Foundation, max_move=1) + def fillStack(self, stack): + pass + + +# /*********************************************************************** +# // General's Patience +# ************************************************************************/ + +class GeneralsPatience(Terrace): + Foundation_Class = Terrace_SS_Foundation + INITIAL_RESERVE_CARDS = 13 + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class BlondesAndBrunettes(Terrace): + INITIAL_RESERVE_CARDS = 10 + + def startGame(self): + self.startDealSample() + for i in range(self.INITIAL_RESERVE_CARDS): + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow() + # deal base_card to Foundations + c = self.s.talon.getCard() + for s in self.s.foundations: + s.cap.base_rank = c.rank + self.s.talon.dealRow(rows=(self.s.foundations[2*c.suit],)) + self.s.talon.dealCards() # deal first card to WasteStack + + def getState(self): + return 1 + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class FallingStar(BlondesAndBrunettes): + INITIAL_RESERVE_CARDS = 11 + + +# register the game +registerGame(GameInfo(135, Terrace, "Terrace", + GI.GT_TERRACE, 2, 0)) +registerGame(GameInfo(136, GeneralsPatience, "General's Patience", + GI.GT_TERRACE, 2, 0)) +registerGame(GameInfo(137, BlondesAndBrunettes, "Blondes and Brunettes", + GI.GT_TERRACE, 2, 0)) +registerGame(GameInfo(138, FallingStar, "Falling Star", + GI.GT_TERRACE, 2, 0)) +registerGame(GameInfo(431, QueenOfItaly, "Queen of Italy", + GI.GT_TERRACE, 2, 0)) + diff --git a/pysollib/games/tournament.py b/pysollib/games/tournament.py new file mode 100644 index 00000000..fd6ee107 --- /dev/null +++ b/pysollib/games/tournament.py @@ -0,0 +1,248 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +# /*********************************************************************** +# // +# ************************************************************************/ + + +class Tournament_Talon(TalonStack): + + def canDealCards(self): + if self.round == self.max_rounds and not self.cards: + return False + return not self.game.isGameWon() + + def dealCards(self, sound=0): + if len(self.cards) == 0: + self._redeal() + self.game.startDealSample() + n = 0 + for r in self.game.s.rows: + for i in range(4): + if not self.cards: + break + n += self.dealRow([r]) + self.game.stopSamples() + return n + + def _redeal(self): + # move all cards to the Talon + lr = len(self.game.s.rows) + num_cards = 0 + assert len(self.cards) == 0 + for r in self.game.s.rows[::-1]: + for i in range(len(r.cards)): + num_cards = num_cards + 1 + self.game.moveMove(1, r, self, frames=0) + self.game.flipMove(self) + assert len(self.cards) == num_cards + if num_cards == 0: # game already finished + return + self.game.nextRoundMove(self) + return + + +class Tournament(Game): + + ROW_YOFFSET = True + + # + # game layout + # + + def createGame(self, **layout): + + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+10*l.XS, max(l.YM+l.YS+20*l.YOFFSET, 5*l.YM+5*l.YS)) + + # create stacks + x, y, = l.XM+l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x = x + l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=KING, dir=-1)) + x = x + l.XS + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(6): + stack = BasicRowStack(x, y, self, max_move=1, max_accept=0) + s.rows.append(stack) + if not self.ROW_YOFFSET: + stack.CARD_YOFFSET = 0 + x = x + l.XS + + x, y = l.XM, 4*l.YM+l.YS + for i in range(4): + self.s.reserves.append(ReserveStack(x, y, self)) + y += l.YS + x, y = l.XM+9*l.XS, 4*l.YM+l.YS + for i in range(4): + self.s.reserves.append(ReserveStack(x, y, self)) + y += l.YS + + s.talon = Tournament_Talon(l.XM, l.YM, self, max_rounds=3) + ##l.createText(s.talon, "ss") + tx, ty, ta, tf = l.getTextAttr(s.talon, "ss") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, anchor=ta, + font=self.app.getFont("canvas_default")) + + # default + l.defaultAll() + + # + # game overrides + # + def _shuffleHook(self, cards): + for c in cards[-8:]: + if c.rank in (ACE, KING): + return cards + # + for c in cards: + if c.rank in (ACE, KING): + break + cards.remove(c) + return cards+[c] + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(self.s.reserves) + for r in self.s.rows: + for i in range(4): + self.s.talon.dealRow([r]) + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + if not self.demo: + self.startDealSample() + for i in range(4): + if not self.s.talon.cards: + break + self.s.talon.dealRow([stack]) + if not self.demo: + self.stopSamples() + + +class LaNivernaise(Tournament): + ROW_YOFFSET = False + +# /*********************************************************************** +# // Kingsdown Eights +# ************************************************************************/ + +class KingsdownEights_Talon(DealRowTalonStack): + def dealCards(self, sound=0): + if len(self.cards) == 0: + self._redeal() + self.game.startDealSample() + n = 0 + for r in self.game.s.reserves: + for i in range(4): + if not self.cards: + break + n += self.dealRow([r]) + self.game.stopSamples() + return n + +class KingsdownEights_Row(AC_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + +class KingsdownEights(Game): + + Hint_Class = CautiousDefaultHint + + def createGame(self, **layout): + + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+10*l.XS, max(l.YM+2*l.YS+12*l.YOFFSET, + l.YM+5*l.YS)) + + # create stacks + x = l.XM + for i in range(2): + y = l.YM+l.YS + for j in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=j)) + y += l.YS + x += l.XS + x, y = l.XM+2*l.XS, l.YM + for i in range(8): + stack = KingsdownEights_Row(x, y, self, max_move=1) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + s.rows.append(stack) + x += l.XS + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(8): + stack = OpenStack(x, y, self, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.reserves.append(stack) + x += l.XS + s.talon = KingsdownEights_Talon(l.XM, l.YM, self, max_rounds=1) + l.createText(s.talon, "se") + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + +# register the game +registerGame(GameInfo(303, Tournament, "Tournament", + GI.GT_2DECK_TYPE, 2, 2)) +registerGame(GameInfo(304, LaNivernaise, "La Nivernaise", + GI.GT_2DECK_TYPE, 2, 2, + altnames = ("Napoleon's Flank", ), + rules_filename = "tournament.html")) +registerGame(GameInfo(386, KingsdownEights, "Kingsdown Eights", + GI.GT_2DECK_TYPE, 2, 0)) + + + + diff --git a/pysollib/games/ultra/__init__.py b/pysollib/games/ultra/__init__.py new file mode 100644 index 00000000..a1e0b46b --- /dev/null +++ b/pysollib/games/ultra/__init__.py @@ -0,0 +1,9 @@ +import dashavatara +import hanafuda +import hanafuda1 +import hexadeck +import larasgame +import matrix +import mughal +import tarock +import threepeaks diff --git a/pysollib/games/ultra/dashavatara.py b/pysollib/games/ultra/dashavatara.py new file mode 100644 index 00000000..98a7eeec --- /dev/null +++ b/pysollib/games/ultra/dashavatara.py @@ -0,0 +1,1294 @@ +## +##---------------------------------------------------------------------------## +## +## Ultrasol -- a Python Solitaire game +## +## Copyright (C) 2000 by T. Kirk +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys, math, time + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# * Dashavatara Foundation Stacks +# ***********************************************************************/ + +class Dashavatara_FoundationStack(AbstractFoundationStack): + + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, max_move=0, max_cards=12) + apply(SS_FoundationStack.__init__, (self, x, y, game, suit), cap) + + def updateText(self): + AbstractFoundationStack.updateText(self) + self.game.updateText() + + +class Journey_Foundation(AbstractFoundationStack): + + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, mod=12, dir=0, base_rank=NO_RANK, max_move=0) + apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if not self.cards: + return 1 + stack_dir = self.game.getFoundationDir() + if stack_dir == 0: + card_dir = (cards[0].rank - self.cards[-1].rank) % self.cap.mod + return card_dir in (1, 11) + else: + return (self.cards[-1].rank + stack_dir) % self.cap.mod == cards[0].rank + + + +class AppachansWaterfall_Foundation(AbstractFoundationStack): + + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, base_suit=0, mod=12, max_cards=120, max_move=0) + apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + if not (from_stack in self.game.s.rows and + AbstractFoundationStack.acceptsCards(self, from_stack, cards)): + return 0 + pile, rank, suit = from_stack.getPile(), 0, 0 + if self.cards: + rank = (self.cards[-1].rank + 1) % 12 + suit = self.cards[-1].suit + (rank == 0) + if (not pile or len(pile) <= 11 - rank + or not isSameSuitSequence(pile[-(12 - rank):])): + return 0 + return cards[0].suit == suit and cards[0].rank == rank + + + +# /*********************************************************************** +# * Dashavatara Row Stacks +# ***********************************************************************/ + +class Dashavatara_OpenStack(OpenStack): + + def __init__(self, x, y, game, yoffset, **cap): + kwdefault(cap, max_move=UNLIMITED_MOVES, max_cards=UNLIMITED_CARDS, + max_accept=UNLIMITED_ACCEPTS, base_rank=0, dir=-1) + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = yoffset + + def currentForce(self, card): + hour = time.localtime(time.time())[3] + if hour >= 7 and hour <= 19: + strong, weak = 0, 1 + else: + strong, weak = 1, 0 + if card.suit <= 4: + return strong + else: + return weak + + def isRankSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not c1.rank + dir == c2.rank: + return 0 + c1 = c2 + return 1 + + def isAlternateColorSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not ((c1.suit + c2.suit) % 2 + and c1.rank + dir == c2.rank): + return 0 + c1 = c2 + return 1 + + def isAlternateForceSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not ((c1.suit < 4 and c2.suit > 3 + or c1.suit > 3 and c2.suit < 4) + and c1.rank + dir == c2.rank): + return 0 + c1 = c2 + return 1 + + def isSuitSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not (c1.suit == c2.suit + and c1.rank + dir == c2.rank): + return 0 + c1 = c2 + return 1 + + +class Dashavatara_AC_RowStack(Dashavatara_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isAlternateColorSequence(cards)): + return 0 + stackcards = self.cards + if not len(stackcards): + return cards[0].rank == 11 or self.cap.base_rank == ANY_RANK + return self.isAlternateColorSequence([stackcards[-1], cards[0]]) + + +class Dashavatara_AF_RowStack(Dashavatara_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isAlternateForceSequence(cards)): + return 0 + stackcards = self.cards + if not len(stackcards): + return cards[0].rank == 11 or self.cap.base_rank == ANY_RANK + return self.isAlternateForceSequence([stackcards[-1], cards[0]]) + + +class Dashavatara_RK_RowStack(Dashavatara_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isRankSequence(cards)): + return 0 + stackcards = self.cards + if not len(stackcards): + return cards[0].rank == 11 or self.cap.base_rank == ANY_RANK + return self.isRankSequence([stackcards[-1], cards[0]]) + + +class Dashavatara_SS_RowStack(Dashavatara_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isSuitSequence(cards)): + return 0 + stackcards = self.cards + if not len(stackcards): + return cards[0].rank == 11 or self.cap.base_rank == ANY_RANK + return self.isSuitSequence([stackcards[-1], cards[0]]) + + +class Circles_RowStack(SS_RowStack): + + def __init__(self, x, y, game, base_rank): + SS_RowStack.__init__(self, x, y, game, base_rank=base_rank, + max_accept=1, max_move=1) + self.CARD_YOFFSET = 1 + + +class Journey_BraidStack(OpenStack): + + def __init__(self, x, y, game, xoffset, yoffset): + OpenStack.__init__(self, x, y, game) + CW = self.game.app.images.CARDW + self.CARD_YOFFSET = int(self.game.app.images.CARD_YOFFSET * yoffset) + # use a sine wave for the x offsets + self.CARD_XOFFSET = [] + j = 1 + for i in range(30): + self.CARD_XOFFSET.append(int(math.sin(j) * xoffset)) + j = j + .9 + + +class Journey_StrongStack(ReserveStack): + + def fillStack(self): + if not self.cards: + if self.game.s.braidstrong.cards: + self.game.moveMove(1, self.game.s.braidstrong, self) + elif self.game.s.braidweak.cards: + self.game.moveMove(1, self.game.s.braidweak, self) + + def getBottomImage(self): + return self.game.app.images.getBraidBottom() + + +class Journey_WeakStack(ReserveStack): + + def fillStack(self): + if not self.cards: + if self.game.s.braidweak.cards: + self.game.moveMove(1, self.game.s.braidweak, self) + elif self.game.s.braidstrong.cards: + self.game.moveMove(1, self.game.s.braidstrong, self) + + def getBottomImage(self): + return self.game.app.images.getBraidBottom() + + +class Journey_ReserveStack(ReserveStack): + + def acceptsCards(self, from_stack, cards): + if (from_stack is self.game.s.braidstrong or + from_stack is self.game.s.braidweak or + from_stack in self.game.s.rows): + return 0 + return ReserveStack.acceptsCards(self, from_stack, cards) + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + +class AppachansWaterfall_RowStack(RK_RowStack): + + def canDropCards(self, stacks): + game, pile, stack, rank = self.game, self.getPile(), stacks[0], 0 + if stack.cards: + rank = (stack.cards[-1].rank + 1) % 12 + if (not pile or len(pile) <= 11 - rank + or not isSameSuitSequence(pile[-(12 - rank):]) + or not stack.acceptsCards(self, pile[-1:])): + return (None, 0) + return (stack, 1) + + + +# /*********************************************************************** +# // Dashavatara Game Stacks +# ************************************************************************/ + +class Dashavatara_TableauStack(Dashavatara_OpenStack): + + def __init__(self, x, y, game, base_rank, yoffset, **cap): + kwdefault(cap, dir=3, max_move=99, max_cards=4, max_accept=1, base_rank=base_rank) + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = yoffset + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + # check that the base card is correct + if self.cards and self.cards[0].rank != self.cap.base_rank: + return 0 + if not self.cards: + return cards[0].rank == self.cap.base_rank + return (self.cards[-1].suit == cards[0].suit and + self.cards[-1].rank + self.cap.dir == cards[0].rank) + + def getBottomImage(self): + return self.game.app.images.getLetter(self.cap.base_rank) + + +class Dashavatara_ReserveStack(ReserveStack): + + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_cards=1, max_accept=1, base_rank=ANY_RANK) + apply(OpenStack.__init__, (self, x, y, game), cap) + + def acceptsCards(self, from_stack, cards): + return (ReserveStack.acceptsCards(self, from_stack, cards) + and self.game.s.talon.cards) + + +class Dashavatara_RowStack(BasicRowStack): + + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + # check + return not (self.cards or self.game.s.talon.cards) + + def canMoveCards(self, cards): + return 1 + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + +# /*********************************************************************** +# * +# ***********************************************************************/ + +class AbstractDashavataraGame(Game): + + SUITS = (_("Fish"), _("Tortoise"), _("Boar"), _("Lion"), _("Dwarf"), + _("Axe"), _("Arrow"), _("Plow"), _("Lotus"), _("Horse")) + RANKS = (_("Ace"), "2", "3", "4", "5", "6", "7", "8", "9", "10", + _("Pradhan"), _("Raja")) + COLORS = (_("Black"), _("Red"), _("Yellow"), _("Green"), _("Brown"), + _("Orange"), _("Grey"), _("White"), _("Olive"), _("Crimson")) + FORCE = (_("Strong"), _("Weak")) + + def updateText(self): + pass + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit + and (card1.rank + 1 == card2.rank + or card1.rank - 1 == card2.rank)) + + +class Journey_Hint(DefaultHint): + # FIXME: demo is not too clever in this game + pass + + +# /*********************************************************************** +# * Dashavatara Circles +# ***********************************************************************/ + +class DashavataraCircles(AbstractDashavataraGame): + Hint_Class = CautiousDefaultHint + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + w, h = l.XM + l.XS * 9, l.YM + l.YS * 7 + self.setSize(w, h) + + # Create row stacks + x = w / 2 - l.CW / 2 + y = h / 2 - l.YS / 2 + x0 = (-.7, .3, .7, -.3, + -1.7, -1.5, -.6, .6, 1.5, 1.7, 1.5, .6, -.6, -1.5, + -2.7, -2.5, -1.9, -1, 0, 1, 1.9, 2.5, 2.7, 2.5, 1.9, 1, 0, -1, -1.9, -2.5) + y0 = (-.3, -.45, .3, .45, + 0, -.8, -1.25, -1.25, -.8, 0, .8, 1.25, 1.25, .8, + 0, -.9, -1.6, -2, -2.2, -2, -1.6, -.9, 0, .9, 1.6, 2, 2.2, 2, 1.6, .9) + for i in range(30): + # FIXME: + _x, _y = x+l.XS*x0[i], y+l.YS*y0[i]+l.YM*y0[i]*2 + if _x < 0: _x = 0 + if _y < 0: _y = 0 + s.rows.append(Circles_RowStack(_x, _y, self, base_rank = ANY_RANK)) + + # Create reserve stacks + s.reserves.append(ReserveStack(l.XM, h - l.YS, self)) + s.reserves.append(ReserveStack(w - l.XS, h - l.YS, self)) + + # Create foundations + x, y = l.XM, l.YM + for j in range(2): + for i in range(5): + s.foundations.append(SS_FoundationStack(x, y, self, i + j * 5, mod=12, + max_move=0, max_cards=12)) + y = y + l.YS + x, y = w - l.XS, l.YM +## from pprint import pprint +## pprint(s.rows) +## print (l.XM + l.XS, 0, w - l.XS - l.XM, 999999) + self.setRegion(s.rows, (l.XM + l.XS, 0, w - l.XS - l.XM, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(l.XM + l.XS, l.YM, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 120 + for i in range(3): + self.s.talon.dealRow(rows=self.s.rows, flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows, flip=1, frames=3) + self.s.talon.dealCards() + + + +# /*********************************************************************** +# * Ten Avatars +# ***********************************************************************/ + +class TenAvatars(AbstractDashavataraGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + self.setSize(l.XM * 3 + l.XS * 11, l.YM + l.YS * 6) + + # Create row stacks + x = l.XM + y = l.YM + for i in range(10): + s.rows.append(RK_RowStack(x, y, self, base_rank=11, + max_move=12, max_cards=99)) + x = x + l.XS + + # Create reserve stacks + x = self.width - l.XS + y = l.YM + for i in range(6): + s.reserves.append(ReserveStack(x, y, self)) + y = y + l.YS + y = y - l.YS + for i in range(6): + x = x - l.XS + s.reserves.append(ReserveStack(x, y, self)) + + self.setRegion(s.rows, (0, 0, l.XM + l.XS * 10, l.YS * 5)) + + # Create talon + s.talon = DealRowTalonStack(l.XM, self.height - l.YS, self) + l.createText(s.talon, "nn") + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 120 + for i in range(4): + self.s.talon.dealRow(flip=1, frames=0) + self.startDealSample() + self.s.talon.dealCards() + + def isGameWon(self): + if len(self.s.talon.cards): + return 0 + for s in self.s.rows: + if len(s.cards) != 12 or not isSameSuitSequence(s.cards): + return 0 + return 1 + + + +# /*********************************************************************** +# * Balarama +# ***********************************************************************/ + +class Balarama(AbstractDashavataraGame): + Layout_Method = Layout.ghulamLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = Dashavatara_AC_RowStack + BASE_RANK = ANY_RANK + + # + # Game layout + # + + def createGame(self, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=16, reserves=4, texts=0) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=12, max_cards=12)) + + # Create reserve stacks + for r in l.s.reserves: + s.reserves.append(ReserveStack(r.x, r.y, self, )) + + # Create row stacks + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, l.YOFFSET, + suit=ANY_SUIT, base_rank=self.BASE_RANK, max_cards=12)) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 120 + for i in range(6): + self.s.talon.dealRow(rows=self.s.rows, flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows, flip=1, frames=3) + self.s.talon.dealRow(rows=self.s.rows[:8], flip=1, frames=3) + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color % 2 != card2.color % 2 and + (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank)) + + + +# /*********************************************************************** +# * Hayagriva +# ***********************************************************************/ + +class Hayagriva(Balarama): + Layout_Method = Layout.ghulamLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = Dashavatara_RK_RowStack + BASE_RANK = 11 + + # + # Game layout + # + + def createGame(self, **layout): + Balarama.createGame(self) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank) + + + +# /*********************************************************************** +# * Shanka +# ***********************************************************************/ + +class Shanka(Balarama): + Layout_Method = Layout.ghulamLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = Dashavatara_RK_RowStack + BASE_RANK = 11 + + # + # Game layout + # + + def createGame(self, **layout): + Balarama.createGame(self, reserves=0) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + if stack1 in self.s.foundations: + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank)) + return (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank) + + + +# /*********************************************************************** +# * Surukh +# ***********************************************************************/ + +class Surukh(Balarama): + Layout_Method = Layout.ghulamLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = Dashavatara_AF_RowStack + BASE_RANK = ANY_RANK + + # + # Game layout + # + + def createGame(self, **layout): + Balarama.createGame(self, reserves=4) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + if card1.suit <= 4: + force0 = 0 + else: + force0 = 1 + if card2.suit <= 4: + force1 = 0 + else: + force1 = 1 + return (force0 != force1 + and (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank)) + + + +# /*********************************************************************** +# * Matsya +# ***********************************************************************/ + +class Matsya(AbstractDashavataraGame): + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = RK_RowStack + BASE_RANK = 11 + + # + # Game layout + # + + def createGame(self, max_rounds=1, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=10, waste=1) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=12, max_cards=12, max_move=0)) + + # Create row stacks + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=self.BASE_RANK)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 120 + for i in range(10): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank) + + + +# /*********************************************************************** +# * Kurma +# ***********************************************************************/ + +class Kurma(Matsya): + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = SS_RowStack + BASE_RANK = ANY_RANK + + # + # Game layout + # + + def createGame(self, **layout): + Matsya.createGame(self, max_rounds=-1) + + + +# /*********************************************************************** +# * Varaha +# ***********************************************************************/ + +class Varaha(Matsya): + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = SS_RowStack + BASE_RANK = ANY_RANK + + # + # Game layout + # + + def createGame(self, **layout): + Matsya.createGame(self, max_rounds=-1, num_deal=3) + + + +# /*********************************************************************** +# * Narasimha +# ***********************************************************************/ + +class Narasimha(Matsya): + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + BASE_RANK = 11 + + # + # Game layout + # + + def createGame(self, **layout): + Matsya.createGame(self, max_rounds=1, num_deal=1) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color % 2 != card2.color % 2 + and (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank)) + + + +# /*********************************************************************** +# * Vamana +# ***********************************************************************/ + +class Vamana(Matsya): + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + BASE_RANK = 11 + + # + # Game layout + # + + def createGame(self, **layout): + Matsya.createGame(self, max_rounds=-1, num_deal=3) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color % 2 != card2.color % 2 + and (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank)) + + + +# /*********************************************************************** +# * Parashurama +# ***********************************************************************/ + +class Parashurama(Matsya): + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = RK_RowStack + BASE_RANK = 11 + + # + # Game layout + # + + def createGame(self, **layout): + Matsya.createGame(self, max_rounds=2, num_deal=3) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank) + + + +# /*********************************************************************** +# // Journey to Cuddapah +# ************************************************************************/ + +class Journey(AbstractDashavataraGame): + Hint_Class = Journey_Hint + + BRAID_CARDS = 15 + BRAID_OFFSET = 1 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 20 cards are playable - needed for Braid_BraidStack) + decks = self.gameinfo.decks + h = max(5 * l.YS + 35, 2*l.YM + 2*l.YS + (self.BRAID_CARDS - 1) * l.YOFFSET*self.BRAID_OFFSET) + self.setSize(l.XM + l.XS * (7 + decks * 2), l.YM + h) + + # extra settings + self.base_card = None + + # Create foundations, rows, reserves + s.addattr(braidstrong=None) # register extra stack variable + s.addattr(braidweak=None) # register extra stack variable + x, y = l.XM, l.YM + for j in range(5): + for i in range(decks): + s.foundations.append(Journey_Foundation(x + l.XS * i, y, self, + j, mod=12, max_cards=12)) + s.rows.append(Journey_StrongStack(x + l.XS * decks, y, self)) + s.rows.append(Journey_ReserveStack(x + l.XS * (1 + decks), y, self)) + y = y + l.YS + x, y = x + l.XS * (5 + decks), l.YM + for j in range(5): + s.rows.append(Journey_ReserveStack(x, y, self)) + s.rows.append(Journey_WeakStack(x + l.XS, y, self)) + for i in range(decks, 0, -1): + s.foundations.append(Journey_Foundation(x + l.XS * (1 + i), y, self, + j + 5, mod=12, max_cards=12)) + y = y + l.YS + self.texts.info = MfxCanvasText(self.canvas, + self.width / 2, h - l.YM / 2, + anchor="center", + font = self.app.getFont("canvas_default")) + + # Create braids + x, y = l.XM + l.XS * 2.15 + l.XS * decks, l.YM + s.braidstrong = Journey_BraidStack(x, y, self, xoffset=12, yoffset=self.BRAID_OFFSET) + x = x + l.XS * 1.7 + s.braidweak = Journey_BraidStack(x, y, self, xoffset=-12, yoffset=self.BRAID_OFFSET) + + # Create talon + x, y = l.XM + l.XS * 2 + l.XS * decks, h - l.YS - l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, "ss") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + self.width / 2, h - l.YM * 2.5, + anchor="center", + font=self.app.getFont("canvas_default")) + x = x + l.XS * 2 + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # define stack-groups + self.sg.talonstacks = [s.talon] + [s.waste] + self.sg.openstacks = s.foundations + s.rows + self.sg.dropstacks = [s.braidstrong] + [s.braidweak] + s.rows + [s.waste] + + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.base_card = None + self.updateText() + for i in range(self.BRAID_CARDS): + self.s.talon.dealRow(rows = [self.s.braidstrong]) + for i in range(self.BRAID_CARDS): + self.s.talon.dealRow(rows = [self.s.braidweak]) + self.s.talon.dealRow() + # deal base_card to foundations, update cap.base_rank + self.base_card = self.s.talon.getCard() + to_stack = self.s.foundations[self.base_card.suit * self.gameinfo.decks] + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, to_stack) + self.updateText() + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + # deal first card to WasteStack + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % 12 == card2.rank + or (card2.rank + 1) % 12 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + + # + # game extras + # + + def updateText(self): + if self.preview > 1 or not self.texts.info: + return + if not self.base_card: + t = "" + else: + t = self.RANKS[self.base_card.rank] + dir = self.getFoundationDir() % 12 + if dir == 1: + t = t + _(" Ascending") + elif dir == 11: + t = t + _(" Descending") + self.texts.info.config(text = t) + + + +# /*********************************************************************** +# // Long Journey to Cuddapah +# ************************************************************************/ + +class LongJourney(Journey): + + BRAID_CARDS = 20 + BRAID_OFFSET = .7 + + + +# /*********************************************************************** +# * Appachan's Waterfall +# ***********************************************************************/ + +class AppachansWaterfall(AbstractDashavataraGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + w, h = l.XM + l.XS * 10, l.YM + l.YS * 6 + self.setSize(w, h) + + # Create row stacks + x, y = l.XM, l.YM + for i in range(10): + s.rows.append(AppachansWaterfall_RowStack(x, y, self, base_rank=ANY_RANK, + max_move=12, max_cards=99)) + x = x + l.XS + self.setRegion(s.rows, (-999, -999, 999999, l.YM + l.YS * 5)) + + # Create foundation + x, y = w / 2 - l.CW / 2, h - l.YS + s.foundations.append(AppachansWaterfall_Foundation(x, y, self, -1)) + + # Create reserves + s.reserves.append(ReserveStack(x - l.XS * 2, y, self)) + s.reserves.append(ReserveStack(x + l.XS * 2, y, self)) + + # Create talon + s.talon = DealRowTalonStack(l.XM, y, self) + l.createText(s.talon, "nn") + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 120 + for i in range(4): + self.s.talon.dealRow(flip=1, frames=0) + self.startDealSample() + self.s.talon.dealCards() + + def isGameWon(self): + return len(self.s.foundations[0].cards) == 120 + + + +# /*********************************************************************** +# // Hiranyaksha +# ************************************************************************/ + +class Hiranyaksha(AbstractDashavataraGame): + RowStack_Class = StackWrapper(Dashavatara_RK_RowStack, base_rank=NO_RANK) + + # + # game layout + # + + def createGame(self, rows=11, reserves=10): + # create layout + l, s = Layout(self), self.s + + # set size + maxrows = max(rows, reserves) + self.setSize(l.XM + (maxrows + 2) * l.XS, l.YM + 6 * l.YS) + + # + playcards = 4 * l.YS / l.YOFFSET + xoffset, yoffset = [], [] + for i in range(playcards): + xoffset.append(0) + yoffset.append(l.YOFFSET) + for i in range(96 * self.gameinfo.decks - playcards): + xoffset.append(l.XOFFSET) + yoffset.append(0) + + # create stacks + x, y = l.XM + (maxrows - reserves) * l.XS / 2, l.YM + for i in range(reserves): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + x, y = l.XM + (maxrows - rows) * l.XS / 2, l.YM + l.YS + self.setRegion(s.reserves, (-999, -999, 999999, y - l.YM / 2)) + for i in range(rows): + stack = self.RowStack_Class(x, y, self, yoffset=l.YOFFSET) + stack.CARD_XOFFSET = xoffset + stack.CARD_YOFFSET = yoffset + s.rows.append(stack) + x = x + l.XS + x, y = l.XM + maxrows * l.XS, l.YM + for i in range(2): + for suit in range(5): + s.foundations.append(SS_FoundationStack(x, y, self, suit=suit + (5 * i))) + y = y + l.YS + x, y = x + l.XS, l.YM + self.setRegion(self.s.foundations, (x - l.XS * 2, -999, 999999, + self.height - (l.YS + l.YM)), priority=1) + s.talon = InitialDealTalonStack(self.width - 3 * l.XS / 2, self.height - l.YS, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + i = 0 + while self.s.talon.cards: + if self.s.talon.cards[-1].rank == 11: + if self.s.rows[i].cards: + i = i + 1 + self.s.talon.dealRow(rows=[self.s.rows[i]], frames=4) + + # must look at cards + def _getClosestStack(self, cx, cy, stacks, dragstack): + closest, cdist = None, 999999999 + for stack in stacks: + if stack.cards and stack is not dragstack: + dist = (stack.cards[-1].x - cx)**2 + (stack.cards[-1].y - cy)**2 + else: + dist = (stack.x - cx)**2 + (stack.y - cy)**2 + if dist < cdist: + closest, cdist = stack, dist + return closest + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isRankSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + + + +# /*********************************************************************** +# // Dashavatara Hint +# ************************************************************************/ + +class Dashavatara_Hint(AbstractHint): + def computeHints(self): + game = self.game + + # 2)See if we can move a card to the tableaux + if not self.hints: + for r in game.sg.dropstacks: + pile = r.getPile() + if not pile or len(pile) != 1: + continue + if r in game.s.tableaux: + rr = self.ClonedStack(r, stackcards=r.cards[:-1]) + if rr.acceptsCards(None, pile): + # do not move a card that is already in correct place + continue + base_score = 80000 + (4 - r.cap.base_suit) + else: + base_score = 80000 + # find a stack that would accept this card + for t in game.s.tableaux: + if t is not r and t.acceptsCards(r, pile): + score = base_score + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 3)See if we can move a card from the tableaux + # to a row stack. This can only happen if there are + # no more cards to deal. + if not self.hints: + for r in game.s.tableaux: + pile = r.getPile() + if not pile or len(pile) != 1: + continue + rr = self.ClonedStack(r, stackcards=r.cards[:-1]) + if rr.acceptsCards(None, pile): + # do not move a card that is already in correct place + continue + # find a stack that would accept this card + for t in game.s.rows: + if t is not r and t.acceptsCards(r, pile): + score = 70000 + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 4)See if we can move a card within the row stacks + if not self.hints: + for r in game.s.rows: + pile = r.getPile() + if not pile or len(pile) != 1 or len(pile) == len(r.cards): + continue + base_score = 60000 + # find a stack that would accept this card + for t in game.s.rows: + if t is not r and t.acceptsCards(r, pile): + score = base_score + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 5)See if we can deal cards + if self.level >= 2: + if game.canDealCards(): + self.addHint(self.SCORE_DEAL, 0, game.s.talon, None) + + +# /*********************************************************************** +# // Dashavatara +# ************************************************************************/ + +class Dashavatara(Game): + Hint_Class = Dashavatara_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + TABLEAU_YOFFSET = min(9, max(3, l.YOFFSET / 3)) + + # set window + th = l.YS + 3 * TABLEAU_YOFFSET + # (set piles so that at least 2/3 of a card is visible with 10 cards) + h = 10 * l.YOFFSET + l.CH * 2/3 + self.setSize(11 * l.XS + l.XM * 2, l.YM + 3 * th + l.YM + h) + + # create stacks + s.addattr(tableaux=[]) # register extra stack variable + x = l.XM + 8 * l.XS + l.XS / 2 + y = l.YM + for i in range(3, 0, -1): + x = l.XM + for j in range(10): + s.tableaux.append(Dashavatara_TableauStack(x, y, self, i - 1, TABLEAU_YOFFSET)) + x = x + l.XS + x = x + l.XM + s.reserves.append(Dashavatara_ReserveStack(x, y, self)) + y = y + th + x, y = l.XM, y + l.YM + for i in range(10): + s.rows.append(Dashavatara_RowStack(x, y, self, max_accept=1)) + x = x + l.XS + x = self.width - l.XS + y = self.height - l.YS + s.talon = DealRowTalonStack(x, y, self) + l.createText(s.talon, "sw") + + # define stack-groups + self.sg.openstacks = s.tableaux + s.rows + s.reserves + self.sg.talonstacks = [s.talon] + self.sg.dropstacks = s.tableaux + s.rows + + # + # game overrides + # + + def startGame(self): + self.s.talon.dealRow(rows=self.s.tableaux, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def isGameWon(self): + for stack in self.s.tableaux: + if len(stack.cards) != 4: + return 0 + return 1 + + def fillStack(self, stack): + if self.s.talon.cards: + if stack in self.s.rows and len(stack.cards) == 0: + self.s.talon.dealRow(rows=[stack]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 3 == card2.rank or card2.rank + 3 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + +# /*********************************************************************** +# * +# ***********************************************************************/ + +def r(id, gameclass, name, game_type, decks, redeals): + game_type = game_type | GI.GT_DASHAVATARA_GANJIFA + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + suits=range(10), ranks=range(12)) + registerGame(gi) + return gi + +r(15406, Matsya, "Matsya", GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15407, Kurma, "Kurma", GI.GT_DASHAVATARA_GANJIFA, 1, -1) +r(15408, Varaha, "Varaha", GI.GT_DASHAVATARA_GANJIFA, 1, -1) +r(15409, Narasimha, "Narasimha", GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15410, Vamana, "Vamana", GI.GT_DASHAVATARA_GANJIFA, 1, -1) +r(15411, Parashurama, "Parashurama", GI.GT_DASHAVATARA_GANJIFA, 1, 1) +r(15412, TenAvatars, "Ten Avatars", GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15413, DashavataraCircles, "Dashavatara Circles", GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15414, Balarama, "Balarama", GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15415, Hayagriva, "Hayagriva", GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15416, Shanka, "Shanka", GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15417, Journey, "Journey to Cuddapah", GI.GT_DASHAVATARA_GANJIFA, 1, 2) +r(15418, LongJourney, "Long Journey to Cuddapah", GI.GT_DASHAVATARA_GANJIFA, 2, 2) +r(15419, Surukh, "Surukh", GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15420, AppachansWaterfall, "Appachan's Waterfall", GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15421, Hiranyaksha, 'Hiranyaksha', GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15422, Dashavatara, 'Dashavatara', GI.GT_DASHAVATARA_GANJIFA, 1, 0) + +del r diff --git a/pysollib/games/ultra/hanafuda.py b/pysollib/games/ultra/hanafuda.py new file mode 100644 index 00000000..658f35f2 --- /dev/null +++ b/pysollib/games/ultra/hanafuda.py @@ -0,0 +1,1052 @@ +##---------------------------------------------------------------------------## +## +## Ultrasol -- a Python Solitaire game +## +## Copyright (C) 2000 by T. Kirk +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys, math + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import FreeCellType_Hint +from pysollib.pysoltk import MfxCanvasText + +from hanafuda_common import * + + +# /*********************************************************************** +# * Flower Clock +# ***********************************************************************/ + +class FlowerClock(AbstractFlowerGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + self.setSize(l.XM + l.XS * 10.5, l.YM + l.YS * 5.5) + + # Create clock + xoffset = ( 1, 2, 2.5, 2, 1, 0, -1, -2, -2.5, -2, -1, 0 ) + yoffset = ( 0.25, 0.75, 1.9, 3, 3.5, 3.75, 3.5, 3, 1.9, 0.75, 0.25, 0 ) + x = l.XM + l.XS * 7 + y = l.CH / 3 + for i in range(12): + x0 = x + xoffset[i] * l.XS + y0 = y + yoffset[i] * l.YS + s.foundations.append(FlowerClock_Foundation(x0, y0, self, ANY_SUIT, base_rank=3)) + t = MfxCanvasText(self.canvas, x0 + l.CW / 2, y0 + l.YS, + anchor="center", font=font, + text=self.SUITS[i]) + + # Create row stacks + for j in range(2): + x, y = l.XM, l.YM + l.YS * j * 2.7 + for i in range(4): + s.rows.append(FlowerClock_RowStack(x, y, self, yoffset=l.CH/4, + max_cards=8, max_accept=8)) + x = x + l.XS + self.setRegion(s.rows, (0, 0, l.XS * 4, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(self.width - l.XS, self.height - l.YS, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + assert len(self.s.talon.cards) == 0 + + def isGameWon(self): + for i in self.s.foundations: + if len(i.cards) != 4: + return 0 + if i.cards[0].suit != i.id: + return 0 + return 1 + + def getAutoStacks(self, event=None): + if event is None: + return (self.sg.dropstacks, (), self.sg.dropstacks) + else: + return (self.sg.dropstacks, self.sg.dropstacks, self.sg.dropstacks) + + + +# /*********************************************************************** +# * Gaji +# ***********************************************************************/ + +class Gaji(AbstractFlowerGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + + # Set window size + self.setSize(l.XM + l.XS * 13, l.YM * 2 + l.YS * 6) + + # Create left foundations + x = l.XM + y = l.YM + s.foundations.append(Gaji_Foundation(x, y, self, -1, base_rank=0)) + x = x + l.XS + s.foundations.append(Gaji_Foundation(x, y, self, -1, base_rank=1)) + + # Create right foundations + x = self.width - l.XS * 2 + s.foundations.append(Gaji_Foundation(x, y, self, -1, base_rank=2)) + x = x + l.XS + s.foundations.append(Gaji_Foundation(x, y, self, -1, base_rank=3)) + + # Create row stacks + x = l.XS * 2.5 + l.XM + for i in range(8): + s.rows.append(Gaji_RowStack(x, y, self, yoffset=l.CH/2, + max_cards=12, max_accept=12)) + x = x + l.XS + self.setRegion(s.rows, (l.XM + l.XS * 2, -999, l.XM + l.XS * 10, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(self.width - l.XS, self.height - l.YS, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def _shuffleHook(self, cards): + topcards = [None, None, None, None] + for c in cards[:]: + if not topcards[c.rank]: + if not ((c.suit == 10) and (c.rank == 3)): + topcards[c.rank] = c + cards.remove(c) + return topcards + cards + + def startGame(self): + assert len(self.s.talon.cards) == 48 + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + r = self.s.rows + self.s.talon.dealRow(rows=(r[0], r[1], r[2], r[5], r[6], r[7])) + self.s.talon.dealRow(rows=(r[0], r[1], r[6], r[7])) + self.s.talon.dealRow(rows=(r[0], r[7])) + r = self.s.foundations + self.s.talon.dealRow(rows=(r[3], r[2], r[1], r[0])) + assert len(self.s.talon.cards) == 0 + + def fillStack(self, stack): + if stack in self.s.rows: + if stack.cards and not stack.cards[-1].face_up: + self.flipMove(stack) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + if stack1 in self.s.foundations: + return (card1.rank == card2.rank + and ((((card1.suit + 1) % 12) == card2.suit) + or (((card1.suit - 1) % 12) == card2.suit))) + else: + return ((card1.suit == card2.suit) + and ((card1.rank + 1 == card2.rank) + or (card1.rank - 1 == card2.rank))) + + + +# /*********************************************************************** +# * Oonsoo +# ***********************************************************************/ + +class Oonsoo(AbstractFlowerGame): + Layout_Method = Layout.oonsooLayout + Talon_Class = DealRowTalonStack + RowStack_Class = Oonsoo_SequenceStack + Rows = 12 + Suit = ANY_SUIT + BaseRank = 0 + Reserves = 0 + Strictness = 0 + + # + # Game layout + # + + def createGame(self, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=self.Rows, reserves=self.Reserves, + texts=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, suit=self.Suit, + base_rank=self.BaseRank, + yoffset=l.YOFFSET)) + for r in l.s.reserves: + s.reserves.append(ReserveStack(r.x, r.y, self)) + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 * self.gameinfo.decks + self.startDealSample() + self.s.talon.dealRow(flip=0) + self.s.talon.dealCards() + + def isGameWon(self): + if len(self.s.talon.cards): + return 0 + for s in self.s.rows: + if (len(s.cards) != 4 or not cardsFaceUp(s.cards) + or not s.isHanafudaSequence(s.cards, self.Strictness)): + return 0 + return 1 + + + +# /*********************************************************************** +# * Oonsoo Too +# ************************************************************************/ + +class OonsooToo(Oonsoo): + Reserves = 1 + + + +# /*********************************************************************** +# * Oonsoo Strict +# ************************************************************************/ + +class OonsooStrict(Oonsoo): + RowStack_Class = Hanafuda_SequenceStack + Reserves = 2 + Strictness = 1 + + + +# /*********************************************************************** +# * Oonsoo Open +# ************************************************************************/ + +class OonsooOpen(Oonsoo): + BaseRank = ANY_RANK + + + +# /*********************************************************************** +# * Oonsoo Times Two +# ************************************************************************/ + +class OonsooTimesTwo(Oonsoo): + Rows = 24 + Reserves = 1 + + + +# /*********************************************************************** +# * Pagoda +# ***********************************************************************/ + +class Pagoda(AbstractFlowerGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + self.setSize(l.XM + l.XS * 11, l.YS * 6) + + # Create foundations + self.foundation_texts = [] + id = 0 + for j in range(4): + x, y = l.XM + l.XS * 8, l.YM * 3 + l.YS * j * 1.5 + for i in range(3): + s.foundations.append(Pagoda_Foundation(x, y, self, id)) + t = MfxCanvasText(self.canvas, x + l.CW / 2, y - 12, + anchor="center", font=font) + self.foundation_texts.append(t) + x = x + l.XS + id = id + 1 + + # Build pagoda + x, y = l.XM + l.XS, l.YM + d = ( 0.4, 0.25, 0, 0.25, 0.4 ) + for i in range(5): + s.reserves.append(ReserveStack(x + l.XS * i, y + l.YS * d[i], self)) + + x, y = l.XM + l.XS * 2, y + l.YS * 1.1 + d = ( 0.25, 0, 0.25 ) + for i in range(3): + s.reserves.append(ReserveStack(x + l.XS * i, y + l.YS * d[i], self)) + + x, y = l.XM, y + l.YS * 1.1 + d = ( 0.5, 0.4, 0.25, 0, 0.25, 0.4, 0.5 ) + for i in range(7): + s.reserves.append(ReserveStack(x + l.XS * i, y + l.YS * d[i], self)) + + x, y = l.XM + l.XS, y + l.YS * 1.5 + for i in range(5): + s.reserves.append(ReserveStack(x + l.XS * i, y, self)) + + # Create talon + x = l.XM + l.XS * 2.5 + y = l.YM + l.YS * 4.9 + s.talon = WasteTalonStack(x, y, self, num_deal=4, max_rounds=1) + l.createText(s.talon, "sw") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "se") + + # Define stack groups + l.defaultStackGroups() + + # + # Game extras + # + + def updateText(self): + if self.preview > 1: + return + for i in range(12): + s = self.s.foundations[i] + if not len(s.cards) or len(s.cards) == 8: + text = self.SUITS[i] + elif len(s.cards) < 5: + text = _("Rising") + else: + text = _("Setting") + self.foundation_texts[i].config(text=text) + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 * 2 + self.updateText() + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves, reverse=1) + self.s.talon.dealCards() + + def fillStack(self, stack): + if not stack.cards and stack is self.s.waste: + if self.canDealCards(): + self.dealCards() + + + +# /*********************************************************************** +# * Matsukiri +# ***********************************************************************/ + +class MatsuKiri(AbstractFlowerGame): + Strictness = 0 + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + + # Set window size + self.setSize(l.XM * 3 + l.XS * 9, l.YM + l.YS * 6) + + # Create row stacks + x = l.XM + y = l.YM + for i in range(8): + s.rows.append(Matsukiri_RowStack(x, y, self, yoffset=l.CH/2, + max_cards=12, max_accept=12)) + x = x + l.XS + self.setRegion(s.rows, (-999, -999, l.XM + (l.XS * 8) + 10, 999999)) + + # Create foundation + x = x + l.XM * 2 + s.foundations.append(MatsuKiri_Foundation(x, y, self, ANY_SUIT)) + self.setRegion(s.foundations, (l.XM + (l.XS * 8) + 10, -999, 999999, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(self.width - l.XS, self.height - l.YS, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + assert len(self.s.talon.cards) == 0 + + def fillStack(self, stack): + if stack in self.s.rows: + if len(stack.cards) > 0 and not stack.cards[-1].face_up: + self.flipMove(stack) + + +class MatsuKiriStrict(MatsuKiri): + Strictness = 1 + + +# /*********************************************************************** +# * Great Wall +# ***********************************************************************/ + +class GreatWall(AbstractFlowerGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + w, h = l.XM + l.XS * 15, l.YM + l.YS * 6.2 + self.setSize(w, h) + + # Create foundations + self.foundation_texts = [] + x, y = (l.XM, l.XM, w - l.XS, w - l.XS), (l.YM, h / 2, l.YM, h / 2) + for i in range(4): + s.foundations.append(GreatWall_FoundationStack(x[i], y[i] + l.YM, self, -1, base_rank=i)) + self.foundation_texts.append(MfxCanvasText(self.canvas, + x[i] + l.CW / 2, y[i], + anchor="center", font=font)) + + # Create row stacks + x = l.XM + l.XS * 1.5 + y = l.YM + for i in range(12): + s.rows.append(GreatWall_RowStack(x, y, self, yoffset=l.CH/4, + max_cards=26, max_accept=26)) + x = x + l.XS + self.setRegion(s.rows, (l.XM + l.XS * 1.25, -999, self.width - l.XS * 1.25, 999999)) + + # Create talon + x = self.width / 2 - l.CW / 2 + y = self.height - l.YS * 1.2 + s.talon = InitialDealTalonStack(x, y, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game extras + # + + def updateText(self): + if self.preview > 1: + return + for i in range(4): + l = len(self.s.foundations[i].cards) / 12 + if l == 0: + t = "" + elif l == 4: + t = _("Filled") + else: + t = str(l) + (_("st"), _("nd"), _("rd"), _("th"))[l - 1] + _(" Deck") + self.foundation_texts[i].config(text=str(t)) + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 * 4 + self.updateText() + for i in range(15): + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + assert len(self.s.talon.cards) == 0 + + def fillStack(self, stack): + if stack in self.s.rows: + if len(stack.cards) > 0 and not stack.cards[-1].face_up: + self.flipMove(stack) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + if stack1 in self.s.foundations: + return (card1.rank == card2.rank + and ((((card1.suit + 1) % 12) == card2.suit) + or (((card1.suit - 1) % 12) == card2.suit))) + else: + return (card1.rank + 1 == card2.rank + or card1.rank - 1 == card2.rank) + + + +# /*********************************************************************** +# * Four Winds +# ************************************************************************/ + +class FourWinds(AbstractFlowerGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + self.setSize(7 * l.XS, 5 * l.YS + 3 * l.YM) + + # Four winds + TEXTS = (_("North"), _("East"), _("South"), _("West"), + _("NW"), _("NE"), _("SE"), _("SW")) + + # Create foundations + x = l.XM * 3 + y = l.YM + xoffset = (2.5, 5, 2.5, 0) + yoffset = (0, 2, 4, 2) + for i in range(4): + x0 = x + (xoffset[i] * l.XS) + y0 = y + (yoffset[i] * l.YS) + s.foundations.append(FourWinds_Foundation(x0, y0, self, -1, + max_cards=12, max_accept=1, base_rank=i)) + t = MfxCanvasText(self.canvas, x0 + l.CW / 2, y0 + l.YS + 5, + anchor="center", font=font, + text=TEXTS[i]) + + # Create rows + xoffset = (1.25, 3.75, 3.75, 1.25) + yoffset = (0.75, 0.75, 3, 3) + for i in range(4): + x0 = x + (xoffset[i] * l.XS) + y0 = y + (yoffset[i] * l.YS) + s.rows.append(FourWinds_RowStack(x0, y0, self, yoffset=10, + max_cards=3, max_accept=1, base_rank=ANY_RANK)) + t = MfxCanvasText(self.canvas, x0 + l.CW / 2, y0 + l.YS + 5, + anchor="center", font=font, + text=TEXTS[i+4]) + self.setRegion(s.rows, (x + l.XS, y + l.YS * 0.65, x + l.XS * 4 + 5, y + l.YS * 3 + 5)) + + # Create talon + x = x + 2 * l.XS + y = y + 2 * l.YS + s.talon = WasteTalonStack(x, y, self, num_deal=1, max_rounds=2) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # Define stack-groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 + self.startDealSample() + self.s.talon.dealCards() + + def fillStack(self, stack): + if not stack.cards and stack is self.s.waste: + if self.canDealCards(): + self.dealCards() + + + +# /*********************************************************************** +# * Sumo +# ************************************************************************/ + +class Sumo(AbstractFlowerGame): + Layout_Method = Layout.sumoLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = Hanafuda_SS_FoundationStack + RowStack_Class = Hanafuda_SequenceStack + Hint_Class = FreeCellType_Hint + + # + # Game layout + # + + def createGame(self, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=8, reserves=2, texts=0, playcards=16) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + suit=r.suit, base_rank=3)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, yoffset=l.YOFFSET)) + for r in l.s.reserves: + s.reserves.append(ReserveStack(r.x, r.y, self)) + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + +# /*********************************************************************** +# * Big Sumo +# ************************************************************************/ + +class BigSumo(AbstractFlowerGame): + Layout_Method = Layout.sumoLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = Hanafuda_SS_FoundationStack + RowStack_Class = Hanafuda_SequenceStack + + # + # Game layout + # + + def createGame(self, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=10, reserves=4, texts=0, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + suit=r.suit, base_rank=3)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, yoffset=l.YOFFSET)) + for r in l.s.reserves: + s.reserves.append(ReserveStack(r.x, r.y, self)) + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 * 2 + for i in range(9): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[2:8]) + self.s.talon.dealCards() + + + +# /*********************************************************************** +# * Samuri +# ************************************************************************/ + +class Samuri(AbstractFlowerGame): + Layout_Method = Layout.samuriLayout + Talon_Class = WasteTalonStack + Foundation_Class = Hanafuda_SS_FoundationStack + RowStack_Class = Hanafuda_SequenceStack + Rows = 7 + + # + # Game layout + # + + def createGame(self, max_rounds=1, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=self.Rows, waste=1, texts=1, playcards=21) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + suit=r.suit, base_rank=3)) + + # Create row stacks + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, yoffset=l.YOFFSET)) + + # Define stack groups + l.defaultAll() + + + # + # Game over rides + # + + def startGame(self): + decks = self.gameinfo.decks + assert len(self.s.talon.cards) == 48 * decks + for i in range(1 + (decks > 1)): + self.s.talon.dealRow(flip=0, frames=0) + max_row = len(self.s.rows) + for i in range(max_row): + self.s.talon.dealRow(rows=self.s.rows[i:max_row-i], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def fillStack(self, stack): + if not stack.cards and stack is self.s.waste: + if self.canDealCards(): + self.dealCards() + + + +# /*********************************************************************** +# * Double Samuri +# ***********************************************************************/ + +class DoubleSamuri(Samuri): + Rows = 11 + + + +# /*********************************************************************** +# * Super Samuri +# ***********************************************************************/ + +class SuperSamuri(DoubleSamuri): + pass + + + +# /*********************************************************************** +# * Little Easy +# ************************************************************************/ + +class LittleEasy(AbstractFlowerGame): + Layout_Method = Layout.easyLayout + Talon_Class = WasteTalonStack + Foundation_Class = FourWinds_Foundation + RowStack_Class = Hanafuda_SequenceStack + Rows = 7 + PlayCards = 10 + + # + # Game layout + # + + def createGame(self, max_rounds=-1, num_deal=3, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=self.Rows, waste=1, texts=1, playcards=self.PlayCards) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, yoffset=l.YOFFSET)) + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 * self.gameinfo.decks + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def fillStack(self, stack): + if not stack.cards and stack is self.s.waste: + if self.canDealCards(): + self.dealCards() + + + +# /*********************************************************************** +# * Easy x One +# ************************************************************************/ + +class EasyX1(LittleEasy): + + def createGame(self, **layout): + LittleEasy.createGame(self, max_rounds=2, num_deal=1) + + + +# /*********************************************************************** +# * Relax +# ************************************************************************/ + +class Relax(EasyX1): + RowStack_Class = Oonsoo_SequenceStack + + + +# /*********************************************************************** +# * Big Easy +# ************************************************************************/ + +class BigEasy(LittleEasy): + Rows = 11 + + + +# /*********************************************************************** +# * Easy Supreme +# ************************************************************************/ + +class EasySupreme(LittleEasy): + Rows = 11 + PlayCards = 14 + + + +# /*********************************************************************** +# * Just For Fun +# ************************************************************************/ + +class JustForFun(AbstractFlowerGame): + Layout_Method = Layout.funLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = FourWinds_Foundation + RowStack_Class = Hanafuda_SequenceStack + Rows = 12 + Reserves = 2 + BaseRank = 0 + + # + # Game layout + # + + def createGame(self, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=self.Rows, reserves=self.Reserves, texts=0, playcards=22) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + base_rank=self.BaseRank, yoffset=l.YOFFSET)) + for r in l.s.reserves: + s.reserves.append(ReserveStack(r.x, r.y, self)) + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + decks = self.gameinfo.decks + assert len(self.s.talon.cards) == 48 * decks + for i in range((decks * 2) + 1): + self.s.talon.dealRow(flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:len(self.s.talon.cards)]) + self.s.talon.dealCards() + + + +# /*********************************************************************** +# * Double Your Fun +# ************************************************************************/ + +class DoubleYourFun(JustForFun): + Rows = 18 + Reserves = 4 + + + +# /*********************************************************************** +# * Firecracker +# ************************************************************************/ + +class Firecracker(JustForFun): + RowStack_Class = Oonsoo_SequenceStack + Reserves = 0 + BaseRank = ANY_RANK + + + +# /*********************************************************************** +# * Cherry Bomb +# ************************************************************************/ + +class CherryBomb(Firecracker): + Rows = 18 + + + +# /*********************************************************************** +# * Paulownia +# ************************************************************************/ + +class Paulownia(AbstractFlowerGame): + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = Hanafuda_SS_FoundationStack + RowStack_Class = Hanafuda_SequenceStack + + # + # Game layout + # + + def createGame(self, max_rounds=-1, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=8, waste=1) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + suit=r.suit, base_rank=3)) + + # Create row stacks + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + base_rank = 0, yoffset=l.YOFFSET)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 + for i in range(8): + self.s.talon.dealRow(rows=self.s.rows[i + 1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + +# /*********************************************************************** +# // Register the games +# ************************************************************************/ + +def r(id, gameclass, name, game_type, decks, redeals): + game_type = game_type | GI.GT_HANAFUDA + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + suits=range(12), ranks=range(4)) + registerGame(gi) + return gi + +r(12345, Oonsoo, "Oonsoo", GI.GT_HANAFUDA, 1, 0) +r(12346, MatsuKiri, "MatsuKiri", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12372, MatsuKiriStrict, 'MatsuKiri Strict', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12347, Gaji, "Gaji", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12348, FlowerClock, "Flower Clock", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12349, Pagoda, "Pagoda", GI.GT_HANAFUDA, 2, 0) +r(12350, Samuri, "Samuri", GI.GT_HANAFUDA, 1, 0) +r(12351, GreatWall, "Great Wall", GI.GT_HANAFUDA, 4, 0) +r(12352, FourWinds, "Four Winds", GI.GT_HANAFUDA, 1, 1) +r(12353, Sumo, "Sumo", GI.GT_HANAFUDA, 1, 0) +r(12354, BigSumo, "Big Sumo", GI.GT_HANAFUDA, 2, 0) +r(12355, LittleEasy, "Little Easy", GI.GT_HANAFUDA, 1, -1) +r(12356, BigEasy, "Big Easy", GI.GT_HANAFUDA, 2, -1) +r(12357, EasySupreme, "Easy Supreme", GI.GT_HANAFUDA, 4, -1) +r(12358, JustForFun, "Just For Fun", GI.GT_HANAFUDA, 1, 0) +r(12359, Firecracker, "Firecracker", GI.GT_HANAFUDA, 1, 0) +r(12360, EasyX1, "Easy x One", GI.GT_HANAFUDA, 1, 1) +r(12361, Relax, "Relax", GI.GT_HANAFUDA, 1, 1) +r(12362, DoubleSamuri, "Double Samuri", GI.GT_HANAFUDA, 2, 0) +r(12363, SuperSamuri, "Super Samuri", GI.GT_HANAFUDA, 4, 0) +r(12364, DoubleYourFun, "Double Your Fun", GI.GT_HANAFUDA, 2, 0) +r(12365, CherryBomb, "Cherry Bomb", GI.GT_HANAFUDA, 2, 0) +r(12366, OonsooToo, "Oonsoo Too", GI.GT_HANAFUDA, 1, 0) +r(12367, OonsooStrict, "Oonsoo Strict", GI.GT_HANAFUDA, 1, 0) +r(12368, OonsooOpen, "Oonsoo Open", GI.GT_HANAFUDA, 1, 0) +r(12379, OonsooTimesTwo, "Oonsoo Times Two", GI.GT_HANAFUDA, 2, 0) + +del r diff --git a/pysollib/games/ultra/hanafuda1.py b/pysollib/games/ultra/hanafuda1.py new file mode 100644 index 00000000..1b30e53d --- /dev/null +++ b/pysollib/games/ultra/hanafuda1.py @@ -0,0 +1,717 @@ +##---------------------------------------------------------------------------## +## +## Ultrasol -- a Python Solitaire game +## +## Copyright (C) 2000 by T. Kirk +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + + +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +from hanafuda_common import * + +# /*********************************************************************** +# * Paulownia +# ************************************************************************/ + +class Paulownia(AbstractFlowerGame): + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = Hanafuda_SS_FoundationStack + RowStack_Class = Hanafuda_SequenceStack + MaxRounds = -1 + BaseRank = 0 + NumDeal = 1 + + # + # Game layout + # + + def createGame(self, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=8, waste=1) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=self.MaxRounds, num_deal=self.NumDeal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + suit=r.suit, base_rank=3)) + + # Create row stacks + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + base_rank=self.BaseRank, yoffset=l.YOFFSET)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 * self.gameinfo.decks + for i in range(8): + self.s.talon.dealRow(rows=self.s.rows[i + 1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + +class Pine(Paulownia): + MaxRounds = 1 + NumDeal = 3 + + +class Eularia(Paulownia): + BaseRank = ANY_RANK + + +class Peony(Eularia): + NumDeal = 3 + + +class Iris(Peony): + MaxRounds = 1 + + + +# /*********************************************************************** +# // Queue +# ************************************************************************/ + +class LesserQueue(AbstractFlowerGame): + Hint_Class = Queue_Hint + BRAID_CARDS = 20 + BRAID_OFFSET = 1 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + decks = self.gameinfo.decks + h = l.YM + l.YS * 5.5 + self.setSize(l.XM + l.XS * 10.5, l.YM + h) + + # extra settings + self.base_card = None + + # Create rows, reserves + s.addattr(braid = None) + x, x0 = l.XM + l.XS * 2, (decks - 1.5) % 2.5 + for j in range(decks / 2): + y = l.YM + for i in range(2): + s.rows.append(Queue_RowStack(x + l.XS * (x0 + j), y, self)) + s.rows.append(Queue_RowStack(x + l.XS * (4 + x0 + j + .5), y, self)) + y = y + l.YS * (3 + (decks > 2)) + y = l.YM + l.YS + for i in range(2): + s.rows.append(Queue_ReserveStack(x, y, self)) + s.rows.append(Queue_ReserveStack(x + l.XS, y, self)) + s.rows.append(Queue_ReserveStack(x, y + l.YS, self)) + s.rows.append(Queue_ReserveStack(x + l.XS, y + l.YS, self)) + if decks - 2: + s.rows.append(Queue_ReserveStack(x, y + l.YS * 2, self)) + s.rows.append(Queue_ReserveStack(x + l.XS, y + l.YS * 2, self)) + x = x + l.XS * 4.5 + + # Create braid + x, y = l.XM + l.XS * 4.25, l.YM + s.braid = Queue_BraidStack(x, y, self, yoffset=self.BRAID_OFFSET) + + # Create talon, waste + x, y = l.XM, l.YM + l.YS * 4.3 + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, "ss") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + self.width / 2, h - l.YM * 2.5, + anchor="center", + font=self.app.getFont("canvas_default")) + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # Create foundations + x = l.XM + for j in range(decks / 2): + y = l.YM + for i in range(4): + s.foundations.append(Queue_Foundation(x, y, self, -1, mod=12, + max_cards=12, base_suit=ANY_SUIT, base_rank=i, rank=i)) + s.foundations.append(Queue_Foundation(x + l.XS * (9.5 - j * 2), y, self, -1, mod=12, + max_cards=12, base_suit=ANY_SUIT, base_rank=i, rank=i)) + y = y + l.YS + x = x + l.XS + self.texts.info = MfxCanvasText(self.canvas, + self.width / 2, h - l.YM / 2, + anchor="center", + font=self.app.getFont("canvas_default")) + + # define stack-groups + self.sg.talonstacks = [s.talon] + [s.waste] + self.sg.openstacks = s.foundations + s.rows + s.reserves + self.sg.dropstacks = [s.braid] + s.rows + [s.waste] + s.reserves + + + # + # game overrides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 * self.gameinfo.decks + self.startDealSample() + self.base_card = None + self.updateText() + for i in range(self.BRAID_CARDS): + self.s.talon.dealRow(rows = [self.s.braid]) + self.s.talon.dealRow() + # deal base_card to foundations, update cap.base_rank + self.base_card = self.s.talon.getCard() + to_stack = self.s.foundations[2 * self.base_card.rank] + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, to_stack) + self.updateText() + for s in self.s.foundations: + s.cap.base_suit = self.base_card.suit + # deal first card to WasteStack + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank == card2.rank and + ((card1.suit + 1) % 12 == card2.suit or (card2.suit + 1) % 12 == card1.suit)) + + def getHighlightPilesStacks(self): + return () + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_suit = self.base_card.suit + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + + # + # game extras + # + + def updateText(self): + if self.preview > 1 or not self.texts.info: + return + if not self.base_card: + t = "" + else: + t = self.SUITS[self.base_card.suit] + dir = self.getFoundationDir() + if dir == 1: + t = t + _(" Ascending") + elif dir == 11: + t = t + _(" Descending") + self.texts.info.config(text = t) + + def getFoundationDir(self): + for s in self.s.foundations: + if len(s.cards) >= 2: + return (s.cards[-1].suit - s.cards[-2].suit) % 12 + return 0 + + + +class GreaterQueue(LesserQueue): + Hint_Class = Queue_Hint + BRAID_CARDS = 40 + BRAID_OFFSET = .5 + + + +# /*********************************************************************** +# * Japanese Garden +# ************************************************************************/ + +class JapaneseGarden(AbstractFlowerGame): + Hint_Class = CautiousDefaultHint + RowStack_Class = FlowerClock_RowStack + WIDTH = 10 + HEIGHT = 6 + XROWS = 3 + YROWS = 2 + MAX_CARDS = 6 + MAX_MOVE = 1 + XRESERVES = 6 + YRESERVES = 2 + MAX_RESERVE = 0 + INITIAL_DEAL = 6 + DEAL_RESERVES = 1 + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_card") + + # Set window size + self.setSize(l.XM + l.XS * self.WIDTH, l.YM * 3 + l.YS * self.HEIGHT) + + # Create foundations + x = self.width / 2 + l.XM / 2 - l.XS * 3 + y = l.YM + for j in range(2): + for i in range(6): + s.foundations.append(Hanafuda_SS_FoundationStack(x, y, self, i + (j * 6), + max_cards=4, max_accept=1, base_rank=3)) + x = x + l.XS + x = self.width / 2 + l.XM / 2 - l.XS * 3 + y = y + l.YS + + # Create flower beds + x = l.XM + y = l.YM * 2 + l.YS * 2 + for j in range(self.YROWS): + for i in range(self.XROWS): + row = self.RowStack_Class(x, y, self, yoffset=0, max_accept=self.MAX_MOVE, + max_move=self.MAX_MOVE, max_cards=self.MAX_CARDS, base_rank=0) + row.CARD_XOFFSET = l.CW / 2 + s.rows.append(row) + x = x + self.width / self.XROWS + x = l.XM + y = y + l.YS + self.setRegion(s.rows, (l.XM, l.YS * 2, 999999, y)) + + # Create pool + x = self.width / 2 + l.XM / 2 - (l.XS * self.XRESERVES) / 2 + for j in range(self.YRESERVES): + for i in range(self.XRESERVES): + s.reserves.append(ReserveStack(x, y, self, max_accept=self.MAX_RESERVE)) + x = x + l.XS + x = self.width / 2 + l.XM / 2 - l.XS * (self.XRESERVES / 2) + y = y + l.YS + if s.reserves: + self.setRegion(s.reserves, (l.XM, l.YS * (2 + self.YROWS), 999999, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(l.XM, l.YM, self) + + # Define stack-groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 + self.startDealSample() + for i in range(self.INITIAL_DEAL): + self.s.talon.dealRow() + if self.DEAL_RESERVES: + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealCards() + + + +class JapaneseGardenII(JapaneseGarden): + RowStack_Class = JapaneseGarden_RowStack + + + +class JapaneseGardenIII(JapaneseGardenII): + XROWS = 2 + YROWS = 4 + MAX_CARDS = 7 + XRESERVES = 0 + YRESERVES = 0 + DEAL_RESERVES = 0 + + +class SixSages(JapaneseGarden): + Hint_Class = CautiousDefaultHint + XROWS = 2 + YROWS = 3 + MAX_CARDS = 9 + XRESERVES = 1 + YRESERVES = 1 + MAX_RESERVE = 1 + INITIAL_DEAL = 8 + DEAL_RESERVES = 0 + + +class SixTengus(SixSages): + RowStack_Class = HanafudaRK_RowStack + HEIGHT = 5 + MAX_MOVE = 2 + XRESERVES = 0 + YRESERVES = 0 + + + +# /*********************************************************************** +# * Four Seasons +# ************************************************************************/ + +class FourSeasons(AbstractFlowerGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_card") + + # Set window size + self.setSize(l.XM + l.XS * 7, l.YM + l.YS * 5) + + # Create rows + x, y, offset = l.XM, l.YM, self.app.images.CARD_YOFFSET + for i in range(6): + s.rows.append(Samuri_RowStack(x, y, self, offset, max_cards=8, + max_accept=8, base_rank=0)) + x = x + l.XS + l.XM + (l.XM * (i == 2)) + x, y = l.XM, y + l.YS * 2.5 + for i in range(6): + s.rows.append(Samuri_RowStack(x, y, self, offset, max_cards=8, + max_accept=8, base_rank=0)) + x = x + l.XS + l.XM + (l.XM * (i == 2)) + self.setRegion(s.rows, (0, 0, 999999, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(-l.XS, -l.YS, self) + + # Define stack-groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 48 * self.gameinfo.decks + self.startDealSample() + for i in range(4): + self.s.talon.dealRow(flip=1) + + + # + # Game extras + # + + def isGameWon(self): + for r in self.s.rows: + cards = r.cards + if not len(cards) == 4: + return 0 + if not (cards[0].suit == r.id + and r.isHanafudaSequence(cards)): + return 0 + return 1 + + + +# /*********************************************************************** +# // Wisteria +# ************************************************************************/ + +class Wisteria(AbstractFlowerGame): + RowStack_Class = StackWrapper(Hanafuda_SequenceStack, base_rank=NO_RANK) + + # + # game layout + # + + def createGame(self, rows=13): + # create layout + l, s = Layout(self), self.s + + # set size + self.setSize(l.XM + rows * l.XS, l.YM + 6 * l.YS) + + # create stacks + x, y = self.width / 2 - l.XS * 3, l.YM + for i in range(2): + for suit in range(6): + s.foundations.append(Hanafuda_SS_FoundationStack(x, y, self, suit=suit + (6 * i))) + x = x + l.XS + x, y = self.width / 2 - l.XS * 3, y + l.YS + self.setRegion(self.s.foundations, (-999, -999, 999999, l.YM + l.YS * 2), priority=1) + x, y = l.XM, l.YM + l.YS * 2 + for i in range(rows): + stack = self.RowStack_Class(x, y, self, yoffset=l.YOFFSET) + s.rows.append(stack) + x = x + l.XS + s.talon = InitialDealTalonStack(l.XS, l.YS / 2, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + i = 0 + while self.s.talon.cards: + if self.s.talon.cards[-1].rank == 0: + if self.s.rows[i].cards: + i = i + 1 + self.s.talon.dealRow(rows=[self.s.rows[i]], frames=4) + + + +# /*********************************************************************** +# // Flower Arrangement Hint +# ************************************************************************/ + +class FlowerArrangement_Hint(AbstractHint): + def computeHints(self): + game = self.game + + # 2)See if we can move a card to the tableaux + if not self.hints: + for r in game.sg.dropstacks: + pile = r.getPile() + if not pile or len(pile) != 1: + continue + if r in game.s.tableaux: + rr = self.ClonedStack(r, stackcards=r.cards[:-1]) + if rr.acceptsCards(None, pile): + # do not move a card that is already in correct place + continue + base_score = 80000 + (4 - r.cap.base_suit) + else: + base_score = 80000 + # find a stack that would accept this card + for t in game.s.tableaux: + if t is not r and t.acceptsCards(r, pile): + score = base_score + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 3)See if we can move a card from the tableaux + # to a row stack. This can only happen if there are + # no more cards to deal. + if not self.hints: + for r in game.s.tableaux: + pile = r.getPile() + if not pile or len(pile) != 1: + continue + rr = self.ClonedStack(r, stackcards=r.cards[:-1]) + if rr.acceptsCards(None, pile): + # do not move a card that is already in correct place + continue + # find a stack that would accept this card + for t in game.s.rows: + if t is not r and t.acceptsCards(r, pile): + score = 70000 + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 4)See if we can move a card within the row stacks + if not self.hints: + for r in game.s.rows: + pile = r.getPile() + if not pile or len(pile) != 1 or len(pile) == len(r.cards): + continue + base_score = 60000 + # find a stack that would accept this card + for t in game.s.rows: + if t is not r and t.acceptsCards(r, pile): + score = base_score + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 5)See if we can deal cards + if self.level >= 2: + if game.canDealCards(): + self.addHint(self.SCORE_DEAL, 0, game.s.talon, None) + + +# /*********************************************************************** +# // Flower Arrangement Stacks +# ************************************************************************/ + +class FlowerArrangement_TableauStack(Flower_OpenStack): + def __init__(self, x, y, game, yoffset, **cap): + kwdefault(cap, dir=-1, max_move=1, max_cards=4, max_accept=1, base_rank=3) + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = yoffset + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + # check that the base card is correct + suits = range(self.cap.mod, (self.cap.mod + 4)) + if self.cards and (self.cards[0].rank == 3 + and self.cards[-1].suit in suits): + return self.isHanafudaSequence([self.cards[-1], cards[0]]) + return not self.cards and cards[0].rank == 3 and cards[0].suit in suits + + def getBottomImage(self): + return self.game.app.images.getSuitBottom() + + +class FlowerArrangement_RowStack(BasicRowStack): + + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + # check + return not (self.cards or self.game.s.talon.cards) + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + +# /*********************************************************************** +# // Flower Arrangement +# ************************************************************************/ + +class FlowerArrangement(Game): + Hint_Class = FlowerArrangement_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + TABLEAU_YOFFSET = min(9, max(3, l.YOFFSET / 3)) + + # set window + th = l.YS + 3 * TABLEAU_YOFFSET + # (set piles so that at least 2/3 of a card is visible with 10 cards) + h = (10-1)*l.YOFFSET + l.CH*2/3 + self.setSize(10*l.XS+l.XM, l.YM + 3*th + l.YM + h) + + # create stacks + s.addattr(tableaux=[]) # register extra stack variable + x = l.XM + 8 * l.XS + l.XS / 2 + y = l.YM + for i in range(3): + x = l.XM + for j in range(8): + s.tableaux.append(FlowerArrangement_TableauStack(x, y, self, TABLEAU_YOFFSET, mod=i * 4)) + x = x + l.XS + y = y + th + x, y = l.XM, y + l.YM + for i in range(8): + s.rows.append(FlowerArrangement_RowStack(x, y, self, max_accept=1)) + x = x + l.XS + x = l.XM + 8 * l.XS + l.XS / 2 + y = self.height - l.YS + s.talon = DealRowTalonStack(x, y, self) + l.createText(s.talon, "se") + + # define stack-groups + self.sg.openstacks = s.tableaux + s.rows + self.sg.talonstacks = [s.talon] + self.sg.dropstacks = s.tableaux + s.rows + + # + # game overrides + # + + def startGame(self): + self.s.talon.dealRow(rows=self.s.tableaux, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def isGameWon(self): + for stack in self.s.tableaux: + if len(stack.cards) != 4: + return 0 + return 1 + + def fillStack(self, stack): + if self.s.talon.cards: + if stack in self.s.rows and len(stack.cards) == 0: + self.s.talon.dealRow(rows=[stack]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 3 == card2.rank or card2.rank + 3 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + +# /*********************************************************************** +# * Register the games +# ************************************************************************/ + +def r(id, gameclass, name, game_type, decks, redeals): + game_type = game_type | GI.GT_HANAFUDA + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + suits=range(12), ranks=range(4)) + registerGame(gi) + return gi + +r(12369, Paulownia, 'Paulownia', GI.GT_HANAFUDA, 1, -1) +r(12370, LesserQueue, 'Lesser Queue', GI.GT_HANAFUDA, 2, 2) +r(12371, GreaterQueue, 'Greater Queue', GI.GT_HANAFUDA, 4, 2) +r(12373, JapaneseGarden, 'Japanese Garden', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12374, JapaneseGardenII, 'Japanese Garden II', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12375, SixSages, 'Six Sages', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12376, SixTengus, 'Six Tengus', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12377, JapaneseGardenIII, 'Japanese Garden III', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12378, FourSeasons, 'Four Seasons', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12380, Eularia, 'Eularia', GI.GT_HANAFUDA, 1, -1) +r(12381, Peony, 'Peony', GI.GT_HANAFUDA, 1, -1) +r(12382, Iris, 'Iris', GI.GT_HANAFUDA, 1, 0) +r(12383, Pine, 'Pine', GI.GT_HANAFUDA, 1, 0) +r(12384, Wisteria, 'Wisteria', GI.GT_HANAFUDA, 1, 0) +r(12385, FlowerArrangement, 'Flower Arrangement', GI.GT_HANAFUDA, 2, 0) + +del r diff --git a/pysollib/games/ultra/hanafuda_common.py b/pysollib/games/ultra/hanafuda_common.py new file mode 100644 index 00000000..933dc4cb --- /dev/null +++ b/pysollib/games/ultra/hanafuda_common.py @@ -0,0 +1,482 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [ + 'AbstractFlowerGame', + 'Queue_Hint', + 'Flower_FoundationStack', + 'Hanafuda_SS_FoundationStack', + 'FlowerClock_Foundation', + 'Gaji_Foundation', + 'Pagoda_Foundation', + 'MatsuKiri_Foundation', + 'GreatWall_FoundationStack', + 'FourWinds_Foundation', + 'Queue_Foundation', + 'Flower_OpenStack', + 'Hanafuda_SequenceStack', + 'Oonsoo_SequenceStack', + 'FlowerClock_RowStack', + 'Gaji_RowStack', + 'Matsukiri_RowStack', + 'Samuri_RowStack', + 'GreatWall_RowStack', + 'FourWinds_RowStack', + 'Queue_BraidStack', + 'Queue_RowStack', + 'Queue_ReserveStack', + 'JapaneseGarden_RowStack', + 'HanafudaRK_RowStack', + ] + + +import sys, math + +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# * +# ***********************************************************************/ + +class AbstractFlowerGame(Game): + SUITS = (_("Pine"), _("Plum"), _("Cherry"), _("Wisteria"), + _("Iris"), _("Peony"), _("Bush Clover"), _("Eularia"), + _("Chrysanthemum"), _("Maple"), _("Willow"), _("Paulownia")) + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.suit == card2.suit) + and ((card1.rank + 1 == card2.rank) + or (card1.rank - 1 == card2.rank))) + +class Queue_Hint(DefaultHint): + pass + + + +# /*********************************************************************** +# * Flower Foundation Stacks +# ***********************************************************************/ + +class Flower_FoundationStack(AbstractFoundationStack): + + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, max_cards=12, max_move=0, base_rank=ANY_RANK, base_suit=ANY_SUIT) + apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + + def updateText(self): + AbstractFoundationStack.updateText(self) + self.game.updateText() + + def isHanafudaSequence(self, s, strictness=1): + for i in range(len(s) - 1): + if s[i].suit != s[i + 1].suit: + return 0 + if s[i].suit == 10 or strictness: + a, b = s[i].rank, s[i + 1].rank + else: + a, b = self.swapTrashCards(s[i], s[i + 1]) + if a + 1 != b: + return 0 + return cardsFaceUp(s) + + def swapTrashCards(self, carda, cardb): + a, b = carda.rank, cardb.rank + if a == 3 and b == 2: + a, b = 2, 3 + elif a == 1 and b == 3: + b = 2 + return a, b + + +class Hanafuda_SS_FoundationStack(Flower_FoundationStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if not stackcards: + return cards[0].rank == 3 + return self.isHanafudaSequence([cards[0], stackcards[-1]]) + + def getBottomImage(self): + return self.game.app.images.getSuitBottom(self.cap.suit) + + +class FlowerClock_Foundation(Flower_FoundationStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if not stackcards: + return cards[0].rank == 3 + if not stackcards[-1].suit == cards[0].suit: + return 0 + return stackcards[-1].rank == cards[0].rank + 1 + + +class Gaji_Foundation(Flower_FoundationStack): + + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, max_move=1, min_cards=1, max_accept=1, base_suit=ANY_SUIT) + apply(Flower_FoundationStack.__init__, (self, x, y, game, suit), cap) + self.CARD_YOFFSET = self.game.app.images.CARD_YOFFSET + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + return ((((stackcards[-1].suit + 1) % 12) == cards[0].suit) + and (stackcards[-1].rank == cards[0].rank)) + + def getBottomImage(self): + return self.game.app.images.getLetter(self.cap.base_rank) + + +class Pagoda_Foundation(Flower_FoundationStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if not stackcards: + return cards[0].rank == 3 + a, b = stackcards[-1].rank, cards[0].rank + if len(stackcards) < 4: + return a - 1 == b + elif len(stackcards) > 4: + return a + 1 == b + else: + return a == b + + def getBottomImage(self): + return self.game.app.images.getSuitBottom(self.cap.suit) + + +class MatsuKiri_Foundation(Flower_FoundationStack): + + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, max_move=0, max_cards=48, max_accept=4, min_accept=4) + apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + self.CARD_YOFFSET = self.game.app.images.CARDH / 10 + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + if not self.isHanafudaSequence(cards, 0): + return 0 + stackcards = self.cards + if not stackcards: + return cards[0].suit == 0 + return stackcards[-1].suit + 1 == cards[0].suit + +## def getBottomImage(self): +## return self.game.app.images.getBraidBottom() + + +class GreatWall_FoundationStack(Flower_FoundationStack): + + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, max_cards=48, max_move=1, min_accept=1, max_accept=1) + apply(Flower_FoundationStack.__init__, (self, x, y, game, suit), cap) + self.CARD_YOFFSET = self.game.app.images.CARDH / 20 + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if stackcards: + return ((stackcards[-1].suit + 1) % 12 == cards[0].suit + and cards[0].rank == self.cap.base_rank) + else: + return cards[0].suit == 0 + + def getBottomImage(self): + return self.game.app.images.getLetter(self.cap.base_rank) + + +class FourWinds_Foundation(Flower_FoundationStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if not (cards[0].rank == self.cap.base_rank): + return 0 + if not stackcards: + return (cards[0].suit == 0) + else: + return (cards[0].suit == stackcards[-1].suit + 1) + +## def getBottomImage(self): +## return self.game.app.images.getLetter(self.cap.base_rank) + + +class Queue_Foundation(AbstractFoundationStack): + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, mod=12, dir=0, base_suit=ANY_SUIT, max_move=0) + apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if not self.cards: + return cards[0].suit == self.game.base_card.suit + stack_dir = self.game.getFoundationDir() + if stack_dir == 0: + card_dir = (cards[0].suit - self.cards[-1].suit) % 12 + return card_dir in (1, 11) + else: + return (self.cards[-1].suit + stack_dir) % 12 == cards[0].suit + + def getBottomImage(self): + return self.game.app.images.getLetter(self.cap.base_rank) + + + + +# /*********************************************************************** +# * Flower Row Stacks +# ***********************************************************************/ + +class Flower_OpenStack(OpenStack): + + def __init__(self, x, y, game, yoffset, **cap): + kwdefault(cap, max_move=99, max_cards=99, max_accept=99, base_rank=0, dir=1) + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = yoffset + + def isHanafudaSequence(self, cards, strictness=1): + c1 = cards[0] + for c2 in cards[1:]: + if c1.suit != c2.suit: + return 0 + if c1.suit == 10 or strictness: + a, b = c1.rank, c2.rank + else: + a, b = self.swapTrashCards(c1, c2) + if a + self.cap.dir != b: + return 0 + c1 = c2 + return 1 + + def swapTrashCards(self, carda, cardb): + a, b = carda.rank, cardb.rank + if a == 3 and b == 2: + a, b = 2, 3 + elif a == 1 and b == 3: + b = 2 + return a, b + + +class Hanafuda_SequenceStack(Flower_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isHanafudaSequence(cards)): + return 0 + stackcards = self.cards + if not len(stackcards): + return cards[0].rank == 0 or self.cap.base_rank == ANY_RANK + return self.isHanafudaSequence([stackcards[-1], cards[0]]) + + +class Oonsoo_SequenceStack(Flower_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isHanafudaSequence(cards, 0)): + return 0 + stackcards = self.cards + if not len(stackcards): + return cards[0].rank == 0 or self.cap.base_rank == ANY_RANK + return self.isHanafudaSequence([stackcards[-1], cards[0]], 0) + + +class FlowerClock_RowStack(Flower_OpenStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if not len(stackcards): + return 1 + return stackcards[-1].rank + 1 == cards[0].rank + + +class Gaji_RowStack(Flower_OpenStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if ((not len(stackcards)) + or ((stackcards[-1].suit == 10) and (stackcards[-1].rank == 3)) + or ((cards[0].suit == 10) and (cards[0].rank == 3))): + return 1 + elif stackcards[-1].suit != cards[0].suit: + return 0 + a, b = self.swapTrashCards(stackcards[-1], cards[0]) + return a + 1 == b + + +class Matsukiri_RowStack(Flower_OpenStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if not stackcards: + return cards[0].rank == 0 + if cards[0].suit != stackcards[-1].suit: + return 0 + if stackcards[-1].suit == 10 or self.game.Strictness: + a, b = stackcards[-1].rank, cards[0].rank + else: + a, b = self.swapTrashCards(stackcards[-1], cards[0]) + return a + 1 == b + + def canDropCards(self, stacks): + pile = self.getPile() + if not pile or len(pile) <= 3: + return (None, 0) + f = self.game.s.foundations[0] + if not f.cards: + suit = 0 + else: + suit = f.cards[-1].suit + 1 + if not pile[-1].suit == suit or not self.isHanafudaSequence(pile[-4:], 0): + return (None, 0) + return (f, 4) + + +class Samuri_RowStack(Flower_OpenStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if not stackcards: + return cards[0].rank == 0 + return stackcards[-1].suit == cards[0].suit and stackcards[-1].rank + 1 == cards[0].rank + + +class GreatWall_RowStack(Flower_OpenStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if not stackcards: + return cards[0].rank == 0 + if cards[0].rank == stackcards[-1].rank: + return stackcards[-1].suit == (cards[0].suit + 1) % 12 + a, b = self.swapTrashCards(stackcards[-1], cards[0]) + return a + 1 == b + + +class FourWinds_RowStack(Flower_OpenStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if len(cards) - 1 or len(stackcards) >= 3: + return 0 + if not stackcards: + return 1 + return ((cards[0].rank == stackcards[-1].rank) and (cards[0].suit == stackcards[-1].suit - 1)) + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class Queue_BraidStack(OpenStack): + + def __init__(self, x, y, game, yoffset): + OpenStack.__init__(self, x, y, game) + CW = self.game.app.images.CARDW + self.CARD_YOFFSET = int(self.game.app.images.CARD_YOFFSET * yoffset) + # use a sine wave for the x offsets + # compensate for card width + offset = self.game.app.images.CARDW / 1.7 + self.CARD_XOFFSET = [] + j = 1 + for i in range(20): + self.CARD_XOFFSET.append(int(math.sin(j) * offset)) + j = j + .9 + + +class Queue_RowStack(ReserveStack): + + def fillStack(self): + if not self.cards and self.game.s.braid.cards: + self.game.moveMove(1, self.game.s.braid, self) + + def getBottomImage(self): + return self.game.app.images.getBraidBottom() + + +class Queue_ReserveStack(ReserveStack): + + def acceptsCards(self, from_stack, cards): + if from_stack is self.game.s.braid or from_stack in self.game.s.rows: + return 0 + return ReserveStack.acceptsCards(self, from_stack, cards) + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + +class JapaneseGarden_RowStack(Flower_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not from_stack in self.game.s.rows): + return 0 + stackcards = self.cards + if not len(stackcards): + return 1 + return stackcards[-1].rank + 1 == cards[0].rank + + +class HanafudaRK_RowStack(Flower_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not isRankSequence(cards, dir=1)): + return 0 + stackcards = self.cards + if not len(stackcards): + return 1 + return stackcards[-1].rank + 1 == cards[0].rank + + + + + + diff --git a/pysollib/games/ultra/hexadeck.py b/pysollib/games/ultra/hexadeck.py new file mode 100644 index 00000000..ae236aff --- /dev/null +++ b/pysollib/games/ultra/hexadeck.py @@ -0,0 +1,1405 @@ +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 by T. Kirk +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys, math + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // Hex A Deck Foundation Stacks +# ************************************************************************/ + +class HexADeck_FoundationStack(SS_FoundationStack): + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, max_move=0, max_cards=12) + apply(SS_FoundationStack.__init__, (self, x, y, game, suit), cap) + + +class HexATrump_Foundation(HexADeck_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + for s in self.game.s.foundations[:3]: + if len(s.cards) != 16: + return 0 + return 1 + + +class Merlins_Foundation(AbstractFoundationStack): + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, mod=16, dir=0, base_rank=NO_RANK, max_move=0) + apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if not self.cards: + return 1 + stack_dir = self.game.getFoundationDir() + if stack_dir == 0: + card_dir = (cards[0].rank - self.cards[-1].rank) % self.cap.mod + return card_dir in (1, 15) + else: + return (self.cards[-1].rank + stack_dir) % self.cap.mod == cards[0].rank + + +# /*********************************************************************** +# // Hex A Deck Row Stacks +# ************************************************************************/ + +class HexADeck_OpenStack(OpenStack): + + def __init__(self, x, y, game, yoffset, **cap): + kwdefault(cap, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS, dir=-1) + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = yoffset + + def isRankSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not c1.rank + dir == c2.rank: + return 0 + c1 = c2 + return 1 + + def isAlternateColorSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if (c1.color < 2 and c1.color == c2.color + or not c1.rank + dir == c2.rank): + return 0 + c1 = c2 + return 1 + + def isSuitSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not ((c1.color == 2 or c2.color == 2 + or c1.suit == c2.suit) + and c1.rank + dir == c2.rank): + return 0 + c1 = c2 + return 1 + + +class HexADeck_RK_RowStack(HexADeck_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isRankSequence(cards)): + return 0 + if not self.cards: + return cards[0].rank == 15 or self.cap.base_rank == ANY_RANK + return self.isRankSequence([self.cards[-1], cards[0]]) + + def canMoveCards(self, cards): + return (self.basicCanMoveCards(cards) + and self.isRankSequence(cards)) + + +class HexADeck_AC_RowStack(HexADeck_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isAlternateColorSequence(cards)): + return 0 + if not self.cards: + return cards[0].rank == 15 or self.cap.base_rank == ANY_RANK + return self.isAlternateColorSequence([self.cards[-1], cards[0]]) + + def canMoveCards(self, cards): + return (self.basicCanMoveCards(cards) + and self.isAlternateColorSequence(cards)) + + +class HexADeck_SS_RowStack(HexADeck_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isSuitSequence(cards)): + return 0 + if not self.cards: + return cards[0].rank == 15 or self.cap.base_rank == ANY_RANK + return self.isSuitSequence([self.cards[-1], cards[0]]) + + def canMoveCards(self, cards): + return (self.basicCanMoveCards(cards) + and self.isSuitSequence(cards)) + + +class Bits_RowStack(ReserveStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if stackcards or cards[0].suit == 4: + return 0 + i = int(self.id / 4) + for r in self.game.s.rows[i * 4:self.id]: + if not r.cards: + return 0 + return ((self.game.s.foundations[i].cards[-1].rank + 1 + >> (self.id % 4)) % 2 == (cards[0].rank + 1) % 2) + + +class Bytes_RowStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if stackcards or cards[0].suit == 4: + return 0 + id = self.id - 16 + i = int(id / 2) + for r in self.game.s.rows[16 + i * 2:self.id]: + if not r.cards: + return 0 + return self.game.s.foundations[i].cards[-1].rank == cards[0].rank + + +class HexAKlon_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if stackcards: + if (stackcards[-1].suit == 4 or cards[0].suit == 4): + return 1 + return AC_RowStack.acceptsCards(self, from_stack, cards) + + +class HexADeck_ACRowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + stackcards = self.cards + if stackcards: + if (stackcards[-1].suit == 4 or cards[0].suit == 4): + return stackcards[-1].rank == cards[0].rank + 1 + return AC_RowStack.acceptsCards(self, from_stack, cards) + + +class Familiar_ReserveStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return 0 + # Only take Wizards + return cards[0].suit == 4 + + def getBottomImage(self): + return self.game.app.images.getSuitBottom(4) + + +class Merlins_BraidStack(OpenStack): + def __init__(self, x, y, game): + OpenStack.__init__(self, x, y, game) + CW = self.game.app.images.CARDW + self.CARD_YOFFSET = self.game.app.images.CARD_YOFFSET + # use a sine wave for the x offsets + self.CARD_XOFFSET = [] + j = 1 + for i in range(20): + self.CARD_XOFFSET.append(int(math.sin(j) * 20)) + j = j + .9 + + +class Merlins_RowStack(ReserveStack): + def fillStack(self): + if not self.cards and self.game.s.braid.cards: + self.game.moveMove(1, self.game.s.braid, self) + + def getBottomImage(self): + return self.game.app.images.getBraidBottom() + + +class Merlins_ReserveStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if from_stack is self.game.s.braid or from_stack in self.game.s.rows: + return 0 + return ReserveStack.acceptsCards(self, from_stack, cards) + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class AbstractHexADeckGame(Game): + RANKS = (_("Ace"), "2", "3", "4", "5", "6", "7", "8", "9", + "A", "B", "C", "D", "E", "F", "10") + + +class Merlins_Hint(DefaultHint): + pass + + +# /*********************************************************************** +# // Bits n Bytes +# ************************************************************************/ + +class BitsNBytes(Game): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + self.setSize(l.XM * 4 + l.XS * 8, l.YM + l.YS * 4) + + # Create bit stacks + self.bit_texts = [] + y = l.YM + for j in range(4): + x = l.XM * 4 + l.XS * 7 + for i in range(4): + s.rows.append(Bits_RowStack(x, y, self, max_cards=1, + max_accept=1, base_suit=j, max_move=0)) + self.bit_texts.append(MfxCanvasText(self.canvas, x + l.CW / 2 , y + l.CH / 2, + anchor="center", font=font)) + x = x - l.XS + y = y + l.YS + + # Create byte stacks + y = l.YM + for j in range(4): + x = l.XM * 3 + l.XS * 3 + for i in range(2): + s.rows.append(Bytes_RowStack(x, y, self, max_cards=1, + max_accept=1, base_suit=ANY_SUIT, max_move=0)) + x = x - l.XS + y = y + l.YS + + # Create foundations + x = l.XM * 2 + l.XS + y = l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, i, mod=1, + max_move=0, max_cards=1)) + y = y + l.YS + self.setRegion(s.rows, (0, 0, 999999, 999999)) + + # Create talon + x = l.XM + y = l.YM + s.talon = WasteTalonStack(x, y, self, num_deal=2, max_rounds=2) + l.createText(s.talon, "ss") + y = y + l.YS + l.YM * 2 + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def updateText(self): + if self.preview > 1: + return + for j in range(4): + if not len(self.s.foundations[j].cards): + break + s = self.s.foundations[j].cards[-1].rank + 1 + for i in range(4): + self.bit_texts[i + j * 4].config(text = str(s % 2)) + s = int(s / 2) + + def _shuffleHook(self, cards): + topcards, ranks = [None] * 4, [None] * 4 + for c in cards[:]: + if not c.suit == 4: + if not topcards[c.suit]: + haverank = 0 + for i in range(4): + if c.rank == ranks[i]: + haverank = 1 + if not haverank: + topcards[c.suit] = c + ranks[c.suit] = c.rank + cards.remove(c) + cards = topcards + cards + cards.reverse() + return cards + + def startGame(self): + assert len(self.s.talon.cards) == 68 + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealCards() + + def isGameWon(self): + for s in self.s.rows: + if not s.cards: + return 0 + return 1 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return 0 + + +# /*********************************************************************** +# // Hex A Klon +# ************************************************************************/ + +class HexAKlon(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = HexAKlon_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=-1, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=8, waste=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations[:4]: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + r = l.s.foundations[4] + s.foundations.append(HexATrump_Foundation(r.x, r.y, self, 4, mod=4, + max_move=0, max_cards=4, base_rank=ANY_RANK)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=ANY_RANK)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 + for i in range(len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Hex A Klon by Threes +# ************************************************************************/ + +class HexAKlonByThrees(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = HexAKlon_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=-1, num_deal=3, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=8, waste=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations[:4]: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + r = l.s.foundations[4] + s.foundations.append(HexATrump_Foundation(r.x, r.y, self, 4, mod=4, + max_move=0, max_cards=4, base_rank=ANY_RANK)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=ANY_RANK)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 + for i in range(len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // King Only Hex A Klon +# ************************************************************************/ + +class KingOnlyHexAKlon(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = HexAKlon_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=-1, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=8, waste=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations[:4]: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + r = l.s.foundations[4] + s.foundations.append(HexATrump_Foundation(r.x, r.y, self, 4, mod=4, + max_move=0, max_cards=4, base_rank=ANY_RANK)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=15)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 + for i in range(len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def _shuffleHook(self, cards): + basecard = [None] + for c in cards[:]: + if c.suit == 4: + if basecard[0] == None: + basecard[0] = c + cards.remove(c) + cards = basecard + cards + cards.reverse() + return cards + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Klondike Plus 16 +# ************************************************************************/ + +class KlondikePlus16(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = HexAKlon_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=2, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=8, waste=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=15)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 + for i in range(len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // The Familiar +# ************************************************************************/ + +class TheFamiliar(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=2, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=8, waste=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=15)) + + # Create reserve + x, y = l.XM, self.height - l.YS + s.reserves.append(Familiar_ReserveStack(x, y, self, max_cards=3)) + self.setRegion(s.reserves, (-999, y - l.YM, x + l.XS, 999999), priority=1) + l.createText(s.reserves[0], "se") + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 + for i in range(len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Two Familiars +# ************************************************************************/ + +class TwoFamiliars(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=2, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=12, waste=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=15)) + + # Create reserve + x, y = l.XM, self.height - l.YS + s.reserves.append(Familiar_ReserveStack(x, y, self, max_cards=3)) + self.setRegion(s.reserves, (-999, y - l.YM, x + l.XS, 999999), priority=1) + l.createText(s.reserves[0], "se") + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 * 2 + for i in range(len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Ten by Eight +# ************************************************************************/ + +class TenByEight(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.gypsyLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=-1, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=10, waste=1, playcards=30) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=ANY_RANK)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 * 2 + frames = 0 + for i in range(8): + if i == 5: + frames = -1 + self.startDealSample() + self.s.talon.dealRow(frames=frames) + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Drawbridge +# ************************************************************************/ + +class Drawbridge(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.harpLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=2, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=7, waste=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=ANY_RANK)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 + for i in range(len(self.s.rows) - 1): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Double Drawbridge +# ************************************************************************/ + +class DoubleDrawbridge(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.harpLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=2, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=10, waste=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=ANY_RANK)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 * 2 + for i in range(len(self.s.rows) - 1): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Hidden Passages +# ************************************************************************/ + +class HiddenPassages(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=2, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=7, waste=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations[:4]: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + r = l.s.foundations[4] + s.foundations.append(HexATrump_Foundation(r.x, r.y, self, 4, mod=4, + max_move=0, max_cards=4, base_rank=ANY_RANK)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=ANY_RANK)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + def _shuffleHook(self, cards): + topcards = [None] * 4 + for c in cards[:]: + if c.rank == 0 and not c.suit == 4: + topcards[c.suit] = c + cards.remove(c) + cards = topcards + cards + cards.reverse() + return cards + + def startGame(self): + assert len(self.s.talon.cards) == 68 + self.s.talon.dealRow(rows=self.s.foundations[:4], frames=0) + for i in range(2): + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Cluitjar's Lair +# ************************************************************************/ + +class CluitjarsLair(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = HexADeck_ACRowStack + + # + # Game layout + # + + def createGame(self, max_rounds=1, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=7, waste=1, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations[:4]: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + r = l.s.foundations[4] + s.foundations.append(HexATrump_Foundation(r.x, r.y, self, 4, mod=4, + max_move=0, max_cards=4, base_rank=ANY_RANK)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=ANY_RANK)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + def startGame(self): + assert len(self.s.talon.cards) == 68 + for i in range(2): + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Merlin's Meander +# ************************************************************************/ + +class MerlinsMeander(AbstractHexADeckGame): + Hint_Class = Merlins_Hint + MERLINS_CARDS = 20 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 20 cards are playable - needed for Braid_BraidStack) + h = max(4*l.YS + 30, l.YS+(self.MERLINS_CARDS-1)*l.YOFFSET) + self.setSize(10*l.XS+l.XM, l.YM + h) + + # extra settings + self.base_card = None + + # Create rows, reserves + s.addattr(braid=None) # register extra stack variable + x, y = l.XM, l.YM + for i in range(2): + s.rows.append(Merlins_RowStack(x + l.XS * 0.5, y, self)) + s.rows.append(Merlins_RowStack(x + l.XS * 4.5, y, self)) + s.reserves.append(Familiar_ReserveStack(x + l.XS * 6.5, y, self, max_cards=3)) + y = y + l.YS * 3 + y = l.YM + l.YS + for i in range(2): + s.rows.append(Merlins_ReserveStack(x, y, self)) + s.rows.append(Merlins_ReserveStack(x + l.XS, y, self)) + s.rows.append(Merlins_ReserveStack(x, y + l.YS, self)) + s.rows.append(Merlins_ReserveStack(x + l.XS, y + l.YS, self)) + x = x + l.XS * 4 + + # Create braid + x, y = l.XM + l.XS * 2.2, l.YM + s.braid = Merlins_BraidStack(x, y, self) + + # Create talon, waste + x, y = l.XM + l.XS * 7, l.YM + l.YS * 1.5 + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, "ss") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + x + l.CW / 2, y - l.YM, + anchor="s", + font=self.app.getFont("canvas_default")) + x = x - l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # Create foundations + x, y = l.XM + l.XS * 8, l.YM + for i in range(4): + s.foundations.append(Merlins_Foundation(x, y, self, i, mod=16, + max_cards=16, base_rank=ANY_RANK)) + s.foundations.append(Merlins_Foundation(x + l.XS, y, self, i, mod=16, + max_cards=16, base_rank=ANY_RANK)) + y = y + l.YS + self.texts.info = MfxCanvasText(self.canvas, + x + l.CW + l.XM / 2, y, + anchor="n", + font=self.app.getFont("canvas_default")) + + # define stack-groups + self.sg.talonstacks = [s.talon] + [s.waste] + self.sg.openstacks = s.foundations + s.rows + s.reserves + self.sg.dropstacks = [s.braid] + s.rows + [s.waste] + s.reserves + + + # + # game overrides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 * 2 + self.startDealSample() + self.base_card = None + self.updateText() + for i in range(self.MERLINS_CARDS): + self.s.talon.dealRow(rows=[self.s.braid]) + self.s.talon.dealRow() + # deal base_card to foundations, update cap.base_rank + self.base_card = self.s.talon.getCard() + while self.base_card.suit == 4: + self.s.talon.cards.remove(self.base_card) + self.s.talon.cards.insert(0, self.base_card) + self.base_card = self.s.talon.getCard() + to_stack = self.s.foundations[2 * self.base_card.suit] + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, to_stack) + self.updateText() + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + # deal first card to WasteStack + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % 16 == card2.rank or (card2.rank + 1) % 16 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + + # + # game extras + # + + def updateText(self): + if self.preview > 1 or not self.texts.info: + return + if not self.base_card: + t = "" + else: + t = self.RANKS[self.base_card.rank] + dir = self.getFoundationDir() % 16 + if dir == 1: + t = t + _(" Ascending") + elif dir == 15: + t = t + _(" Descending") + self.texts.info.config(text=t) + + def isGameWon(self): + for s in self.s.rows: + if s.cards and s.cards[0].suit != 4: + return 0 + if not len(self.s.talon.cards) and len(self.s.waste.cards) == 1: + return self.s.waste.cards[0].suit == 4 + return len(self.s.talon.cards) + len(self.s.waste.cards) == 0 + + +# /*********************************************************************** +# // Mage's Game +# ************************************************************************/ + +class MagesGame(Game): + Hint_Class = CautiousDefaultHint + Layout_Method = Layout.gypsyLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack + + # + # Game layout + # + + def createGame(self, max_rounds=1, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=12, texts=0, playcards=20) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds=max_rounds, num_deal=num_deal) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=16, max_cards=16, max_move=1)) + + # Create rows + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit=ANY_SUIT, base_rank=ANY_RANK)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 68 + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.rows[2:10]) + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Convolution(AbstractHexADeckGame): + RowStack_Class = StackWrapper(HexADeck_RK_RowStack, base_rank=NO_RANK) + + # + # game layout + # + + def createGame(self, rows=9, reserves=8): + # create layout + l, s = Layout(self), self.s + + # set size + maxrows = max(rows, reserves) + self.setSize(l.XM + (maxrows + 2) * l.XS, l.YM + 6 * l.YS) + + # + playcards = 4 * l.YS / l.YOFFSET + xoffset, yoffset = [], [] + for i in range(playcards): + xoffset.append(0) + yoffset.append(l.YOFFSET) + for i in range(68 * self.gameinfo.decks - playcards): + xoffset.append(l.XOFFSET) + yoffset.append(0) + + # create stacks + x, y = l.XM + (maxrows - reserves) * l.XS / 2, l.YM + for i in range(reserves): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + x, y = l.XM + (maxrows - rows) * l.XS / 2, l.YM + l.YS + self.setRegion(s.reserves, (-999, -999, 999999, y - l.YM / 2)) + for i in range(rows): + stack = self.RowStack_Class(x, y, self, yoffset=yoffset) + stack.CARD_XOFFSET = xoffset + stack.CARD_YOFFSET = yoffset + s.rows.append(stack) + x = x + l.XS + x, y = l.XM + maxrows * l.XS, l.YM + for i in range(2): + for suit in range(5): + s.foundations.append(SS_FoundationStack(x, y, self, suit=suit, max_cards=16)) + y = y + l.YS + x, y = x + l.XS, l.YM + self.setRegion(self.s.foundations, (x - l.XS * 2, -999, 999999, + self.height - (l.YS + l.YM)), priority=1) + s.talon = InitialDealTalonStack(self.width - 3 * l.XS / 2, self.height - l.YS, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + i = 0 + while self.s.talon.cards: + if self.s.talon.cards[-1].rank == 15: + if self.s.rows[i].cards: + i = i + 1 + self.s.talon.dealRow(rows=[self.s.rows[i]], frames=4) + + # must look at cards + def _getClosestStack(self, cx, cy, stacks, dragstack): + closest, cdist = None, 999999999 + for stack in stacks: + if stack.cards and stack is not dragstack: + dist = (stack.cards[-1].x - cx)**2 + (stack.cards[-1].y - cy)**2 + else: + dist = (stack.x - cx)**2 + (stack.y - cy)**2 + if dist < cdist: + closest, cdist = stack, dist + return closest + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isRankSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Labyrinth(Convolution): + RowStack_Class = StackWrapper(HexADeck_AC_RowStack, base_rank=NO_RANK) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isAlternateColorSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Snakestone(Convolution): + RowStack_Class = StackWrapper(HexADeck_SS_RowStack, base_rank=NO_RANK) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isSuitSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + + + +# /*********************************************************************** +# // +# ************************************************************************/ + +def r(id, gameclass, name, game_type, decks, redeals): + game_type = game_type | GI.GT_HEXADECK + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + suits=range(4), ranks=range(16), trumps=range(4)) + registerGame(gi) + return gi + + +r(165, BitsNBytes, 'Bits n Bytes', GI.GT_HEXADECK, 1, 1) +r(166, HexAKlon, 'Hex A Klon', GI.GT_HEXADECK, 1, -1) +r(16666, KlondikePlus16, 'Klondike Plus 16', GI.GT_HEXADECK, 1, 1) +r(16667, HexAKlonByThrees, 'Hex A Klon by Threes', GI.GT_HEXADECK, 1, -1) +r(16668, KingOnlyHexAKlon, 'King Only Hex A Klon', GI.GT_HEXADECK, 1, -1) +r(16669, TheFamiliar, 'The Familiar', GI.GT_HEXADECK, 1, 1) +r(16670, TwoFamiliars, 'Two Familiars', GI.GT_HEXADECK, 2, 1) +r(16671, TenByEight, '10 x 8', GI.GT_HEXADECK, 2, -1) +r(16672, Drawbridge, 'Drawbridge', GI.GT_HEXADECK, 1, 1) +r(16673, DoubleDrawbridge, 'Double Drawbridge', GI.GT_HEXADECK, 2, 1) +r(16674, HiddenPassages, 'Hidden Passages', GI.GT_HEXADECK, 1, 1) +r(16675, CluitjarsLair, 'Cluitjar\'s Lair', GI.GT_HEXADECK, 1, 0) +r(16676, MerlinsMeander, 'Merlin\'s Meander', GI.GT_HEXADECK, 2, 2) +r(16677, MagesGame, 'Mage\'s Game', GI.GT_HEXADECK, 1, 0) +r(16678, Convolution, 'Convolution', GI.GT_HEXADECK, 2, 0) +r(16679, Labyrinth, 'Hex Labyrinth', GI.GT_HEXADECK, 2, 0) +r(16680, Snakestone, 'Snakestone', GI.GT_HEXADECK, 2, 0) + +del r diff --git a/pysollib/games/ultra/larasgame.py b/pysollib/games/ultra/larasgame.py new file mode 100644 index 00000000..d7124feb --- /dev/null +++ b/pysollib/games/ultra/larasgame.py @@ -0,0 +1,774 @@ +##---------------------------------------------------------------------------## +## +## Ultrasol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Matthew Hohlfeld +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys, types + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class LarasGame_Hint(CautiousDefaultHint): + pass + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class LarasGame_Talon(WasteTalonStack): + # Deal a card to each of the RowStacks. Then deal + # cards to the talon. Return number of cards dealt. + def dealRow(self, rows=None, flip=1, reverse=0, frames=-1): + game = self.game + if rows is None: + rows = game.s.rows + old_state = game.enterState(game.S_DEAL) + cards = self.dealToStacks(rows[:game.MAX_ROW], flip, reverse, frames) + for i in range(game.DEAL_TO_TALON): + if self.cards: + game.moveMove(1, self, game.s.rows[-1], frames=frames) + cards = cards + 1 + game.leaveState(old_state) + return cards + + def dealToStacks(self, stacks, flip=1, reverse=0, frames=-1): + game = self.game + i, move = 0, game.moveMove + for r in stacks: + if not self.cards: + return 0 + assert not self.getCard().face_up + assert r is not self + if flip: + game.flipMove(self) + move(1, self, r, frames=frames) + # Dealing has extra rules in this game type: + # If card rank == card location then add one card to talon + # If card rank == ACE then add two cards to talon + # If card rank == JACK, or higher then add one card to talon + # After all the rows have been dealt, deal cards to talon in self.dealRow + rank = r.getCard().rank + if rank == i: # Is the rank == position? + if not self.cards: + return 0 + move(1, self, game.s.rows[-1], frames=frames) + i = i + 1 + if rank == 0: # Is this an Ace? + for j in range(2): + if not self.cards: + return 0 + move(1, self, game.s.rows[-1], frames=frames) + if rank >= 10: # Is it a Jack or better? + if not self.cards: + return 0 + move(1, self, game.s.rows[-1], frames=frames) + return len(stacks) + + def dealCards(self, sound=0): + game = self.game + for r in game.s.reserves[:20]: + while r.cards: + game.moveMove(1, r, game.s.rows[game.active_row], frames=3, shadow=0) + if self.cards: + game.active_row = self.getActiveRow() + game.flipMove(self) + game.moveMove(1, self, game.s.reserves[0], frames=4, shadow=0) + ncards = len(game.s.rows[game.active_row].cards) + if ncards >= 20: + # We have encountered an extreme situation. + # In some game type variations it's possible + # to have up to 28 cards on a row stack. + # We'll have to double up on some of the reserves. + for i in range(ncards - 19): + game.moveMove(1, game.s.rows[game.active_row], + game.s.reserves[19 - i], frames=4, shadow=0) + ncards = len(game.s.rows[game.active_row].cards) + assert ncards <= 19 + for i in range(ncards): + game.moveMove(1, game.s.rows[game.active_row], + game.s.reserves[ncards - i], frames=4, shadow=0) + return len(self.cards) or self.canDealCards() + if self.round < self.max_rounds: + num_cards = 0 + rows = list(game.s.rows)[:game.MAX_ROW] + rows.reverse() + for r in rows: + while r.cards: + num_cards = num_cards + 1 + if r.cards[-1].face_up: + game.flipMove(r) + game.moveMove(1, r, self, frames=0) + assert len(self.cards) == num_cards + if num_cards == 0: + return 0 + game.nextRoundMove(self) + game.dealToRows() + if sound: + game.stopSamples() + return len(self.cards) + + def canDealCards(self): + if self.game.demo and self.game.moves.index >= 400: + return 0 + return (self.cards or (self.round < self.max_rounds and not self.game.isGameWon())) + + def updateText(self): + if self.game.preview > 1: + return + WasteTalonStack.updateText(self, update_rounds=0) + if not self.max_rounds - 1: + return + t = _("Round %d") % self.round + self.texts.rounds.config(text=t) + + def getActiveRow(self): + return self.getCard().rank + + + +class DojoujisGame_Talon(LarasGame_Talon): + + def getActiveRow(self): + card = self.getCard() + return card.rank + card.deck * 4 + + + +class DoubleKalisGame_Talon(LarasGame_Talon): + + def getActiveRow(self): + card = self.getCard() + return card.rank + card.deck * 12 + + + +class LarasGame_RowStack(OpenStack): + def __init__(self, x, y, game, yoffset = 1, **cap): + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = yoffset + + + +class LarasGame_ReserveStack(OpenStack): + pass + + + +class BridgetsGame_Reserve(OpenStack): + + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + if not self.cards: + return from_stack in self.game.s.foundations and cards[0].suit == 4 + return from_stack in self.game.s.rows + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + + +class LarasGame_Reserve(BridgetsGame_Reserve): + + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + return from_stack in self.game.s.rows + + + +# /*********************************************************************** +# // Lara's Game +# ************************************************************************/ + +class LarasGame(Game): + Hint_Class = LarasGame_Hint + Talon_Class = LarasGame_Talon + Reserve_Class = None + DEAL_TO_TALON = 2 + MAX_ROUNDS = 1 + ROW_LENGTH = 4 + MAX_ROW = 13 + DIR = (-1, 1) + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + ROW_LENGTH = self.ROW_LENGTH + + # set window + w, h = l.XM + l.XS * (ROW_LENGTH + 5), l.YM + l.YS * (ROW_LENGTH + (ROW_LENGTH != 6)) + self.setSize(w, h) + + # extra settings + self.active_row = None + + # Create foundations + x, y = l.XM, l.YM + for j in range(2): + for i in range(ROW_LENGTH): + s.foundations.append(SS_FoundationStack(x, y, self, self.Base_Suit(i, j), + max_cards = self.Max_Cards(i), mod = self.Mod(i), + dir = self.DIR[j], base_rank = self.Base_Rank(i, j))) + y = y + l.YS * (not j) + x = x + l.XS * j + x, y = x + l.XS * 2, l.YM + + # Create rows + x, y = l.XM + l.XS, y + l.YS + for i in range(self.MAX_ROW): + s.rows.append(LarasGame_RowStack(x, y, self)) + x = x + l.XS + if i == ROW_LENGTH or i == ROW_LENGTH * 2 + 1 or i == ROW_LENGTH * 3 + 2: + x, y = l.XM + l.XS, y + l.YS + + # Create reserves + x, y = l.XM + l.XS * (ROW_LENGTH == 6), l.YM + l.YS * (ROW_LENGTH - (ROW_LENGTH == 6)) + for i in range(20): + s.reserves.append(LarasGame_ReserveStack(x, y, self, max_cards=2)) + x = x + l.XS * (i < (ROW_LENGTH + 4)) - l.XS * (i == (ROW_LENGTH + 9)) + y = y - l.YS * (i > (ROW_LENGTH + 3) and i < (ROW_LENGTH + 9)) + l.YS * (i > (ROW_LENGTH + 9)) + + # Create talon + x, y = l.XM + l.XS * (ROW_LENGTH + 2), h - l.YM - l.YS * 3 + s.talon = self.Talon_Class(x, y, self, max_rounds=self.MAX_ROUNDS) + l.createText(s.talon, "s") + if self.MAX_ROUNDS - 1: + s.talon.texts.rounds = MfxCanvasText(self.canvas, + x + l.XS / 2, y - l.YM, + anchor="center", + font=self.app.getFont("canvas_default")) + y = h - l.YS * 2 + s.rows.append(LarasGame_RowStack(x, y, self, yoffset=0)) + + # Define stack-groups (not default) + self.sg.openstacks = s.foundations + s.rows[:self.MAX_ROW] + self.sg.talonstacks = [s.talon] + s.rows[-1:] + self.sg.dropstacks = s.rows[:self.MAX_ROW] + s.reserves + + # Create relaxed reserve + if self.Reserve_Class != None: + x, y = l.XM + l.XS * (ROW_LENGTH + 2), l.YM + l.YS * .5 + s.reserves.append(self.Reserve_Class(x, y, self, + max_accept=1, max_cards=self.Reserve_Cards)) + self.sg.openstacks = self.sg.openstacks + s.reserves[19:] + self.sg.dropstacks = self.sg.dropstacks + s.reserves[19:] + self.setRegion(s.reserves[19:], (x - l.XM / 2, 0, 99999, 99999)) + + # + # Game extras + # + + def Max_Cards(self, i): + return 13 + + def Mod(self, i): + return 13 + + def Base_Rank(self, i, j): + return 12 * (not j) + + def Deal_Rows(self, i): + return 13 + + def Base_Suit(self, i, j): + return i + + # + # game overrides + # + + def startGame(self): + assert len(self.s.talon.cards) == self.gameinfo.ncards + self.dealToRows() + + def dealToRows(self): + frames, ncards = 0, len(self.s.talon.cards) + for i in range(8): + if not self.s.talon.cards: + break + if i == 4 or len(self.s.talon.cards) <= ncards / 2: + self.startDealSample() + frames = 4 + self.s.talon.dealRow(rows=self.s.rows[:self.Deal_Rows(i)], frames=frames) + self.moveMove(len(self.s.rows[-1].cards), self.s.rows[-1], self.s.talon, frames=0) + self.active_row = None + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + i, j = (stack1 in self.s.foundations), (stack2 in self.s.foundations) + if not (i or j): return 0 + if i: stack = stack1 + else: stack = stack2 + i = 0 + for f in self.s.foundations: + if f == stack: break + i = i + 1 % self.ROW_LENGTH + return (card1.suit == card2.suit and + ((card1.rank + 1) % self.Mod(i) == card2.rank + or (card1.rank - 1) % self.Mod(i) == card2.rank)) + + def getHighlightPilesStacks(self): + return () + + # Finish the current move. + # Append current active_row to moves.current. + # Append moves.current to moves.history. + def finishMove(self): + moves, stats = self.moves, self.stats + if not moves.current: + return 0 + # invalidate hints + self.hints.list = None + # resize (i.e. possibly shorten list from previous undos) + if not moves.index == 0: + m = moves.history[len(moves.history) - 1] + del moves.history[moves.index : ] + # update stats + if self.demo: + stats.demo_moves = stats.demo_moves + 1 + if moves.index == 0: + stats.player_moves = 0 # clear all player moves + else: + stats.player_moves = stats.player_moves + 1 + if moves.index == 0: + stats.demo_moves = 0 # clear all demo moves + stats.total_moves = stats.total_moves + 1 + # add current move to history (which is a list of lists) + moves.current.append(self.active_row) + moves.history.append(moves.current) + moves.index = moves.index + 1 + assert moves.index == len(moves.history) + moves.current = [] + self.updateText() + self.updateStatus(moves=moves.index) + self.updateMenus() + return 1 + + def undo(self): + assert self.canUndo() + assert self.moves.state == self.S_PLAY and self.moves.current == [] + assert 0 <= self.moves.index <= len(self.moves.history) + if self.moves.index == 0: + return + self.moves.index = self.moves.index - 1 + m = self.moves.history[self.moves.index] + m = m[:len(m) - 1] + m.reverse() + self.moves.state = self.S_UNDO + for atomic_move in m: + atomic_move.undo(self) + self.moves.state = self.S_PLAY + m = self.moves.history[max(0, self.moves.index - 1)] + self.active_row = m[len(m) - 1] + self.stats.undo_moves = self.stats.undo_moves + 1 + self.stats.total_moves = self.stats.total_moves + 1 + self.hints.list = None + self.updateText() + self.updateStatus(moves = self.moves.index) + self.updateMenus() + + def redo(self): + assert self.canRedo() + assert self.moves.state == self.S_PLAY and self.moves.current == [] + assert 0 <= self.moves.index <= len(self.moves.history) + if self.moves.index == len(self.moves.history): + return + m = self.moves.history[self.moves.index] + self.moves.index = self.moves.index + 1 + self.active_row = m[len(m) - 1] + m = m[:len(m) - 1] + self.moves.state = self.S_REDO + for atomic_move in m: + atomic_move.redo(self) + self.moves.state = self.S_PLAY + self.stats.redo_moves = self.stats.redo_moves + 1 + self.stats.total_moves = self.stats.total_moves + 1 + self.hints.list = None + self.updateText() + self.updateStatus(moves = self.moves.index) + self.updateMenus() + + def _restoreGameHook(self, game): + self.active_row = game.loadinfo.active_row + + def _loadGameHook(self, p): + self.loadinfo.addattr(active_row=0) # register extra load var. + self.loadinfo.active_row = p.load() + + def _saveGameHook(self, p): + p.dump(self.active_row) + + + +# /*********************************************************************** +# // Relaxed Lara's Game +# ************************************************************************/ + +class RelaxedLarasGame(LarasGame): + Reserve_Class = LarasGame_Reserve + Reserve_Cards = 1 + DEAL_TO_TALON = 3 + MAX_ROUNDS = 2 + + +# /*********************************************************************** +# // Double Lara's Game +# ************************************************************************/ + +class DoubleLarasGame(RelaxedLarasGame): + Reserve_Cards = 2 + MAX_ROUNDS = 3 + + # + # Game extras + # + + def Max_Cards(self, i): + return 26 + + +# /*********************************************************************** +# // Katrina's Game +# ************************************************************************/ + +class KatrinasGame(LarasGame): + DEAL_TO_TALON = 3 + MAX_ROUNDS = 2 + ROW_LENGTH = 5 + MAX_ROW = 22 + + # + # Game extras + # + + def Max_Cards(self, i): + return 14 + 8 * (i == 4) + + def Mod(self, i): + return 14 + 8 * (i == 4) + + def Base_Rank(self, i, j): + return (13 + 8 * (i == 4)) * (not j) + + def Deal_Rows(self, i): + return 14 + 8 * (i % 2) + + def Base_Suit(self, i, j): + return i + + # + # Game overrides + # + + def getCardFaceImage(self, deck, suit, rank): + return self.app.images.getFace(deck, suit, rank) + + +# /*********************************************************************** +# // Relaxed Katrina's Game +# ************************************************************************/ + +class RelaxedKatrinasGame(KatrinasGame): + Reserve_Class = LarasGame_Reserve + Reserve_Cards = 2 + + +# /*********************************************************************** +# // Double Katrina's Game +# ************************************************************************/ + +class DoubleKatrinasGame(RelaxedKatrinasGame): + Reserve_Cards = 3 + MAX_ROUNDS = 3 + + # + # Game extras + # + + def Max_Cards(self, i): + return 28 + 16 * (i == 4) + + +# /*********************************************************************** +# // Bridget's Game +# // In memory of Bridget Bishop +# // Hanged as a witch on June 10, 1692 +# // Salem Massachusetts, U. S. A. +# // and the nineteen other women +# // and men who followed her +# ************************************************************************/ + +class BridgetsGame(LarasGame): + Reserve_Class = BridgetsGame_Reserve + Reserve_Cards = 2 + MAX_ROUNDS = 2 + ROW_LENGTH = 5 + MAX_ROW = 16 + + # + # Game extras + # + + def Max_Cards(self, i): + return 16 - 12 * (i == 4) + + def Mod(self, i): + return 16 - 12 * (i == 4) + + def Base_Rank(self, i, j): + return (15 - 12 * (i == 4)) * (not j) + + def Deal_Rows(self, i): + return 16 + + def Base_Suit(self, i, j): + return i + + +# /*********************************************************************** +# // Double Bridget's Game +# ************************************************************************/ + +class DoubleBridgetsGame(BridgetsGame): + Reserve_Cards = 3 + MAX_ROUNDS = 3 + + # + # Game extras + # + + def Max_Cards(self, i): + return 32 - 24 * (i == 4) + + +# /*********************************************************************** +# // Fatimeh's Game +# ************************************************************************/ + +class FatimehsGame(LarasGame): + DEAL_TO_TALON = 5 + MAX_ROUNDS = 3 + MAX_ROW = 12 + DIR = (1, 1) + + # + # Game extras + # + + def Max_Cards(self, i): + return 12 + + def Mod(self, i): + return 12 + + def Base_Rank(self, i, j): + return 0 + + def Deal_Rows(self, i): + return 12 + + def Base_Suit(self, i, j): + return i + j * 4 + + +# /*********************************************************************** +# // Relaxed Fatimeh's Game +# ************************************************************************/ + +class RelaxedFatimehsGame(FatimehsGame): + Reserve_Class = LarasGame_Reserve + Reserve_Cards = 2 + + +# /*********************************************************************** +# // Kali's Game +# ************************************************************************/ + +class KalisGame(FatimehsGame): + DEAL_TO_TALON = 6 + ROW_LENGTH = 5 + + # + # Game extras + # + + def Base_Suit(self, i, j): + return i + j * 5 + + +# /*********************************************************************** +# // Relaxed Kali's Game +# ************************************************************************/ + +class RelaxedKalisGame(KalisGame): + Reserve_Class = LarasGame_Reserve + Reserve_Cards = 2 + + +# /*********************************************************************** +# // Double Kali's Game +# ************************************************************************/ + +class DoubleKalisGame(RelaxedKalisGame): + Talon_Class = DoubleKalisGame_Talon + Reserve_Cards = 4 + MAX_ROUNDS = 4 + MAX_ROW = 24 + + # + # Game extras + # + + def Max_Cards(self, i): + return 24 + + def Deal_Rows(self, i): + return 24 + + +# /*********************************************************************** +# // Dojouji's Game +# ************************************************************************/ + +class DojoujisGame(LarasGame): + Talon_Class = DojoujisGame_Talon + ROW_LENGTH = 6 + MAX_ROW = 8 + DIR = (-1, -1) + + # + # Game extras + # + + def Max_Cards(self, i): + return 8 + + def Mod(self, i): + return 4 + + def Base_Rank(self, i, j): + return 3 + + def Deal_Rows(self, i): + return 8 + + def Base_Suit(self, i, j): + return i + j * 6 + + + +# /*********************************************************************** +# // Double Dojouji's Game +# ************************************************************************/ + +class DoubleDojoujisGame(DojoujisGame): + MAX_ROW = 16 + + # + # Game extras + # + + def Max_Cards(self, i): + return 16 + + def Deal_Rows(self, i): + return 16 + + + +# register the game +registerGame(GameInfo(37, LarasGame, "Lara's Game", GI.GT_2DECK_TYPE, 2, 0)) + +registerGame(GameInfo(13001, KatrinasGame, "Katrina's Game", + GI.GT_TAROCK, 2, 1, + ranks = range(14), trumps = range(22))) + +registerGame(GameInfo(13002, BridgetsGame, "Bridget's Game", + GI.GT_HEXADECK, 2, 1, + ranks = range(16), trumps = range(4))) + +registerGame(GameInfo(13003, FatimehsGame, "Fatimeh's Game", + GI.GT_MUGHAL_GANJIFA, 1, 2, + suits = range(8), ranks = range(12))) + +registerGame(GameInfo(13004, KalisGame, "Kali's Game", + GI.GT_DASHAVATARA_GANJIFA, 1, 2, + suits = range(10), ranks = range(12))) + +registerGame(GameInfo(13005, DojoujisGame, "Dojouji's Game", + GI.GT_HANAFUDA, 2, 0, + suits = range(12), ranks = range(4))) + +registerGame(GameInfo(13006, RelaxedLarasGame, "Lara's Game Relaxed", + GI.GT_2DECK_TYPE, 2, 1)) + +registerGame(GameInfo(13007, DoubleLarasGame, "Lara's Game Doubled", + GI.GT_2DECK_TYPE, 4, 2)) + +registerGame(GameInfo(13008, RelaxedKatrinasGame, "Katrina's Game Relaxed", + GI.GT_TAROCK, 2, 1, + ranks = range(14), trumps = range(22))) + +registerGame(GameInfo(13009, DoubleKatrinasGame, "Katrina's Game Doubled", + GI.GT_TAROCK, 4, 2, + ranks = range(14), trumps = range(22))) + +registerGame(GameInfo(13010, DoubleBridgetsGame, "Bridget's Game Doubled", + GI.GT_HEXADECK, 4, 2, + ranks = range(16), trumps = range(4))) + +registerGame(GameInfo(13011, RelaxedKalisGame, "Kali's Game Relaxed", + GI.GT_DASHAVATARA_GANJIFA, 1, 2, + suits = range(10), ranks = range(12))) + +registerGame(GameInfo(13012, DoubleKalisGame, "Kali's Game Doubled", + GI.GT_DASHAVATARA_GANJIFA, 2, 3, + suits = range(10), ranks = range(12))) + +registerGame(GameInfo(13013, RelaxedFatimehsGame, "Fatimeh's Game Relaxed", + GI.GT_MUGHAL_GANJIFA, 1, 2, + suits = range(8), ranks = range(12))) + +registerGame(GameInfo(13014, DoubleDojoujisGame, "Dojouji's Game Doubled", + GI.GT_HANAFUDA, 4, 0, + suits = range(12), ranks = range(4))) diff --git a/pysollib/games/ultra/matrix.py b/pysollib/games/ultra/matrix.py new file mode 100644 index 00000000..6fdaa243 --- /dev/null +++ b/pysollib/games/ultra/matrix.py @@ -0,0 +1,471 @@ +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 by T. Kirk +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys, math + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText, MfxCanvasImage, bind, ANCHOR_NW + +from pysollib.games.special.pegged import Pegged_RowStack, WasteTalonStack, \ + Pegged, PeggedCross1, PeggedCross2, Pegged6x6, Pegged7x7 + + +## Matrix_RowStack +## NewTower_RowStack +## RockHopper_RowStack +## ThreePeaks_TalonStack +## ThreePeaks_RowStack +## Matrix3 +## Matrix4 +## Matrix5 +## Matrix6 +## Matrix7 +## Matrix8 +## Matrix9 +## Matrix10 +## Matrix20 +## NewTowerofHanoi +## RockHopper +## RockHopperCross1 +## RockHopperCross2 +## RockHopper6x6 +## RockHopper7x7 +## ThreePeaks +## ThreePeaksNoScore +## LeGrandeTeton + + +# /*********************************************************************** +# // Matrix Row Stack +# ************************************************************************/ + +class Matrix_RowStack(OpenStack): + + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=1, max_accept=1, max_cards=1, + base_rank=ANY_RANK) + apply(OpenStack.__init__, (self, x, y, game), cap) + + def acceptsCards(self, from_stack, cards): + return OpenStack.acceptsCards(self, from_stack, cards) + + def canFlipCard(self): + return 0 + + def canDropCards(self, stacks): + return (None, 0) + + def cancelDrag(self, event=None): + if event is None: + self._stopDrag() + + def _findCard(self, event): + # we need to override this because the shade may be hiding + # the tile (from Tk's stacking view) + return len(self.cards) - 1 + + def initBindings(self): + bind(self.group, "<1>", self._Stack__clickEventHandler) + bind(self.group, "", self._Stack__controlclickEventHandler) + + def getBottomImage(self): + return None + + def blockMap(self): + ncards = self.game.gameinfo.ncards + id, sqrt = self.id, int(math.sqrt(ncards)) + line, row, column = int(id / sqrt), [], [] + for r in self.game.s.rows[line * sqrt:sqrt + line * sqrt]: + row.append(r.id) + while id >= sqrt: + id = id - sqrt + while id < ncards: + column.append(id) + id = id + sqrt + return [row, column] + + def basicIsBlocked(self): + stack_map = self.blockMap() + for j in range(2): + for i in range(len(stack_map[j])): + if not self.game.s.rows[stack_map[j][i]].cards: + return 0 + return 1 + + def clickHandler(self, event): + game = self.game + row = game.s.rows + if not self.cards or game.drag.stack is self or self.basicIsBlocked(): + return 1 + stack_map = self.blockMap() + for j in range(2): + dir = 1 + for i in range(len(stack_map[j])): + to_stack = row[stack_map[j][i]] + if to_stack is self: + dir = -1 + if not to_stack.cards: + self._stopDrag() + step = 1 + from_stack = row[stack_map[j][i + dir]] + while not from_stack is self: + from_stack.playMoveMove(1, to_stack, frames = 0, sound = 1) + to_stack = from_stack + step = step + 1 + from_stack = row[stack_map[j][i + dir * step]] + self.playMoveMove(1, to_stack, frames = 0, sound = 1) + return 1 + return 1 + + + +# /*********************************************************************** +# // New Tower Row Stack +# ************************************************************************/ + +class NewTower_RowStack(Matrix_RowStack): + + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=1, max_accept=1, max_cards=99, + base_rank=ANY_RANK) + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = -max(self.game.app.images.CARD_YOFFSET, 20) + + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + if self.cards: + return self.cards[-1].rank > cards[0].rank + return 1 + + def getBottomImage(self): + # None doesn't recognize clicks. + return self.game.app.images.getLetter(0) + + def basicIsBlocked(self): + return 0 + + def clickHandler(self, event): + game = self.game + drag = game.drag + from_stack = drag.stack + if from_stack is self: + # remove selection + self._stopDrag() + return 1 + # possible move + if from_stack: + if self.acceptsCards(from_stack, from_stack.cards[-1:]): + self._stopDrag() + # this code actually moves the tiles + from_stack.playMoveMove(1, self, frames=3, sound=0) + return 1 + drag.stack = self + # move or create the shade image (see stack.py, _updateShade) + if drag.shade_img: + img = drag.shade_img + img.dtag(drag.shade_stack.group) + img.moveTo(self.x, self.y) + elif self.cards: + img = game.app.images.getShade() + if img is None: + return 1 + img = MfxCanvasImage(game.canvas, self.x, + self.y + self.CARD_YOFFSET[0] * (len(self.cards) - 1), + image=img, anchor=ANCHOR_NW) + drag.shade_img = img + if self.cards: + img.tkraise(self.cards[-1].item) + img.addtag(self.group) + drag.shade_stack = self + return 1 + + + +# /*********************************************************************** +# // Rock Hopper Row Stack +# ************************************************************************/ + +class RockHopper_RowStack(Pegged_RowStack): + + def canFlipCard(self): + return 0 + + def cancelDrag(self, event=None): + if event is None: + self._stopDrag() + + def _findCard(self, event): + # we need to override this because the shade may be hiding + # the tile (from Tk's stacking view) + return len(self.cards) - 1 + + def initBindings(self): + bind(self.group, "<1>", self._Stack__clickEventHandler) + bind(self.group, "", self._Stack__controlclickEventHandler) + + def getBottomImage(self): + # None doesn't recognize clicks. + return self.game.app.images.getReserveBottom() + + def clickHandler(self, event): + game = self.game + drag = game.drag + from_stack = drag.stack + if from_stack is self: + # remove selection + self._stopDrag() + return 1 + # possible move + if from_stack and not self.cards and self._getMiddleStack(from_stack) is not None: + self._stopDrag() + # this code actually moves the tiles + from_stack.moveMove(1, self, frames=3) + return 1 + drag.stack = self + # move or create the shade image (see stack.py, _updateShade) + if drag.shade_img and self.cards: + img = drag.shade_img + img.dtag(drag.shade_stack.group) + img.moveTo(self.x, self.y) + elif self.cards: + img = game.app.images.getShade() + if img is None: + return 1 + img = MfxCanvasImage(game.canvas, self.x, self.y, + image=img, anchor=ANCHOR_NW) + drag.shade_img = img + if self.cards: + img.tkraise(self.cards[-1].item) + img.addtag(self.group) + drag.shade_stack = self + return 1 + + + +# /*********************************************************************** +# // Matrix Game +# ************************************************************************/ + +class Matrix3(Game): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + grid = math.sqrt(self.gameinfo.ncards) + assert grid == int(grid) + grid = int(grid) + + # Set window size + w, h = l.XM * 2 + l.CW * grid, l.YM * 2 + l.CH * grid + self.setSize(w, h) + + # Create rows + for j in range(grid): + x, y = l.XM, l.YM + l.CH * j + for i in range(grid): + s.rows.append(Matrix_RowStack(x, y, self)) + x = x + l.CW + + # Create talon + x, y = l.XM - l.XS, l.YM + s.talon = InitialDealTalonStack(x, y, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game extras + # + + def shuffle(self): + cards = list(self.cards)[:] + cards.reverse() + for card in cards: + self.s.talon.addCard(card, update=0) + card.showBack(unhide=0) + + def scramble(self): + if self.gstats.restarted: + self.random.reset() + ncards, randint = self.gameinfo.ncards, self.random.randint + r = self.s.rows[ncards - int(math.sqrt(ncards))] + rc, stackmap = 1, r.blockMap() + for i in range(randint(max(200, ncards * 4), max(300, ncards * 5))): + r.clickHandler(r) + r = self.s.rows[stackmap[rc][randint(0, len(stackmap[0]) - 1)]] + rc, stackmap = (rc + 1) % 2, r.blockMap() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == self.gameinfo.ncards + self.s.talon.dealRow(rows=self.s.rows[:self.gameinfo.ncards - 1], + flip=1, frames=3) + self.scramble() + self.startDealSample() + + def isGameWon(self): + if self.busy: + return 0 + s = self.s.rows + l = len(s) - 1 + for r in s[:l]: + if not r.cards or not r.cards[0].rank == r.id: + return 0 + self.s.talon.dealRow(rows=s[l:], flip=1, frames=3) + return 1 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1 == card2.rank) + or (card1.rank - 1 == card2.rank)) + + + +# /*********************************************************************** +# // Size variations +# ************************************************************************/ + +class Matrix4(Matrix3): + + pass + +class Matrix5(Matrix3): + + pass + +class Matrix6(Matrix3): + + pass + +class Matrix7(Matrix3): + + pass + +class Matrix8(Matrix3): + + pass + +class Matrix9(Matrix3): + + pass + +class Matrix10(Matrix3): + + pass + +class Matrix20(Matrix3): + + pass + + +# /*********************************************************************** +# // Rock Hopper +# ************************************************************************/ + +class RockHopper(Pegged): + STACK = RockHopper_RowStack + +class RockHopperCross1(PeggedCross1): + STACK = RockHopper_RowStack + +class RockHopperCross2(PeggedCross2): + STACK = RockHopper_RowStack + +class RockHopper6x6(Pegged6x6): + STACK = RockHopper_RowStack + +class RockHopper7x7(Pegged7x7): + STACK = RockHopper_RowStack + + + +# /*********************************************************************** +# // Register a Matrix game +# ************************************************************************/ + +def r(id, gameclass, short_name): + name = short_name + ncards = int(name[:2]) * int(name[:2]) + gi = GameInfo(id, gameclass, name, + GI.GT_MATRIX, 1, 0, + category=GI.GC_TRUMP_ONLY, short_name=short_name, + suits=(), ranks=(), trumps=range(ncards), + si = {"decks": 1, "ncards": ncards}) + gi.ncards = ncards + gi.rules_filename = "matrix.html" + registerGame(gi) + return gi + +r(22223, Matrix3, " 3x3 Matrix") +r(22224, Matrix4, " 4x4 Matrix") +r(22225, Matrix5, " 5x5 Matrix") +r(22226, Matrix6, " 6x6 Matrix") +r(22227, Matrix7, " 7x7 Matrix") +r(22228, Matrix8, " 8x8 Matrix") +r(22229, Matrix9, " 9x9 Matrix") +r(22230, Matrix10, "10x10 Matrix") +#r(22240, Matrix20, "20x20 Matrix") + +del r + +def r(id, gameclass, short_name): + name = short_name + ncards = 0 + for n in gameclass.ROWS: + ncards = ncards + n + gi = GameInfo(id, gameclass, name, GI.GT_MATRIX, 1, 0, + category=GI.GC_TRUMP_ONLY, short_name=short_name, + suits=(), ranks=(), trumps=range(ncards), + si={"decks": 1, "ncards": ncards}) + gi.ncards = ncards + gi.rules_filename = "pegged.html" + registerGame(gi) + return gi + +r(22221, RockHopper, "Rock Hopper") +r(22220, RockHopperCross1, "Rock Hopper Cross 1") +r(22219, RockHopperCross2, "Rock Hopper Cross 2") +r(22218, RockHopper6x6, "Rock Hopper 6x6") +r(22217, RockHopper7x7, "Rock Hopper 7x7") + +del r diff --git a/pysollib/games/ultra/mughal.py b/pysollib/games/ultra/mughal.py new file mode 100644 index 00000000..b4b85a8a --- /dev/null +++ b/pysollib/games/ultra/mughal.py @@ -0,0 +1,1174 @@ +##---------------------------------------------------------------------------## +## +## Ultrasol -- a Python Solitaire game +## +## Copyright (C) 2000 by T. Kirk +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys, math + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint, FreeCellType_Hint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# * Mughal Foundation Stacks +# ***********************************************************************/ + +class Mughal_FoundationStack(AbstractFoundationStack): + + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, max_move=0) + apply(SS_FoundationStack.__init__, (self, x, y, game, suit), cap) + + def updateText(self): + AbstractFoundationStack.updateText(self) + self.game.updateText() + + +class Triumph_Foundation(AbstractFoundationStack): + + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, mod=12, dir=0, base_rank=NO_RANK, max_move=0) + apply(AbstractFoundationStack.__init__, (self, x, y, game, suit), cap) + + def acceptsCards(self, from_stack, cards): + + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if not self.cards: + return 1 + stack_dir = self.game.getFoundationDir() + if stack_dir == 0: + card_dir = (cards[0].rank - self.cards[-1].rank) % self.cap.mod + return card_dir in (1, 11) + else: + return (self.cards[-1].rank + stack_dir) % self.cap.mod == cards[0].rank + + + +# /*********************************************************************** +# * Mughal Row Stacks +# ***********************************************************************/ + +class Mughal_OpenStack(OpenStack): + + def __init__(self, x, y, game, yoffset, **cap): + kwdefault(cap, max_move=UNLIMITED_MOVES, max_cards=UNLIMITED_CARDS, + max_accept=UNLIMITED_ACCEPTS, base_rank=0, dir=-1) + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = yoffset + + def isRankSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not c1.rank + dir == c2.rank: + return 0 + c1 = c2 + return 1 + + def isAlternateColorSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not ((c1.suit + c2.suit) % 2 + and c1.rank + dir == c2.rank): + return 0 + c1 = c2 + return 1 + + def isAlternateForceSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not ((c1.suit < 4 and c2.suit > 3 + or c1.suit > 3 and c2.suit < 4) + and c1.rank + dir == c2.rank): + return 0 + c1 = c2 + return 1 + + def isSuitSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not (c1.suit == c2.suit + and c1.rank + dir == c2.rank): + return 0 + c1 = c2 + return 1 + + +class Mughal_AC_RowStack(Mughal_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isAlternateColorSequence(cards)): + return 0 + stackcards = self.cards + if not len(stackcards): + return cards[0].rank == 11 or self.cap.base_rank == ANY_RANK + return self.isAlternateColorSequence([stackcards[-1], cards[0]]) + + +class Mughal_AF_RowStack(Mughal_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isAlternateForceSequence(cards)): + return 0 + stackcards = self.cards + if not len(stackcards): + return cards[0].rank == 11 or self.cap.base_rank == ANY_RANK + return self.isAlternateForceSequence([stackcards[-1], cards[0]]) + + +class Mughal_RK_RowStack(Mughal_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isRankSequence(cards)): + return 0 + stackcards = self.cards + if not len(stackcards): + return cards[0].rank == 11 or self.cap.base_rank == ANY_RANK + return self.isRankSequence([stackcards[-1], cards[0]]) + + +class Mughal_SS_RowStack(Mughal_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isSuitSequence(cards)): + return 0 + stackcards = self.cards + if not len(stackcards): + return cards[0].rank == 11 or self.cap.base_rank == ANY_RANK + return self.isSuitSequence([stackcards[-1], cards[0]]) + + +class Circles_RowStack(SS_RowStack): + + def __init__(self, x, y, game, base_rank, yoffset): + SS_RowStack.__init__(self, x, y, game, base_rank=base_rank, + max_accept=1, max_move=1) + self.CARD_YOFFSET = 1 + + +class Triumph_BraidStack(OpenStack): + + def __init__(self, x, y, game, xoffset, yoffset): + OpenStack.__init__(self, x, y, game) + CW = self.game.app.images.CARDW + self.CARD_YOFFSET = int(self.game.app.images.CARD_YOFFSET * yoffset) + # use a sine wave for the x offsets + self.CARD_XOFFSET = [] + j = 1 + for i in range(30): + self.CARD_XOFFSET.append(int(math.cos(j) * xoffset)) + j = j + .9 + + +class Triumph_StrongStack(ReserveStack): + + def fillStack(self): + if not self.cards: + if self.game.s.braidstrong.cards: + self.game.moveMove(1, self.game.s.braidstrong, self) + elif self.game.s.braidweak.cards: + self.game.moveMove(1, self.game.s.braidweak, self) + + def getBottomImage(self): + return self.game.app.images.getBraidBottom() + + +class Triumph_WeakStack(ReserveStack): + + def fillStack(self): + if not self.cards: + if self.game.s.braidweak.cards: + self.game.moveMove(1, self.game.s.braidweak, self) + elif self.game.s.braidstrong.cards: + self.game.moveMove(1, self.game.s.braidstrong, self) + + def getBottomImage(self): + return self.game.app.images.getBraidBottom() + + +class Triumph_ReserveStack(ReserveStack): + + def acceptsCards(self, from_stack, cards): + if (from_stack is self.game.s.braidstrong or + from_stack is self.game.s.braidweak or + from_stack in self.game.s.rows): + return 0 + return ReserveStack.acceptsCards(self, from_stack, cards) + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + + +# /*********************************************************************** +# * +# ***********************************************************************/ + +class AbstractMughalGame(Game): + + SUITS = (_("Crown"), _("Silver"), _("Saber"), _("Servant"), + _("Harp"), _("Gold"), _("Document"), _("Stores")) + RANKS = (_("Ace"), "2", "3", "4", "5", "6", "7", "8", "9", "10", + _("Pradhan"), _("Raja")) + COLORS = (_("Brown"), _("Black"), _("Red"), _("Yellow"), + _("Green"), _("Grey"), _("Orange"), _("Tan")) + FORCE = (_("Strong"), _("Weak")) + + def updateText(self): + pass + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank) + + +class Triumph_Hint(DefaultHint): + # FIXME: demo is not too clever in this game + pass + + + +# /*********************************************************************** +# * Mughal Circles +# ***********************************************************************/ + +class MughalCircles(AbstractMughalGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + w, h = l.XM + l.XS * 9, l.YM + l.YS * 7 + self.setSize(w, h) + + # Create row stacks + x = w / 2 - l.CW / 2 + y = h / 2 - l.YS / 2 + x0 = (-1, -.8, 0, .8, 1, .8, 0, -.8, + -2, -1.9, -1.5, -.8, 0, .8, 1.5, 1.9, 2, 1.9, 1.5, .8, 0, -.8, -1.5, -1.9) + y0 = (0, -.8, -1, -.8, 0, .8, 1, .8, + 0, -.8, -1.5, -1.9, -2, -1.9, -1.5, -.8, 0, .8, 1.5, 1.9, 2, 1.9, 1.5, .8) + for i in range(24): + # FIXME: + _x, _y = x+l.XS*x0[i]+l.XM*x0[i]*2, y+l.YS*y0[i]+l.YM*y0[i]*2 + if _x < 0: _x = 0 + if _y < 0: _y = 0 + s.rows.append(Circles_RowStack(_x, _y, self, base_rank=ANY_RANK, yoffset=0)) + + # Create reserve stacks + s.reserves.append(ReserveStack(l.XM, h - l.YS, self)) + s.reserves.append(ReserveStack(w - l.XS, h - l.YS, self)) + + # Create foundations + x = l.XM + y = l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, i, mod = 12, + max_move = 0, max_cards = 12)) + y = y + l.YS + x = self.width - l.XS + y = l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, i + 4, mod = 12, + max_move = 0, max_cards = 12)) + y = y + l.YS + # FIXME: + _x1, _x2 = l.XM + l.XS, w - l.XS - l.XM + for i in s.rows: + if i.x < _x1: i.x = _x1 + elif i.x > _x2: i.x = _x2 + self.setRegion(s.rows, (_x1, 0, _x2, 999999)) + + # Create talon + s.talon = InitialDealTalonStack(l.XM + l.XS, l.YM, self) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 96 + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.suit == card2.suit) + and ((card1.rank + 1 == card2.rank) + or (card1.rank - 1 == card2.rank))) + + + +# /*********************************************************************** +# * Eight Legions +# ***********************************************************************/ + +class EightLegions(AbstractMughalGame): + + # + # Game layout + # + + def createGame(self): + l, s = Layout(self), self.s + font = self.app.getFont("canvas_default") + + # Set window size + self.setSize(l.XM * 3 + l.XS * 9, l.YM + l.YS * 6) + + # Create row stacks + x = l.XM + y = l.YM + for i in range(8): + s.rows.append(RK_RowStack(x, y, self, base_rank = 11, + max_move = 12, max_cards = 99)) + x = x + l.XS + + # Create reserve stacks + x = self.width - l.XS + y = l.YM + for i in range(6): + s.reserves.append(ReserveStack(x, y, self)) + y = y + l.YS + y = y - l.YS + for i in range(4): + x = x - l.XS + s.reserves.append(ReserveStack(x, y, self)) + + self.setRegion(s.rows, (0, 0, l.XM + l.XS * 8, l.YS * 5)) + + # Create talon + s.talon = DealRowTalonStack(l.XM, self.height - l.YS, self) + l.createText(s.talon, "nn") + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 96 + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealCards() + + def isGameWon(self): + if len(self.s.talon.cards): + return 0 + for s in self.s.rows: + if len(s.cards) != 12 or not isSameSuitSequence(s.cards): + return 0 + return 1 + + + +# /*********************************************************************** +# * Shamsher +# ***********************************************************************/ + +class Shamsher(AbstractMughalGame): + Layout_Method = Layout.ghulamLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = RK_RowStack + BASE_RANK = ANY_RANK + + # + # Game layout + # + + def createGame(self, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=14, reserves=4, texts=0) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod=12, max_cards=12)) + + # Create reserve stacks + for r in l.s.reserves: + s.reserves.append(ReserveStack(r.x, r.y, self, )) + + # Create row stacks + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, max_cards=12, + suit=ANY_SUIT, base_rank=self.BASE_RANK)) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 96 + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:12]) + self.s.talon.dealCards() + + + +# /*********************************************************************** +# * Ashrafi +# ***********************************************************************/ + +class Ashrafi(Shamsher): + Layout_Method = Layout.ghulamLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = RK_RowStack + BASE_RANK = 11 + + # + # Game layout + # + + def createGame(self, **layout): + Shamsher.createGame(self) + + + +# /*********************************************************************** +# * Ghulam +# ***********************************************************************/ + +class Ghulam(Shamsher): + Layout_Method = Layout.ghulamLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = SS_RowStack + BASE_RANK = ANY_RANK + + # + # Game layout + # + + def createGame(self, **layout): + Shamsher.createGame(self) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.suit == card2.suit) + and ((card1.rank + 1 == card2.rank) + or (card1.rank - 1 == card2.rank))) + + + +# /*********************************************************************** +# * Tipati +# ***********************************************************************/ + +class Tipati(AbstractMughalGame): + Layout_Method = Layout.klondikeLayout + Talon_Class = WasteTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = RK_RowStack + BASE_RANK = 11 + MAX_MOVE = 0 + + # + # Game layout + # + + def createGame(self, max_rounds=1, num_deal=1, **layout): + l, s = Layout(self), self.s + kwdefault(layout, rows=8, waste=1) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + + # Create talon + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self, + max_rounds = max_rounds, num_deal = num_deal) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + + # Create foundations + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, + r.suit, mod = 12, max_cards = 12, max_move = self.MAX_MOVE)) + + # Create row stacks + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self, + suit = ANY_SUIT, base_rank = self.BASE_RANK)) + + # Define stack groups + l.defaultAll() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == 96 + for i in range(8): + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + + +# /*********************************************************************** +# * Ashwapati +# ***********************************************************************/ + +class Ashwapati(Tipati): + RowStack_Class = SS_RowStack + BASE_RANK = ANY_RANK + MAX_MOVE = 1 + + # + # Game layout + # + + def createGame(self, **layout): + Tipati.createGame(self, max_rounds = -1, num_deal = 1) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.suit == card2.suit) + and ((card1.rank + 1 == card2.rank) + or (card1.rank - 1 == card2.rank))) + + + +# /*********************************************************************** +# * Gajapati +# ***********************************************************************/ + +class Gajapati(Tipati): + RowStack_Class = SS_RowStack + BASE_RANK = ANY_RANK + MAX_MOVE = 1 + + # + # Game layout + # + + def createGame(self, **layout): + Tipati.createGame(self, max_rounds=-1, num_deal=3) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.suit == card2.suit) + and ((card1.rank + 1 == card2.rank) + or (card1.rank - 1 == card2.rank))) + + + +# /*********************************************************************** +# * Narpati +# ***********************************************************************/ + +class Narpati(Tipati): + RowStack_Class = AC_RowStack + MAX_MOVE = 1 + + # + # Game layout + # + + def createGame(self, **layout): + Tipati.createGame(self, max_rounds=1, num_deal=1) + + + +# /*********************************************************************** +# * Garhpati +# ***********************************************************************/ + +class Garhpati(Tipati): + RowStack_Class = AC_RowStack + + # + # Game layout + # + + def createGame(self, **layout): + Tipati.createGame(self, max_rounds=-1, num_deal=3) + + + +# /*********************************************************************** +# * Dhanpati +# ***********************************************************************/ + +class Dhanpati(Tipati): + + # + # Game layout + # + + def createGame(self, **layout): + Tipati.createGame(self, max_rounds=2, num_deal=3) + + + +# /*********************************************************************** +# // Akbar's Triumph +# ************************************************************************/ + +class AkbarsTriumph(AbstractMughalGame): + Hint_Class = Triumph_Hint + + BRAID_CARDS = 12 + BRAID_OFFSET = 1.1 + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (piles up to 20 cards are playable - needed for Braid_BraidStack) + decks = self.gameinfo.decks + h = max(5 * l.YS + 35, l.YS + (self.BRAID_CARDS - 1) * l.YOFFSET) + self.setSize(l.XM + l.XS * (7 + decks * 2), l.YM + h) + + # extra settings + self.base_card = None + + # Create foundations, rows, reserves + s.addattr(braidstrong = None) # register extra stack variable + s.addattr(braidweak = None) # register extra stack variable + x, y = l.XM, l.YM + for j in range(4): + for i in range(decks): + s.foundations.append(Triumph_Foundation(x + l.XS * i, y, self, + j, mod = 12, max_cards = 12)) + s.rows.append(Triumph_StrongStack(x + l.XS * decks, y, self)) + s.rows.append(Triumph_ReserveStack(x + l.XS * (1 + decks), y, self)) + y = y + l.YS + x, y = x + l.XS * (5 + decks), l.YM + for j in range(4): + s.rows.append(Triumph_ReserveStack(x, y, self)) + s.rows.append(Triumph_WeakStack(x + l.XS, y, self)) + for i in range(decks, 0, -1): + s.foundations.append(Triumph_Foundation(x + l.XS * (1 + i), y, self, + j + 4, mod = 12, max_cards = 12)) + y = y + l.YS + self.texts.info = MfxCanvasText(self.canvas, + self.width / 2, h - l.YM / 2, + anchor = "center", + font = self.app.getFont("canvas_default")) + + # Create braids + x, y = l.XM + l.XS * 2.3 + l.XS * decks, l.YM + s.braidstrong = Triumph_BraidStack(x, y, self, xoffset = 12, yoffset = self.BRAID_OFFSET) + x = x + l.XS * 1.4 + s.braidweak = Triumph_BraidStack(x, y, self, xoffset = -12, yoffset = self.BRAID_OFFSET) + + # Create talon + x, y = l.XM + l.XS * 2 + l.XS * decks, h - l.YS - l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds = 3) + l.createText(s.talon, "ss") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + self.width / 2, h - l.YM * 2.5, + anchor = "center", + font=self.app.getFont("canvas_default")) + x = x + l.XS * 2 + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + + # define stack-groups + self.sg.talonstacks = [s.talon] + [s.waste] + self.sg.openstacks = s.foundations + s.rows + self.sg.dropstacks = [s.braidstrong] + [s.braidweak] + s.rows + [s.waste] + + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.base_card = None + self.updateText() + for i in range(self.BRAID_CARDS): + self.s.talon.dealRow(rows = [self.s.braidstrong]) + for i in range(self.BRAID_CARDS): + self.s.talon.dealRow(rows = [self.s.braidweak]) + self.s.talon.dealRow() + # deal base_card to foundations, update cap.base_rank + self.base_card = self.s.talon.getCard() + to_stack = self.s.foundations[self.base_card.suit * self.gameinfo.decks] + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, to_stack) + self.updateText() + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + # deal first card to WasteStack + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + ((card1.rank + 1) % 12 == card2.rank or (card2.rank + 1) % 12 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + + # + # game extras + # + + def updateText(self): + if self.preview > 1 or not self.texts.info: + return + if not self.base_card: + t = "" + else: + t = self.RANKS[self.base_card.rank] + dir = self.getFoundationDir() % 12 + if dir == 1: + t = t + _(" Ascending") + elif dir == 11: + t = t + _(" Descending") + self.texts.info.config(text = t) + + + +# /*********************************************************************** +# // Akbar's Conquest +# ************************************************************************/ + +class AkbarsConquest(AkbarsTriumph): + + BRAID_CARDS = 16 + BRAID_OFFSET = .9 + + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Vajra(AbstractMughalGame): + RowStack_Class = StackWrapper(Mughal_RK_RowStack, base_rank=NO_RANK) + + # + # game layout + # + + def createGame(self, rows=9, reserves=8): + # create layout + l, s = Layout(self), self.s + + # set size + maxrows = max(rows, reserves) + self.setSize(l.XM + (maxrows + 2) * l.XS, l.YM + 6 * l.YS) + + # + playcards = 4 * l.YS / l.YOFFSET + xoffset, yoffset = [], [] + for i in range(playcards): + xoffset.append(0) + yoffset.append(l.YOFFSET) + for i in range(96 * self.gameinfo.decks - playcards): + xoffset.append(l.XOFFSET) + yoffset.append(0) + + # create stacks + x, y = l.XM + (maxrows - reserves) * l.XS / 2, l.YM + for i in range(reserves): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + x, y = l.XM + (maxrows - rows) * l.XS / 2, l.YM + l.YS + self.setRegion(s.reserves, (-999, -999, 999999, y - l.YM / 2)) + for i in range(rows): + stack = self.RowStack_Class(x, y, self, yoffset=l.YOFFSET) + stack.CARD_XOFFSET = xoffset + stack.CARD_YOFFSET = yoffset + s.rows.append(stack) + x = x + l.XS + x, y = l.XM + maxrows * l.XS, l.YM + for i in range(2): + for suit in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=suit + (4 * i))) + y = y + l.YS + x, y = x + l.XS, l.YM + self.setRegion(self.s.foundations, (x - l.XS * 2, -999, 999999, + self.height - (l.YS + l.YM)), priority=1) + s.talon = InitialDealTalonStack(self.width - 3 * l.XS / 2, self.height - l.YS, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + i = 0 + while self.s.talon.cards: + if self.s.talon.cards[-1].rank == 11: + if self.s.rows[i].cards: + i = i + 1 + self.s.talon.dealRow(rows=[self.s.rows[i]], frames=4) + + # must look at cards + def _getClosestStack(self, cx, cy, stacks, dragstack): + closest, cdist = None, 999999999 + for stack in stacks: + if stack.cards and stack is not dragstack: + dist = (stack.cards[-1].x - cx)**2 + (stack.cards[-1].y - cy)**2 + else: + dist = (stack.x - cx)**2 + (stack.y - cy)**2 + if dist < cdist: + closest, cdist = stack, dist + return closest + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isRankSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Danda(Vajra): + RowStack_Class = StackWrapper(Mughal_AF_RowStack, base_rank=NO_RANK) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isAlternateForceSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Khadga(Vajra): + RowStack_Class = StackWrapper(Mughal_AC_RowStack, base_rank=NO_RANK) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isAlternateColorSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Makara(Vajra): + RowStack_Class = StackWrapper(Mughal_SS_RowStack, base_rank=NO_RANK) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isSuitSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + + + +# /*********************************************************************** +# // Ashta Dikapala Game Stacks +# ************************************************************************/ + +class Dikapala_TableauStack(Mughal_OpenStack): + + def __init__(self, x, y, game, base_rank, yoffset, **cap): + kwdefault(cap, dir=3, max_move=99, max_cards=4, max_accept=1, base_rank=base_rank) + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = yoffset + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + # check that the base card is correct + if self.cards and self.cards[0].rank != self.cap.base_rank: + return 0 + if not self.cards: + return cards[0].rank == self.cap.base_rank + return (self.cards[-1].suit == cards[0].suit and + self.cards[-1].rank + self.cap.dir == cards[0].rank) + + def getBottomImage(self): + return self.game.app.images.getLetter(self.cap.base_rank) + + +class Dikapala_ReserveStack(ReserveStack): + + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_cards=1, max_accept=1, base_rank=ANY_RANK) + apply(OpenStack.__init__, (self, x, y, game), cap) + + def acceptsCards(self, from_stack, cards): + return (ReserveStack.acceptsCards(self, from_stack, cards) + and self.game.s.talon.cards) + + +class Dikapala_RowStack(BasicRowStack): + + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return 0 + # check + return not (self.cards or self.game.s.talon.cards) + + def canMoveCards(self, cards): + return 1 + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + +# /*********************************************************************** +# // Dikapala Hint +# ************************************************************************/ + +class Dikapala_Hint(AbstractHint): + def computeHints(self): + game = self.game + + # 2)See if we can move a card to the tableaux + if not self.hints: + for r in game.sg.dropstacks: + pile = r.getPile() + if not pile or len(pile) != 1: + continue + if r in game.s.tableaux: + rr = self.ClonedStack(r, stackcards=r.cards[:-1]) + if rr.acceptsCards(None, pile): + # do not move a card that is already in correct place + continue + base_score = 80000 + (4 - r.cap.base_suit) + else: + base_score = 80000 + # find a stack that would accept this card + for t in game.s.tableaux: + if t is not r and t.acceptsCards(r, pile): + score = base_score + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 3)See if we can move a card from the tableaux + # to a row stack. This can only happen if there are + # no more cards to deal. + if not self.hints: + for r in game.s.tableaux: + pile = r.getPile() + if not pile or len(pile) != 1: + continue + rr = self.ClonedStack(r, stackcards=r.cards[:-1]) + if rr.acceptsCards(None, pile): + # do not move a card that is already in correct place + continue + # find a stack that would accept this card + for t in game.s.rows: + if t is not r and t.acceptsCards(r, pile): + score = 70000 + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 4)See if we can move a card within the row stacks + if not self.hints: + for r in game.s.rows: + pile = r.getPile() + if not pile or len(pile) != 1 or len(pile) == len(r.cards): + continue + base_score = 60000 + # find a stack that would accept this card + for t in game.s.rows: + if t is not r and t.acceptsCards(r, pile): + score = base_score + 100 * (self.K - pile[0].rank) + self.addHint(score, 1, r, t) + break + + # 5)See if we can deal cards + if self.level >= 2: + if game.canDealCards(): + self.addHint(self.SCORE_DEAL, 0, game.s.talon, None) + + +# /*********************************************************************** +# // Ashta Dikapala +# ************************************************************************/ + +class AshtaDikapala(Game): + Hint_Class = Dikapala_Hint + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + TABLEAU_YOFFSET = min(9, max(3, l.YOFFSET / 3)) + + # set window + th = l.YS + 3 * TABLEAU_YOFFSET + # (set piles so that at least 2/3 of a card is visible with 10 cards) + h = 8 * l.YOFFSET + l.CH * 2/3 + self.setSize(9 * l.XS + l.XM * 2, l.YM + 3 * th + l.YM + h) + + # create stacks + s.addattr(tableaux=[]) # register extra stack variable + x = l.XM + 8 * l.XS + l.XS / 2 + y = l.YM + for i in range(3, 0, -1): + x = l.XM + for j in range(8): + s.tableaux.append(Dikapala_TableauStack(x, y, self, i - 1, TABLEAU_YOFFSET)) + x = x + l.XS + x = x + l.XM + s.reserves.append(Dikapala_ReserveStack(x, y, self)) + y = y + th + x, y = l.XM, y + l.YM + for i in range(8): + s.rows.append(Dikapala_RowStack(x, y, self, max_accept=1)) + x = x + l.XS + x = self.width - l.XS + y = self.height - l.YS + s.talon = DealRowTalonStack(x, y, self) + l.createText(s.talon, "sw") + + # define stack-groups + self.sg.openstacks = s.tableaux + s.rows + s.reserves + self.sg.talonstacks = [s.talon] + self.sg.dropstacks = s.tableaux + s.rows + + # + # game overrides + # + + def startGame(self): + self.s.talon.dealRow(rows=self.s.tableaux, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def isGameWon(self): + for stack in self.s.tableaux: + if len(stack.cards) != 4: + return 0 + return 1 + + def fillStack(self, stack): + if self.s.talon.cards: + if stack in self.s.rows and len(stack.cards) == 0: + self.s.talon.dealRow(rows=[stack]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 3 == card2.rank or card2.rank + 3 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + +# /*********************************************************************** +# // +# ************************************************************************/ + +def r(id, gameclass, name, game_type, decks, redeals): + game_type = game_type | GI.GT_MUGHAL_GANJIFA + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + suits=range(8), ranks=range(12)) + registerGame(gi) + return gi + +r(14401, MughalCircles, 'Mughal Circles', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(14402, Ghulam, 'Ghulam', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(14403, Shamsher, 'Shamsher', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(14404, EightLegions, 'Eight Legions', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(14405, Ashrafi, 'Ashrafi', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(14406, Tipati, 'Tipati', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(14407, Ashwapati, 'Ashwapati', GI.GT_MUGHAL_GANJIFA, 1, -1) +r(14408, Gajapati, 'Gajapati', GI.GT_MUGHAL_GANJIFA, 1, -1) +r(14409, Narpati, 'Narpati', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(14410, Garhpati, 'Garhpati', GI.GT_MUGHAL_GANJIFA, 1, -1) +r(14411, Dhanpati, 'Dhanpati', GI.GT_MUGHAL_GANJIFA, 1, 1) +r(14412, AkbarsTriumph, 'Akbar\'s Triumph', GI.GT_MUGHAL_GANJIFA, 1, 2) +r(14413, AkbarsConquest, 'Akbar\'s Conquest', GI.GT_MUGHAL_GANJIFA, 2, 2) +r(16000, Vajra, 'Vajra', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(16001, Danda, 'Danda', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(16002, Khadga, 'Khadga', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(16003, Makara, 'Makara', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(16004, AshtaDikapala, 'Ashta Dikapala', GI.GT_MUGHAL_GANJIFA, 1, 0) + +del r diff --git a/pysollib/games/ultra/tarock.py b/pysollib/games/ultra/tarock.py new file mode 100644 index 00000000..331fbdd8 --- /dev/null +++ b/pysollib/games/ultra/tarock.py @@ -0,0 +1,274 @@ +##---------------------------------------------------------------------------## +## +## Ultrasol -- a Python Solitaire game +## +## Copyright (C) 2000 by T. Kirk +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys + +# Ultrasol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +#from pysollib.pysoltk import MfxCanvasText + +from pysollib.games.special.tarock import AbstractTarockGame, Grasshopper + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Tarock_OpenStack(OpenStack): + + def __init__(self, x, y, game, yoffset=-1, **cap): + kwdefault(cap, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS, dir=-1) + apply(OpenStack.__init__, (self, x, y, game), cap) + if yoffset < 0: + yoffset = game.app.images.CARD_YOFFSET + self.CARD_YOFFSET = yoffset + + def isRankSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not c1.rank + dir == c2.rank: + return 0 + c1 = c2 + return 1 + + def isAlternateColorSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if (c1.color < 2 and c1.color == c2.color + or not c1.rank + dir == c2.rank): + return 0 + c1 = c2 + return 1 + + def isSuitSequence(self, cards, dir=None): + if not dir: + dir = self.cap.dir + c1 = cards[0] + for c2 in cards[1:]: + if not (c1.suit == c2.suit + and c1.rank + dir == c2.rank): + return 0 + c1 = c2 + return 1 + + def isHighRankCard(self, card): + maxcard = ([self.game.gameinfo.ranks[-1], self.game.gameinfo.trumps[-1]] + [(card.suit == len(self.game.gameinfo.suits))]) + return card.rank == maxcard or self.cap.base_rank == ANY_RANK + +class Tarock_RK_RowStack(Tarock_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isRankSequence(cards)): + return 0 + if not self.cards: + return self.isHighRankCard(cards[0]) + return self.isRankSequence([self.cards[-1], cards[0]]) + + def canMoveCards(self, cards): + return (self.basicCanMoveCards(cards) + and self.isRankSequence(cards)) + +class Tarock_SS_RowStack(Tarock_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isSuitSequence(cards)): + return 0 + if not self.cards: + return self.isHighRankCard(cards[0]) + return self.isSuitSequence([self.cards[-1], cards[0]]) + + def canMoveCards(self, cards): + return (self.basicCanMoveCards(cards) + and self.isSuitSequence(cards)) + +class Tarock_AC_RowStack(Tarock_OpenStack): + + def acceptsCards(self, from_stack, cards): + if (not self.basicAcceptsCards(from_stack, cards) + or not self.isAlternateColorSequence(cards)): + return 0 + if not self.cards: + return self.isHighRankCard(cards[0]) + return self.isAlternateColorSequence([self.cards[-1], cards[0]]) + + def canMoveCards(self, cards): + return (self.basicCanMoveCards(cards) + and self.isAlternateColorSequence(cards)) + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Cockroach(Grasshopper): + MAX_ROUNDS = 1 + +class DoubleCockroach(Grasshopper): + MAX_ROUNDS = 1 + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Corkscrew(AbstractTarockGame): + RowStack_Class = StackWrapper(Tarock_RK_RowStack, base_rank=NO_RANK) + + # + # game layout + # + + def createGame(self, rows=11, reserves=10): + # create layout + l, s = Layout(self), self.s + + # set size + maxrows = max(rows, reserves) + self.setSize(l.XM + (maxrows + 2) * l.XS, l.YM + 6 * l.YS) + + # + playcards = 4 * l.YS / l.YOFFSET + xoffset, yoffset = [], [] + for i in range(playcards): + xoffset.append(0) + yoffset.append(l.YOFFSET) + for i in range(78 * self.gameinfo.decks - playcards): + xoffset.append(l.XOFFSET) + yoffset.append(0) + + # create stacks + x, y = l.XM + (maxrows - reserves) * l.XS / 2, l.YM + for i in range(reserves): + s.reserves.append(ReserveStack(x, y, self)) + x = x + l.XS + x, y = l.XM + (maxrows - rows) * l.XS / 2, l.YM + l.YS + self.setRegion(s.reserves, (-999, -999, 999999, y - l.YM / 2)) + for i in range(rows): + stack = self.RowStack_Class(x, y, self, yoffset=l.YOFFSET) + stack.CARD_XOFFSET = xoffset + stack.CARD_YOFFSET = yoffset + s.rows.append(stack) + x = x + l.XS + x, y = l.XM + maxrows * l.XS, l.YM + for i in range(2): + for suit in range(5): + s.foundations.append(SS_FoundationStack(x, y, self, suit=suit, + max_cards=14 + 8 * (suit == 4))) + y = y + l.YS + x, y = x + l.XS, l.YM + self.setRegion(self.s.foundations, (x - l.XS * 2, -999, 999999, + self.height - (l.YS + l.YM)), priority=1) + s.talon = InitialDealTalonStack(self.width - 3 * l.XS / 2, self.height - l.YS, self) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + i = 0 + while self.s.talon.cards: + card = self.s.talon.cards[-1] + if card.rank == 13 + 8 * (card.suit == 4): + if self.s.rows[i].cards: + i = i + 1 + self.s.talon.dealRow(rows=[self.s.rows[i]], frames=4) + + # must look at cards + def _getClosestStack(self, cx, cy, stacks, dragstack): + closest, cdist = None, 999999999 + for stack in stacks: + if stack.cards and stack is not dragstack: + dist = (stack.cards[-1].x - cx)**2 + (stack.cards[-1].y - cy)**2 + else: + dist = (stack.x - cx)**2 + (stack.y - cy)**2 + if dist < cdist: + closest, cdist = stack, dist + return closest + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isRankSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Serpent(Corkscrew): + RowStack_Class = StackWrapper(Tarock_AC_RowStack, base_rank=NO_RANK) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isAlternateColorSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Rambling(Corkscrew): + RowStack_Class = StackWrapper(Tarock_SS_RowStack, base_rank=NO_RANK) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + row = self.s.rows[0] + sequence = row.isSuitSequence + return (sequence([card1, card2]) or sequence([card2, card1])) + +# /*********************************************************************** +# // register the games +# ************************************************************************/ + +def r(id, gameclass, name, game_type, decks, redeals): + game_type = game_type | GI.GT_TAROCK | GI.GT_CONTRIB | GI.GT_ORIGINAL + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + ranks=range(14), trumps=range(22)) + registerGame(gi) + return gi + +r(13163, Cockroach, 'Cockroach', GI.GT_TAROCK, 1, 0) +r(13164, DoubleCockroach, 'Double Cockroach', GI.GT_TAROCK, 2, 0) +r(13165, Corkscrew, 'Corkscrew', GI.GT_TAROCK, 2, 0) +r(13166, Serpent, 'Serpent', GI.GT_TAROCK, 2, 0) +r(13167, Rambling, 'Rambling', GI.GT_TAROCK, 2, 0) + +del r diff --git a/pysollib/games/ultra/threepeaks.py b/pysollib/games/ultra/threepeaks.py new file mode 100644 index 00000000..0600a54e --- /dev/null +++ b/pysollib/games/ultra/threepeaks.py @@ -0,0 +1,300 @@ +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 by T. Kirk +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# Imports +import sys, math + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText, MfxCanvasImage, bind, ANCHOR_NW + +from pysollib.games.golf import Golf_Waste, Golf_Hint + + +# /*********************************************************************** +# // Three Peaks Row Stack +# ************************************************************************/ + +class ThreePeaks_TalonStack(WasteTalonStack): + + def dealCards(self, sound=0): + game = self.game + game.sequence = 0 + old_state = game.enterState(game.S_DEAL) + num_cards = 0 + waste = self.waste + if self.cards: + if sound and not self.game.demo: + self.game.playSample("dealwaste") + num_cards = min(len(self.cards), self.num_deal) + assert len(waste.cards) + num_cards <= waste.cap.max_cards + for i in range(num_cards): + if not self.cards[-1].face_up: + game.flipMove(self) + game.moveMove(1, self, waste, frames=4, shadow=0) + self.fillStack() + elif waste.cards and self.round != self.max_rounds: + if sound: + self.game.playSample("turnwaste", priority=20) + num_cards = len(waste.cards) + game.turnStackMove(waste, self, update_flags=1) + game.leaveState(old_state) + return num_cards + + +class ThreePeaks_RowStack(OpenStack): + + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=0, max_accept=0, max_cards=1, + base_rank=ANY_RANK) + apply(OpenStack.__init__, (self, x, y, game), cap) + + def basicIsBlocked(self): + r, step = self.game.s.rows, (3, 4, 5, 6, 6, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 9) + i = self.id + while i < 18: + i = i + step[i] + for j in range(2): + if r[i + j].cards: + return 1 + return 0 + + def clickHandler(self, event): + if self.basicIsBlocked(): + # remove selection + self._stopDrag() + return 1 + game = self.game + #print self.cards, game.s.waste.cards + card, waste = self.cards[0], game.s.waste.cards[-1] + mod, ranks, trumps = [], len(game.gameinfo.ranks), len(game.gameinfo.trumps) + mod.append([ranks, trumps][(card.suit == len(game.gameinfo.suits))]) + mod.append([ranks, trumps][(waste.suit == len(game.gameinfo.suits))]) + if ((card.rank + 1) % mod[0] == waste.rank + or (card.rank - 1) % mod[1] == waste.rank + or (waste.rank + 1) % mod[1] == card.rank + or (waste.rank - 1) % mod[0] == card.rank): + game.sequence = game.sequence + 1 + self._stopDrag() + self.game.playSample("autodrop", priority=20) + self.playMoveMove(1, game.s.waste, frames=-1, sound=0) + game.updateText() + return 1 + + +# /*********************************************************************** +# // Three Peaks Game +# ************************************************************************/ + +class ThreePeaks(Game): + + Waste_Class = StackWrapper(Golf_Waste, mod=13) + Hint_Class = Golf_Hint + + SCORING = 1 + + # + # Game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + # (compute best XOFFSET - up to 64/72 cards can be in the Waste) + decks = self.gameinfo.decks + l.XOFFSET = int(l.XS * 9 / self.gameinfo.ncards) + + # Set window size + w, h = l.XM + l.XS * 10, l.YM + l.YS * 4 + self.setSize(w, h) + + # Extra settings + self.game_score = 52 + self.hand_score = self.sequence = 0 + self.peaks = [0] * 3 + + # Create rows + x, y = l.XM + l.XS * 1.5, l.YM + for i in range(3): + s.rows.append(ThreePeaks_RowStack(x, y, self)) + x = x + l.XS * 3 + x, y = l.XM + l.XS, y + l.YS * .5 + for i in range(3): + s.rows.append(ThreePeaks_RowStack(x, y, self)) + x = x + l.XS + s.rows.append(ThreePeaks_RowStack(x, y, self)) + x = x + l.XS * 2 + x, y = l.XM + l.XS * .5, y + l.YS * .5 + for i in range(9): + s.rows.append(ThreePeaks_RowStack(x, y, self)) + x = x + l.XS + x, y = l.XM, y + l.YS * .5 + for i in range(10): + s.rows.append(ThreePeaks_RowStack(x, y, self)) + x = x + l.XS + + # Create talon + x, y = l.XM, y + l.YM + l.YS + s.talon = ThreePeaks_TalonStack(x, y, self, num_deal=1, max_rounds=1) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = self.Waste_Class(x, y, self) + s.waste.CARD_XOFFSET = l.XOFFSET + s.foundations.append(s.waste) + l.createText(s.waste, "ss") + + # Create text for scores + if self.preview <= 1: + self.texts.info = MfxCanvasText(self.canvas, + l.XM + l.XS * 3, h - l.YM, + anchor="sw", + font=self.app.getFont("canvas_default")) + + # Define stack groups + l.defaultStackGroups() + + # + # Game over rides + # + + def startGame(self): + assert len(self.s.talon.cards) == self.gameinfo.ncards + self.game_score = self.game_score + self.hand_score - 52 + self.hand_score = -52 + self.peaks = [0] * 3 + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:18], flip=0, frames=4) + self.s.talon.dealRow(rows=self.s.rows[18:], flip=1, frames=4) + self.s.talon.dealCards() + + def isGameWon(self): + for r in self.s.rows: + if r.cards: + return 0 + if self.sequence: + self.hand_score = self.hand_score + len(self.s.talon.cards) * 10 + self.updateText() + self.sequence = 0 + return 1 + + def updateText(self): + if self.preview > 1 or not self.texts.info or not self.SCORING: + return + t = _('Score:\011This hand: ') + str(self.getHandScore()) + t = t + _('\011This game: ') + str(self.game_score) + self.texts.info.config(text=t) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + if stack1 == self.s.waste or stack2 == self.s.waste: + return ((card1.rank + 1) % 13 == card2.rank + or (card1.rank - 1) % 13 == card2.rank) + return 0 + + def getHandScore(self): + score, i = self.hand_score, 1 + if self.busy: + return score + # First count the empty peaks + for r in self.s.rows[:3]: + if not r.cards: + i = i * 2 + # Now give credit for newly emptied peaks + for r in self.s.rows[:3]: + if not r.cards and not self.peaks[r.id]: + score, self.peaks[r.id] = score + 5 * i, 1 + # Now give credit for the sequence length + if self.sequence and len(self.s.waste.cards) - 1: + score = score + i * 2 ** int((self.sequence - 1) / 4) + self.hand_score = score + return score + + def canUndo(self): + return 0 + + def _restoreGameHook(self, game): + self.game_score = game.loadinfo.game_score + self.hand_score = game.loadinfo.hand_score + self.sequence = game.loadinfo.sequence + self.peaks = game.loadinfo.peaks + + def _loadGameHook(self, p): + self.loadinfo.addattr(game_score=0) + self.loadinfo.game_score = p.load() + self.loadinfo.addattr(hand_score=0) + self.loadinfo.hand_score = p.load() + self.loadinfo.addattr(sequence=0) + self.loadinfo.sequence = p.load() + self.loadinfo.addattr(peaks=[0]*3) + self.loadinfo.peaks = p.load() + + def _saveGameHook(self, p): + p.dump(self.game_score) + p.dump(self.hand_score) + p.dump(self.sequence) + p.dump(self.peaks) + + +# /*********************************************************************** +# // Three Peaks Game Non-scoring +# ************************************************************************/ + +class ThreePeaksNoScore(ThreePeaks): + SCORING = 0 + + def canUndo(self): + return 1 + + +# /*********************************************************************** +# // Three Peaks Game Non-scoring +# ************************************************************************/ + +class LeGrandeTeton(ThreePeaks): + SCORING = 0 + + def canUndo(self): + return 1 + + +registerGame(GameInfo(22216, ThreePeaks, "Three Peaks", + GI.GT_PAIRING_TYPE, 1, 0)) +registerGame(GameInfo(22231, ThreePeaksNoScore, "Three Peaks Non-scoring", + GI.GT_PAIRING_TYPE, 1, 0)) +registerGame(GameInfo(22232, LeGrandeTeton, "Le Grande Teton", + GI.GT_TAROCK, 1, 0, ranks=range(14), trumps=range(22))) + + diff --git a/pysollib/games/unionsquare.py b/pysollib/games/unionsquare.py new file mode 100644 index 00000000..3fed5d1e --- /dev/null +++ b/pysollib/games/unionsquare.py @@ -0,0 +1,183 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class UnionSquare_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + # check the rank + if len(self.cards) > 12: + return cards[0].rank == 25 - len(self.cards) + else: + return cards[0].rank == len(self.cards) + + +class UnionSquare_RowStack(OpenStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, mod=8192, dir=0, base_rank=ANY_RANK, + max_accept=1, max_move=1) + apply(OpenStack.__init__, (self, x, y, game), cap) + #self.CARD_YOFFSET = 1 + + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + if not self.cards: + return 1 + if cards[0].suit != self.cards[0].suit: + return 0 + if len(self.cards) == 1: + card_dir = cards[0].rank - self.cards[-1].rank + return card_dir == 1 or card_dir == -1 + else: + stack_dir = (self.cards[1].rank - self.cards[0].rank) % self.cap.mod + return (self.cards[-1].rank + stack_dir) % self.cap.mod == cards[0].rank + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class UnionSquare(Game): + Hint_Class = CautiousDefaultHint + RowStack_Class = UnionSquare_RowStack + + # + # game layout + # + + def createGame(self, rows=16): + # create layout + l, s = Layout(self, YM=18), self.s + + # set window + self.setSize(l.XM + (5+rows/4)*l.XS, l.YM + 4*l.YS) + + # create stacks + x, y, = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "s") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "s") + for i in range(4): + x = 3*l.XS + for j in range(rows/4): + stack = self.RowStack_Class(x, y, self) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 1 + s.rows.append(stack) + x = x + l.XS + y = y + l.YS + x, y = self.width-l.XS, l.YM + for i in range(4): + stack = UnionSquare_Foundation(x, y, self, i, max_move=0, + dir=0, max_cards=26) + l.createText(stack, "sw") + s.foundations.append(stack) + y = y + l.YS + + # define stack-groups + l.defaultStackGroups() + + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + def getHighlightPilesStacks(self): + return () + + +# /*********************************************************************** +# // Solid Square +# ************************************************************************/ + +class SolidSquare(UnionSquare): + RowStack_Class = StackWrapper(UD_SS_RowStack, base_rank=NO_RANK, + max_accept=1, max_move=1, mod=13) + def createGame(self): + UnionSquare.createGame(self, rows=20) + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE and c.deck == 0, c.suit)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + UnionSquare.startGame(self) + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + old_state = self.enterState(self.S_FILL) + if not self.s.waste.cards: + self.s.talon.dealCards() + if self.s.waste.cards: + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + +# register the game +registerGame(GameInfo(35, UnionSquare, "Union Square", + GI.GT_2DECK_TYPE, 2, 0, + altnames=('British Square',), + )) +registerGame(GameInfo(439, SolidSquare, "Solid Square", + GI.GT_2DECK_TYPE, 2, 0)) diff --git a/pysollib/games/wavemotion.py b/pysollib/games/wavemotion.py new file mode 100644 index 00000000..74b1b5ef --- /dev/null +++ b/pysollib/games/wavemotion.py @@ -0,0 +1,100 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Wave Motion +# ************************************************************************/ + +class WaveMotion_RowStack(SS_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + +class WaveMotion(Game): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+8*l.XS, l.YM+2*l.YS+19*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + for i in range(8): + stack = WaveMotion_RowStack(x, y, self, base_rank=ANY_RANK) + s.rows.append(stack) + x += l.XS + x, y = l.XM, l.YM+l.YS+12*l.YOFFSET + for i in range(8): + stack = OpenStack(x, y, self, max_accept=0) + s.reserves.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + x += l.XS + + s.talon = InitialDealTalonStack(l.XM, l.YM, self) + + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow(rows=self.s.reserves[:4]) + + def isGameWon(self): + for s in self.s.rows: + if s.cards: + if len(s.cards) != 13 or not isSameSuitSequence(s.cards): + return False + return True + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +# register the game +registerGame(GameInfo(314, WaveMotion, "Wave Motion", + GI.GT_1DECK_TYPE, 1, 0)) diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py new file mode 100644 index 00000000..fc9e62a7 --- /dev/null +++ b/pysollib/games/windmill.py @@ -0,0 +1,270 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Windmill_Foundation(RK_FoundationStack): + def getBottomImage(self): + if self.cap.base_rank == ACE: + return self.game.app.images.getLetter(ACE) + return RK_FoundationStack.getBottomImage(self) + + +class Windmill_RowStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return 0 + # this stack accepts one card from the Waste pile + return from_stack is self.game.s.waste + + +# /*********************************************************************** +# // Windmill +# ************************************************************************/ + +class Windmill(Game): + + FILL_STACK = True + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self, XM=20), self.s + + # set window + self.setSize(7*l.XS+l.XM, 5*l.YS+l.YM+l.YM) + + # create stacks + x = l.XM + y = l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + x0, y0 = x + l.XS, y + for d in ((2,0), (2,1), (0,2), (1,2), (3,2), (4,2), (2,3), (2,4)): + x, y = x0 + d[0] * l.XS, y0 + d[1] * l.YS + s.rows.append(Windmill_RowStack(x, y, self)) + x, y = x0 + 2 * l.XS, y0 + 2 * l.YS + s.foundations.append(Windmill_Foundation(x, y, self, + mod=13, min_cards=1, max_cards=52)) + for d in ((1,0.6), (3,0.6), (1,3.4), (3,3.4)): + x, y = x0 + d[0] * l.XS, y0 + d[1] * l.YS + s.foundations.append(Windmill_Foundation(x, y, self, + base_rank=KING, dir=-1)) + + # define stack-groups + l.defaultStackGroups() + + # + # game overrides + # + + def _shuffleHook(self, cards): + for c in cards: + if c.id == 0: + break + cards.remove(c) + return cards + [c] + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=(self.s.foundations[0],)) + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def fillStack(self, stack): + if self.FILL_STACK and len(stack.cards) == 0: + if stack is self.s.waste and self.s.talon.cards: + self.s.talon.dealCards() + elif stack in self.s.rows and self.s.waste.cards: + self.s.waste.moveMove(1, stack) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank) + + def getHighlightPilesStacks(self): + return () + + def getAutoStacks(self, event=None): + # disable auto drop - this would ruin the whole gameplay + return ((), (), ()) + + + +# /*********************************************************************** +# // Napoleon's Tomb +# ************************************************************************/ + +class NapoleonsTomb(Windmill): + + FILL_STACK = False + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self, XM=20, YM=20), self.s + + # set window + self.setSize(5*l.XS+l.XM, 3*l.YS+l.YM+l.YM) + + # create stacks + x = l.XM + y = l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, "ss") + x = x + l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "ss") + x0, y0 = x + l.XS, y + for d in ((0,1), (1,0), (1,2), (2,1)): + x, y = x0 + d[0] * l.XS, y0 + d[1] * l.YS + s.rows.append(Windmill_RowStack(x, y, self)) + x, y = x0 + l.XS, y0 + l.YS + s.foundations.append(Windmill_Foundation(x, y, self, base_rank=5, + mod=6, min_cards=1, max_cards=24, + max_move=0, dir=-1)) + for d in ((0.1, 0.1), (1.9, 0.1), (0.1, 1.9), (1.9, 1.9)): + x, y = x0 + d[0] * l.XS, y0 + d[1] * l.YS + s.foundations.append(Windmill_Foundation(x, y, self, + max_cards=7, base_rank=6, max_move=0)) + + # define stack-groups + l.defaultStackGroups() + + + # + # game overrides + # + + def _shuffleHook(self, cards): + return cards + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +# /*********************************************************************** +# // Corners +# ************************************************************************/ + +class Corners(Game): + + def createGame(self): + # create layout + l, s = Layout(self, XM=20, YM=20), self.s + + # set window + self.setSize(5*l.XS+l.XM, 4*l.YS+3*l.YM) + + # create stacks + x, y = l.XM+l.XS, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, "sw") + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "se") + x0, y0 = l.XM, l.YM+l.YS + i = 0 + for d in ((0,0), (4,0), (0,2), (4,2)): + x, y = x0+d[0]*l.XS, y0+d[1]*l.YS + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + max_move=0, mod=13)) + i += 1 + for d in ((2,0), (1,1), (2,1), (3,1), (2,2)): + x, y = x0+d[0]*l.XS, y0+d[1]*l.YS + s.rows.append(ReserveStack(x, y, self)) + + # define stack-groups + l.defaultStackGroups() + + + def fillStack(self, stack): + if len(stack.cards) == 0: + if stack is self.s.waste and self.s.talon.cards: + self.s.talon.dealCards() + elif stack in self.s.rows and self.s.waste.cards: + self.s.waste.moveMove(1, stack) + + + def _shuffleHook(self, cards): + suits = [] + top_cards = [] + for c in cards[:]: + if c.suit not in suits: + suits.append(c.suit) + cards.remove(c) + top_cards.append(c) + if len(suits) == 4: + break + top_cards.sort(lambda a, b: cmp(b.suit, a.suit)) + return cards+top_cards + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + +# register the game +registerGame(GameInfo(30, Windmill, "Windmill", + GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(277, NapoleonsTomb, "Napoleon's Tomb", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(417, Corners, "Corners", + GI.GT_1DECK_TYPE, 1, 2)) + diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py new file mode 100644 index 00000000..ced4d9ef --- /dev/null +++ b/pysollib/games/yukon.py @@ -0,0 +1,545 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.hint import YukonType_Hint +from pysollib.pysoltk import MfxCanvasText + +from spider import Spider_SS_Foundation + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Yukon_Hint(YukonType_Hint): + BONUS_FLIP_CARD = 9000 + BONUS_CREATE_EMPTY_ROW = 100 + + ## FIXME: this is only a rough approximation and doesn't seem to help + ## for Russian Solitaire + def _getMovePileScore(self, score, color, r, t, pile, rpile): + s, color = YukonType_Hint._getMovePileScore(self, score, color, r, t, pile, rpile) + bonus = s - score + assert 0 <= bonus <= 9999 + # We must take care when moving piles that we won't block cards, + # i.e. if there is a card in pile which would be needed + # for a card in stack t. + tpile = t.getPile() + if tpile: + for cr in pile: + rr = self.ClonedStack(r, stackcards=[cr]) + for ct in tpile: + if rr.acceptsCards(t, [ct]): + d = bonus / 1000 + bonus = (d * 1000) + bonus % 100 + break + return score + bonus, color + + +# /*********************************************************************** +# // Yukon +# ************************************************************************/ + +class Yukon(Game): + Layout_Method = Layout.yukonLayout + Talon_Class = InitialDealTalonStack + Foundation_Class = SS_FoundationStack + RowStack_Class = StackWrapper(Yukon_AC_RowStack, base_rank=KING) + Hint_Class = Yukon_Hint + + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=7, texts=0, playcards=25) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon =self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit, + max_move=0)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + # default + l.defaultAll() + return l + + def startGame(self): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + for i in range(4): + self.s.talon.dealRow(rows=self.s.rows[1:], flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow() + assert len(self.s.talon.cards) == 0 + + def getHighlightPilesStacks(self): + return () + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Russian Solitaire (like Yukon, but build down by suit) +# ************************************************************************/ + +class RussianSolitaire(Yukon): + RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Moosehide (build down in any suit but the same) +# ************************************************************************/ + +class Moosehide_RowStack(Yukon_AC_RowStack): + def _isSequence(self, c1, c2): + return (c1.suit != c2.suit and c1.rank == c2.rank+1) + def getHelp(self): + return _('Row. Build down in any suit but the same, can move any face-up cards regardless of sequence.') + +class Moosehide(Yukon): + RowStack_Class = StackWrapper(Moosehide_RowStack, base_rank=KING) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit != card2.suit and + abs(card1.rank-card2.rank) == 1) + + +# /*********************************************************************** +# // Odessa (just like Russian Solitaire, only a different initial +# // card layout) +# ************************************************************************/ + +class Odessa(RussianSolitaire): + def startGame(self): + for i in range(3): + self.s.talon.dealRow(flip=0, frames=0) + for i in range(2): + self.s.talon.dealRow(frames=0) + for i in range(2): + self.s.talon.dealRow(rows=self.s.rows[1:6], frames=0) + self.startDealSample() + self.s.talon.dealRow() + assert len(self.s.talon.cards) == 0 + + +# /*********************************************************************** +# // Grandfather +# ************************************************************************/ + +class Grandfather(RussianSolitaire): + def startGame(self): + n = 1 + for i in (2,4,6,5,3,1): + self.s.talon.dealRow(rows=[self.s.rows[n]]*i, flip=0, frames=0) + n += 1 + n = 0 + self.startDealSample() + for i in (1,5,5,5,5,5,5): + self.s.talon.dealRow(rows=[self.s.rows[n]]*i) + n += 1 + assert len(self.s.talon.cards) == 0 + + +# /*********************************************************************** +# // Alaska (like Russian Solitaire, but build up or down in suit) +# ************************************************************************/ + +class Alaska_RowStack(Yukon_SS_RowStack): + def _isSequence(self, c1, c2): + return (c1.suit == c2.suit and + ((c1.rank + self.cap.dir) % self.cap.mod == c2.rank or + (c2.rank + self.cap.dir) % self.cap.mod == c1.rank)) + def getHelp(self): + return _('Row. Build up or down by suit, can move any face-up cards regardless of sequence.') + + +class Alaska(RussianSolitaire): + RowStack_Class = StackWrapper(Alaska_RowStack, base_rank=KING) + + +# /*********************************************************************** +# // Roslin (like Russian Solitaire, but build up or down by alternate color) +# ************************************************************************/ + +class Roslin_RowStack(Yukon_AC_RowStack): + def _isSequence(self, c1, c2): + return (c1.color != c2.color and + ((c1.rank + self.cap.dir) % self.cap.mod == c2.rank or + (c2.rank + self.cap.dir) % self.cap.mod == c1.rank)) + def getHelp(self): + return _('Row. Build up or down by alternate color, can move any face-up cards regardless of sequence.') + + +class Roslin(Yukon): + RowStack_Class = StackWrapper(Roslin_RowStack, base_rank=KING) + + +# /*********************************************************************** +# // Chinese Discipline +# // Chinese Solitaire +# ************************************************************************/ + +class ChineseDiscipline(Yukon): + Layout_Method = Layout.klondikeLayout + Talon_Class = DealRowTalonStack + + def createGame(self): + return Yukon.createGame(self, waste=0, texts=1) + + def startGame(self): + for i in (3, 3, 3, 4, 5, 6): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=1, frames=0) + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +class ChineseSolitaire(ChineseDiscipline): + RowStack_Class = Yukon_AC_RowStack # anything on an empty space + + +# /*********************************************************************** +# // Queenie +# ************************************************************************/ + +class Queenie(Yukon): + Layout_Method = Layout.klondikeLayout + Talon_Class = DealRowTalonStack + + def createGame(self): + return Yukon.createGame(self, waste=0, texts=1) + + def startGame(self, flip=1, reverse=1): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=flip, frames=0, reverse=reverse) + self.startDealSample() + self.s.talon.dealRow(reverse=reverse) + + +# /*********************************************************************** +# // Rushdike (like Queenie, but built down by suit) +# ************************************************************************/ + +class Rushdike(RussianSolitaire): + Layout_Method = Layout.klondikeLayout + Talon_Class = DealRowTalonStack + + def createGame(self): + return RussianSolitaire.createGame(self, waste=0, texts=1) + + def startGame(self, flip=0, reverse=1): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=flip, frames=0, reverse=reverse) + self.startDealSample() + self.s.talon.dealRow(reverse=reverse) + + +# /*********************************************************************** +# // Russian Point (Rushdike in a different layout) +# ************************************************************************/ + +class RussianPoint(Rushdike): + def startGame(self): + r = self.s.rows + for i in (1, 1, 2, 2, 3, 3): + self.s.talon.dealRow(rows=r[i:len(r)-i], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Abacus +# ************************************************************************/ + +class Abacus_Foundation(SS_FoundationStack): + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, base_rank=suit, mod=13, dir=suit+1, max_move=0) + apply(SS_FoundationStack.__init__, (self, x, y, game, suit), cap) + + +class Abacus_RowStack(Yukon_SS_RowStack): + def _isSequence(self, c1, c2): + dir, mod = -(c1.suit + 1), 13 + return c1.suit == c2.suit and (c1.rank + dir) % mod == c2.rank + + +class Abacus(Rushdike): + Foundation_Class = Abacus_Foundation + RowStack_Class = Abacus_RowStack + + def createGame(self): + l = Rushdike.createGame(self) + help = (_('''\ +Club: A 2 3 4 5 6 7 8 9 T J Q K +Spade: 2 4 6 8 T Q A 3 5 7 9 J K +Heart: 3 6 9 Q 2 5 8 J A 4 7 T K +Diamond: 4 8 Q 3 7 J 2 6 T A 5 9 K''')) + self.texts.help = MfxCanvasText(self.canvas, + l.XM, self.height - l.YM, text=help, + anchor="sw", + font=self.app.getFont("canvas_fixed")) + + def _shuffleHook(self, cards): + # move Twos to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, lambda c: (c.id in (0, 14, 28, 42), c.suit)) + + def startGame(self, flip=1, reverse=1): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=flip, frames=0, reverse=reverse) + self.startDealSample() + self.s.talon.dealRow(reverse=reverse) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + dir, mod = -(card1.suit + 1), 13 + return (card1.suit == card2.suit and + ((card1.rank + dir) % mod == card2.rank or + (card2.rank + dir) % mod == card1.rank)) + + +# /*********************************************************************** +# // Double Yukon +# ************************************************************************/ + +class DoubleYukon(Yukon): + def createGame(self): + Yukon.createGame(self, rows=10) + def startGame(self): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + for i in range(5): + self.s.talon.dealRow(rows=self.s.rows, flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:-1]) + assert len(self.s.talon.cards) == 0 + + +# /*********************************************************************** +# // Triple Yukon +# ************************************************************************/ + +class TripleYukon(Yukon): + def createGame(self): + Yukon.createGame(self, rows=13) + def startGame(self): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + for i in range(5): + self.s.talon.dealRow(rows=self.s.rows, flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow() + assert len(self.s.talon.cards) == 0 + + +# /*********************************************************************** +# // Ten Across +# ************************************************************************/ + +class TenAcross(Yukon): + + Foundation_Class = Spider_SS_Foundation + RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) + Layout_Method = Layout.freeCellLayout + + # + # game layout + # + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + kwdefault(layout, rows=10, reserves=2, texts=0) + apply(self.Layout_Method, (l,), layout) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = InitialDealTalonStack(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + self.s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + for r in l.s.reserves: + self.s.reserves.append(ReserveStack(r.x, r.y, self)) + # default + l.defaultAll() + + # + # game overrides + # + + def startGame(self): + n = 1 + for i in range(4): + self.s.talon.dealRow(rows=self.s.rows[:n], frames=0) + self.s.talon.dealRow(rows=self.s.rows[n:-n], frames=0, flip=0) + self.s.talon.dealRow(rows=self.s.rows[-n:], frames=0) + n += 1 + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + assert len(self.s.talon.cards) == 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + +# /*********************************************************************** +# // Panopticon +# ************************************************************************/ + +class Panopticon(TenAcross): + + Foundation_Class = SS_FoundationStack + + def createGame(self): + TenAcross.createGame(self, rows=8, reserves=4) + + def startGame(self): + self.s.talon.dealRow(frames=0, flip=0) + n = 1 + for i in range(3): + self.s.talon.dealRow(rows=self.s.rows[:n], frames=0) + self.s.talon.dealRow(rows=self.s.rows[n:-n], frames=0, flip=0) + self.s.talon.dealRow(rows=self.s.rows[-n:], frames=0) + n += 1 + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + + +# /*********************************************************************** +# // Australian Patience +# // Raw Prawn +# ************************************************************************/ + +class AustralianPatience(RussianSolitaire): + + RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) + + def createGame(self, rows=7): + l, s = Layout(self), self.s + Layout.klondikeLayout(l, rows=rows, waste=1) + self.setSize(l.size[0], l.size[1]) + s.talon = WasteTalonStack(l.s.talon.x, l.s.talon.y, self, max_rounds=1) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + for r in l.s.foundations: + s.foundations.append(SS_FoundationStack(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + l.defaultAll() + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + +class RawPrawn(AustralianPatience): + RowStack_Class = Yukon_SS_RowStack + + +class BimBom(AustralianPatience): + RowStack_Class = Yukon_SS_RowStack + def createGame(self): + AustralianPatience.createGame(self, rows=8) + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + +# register the game +registerGame(GameInfo(19, Yukon, "Yukon", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(20, RussianSolitaire, "Russian Solitaire", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(27, Odessa, "Odessa", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(278, Grandfather, "Grandfather", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(186, Alaska, "Alaska", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(187, ChineseDiscipline, "Chinese Discipline", + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) +registerGame(GameInfo(188, ChineseSolitaire, "Chinese Solitaire", + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) +registerGame(GameInfo(189, Queenie, "Queenie", + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) +registerGame(GameInfo(190, Rushdike, "Rushdike", + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) +registerGame(GameInfo(191, RussianPoint, "Russian Point", + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) +registerGame(GameInfo(192, Abacus, "Abacus", + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) +registerGame(GameInfo(271, DoubleYukon, "Double Yukon", + GI.GT_YUKON, 2, 0)) +registerGame(GameInfo(272, TripleYukon, "Triple Yukon", + GI.GT_YUKON, 3, 0)) +registerGame(GameInfo(284, TenAcross, "Ten Across", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(285, Panopticon, "Panopticon", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(339, Moosehide, "Moosehide", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(387, Roslin, "Roslin", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(447, AustralianPatience, "Australian Patience", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(450, RawPrawn, "Raw Prawn", + GI.GT_YUKON, 1, 0)) +registerGame(GameInfo(456, BimBom, "Bim Bom", + GI.GT_YUKON, 2, 0)) diff --git a/pysollib/help.py b/pysollib/help.py new file mode 100644 index 00000000..20e232c0 --- /dev/null +++ b/pysollib/help.py @@ -0,0 +1,171 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import sys, os +import traceback +import Tkinter + +# PySol imports +from mfxutil import EnvError +from settings import PACKAGE, PACKAGE_URL +from version import VERSION, FC_VERSION +from pysoltk import tkname, makeHelpToplevel, wm_map, wm_set_icon +from pysoltk import MfxDialog +from pysoltk import tkHTMLViewer +from gamedb import GAME_DB + +# /*********************************************************************** +# // +# ************************************************************************/ + +class AboutDialog(MfxDialog): + def createFrames(self, kw): + top_frame, bottom_frame = MfxDialog.createFrames(self, kw) + return top_frame, bottom_frame + + +def helpAbout(app, timeout=0, sound=1): + if sound: + app.audio.playSample("about") + t = _("A Python Solitaire Game Collection\n") + if app.miscrandom.random() < 0.8: + t = _("A World Domination Project\n") + strings=(_("Nice"), _("Credits...")) + if timeout: + strings=(_("Enjoy"),) + ##version = _("Version %s (%s)\n\n") % (FC_VERSION, VERSION) + version = _("Version %s\n\n") % FC_VERSION + d = AboutDialog(app.top, title=_("About ") + PACKAGE, timeout=timeout, + text=_('''PySol Fan Club edition +%s%s +Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 +Markus F.X.J. Oberhumer +Copyright (C) 2003 Mt. Hood Playing Card Co. +Copyright (C) 2005 Skomoroh (Fan Club edition) +All Rights Reserved. + +PySol is free software distributed under the terms +of the GNU General Public License. + +For more information about this application visit +%s''') % (t, version, PACKAGE_URL), + image=app.gimages.logos[2], + strings=strings, default=0, + separatorwidth=2) + if d.status == 0 and d.button == 1: + helpCredits(app, sound=sound) + return d.status + + +def helpCredits(app, timeout=0, sound=1): + if sound: + app.audio.playSample("credits") + t = "" + if tkname == "tk": t = "Tcl/Tk, " + elif tkname == "gnome": t = "PyGTK, " + elif tkname == "kde": t = "pyKDE, " + elif tkname == "wx": t = "wxPython, " + d = MfxDialog(app.top, title=_("Credits"), timeout=timeout, + text=PACKAGE+_(''' credits go to: + +Volker Weidner for getting me into Solitaire +Guido van Rossum for the initial example program +T. Kirk for lots of contributed games and cardsets +Carl Larsson for the background music +The Gnome AisleRiot team for parts of the documentation +Natascha + +The Python, %s, SDL & Linux crews +for making this program possible''') % t, + image=app.gimages.logos[3], image_side="right", + separatorwidth=2) + return d.status + + +# /*********************************************************************** +# // +# ************************************************************************/ + +help_html_viewer = None +help_html_index = None + +def helpHTML(app, document, dir_, top=None): + global help_html_viewer, help_html_index + if not document: + return None + if top is None: + top = app.top + try: + doc = app.dataloader.findFile(document, dir_) + if help_html_index is None: + document, dir_ = "index.html", "html" + help_html_index = app.dataloader.findFile(document, dir_) + except EnvError: + d = MfxDialog(app.top, title=PACKAGE + _(" HTML Problem"), + text=_("Cannot find help document\n") + document, + bitmap="warning") + return None + ##print doc, help_html_index + try: + viewer = help_html_viewer + #if viewer.parent.winfo_parent() != top._w: + # viewer.destroy() + # viewer = None + viewer.updateHistoryXYView() + viewer.display(doc, relpath=0) + except: + ##traceback.print_exc() + top = makeHelpToplevel(app, title=PACKAGE+_(" Help")) + if top.winfo_screenwidth() < 800 or top.winfo_screenheight() < 600: + #maximized = 1 + top.wm_minsize(300, 150) + else: + #maximized = 0 + top.wm_minsize(400, 200) + try: + wm_set_icon(top, app.dataloader.findIcon()) + except: + pass + viewer = tkHTMLViewer(top) + viewer.app = app + viewer.home = help_html_index + viewer.display(doc) + #wm_map(top, maximized=maximized) + viewer.parent.tkraise() + help_html_viewer = viewer + return viewer + diff --git a/pysollib/hint.py b/pysollib/hint.py new file mode 100644 index 00000000..4bb2cee0 --- /dev/null +++ b/pysollib/hint.py @@ -0,0 +1,965 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import struct, os, sys +import traceback + +# PySol imports +from mfxutil import Struct, destruct +from util import KING + + +# /*********************************************************************** +# // HintInterface is an abstract class that defines the public +# // interface - it only consists of the constructor +# // and the getHints() method. +# // +# // The whole hint system is exclusively used by Game.getHints(). +# ************************************************************************/ + +class HintInterface: + # level == 0: show hint (key `H') + # level == 1: show hint and display score value (key `Ctrl-H') + # level == 2: demo + def __init__(self, game, level): + pass + + # Compute all hints for the current position. + # Subclass responsibility. + # + # Returns a list of "atomic hints" - an atomic hint is a 7-tuple + # (score, pos, ncards, from_stack, to_stack, text_color, forced_move). + # + # if ncards == 0: deal cards + # elif from_stack == to_stack: flip card + # else: move cards from from_stack to to_stack + # + # score, pos and text_color are only for debugging. + # A forced_move is the next move that must be taken after this move + # in order to avoid endless loops during demo play. + # + # Deal and flip may only happen if self.level >= 2 (i.e. demo). + # + # See Game.showHint() for more information. + def getHints(self, taken_hint=None): + return [] + + +# /*********************************************************************** +# // AbstractHint provides a useful framework for derived hint classes. +# // +# // Subclasses should override computeHints() +# ************************************************************************/ + +class AbstractHint(HintInterface): + def __init__(self, game, level): + self.game = game + self.level = level + self.score_flatten_value = 0 + if self.level == 0: + self.score_flatten_value = 10000 + # temporaries within getHints() + self.bonus_color = None + # + self.__clones = [] + self.reset() + + def __del__(self): + self.reset() + + def reset(self): + self.hints = [] + self.max_score = 0 + self.__destructClones() + + # + # stack cloning + # + + # Create a shallow copy of a stack. + class AClonedStack: + def __init__(self, stack, stackcards): + # copy class identity + self.__class__ = stack.__class__ + # copy model data (reference copy) + stack.copyModel(self) + # set new cards (shallow copy of the card list) + self.cards = stackcards[:] + + def ClonedStack(self, stack, stackcards): + s = self.AClonedStack(stack, stackcards) + self.__clones.append(s) + return s + + def __destructClones(self): + for s in self.__clones: + s.__class__ = self.AClonedStack # restore orignal class + destruct(s) + self.__clones = [] + + # When computing hints for level 0, the scores are flattened + # (rounded down) to a multiple of score_flatten_value. + # + # The idea is that hints will appear equal within a certain score range + # so that the player will not get confused by the demo-intelligence. + # + # Pressing `Ctrl-H' (level 1) will preserve the score. + + def addHint(self, score, ncards, from_stack, to_stack, text_color=None, forced_move=None): + if score < 0: + return + self.max_score = max(self.max_score, score) + # add an atomic hint + if self.score_flatten_value > 0: + score = (score / self.score_flatten_value) * self.score_flatten_value + if text_color is None: + text_color = self.BLACK + assert forced_move is None or len(forced_move) == 7 + # pos is used for preserving the original sort order on equal scores + pos = -len(self.hints) + ah = (int(score), pos, ncards, from_stack, to_stack, text_color, forced_move) + self.hints.append(ah) + + # clean up and return hints sorted by score + def __returnHints(self): + hints = self.hints + self.reset() + hints.sort() + hints.reverse() + return hints + + # + # getHints() default implementation: + # - handle forced moves + # - try to flip face-down cards + # - call computeHints() to do something useful + # - try to deal cards + # - clean up and return hints sorted by score + # + + # Default scores for flip and deal moves. + SCORE_FLIP = 100000 # 0..100000 + SCORE_DEAL = 0 # 0..100000 + + def getHints(self, taken_hint=None): + # 0) setup + self.reset() + game = self.game + # 1) forced moves of the prev. taken hint have absolute priority + if taken_hint and taken_hint[6]: + return [taken_hint[6]] + # 2) try if we can flip a card + if self.level >= 2: + for r in game.allstacks: + if r.canFlipCard(): + self.addHint(self.SCORE_FLIP, 1, r, r) + if self.SCORE_FLIP >= 90000: + return self.__returnHints() + # 3) ask subclass to do something useful + self.computeHints() + # 4) try if we can deal cards + if self.level >= 2: + if game.canDealCards(): + self.addHint(self.SCORE_DEAL, 0, game.s.talon, None) + return self.__returnHints() + + # subclass + def computeHints(self): + pass + + # + # utility shallMovePile() + # + + # we move the pile if it is accepted by the target stack + def _defaultShallMovePile(self, from_stack, to_stack, pile, rpile): + if from_stack is to_stack or not to_stack.acceptsCards(from_stack, pile): + return 0 + return 1 + + # same, but check for loops + def _cautiousShallMovePile(self, from_stack, to_stack, pile, rpile): + if from_stack is to_stack or not to_stack.acceptsCards(from_stack, pile): + return 0 + # now check for loops + rr = self.ClonedStack(from_stack, stackcards=rpile) + if rr.acceptsCards(to_stack, pile): + # the pile we are going to move could be moved back - + # this is dangerous as we can create endless loops... + return 0 + return 1 + + # same, but only check for loops only when in demo mode + def _cautiousDemoShallMovePile(self, from_stack, to_stack, pile, rpile): + if from_stack is to_stack or not to_stack.acceptsCards(from_stack, pile): + return 0 + if self.level >= 2: + # now check for loops + rr = self.ClonedStack(from_stack, stackcards=rpile) + if rr.acceptsCards(to_stack, pile): + # the pile we are going to move could be moved back - + # this is dangerous as we can create endless loops... + return 0 + return 1 + + shallMovePile = _defaultShallMovePile + + + # + # other utility methods + # + + def _canDropAllCards(self, from_stack, stacks, stackcards): + assert not from_stack in stacks + return 0 + # FIXME: this does not account for cards which are dropped herein + cards = pile[:] + cards.reverse() + for card in cards: + for s in stacks: + if s is not from_stack: + if s.acceptsCards(from_stack, [card]): + break + else: + return 0 + return 1 + + # + # misc. constants + # + + # score value so that the scores look nicer + K = KING + 1 + # text_color that will display the score (for debug with level 1) + BLACK = "black" + RED = "red" + BLUE = "blue" + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class DefaultHint(AbstractHint): + + # The DefaultHint is optimized for Klondike type games + # and also deals quite ok with other simple variants. + # + # But it completely lacks any specific strategy about game + # types like Forty Thieves, FreeCell, Golf, Spider, ... + # + # BTW, we do not cheat ! + + + # + # bonus scoring used in _getXxxScore() below - subclass overrideable + # + + def _preferHighRankMoves(self): + return 0 + + + # Basic bonus for moving a card. + # Bonus must be in range 0..999 + + BONUS_DROP_CARD = 300 # 0..400 + BONUS_SAME_SUIT_MOVE = 200 # 0..400 + BONUS_NORMAL_MOVE = 100 # 0..400 + + def _getMoveCardBonus(self, r, t, pile, rpile): + assert pile + bonus = 0 + if rpile: + rr = self.ClonedStack(r, stackcards=rpile) + if (rr.canDropCards(self.game.s.foundations))[0]: + # the card below the pile can be dropped + bonus = self.BONUS_DROP_CARD + if t.cards and t.cards[-1].suit == pile[0].suit: + # simple heuristics - prefer moving high-rank cards + bonus = bonus + self.BONUS_SAME_SUIT_MOVE + (1 + pile[0].rank) + elif self._preferHighRankMoves(): + # simple heuristics - prefer moving high-rank cards + bonus = bonus + self.BONUS_NORMAL_MOVE + (1 + pile[0].rank) + elif rpile: + # simple heuristics - prefer low-rank cards in rpile + bonus = bonus + self.BONUS_NORMAL_MOVE + (self.K - rpile[-1].rank) + else: + # simple heuristics - prefer moving high-rank cards + bonus = bonus + self.BONUS_NORMAL_MOVE + (1 + pile[0].rank) + return bonus + + + # Special bonus for facing up a card after the current move. + # Bonus must be in range 0..9000 + + BONUS_FLIP_CARD = 1500 # 0..9000 + + def _getFlipSpecialBonus(self, r, t, pile, rpile): + assert pile and rpile + # The card below the pile can be flipped + # (do not cheat and look at it !) + # default: prefer a short rpile + bonus = max(self.BONUS_FLIP_CARD - len(rpile), 0) + return bonus + + + # Special bonus for moving a pile from stack r to stack t. + # Bonus must be in range 0..9000 + + BONUS_CREATE_EMPTY_ROW = 9000 # 0..9000 + BONUS_CAN_DROP_ALL_CARDS = 4000 # 0..4000 + BONUS_CAN_CREATE_EMPTY_ROW = 2000 # 0..4000 + + def _getMoveSpecialBonus(self, r, t, pile, rpile): + # check if we will create an empty row + if not rpile: + return self.BONUS_CREATE_EMPTY_ROW + # check if the card below the pile can be flipped + if not rpile[-1].face_up: + return self._getFlipSpecialBonus(r, t, pile, rpile) + # check if all the cards below our pile could be dropped + if self._canDropAllCards(r, self.game.s.foundations, stackcards=rpile): + # we can drop the whole remaining pile + # (and will create an empty row in the next move) + ##print "BONUS_CAN_DROP_ALL_CARDS", r, pile, rpile + self.bonus_color = self.RED + return self.BONUS_CAN_DROP_ALL_CARDS + self.BONUS_CAN_CREATE_EMPTY_ROW + # check if the cards below our pile are a whole row + if r.canMoveCards(rpile): + # could we move the remaining pile ? + for x in self.game.s.rows: + # note: we allow x == r here, because the pile + # (currently at the top of r) will be + # available in the next move + if x is t or not x.cards: + continue + if x.acceptsCards(r, rpile): + # we can create an empty row in the next move + ##print "BONUS_CAN_CREATE_EMPTY_ROW", r, x, pile, rpile + self.bonus_color = self.BLUE + return self.BONUS_CAN_CREATE_EMPTY_ROW + return 0 + + + # + # scoring used in getHints() - subclass overrideable + # + + # Score for moving a pile from stack r to stack t. + # Increased score should be in range 0..9999 + def _getMovePileScore(self, score, color, r, t, pile, rpile): + assert pile + self.bonus_color = color + b1 = self._getMoveSpecialBonus(r, t, pile, rpile) + assert 0 <= b1 <= 9000 + b2 = self._getMoveCardBonus(r, t, pile, rpile) + assert 0 <= b2 <= 999 + return score + b1 + b2, self.bonus_color + + + # Score for moving a pile (usually a single card) from the WasteStack. + def _getMoveWasteScore(self, score, color, r, t, pile, rpile): + assert pile + self.bonus_color = color + score = 30000 + if t.cards: score = 31000 + b2 = self._getMoveCardBonus(r, t, pile, rpile) + assert 0 <= b2 <= 999 + return score + b2, self.bonus_color + + + # Score for dropping ncards from stack r to stack t. + def _getDropCardScore(self, score, color, r, t, ncards): + assert t is not r + if ncards > 1: + # drop immediately (Spider) + return 93000, color + pile = r.cards + c = pile[-1] + # compute distance to t.cap.base_rank - compare Stack.getRankDir() + if t.cap.base_rank < 0: + d = len(t.cards) + else: + d = (c.rank - t.cap.base_rank) % t.cap.mod + if d > t.cap.mod / 2: + d = d - t.cap.mod + if abs(d) <= 1: + # drop Ace and 2 immediately + score = 92000 + elif r in self.game.sg.talonstacks: + score = 25000 # less than _getMoveWasteScore() + elif len(pile) == 1: + ###score = 50000 + score = 91000 + elif self._canDropAllCards(r, self.game.s.foundations, stackcards=pile[:-1]): + score = 90000 + color = self.RED + else: + # don't drop this card too eagerly - we may need it + # for pile moving + score = 50000 + score = score + (self.K - c.rank) + return score, color + + + # + # compute hints - main hint intelligence + # + + def computeHints(self): + game = self.game + + # 1) check Tableau piles + self.step010(game.sg.dropstacks, game.s.rows) + + # 2) try if we can move part of a pile within the RowStacks + # so that we can drop a card afterwards + if not self.hints and self.level >= 1: + self.step020(game.s.rows, game.s.foundations) + + # 3) try if we should move a card from a Foundation to a RowStack + if not self.hints and self.level >= 1: + self.step030(game.s.foundations, game.s.rows, game.sg.dropstacks) + + # 4) try if we can move a card from a RowStack to a ReserveStack + if not self.hints: + self.step040(game.s.rows, game.sg.reservestacks) + + # 5) try if we should move a card from a ReserveStack to a RowStack + if not self.hints: + self.step050(game.sg.reservestacks, game.s.rows) + + # Don't be too clever and give up ;-) + + + # + # implementation of the hint steps + # + + # 1) check Tableau piles + + def step010(self, dropstacks, rows): + # for each stack + for r in dropstacks: + # 1a) try if we can drop cards + t, ncards = r.canDropCards(self.game.s.foundations) + if t: + score, color = 0, None + score, color = self._getDropCardScore(score, color, r, t, ncards) + self.addHint(score, ncards, r, t, color) + if score >= 90000: + break + # 1b) try if we can move cards to one of the RowStacks + for pile in self.step010b_getPiles(r): + if pile: + self.step010_movePile(r, pile, rows) + + def step010b_getPiles(self, stack): + # return all moveable piles for this stack, longest one first + return (stack.getPile(), ) + + def step010_movePile(self, r, pile, rows): + lp = len(pile) + lr = len(r.cards) + assert 1 <= lp <= lr + rpile = r.cards[ : (lr-lp) ] # remaining pile + + empty_row_seen = 0 + r_is_waste = r in self.game.sg.talonstacks + + for t in rows: + score, color = 0, None + if not self.shallMovePile(r, t, pile, rpile): + continue + if r_is_waste: + # moving a card from the WasteStack + score, color = self._getMoveWasteScore(score, color, r, t, pile, rpile) + else: + if not t.cards: + # the target stack is empty + if lp == lr: + # do not move a whole stack from row to row + continue + if empty_row_seen: + # only make one hint for moving to an empty stack + # (in case we have multiple empty stacks) + continue + score = 60000 + empty_row_seen = 1 + else: + # the target stack is not empty + score = 80000 + score, color = self._getMovePileScore(score, color, r, t, pile, rpile) + self.addHint(score, lp, r, t, color) + + + # 2) try if we can move part of a pile within the RowStacks + # so that we can drop a card afterwards + # score: 40000 .. 59999 + + step020_getPiles = step010b_getPiles + + def step020(self, rows, foundations): + for r in rows: + for pile in self.step020_getPiles(r): + if not pile or len(pile) < 2: + continue + # is there a card in our pile that could be dropped ? + drop_info = [] + i = 0 + for c in pile: + rr = self.ClonedStack(r, stackcards=[c]) + stack, ncards = rr.canDropCards(foundations) + if stack and stack is not r: + assert ncards == 1 + drop_info.append((c, stack, ncards, i)) + i = i + 1 + # now try to make a move so that the drop-card will get free + for di in drop_info: + c = di[0] + sub_pile = pile[di[3]+1 : ] + ##print "trying drop move", c, pile, sub_pile + ##assert r.canMoveCards(sub_pile) + if not r.canMoveCards(sub_pile): + continue + for t in rows: + if t is r or not t.acceptsCards(r, sub_pile): + continue + ##print "drop move", r, t, sub_pile + score = 40000 + score = score + 1000 + (self.K - r.getCard().rank) + # force the drop (to avoid loops) + force = (999999, 0, di[2], r, di[1], self.BLUE, None) + self.addHint(score, len(sub_pile), r, t, self.RED, forced_move=force) + + + # 3) try if we should move a card from a Foundation to a RowStack + # score: 20000 .. 29999 + + def step030(self, foundations, rows, dropstacks): + for s in foundations: + card = s.getCard() + if not card or not s.canMoveCards([card]): + continue + # search a RowStack that would accept the card + for t in rows: + if t is s or not t.acceptsCards(s, [card]): + continue + tt = self.ClonedStack(t, stackcards=t.cards+[card]) + # search a Stack that would benefit from this card + for r in dropstacks: + if r is t: + continue + pile = r.getPile() + if not pile: + continue + if not tt.acceptsCards(r, pile): + continue + # compute remaining pile in r + rpile = r.cards[ : (len(r.cards)-len(pile)) ] + rr = self.ClonedStack(r, stackcards=rpile) + if rr.acceptsCards(t, pile): + # the pile we are going to move from r to t + # could be moved back from t ro r - this is + # dangerous as we can create loops... + continue + score = 20000 + card.rank + ##print score, s, t, r, pile, rpile + # force the move from r to t (to avoid loops) + force = (999999, 0, len(pile), r, t, self.BLUE, None) + self.addHint(score, 1, s, t, self.BLUE, forced_move=force) + + + # 4) try if we can move a card from a RowStack to a ReserveStack + # score: 10000 .. 19999 + + def step040(self, rows, reservestacks): + if not reservestacks: + return + for r in rows: + card = r.getCard() + if not card or not r.canMoveCards([card]): + continue + pile = [card] + # compute remaining pile in r + rpile = r.cards[ : (len(r.cards)-len(pile)) ] + rr = self.ClonedStack(r, stackcards=rpile) + for t in reservestacks: + if t is r or not t.acceptsCards(r, pile): + continue + if rr.acceptsCards(t, pile): + # the pile we are going to move from r to t + # could be moved back from t ro r - this is + # dangerous as we can create loops... + continue + score = 10000 + score, color = self._getMovePileScore(score, None, r, t, pile, rpile) + self.addHint(score, len(pile), r, t, color) + break + + + # 5) try if we should move a card from a ReserveStack to a RowStack + + def step050(self, reservestacks, rows): + if not reservestacks: + return + ### FIXME + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class CautiousDefaultHint(DefaultHint): + shallMovePile = DefaultHint._cautiousShallMovePile + ##shallMovePile = DefaultHint._cautiousDemoShallMovePile + + def _preferHighRankMoves(self): + return 1 + + +# /*********************************************************************** +# // now some default hints for the various game types +# ************************************************************************/ + +# DefaultHint is optimized for Klondike type games anyway +class KlondikeType_Hint(DefaultHint): + pass + +# this works for Yukon, but not too well for Russian Solitaire +class YukonType_Hint(CautiousDefaultHint): + def step010b_getPiles(self, stack): + # return all moveable piles for this stack, longest one first + p = stack.getPile() + piles = [] + while p: + piles.append(p) + p = p[1:] # note: we need a fresh shallow copy + return piles + +# FIXME +class FreeCellType_Hint(CautiousDefaultHint): + pass + +class GolfType_Hint(DefaultHint): + pass + +class SpiderType_Hint(DefaultHint): + pass + + + +# /*********************************************************************** +# // +# ************************************************************************/ + +FreecellSolver = None + +## try: +## import FreecellSolver +## except: +## FreecellSolver = None + +fcs_command = 'fc-solve' +if os.name == 'nt': + if sys.path[0] and not os.path.isdir(sys.path[0]): # i.e. library.zip + fcs_command = os.path.join(os.path.split(sys.path[0])[0], 'fc-solve.exe') + fcs_command = '"%s"' % fcs_command + +try: + pin, pout, perr = os.popen3(fcs_command+' --help') + if pout.readline().startswith('fc-solve'): + FreecellSolver = True + del pin, pout, perr +except: + ##traceback.print_exc() + pass + + +class FreeCellSolverWrapper: + class FreeCellSolver_Hint(AbstractHint): + def str1(self, card): + return "A23456789TJQK"[card.rank] + "CSHD"[card.suit] + def str2(self, card): + return "CSHD"[card.suit] + "-" + "A23456789TJQK"[card.rank] + + + def computeHints(self): + ##print 'FreeCellSolver_Hint.computeHints' + + board = '' + pboard = {} + # + b = '' + #l = [] + for s in self.game.s.foundations: + if s.cards: + b = b + ' ' + self.str2(s.cards[-1]) + #l.append(self.str2(s.cards[-1])) + if b: + board = board + 'Founds:' + b + '\n' + #pboard['Founds'] = l + # + b = '' + l = [] + for s in self.game.s.reserves: + if s.cards: + cs = self.str1(s.cards[-1]) + b = b + ' ' + cs + l.append(cs) + else: + b = b + ' -' + l.append(None) + if b: + board = board + 'FC:' + b + '\n' + pboard['FC'] = l + # + n = 0 + for s in self.game.s.rows: + b = '' + l = [] + for c in s.cards: + cs = self.str1(c) + if not c.face_up: + cs = '<%s>' % cs + b = b + cs + ' ' + l.append(cs) + board = board + b.strip() + '\n' + pboard[n] = l + n += 1 + # + ##print board + # + args = [] + args += ['-sam', '-p', '--display-10-as-t'] + ##args += ['-l', 'good-intentions'] + args += ['--max-iters', 200000] + args += ['--decks-num', self.fcs_args[0], + '--stacks-num', self.fcs_args[1], + '--freecells-num', self.fcs_args[2], + ] + # + game_type = self.fcs_args[3] + if game_type.has_key('sbb'): + args += ['--sequences-are-built-by', game_type['sbb']] + if game_type.has_key('sm'): + args += ['--sequence-move', game_type['sm']] + if game_type.has_key('esf'): + args += ['--empty-stacks-filled-by', game_type['esf']] + if game_type.has_key('preset'): + args += ['--preset', game_type['preset']] + + command = fcs_command+' '+' '.join([str(i) for i in args]) + ##print command + pin, pout, perr = os.popen3(command) + pin.write(board) + pin.close() + # + stack_types = { + 'the' : self.game.s.foundations, + 'stack' : self.game.s.rows, + 'freecell' : self.game.s.reserves, + } + my_hints = [] + pboard_n = 0 + ##print pboard + for s in pout: + ##print s, + if not s.startswith('Move'): + if s.startswith('Freecells:'): + ss=s[10:] + pboard['FC'] = [ss[i:i+4].strip() for i in range(0, len(ss), 4)] + elif s.startswith(':'): + pboard[pboard_n] = s.split()[1:] + pboard_n += 1 + continue + + words = s.split() + ncards = words[1] + if ncards == 'a': + ncards = 1 + else: + ncards = int(ncards) + + sn = int(words[5]) + st = stack_types[words[4]] + src = st[sn] + + if words[7] == 'the': + # to foundation + if words[4] == 'stack': + # from rows + card = pboard[sn][-1] + else: + # from reserves + card = pboard['FC'][sn] + suit = 'CSHD'.index(card[1]) + ##dest = self.game.s.foundations[suit] + dest = None + for f in self.game.s.foundations: + if f.cap.base_suit == suit: + dest = f + break + assert dest is not None + + else: + # to rows or reserves + dt = stack_types[words[7]] + dn = int(words[8]) + dest = dt[dn] + + my_hints.append([ncards, src, dest]) + ##print src, dest, ncards + + pboard = {} + pboard_n = 0 + + my_hints.reverse() + hint = None + for i in my_hints: + hint = (999999, 0, i[0], i[1], i[2], None, hint) + if hint: + self.hints.append(hint) + ##print self.hints + + + def computeHints_mod(self): + board = "" + # + b = "" + for s in self.game.s.foundations: + if s.cards: + b = b + " " + self.str2(s.cards[-1]) + if b: + board = board + "Founds:" + b + "\n" + # + b = "" + for s in self.game.s.reserves: + if s.cards: + b = b + " " + self.str1(s.cards[-1]) + else: + b = b + " -" + if b: + board = board + "FC:" + b + "\n" + # + for s in self.game.s.rows: + b = "" + for c in s.cards: + b = b + self.str1(c) + " " + board = board + b.strip() + "\n" + # + ##print board + # solver = apply(FreecellSolver.FCSolver, self.fcs_args) + solver = FreecellSolver.alloc() + solver.config(["-l", "good-intentions"]); + solver.config(["--decks-num", self.fcs_args[0], + "--stacks-num", self.fcs_args[1], + "--freecells-num", self.fcs_args[2], + ]) + + game_type = self.fcs_args[3] + game_type_defaults = {'sbb' : 'alternate_color', 'sm' : 'limited', 'esf': 'all'} + for k,v in game_type_defaults.items(): + if (not game_type.has_key(k)): + game_type[k] = v + + solver.config(["--sequences-are-built-by", game_type['sbb'], + "--sequence-move", game_type['sm'], + "--empty-stacks-filled-by", game_type['esf'], + ]) + + solver.limit_iterations(200000) + + h = solver.solve(board) + if (h == "solved"): + move = solver.get_next_move() + hint = None + founds_map = [2,0,3,1,6,4,7,5] + my_hints = [] + while (move): + print move + + if (move['type'] == "s2s"): + ncards = move['num_cards'] + else: + ncards = 1 + + src_idx = move['src'] + if move['type'] in ("s2s", "s2found", "s2f"): + src = self.game.s.rows[src_idx] + else: + src = self.game.s.reserves[src_idx] + + d_idx = move['dest'] + if move['type'] in ("s2s", "f2s"): + dest = self.game.s.rows[d_idx] + elif move['type'] in ("s2f", "f2f"): + dest = self.game.s.reserves[d_idx] + else: + dest = self.game.s.foundations[founds_map[d_idx]] + + # hint = (999999, 0, ncards, src, dest, None, 0) + my_hints.append([ncards, src, dest]) + # self.hints.append(hint) + move = solver.get_next_move(); + hint = None + my_hints.reverse() + for i in my_hints: + hint = (999999, 0, i[0], i[1], i[2], None, hint) + self.hints.append(hint) + #i = len(h) + #assert i % 3 == 0 + #hint = None + #map = self.game.s.foundations + self.game.s.rows + self.game.s.reserves + #while i > 0: + # i = i - 3 + # v = struct.unpack(" +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import os, types + +# PySol imports +from version import VERSION, VERSION_TUPLE +from mfxutil import Pickler, Unpickler, UnpicklingError +from mfxutil import Struct, EnvError + +# Toolkit imports +from pysoltk import tkversion, loadImage, copyImage, createImage + +try: + import Image +except ImportError: + Image = None + +# /*********************************************************************** +# // Images +# ************************************************************************/ + + +class ImagesCardback: + def __init__(self, index, name, image, menu_image=None): + if menu_image is None: menu_image = image + self.index = index + self.name = name + self.image = image + self.menu_image = menu_image + + +class Images: + def __init__(self, dataloader, cs, r=1): + self.d = dataloader + self.cs = cs + self.reduced = r + if cs is None: + return + # copy from cardset + self.CARDW, self.CARDH, self.CARDD = cs.CARDW/r, cs.CARDH/r, cs.CARDD/r + self.CARD_XOFFSET = cs.CARD_XOFFSET + self.CARD_YOFFSET = cs.CARD_YOFFSET + if r > 1: + self.CARD_XOFFSET = max(10, cs.CARD_XOFFSET)/r + self.CARD_YOFFSET = max(10, cs.CARD_YOFFSET)/r + self.SHADOW_XOFFSET, self.SHADOW_YOFFSET = cs.SHADOW_XOFFSET/r, cs.SHADOW_YOFFSET/r + self.CARD_DX, self.CARD_DY = cs.CARD_DX/r, cs.CARD_DY/r + # other + self._shade_index = 0 + self._card = [] + self._back = [] + self._bottom = [] + self._bottom_negative = [] + self._bottom_positive = [] + self._letter = [] + self._letter_negative = [] + self._letter_positive = [] + self._shadow = [] + self._shade = [] + + def destruct(self): + pass + + def __loadCard(self, filename, check_w=1, check_h=1): + ##print '__loadCard:', filename + f = os.path.join(self.cs.dir, filename) + img = loadImage(file=f) + w, h = img.width(), img.height() + if self.CARDW < 0: + self.CARDW, self.CARDH = w, h + else: + if ((check_w and w != self.CARDW) or + (check_h and h != self.CARDH)): + raise Exception, "Invalid size %dx%d of image %s" % (w, h, f) + return img + + def __addBack(self, im1, name): + r = max(self.CARDW / 40.0, self.CARDH / 60.0) + r = max(2, int(round(r))) + im2 = im1.subsample(r) + self._back.append(ImagesCardback(len(self._back), name, im1, im2)) + + def _createMissingImages(self): + # back + if not self._back: + im = createImage(self.CARDW, self.CARDH, fill="#a0a0a0", outline="#000000") + name = "" + self.__addBack(im, name) + self.cs.backnames = tuple(self.cs.backnames) + (name,) + # bottoms / letters + bottom = None + while len(self._bottom_positive) < 7: + if bottom is None: + bottom = createImage(self.CARDW, self.CARDH, fill=None, outline="#000000") + self._bottom_positive.append(bottom) + while len(self._bottom_negative) < 7: + if bottom is None: + bottom = createImage(self.CARDW, self.CARDH, fill=None, outline="#ffffff") + self._bottom_negative.append(bottom) + while len(self._letter_positive) < 4: + if bottom is None: + bottom = createImage(self.CARDW, self.CARDH, fill=None, outline="#000000") + self._letter_positive.append(bottom) + while len(self._letter_negative) < 4: + if bottom is None: + bottom = createImage(self.CARDW, self.CARDH, fill=None, outline="#ffffff") + self._letter_negative.append(bottom) + + def load(self, app, progress=None, fast=0): + ##fast = 1 + ##fast = 2 + if fast > 1: + # only for testing + self.cs.backnames = () + self.cs.nbottoms = 0 + self.cs.nletters = 0 + ext = self.cs.ext[1:] + pstep = 0 + if progress: + pstep = self.cs.ncards + len(self.cs.backnames) + self.cs.nbottoms + self.cs.nletters + if not fast: + pstep = pstep + self.cs.nshadows + 1 # shadows & shade + pstep = max(0, (80.0 - progress.percent) / pstep) + # load face cards + for n in self.cs.getFaceCardNames(): + self._card.append(self.__loadCard(n + self.cs.ext)) + self._card[-1].filename = n + if progress: progress.update(step=pstep) + assert len(self._card) == self.cs.ncards + # load backgrounds + for name in self.cs.backnames: + if name: + try: + im = self.__loadCard(name) + self.__addBack(im, name) + except: + pass + if progress: progress.update(step=1) + # load bottoms + for i in range(self.cs.nbottoms): + try: + name = "bottom%02d.%s" % (i + 1, ext) + self._bottom_positive.append(self.__loadCard(name)) + except: + pass + if progress: progress.update(step=pstep) + # load negative bottoms + try: + name = "bottom%02d-n.%s" % (i + 1, ext) + self._bottom_negative.append(self.__loadCard(name)) + except: + pass + if progress: progress.update(step=pstep) + # load letters + for rank in range(self.cs.nletters): + try: + name = "l%02d.%s" % (rank + 1, ext) + self._letter_positive.append(self.__loadCard(name)) + except: + pass + if progress: progress.update(step=pstep) + # load negative letters + try: + name = "l%02d-n.%s" % (rank + 1, ext) + self._letter_negative.append(self.__loadCard(name)) + except: + pass + if progress: progress.update(step=pstep) + # shadow + for i in range(self.cs.nshadows): + if fast: + self._shadow.append(None) + else: + name = "shadow%02d.%s" % (i, ext) + try: + im = self.__loadCard(name, check_w=0, check_h=0) + except: + im = None + self._shadow.append(im) + if progress: progress.update(step=pstep) + # shade + if fast: + self._shade.append(None) + else: + self._shade.append(self.__loadCard("shade." + ext)) + if progress: progress.update(step=pstep) + # create missing + self._createMissingImages() + # + self._bottom = self._bottom_positive + self._letter = self._letter_positive + return 1 + + def getFace(self, deck, suit, rank): + index = suit * len(self.cs.ranks) + rank + ##print "getFace:", suit, rank, index + return self._card[index % self.cs.ncards] + + def getBack(self, deck, suit, rank): + index = self.cs.backindex % len(self._back) + return self._back[index].image + + def getTalonBottom(self): + return self._bottom[0] + + def getReserveBottom(self): + return self._bottom[0] + + def getSuitBottom(self, suit=-1): + assert type(suit) is types.IntType + if suit == -1: return self._bottom[1] # any suit + i = 3 + suit + if i >= len(self._bottom): + # Trump (for Tarock type games) + return self._bottom[1] + return self._bottom[i] + + def getBraidBottom(self): + return self._bottom[2] + + def getLetter(self, rank): + assert 0 <= rank <= 3 + if rank >= len(self._letter): + return self._bottom[0] + return self._letter[rank] + + def getShadow(self, ncards): + assert ncards >= 0 + if ncards >= len(self._shadow): + ##ncards = len(self._shadow) - 1 + return None + return self._shadow[ncards] + + def getShade(self): + return self._shade[self._shade_index] + + def getCardbacks(self): + return self._back + + def setNegative(self, flag=0): + if flag: + self._bottom = self._bottom_negative + self._letter = self._letter_negative + else: + self._bottom = self._bottom_positive + self._letter = self._letter_positive + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class SubsampledImages(Images): + def __init__(self, images, r=2): + Images.__init__(self, None, images.cs, r=r) + self._card = self._subsample(images._card, r) + self._bottom_positive = self._subsample(images._bottom_positive, r) + self._letter_positive = self._subsample(images._letter_positive, r) + self._bottom_negative = self._subsample(images._bottom_negative, r) + self._letter_negative = self._subsample(images._letter_negative, r) + self._bottom = self._bottom_positive + self._letter = self._letter_positive + # + for _back in images._back: + if _back is None: + self._back.append(None) + else: + im = _back.image.subsample(r) + self._back.append(ImagesCardback(len(self._back), _back.name, im, im)) + # + CW, CH = self.CARDW, self.CARDH + for im in images._shade: + if im is None or tkversion < (8, 3, 0, 0): + self._shade.append(None) + else: + self._shade.append(copyImage(im, 0, 0, CW, CH)) + + def getShadow(self, ncards): + return None + + def _subsample(self, l, r): + s = [] + for im in l: + if im is None or r == 1: + s.append(im) + else: + s.append(im.subsample(r)) + return s + diff --git a/pysollib/layout.py b/pysollib/layout.py new file mode 100644 index 00000000..85009086 --- /dev/null +++ b/pysollib/layout.py @@ -0,0 +1,913 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import sys + +# PySol imports +from mfxutil import destruct, Struct, SubclassResponsibility +from pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // a helper class to create common layouts +# ************************************************************************/ + +# a layout stack +class _LayoutStack: + def __init__(self, x, y, suit=None): + self.x = int(round(x)) + self.y = int(round(y)) + self.suit = suit + self.text_args = {} + self.text_format = "%d" + + def setText(self, x, y, anchor="center", format=None, **kw): + self.text_args["x"] = x + self.text_args["y"] = y + self.text_args["anchor"] = anchor + self.text_args.update(kw) + if format is not None: + self.text_format = format + + +class Layout: + def __init__(self, game, XM=10, YM=10, **kw): + self.game = game + self.canvas = self.game.canvas + self.size = None + self.s = Struct( + talon = None, + waste = None, + foundations = [], + rows = [], + reserves = [], + ) + self.stackmap = {} + self.regions = [] + # set visual constants + images = self.game.app.images + self.CW = images.CARDW + self.CH = images.CARDH + self.XM = XM # XMARGIN + self.YM = YM # YMARGIN + self.XS = self.CW + XM # XSPACE + self.YS = self.CH + YM # YSPACE + self.XOFFSET = images.CARD_XOFFSET + self.YOFFSET = images.CARD_YOFFSET + self.__dict__.update(kw) +## if self.game.preview > 1: +## if kw.has_key("XOFFSET"): +## self.XOFFSET = self.XOFFSET / self.game.preview +## if kw.has_key("YOFFSET"): +## self.YOFFSET = self.YOFFSET / self.game.preview + + def __createStack(self, x, y, suit=None): + stack = _LayoutStack(x, y, suit) + mapkey = (stack.x, stack.y) + #from pprint import pprint + #print mapkey + #pprint(self.stackmap) + assert not self.stackmap.has_key(mapkey) + self.stackmap[mapkey] = stack + return stack + + + # + # public util for use by class Game + # + + def getTextAttr(self, stack, anchor): + x, y = 0, 0 + if stack is not None: + x, y = stack.x, stack.y + if anchor == "n": + return (x + self.CW / 2, y - self.YM, "center", "%d") + if anchor == "nn": + return (x + self.CW / 2, y - self.YM, "s", "%d") + if anchor == "s": + return (x + self.CW / 2, y + self.YS, "center", "%d") + if anchor == "ss": + return (x + self.CW / 2, y + self.YS, "n", "%d") + if anchor == "nw": + return (x - self.XM, y, "ne", "%d") + if anchor == "sw": + return (x - self.XM, y + self.CH, "se", "%d") + f = "%2d" + if self.game.gameinfo.decks > 1: + f = "%3d" + if anchor == "ne": + return (x + self.XS, y, "nw", f) + if anchor == "se": + return (x + self.XS, y + self.CH, "sw", f) + if anchor == "e": + return (x + self.XS, y + self.CH / 2, "w", f) + raise Exception, anchor + + def createText(self, stack, anchor, dx=0, dy=0, text_format=""): + if self.canvas.preview > 1: + return + assert stack.texts.ncards is None + tx, ty, ta, tf = self.getTextAttr(stack, anchor) + stack.texts.ncards = MfxCanvasText(self.canvas, tx+dx, ty+dy, + anchor=ta, + font=self.game.app.getFont("canvas_default")) + stack.texts.ncards.text_format = text_format or tf + + def setRegion(self, stacks, rects): + self.regions.append((stacks, rects)) + + + # + # util for use by a Game + # + + def defaultAll(self): + game = self.game + # create texts + if game.s.talon: + game.s.talon.texts.ncards = self.defaultText(self.s.talon) + if game.s.waste: + game.s.waste.texts.ncards = self.defaultText(self.s.waste) + # define stack-groups + self.defaultStackGroups() + # set regions + self.defaultRegions() + + def defaultText(self, layout_stack): + if self.canvas.preview > 1: + return None + ##print layout_stack, layout_stack.text_args + if layout_stack is None or not layout_stack.text_args: + return None + layout_stack.text_args["font"] = self.game.app.getFont("canvas_default") + t = apply(MfxCanvasText, (self.game.canvas,), layout_stack.text_args) + t.text_format = layout_stack.text_format + return t + + # define stack-groups + def defaultStackGroups(self): + game = self.game + waste = [] + if game.s.waste is not None: waste = [game.s.waste] + game.sg.talonstacks = [game.s.talon] + waste + game.sg.dropstacks = game.s.rows + game.s.reserves + waste + game.sg.openstacks = game.s.foundations + game.s.rows + game.s.reserves + game.sg.reservestacks = game.s.reserves + + def defaultRegions(self): + for region in self.regions: + # convert layout-stacks to corresponding game-stacks + stacks = [] + for s in region[0]: + mapkey = (s.x, s.y) + id = self.game.stackmap[mapkey] + stacks.append(self.game.allstacks[id]) + ##print stacks, region[1] + self.game.setRegion(stacks, region[1]) + + + # + # Baker's Dozen layout + # - left: 2 rows + # - right: foundations, talon + # + + def bakersDozenLayout(self, rows, texts=0, playcards=9): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps) + halfrows = (rows + 1) / 2 + + # set size so that at least 9 cards are fully playable + h = YS + min(2*YS, (playcards-1)*self.YOFFSET) + h = max(h, 5*YS/2, 3*YS/2+CH) + h = min(h, 3*YS) + + # create rows + x, y = XM, YM + for i in range(halfrows): + self.s.rows.append(S(x+i*XS, y)) + for i in range(rows-halfrows): + self.s.rows.append(S(x+i*XS, y+h)) + + # create foundations + x, y = XM + halfrows * XS, YM + self.setRegion(self.s.rows, (-999, -999, x - CW / 2, 999999)) + for suit in range(suits): + for i in range(decks): + self.s.foundations.append(S(x+i*XS, y, suit=suit)) + y = y + YS + + # create talon + h = YM + 2*h + self.s.talon = s = S(x, h - YS) + if texts: + assert 0 + + # set window + self.size = (XM + (halfrows+decks)*XS, h) + + + # + # FreeCell layout + # - top: free cells, foundations + # - below: rows + # - left bottom: talon + # + + def freeCellLayout(self, rows, reserves, texts=0, playcards=18): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps) + toprows = reserves + 1 + suits*decks + maxrows = max(rows, toprows) + + w = XM + maxrows*XS + + # set size so that at least 2/3 of a card is visible with 18 cards + h = CH*2/3 + (playcards-1)*self.YOFFSET + h = YM + YS + max(h, 3*YS) + + # create reserves & foundations + x, y = (w - (toprows*XS - XM))/2, YM + for i in range(reserves): + self.s.reserves.append(S(x, y)) + x = x + XS + for suit in range(suits): + for i in range(decks): + x = x + XS + self.s.foundations.append(S(x, y, suit=suit)) + + # create rows + x, y = (w - (rows*XS - XM))/2, YM + YS + for i in range(rows): + self.s.rows.append(S(x, y)) + x = x + XS + self.setRegion(self.s.rows, (-999, y - YM / 2, 999999, 999999)) + + # create talon + x, y = XM, h - YS + self.s.talon = s = S(x, y) + if texts: + # place text right of stack + s.setText(x + XS, y + CH, anchor="sw", format="%3d") + + # set window + self.size = (w, h) + + + # + # Gypsy layout + # - left: rows + # - right: foundations, talon + # + + def gypsyLayout(self, rows, waste=0, texts=1, playcards=25): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps) + + # set size so that at least 2/3 of a card is visible with 25 cards + h = CH*2/3 + (playcards-1)*self.YOFFSET + h = YM + max(h, (suits+1)*YS) + + # create rows + x, y = XM, YM + for i in range(rows): + self.s.rows.append(S(x, y)) + x = x + XS + self.setRegion(self.s.rows, (-999, -999, x - CW / 2, 999999)) + + # create foundations + for suit in range(suits): + for i in range(decks): + self.s.foundations.append(S(x+i*XS, y, suit=suit)) + y = y + YS + + # create talon and waste + x, y = x + (decks-1)*XS, h - YS + if texts: + x = x - XS/2 + self.s.talon = s = S(x, y) + if texts: + # place text right of stack + s.setText(x + XS, y + CH, anchor="sw", format="%3d") + if waste: + x = x - XS + self.s.waste = s = S(x, y) + if texts: + # place text left of stack + s.setText(x - XM, y + CH, anchor="se", format="%3d") + + # set window + self.size = (XM + (rows+decks)*XS, h) + + + # + # Harp layout + # - top: rows + # - bottom: foundations, waste, talon + # + + def harpLayout(self, rows, waste, texts=1, playcards=19): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps) + + w = max(rows*XS, (suits*decks+waste+1)*XS, (suits*decks+1)*XS+2*XM) + w = XM + w + + # set size so that at least 19 cards are fully playable + h = YS + (playcards-1)*self.YOFFSET + h = max(h, 3*YS) + + # top + x, y = (w - (rows*XS - XM))/2, YM + for i in range(rows): + self.s.rows.append(S(x, y)) + x = x + XS + + # bottom + x, y = XM, YM + h + self.setRegion(self.s.rows, (-999, -999, 999999, y - YS / 2)) + for suit in range(suits): + for i in range(decks): + self.s.foundations.append(S(x, y, suit=suit)) + x = x + XS + if waste: + x = w - 2*XS + self.s.waste = s = S(x, y) + if texts: + # place text above stack + s.setText(x + CW / 2, y - YM, anchor="s") + x = w - XS + self.s.talon = s = S(x, y) + if texts: + # place text above stack + s.setText(x + CW / 2, y - YM, anchor="s") + + # set window + self.size = (w, YM + h + YS) + + + # + # Klondike layout + # - top: talon, waste, foundations + # - bottom: rows + # + + def klondikeLayout(self, rows, waste, texts=1, playcards=16, center=1): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps) + foundrows = 1 + (suits > 5) + frows = decks * suits / foundrows + toprows = 1 + waste + frows + maxrows = max(rows, toprows) + + # set size so that at least 2/3 of a card is visible with 16 cards + h = CH * 2 / 3 + (playcards - 1) * self.YOFFSET + h = max(h, 2 * YS) + + # top + x, y = XM, YM + self.s.talon = s = S(x, y) + if texts: + if waste or not center or maxrows - frows <= 1: + # place text below stack + s.setText(x + CW / 2, y + YS, anchor="n") + else: + # place text right of stack + s.setText(x + XS, y, anchor="nw", format="%3d") + if waste: + x = x + XS + self.s.waste = s = S(x, y) + if texts: + # place text below stack + s.setText(x + CW / 2, y + YS, anchor="n") + + for row in range(foundrows): + x = XM + (maxrows - frows) * XS + if center and frows + 2 * (1 + waste + 1) <= maxrows: + # center the foundations + x = XM + (maxrows - frows) * XS / 2 + for suit in range(suits / foundrows): + for i in range(decks): + self.s.foundations.append(S(x, y, suit=suit + (row * (suits / 2)))) + x = x + XS + y = y + YS + + # bottom + x = XM + if rows < maxrows: x += (maxrows-rows) * XS/2 + y += YM * (3 - foundrows) + self.setRegion(self.s.rows, (-999, y - YM / 2, 999999, 999999)) + for i in range(rows): + self.s.rows.append(S(x, y)) + x = x + XS + + # set window + self.size = (XM + maxrows * XS, h + YM + YS * foundrows) + + + # + # Yukon layout + # - left: rows + # - right: foundations + # - left bottom: talon + # + + def yukonLayout(self, rows, texts=0, playcards=20): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps) + + # set size so that at least 2/3 of a card is visible with 20 cards + h = CH*2/3 + (playcards-1)*self.YOFFSET + h = YM + max(h, suits*YS) + + # create rows + x, y = XM, YM + for i in range(rows): + self.s.rows.append(S(x, y)) + x = x + XS + self.setRegion(self.s.rows, (-999, -999, x - CW / 2, 999999)) + + # create foundations + for suit in range(suits): + for i in range(decks): + self.s.foundations.append(S(x+i*XS, y, suit=suit)) + y = y + YS + + # create talon + x, y = XM, h - YS + self.s.talon = s = S(x, y) + if texts: + # place text right of stack + s.setText(x + XS, y + CH, anchor="sw", format="%3d") + + # set window + self.size = (XM + (rows+decks)*XS, h) + + + # + # Easy layout + # - top: talon, waste, foundations + # - bottom: rows + # + + def easyLayout(self, rows, waste, texts=1, playcards=10, center=1): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + ranks = len(self.game.gameinfo.ranks) + frows = 4 * decks / (1 + (decks >= 3)) + toprows = 1 + waste + frows + maxrows = max(rows, toprows) + yextra = 0 + + # set size so that at least 2/3 of a card is visible with 10 cards + h = CH * 2 / 3 + (playcards - 1) * self.YOFFSET + h = max(h, 2 * YS) + + # top + x, y = XM, YM + self.s.talon = s = S(x, y) + if texts: + if waste or not center or maxrows - frows <= 1: + # place text below stack + s.setText(x + CW / 2, y + YS, anchor="n") + yextra = 20 + else: + # place text right of stack + s.setText(x + XS, y, anchor="nw", format="%3d") + if waste: + x = x + XS + self.s.waste = s = S(x, y) + if texts: + # place text below stack + s.setText(x + CW / 2, y + YS, anchor="n") + x = XM + (maxrows - frows) * XS + if center and frows + 2 * (1 + waste + 1) <= maxrows: + # center the foundations + x = XM + (maxrows - frows) * XS / 2 + + x0, y0 = x, y + for i in range(decks): + for rank in range(ranks): + self.s.foundations.append(S(x0, y0, suit=rank)) + x0 = x0 + XS + if i == 1 and decks > 2: + x0, y0 = x, y + YS + y = y0 + + # bottom + x, y = XM, y + YS + yextra * (decks <= 2) + self.setRegion(self.s.rows, (-999, y - YM / 2, 999999, 999999)) + for i in range(rows): + self.s.rows.append(S(x, y)) + x = x + XS + + # set window + self.size = (XM + maxrows * XS, YM + YS + yextra + h) + + + # + # Samuri layout + # - top center: rows + # - left & right: foundations + # - bottom center: talon + # + + def samuriLayout(self, rows, waste, texts=1, playcards=20, center=1): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps) + toprows = 2 * decks + rows + yextra = 0 + + # set size so that at least 2/3 of a card is visible with 20 cards + h = CH * 2 / 3 + (playcards - 1) * self.YOFFSET + h = max(h, 2 * YS) + + # bottom center + x = (XM + (toprows * XS) / 2) - XS + y = h + self.s.talon = s = S(x, y) + if texts: + if waste or not center or toprows - rows <= 1: + # place text below stack + s.setText(x + CW / 2, y + YS, anchor="n") + yextra = 20 + else: + # place text right of stack + s.setText(x + XS, y, anchor="nw", format="%3d") + if waste: + x = x + XS + self.s.waste = s = S(x, y) + if texts: + # place text below stack + s.setText(x + CW / 2, y + YS, anchor="n") + + # left & right + x, y = XM, YM + d, x0, y0 = 0, x, y + for suit in range(12): + for i in range(decks): + x0, y0 = x + XS * i, y + YS * d + self.s.foundations.append(S(x0, y0, suit=suit)) + if i == decks - 1 and suit == 5: + x0, y0 = x + XS * (toprows - decks), YM + d, x, y = -1, x0, y0 + d = d + 1 + + # top center + x, y = XM + XS * decks, YM + self.setRegion(self.s.rows, (x - XM / 2, 0, x + XS * rows, 999999)) + for i in range(rows): + self.s.rows.append(S(x, y)) + x = x + XS + + # set window + self.size = (XM + toprows * XS, YM + YS + yextra + h) + + + # + # Sumo layout + # - top center: rows + # - left & right: foundations + # - bottom center: talon + # + + def sumoLayout(self, rows, reserves, texts=0, playcards=12, center=1): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps) + assert reserves % 2 == 0 + toprows = 12 + maxrows = max(rows, toprows) + w = XM + maxrows * XS + + # set size so that at least 2/3 of a card is visible with 12 cards + h = CH * 2 / 3 + (playcards - 1) * self.YOFFSET + h = max(h, 2 * YS) + + # create foundations + x, y = XM, YM + for i in range(decks): + for suit in range(12): + self.s.foundations.append(S(x, y, suit=suit)) + x = x + XS + x, y = XM, y + YS + + # create rows + x, y = XM + XS * ((toprows - rows) / 2), YM + YS * decks + for i in range(rows): + self.s.rows.append(S(x, y)) + x = x + XS + self.setRegion(self.s.rows, (XS + XM / 2, YS * decks + YM / 2, XS * 11 - XM / 2, 999999)) + + # create reserves + x, y = XM, YM + YS * decks + for i in range(reserves / 2): + self.s.reserves.append(S(x, y)) + y = y + YS + x, y = w - XS, YM + YS * decks + for i in range(reserves / 2): + self.s.reserves.append(S(x, y)) + y = y + YS + + # create talon + x, y = XM, h + YM + self.s.talon = s = S(x, y) + if texts: + # place text right of stack + s.setText(x + XS, y + CH, anchor="sw", format="%3d") + + # set window + self.size = (XM + toprows * XS, YM + YS + h) + + + # + # Fun layout + # - top: rows + # - right: foundations + # - bottom right: reserves + # + + def funLayout(self, rows, reserves, texts=0, playcards=12, center=1): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + ranks = len(self.game.gameinfo.ranks) + assert rows % 2 == 0 + assert reserves % decks == 0 + toprows = decks + rows / 2 + w = XM * 2 + toprows * XS + + # set size so that at least 2/3 of a card is visible with 12 cards + h = CH * 2 / 3 + (playcards - 1) * self.YOFFSET + h = max(h, 2 * YS) + + # create foundations + x, y = w - XS * decks, YM + for i in range(decks): + for rank in range(ranks): + self.s.foundations.append(S(x, y, suit=rank)) + y = y + YS + x, y = x + XS, YM + + # create rows + x, y = XM, YM + for i in range(rows / 2): + self.s.rows.append(S(x, y)) + x = x + XS + x, y = XM, (YS + h) / 2 + for i in range(rows / 2): + self.s.rows.append(S(x, y)) + x = x + XS + self.setRegion(self.s.rows, (0, 0, XS * rows / 2 + XM / 2, 999999)) + + # create reserves + x, y = w - XS * decks, YM + YS * 4 + for i in range(decks): + for i in range(reserves / decks): + self.s.reserves.append(S(x, y)) + y = y + YS + x, y = x + XS, YM + YS * 4 + + # create talon + x, y = XM, h + self.s.talon = s = S(x, y) + if texts: + # place text right of stack + s.setText(x + XS, y + CH, anchor="sw", format="%3d") + + # set window + self.size = (w, YM + YS + h) + + + # + # Oonsoo layout + # - top: talon & rows + # - left: reserves + # - center right: rows + # + + def oonsooLayout(self, rows, reserves, texts=0, playcards=12, center=1): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + assert rows % 2 == 0 + toprows = decks + rows / 2 + w = XM * 2 + toprows * (XS + XM) + + # set size so that at least 2/3 of a card is visible with 12 cards + h = CH * 2 / 3 + (playcards - 1) * self.YOFFSET + h = max(h, 2 * YS) + + # create talon + x, y = XM, YM + self.s.talon = s = S(x, y) + if texts: + # place text below stack + s.setText(x + CW / 2, y + YS, anchor="center", format="%d") + + # create rows + x, y = XS + XM * 3, YM + for i in range(rows / 2): + self.s.rows.append(S(x, y)) + x = x + XS + XM + x, y = XS + XM * 3, (YS + h) / 2 + for i in range(rows / 2): + self.s.rows.append(S(x, y)) + x = x + XS + XM + self.setRegion(self.s.rows, (XS + XM, -999, 999999, 999999)) + + # create reserves + x, y = XM, YM * 3 + YS + for i in range(decks): + for i in range(reserves / decks): + self.s.reserves.append(S(x, y)) + y = y + YS + x, y = x + XS, YM + YS * 4 + + # set window + self.size = (w, YM + YS + h) + + + # + # Ghulam layout + # - left & right: foundations & reserves + # - center: two groups of rows + # - lower right: talon + # + + def ghulamLayout(self, rows, reserves=0, texts=0): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + suits = len(self.game.gameinfo.suits) + assert rows % 2 == 0 + assert reserves % 2 == 0 + + # set size + w, h = XM * 3 + XS * ((rows / 2) + 2), YM + YS * ((suits / 2) + 2) + + # create foundations + x, y = XM, YM + for i in range(suits): + self.s.foundations.append(S(x, y, suit=i)) + y = y + YS + if i == suits / 2 - 1: + x, y = w - XS, YM + + # create rows + x = XM * 2 + XS + for i in range(rows / 2): + self.s.rows.append(S(x + i * XS, YM)) + for i in range(rows / 2): + self.s.rows.append(S(x + i * XS, h / 2)) + self.setRegion(self.s.rows, (XM + XS, -999, w - XM - XS, 999999)) + + # create reserves + for i in range(reserves / 2): + self.s.reserves.append(S(XM, h - YS * (i + 1))) + for i in range(reserves / 2): + self.s.reserves.append(S(w - XS, h - YS * (i + 1))) + + # create talon + self.s.talon = s = S(w - XS * 2, h - YS) + if texts: + assert 0 + + # set window + self.size = (w, h) + + + # + # Generiklon layout + # - top: talon & foundations + # - bottom: rows + # + + def generiklonLayout(self, rows, waste = 1, height = 6): + S = self.__createStack + CW, CH = self.CW, self.CH + XM, YM = self.XM, self.YM + XS, YS = self.XS, self.YS + + decks = self.game.gameinfo.decks + suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps) + frows = suits * decks / 2 + fspace = XS * (rows - 1) / 2 + + # Set window size + w, h = XM + XS * rows, YM * 2 + YS * height + self.size = (w, h) + + # Talon + x, y = XM, YM + self.s.talon = s = S(x, y) + s.setText(x + XS, y + CH, anchor = "sw", format = "%3d") + self.s.waste = s = S(x, y + YS) + s.setText(x + XS, y + YS + CH, anchor = "sw", format = "%3d") + + # Create foundations + x = w - fspace - XS * frows / 2 + for suit in range(suits / 2): + for i in range(decks): + self.s.foundations.append(S(x, y, suit = suit)) + x = x + XS + x = w - fspace - XS * frows / 2 + y = y + YS + for suit in range(suits / 2): + for i in range(decks): + self.s.foundations.append(S(x, y, suit = suit + suits / 2)) + x = x + XS + + # bottom + x, y = XM, YM * 2 + YS * 2 + for i in range(rows): + self.s.rows.append(S(x, y)) + x = x + XS + self.setRegion(self.s.rows, (-999, y - YM, 999999, 999999)) + diff --git a/pysollib/main.py b/pysollib/main.py new file mode 100644 index 00000000..dbf733e3 --- /dev/null +++ b/pysollib/main.py @@ -0,0 +1,536 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import sys, os, re, string, time, types +import traceback +import getopt +import gettext + +# PySol imports +from mfxutil import destruct, EnvError +from util import CARDSET, DataLoader +from version import VERSION +from settings import PACKAGE +from resource import Tile +from gamedb import GI +from app import Application +from pysolaudio import thread, pysolsoundserver +from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient, Win32AudioClient + +# Toolkit imports +from pysoltk import tkname, tkversion, wm_withdraw, wm_set_icon, loadImage +from pysoltk import MfxDialog, MfxExceptionDialog +from pysoltk import TclError, MfxRoot +from pysoltk import PysolProgressBar + +from tkFont import Font + +# /*********************************************************************** +# // +# ************************************************************************/ + +def fatal_no_cardsets(app): + app.wm_withdraw() + d = MfxDialog(app.top, title=PACKAGE + _(" installation error"), + text=_('''No %ss were found !!! + +Main data directory is: +%s + +Please check your %s installation. +''') % (CARDSET, app.dataloader.dir, PACKAGE), + bitmap="error", strings=(_("Quit"),)) + ##raise Exception, "no "+CARDSET+"s found !" + + +# /*********************************************************************** +# // +# ************************************************************************/ + +def parse_option(argv): + prog_name = argv[0] + try: + optlist, args = getopt.getopt(argv[1:], "h", + ["fg=", "foreground=", + "bg=", "background=", + "fn=", "font=", + "noplugins", + "nosound", + "help"]) + except getopt.GetoptError, err: + print _("%s: %s\ntry %s --help for more information") \ + % (prog_name, err, prog_name) + return None + opts = {"help": 0, + "fg": None, + "bg": None, + "fn": None, + "noplugins": 0, + "nosound": 0, + } + for i in optlist: + if i[0] in ("-h", "--help"): + opts["help"] = 1 + elif i[0] in ("--fg", "--foreground"): + opts["fg"] = i[1] + elif i[0] in ("--bg", "--background"): + opts["bg"] = i[1] + elif i[0] in ("--fn", "--font"): + opts["fn"] = i[1] + elif i[0] == "--noplugins": + opts["noplugins"] = 1 + elif i[0] == "--nosound": + opts["nosound"] = 1 + + if opts["help"]: + print _("""Usage: %s [OPTIONS] [FILE] + --fg --foreground=COLOR foreground color + --bg --background=COLOR background color + --fn --font=FONT default font + --nosound disable sound support + --noplugins disable load plugins + -h --help display this help and exit + + FILE - file name of a saved game +""") % prog_name + return None + + if len(args) > 1: + print _("%s: too many files\ntry %s --help for more information") % (prog_name, prog_name) + return None + filename = args and args[0] or None + if filename and not os.path.isfile(filename): + print _("%s: invalide file name\ntry %s --help for more information") % (prog_name, prog_name) + return None + return opts, filename + +# /*********************************************************************** +# // +# ************************************************************************/ + +def pysol_init(app, args): + # try to create the config directory + for d in ( + app.dn.config, + app.dn.savegames, + os.path.join(app.dn.config, "music"), + ##os.path.join(app.dn.config, "screenshots"), + os.path.join(app.dn.config, "tiles"), + os.path.join(app.dn.config, "tiles", "stretch"), + os.path.join(app.dn.config, "cardsets"), + os.path.join(app.dn.config, "plugins"), + ): + if not os.path.exists(d): + try: os.mkdir(d) + except: pass + + # init commandline options (undocumented) + opts = parse_option(args) + if not opts: + return 1 + sys.exit(1) + opts, filename = opts + wm_command = "" + prog = sys.executable + if prog and os.path.isfile(prog): + argv0 = os.path.normpath(args[0]) + prog = os.path.abspath(prog) + if os.path.isfile(argv0): + wm_command = prog + " " + os.path.abspath(argv0) + if filename: + app.commandline.loadgame = filename + + # init games database + import games + import games.contrib + import games.special + import games.ultra + import games.mahjongg + + # init DataLoader + f = os.path.join("html", "license.html") + app.dataloader = DataLoader(args[0], f) + + # try to load plugins + if not opts["noplugins"]: + for dir in (os.path.join(app.dataloader.dir, "games"), + os.path.join(app.dataloader.dir, "plugins"), + app.dn.plugins): + try: + app.loadPlugins(dir) + except: + pass + + # init toolkit 1) + top = MfxRoot(className=PACKAGE) + app.top = top + app.top_bg = top.cget("bg") + app.top_palette = [None, None] # [fg, bg] + app.top_cursor = top.cget("cursor") + + # print some debug info + + # load options + app.loadOptions() + + # init audio 1) + warn_thread = 0 + warn_pysolsoundserver = 0 + app.audio = None + if not opts["nosound"]: + if os.name == "nt" and app.opt.sound_mode == 0: + app.audio = Win32AudioClient() + elif pysolsoundserver: + app.audio = PysolSoundServerModuleClient() + elif os.name == "nt": + app.audio = Win32AudioClient() + if app.audio: + app.audio.startServer() + if app.audio.server is None: + if os.name == "nt" and not isinstance(app.audio, Win32AudioClient): + app.audio.destroy() + app.audio = Win32AudioClient() + app.audio.startServer() + else: + app.audio = AbstractAudioClient() + # update sound_mode + if isinstance(app.audio, PysolSoundServerModuleClient): + app.opt.sound_mode = 1 + else: + app.opt.sound_mode = 0 + + # init toolkit 2) + sw, sh, sd = top.winfo_screenwidth(), top.winfo_screenheight(), top.winfo_screendepth() + top.wm_group(top) + top.wm_title(PACKAGE + " " + VERSION) + top.wm_iconname(PACKAGE + " " + VERSION) + if sw < 640 or sh < 480: + top.wm_minsize(400, 300) + else: + top.wm_minsize(520, 360) + ##self.top.wm_maxsize(9999, 9999) # unlimited + top.wm_protocol("WM_DELETE_WINDOW", top.wmDeleteWindow) + if wm_command: + top.wm_command(wm_command) + if 1: + # set expected window size to assist the layout of the window manager + top.config(width=min(800,sw-64), height=min(600,sh-64)) + try: + wm_set_icon(top, app.dataloader.findIcon()) + except: pass + + # set global color scheme + if not opts["fg"] and not opts["bg"]: + if os.name == "posix": # Unix/X11 + top.option_add('*selectBackground', '#00008b', 50) + top.option_add('*selectForeground', 'white', 50) + top.option_add('*Entry.background', 'white', 50) + top.option_add('*Listbox.background', 'white', 50) + if os.name == "mac": + color, priority = "#d9d9d9", "60" + classes = ( + "Button", "Canvas", "Checkbutton", "Entry", + "Frame", "Label", "Listbox", "Menubutton", ### "Menu", + "Message", "Radiobutton", "Scale", "Scrollbar", "Text", + ) + for c in classes: + top.option_add("*" + c + "*background", color, priority) + top.option_add("*" + c + "*activeBackground", color, priority) + else: + bg, fg = opts["bg"], opts["fg"] + if bg: + top.tk_setPalette(bg) + app.top_palette[1] = bg + app.top_bg = bg + if fg: + top.option_add("*foreground", fg) + app.top_palette[0] = fg + + # font + if opts["fn"]: + font = opts["fn"] + top.option_add("*font", font) + elif os.name == 'posix': + top.option_add("*font", "Helvetica 12", 50) + font = top.option_get('font', '') + else: + font = None + try: + f = Font(top, font) + except: + print >> sys.stderr, "invalide font name:", font + pass + else: + if font: + fa = f.actual() + app.opt.fonts["default"] = (fa["family"], + fa["size"], + fa["slant"], + fa["weight"]) + else: + app.opt.fonts["default"] = None + + # check games + if len(app.gdb.getGamesIdSortedByName()) == 0: + app.wm_withdraw() + d = MfxDialog(top, title=PACKAGE + _(" installation error"), + text=_(''' +No games were found !!! + +Main data directory is: +%s + +Please check your %s installation. +''') % (app.dataloader.dir, PACKAGE), + bitmap="error", strings=(_("Quit"),)) + return 1 + + # init cardsets + app.initCardsets() + cardset = None + c = app.opt.cardset.get(0) + if c: + cardset = app.cardset_manager.getByName(c[0]) + if cardset and c[1]: + cardset.updateCardback(backname=c[1]) + if not cardset: + cardset = app.cardset_manager.get(0) + if app.cardset_manager.len() == 0 or not cardset: + fatal_no_cardsets(app) + return 3 + + # init tiles + manager = app.tabletile_manager + tile = Tile() + tile.color = app.opt.table_color + tile.name = "None" + tile.filename = None + manager.register(tile) + app.initTiles() + if app.opt.tabletile_name: ### and top.winfo_screendepth() > 8: + for tile in manager.getAll(): + if app.opt.tabletile_name == tile.basename: + app.tabletile_index = tile.index + break + + # init samples and music resources + app.initSamples() + app.initMusic() + + # init audio 2) + app.audio.connectServer(app) + if app.audio.audiodev is None: + app.opt.sound = 0 + if not opts["nosound"] and pysolsoundserver and not app.audio.connected: + print PACKAGE + ": could not connect to pysolsoundserver, sound disabled." + warn_pysolsoundserver = 1 + app.audio.updateSettings() + # start up the background music + if app.audio.audiodev: + music = app.music_manager.getAll() + if music: + app.music_playlist = list(music)[:] + app.miscrandom.shuffle(app.music_playlist) + if 1: ## and not app.debug: + for m in app.music_playlist: + if m.name.lower() == "bye_for_now": + app.music_playlist.remove(m) + app.music_playlist.insert(0, m) + break + app.audio.playContinuousMusic(app.music_playlist) + + # prepare the progress bar + app.loadImages1() + if not app.progress_images: + app.progress_images = (loadImage(app.gimages.logos[0]), + loadImage(app.gimages.logos[1])) + app.wm_withdraw() + + # warn about audio problems + if not opts["nosound"] and os.name == "posix" and pysolsoundserver is None: + if 1 and app.opt.sound and re.search(r"linux", sys.platform, re.I): + warn_pysolsoundserver = 1 + if thread is None: + warn_thread = 1 + if thread is None: + print PACKAGE + ": Python thread module not found, sound disabled." + else: + print PACKAGE + ": pysolsoundserver module not found, sound disabled." + sys.stdout.flush() + if not opts["nosound"]: + if warn_thread: + top.update() + d = MfxDialog(top, title=PACKAGE + _(" installation problem"), + text=_("Your Python installation is compiled without thread support.\n\nSounds and background music will be disabled."), + bitmap="warning", strings=(_("OK"),)) + elif warn_pysolsoundserver: + top.update() + d = MfxDialog(top, title=PACKAGE + _(" installation problem"), + text=_("The pysolsoundserver module was not found.\n\nSounds and background music will be disabled."), + bitmap="warning", strings=(_("OK"),)) + + # create the progress bar + title = _("Welcome to ") + PACKAGE + color = app.opt.table_color + if app.tabletile_index > 0: + color = "#008200" + app.intro.progress = PysolProgressBar(app, top, title=title, color=color, + images=app.progress_images) + + # prepare other images + app.loadImages2() + app.loadImages3() + app.loadImages4() + + # load cardset + progress = app.intro.progress + if not app.loadCardset(cardset, progress=progress, update=1): + for cardset in app.cardset_manager.getAll(): + progress.reset() + if app.loadCardset(cardset, progress=progress, update=1): + break + else: + fatal_no_cardsets(app) + return 3 + + # ok + return 0 + + +# /*********************************************************************** +# // +# ************************************************************************/ + +def pysol_exit(app): + # clean up + if app.audio is not None: + app.audio.destroy() # shut down audio + destruct(app.audio) + app.wm_withdraw() + if app.canvas is not None: + app.canvas.destroy() + destruct(app.canvas) + if app.toolbar is not None: + app.toolbar.destroy() + destruct(app.toolbar) + if app.menubar is not None: + destruct(app.menubar) + top = app.top + destruct(app) + app = None + if top is not None: + try: + top.destroy() + except: + pass + destruct(top) + + +# /*********************************************************************** +# // PySol main entry +# ************************************************************************/ + +def pysol_main(args): + # create the application + app = Application() + r = pysol_init(app, args) + if r != 0: + return r + # let's go - enter the mainloop + app.mainloop() +## try: +## r = pysol_init(app, args) +## if r != 0: +## return r +## # let's go - enter the mainloop +## app.mainloop() +## except KeyboardInterrupt, ex: +## print "Exiting on SIGINT." +## pass +## except StandardError, ex: +## if not app.top: +## raise +## t = str(ex.__class__) +## if str(ex): t = t + ":\n" + str(ex) +## d = MfxDialog(app.top, title=PACKAGE + " internal error", +## text="Internal errror. Please report this bug:\n\n"+t, +## strings=("Quit",), bitmap="error") + try: + pysol_exit(app) + except: + pass + return 0 + + +# /*********************************************************************** +# // main +# ************************************************************************/ + +def main(args=None): + + # setup (mainly for JPython) + if not hasattr(sys, "platform"): + sys.platform = "unknown" + if not hasattr(sys, "executable"): + sys.executable = None + if not hasattr(os, "defpath"): + os.defpath = "" + + # check versions + if sys.platform[:4] != "java": + if sys.version[:5] < "1.5.2": + print "%s needs Python 1.5.2 or better (you have %s)" % (PACKAGE, sys.version) + return 1 + assert len(tkversion) == 4 + if tkname == "tk": + import Tkinter + if tkversion < (8, 0, 0, 0): + print "%s needs Tcl/Tk 8.0 or better (you have %s)" % (PACKAGE, str(tkversion)) + return 1 + # check that Tkinter bindings are also at version 1.5.2 + if not hasattr(Tkinter.Wm, "wm_aspect") or not hasattr(Tkinter.Canvas, "tag_lower"): + print "%s: please update the Python-Tk bindings (aka Tkinter) to version 1.5.2 or better" % (PACKAGE,) + return 1 + # check Python + if -1 % 13 != 12: + raise Exception, "-1 % 13 != 12" + + # run it + r = pysol_main(args) + ##print "FINAL\n"; dumpmem() + return r + diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py new file mode 100644 index 00000000..412cbca3 --- /dev/null +++ b/pysollib/mfxutil.py @@ -0,0 +1,437 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import sys, os, time, types +#import traceback + +try: + from cPickle import Pickler, Unpickler, UnpicklingError +except ImportError: + from pickle import Pickler, Unpickler, UnpicklingError + +try: + import thread +except: + thread = None + +if os.name == "mac": + # macfs module is deprecated, consider using Carbon.File or Carbon.Folder + import macfs, MACFS + +win32api = shell = shellcon = None +if sys.platform.startswith('win'): + try: + import win32api + #from win32com.shell import shell, shellcon + except ImportError: + pass + +# /*********************************************************************** +# // exceptions +# ************************************************************************/ + +# work around a Mac problem +##EnvError = EnvironmentError +EnvError = (IOError, OSError, os.error,) + + +class SubclassResponsibility(Exception): + pass + + +# /*********************************************************************** +# // misc. util +# ************************************************************************/ + +## def static(f, *args, **kw): +## if args: +## a = tuple([f.im_class()] + list(args)) +## else: +## a = (f.im_class(),) +## return apply(f, a, kw) + + +## def ifelse(expr, val1, val2): +## if expr: +## return val1 +## return val2 + + +## def merge_dict(dict1, dict2, merge_none=1): +## for k, v in dict2.items(): +## if dict1.has_key(k): +## if type(dict1[k]) is type(v): +## dict1[k] = v +## elif dict2[k] is None and merge_none: +## dict1[k] = v + + +# this is a quick hack - we definitely need Unicode support... +def latin1_to_ascii(n): + #return n + n = n.encode('iso8859-1', 'replace') + ## FIXME: rewrite this for better speed + n = (n.replace("\xc4", "Ae") + .replace("\xd6", "Oe") + .replace("\xdc", "Ue") + .replace("\xe4", "ae") + .replace("\xf6", "oe") + .replace("\xfc", "ue")) + return n + +## import htmlentitydefs +## htmlentitydefs_i = {} +## def latin1_to_html(n): +## global htmlentitydefs_i +## if not htmlentitydefs_i: +## for k, v in htmlentitydefs.entitydefs.items(): +## htmlentitydefs_i[v] = "&" + k + ";" +## s, g = "", htmlentitydefs_i.get +## for c in n: +## s = s + g(c, c) +## return s + + +## def hexify(s): +## return "%02x"*len(s) % tuple(map(ord, s)) + + +def format_time(t): + ##print 'format_time:', t + if t <= 0: return "0:00" + if t < 3600: return "%d:%02d" % (t / 60, t % 60) + return "%d:%02d:%02d" % (t / 3600, (t % 3600) / 60, t % 60) + + +# /*********************************************************************** +# // misc. portab stuff +# ************************************************************************/ + +def getusername(): + if os.name == "nt": + return win32_getusername() + user = os.environ.get("USER","").strip() + if not user: + user = os.environ.get("LOGNAME","").strip() + return user + + +def gethomedir(): + if os.name == "nt": + return win32_gethomedir() + home = os.environ.get("HOME", "").strip() + if not home or not os.path.isdir(home): + home = os.curdir + return os.path.abspath(home) + + +def getprefdir(package, home=None): + if os.name == "nt": + return win32_getprefdir(package) + if os.name == "mac": + vrefnum, dirid = macfs.FindFolder(MACFS.kOnSystemDisk, MACFS.kPreferencesFolderType, 0) + fss = macfs.FSSpec((vrefnum, dirid, ":" + "PySolFC")) + return fss.as_pathname() + if home is None: + home = gethomedir() + return os.path.join(home, ".PySolFC") + + +# high resolution clock() and sleep() +uclock = time.clock +usleep = time.sleep +if os.name == "posix": + uclock = time.time + +# /*********************************************************************** +# // MSWin util +# ************************************************************************/ + +def win32_getusername(): + user = os.environ.get('USERNAME','').strip() + try: + user = win32api.GetUserName().strip() + except AttributeError: + pass + return user + +def win32_getprefdir(package): + hd = win32_gethomedir() + return os.path.join(hd, 'PySolFC') +## dname = os.path.expanduser("~\\.pysol") +## if not os.path.isdir(dname): +## try: +## dname = os.path.join( +## shell.SHGetFolderPath(0, shellcon.CSIDL_APPDATA, 0, 0), +## package, package) +## except AttributeError: +## pass +## return os.path.abspath(dname) + +def win32_gethomedir(): + # %USERPROFILE%, %APPDATA% + hd = os.path.expanduser('~') + if hd == '~': # win9x + return os.path.abspath('/') + return hd + +# /*********************************************************************** +# // memory util +# ************************************************************************/ + +def destruct(obj): + # assist in breaking circular references + if obj is not None: + assert type(obj) is types.InstanceType + for k in obj.__dict__.keys(): + obj.__dict__[k] = None + ##del obj.__dict__[k] + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Struct: + def __init__(self, **kw): + self.__dict__.update(kw) + + def __str__(self): + return str(self.__dict__) + + def __setattr__(self, key, value): + if not self.__dict__.has_key(key): + raise AttributeError, key + self.__dict__[key] = value + + def addattr(self, **kw): + for key in kw.keys(): + if hasattr(self, key): + raise AttributeError, key + self.__dict__.update(kw) + + def update(self, dict): + for key in dict.keys(): + if not self.__dict__.has_key(key): + raise AttributeError, key + self.__dict__.update(dict) + + def clear(self): + for key in self.__dict__.keys(): + t = type(key) + if t is types.ListType: + self.__dict__[key] = [] + elif t is types.TupleType: + self.__dict__[key] = () + elif t is types.DictType: + self.__dict__[key] = {} + else: + self.__dict__[key] = None + + def copy(self): + c = Struct() + c.__class__ = self.__class__ + c.__dict__.update(self.__dict__) + return c + + +# /*********************************************************************** +# // keyword argument util +# ************************************************************************/ + +# update keyword arguments with default arguments +def kwdefault(kw, **defaults): + for k, v in defaults.items(): + if not kw.has_key(k): + kw[k] = v + + +class KwStruct: + def __init__(self, kw={}, **defaults): + if isinstance(kw, KwStruct): + kw = kw.__dict__ + if isinstance(defaults, KwStruct): + defaults = defaults.__dict__ + if defaults: + kw = kw.copy() + for k, v in defaults.items(): + if not kw.has_key(k): + kw[k] = v + self.__dict__.update(kw) + + def __setattr__(self, key, value): + if not self.__dict__.has_key(key): + raise AttributeError, key + self.__dict__[key] = value + + def __getitem__(self, key): + return getattr(self, key) + + def get(self, key, default=None): + return self.__dict__.get(key, default) + + def getKw(self): + return self.__dict__ + + +# /*********************************************************************** +# // pickling support +# ************************************************************************/ + +def pickle(obj, filename, binmode=0): + f = None + try: + f = open(filename, "wb") + p = Pickler(f, binmode) + p.dump(obj) + f.close(); f = None + ##print "Pickled", filename + finally: + if f: f.close() + + +def unpickle(filename): + f, obj = None, None + try: + f = open(filename, "rb") + p = Unpickler(f) + x = p.load() + f.close(); f = None + obj = x + ##print "Unpickled", filename + finally: + if f: f.close() + return obj + + +# /*********************************************************************** +# // +# ************************************************************************/ + +def spawnv(file, args=()): + if not args: + args = () + args = (file,) + tuple(args) + # + if not os.path.isfile(file): + raise os.error, str(file) + mode = os.stat(file)[0] + if not (mode & 0100): + return 0 + # + if os.name == "posix": + pid = os.fork() + if pid == -1: + raise os.error, "fork failed" + if pid != 0: + # parent + try: + os.waitpid(pid, 0) + except: + pass + return 1 + # child + # 1) close all files + for fd in range(255, -1, -1): + try: + os.close(fd) + except: + pass + # 2) open stdin, stdout and stderr to /dev/null + try: + fd = os.open("/dev/null", os.O_RDWR) + os.dup(fd) + os.dup(fd) + except: + pass + # 3) fork again and exec program + try: + if os.fork() == 0: + try: + os.setpgrp() + except: + pass + os.execv(file, args) + except: + pass + # 4) exit + while 1: + os._exit(0) + return 0 + + +def spawnvp(file, args=()): + if file and os.path.isabs(file): + try: + if spawnv(file, args): + return file + except: + ##if traceback: traceback.print_exc() + pass + return None + # + path = os.environ.get("PATH", "") + path = path.split(os.pathsep) + for dir in path: + try: + if dir and os.path.isdir(dir): + f = os.path.join(dir, file) + try: + if spawnv(f, args): + return f + except: + ##if traceback: traceback.print_exc() + pass + except: + ##if traceback: traceback.print_exc() + pass + return None + + +# /*********************************************************************** +# // +# ************************************************************************/ + +def openURL(url): + try: + import webbrowser + webbrowser.open(url) + return 1 + except: + return 0 + + diff --git a/pysollib/move.py b/pysollib/move.py new file mode 100644 index 00000000..87afb8db --- /dev/null +++ b/pysollib/move.py @@ -0,0 +1,436 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import sys + + +# /*********************************************************************** +# // moves (undo / redo) +# ************************************************************************/ + +## Currently we have the following atomic moves: +## - move the top cards from one stack on the top of another +## - flip the top card of a stack +## - turn a whole stack onto another stack +## - update the model or complete view a stack +## - increase the round (the number of redeals) +## - save the seed of game.random +## - shuffle a stack + +class AtomicMove: + + def do(self, game): + self.redo(game) + + def __repr__(self): + return str(self.__dict__) + def __str__(self): + return str(self.__dict__) + + # Custom comparision for detecting redo moves. See Game.finishMove(). + def cmpForRedo(self, other): + return -1 + + +# /*********************************************************************** +# // Move the top N cards from a stack to another stack. +# ************************************************************************/ + +class AMoveMove(AtomicMove): + def __init__(self, ncards, from_stack, to_stack, frames, shadow=-1): + assert from_stack is not to_stack + self.ncards = ncards + self.from_stack_id = from_stack.id + self.to_stack_id = to_stack.id + self.frames = frames + self.shadow = shadow + + # do the actual move + def __doMove(self, game, ncards, from_stack, to_stack): + if game.moves.state == game.S_PLAY: + assert to_stack.acceptsCards(from_stack, from_stack.cards[-ncards:]) + cards = [] + for i in range(ncards): + card = from_stack.removeCard() + cards.append(card) + cards.reverse() + if self.frames != 0: + x, y = to_stack.getPositionFor(cards[0]) + game.animatedMoveTo(from_stack, to_stack, cards, x, y, frames=self.frames, shadow=self.shadow) + for c in cards: + to_stack.addCard(c) + + def redo(self, game): + self.__doMove(game, self.ncards, game.allstacks[self.from_stack_id], + game.allstacks[self.to_stack_id]) + + def undo(self, game): + self.__doMove(game, self.ncards, game.allstacks[self.to_stack_id], + game.allstacks[self.from_stack_id]) + + def cmpForRedo(self, other): + return (cmp(self.ncards, other.ncards) or + cmp(self.from_stack_id, other.from_stack_id) or + cmp(self.to_stack_id, other.to_stack_id)) + + +# /*********************************************************************** +# // Flip the top card of a stack. +# ************************************************************************/ + +class AFlipMove(AtomicMove): + def __init__(self, stack): + self.stack_id = stack.id + + # do the actual move + def __doMove(self, game, stack): + card = stack.cards[-1] + if card.face_up: + card.showBack() + else: + card.showFace() + + def redo(self, game): + self.__doMove(game, game.allstacks[self.stack_id]) + + def undo(self, game): + self.__doMove(game, game.allstacks[self.stack_id]) + + def cmpForRedo(self, other): + return cmp(self.stack_id, other.stack_id) + + +# /*********************************************************************** +# // Flip all cards +# ************************************************************************/ + +class AFlipAllMove(AtomicMove): + def __init__(self, stack): + self.stack_id = stack.id + + # do the actual move + def __doMove(self, game, stack): + #card = stack.cards[-1] + for card in stack.cards: + if card.face_up: + card.showBack() + else: + card.showFace() + + def redo(self, game): + self.__doMove(game, game.allstacks[self.stack_id]) + + def undo(self, game): + self.__doMove(game, game.allstacks[self.stack_id]) + + def cmpForRedo(self, other): + return cmp(self.stack_id, other.stack_id) + + +# /*********************************************************************** +# // Turn the Waste stack onto the empty Talon. +# ************************************************************************/ + +class ATurnStackMove(AtomicMove): + def __init__(self, from_stack, to_stack, update_flags=1): + assert from_stack is not to_stack + self.from_stack_id = from_stack.id + self.to_stack_id = to_stack.id + self.update_flags = update_flags + + def redo(self, game): + from_stack = game.allstacks[self.from_stack_id] + to_stack = game.allstacks[self.to_stack_id] + assert len(from_stack.cards) > 0 + assert len(to_stack.cards) == 0 + l = len(from_stack.cards) + for i in range(l): + ##unhide = (i >= l - 2) + unhide = 1 + ##print 1, unhide, from_stack.getCard().__dict__ + card = from_stack.removeCard(unhide=unhide, update=0) + ##print 2, unhide, card.__dict__ + assert card.face_up + to_stack.addCard(card, unhide=unhide, update=0) + card.showBack(unhide=unhide) + ##print 3, unhide, to_stack.getCard().__dict__ + if self.update_flags & 2: + ### not used yet + assert 0 + from_stack.round = from_stack.round + 1 + if self.update_flags & 1: + assert to_stack is game.s.talon + assert to_stack.round < to_stack.max_rounds or to_stack.max_rounds < 0 + to_stack.round = to_stack.round + 1 + from_stack.updateText() + to_stack.updateText() + + def undo(self, game): + from_stack = game.allstacks[self.to_stack_id] + to_stack = game.allstacks[self.from_stack_id] + assert len(from_stack.cards) > 0 + assert len(to_stack.cards) == 0 + l = len(from_stack.cards) + for i in range(l): + ##unhide = (i >= l - 2) + unhide = 1 + card = from_stack.removeCard(unhide=unhide, update=0) + assert not card.face_up + card.showFace(unhide=unhide) + to_stack.addCard(card, unhide=unhide, update=0) + if self.update_flags & 2: + ### not used yet + assert 0 + assert to_stack.round > 1 + to_stack.round = to_stack.round - 1 + if self.update_flags & 1: + assert from_stack is game.s.talon + assert from_stack.round > 1 + from_stack.round = from_stack.round - 1 + from_stack.updateText() + to_stack.updateText() + + def cmpForRedo(self, other): + return (cmp(self.from_stack_id, other.from_stack_id) or + cmp(self.to_stack_id, other.to_stack_id) or + cmp(self.update_flags, other.update_flags)) + + +# /*********************************************************************** +# // ATurnStackMove is somewhat optimized to avoid unnecessary +# // unhide and hide operations. +# // FIXME: doesn't work yet +# ************************************************************************/ + +class NEW_ATurnStackMove(AtomicMove): + def __init__(self, from_stack, to_stack, update_flags=1): + assert from_stack is not to_stack + self.from_stack_id = from_stack.id + self.to_stack_id = to_stack.id + self.update_flags = update_flags + + # do the actual turning move + def __doMove(self, from_stack, to_stack, show_face): + assert len(from_stack.cards) > 0 + assert len(to_stack.cards) == 0 + for card in from_stack.cards: + card.item.dtag(from_stack.group) + card.item.addtag(to_stack.group) + if show_face: + assert not card.face_up + card.showFace(unhide=0) + else: + assert card.face_up + card.showBack(unhide=0) + to_stack.cards = from_stack.cards + from_stack.cards = [] + from_stack.refreshView() + from_stack.updateText() + to_stack.refreshView() + to_stack.updateText() + + def redo(self, game): + from_stack = game.allstacks[self.from_stack_id] + to_stack = game.allstacks[self.to_stack_id] + if self.update_flags & 1: + assert to_stack is game.s.talon + assert to_stack.round < to_stack.max_rounds or to_stack.max_rounds < 0 + to_stack.round = to_stack.round + 1 + self.__doMove(from_stack, to_stack, 0) + + def undo(self, game): + from_stack = game.allstacks[self.from_stack_id] + to_stack = game.allstacks[self.to_stack_id] + if self.update_flags & 1: + assert to_stack is game.s.talon + assert to_stack.round > 1 + to_stack.round = to_stack.round - 1 + self.__doMove(to_stack, from_stack, 1) + + def cmpForRedo(self, other): + return (cmp(self.from_stack_id, other.from_stack_id) or + cmp(self.to_stack_id, other.to_stack_id) or + cmp(self.update_flags, other.update_flags)) + + +# /*********************************************************************** +# // Update the view or model of a stack. Only needed for complex +# // games in combination with undo. +# ************************************************************************/ + +class AUpdateStackMove(AtomicMove): + def __init__(self, stack, flags): + self.stack_id = stack.id + self.flags = flags + + # do the actual move + def __doMove(self, game, stack, undo): + if self.flags & 64: + # model + stack.updateModel(undo, self.flags) + else: + # view + if self.flags & 16: + stack.updateText() + if self.flags & 32: + stack.refreshView() + + def redo(self, game): + if (self.flags & 3) in (1, 3): + self.__doMove(game, game.allstacks[self.stack_id], 0) + + def undo(self, game): + if (self.flags & 3) in (2, 3): + self.__doMove(game, game.allstacks[self.stack_id], 1) + + def cmpForRedo(self, other): + return cmp(self.stack_id, other.stack_id) or cmp(self.flags, other.flags) + + +AUpdateStackModelMove = AUpdateStackMove +AUpdateStackViewMove = AUpdateStackMove + + +# /*********************************************************************** +# // Increase the `round' member variable of a Talon stack. +# ************************************************************************/ + +class ANextRoundMove(AtomicMove): + def __init__(self, stack): + self.stack_id = stack.id + + def redo(self, game): + stack = game.allstacks[self.stack_id] + assert stack is game.s.talon + assert stack.round < stack.max_rounds or stack.max_rounds < 0 + stack.round = stack.round + 1 + stack.updateText() + + def undo(self, game): + stack = game.allstacks[self.stack_id] + assert stack is game.s.talon + assert stack.round > 1 + stack.round = stack.round - 1 + stack.updateText() + + def cmpForRedo(self, other): + return cmp(self.stack_id, other.stack_id) + + +# /*********************************************************************** +# // Save the current state (needed for undo in some games). +# ************************************************************************/ + +class ASaveSeedMove(AtomicMove): + def __init__(self, game): + self.state = game.random.getstate() + + def redo(self, game): + game.random.setstate(self.state) + + def undo(self, game): + game.random.setstate(self.state) + + def cmpForRedo(self, other): + return cmp(self.state, other.state) + + +# /*********************************************************************** +# // Save game variables +# ************************************************************************/ + +class ASaveStateMove(AtomicMove): + def __init__(self, game, flags): + self.state = game.getState() + self.flags = flags + + def redo(self, game): + if (self.flags & 3) in (1, 3): + game.setState(self.state) + + def undo(self, game): + if (self.flags & 3) in (2, 3): + game.setState(self.state) + + def cmpForRedo(self, other): + return cmp(self.state, other.state) + + +# /*********************************************************************** +# // Shuffle all cards of a stack. Saves the seed. Does not flip any cards. +# ************************************************************************/ + +class AShuffleStackMove(AtomicMove): + def __init__(self, stack, game): + self.stack_id = stack.id + # save cards and state + self.card_ids = tuple(map(lambda c: c.id, stack.cards)) + self.state = game.random.getstate() + + def redo(self, game): + stack = game.allstacks[self.stack_id] + # paranoia + assert stack is game.s.talon + assert self.card_ids == tuple(map(lambda c: c.id, stack.cards)) + # shuffle (see random) + game.random.setstate(self.state) + seq = stack.cards + n = len(seq) - 1 + while n > 0: + j = game.random.randint(0, n) + seq[n], seq[j] = seq[j], seq[n] + n = n - 1 + stack.refreshView() + + def undo(self, game): + stack = game.allstacks[self.stack_id] + # restore cards + cards = [] + for id in self.card_ids: + c = game.cards[id] + assert c.id == id + cards.append(c) + stack.cards = cards + # restore the state + game.random.setstate(self.state) + stack.refreshView() + + def cmpForRedo(self, other): + return (cmp(self.stack_id, other.stack_id) or + cmp(self.card_ids, other.card_ids) or + cmp(self.state, other.state)) + diff --git a/pysollib/pysolaudio.py b/pysollib/pysolaudio.py new file mode 100644 index 00000000..acab3e95 --- /dev/null +++ b/pysollib/pysolaudio.py @@ -0,0 +1,331 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import os, re, string, sys, time, types +import traceback + +import thread +try: + import pysolsoundserver +except ImportError: + pysolsoundserver = None + + +# /*********************************************************************** +# // basic audio client +# ************************************************************************/ + +class AbstractAudioClient: + def __init__(self): + self.server = None + self.audiodev = None + self.connected = 0 + self.app = None + self.file_cache = {} + self.sample_priority = -1 + self.sample_loop = 0 + self.music_priority = -1 + self.music_loop = 0 + + def __del__(self): + self.destroy() + + # start server - set self.server on success (may also set self.audiodev) + def startServer(self): + pass + + # connect to server - set self.audiodev on success + def connectServer(self, app): + assert app + self.app = app + if self.server is not None: + try: + if self._connectServer(): + self.connected = 1 + except: + if traceback: traceback.print_exc() + self.destroy() + + # disconnect and stop server + def destroy(self): + if self.audiodev is not None: + try: + self._destroy() + except: + pass + self.server = None + self.audiodev = None + self.connected = 0 + self.app = None + + # + # high-level interface + # + + def stopAll(self): + self.stopSamples() + self.stopMusic() + + def playSample(self, name, priority=0, loop=0, volume=-1): + if self.audiodev is None or not self.app or not self.app.opt.sound: + return 0 + if priority <= self.sample_priority and self.sample_loop: + return 0 + obj = self.app.sample_manager.getByName(name) + if not obj or not obj.absname: + return 0 + try: + if self._playSample(obj.absname, priority, loop, volume): + self.sample_priority = priority + self.sample_loop = loop + return 1 + except: + if traceback: traceback.print_exc() + return 0 + + def stopSamples(self): + if self.audiodev is None: + return + try: + self._stopSamples() + except: + if traceback: traceback.print_exc() + self.sample_priority = -1 + self.sample_loop = 0 + + def stopSamplesLoop(self): + if self.audiodev is None: + return + try: + self._stopSamplesLoop() + except: + if traceback: traceback.print_exc() + self.sample_priority = -1 + self.sample_loop = 0 + + def playMusic(self, basename, priority=0, loop=0, volume=-1): + if self.audiodev is None or not self.app or not self.app.opt.sound: + return 0 + if priority <= self.music_priority and self.music_loop: + return 0 + obj = self.app.music_manager.getByBasename(basename) + if not obj or not obj.absname: + return 0 + try: + if self._playMusic(obj.absname, priority, loop, volume): + self.music_priority = priority + self.music_loop = loop + return 1 + except: + if traceback: traceback.print_exc() + return 0 + + def stopMusic(self): + if self.audiodev is None: + return + try: + self._stopMusic() + except: + if traceback: traceback.print_exc() + self.music_priority = -1 + self.music_loop = 0 + + # + # subclass - core implementation + # + + def _connectServer(self): + return 0 + + def _destroy(self): + pass + + def _playSample(self, filename, priority, loop, volume): + return 0 + + def _stopSamples(self): + pass + + def _stopSamplesLoop(self): + self._stopSamples() + + def _playMusic(self, name, priority, loop, volume): + return 0 + + def _stopMusic(self): + pass + + # + # subclass - extensions + # + + def getMusicInfo(self): + return -1 + + def playContinuousMusic(self, music_list): + pass + + def playNextMusic(self): + pass + + def updateSettings(self): + pass + + +# /*********************************************************************** +# // pysolsoundserver module +# ************************************************************************/ + +class PysolSoundServerModuleClient(AbstractAudioClient): + def startServer(self): + # use the module + try: + self.audiodev = pysolsoundserver + self.audiodev.init() + self.server = 1 # success - see also tk/menubar.py + except: + if traceback: traceback.print_exc() + self.server = None + self.audiodev = None + + def cmd(self, cmd): + return self.audiodev.cmd(cmd) + + # connect to server + def _connectServer(self): + r = self.cmd("protocol 6") + if r != 0: + return 0 + if 0 and self.app.debug: + self.cmd("debug 1") + return 1 + + # disconnect and stop server + def _destroy(self): + self.audiodev.exit() + + # + # + # + + def _playSample(self, filename, priority, loop, volume): + self.cmd("playwav '%s' %d %d %d %d" % (filename, -1, priority, loop, volume)) + return 1 + + def _stopSamples(self): + self.cmd("stopwav") + + def _stopSamplesLoop(self): + self.cmd("stopwavloop") + + def _playMusic(self, filename, priority, loop, volume): + self.cmd("playmus '%s' %d %d %d %d" % (filename, -1, priority, loop, volume)) + return 1 + + def _stopMusic(self): + self.cmd("stopmus") + + def getMusicInfo(self): + if self.audiodev: + return self.audiodev.getMusicInfo() + return -1 + + def playContinuousMusic(self, music_list): + if self.audiodev is None or not self.app: + return + try: + loop = 999999 + for music in music_list: + if music.absname: + self.cmd("queuemus '%s' %d %d %d %d" % (music.absname, music.index, 0, loop, music.volume)) + self.cmd("startqueue") + except: + if traceback: traceback.print_exc() + + def playNextMusic(self): + self.cmd("nextmus") + + def updateSettings(self): + if self.audiodev is None or not self.app: + return + s, m = 0, 0 + if self.app.opt.sound: + s = self.app.opt.sound_sample_volume + m = self.app.opt.sound_music_volume + try: + self.cmd("setwavvol %d" % s) + self.cmd("setmusvol %d" % m) + except: + if traceback: traceback.print_exc() + + +# /*********************************************************************** +# // Win32 winsound audio +# ************************************************************************/ + +class Win32AudioClient(AbstractAudioClient): + def startServer(self): + # use the built-in winsound module + try: + import winsound #keep# + self.audiodev = winsound + del winsound + self.server = 0 # success - see also tk/menubar.py + except: + self.server = None + self.audiodev = None + + def _playSample(self, filename, priority, loop, volume): + a = self.audiodev + flags = a.SND_FILENAME | a.SND_NODEFAULT | a.SND_NOWAIT | a.SND_ASYNC + if loop: + flags = flags | a.SND_LOOP + if priority <= self.sample_priority: + flags = flags | a.SND_NOSTOP + ###print filename, flags, priority + try: + a.PlaySound(filename, flags) + return 1 + except: pass + return 0 + + def _stopSamples(self): + a = self.audiodev + flags = a.SND_NODEFAULT | a.SND_PURGE + a.PlaySound(None, flags) + + diff --git a/pysollib/pysolrandom.py b/pysollib/pysolrandom.py new file mode 100644 index 00000000..ff2c793a --- /dev/null +++ b/pysollib/pysolrandom.py @@ -0,0 +1,233 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import sys, os, re, time, types +import random + +##---------------------------------------------------------------------- + +class PysolRandom(random.Random): + #MAX_SEED = 0L + #MAX_SEED = 0xffffffffffffffffL # 64 bits + MAX_SEED = 100000000000000000000L # 20 digits + + ORIGIN_UNKNOWN = 0 + ORIGIN_RANDOM = 1 + ORIGIN_PREVIEW = 2 # random from preview + ORIGIN_SELECTED = 3 # manually entered + ORIGIN_NEXT_GAME = 4 # "Next game number" + + def __init__(self, seed=None): + if seed is None: + seed = self._getRandomSeed() + random.Random.__init__(self, seed) + self.initial_seed = seed + self.initial_state = self.getstate() + self.origin = self.ORIGIN_UNKNOWN + + def __str__(self): + return self.str(self.initial_seed) + + def str(self, seed): + return '%020d' % seed + + def reset(self): + self.setstate(self.initial_state) + + def copy(self): + random = PysolRandom(0L) + random.__class__ = self.__class__ + random.__dict__.update(self.__dict__) + return random + + def increaseSeed(self, seed): + if seed < self.MAX_SEED: + return seed + 1L + return 0L + + def _getRandomSeed(self): + t = long(time.time() * 256.0) + t = (t ^ (t >> 24)) % (self.MAX_SEED + 1L) + return t + + +# /*********************************************************************** +# // Abstract PySol Random number generator. +# // +# // We use a seed of type long in the range [0, MAX_SEED]. +# ************************************************************************/ + +class PysolRandomMFX: + MAX_SEED = 0L + + ORIGIN_UNKNOWN = 0 + ORIGIN_RANDOM = 1 + ORIGIN_PREVIEW = 2 # random from preview + ORIGIN_SELECTED = 3 # manually entered + ORIGIN_NEXT_GAME = 4 # "Next game number" + + def __init__(self, seed=None): + if seed is None: + seed = self._getRandomSeed() + self.initial_seed = self.setSeed(seed) + self.origin = self.ORIGIN_UNKNOWN + + def __str__(self): + return self.str(self.initial_seed) + + def reset(self): + self.seed = self.initial_seed + + def getSeed(self): + return self.seed + + def setSeed(self, seed): + seed = self._convertSeed(seed) + if type(seed) is not types.LongType: + raise TypeError, "seeds must be longs" + if not (0L <= seed <= self.MAX_SEED): + raise ValueError, "seed out of range" + self.seed = seed + return seed + + def getstate(self): + return self.seed + + def setstate(self, state): + self.seed = state + + def copy(self): + random = PysolRandom(0L) + random.__class__ = self.__class__ + random.__dict__.update(self.__dict__) + return random + + # + # implementation + # + + def choice(self, seq): + return seq[int(self.random() * len(seq))] + + # Get a random integer in the range [a, b] including both end points. + def randint(self, a, b): + return a + int(self.random() * (b+1-a)) + + def randrange(self, a, b): + return self.randint(a, b-1) + + # + # subclass responsibility + # + + # Get the next random number in the range [0.0, 1.0). + def random(self): + raise SubclassResponsibility + + # + # subclass overrideable + # + + def _convertSeed(self, seed): + return long(seed) + + def increaseSeed(self, seed): + if seed < self.MAX_SEED: + return seed + 1L + return 0L + + def _getRandomSeed(self): + t = long(time.time() * 256.0) + t = (t ^ (t >> 24)) % (self.MAX_SEED + 1L) + return t + + # + # shuffle + # see: Knuth, Vol. 2, Chapter 3.4.2, Algorithm P + # see: FAQ of sci.crypt: "How do I shuffle cards ?" + # + + def shuffle(self, seq): + n = len(seq) - 1 + while n > 0: + j = self.randint(0, n) + seq[n], seq[j] = seq[j], seq[n] + n = n - 1 + +# /*********************************************************************** +# // Linear Congruential random generator +# // In PySol this is only used for 0 <= seed <= 32000. +# ************************************************************************/ + +class LCRandom31(PysolRandomMFX): + MAX_SEED = 0x7fffffffL # 31 bits + + def str(self, seed): + return "%05d" % int(seed) + + def random(self): + self.seed = (self.seed*214013L + 2531011L) & self.MAX_SEED + return (self.seed >> 16) / 32768.0 + + def randint(self, a, b): + self.seed = (self.seed*214013L + 2531011L) & self.MAX_SEED + return a + (int(self.seed >> 16) % (b+1-a)) + + +# /*********************************************************************** +# // PySol support code +# ************************************************************************/ + +# construct Random from seed string +def constructRandom(s): + s = re.sub(r"L$", "", str(s)) # cut off "L" from possible conversion to long + s = re.sub(r"[\s\#\-\_\.\,]", "", s.lower()) + if not s: + return None + seed = long(s) + if 0 <= seed <= 32000: + return LCRandom31(seed) + return PysolRandom(seed) + +# test +if __name__ == '__main__': + _, r = constructRandom('12345') + print r.randint(0, 100) + print r.random() + print type(r) + + diff --git a/pysollib/pysoltk.py b/pysollib/pysoltk.py new file mode 100644 index 00000000..64c4f7b8 --- /dev/null +++ b/pysollib/pysoltk.py @@ -0,0 +1,43 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +from tk.tkconst import * +from tk.tkutil import * +from tk.tkcanvas import * +from tk.tkwrap import * +from tk.tkwidget import * +from tk.tkhtml import * +from tk.edittextdialog import * +from tk.tkstats import * +from tk.playeroptionsdialog import * +from tk.soundoptionsdialog import * +from tk.demooptionsdialog import * +from tk.timeoutsdialog import * +from tk.colorsdialog import * +from tk.fontsdialog import * +from tk.gameinfodialog import * +from tk.toolbar import * +from tk.statusbar import * +from tk.progressbar import * +from tk.menubar import * +from tk.card import * +from tk.selectcardset import * +from tk.selecttree import * diff --git a/pysollib/resource.py b/pysollib/resource.py new file mode 100644 index 00000000..527e48ff --- /dev/null +++ b/pysollib/resource.py @@ -0,0 +1,589 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import sys, os, glob, operator, types +#import traceback + +# PySol imports +from mfxutil import win32api +from mfxutil import Struct, KwStruct, EnvError, latin1_to_ascii +from version import VERSION +from settings import PACKAGE + + +# /*********************************************************************** +# // Abstract +# ************************************************************************/ + +class Resource(Struct): + def __init__(self, **kw): + kw = KwStruct(kw, + name = "", + filename = "", + basename = "", # basename of filename + absname = "", # absolute filename + # implicit + index = -1, + error = 0, # error while loading this resource + ) + apply(Struct.__init__, (self,), kw.getKw()) + + def getSortKey(self): + return latin1_to_ascii(self.name).lower() + + +class ResourceManager: + def __init__(self): + self._selected_key = -1 + self._objects = [] + self._objects_by_name = None + self._objects_cache_name = {} + self._objects_cache_filename = {} + self._objects_cache_basename = {} + self._objects_cache_absname = {} + + def getSelected(self): + return self._selected_key + + def setSelected(self, index): + assert -1 <= index < len(self._objects) + self._selected_key = index + + def len(self): + return len(self._objects) + + def register(self, obj): + assert obj.index == -1 + assert obj.name and not self._objects_cache_name.has_key(obj.name) + self._objects_cache_name[obj.name] = obj + if obj.filename: + obj.absname = os.path.abspath(obj.filename) + obj.basename = os.path.basename(obj.filename) + self._objects_cache_filename[obj.filename] = obj + self._objects_cache_basename[obj.basename] = obj + self._objects_cache_absname[obj.absname] = obj + obj.index = len(self._objects) + self._objects.append(obj) + self._objects_by_name = None # invalidate + + def get(self, index): + if 0 <= index < len(self._objects): + return self._objects[index] + return None + + def getByName(self, key): + return self._objects_cache_name.get(key) + + def getByBasename(self, key): + return self._objects_cache_basename.get(key) + + def getAll(self): + return tuple(self._objects) + + def getAllSortedByName(self): + if self._objects_by_name is None: + l = map(lambda obj: (obj.getSortKey(), obj), self._objects) + l.sort() + self._objects_by_name = tuple(map(lambda item: item[1], l)) + return self._objects_by_name + + # + # static methods + # + + def _addDir(self, result, dir): + try: + if dir: + dir = os.path.normpath(dir) + if dir and os.path.isdir(dir) and not dir in result: + result.append(dir) + except EnvError, ex: + pass + + def _addRegistryKey(self, result, hkey, subkey): + k = None + try: + k = win32api.RegOpenKeyEx(hkey, subkey, 0, KEY_READ) + nsubkeys, nvalues, t = win32api.RegQueryInfoKey(k) + for i in range(nvalues): + try: + key, value, vtype = win32api.RegEnumValue(k, i) + except: + break + if not key or not value: + continue + if vtype == 1 and type(value) is types.StringType: + for d in value.split(os.pathsep): + self._addDir(result, d.strip()) + finally: + if k is not None: + try: + win32api.RegCloseKey(k) + except: + pass + + def getSearchDirs(self, app, search, env=None): + if type(search) is types.StringType: + search = (search,) + result = [] + if env: + for d in os.environ.get(env, "").split(os.pathsep): + self._addDir(result, d.strip()) + for dir in (app.dataloader.dir, app.dn.maint, app.dn.config): + if not dir: + continue + dir = os.path.normpath(dir) + if not dir or not os.path.isdir(dir): + continue + for s in search: + try: + if s[-2:] == "-*": + d = os.path.normpath(os.path.join(dir, s[:-2])) + self._addDir(result, d) + globdirs = glob.glob(d + "-*") + globdirs.sort() + for d in globdirs: + self._addDir(result, d) + else: + self._addDir(result, os.path.join(dir, s)) + except EnvError, ex: + pass + if app.debug >= 2: + print "getSearchDirs", env, search, "->", result + return result + + def getRegistryDirs(self, app, categories): + if not win32api: + return [] + # + vendors = ("Markus Oberhumer", "",) + versions = (VERSION, "",) + if type(categories) is types.StringType: + categories = (categories,) + # + result = [] + for version in versions: + for vendor in vendors: + for category in categories: + t = ("Software", vendor, PACKAGE, version, category) + t = filter(None, t) + subkey = '\\'.join(t) + ##print "getRegistryDirs subkey", subkey + for hkey in (HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE): + try: + self._addRegistryKey(result, hkey, subkey) + except: + pass + # + if app.debug >= 2: + print "getRegistryDirs", category, "->", result + return result + + +# /*********************************************************************** +# // Cardset +# ************************************************************************/ + +# CardsetInfo constants +class CSI: + # cardset size + SIZE_TINY = 1 + SIZE_SMALL = 2 + SIZE_MEDIUM = 3 + SIZE_LARGE = 4 + SIZE_XLARGE = 5 + + # cardset types + TYPE_FRENCH = 1 + TYPE_HANAFUDA = 2 + TYPE_TAROCK = 3 + TYPE_MAHJONGG = 4 + TYPE_HEXADECK = 5 + TYPE_MUGHAL_GANJIFA = 6 + TYPE_NAVAGRAHA_GANJIFA = 7 + TYPE_DASHAVATARA_GANJIFA = 8 + TYPE_TRUMP_ONLY = 9 + + TYPE = { + 1: "French type (52 cards)", + 2: "Hanafuda type (48 cards)", + 3: "Tarock type (78 cards)", + 4: "Mahjongg type (42 tiles)", + 5: "Hex A Deck type (68 cards)", + 6: "Mughal Ganjifa type (96 cards)", + 7: "Navagraha Ganjifa type (108 cards)", + 8: "Dashavatara Ganjifa type (120 cards)", + 9: "Trumps only type (variable cards)", + } + + # cardset styles + STYLE = { + 1: "Adult", # + 2: "Animals", # + 3: "Anime", # + 4: "Art", # + 5: "Cartoons", # + 6: "Children", # + 7: "Classic look", # + 8: "Collectors", # scanned collectors cardsets + 9: "Computers", # + 10: "Engines", # + 11: "Fantasy", # + 30: "Ganjifa", # + 12: "Hanafuda", # + 29: "Hex A Deck", # + 13: "Holiday", # + 28: "Mahjongg", # + 14: "Movies", # + 31: "Matrix", # + 15: "Music", # + 16: "Nature", # + 17: "Operating Systems", # e.g. cards with Linux logos + 19: "People", # famous people + 20: "Places", # + 21: "Plain", # + 22: "Products", # + 18: "Round cardsets", # + 23: "Science Fiction", # + 24: "Sports", # + 27: "Tarock", # + 25: "Vehicels", # + 26: "Video Games", # + } + + # cardset nationality (suit and rank symbols) + NATIONALITY = { + 1021: "Australia", # + 1001: "Austria", # + 1019: "Belgium", # + 1010: "Canada", # + 1011: "China", # + 1012: "Czech Republic", # + 1013: "Denmark", # + 1003: "England", # + 1004: "France", # + 1006: "Germany", # + 1014: "Great Britain", # + 1015: "Hungary", # + 1020: "India", # + 1005: "Italy", # + 1016: "Japan", # + 1002: "Netherlands", # + 1007: "Russia", # + 1008: "Spain", # + 1017: "Sweden", # + 1009: "Switzerland", # + 1018: "USA", # + } + + # cardset creation date + DATE = { + 10: "1000 - 1099", + 11: "1100 - 1199", + 12: "1200 - 1299", + 13: "1300 - 1399", + 14: "1400 - 1499", + 15: "1500 - 1599", + 16: "1600 - 1699", + 17: "1700 - 1799", + 18: "1800 - 1899", + 19: "1900 - 1999", + 20: "2000 - 2099", + 21: "2100 - 2199", + 22: "2200 - 2299", + } + + # + TYPE_NAME = {} + +def create_csi_type_name(): + for id, type in CSI.TYPE.items(): + i = type.find('type') + if i > 0: + CSI.TYPE_NAME[id] = type[:i-1] + else: + CSI.TYPE_NAME[id] = type + +if not CSI.TYPE_NAME: + create_csi_type_name() + + +class CardsetConfig(Struct): + # see config.txt and _readCardsetConfig() + def __init__(self): + Struct.__init__(self, + # line[0] + version = 1, + ext = ".gif", + type = CSI.TYPE_FRENCH, + ncards = -1, + styles = [], + year = 0, + # line[1] + ident = "", + name = "", + # line[2] + CARDW = 0, + CARDH = 0, + CARDD = 0, + # line[3] + CARD_XOFFSET = 0, + CARD_YOFFSET = 0, + SHADOW_XOFFSET = 0, + SHADOW_YOFFSET = 0, + # line[4] + backindex = 0, + # line[5] + backnames = (), + # other + CARD_DX = 0, # relative pos of real card image within Card + CARD_DY = 0, + ) + + +class Cardset(Resource): + def __init__(self, **kw): + # start with all fields from CardsetConfig + config = CardsetConfig() + kw = apply(KwStruct, (config.__dict__,), kw) + # si is the SelectionInfo struct that will be queried by + # the "select cardset" dialogs. It can be freely modified. + si = Struct(type=0, size=0, styles=[], nationalities=[], dates=[]) + kw = KwStruct(kw, + # essentials + ranks = (), + suits = (), + trumps = (), + nbottoms = 7, + nletters = 4, + nshadows = 1 + 13, + # selection criterias + si = si, + # implicit + backname = None, + dir = "", + ) + apply(Resource.__init__, (self,), kw.getKw()) + + def getFaceCardNames(self): + names = [] + for suit in self.suits: + for rank in self.ranks: + names.append("%02d%s" % (rank + 1, suit)) + for trump in self.trumps: + names.append("%02d%s" % (trump + 1, "z")) + assert len(names) == self.ncards + return names + + def getPreviewCardNames(self): + names = self.getFaceCardNames() + pnames = [] + ranks, suits = self.ranks, self.suits + lr, ls = len(ranks), len(suits) + if lr == 0 or ls == 0: # TYPE_TRUMP_ONLY + return names[:16], 4 + if lr >= 4: + ls = min(ls, 4) + low_ranks, high_ranks = 1, 3 + ###if self.type == 3: high_ranks = 4 + for rank in range(0, low_ranks) + range(lr-high_ranks, lr): + for suit in range(ls): + index = suit * len(self.ranks) + rank + pnames.append(names[index % len(names)]) + return pnames, ls + + def updateCardback(self, backname=None, backindex=None): + # update default back + if type(backname) is types.StringType: + if backname in self.backnames: + backindex = self.backnames.index(backname) + if type(backindex) is types.IntType: + self.backindex = backindex % len(self.backnames) + self.backname = self.backnames[self.backindex] + + +class CardsetManager(ResourceManager): + def __init__(self): + ResourceManager.__init__(self) + self.registered_types = {} + self.registered_sizes = {} + self.registered_styles = {} + self.registered_nationalities = {} + self.registered_dates = {} + + def _check(self, cs): + s = cs.type + if not CSI.TYPE.has_key(s): + return 0 + cs.si.type = s + if s == CSI.TYPE_FRENCH: + cs.ranks = range(13) + cs.suits = "cshd" + elif s == CSI.TYPE_HANAFUDA: + cs.ranks = range(12) + cs.suits = "cshd" + elif s == CSI.TYPE_TAROCK: + cs.nbottoms = 8 + cs.ranks = range(14) + cs.suits = "cshd" + cs.trumps = range(22) + elif s == CSI.TYPE_MAHJONGG: + cs.ranks = range(10) + cs.suits = "abc" + cs.trumps = range(12) + # + cs.nbottoms = 0 + cs.nletters = 0 + cs.nshadows = 0 + elif s == CSI.TYPE_HEXADECK: + cs.nbottoms = 8 + cs.ranks = range(16) + cs.suits = "cshd" + cs.trumps = range(4) + elif s == CSI.TYPE_MUGHAL_GANJIFA: + cs.nbottoms = 11 + cs.ranks = range(12) + cs.suits = "abcdefgh" + elif s == CSI.TYPE_NAVAGRAHA_GANJIFA: + #???return 0 ## FIXME + cs.nbottoms = 12 + cs.ranks = range(12) + cs.suits = "abcdefghi" + elif s == CSI.TYPE_DASHAVATARA_GANJIFA: + cs.nbottoms = 13 + cs.ranks = range(12) + cs.suits = "abcdefghij" + elif s == CSI.TYPE_TRUMP_ONLY: + #???return 0 ## FIXME + #cs.nbottoms = 7 + #cs.ranks = () + #cs.suits = "" + #cs.trumps = range(cs.ncards) + cs.nbottoms = 1 + cs.nletters = 0 + cs.nshadows = 0 + cs.ranks = () + cs.suits = "" + cs.trumps = range(cs.ncards) + + else: + return 0 + return 1 + + def register(self, cs): + if not self._check(cs): + return + cs.ncards = len(cs.ranks) * len(cs.suits) + len(cs.trumps) + cs.name = cs.name[:25] + if not (1 <= cs.si.size <= 5): + CW, CH = cs.CARDW, cs.CARDH + if CW <= 55 and CH <= 72: + cs.si.size = CSI.SIZE_TINY + elif CW <= 60 and CH <= 85: + cs.si.size = CSI.SIZE_SMALL + elif CW <= 75 and CH <= 105: + cs.si.size = CSI.SIZE_MEDIUM + elif CW <= 90 and CH <= 125: + cs.si.size = CSI.SIZE_LARGE + else: + cs.si.size = CSI.SIZE_XLARGE + # + keys = cs.styles[:] + cs.si.styles = tuple(filter(lambda s: CSI.STYLE.has_key(s), keys)) + for s in cs.si.styles: + self.registered_styles[s] = self.registered_styles.get(s, 0) + 1 + cs.si.nationalities = tuple(filter(lambda s: CSI.NATIONALITY.has_key(s), keys)) + for s in cs.si.nationalities: + self.registered_nationalities[s] = self.registered_nationalities.get(s, 0) + 1 + keys = (cs.year / 100,) + cs.si.dates = tuple(filter(lambda s: CSI.DATE.has_key(s), keys)) + for s in cs.si.dates: + self.registered_dates[s] = self.registered_dates.get(s, 0) + 1 + # + s = cs.si.type + self.registered_types[s] = self.registered_types.get(s, 0) + 1 + s = cs.si.size + self.registered_sizes[s] = self.registered_sizes.get(s, 0) + 1 + cs.updateCardback() + ResourceManager.register(self, cs) + + +# /*********************************************************************** +# // Tile +# ************************************************************************/ + +class Tile(Resource): + def __init__(self, **kw): + kw = KwStruct(kw, + color = None, + text_color = "#000000", + stretch = 0, + ) + apply(Resource.__init__, (self,), kw.getKw()) + + +class TileManager(ResourceManager): + pass + + +# /*********************************************************************** +# // Sample +# ************************************************************************/ + +class Sample(Resource): + def __init__(self, **kw): + kw = KwStruct(kw, + volume = -1, + ) + apply(Resource.__init__, (self,), kw.getKw()) + + +class SampleManager(ResourceManager): + pass + + +# /*********************************************************************** +# // Music +# ************************************************************************/ + +class Music(Sample): + pass + + +class MusicManager(SampleManager): + pass + diff --git a/pysollib/settings.py b/pysollib/settings.py new file mode 100644 index 00000000..65cb17f8 --- /dev/null +++ b/pysollib/settings.py @@ -0,0 +1,60 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +import sys, os + +n_ = lambda x: x + +# +#PACKAGE = "PySolFC" +PACKAGE = "PySol" +PACKAGE_URL = "http://sourceforge.net/projects/pysolfc/" + +# data dirs +DATA_DIRS = [] +# you can add your extra directories here +if os.name == "posix": + DATA_DIRS = [ + '/usr/share/PySolFC', + '/usr/local/share/PySolFC', + '/usr/games/PySolFC', + '/usr/local/games/PySolFC', + ] +if os.name == "nt": + pass +if os.name == "mac": + pass + +# sound mixers +MIXERS = () +if os.name == "nt": + MIXERS = (("sndvol32.exe", None),) +elif os.name == "posix": + MIXERS = ( + #("alsamixer", None), + ("kmix", None), + ("gmix", None), + ) + +TOP_SIZE = 10 +TOP_TITLE = n_("Top 10") + + diff --git a/pysollib/stack.py b/pysollib/stack.py new file mode 100644 index 00000000..2168e16b --- /dev/null +++ b/pysollib/stack.py @@ -0,0 +1,2101 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['cardsFaceUp', + 'cardsFaceDown', + 'isRankSequence', + 'isAlternateColorSequence', + 'isSameColorSequence', + 'isSameSuitSequence', + 'isAnySuitButOwnSequence', + 'getNumberOfFreeStacks', + 'getPileFromStacks', + 'Stack', + 'DealRow_StackMethods', + 'DealBaseCard_StackMethods', + 'TalonStack', + 'DealRowTalonStack', + 'InitialDealTalonStack', + 'OpenStack', + 'AbstractFoundationStack', + 'SS_FoundationStack', + 'RK_FoundationStack', + 'AC_FoundationStack', + 'SequenceStack_StackMethods', + 'BasicRowStack', + 'SequenceRowStack', + 'AC_RowStack', + 'SC_RowStack', + 'SS_RowStack', + 'RK_RowStack', + 'UD_AC_RowStack', + 'UD_SC_RowStack', + 'UD_SS_RowStack', + 'UD_RK_RowStack', + 'FreeCell_AC_RowStack', + 'FreeCell_SS_RowStack', + 'Spider_AC_RowStack', + 'Spider_SS_RowStack', + 'Yukon_AC_RowStack', + 'Yukon_SS_RowStack', + 'KingAC_RowStack', + 'KingSS_RowStack', + 'KingRK_RowStack', + 'WasteStack', + 'WasteTalonStack', + 'FaceUpWasteTalonStack', + 'OpenTalonStack', + 'ReserveStack', + 'InvisibleStack', + 'StackWrapper', + 'WeakStackWrapper', + 'FullStackWrapper', + ] + +# imports +import time, types + +# PySol imports +from mfxutil import Struct, kwdefault, SubclassResponsibility +from util import Timer +from util import ACE, KING, SUITS +from util import ANY_SUIT, ANY_COLOR, ANY_RANK, NO_RANK +from util import NO_REDEAL, UNLIMITED_REDEALS, VARIABLE_REDEALS +from pysoltk import tkname, EVENT_HANDLED, EVENT_PROPAGATE +from pysoltk import CURSOR_DRAG, ANCHOR_NW, ANCHOR_SE +from pysoltk import bind, unbind_destroy +from pysoltk import after, after_idle, after_cancel +from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText +from pysoltk import Card + +from tkFont import Font + +# /*********************************************************************** +# // Let's start with some test methods for cards. +# // Empty card-lists return false. +# ************************************************************************/ + +# check that all cards are face-up +def cardsFaceUp(cards): + if not cards: return 0 + for c in cards: + if not c.face_up: + return 0 + return 1 + +# check that all cards are face-down +def cardsFaceDown(cards): + if not cards: return 0 + for c in cards: + if c.face_up: + return 0 + return 1 + +# check that cards are face-up and build down by rank +def isRankSequence(cards, mod=8192, dir=-1): + if not cardsFaceUp(cards): + return 0 + c1 = cards[0] + for c2 in cards[1:]: + if (c1.rank + dir) % mod != c2.rank: + return 0 + c1 = c2 + return 1 + +# check that cards are face-up and build down by alternate color +def isAlternateColorSequence(cards, mod=8192, dir=-1): + if not cardsFaceUp(cards): + return 0 + c1 = cards[0] + for c2 in cards[1:]: + if (c1.rank + dir) % mod != c2.rank or c1.color == c2.color: + return 0 + c1 = c2 + return 1 + +# check that cards are face-up and build down by same color +def isSameColorSequence(cards, mod=8192, dir=-1): + if not cardsFaceUp(cards): + return 0 + c1 = cards[0] + for c2 in cards[1:]: + if (c1.rank + dir) % mod != c2.rank or c1.color != c2.color: + return 0 + c1 = c2 + return 1 + +# check that cards are face-up and build down by same suit +def isSameSuitSequence(cards, mod=8192, dir=-1): + if not cardsFaceUp(cards): + return 0 + c1 = cards[0] + for c2 in cards[1:]: + if (c1.rank + dir) % mod != c2.rank or c1.suit != c2.suit: + return 0 + c1 = c2 + return 1 + +# check that cards are face-up and build down by any suit but own +def isAnySuitButOwnSequence(cards, mod=8192, dir=-1): + if not cardsFaceUp(cards): + return 0 + c1 = cards[0] + for c2 in cards[1:]: + if (c1.rank + dir) % mod != c2.rank or c1.suit == c2.suit: + return 0 + c1 = c2 + return 1 + +def getNumberOfFreeStacks(stacks): + return len(filter(lambda s: not s.cards, stacks)) + +# collect the top cards of several stacks into a pile +def getPileFromStacks(stacks, reverse=0): + cards = [] + for s in stacks: + if not s.cards or not s.cards[-1].face_up: + return None + cards.append(s.cards[-1]) + if reverse: + cards.reverse() + return cards + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Stack: + # A generic stack of cards. + # + # This is used as a base class for all other stacks (e.g. the talon, + # the foundations and the row stacks). + # + # The default event handlers turn the top card of the stack with + # its face up on a (single or double) click, and also support + # moving a subpile around. + + def __init__(self, x, y, game, cap={}): + # Arguments are the stack's nominal x and y position (the top + # left corner of the first card placed in the stack), and the + # game object (which is used to get the canvas; subclasses use + # the game object to find other stacks). + + # + # link back to game + # + id = len(game.allstacks) + game.allstacks.append(self) + x = int(round(x)) + y = int(round(y)) + mapkey = (x, y) + ###assert not game.stackmap.has_key(mapkey) ## can happen in PyJonngg + game.stackmap[mapkey] = id + + # + # setup our pseudo MVC scheme + # + model, view, controller = self, self, self + + # + # model + # + model.id = id + model.game = game + model.cards = [] + + # capabilites - the game logic + model.cap = Struct( + suit = -1, # required suit for this stack (-1 is ANY_SUIT) + color = -1, # required color for this stack (-1 is ANY_COLOR) + rank = -1, # required rank for this stack (-1 is ANY_RANK) + base_suit = -1, # base suit for this stack (-1 is ANY_SUIT) + base_color = -1, # base color for this stack (-1 is ANY_COLOR) + base_rank = -1, # base rank for this stack (-1 is ANY_RANK) + dir = 0, # direction - stack builds up/down + mod = 8192, # modulo for wrap around (typically 13 or 8192) + max_move = 0, # can move at most # cards at a time + max_accept = 0, # can accept at most # cards at a time + max_cards = 999999, # total number of cards may not exceed this + # not commonly used: + min_move = 1, # must move at least # cards at a time + min_accept = 1, # must accept at least # cards at a time + min_cards = 0, # total number of cards this stack at least requires + ) + model.cap.update(cap) + assert type(model.cap.suit) is types.IntType + assert type(model.cap.color) is types.IntType + assert type(model.cap.rank) is types.IntType + assert type(model.cap.base_suit) is types.IntType + assert type(model.cap.base_color) is types.IntType + assert type(model.cap.base_rank) is types.IntType + # + # view + # + view.x = x + view.y = y + view.canvas = game.canvas + view.CARD_XOFFSET = 0 + view.CARD_YOFFSET = 0 + view.group = MfxCanvasGroup(view.canvas) + ##view.group.move(view.x, view.y) + # image items + view.images = Struct( + bottom = None, # canvas item + redeal = None, # canvas item + redeal_img = None, # the corresponding PhotoImage + ) + # other canvas items + view.items = Struct( + bottom = None, # dummy canvas item + ) + # text items + view.texts = Struct( + ncards = None, # canvas item + # by default only used by Talon: + rounds = None, # canvas item + redeal = None, # canvas item + redeal_str = None, # the corresponding string + # for use by derived stacks: + misc = None, # canvas item + ) + view.top_bottom = None # the highest of all bottom items + view.is_visible = view.x >= -100 and view.y >= -100 + view.is_open = -1 + view.can_hide_cards = -1 + view.max_shadow_cards = -1 + + def destruct(self): + # help breaking circular references + unbind_destroy(self.group) + + def prepareStack(self): + self.prepareView() + if self.is_visible: + self.initBindings() + + + # bindings {view widgets bind to controller} + def initBindings(self): + group = self.group + bind(group, "<1>", self.__clickEventHandler) + ##bind(group, "", self.__motionEventHandler) + bind(group, "", self.__motionEventHandler) + bind(group, "", self.__releaseEventHandler) + bind(group, "", self.__controlclickEventHandler) + bind(group, "", self.__shiftclickEventHandler) + bind(group, "", self.__doubleclickEventHandler) + bind(group, "<3>", self.__rightclickEventHandler) + bind(group, "<2>", self.__middleclickEventHandler) + bind(group, "", self.__middleclickEventHandler) + bind(self.group, "", self.__shiftrightclickEventHandler) + ##bind(self.group, "", "") + bind(group, "", self.__enterEventHandler) + bind(group, "", self.__leaveEventHandler) + + def prepareView(self): + ##assertView(self) + # prepare some variables + ox, oy = self.CARD_XOFFSET, self.CARD_YOFFSET + if type(ox) is types.IntType: + self.CARD_XOFFSET = (ox,) + else: + self.CARD_XOFFSET = tuple(map(int, map(round, ox))) + if type(oy) is types.IntType: + self.CARD_YOFFSET = (oy,) + else: + self.CARD_YOFFSET = tuple(map(int, map(round, oy))) + if self.can_hide_cards < 0: + self.can_hide_cards = self.is_visible + if self.cap.max_cards < 3: + self.can_hide_cards = 0 + elif filter(None, self.CARD_XOFFSET): + self.can_hide_cards = 0 + elif filter(None, self.CARD_YOFFSET): + self.can_hide_cards = 0 + elif self.canvas.preview: + self.can_hide_cards = 0 + if self.can_hide_cards: + # compute hide-off direction (see class Card) + CW, CH = self.game.app.images.CARDW, self.game.app.images.CARDH + cx = self.x + CW / 2 + cy = self.y + CH / 2 + if cy < 3 * CH / 2: + self.hide_x, self.hide_y = 0, -10000 # hide at top + elif cx < 3 * CW / 2: + self.hide_x, self.hide_y = -10000, 0 # hide at left + elif cy > self.game.height - 3 * CH / 2: + self.hide_x, self.hide_y = 0, 10000 # hide at bottom + else: + self.hide_x, self.hide_y = 10000, 0 # hide at right + if self.is_open < 0: + self.is_open = (self.is_visible and + (abs(self.CARD_XOFFSET[0]) >= 5 or + abs(self.CARD_YOFFSET[0]) >= 5)) + if self.max_shadow_cards < 0: + self.max_shadow_cards = 999999 + if abs(self.CARD_YOFFSET[0]) != self.game.app.images.CARD_YOFFSET: + # don't display a shadow if the YOFFSET of the stack + # and the images don't match + self.max_shadow_cards = 1 + # bottom image + if self.is_visible: + self.prepareBottom() + + # stack bottom image + def prepareBottom(self): + assert self.is_visible and self.images.bottom is None + img = self.getBottomImage() + if img is not None: + self.images.bottom = MfxCanvasImage(self.canvas, self.x, self.y, + image=img, anchor=ANCHOR_NW) + self.images.bottom.addtag(self.group) + self.top_bottom = self.images.bottom + + # invisible stack bottom + # We need this if we want to get any events for an empty stack (which + # is needed by the quickPlayHandler in some games like Montana) + def prepareInvisibleBottom(self): + assert self.is_visible and self.items.bottom is None + images = self.game.app.images + self.items.bottom = MfxCanvasRectangle(self.canvas, self.x, self.y, + self.x + images.CARDW, + self.y + images.CARDH, + fill="", outline="", width=0) + self.items.bottom.addtag(self.group) + self.top_bottom = self.items.bottom + + # sanity checks + def assertStack(self): + assert self.cap.min_move > 0 + assert self.cap.min_accept > 0 + assert not hasattr(self, "suit") + + + # + # Core access methods {model -> view} + # + + # Add a card add the top of a stack. Also update display. {model -> view} + def addCard(self, card, unhide=1, update=1): + model, view = self, self + model.cards.append(card) + card.tkraise(unhide=unhide) + if view.can_hide_cards and len(model.cards) >= 3: + # we only need to display the 2 top cards + model.cards[-3].hide(self) + card.item.addtag(view.group) + view._position(card) + if update: + view.updateText() + return card + + # Remove a card from the stack. Also update display. {model -> view} + def removeCard(self, card=None, unhide=1, update=1): + model, view = self, self + assert len(model.cards) > 0 + if card is None: + card = model.cards[-1] + # optimized a little bit (compare with the else below) + card.item.dtag(view.group) + if unhide and self.can_hide_cards: + card.unhide() + if len(self.cards) >= 3: + model.cards[-3].unhide() + del model.cards[-1] + else: + card.item.dtag(view.group) + if unhide and view.can_hide_cards: + # Note: the 2 top cards ([-1] and [-2]) are already unhidden. + card.unhide() + if len(model.cards) >= 3: + if card is model.cards[-1] or model is self.cards[-2]: + # Make sure that 2 top cards will be un-hidden. + model.cards[-3].unhide() + model.cards.remove(card) + if update: + view.updateText() + return card + + # Get the top card {model} + def getCard(self): + if self.cards: + return self.cards[-1] + return None + + # get the largest moveable pile {model} - uses canMoveCards() + def getPile(self): + if self.cap.max_move > 0: + cards = self.cards[-self.cap.max_move:] + while len(cards) >= self.cap.min_move: + if self.canMoveCards(cards): + return cards + del cards[0] + return None + + # Position the card on the canvas {view} + def _position(self, card): + x, y = self.getPositionFor(card) + card.moveTo(x, y) + + # find card + def _findCard(self, event): + model, view = self, self + if event is not None and model.cards: + # ask the canvas + return view.canvas.findCard(self, event) + return -1 + + # find card + def _findCardXY(self, x, y, cards=None): + model, view = self, self + if cards is None: cards = model.cards + images = self.game.app.images + index = -1 + for i in range(len(cards)): + c = cards[i] + r = (c.x, c.y, c.x + images.CARDW, c.y + images.CARDH) + if x >= r[0] and x < r[2] and y >= r[1] and y < r[3]: + index = i + return index + + # generic model update (can be used for undo/redo - see move.py) + def updateModel(self, undo, flags): + pass + + # copy model data - see Hint.AClonedStack + def copyModel(self, clone): + clone.id = self.id + clone.game = self.game + clone.cap = self.cap + + def getRankDir(self, cards=None): + if cards is None: + cards = self.cards[-2:] + if len(cards) < 2: + return 0 + dir = (cards[-1].rank - cards[-2].rank) % self.cap.mod + if dir > self.cap.mod / 2: + return dir - self.cap.mod + return dir + + + # + # Basic capabilities {model} + # Used by various subclasses. + # + + def basicIsBlocked(self): + # Check if the stack is blocked (e.g. Pyramid or Mahjongg) + return 0 + + def basicAcceptsCards(self, from_stack, cards): + # Check that the limits are ok and that the cards are face up + if from_stack is self or self.basicIsBlocked(): + return 0 + cap = self.cap + l = len(cards) + if l < cap.min_accept or l > cap.max_accept: + return 0 + l = l + len(self.cards) + if l > cap.max_cards: # note: we don't check cap.min_cards here + return 0 + for c in cards: + if not c.face_up: + return 0 + if cap.suit >= 0 and c.suit != cap.suit: + return 0 + if cap.color >= 0 and c.color != cap.color: + return 0 + if cap.rank >= 0 and c.rank != cap.rank: + return 0 + if self.cards: + # top card of our stack must be face up + return self.cards[-1].face_up + else: + # check required base + c = cards[0] + if cap.base_suit >= 0 and c.suit != cap.base_suit: + return 0 + if cap.base_color >= 0 and c.color != cap.base_color: + return 0 + if cap.base_rank >= 0 and c.rank != cap.base_rank: + return 0 + return 1 + + def basicCanMoveCards(self, cards): + # Check that the limits are ok and the cards are face up + if self.basicIsBlocked(): + return 0 + cap = self.cap + l = len(cards) + if l < cap.min_move or l > cap.max_move: + return 0 + l = len(self.cards) - l + if l < cap.min_cards: # note: we don't check cap.max_cards here + return 0 + return cardsFaceUp(cards) + + + # + # Capabilities - important for game logic {model} + # + + def acceptsCards(self, from_stack, cards): + # Do we accept receiving `cards' from `from_stack' ? + return 0 + + def canMoveCards(self, cards): + # Can we move these cards when assuming they are our top-cards ? + return 0 + + def canFlipCard(self): + # Can we flip our top card ? + return 0 + + def canDropCards(self, stacks): + # Can we drop the top cards onto one of the foundation stacks ? + return (None, 0) # return the stack and the number of cards + + + # + # State {model} + # + + def resetGame(self): + # Called when starting a new game. + pass + + def __repr__(self): + # Return a string for debug print statements. + return "%s(%d)" % (self.__class__.__name__, self.id) + + + # + # Atomic move actions {model -> view} + # + + def flipMove(self): + # Flip the top card. + self.game.flipMove(self) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + # Move the top n cards. + self.game.moveMove(ncards, self, to_stack, frames=frames, shadow=shadow) + self.fillStack() + + def fillStack(self): + self.game.fillStack(self) + + + # + # Playing move actions. Better not override. + # + + def playFlipMove(self, sound=1): + if sound: + self.game.playSample("flip", 5) + self.flipMove() + if not self.game.checkForWin(): + self.game.autoPlay() + self.game.finishMove() + + def playMoveMove(self, ncards, to_stack, frames=-1, shadow=-1, sound=1): + if sound: + if to_stack in self.game.s.foundations: + self.game.playSample("drop", priority=30) + else: + self.game.playSample("move", priority=10) + self.moveMove(ncards, to_stack, frames=frames, shadow=shadow) + if not self.game.checkForWin(): + # let the player put cards back from the foundations + if not self in self.game.s.foundations: + self.game.autoPlay() + self.game.finishMove() + + + # + # Appearance {view} + # + + def getBottomImage(self): + return None + + def getPositionFor(self, card): + model, view = self, self + if view.can_hide_cards: + return view.x, view.y + x, y = view.x, view.y + ix, iy, lx, ly = 0, 0, len(view.CARD_XOFFSET), len(view.CARD_YOFFSET) + for c in model.cards: + if c is card: + break + x = x + view.CARD_XOFFSET[ix] + y = y + view.CARD_YOFFSET[iy] + ix = (ix + 1) % lx + iy = (iy + 1) % ly + return (x, y) + + # Fully update the view of a stack - updates + # hiding, card positions and stacking order. + # Avoid calling this as it is rather slow. + def refreshView(self): + model, view = self, self + cards = model.cards + if not view.is_visible or len(cards) < 2: + return + if view.can_hide_cards: + # hide all lower cards + for c in cards[:-2]: + ##print "refresh hide", c, c.hide_stack + c.hide(self) + # unhide the 2 top cards + for c in cards[-2:]: + ##print "refresh unhide 1", c, c.hide_stack + c.unhide() + ##print "refresh unhide 1", c, c.hide_stack, c.hide_x, c.hide_y + # update the card postions and stacking order + item = cards[0].item + x, y = view.x, view.y + ix, iy, lx, ly = 0, 0, len(view.CARD_XOFFSET), len(view.CARD_YOFFSET) + for c in cards[1:]: + c.item.tkraise(item) + item = c.item + if not view.can_hide_cards: + x = x + view.CARD_XOFFSET[ix] + y = y + view.CARD_YOFFSET[iy] + ix = (ix + 1) % lx + iy = (iy + 1) % ly + c.moveTo(x, y) + + def updateText(self): + if self.game.preview > 1 or self.texts.ncards is None: + return + t = "" + format = "%d" + if self.texts.ncards.text_format is not None: + format = self.texts.ncards.text_format + if format == "%D": + format = "" + if self.cards: + format = "%d" + if format: + t = format % len(self.cards) + if 0 and self.game.app.debug: + visible = 0 + for c in self.cards: + if c.isHidden(): + assert c.hide_stack is not None + assert c.hide_x != 0 or c.hide_y != 0 + else: + visible = visible + 1 + assert c.hide_stack is None + assert c.hide_x == 0 and c.hide_y == 0 + t = t + " %2d" % visible + self.texts.ncards.config(text=t) + + def basicShallHighlightSameRank(self, card): + # by default all open stacks are available for highlighting + assert card in self.cards + if not self.is_visible or not card.face_up: + return 0 + if card is self.cards[-1]: + return 1 + return self.is_open + + def basicShallHighlightMatch(self, card): + # by default all open stacks are available for highlighting + return self.basicShallHighlightSameRank(card) + + def highlightSameRank(self, event): + i = self._findCard(event) + if i < 0: + return 0 + card = self.cards[i] + if not self.basicShallHighlightSameRank(card): + return 0 + col = self.game.app.opt.highlight_samerank_colors + info = [ (self, card, card, col[1]) ] + for s in self.game.allstacks: + for c in s.cards: + if c is card: continue + # check the rank + if c.rank != card.rank: continue + # ask the target stack + if s.basicShallHighlightSameRank(c): + info.append((s, c, c, col[3])) + self.game.stats.highlight_samerank = self.game.stats.highlight_samerank + 1 + return self.game._highlightCards(info, self.game.app.opt.highlight_samerank_sleep) + + def highlightMatchingCards(self, event): + i = self._findCard(event) + if i < 0: + return 0 + card = self.cards[i] + if not self.basicShallHighlightMatch(card): + return 0 + col = self.game.app.opt.highlight_cards_colors + c1 = c2 = card + info = [] + found = 0 + for s in self.game.allstacks: + # continue if both stacks are foundations + if self in self.game.s.foundations and s in self.game.s.foundations: + continue + # for all cards + for c in s.cards: + if c is card: continue + # ask the target stack + if not s.basicShallHighlightMatch(c): + continue + # ask the game + if self.game.shallHighlightMatch(self, card, s, c): + found = 1 + if s is self: + # enlarge rectangle for neighbours + j = self.cards.index(c) + if i - 1 == j: c1 = c; continue + if i + 1 == j: c2 = c; continue + info.append((s, c, c, col[3])) + if found: + if info: + self.game.stats.highlight_cards = self.game.stats.highlight_cards + 1 + info.append((self, c1, c2, col[1])) + return self.game._highlightCards(info, self.game.app.opt.highlight_cards_sleep) + if not self.basicIsBlocked(): + self.game.highlightNotMatching() + return 0 + + + # + # Subclass overridable handlers {contoller -> model -> view} + # + + def clickHandler(self, event): + return 0 + + def middleclickHandler(self, event): + # default action: show the card if it is overlapped by other cards + if not self.is_open: + return 0 + i = self._findCard(event) + positions = len(self.cards) - i - 1 + if i < 0 or positions <= 0 or not self.cards[i].face_up: + return 0 + ##print self.cards[i] + self.cards[i].item.tkraise() + self.game.canvas.update_idletasks() + self.game.sleep(self.game.app.opt.raise_card_sleep) + self.cards[i].item.lower(self.cards[i+1].item) + self.game.canvas.update_idletasks() + return 1 + + def rightclickHandler(self, event): + return 0 + + def doubleclickHandler(self, event): + return self.clickHandler(event) + + def controlclickHandler(self, event): + return 0 + + def shiftclickHandler(self, event): + # default action: highlight all cards of the same rank + if self.game.app.opt.highlight_samerank: + return self.highlightSameRank(event) + return 0 + + def shiftrightclickHandler(self, event): + return 0 + + def releaseHandler(self, event, drag, sound=1): + # default action: move cards back to their origin position + if drag.cards: + if sound: + self.game.playSample("nomove") + self.moveCardsBackHandler(event, drag) + + def moveCardsBackHandler(self, event, drag): + for card in drag.cards: + self._position(card) + + + # + # Event handlers {controller} + # + + def __defaultClickEventHandler(self, event, handler, start_drag=0, cancel_drag=1): + if self.game.demo: + self.game.stopDemo(event) + self.game.interruptSleep() + if self.game.busy: return EVENT_HANDLED + if self.game.drag.stack and cancel_drag: + self.game.drag.stack.cancelDrag(event) # in case we lost an event + if start_drag: + # this handler may start a drag operation + r = handler(event) + if r <= 0: + sound = r == 0 + self.startDrag(event, sound=sound) + else: + handler(event) + return EVENT_HANDLED + + def __clickEventHandler(self, event): + if self.game.app.opt.sticky_mouse: + cancel_drag = 0 + start_drag = not self.game.drag.stack + if start_drag: + handler = self.clickHandler + else: + handler = self.finishDrag + else: + cancel_drag = 1 + start_drag = 1 + handler = self.clickHandler + return self.__defaultClickEventHandler(event, handler, start_drag, cancel_drag) + + def __doubleclickEventHandler(self, event): + return self.__defaultClickEventHandler(event, self.doubleclickHandler) + + def __middleclickEventHandler(self, event): + return self.__defaultClickEventHandler(event, self.middleclickHandler) + + def __rightclickEventHandler(self, event): + return self.__defaultClickEventHandler(event, self.rightclickHandler) + + def __controlclickEventHandler(self, event): + return self.__defaultClickEventHandler(event, self.controlclickHandler) + + def __shiftclickEventHandler(self, event): + return self.__defaultClickEventHandler(event, self.shiftclickHandler) + + def __shiftrightclickEventHandler(self, event): + return self.__defaultClickEventHandler(event, self.shiftrightclickHandler) + + def __motionEventHandler(self, event): + if not self.game.drag.stack or not self is self.game.drag.stack: + return EVENT_PROPAGATE + if self.game.demo: + self.game.stopDemo(event) + if self.game.busy: return EVENT_HANDLED + if not self.game.app.opt.sticky_mouse: # 1: + # use a timer to update the drag + # this allows us to skip redraws on slow machines + drag = self.game.drag + if drag.timer is None: + drag.timer = after_idle(self.canvas, self.keepDragTimer) + drag.event = event + else: + # update now + self.keepDrag(event) + return EVENT_HANDLED + + def __releaseEventHandler(self, event): + if self.game.demo: + self.game.stopDemo(event) + self.game.interruptSleep() + if self.game.busy: return EVENT_HANDLED + if not self.game.app.opt.sticky_mouse: + self.keepDrag(event) + self.finishDrag(event) + return EVENT_HANDLED + + def __enterEventHandler(self, event): + if not self.game.drag.stack: + after_idle(self.canvas, self.game.showHelp, + 'help', self.getHelp(), ##+' '+self.getBaseCard(), + 'info', self.getNumCards()) + return EVENT_HANDLED + + def __leaveEventHandler(self, event): + if not self.game.drag.stack: + after_idle(self.canvas, self.game.showHelp) + if not self.game.app.opt.sticky_mouse: + return EVENT_HANDLED + drag_stack = self.game.drag.stack + if self is drag_stack: + x, y = event.x, event.y + w, h = self.game.canvas.winfo_width(), self.game.canvas.winfo_height() + if x < 0 or y < 0 or x >= w or y >= h: + # cancel drag if mouse leave canvas + drag_stack.cancelDrag(event) + after_idle(self.canvas, self.game.showHelp) + return EVENT_HANDLED + else: + # continue drag + return self.__motionEventHandler(event) + else: + return EVENT_PROPAGATE + + + # + # Drag internals {controller -> model -> view} + # + + # begin a drag operation + def startDrag(self, event, sound=1): + #print event.x, event.y + assert self.game.drag.stack is None + i = self._findCard(event) + if i < 0 or not self.canMoveCards(self.cards[i:]): + return + x_offset, y_offset = self.cards[i].x, self.cards[i].y + if sound: + self.game.playSample("startdrag") + self.lastx = event.x + self.lasty = event.y + game = self.game + drag = game.drag + drag.start_x = event.x + drag.start_y = event.y + drag.stack = self + drag.noshade_stacks = [ self ] + drag.cards = self.cards[i:] + images = game.app.images + drag.shadows = self.createShadows(drag.cards) + ##sx, sy = 0, 0 + sx, sy = -images.SHADOW_XOFFSET, -images.SHADOW_YOFFSET + dx, dy = 0, 0 + if self.game.app.opt.sticky_mouse: + # return cards under mouse + dx = event.x - (x_offset+images.CARDW+sx) + dy = event.y - (y_offset+images.CARDH+sy) + if dx < 0: dx = 0 + if dy < 0: dy = 0 + for s in drag.shadows: + if dx > 0 or dy > 0: + s.move(dx, dy) + s.tkraise() + for card in drag.cards: + card.tkraise() + card.moveBy(sx+dx, sy+dy) + if self.game.app.opt.dragcursor: + self.game.canvas.config(cursor=CURSOR_DRAG) + + # continue a drag operation + def keepDrag(self, event): + drag = self.game.drag + if not drag.cards: + return + assert self is drag.stack + dx = event.x - self.lastx + dy = event.y - self.lasty + if dx or dy: + self.lastx = event.x + self.lasty = event.y + if self.game.app.opt.shade: + self._updateShade() + for s in drag.shadows: + s.move(dx, dy) + for card in drag.cards: + card.moveBy(dx, dy) + drag.event = None + + def keepDragTimer(self): + drag = self.game.drag + after_cancel(drag.timer) + drag.timer = None + if drag.event: + self.keepDrag(drag.event) + self.canvas.update_idletasks() + + # create shadows, return a tuple of MfxCanvasImages + def createShadows(self, cards, dx=0, dy=0): + if not self.game.app.opt.shadow or self.canvas.preview > 1: + return () + l = len(cards) + if l == 0 or l > self.max_shadow_cards: + return () + images = self.game.app.images + cx, cy = cards[0].x, cards[0].y + for c in cards[1:]: + if c.x != cx or abs(c.y - cy) != images.CARD_YOFFSET: + return () + cy = c.y + img0, img1 = images.getShadow(0), images.getShadow(l) + if 0: + # Dynamically compute the shadow. Doesn't work because + # PhotoImage.copy() doesn't preserve transparency. + img1 = images.getShadow(13) + if img1: + h = images.CARDH - img0.height() + h = h + (l - 1) * self.CARD_YOFFSET[0] + if h < img1.height(): + import Tkinter + dest = Tkinter.PhotoImage(width=img1.width(), height=h) + dest.blank() + img1.tk.call(dest, "copy", img1.name, "-from", 0, 0, img1.width(), h) + assert dest.height() == h and dest.width() == img1.width() + #print h, img1.height(), dest.height() + img1 = dest + self._foo = img1 # keep a reference + elif h > img1.height(): + img1 = None + if img0 and img1: + c = cards[-1] + if self.CARD_YOFFSET[0] < 0: c = cards[0] + cx, cy = c.x + images.CARDW + dx, c.y + images.CARDH + dy + s1 = MfxCanvasImage(self.game.canvas, cx, cy - img0.height(), + image=img1, anchor=ANCHOR_SE) + s2 = MfxCanvasImage(self.game.canvas, cx, cy, + image=img0, anchor=ANCHOR_SE) + s1.lower(c.item) + s2.lower(c.item) + return (s1, s2) + return () + + # handle shade within a drag operation + def _deleteShade(self): + if self.game.drag.shade_img: + self.game.drag.shade_img.delete() + self.game.drag.shade_img = None + self.game.drag.shade_stack = None + + def _updateShade(self): + # optimized for speed - we use lots of local variables + game = self.game + images = game.app.images + img = images.getShade() + if img is None: + return + CW, CH = images.CARDW, images.CARDH + drag = game.drag + ##stacks = game.allstacks + c = drag.cards[0] + stacks = ( game.getClosestStack(c, drag.stack), ) + r1_0, r1_1, r1_2, r1_3 = c.x, c.y, c.x + CW, c.y + CH + sstack, sdiff, sx, sy = None, 999999999, 0, 0 + for s in stacks: + if s is None or s in drag.noshade_stacks: + continue + if s.cards: + c = s.cards[-1] + r2 = (c.x, c.y, c.x + CW, c.y + CH) + else: + r2 = (s.x, s.y, s.x + CW, s.y + CH) + if r1_2 <= r2[0] or r1_3 <= r2[1] or r2[2] <= r1_0 or r2[3] <= r1_1: + # rectangles do not intersect + continue + if s in drag.canshade_stacks: + pass + elif s.acceptsCards(drag.stack, drag.cards): + drag.canshade_stacks.append(s) + else: + drag.noshade_stacks.append(s) + continue + diff = (r1_0 - r2[0])**2 + (r1_1 - r2[1])**2 + if diff < sdiff: + sstack, sdiff, sx, sy = s, diff, r2[0], r2[1] + if sstack is drag.shade_stack: + return + if sstack is None: + self._deleteShade() + return + # move or create the shade image + drag.shade_stack = sstack + if drag.shade_img: + drag.shade_img.moveTo(sx, sy) + else: + img = MfxCanvasImage(game.canvas, sx, sy, image=img, anchor=ANCHOR_NW) + drag.shade_img = img + # raise/lower the shade image to the correct stacking order + if drag.shadows: + img.lower(drag.shadows[0]) + else: + img.lower(drag.cards[0].item) + + def _stopDrag(self): + drag = self.game.drag + after_cancel(drag.timer) + drag.timer = None + self._deleteShade() + drag.canshade_stacks = [] + drag.noshade_stacks = [] + for s in drag.shadows: + s.delete() + drag.shadows = [] + drag.stack = None + drag.cards = [] + + # finish a drag operation + def finishDrag(self, event=None): + if self.game.app.opt.dragcursor: + self.game.canvas.config(cursor=self.game.app.top_cursor) + drag = self.game.drag.copy() + self._stopDrag() + if drag.cards: + assert drag.stack is self + self.releaseHandler(event, drag) + + # cancel a drag operation + def cancelDrag(self, event=None): + if self.game.app.opt.dragcursor: + self.game.canvas.config(cursor=self.game.app.top_cursor) + drag = self.game.drag.copy() + self._stopDrag() + if drag.cards: + assert drag.stack is self + self.moveCardsBackHandler(event, drag) + + def getHelp(self): + # devel + return str(self) + + def getBaseCard(self): + return '' + + def _getBaseCard(self): + if self.cap.max_accept == 0: + return '' + br = self.cap.base_rank + s = _('Base card - %s.') + if br == NO_RANK: s = _('Empty row cannot be filled.') + elif br == -1: s = s % _('any card') + elif br == 10: s = s % _('Jack') + elif br == 11: s = s % _('Queen') + elif br == 12: s = s % _('King') + elif br == 0 : s = s % _('Ace') + else : s = s % str(br) + return s + + def getNumCards(self): + n = len(self.cards) + if n == 0 : return _('No cards') + elif n == 1 : return _('1 card') + else : return str(n)+_(' cards') + + +# /*********************************************************************** +# // Abstract interface that supports a concept of dealing. +# ************************************************************************/ + +class DealRow_StackMethods: + # Deal a card to each of the RowStacks. Return number of cards dealt. + def dealRow(self, rows=None, flip=1, reverse=0, frames=-1, sound=0): + if rows is None: rows = self.game.s.rows + if sound and frames and self.game.app.opt.animations: + self.game.startDealSample() + n = self.dealToStacks(rows, flip, reverse, frames) + if sound: + self.game.stopSamples() + return n + + # Same, but no error if not enough cards are available. + def dealRowAvail(self, rows=None, flip=1, reverse=0, frames=-1, sound=0): + if rows is None: rows = self.game.s.rows + if sound and frames and self.game.app.opt.animations: + self.game.startDealSample() + if len(self.cards) < len(rows): + rows = rows[:len(self.cards)] + n = self.dealToStacks(rows, flip, reverse, frames) + if sound: + self.game.stopSamples() + return n + + def dealToStacks(self, stacks, flip=1, reverse=0, frames=-1): + if not self.cards or not stacks: + return 0 + assert len(self.cards) >= len(stacks) + old_state = self.game.enterState(self.game.S_DEAL) + if reverse: + stacks = list(stacks) + stacks.reverse() + for r in stacks: + assert not self.getCard().face_up + assert r is not self + if frames == 0 and self.game.moves.state == self.game.S_INIT: + # optimized a little bit for initial dealing + c = self.removeCard(update=0) + r.addCard(c, update=0) + # doing the flip after the move seems to be a little faster + if flip: + c.showFace() + else: + if flip: + self.game.flipMove(self) + self.game.moveMove(1, self, r, frames=frames) + self.game.leaveState(old_state) + return len(stacks) + + # all Aces go to the Foundations + def dealToStacksOrFoundations(self, stacks, flip=1, reverse=0, frames=-1, rank=-1): + if rank < 0: + rank = self.game.s.foundations[0].cap.base_rank + if not self.cards or not stacks: + return 0 + old_state = self.game.enterState(self.game.S_DEAL) + if reverse: + stacks = list(stacks) + stacks.reverse() + n = 0 + for r in stacks: + assert r is not self + while self.cards: + n = n + 1 + if flip: + self.game.flipMove(self) + if flip and self.cards[-1].rank == rank: + for s in self.game.s.foundations: + assert s is not self + if s.acceptsCards(self, self.cards[-1:]): + self.game.moveMove(1, self, s, frames=frames) + break + else: + self.game.moveMove(1, self, r, frames=frames) + break + self.game.leaveState(old_state) + return n + + +class DealBaseCard_StackMethods: + def dealSingleBaseCard(self, frames=-1, update_saveinfo=1): + c = self.cards[-1] + self.dealBaseCards(ncards=1, frames=frames, update_saveinfo=0) + for s in self.game.s.foundations: + s.cap.base_rank = c.rank + if update_saveinfo: + cap = Struct(base_rank=c.rank) + self.game.saveinfo.stack_caps.append((s.id, cap)) + return c + + def dealBaseCards(self, ncards=1, frames=-1, update_saveinfo=1): + assert self.game.moves.state == self.game.S_INIT + assert not self.base_cards + while ncards > 0: + assert self.cards + c = self.cards[-1] + for s in self.game.s.foundations: + if not s.cards and (s.cap.base_suit < 0 or s.cap.base_suit == c.suit): + break + else: + assert 0 + s = None + s.cap.base_rank = c.rank + if update_saveinfo: + cap = Struct(base_rank=c.rank) + self.game.saveinfo.stack_caps.append((s.id, cap)) + if not c.face_up: + self.game.flipMove(self) + self.game.moveMove(1, self, s, frames=frames) + ncards = ncards - 1 + + +# /*********************************************************************** +# // The Talon is a stack with support for dealing. +# ************************************************************************/ + +class TalonStack(Stack, DealRow_StackMethods, DealBaseCard_StackMethods): + def __init__(self, x, y, game, max_rounds=1, num_deal=1, **cap): + Stack.__init__(self, x, y, game, cap=cap) + self.max_rounds = max_rounds + self.num_deal = num_deal + self.resetGame() + + def resetGame(self): + self.round = 1 + self.base_cards = [] # for DealBaseCard_StackMethods + + def assertStack(self): + Stack.assertStack(self) + n = self.game.gameinfo.redeals + if n < 0: assert self.max_rounds == n + else: assert self.max_rounds == n + 1 + + # Control of dealing is transferred to the game which usually + # transfers it back to the Talon - see dealCards() below. + def clickHandler(self, event): + return self.game.dealCards(sound=1) + + def rightclickHandler(self, event): + return self.clickHandler(event) + + # Usually called by Game.canDealCards() + def canDealCards(self): + return len(self.cards) > 0 + + # Actual dealing, usually called by Game.dealCards(). + # Either deal all cards in Game.startGame(), or subclass responsibility. + def dealCards(self, sound=0): + pass + + # remove all cards from all stacks + def removeAllCards(self): + for stack in self.game.allstacks: + while stack.cards: + ##stack.removeCard(update=0) + stack.removeCard(unhide=0, update=0) + for stack in self.game.allstacks: + stack.updateText() + + def updateText(self, update_rounds=1, update_redeal=1): + ##assertView(self) + Stack.updateText(self) + if update_rounds and self.game.preview <= 1: + if self.texts.rounds is not None: + t = _("Round %d") % self.round + self.texts.rounds.config(text=t) + if update_redeal: + deal = self.canDealCards() != 0 + if self.images.redeal is not None: + img = (self.getRedealImages())[deal] + if img is not None and img is not self.images.redeal_img: + self.images.redeal.config(image=img) + self.images.redeal_img = img + t = ("", _("Redeal"))[deal] + else: + t = (_("Stop"), _("Redeal"))[deal] + if self.texts.redeal is not None and self.game.preview <= 1: + if t != self.texts.redeal_str: + self.texts.redeal.config(text=t) + self.texts.redeal_str = t + + def prepareView(self): + Stack.prepareView(self) + if not self.is_visible or self.images.bottom is None: + return + if self.images.redeal is not None or self.texts.redeal is not None: + return + if self.game.preview > 1: + return + images = self.game.app.images + cx, cy, ca = self.x + images.CARDW/2, self.y + images.CARDH/2, "center" + if images.CARDW >= 54 and images.CARDH >= 54: + # add a redeal image above the bottom image + img = (self.getRedealImages())[self.max_rounds != 1] + if img is not None: + self.images.redeal = MfxCanvasImage(self.game.canvas, cx, cy, + image=img, anchor="center") + self.images.redeal_img = img + self.images.redeal.tkraise(self.top_bottom) + self.images.redeal.addtag(self.group) + self.top_bottom = self.images.redeal + if images.CARDH >= 90: + cy, ca = self.y + images.CARDH - 4, "s" + else: + ca = None + font = self.game.app.getFont("canvas_default") + text_width = Font(self.game.canvas, font).measure(_('Redeal')) + if images.CARDW >= text_width+4 and ca: + # add a redeal text above the bottom image + if self.max_rounds != 1: + images = self.game.app.images + self.texts.redeal = MfxCanvasText(self.game.canvas, cx, cy, + anchor=ca, font=font) + self.texts.redeal_str = "" + self.texts.redeal.tkraise(self.top_bottom) + self.texts.redeal.addtag(self.group) + self.top_bottom = self.texts.redeal + + def getBottomImage(self): + return self.game.app.images.getTalonBottom() + + def getRedealImages(self): + # returns a tuple of two PhotoImages + return self.game.app.gimages.redeal + + def getHelp(self): + if self.max_rounds == -2: nredeals = _('Variable redeals.') + elif self.max_rounds == -1: nredeals = _('Unlimited redeals.') + elif self.max_rounds == 1: nredeals = _('No redeals.') + elif self.max_rounds == 2: nredeals = _('One redeal.') + else: nredeals = str(self.max_rounds-1)+_(' redeals.') + ##round = _('Round #%d.') % self.round + return _('Talon.')+' '+nredeals ##+' '+round + + def getBaseCard(self): + return self._getBaseCard() + + +# A single click deals one card to each of the RowStacks. +class DealRowTalonStack(TalonStack): + def dealCards(self, sound=0): + return self.dealRowAvail(sound=sound) + + +# For games where the Talon is only used for the initial dealing. +class InitialDealTalonStack(TalonStack): + # no bindings + def initBindings(self): + pass + # no bottom + def getBottomImage(self): + return None + + +# /*********************************************************************** +# // An OpenStack is a stack where cards can be placed and dragged +# // (i.e. FoundationStack, RowStack, ReserveStack, ...) +# // +# // Note that it defaults to max_move=1 and max_accept=0. +# ************************************************************************/ + +class OpenStack(Stack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=1, max_accept=0, max_cards=999999) + Stack.__init__(self, x, y, game, cap=cap) + + + # + # Capabilities {model} + # + + def acceptsCards(self, from_stack, cards): + # default for OpenStack: we cannot accept cards (max_accept defaults to 0) + return self.basicAcceptsCards(from_stack, cards) + + def canMoveCards(self, cards): + # default for OpenStack: we can move the top card (max_move defaults to 1) + return self.basicCanMoveCards(cards) + + def canFlipCard(self): + # default for OpenStack: we can flip the top card + if self.basicIsBlocked() or not self.cards: + return 0 + return not self.cards[-1].face_up + + def canDropCards(self, stacks): + if self.basicIsBlocked() or not self.cards: + return (None, 0) + cards = self.cards[-1:] + if self.canMoveCards(cards): + for s in stacks: + if s is not self and s.acceptsCards(self, cards): + return (s, 1) + return (None, 0) + + + # + # Mouse handlers {controller} + # + + def clickHandler(self, event): + flipstacks, dropstacks, quickstacks = self.game.getAutoStacks(event) + if self in flipstacks and self.canFlipCard(): + self.playFlipMove() + return -1 # continue this event (start a drag) + return 0 + + def rightclickHandler(self, event): + if self.doubleclickHandler(event): + return 1 + if self.game.app.opt.quickplay: + flipstacks, dropstacks, quickstacks = self.game.getAutoStacks(event) + if self in quickstacks: + n = self.quickPlayHandler(event) + self.game.stats.quickplay_moves += n + return n + return 0 + + def doubleclickHandler(self, event): + # flip or drop a card + flipstacks, dropstacks, quickstacks = self.game.getAutoStacks(event) + if self in flipstacks and self.canFlipCard(): + self.playFlipMove() + return -1 # continue this event (start a drag) + if self in dropstacks: + to_stack, ncards = self.canDropCards(self.game.s.foundations) + if to_stack: + self.game.playSample("autodrop", priority=30) + self.playMoveMove(ncards, to_stack, sound=0) + return 1 + return 0 + + def controlclickHandler(self, event): + # highlight matching cards + if self.game.app.opt.highlight_cards: + return self.highlightMatchingCards(event) + return 0 + + def releaseHandler(self, event, drag, sound=1): + cards = drag.cards + # check if we moved the card by at least 10 pixels + if event is not None: + dx, dy = event.x - drag.start_x, event.y - drag.start_y + if abs(dx) < 10 and abs(dy) < 10: + # move cards back to their origin stack + Stack.releaseHandler(self, event, drag, sound=sound) + return + ##print dx, dy + # get destination stack + stack = self.game.getClosestStack(cards[0], self) + # move cards + if not stack or stack is self or not stack.acceptsCards(self, cards): + # move cards back to their origin stack + Stack.releaseHandler(self, event, drag, sound=sound) + else: + # this code actually moves the cards to the new stack + self.playMoveMove(len(cards), stack, frames=0, sound=sound) + + def quickPlayHandler(self, event, from_stacks=None, to_stacks=None): + ##print 'quickPlayHandler', from_stacks, to_stacks + # from_stacks and to_stacks are meant for possible + # use in a subclasses + if from_stacks is None: + from_stacks = self.game.sg.dropstacks + if to_stacks is None: + ##to_stacks = self.game.s.rows + self.game.s.reserves + ##to_stacks = self.game.sg.dropstacks + to_stacks = self.game.s.foundations + self.game.sg.dropstacks + ##from pprint import pprint; pprint(to_stacks) + moves = [] + # + if not self.cards: + for s in from_stacks: + if s is not self and s.cards: + pile = s.getPile() + if pile and self.acceptsCards(s, pile): + score = self.game.getQuickPlayScore(len(pile), s, self) + moves.append((score, -len(moves), len(pile), s, self)) + else: + pile1, pile2 = None, self.getPile() + if pile2: + i = self._findCard(event) + if i >= 0: + pile = self.cards[i:] + if len(pile) != len(pile2) and self.canMoveCards(pile): + pile1 = pile + for pile in (pile1, pile2): + if not pile: + continue + for s in to_stacks: + if s is not self and s.acceptsCards(self, pile): + score = self.game.getQuickPlayScore(len(pile), self, s) + moves.append((score, -len(moves), len(pile), self, s)) + # + if moves: + moves.sort() + moves.reverse() + ##from pprint import pprint + ##pprint(moves) + if moves[0][0] >= 0: + ##self.game.playSample("startdrag") + moves[0][3].playMoveMove(moves[0][2], moves[0][4]) + return 1 + return 0 + + def getHelp(self): + if self.cap.max_accept == 0: + return _('Reserve. No building.') + return '' + + +# /*********************************************************************** +# // Foundations stacks +# ************************************************************************/ + +class AbstractFoundationStack(OpenStack): + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, suit=suit, base_suit=suit, base_rank=ACE, + dir=1, max_accept=1, max_cards=13) + apply(OpenStack.__init__, (self, x, y, game), cap) + + def canDropCards(self, stacks): + return (None, 0) + + def clickHandler(self, event): + return 0 + + def rightclickHandler(self, event): + return 0 + + def quickPlayHandler(self, event, from_stacks=None, to_stacks=None): + return 0 + + def getBottomImage(self): + return self.game.app.images.getSuitBottom(self.cap.base_suit) + + def getBaseCard(self): + return self._getBaseCard() + + +# A SameSuit_FoundationStack is the typical Foundation stack. +# It builds up in rank and suit. +class SS_FoundationStack(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if self.cards: + # check the rank + if (self.cards[-1].rank + self.cap.dir) % self.cap.mod != cards[0].rank: + return 0 + return 1 + + def getHelp(self): + if self.cap.dir > 0: return _('Foundation. Build up by suit.') + elif self.cap.dir < 0: return _('Foundation. Build down by suit.') + else: return _('Foundation. Build by same rank.') + + +# A Rank_FoundationStack builds up in rank and ignores color and suit. +class RK_FoundationStack(SS_FoundationStack): + def __init__(self, x, y, game, suit=ANY_SUIT, **cap): + apply(SS_FoundationStack.__init__, (self, x, y, game, suit), cap) + + def assertStack(self): + SS_FoundationStack.assertStack(self) + assert self.cap.suit == ANY_SUIT + assert self.cap.color == ANY_COLOR + + def getHelp(self): + if self.cap.dir > 0: return _('Foundation. Build up regardless of suit.') + elif self.cap.dir < 0: return _('Foundation. Build down regardless of suit.') + else: return _('Foundation. Build by same rank.') + + +# A AlternateColor_FoundationStack builds up in rank and alternate color. +# It is used in only a few games. +class AC_FoundationStack(SS_FoundationStack): + def __init__(self, x, y, game, suit, **cap): + kwdefault(cap, base_suit=suit) + apply(SS_FoundationStack.__init__, (self, x, y, game, ANY_SUIT), cap) + + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return 0 + if self.cards: + # check the color + if cards[0].color == self.cards[-1].color: + return 0 + return 1 + + def getHelp(self): + if self.cap.dir > 0: return _('Foundation. Build up by alternate color.') + elif self.cap.dir < 0: return _('Foundation. Build down by alternate color.') + else: return _('Foundation. Build by same rank.') + + +# /*********************************************************************** +# // Abstract classes for row stacks. +# ************************************************************************/ + +# Abstract class. +class SequenceStack_StackMethods: + def _isSequence(self, cards): + # Are the cards in a basic sequence for our stack ? + raise SubclassResponsibility + + def _isAcceptableSequence(self, cards): + return self._isSequence(cards) + + def _isMoveableSequence(self, cards): + return self._isSequence(cards) + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + # cards must be an acceptable sequence + if not self._isAcceptableSequence(cards): + return 0 + # [topcard + cards] must be an acceptable sequence + if self.cards and not self._isAcceptableSequence([self.cards[-1]] + cards): + return 0 + return 1 + + def canMoveCards(self, cards): + return self.basicCanMoveCards(cards) and self._isMoveableSequence(cards) + + +# Abstract class. +class BasicRowStack(OpenStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, dir=-1, base_rank=ANY_RANK) + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = game.app.images.CARD_YOFFSET + + def getHelp(self): + if self.cap.max_accept == 0: + return _('Row. No building.') + return '' + + #def getBaseCard(self): + # return self._getBaseCard() + + +# Abstract class. +class SequenceRowStack(SequenceStack_StackMethods, BasicRowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=999999, max_accept=999999) + apply(BasicRowStack.__init__, (self, x, y, game), cap) + def getBaseCard(self): + return self._getBaseCard() + + +# /*********************************************************************** +# // Row stacks (the main playing stacks on the Tableau). +# ************************************************************************/ + +# +# Implementation of common row stacks follows here. +# + +# An AlternateColor_RowStack builds down by rank and alternate color. +# e.g. Klondike +class AC_RowStack(SequenceRowStack): + def _isSequence(self, cards): + return isAlternateColorSequence(cards, self.cap.mod, self.cap.dir) + def getHelp(self): + if self.cap.dir > 0: return _('Row. Build up by alternate color.') + elif self.cap.dir < 0: return _('Row. Build down by alternate color.') + else: return _('Row. Build by same rank.') + +# A SameColor_RowStack builds down by rank and same color. +# e.g. Klondike +class SC_RowStack(SequenceRowStack): + def _isSequence(self, cards): + return isSameColorSequence(cards, self.cap.mod, self.cap.dir) + def getHelp(self): + if self.cap.dir > 0: return _('Row. Build up by color.') + elif self.cap.dir < 0: return _('Row. Build down by color.') + else: return _('Row. Build by same rank.') + +# A SameSuit_RowStack builds down by rank and suit. +class SS_RowStack(SequenceRowStack): + def _isSequence(self, cards): + return isSameSuitSequence(cards, self.cap.mod, self.cap.dir) + def getHelp(self): + if self.cap.dir > 0: return _('Row. Build up by suit.') + elif self.cap.dir < 0: return _('Row. Build down by suit.') + else: return _('Row. Build by same rank.') + +# A Rank_RowStack builds down by rank ignoring suit. +class RK_RowStack(SequenceRowStack): + def _isSequence(self, cards): + return isRankSequence(cards, self.cap.mod, self.cap.dir) + def getHelp(self): + if self.cap.dir > 0: return _('Row. Build up regardless of suit.') + elif self.cap.dir < 0: return _('Row. Build down regardless of suit.') + else: return _('Row. Build by same rank.') + +# A Freecell_AlternateColor_RowStack +class FreeCell_AC_RowStack(AC_RowStack): + def canMoveCards(self, cards): + max_move = getNumberOfFreeStacks(self.game.s.reserves) + 1 + return len(cards) <= max_move and AC_RowStack.canMoveCards(self, cards) + +# A Freecell_SameSuit_RowStack (i.e. Baker's Game) +class FreeCell_SS_RowStack(SS_RowStack): + def canMoveCards(self, cards): + max_move = getNumberOfFreeStacks(self.game.s.reserves) + 1 + return len(cards) <= max_move and SS_RowStack.canMoveCards(self, cards) + +# A Spider_AlternateColor_RowStack builds down by rank and alternate color, +# but accepts sequences that match by rank only. +class Spider_AC_RowStack(AC_RowStack): + def _isAcceptableSequence(self, cards): + return isRankSequence(cards, self.cap.mod, self.cap.dir) + +# A Spider_SameSuit_RowStack builds down by rank and suit, +# but accepts sequences that match by rank only. +class Spider_SS_RowStack(SS_RowStack): + def _isAcceptableSequence(self, cards): + return isRankSequence(cards, self.cap.mod, self.cap.dir) + def getHelp(self): + if self.cap.dir > 0: return _('Row. Build up regardless of suit.') + elif self.cap.dir < 0: return _('Row. Build down regardless of suit.') + else: return _('Row. Build by same rank.') + +# A Yukon_AlternateColor_RowStack builds down by rank and alternate color, +# but can move any face-up cards regardless of sequence. +class Yukon_AC_RowStack(BasicRowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=999999, max_accept=999999) + apply(BasicRowStack.__init__, (self, x, y, game), cap) + + def _isSequence(self, c1, c2): + return (c1.rank + self.cap.dir) % self.cap.mod == c2.rank and c1.color != c2.color + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return 0 + # [topcard + card[0]] must be acceptable + if self.cards and not self._isSequence(self.cards[-1], cards[0]): + return 0 + return 1 + + def getHelp(self): + if self.cap.dir > 0: return _('Row. Build up by alternate color, can move any face-up cards regardless of sequence.') + elif self.cap.dir < 0: return _('Row. Build down by alternate color, can move any face-up cards regardless of sequence.') + else: return _('Row. Build by same rank, can move any face-up cards regardless of sequence.') + + +# A Yukon_SameSuit_RowStack builds down by rank and suit, +# but can move any face-up cards regardless of sequence. +class Yukon_SS_RowStack(Yukon_AC_RowStack): + def _isSequence(self, c1, c2): + return (c1.rank + self.cap.dir) % self.cap.mod == c2.rank and c1.suit == c2.suit + def getHelp(self): + if self.cap.dir > 0: return _('Row. Build up by suit, can move any face-up cards regardless of sequence.') + elif self.cap.dir < 0: return _('Row. Build down by suit, can move any face-up cards regardless of sequence.') + else: return _('Row. Build by same rank, can move any face-up cards regardless of sequence.') + +# +# King-versions of some of the above stacks: they accepts only Kings or +# sequences starting with a King as base_rank cards (i.e. when empty). +# + +class KingAC_RowStack(AC_RowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, base_rank=KING) + apply(AC_RowStack.__init__, (self, x, y, game), cap) + +class KingSS_RowStack(SS_RowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, base_rank=KING) + apply(SS_RowStack.__init__, (self, x, y, game), cap) + +class KingRK_RowStack(RK_RowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, base_rank=KING) + apply(RK_RowStack.__init__, (self, x, y, game), cap) + + +# up or down by color +class UD_SC_RowStack(SequenceRowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=1, max_accept=1) + apply(SequenceRowStack.__init__, (self, x, y, game), cap) + def _isSequence(self, cards): + return (isSameColorSequence(cards, self.cap.mod, 1) or + isSameColorSequence(cards, self.cap.mod, -1)) + def getHelp(self): + return _('Row. Build up or down by color.') + +# up or down by alternate color +class UD_AC_RowStack(SequenceRowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=1, max_accept=1) + apply(SequenceRowStack.__init__, (self, x, y, game), cap) + def _isSequence(self, cards): + return (isAlternateColorSequence(cards, self.cap.mod, 1) or + isAlternateColorSequence(cards, self.cap.mod, -1)) + def getHelp(self): + return _('Row. Build up or down by alternate color.') + +# up or down by suit +class UD_SS_RowStack(SequenceRowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=1, max_accept=1) + apply(SequenceRowStack.__init__, (self, x, y, game), cap) + def _isSequence(self, cards): + return (isSameSuitSequence(cards, self.cap.mod, 1) or + isSameSuitSequence(cards, self.cap.mod, -1)) + def getHelp(self): + return _('Row. Build up or down by suit.') + +# up or down by rank ignoring suit +class UD_RK_RowStack(SequenceRowStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=1, max_accept=1) + apply(SequenceRowStack.__init__, (self, x, y, game), cap) + def _isSequence(self, cards): + return (isRankSequence(cards, self.cap.mod, 1) or + isRankSequence(cards, self.cap.mod, -1)) + def getHelp(self): + return _('Row. Build up or down regardless of suit.') + + + + +# /*********************************************************************** +# // WasteStack (a helper stack for the Talon, e.g. in Klondike) +# ************************************************************************/ + +class WasteStack(OpenStack): + def getHelp(self): + return _('Waste.') + + +class WasteTalonStack(TalonStack): + # A single click moves the top cards to the game's waste and + # moves it face up; if we're out of cards, it moves the waste + # back to the talon and increases the number of rounds (redeals). + def __init__(self, x, y, game, max_rounds, num_deal=1, waste=None, **cap): + apply(TalonStack.__init__, (self, x, y, game, max_rounds, num_deal), cap) + self.waste = waste + + def prepareStack(self): + TalonStack.prepareStack(self) + if self.waste is None: + self.waste = self.game.s.waste + + def canDealCards(self): + waste = self.waste + if self.cards: + num_cards = min(len(self.cards), self.num_deal) + return len(waste.cards) + num_cards <= waste.cap.max_cards + elif waste.cards and self.round != self.max_rounds: + return 1 + return 0 + + def dealCards(self, sound=0): + old_state = self.game.enterState(self.game.S_DEAL) + num_cards = 0 + waste = self.waste + if self.cards: + if sound and not self.game.demo: + self.game.playSample("dealwaste") + num_cards = min(len(self.cards), self.num_deal) + assert len(waste.cards) + num_cards <= waste.cap.max_cards + for i in range(num_cards): + if not self.cards[-1].face_up: + self.game.flipMove(self) + self.game.moveMove(1, self, waste, frames=4, shadow=0) + self.fillStack() + elif waste.cards and self.round != self.max_rounds: + if sound: + self.game.playSample("turnwaste", priority=20) + num_cards = len(waste.cards) + self.game.turnStackMove(waste, self, update_flags=1) + self.game.leaveState(old_state) + return num_cards + + +class FaceUpWasteTalonStack(WasteTalonStack): + def canFlipCard(self): + return len(self.cards) > 0 and not self.cards[-1].face_up + + def fillStack(self): + if self.canFlipCard(): + self.game.flipMove(self) + + +class OpenTalonStack(TalonStack, OpenStack): + canMoveCards = OpenStack.canMoveCards + canDropCards = OpenStack.canDropCards + releaseHandler = OpenStack.releaseHandler + + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_move=1) + apply(TalonStack.__init__, (self, x, y, game), cap) + + def canDealCards(self): + return 0 + + def canFlipCard(self): + return len(self.cards) > 0 and not self.cards[-1].face_up + + def fillStack(self): + if self.canFlipCard(): + self.game.flipMove(self) + + def clickHandler(self, event): + if self.canDealCards(): + return TalonStack.clickHandler(self, event) + else: + return OpenStack.clickHandler(self, event) + + +# /*********************************************************************** +# // ReserveStack (free cell) +# ************************************************************************/ + +class ReserveStack(OpenStack): + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_accept=1, max_cards=1) + apply(OpenStack.__init__, (self, x, y, game), cap) + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + def getHelp(self): + if self.cap.max_accept == 0: + return _('Reserve. No building.') + return _('Free cell.') + + +# /*********************************************************************** +# // InvisibleStack (an internal off-screen stack to hold cards) +# ************************************************************************/ + +class InvisibleStack(Stack): + def __init__(self, game, **cap): + x, y = -500, -500 - len(game.allstacks) + kwdefault(cap, max_move=0, max_accept=0) + Stack.__init__(self, x, y, game, cap=cap) + + def assertStack(self): + Stack.assertStack(self) + assert not self.is_visible + + # no bindings + def initBindings(self): + pass + + # no bottom + def getBottomImage(self): + return None + + +# /*********************************************************************** +# // A StackWrapper is a functor (function object) that creates a +# // new stack when called, i.e. it wraps the constructor. +# // +# // "cap" are the capabilites, see class Stack above. +# ************************************************************************/ + +# self.cap override any call-time cap +class StackWrapper: + def __init__(self, stack_class, **cap): + assert type(stack_class) is types.ClassType + assert issubclass(stack_class, Stack) + self.stack_class = stack_class + self.cap = cap + + # return a new stack (an instance of the stack class) + def __call__(self, x, y, game, **cap): + # must preserve self.cap, so create a shallow copy + c = self.cap.copy() + apply(kwdefault, (c,), cap) + return apply(self.stack_class, (x, y, game), c) + + +# call-time cap override self.cap +class WeakStackWrapper(StackWrapper): + def __call__(self, x, y, game, **cap): + apply(kwdefault, (cap,), self.cap) + return apply(self.stack_class, (x, y, game), cap) + + +# self.cap only, call-time cap is completely ignored +class FullStackWrapper(StackWrapper): + def __call__(self, x, y, game, **cap): + return apply(self.stack_class, (x, y, game), self.cap) + + +# /*********************************************************************** +# // +# ************************************************************************/ + diff --git a/pysollib/stats.py b/pysollib/stats.py new file mode 100644 index 00000000..d3039bfa --- /dev/null +++ b/pysollib/stats.py @@ -0,0 +1,213 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import os, sys, time, types + +# PySol imports +from mfxutil import SubclassResponsibility, Struct, destruct +from mfxutil import format_time +from util import PACKAGE, VERSION +from gamedb import GI + +# Toolkit imports +from pysoltk import MfxDialog + + +# // FIXME - this a quick hack and needs a rewrite + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PysolStatsFormatter: + def __init__(self, app): + self.app = app + + # + # + # + + class StringWriter: + def __init__(self): + self.text = "" + + def p(self, s): + self.text = self.text + s + + def nl(self, count=1): + self.p("\n" * count) + + def pheader(self, s): + self.p(s) + + def pstats(self, *args, **kwargs): + s = "%-30s %7s %7s %7s %7s %7s %7s\n" % args + self.p(s) + + def plog(self, gamename, gamenumber, date, status, gameid=-1, won=-1): + self.p("%-25s %-20s %17s %s\n" % (gamename, gamenumber, date, status)) + + + class FileWriter(StringWriter): + def __init__(self, file): + self.file = file + + def p(self, s): + self.file.write(s.encode('utf-8')) + + # + # + # + + def writeHeader(self, writer, header, pagewidth=72): + date = time.ctime(time.time()) + date = time.strftime("%Y-%m-%d %H:%M", time.localtime(time.time())) + blanks = max(pagewidth - len(header) - len(date), 1) + writer.pheader(header + " "*blanks + date + "\n") + writer.pheader("-" * pagewidth + "\n") + writer.pheader("\n") + + def writeStats(self, writer, player, header, sort_by='name'): + app = self.app + # + sort_functions = { + 'name': app.getGamesIdSortedByName, + 'played': app.getGamesIdSortedByPlayed, + 'won': app.getGamesIdSortedByWon, + 'lost': app.getGamesIdSortedByLost, + 'time': app.getGamesIdSortedByPlayingTime, + 'moves': app.getGamesIdSortedByMoves, + 'percent': app.getGamesIdSortedByPercent, + } + sort_func = sort_functions[sort_by] + + self.writeHeader(writer, header, 62) + writer.pstats(player or _("Demo games"), + _("Played"), + _("Won"), + _("Lost"), + _('Playing time'), + _('Moves'), + _("% won")) + writer.nl() + twon, tlost, tgames, ttime, tmoves = 0, 0, 0, 0, 0 + g = sort_func() + for id in g: + name = app.getGameMenuitemName(id) + #won, lost = app.stats.getStats(player, id) + won, lost, time, moves = app.stats.getFullStats(player, id) + twon, tlost = twon + won, tlost + lost + ttime, tmoves = ttime+time, tmoves+moves + if won + lost > 0: perc = "%.1f" % (100.0 * won / (won + lost)) + else: perc = "0.0" + if won > 0 or lost > 0 or id == app.game.id: + #writer.pstats(name, won+lost, won, lost, perc, gameid=id) + t = format_time(time) + m = str(round(moves, 1)) + writer.pstats(name, won+lost, won, lost, t, m, perc, gameid=id) + tgames = tgames + 1 + writer.nl() + won, lost = twon, tlost + if won + lost > 0: + if won > 0: + time = format_time(ttime/won) + moves = round(tmoves/won, 1) + else: + time = format_time(0) + moves = 0 + perc = "%.1f" % (100.0*won/(won+lost)) + else: perc = "0.0" + writer.pstats(_("Total (%d out of %d games)") % (tgames, len(g)), + won+lost, won, lost, time, moves, perc) + writer.nl(2) + return tgames + + def _writeLog(self, writer, player, header, prev_games): + if not player or not prev_games: + return 0 + self.writeHeader(writer, header, 71) + writer.plog(_("Game"), _("Game number"), _("Started at "), _("Status")) + writer.nl() + twon, tlost = 0, 0 + for pg in prev_games: + if type(pg) is not types.TupleType: + continue + if len(pg) == 5: + pg = pg + ("", None, None, 1) + elif len(pg) == 7: + pg = pg + (None, 1) + elif len(pg) == 8: + pg = pg + (1,) + if len(pg) < 8: + continue + gameid = pg[0] + if type(gameid) is not types.IntType: + continue + gi = self.app.getGameInfo(gameid) + if not gi: + gi = self.app.getGameInfo(GI.PROTECTED_GAMES.get(gameid)) + if gi: + name = gi.short_name + else: + name = _("** UNKNOWN %d **") % gameid + f = pg[1] + if len(f) == 16: + ##gamenumber = "%s-%s-%s-%s" % (f[0:4], f[4:8], f[8:12], f[12:16]) + gamenumber = "%s-%s-%s" % (f[4:8], f[8:12], f[12:16]) + elif len(f) <= 20: + gamenumber = f + else: + gamenumber = _("** ERROR **") + date = time.strftime("%Y-%m-%d %H:%M", time.localtime(pg[3])) + if pg[2] >= 0: + won = pg[2] > 0 + twon, tlost = twon + won, tlost + (1 - won) + status = "*error*" + if -2 <= pg[2] <= 2: + status = (_("Loaded"), _("Not won"), _("Lost"), _("Won"), _("Perfect")) [pg[2]+2] + writer.plog(name, gamenumber, date, status, gameid=gameid, won=pg[2]) + writer.nl(2) + return 1 + + def writeFullLog(self, writer, player, header): + prev_games = self.app.stats.prev_games.get(player) + return self._writeLog(writer, player, header, prev_games) + + def writeSessionLog(self, writer, player, header): + prev_games = self.app.stats.session_games.get(player) + return self._writeLog(writer, player, header, prev_games) diff --git a/pysollib/tk/__init__.py b/pysollib/tk/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pysollib/tk/card.py b/pysollib/tk/card.py new file mode 100644 index 00000000..3daa7339 --- /dev/null +++ b/pysollib/tk/card.py @@ -0,0 +1,289 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['Card'] + +# imports + +# PySol imports +from pysollib.acard import AbstractCard + +# Toolkit imports +from tkconst import tkversion, TK_DASH_PATCH +from tkcanvas import MfxCanvasGroup, MfxCanvasImage + + +# /*********************************************************************** +# // +# ************************************************************************/ + +# any Tk version +class _HideableCard_1(AbstractCard): + def hide(self, stack): + if stack is self.hide_stack: + return + if self.hide_stack: + hx, hy = stack.hide_x - self.hide_x, stack.hide_y - self.hide_y + else: + hx, hy = stack.hide_x, stack.hide_y + ####self.item.move(hx, hy) + item = self.item + item.canvas.tk.call(item.canvas._w, "move", item.id, hx, hy) + self.hide_x, self.hide_y = stack.hide_x, stack.hide_y + self.hide_stack = stack + ##print "hide:", self.id, hx, hy, self.item.coords() + + def unhide(self): + if self.hide_stack is None: + return 0 + ####self.item.move(-self.hide_x, -self.hide_y) + item = self.item + item.canvas.tk.call(item.canvas._w, "move", item.id, -self.hide_x, -self.hide_y) + ##print "unhide:", self.id, -self.hide_x, -self.hide_y, self.item.coords() + self.hide_x, self.hide_y = 0, 0 + self.hide_stack = None + return 1 + + +# needs Tk 8.3.0 or better +class _HideableCard_2(AbstractCard): + def hide(self, stack): + if stack is self.hide_stack: + return + self.item.config(state="hidden") + self.hide_stack = stack + ##print "hide:", self.id, self.item.coords() + + def unhide(self): + if self.hide_stack is None: + return 0 + ##print "unhide:", self.id, self.item.coords() + self.item.config(state="normal") + self.hide_stack = None + return 1 + + +_HideableCard =_HideableCard_1 +if 1 and tkversion >= (8, 3, 0, 0): + _HideableCard =_HideableCard_2 + + +# /*********************************************************************** +# // New implemetation since 2.10 +# // +# // We use a single CanvasImage and call CanvasImage.config() to +# // turn the card. +# // This makes turning cards a little bit slower, but dragging cards +# // around is noticeable faster as the total number of images is +# // reduced by half. +# ************************************************************************/ + +class _OneImageCard(_HideableCard): + def __init__(self, id, deck, suit, rank, game, x=0, y=0): + _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y) + self._face_image = game.getCardFaceImage(deck, suit, rank) + self._back_image = game.getCardBackImage(deck, suit, rank) + self._active_image = self._back_image + self.item = MfxCanvasImage(game.canvas, self.x, self.y, image=self._active_image, anchor="nw") + ##self._setImage = self.item.config + + def _setImage(self, image): + if image is not self._active_image: + self.item.config(image=image) + self._active_image = image + + def showFace(self, unhide=1): + if not self.face_up: + self._setImage(image=self._face_image) + self.tkraise(unhide) + self.face_up = 1 + + def showBack(self, unhide=1): + if self.face_up: + self._setImage(image=self._back_image) + self.tkraise(unhide) + self.face_up = 0 + + def updateCardBackground(self, image): + self._back_image = image + if not self.face_up: + self._setImage(image=image) + + # + # optimized by inlining + # + + def moveBy(self, dx, dy): + dx, dy = int(dx), int(dy) + self.x = self.x + dx + self.y = self.y + dy + item = self.item + item.canvas.tk.call(item.canvas._w, "move", item.id, dx, dy) + + +# /*********************************************************************** +# // New idea since 3.00 +# // +# // Hide a card by configuring the canvas image to None. +# ************************************************************************/ + +class _OneImageCardWithHideByConfig(_OneImageCard): + def hide(self, stack): + if stack is self.hide_stack: + return + self._setImage(image=None) + self.hide_stack = stack + + def unhide(self): + if self.hide_stack is None: + return 0 + if self.face_up: + self._setImage(image=self._face_image) + else: + self._setImage(image=self._back_image) + self.hide_stack = None + return 1 + + # + # much like in _OneImageCard + # + + def showFace(self, unhide=1): + if not self.face_up: + if unhide: + self._setImage(image=self._face_image) + self.item.tkraise() + self.face_up = 1 + + def showBack(self, unhide=1): + if self.face_up: + if unhide: + self._setImage(image=self._back_image) + self.item.tkraise() + self.face_up = 0 + + def updateCardBackground(self, image): + self._back_image = image + if not self.face_up and not self.hide_stack: + self._setImage(image=image) + + +# /*********************************************************************** +# // Old implemetation prior to 2.10 +# // +# // The card consists of two CanvasImages. To show the card face up, +# // the face item is placed in front of the back. To show it face +# // down, this is reversed. +# ************************************************************************/ + +class _TwoImageCard(_HideableCard): + # Private instance variables: + # __face, __back -- the canvas items making up the card + def __init__(self, id, deck, suit, rank, game, x=0, y=0): + _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y) + self.item = MfxCanvasGroup(game.canvas) + self.__face = MfxCanvasImage(game.canvas, self.x, self.y, image=game.getCardFaceImage(deck, suit, rank), anchor="nw") + self.__back = MfxCanvasImage(game.canvas, self.x, self.y, image=game.getCardBackImage(deck, suit, rank), anchor="nw") + self.__face.addtag(self.item) + self.__back.addtag(self.item) + + def showFace(self, unhide=1): + if not self.face_up: + if TK_DASH_PATCH: + self.__back.config(state="hidden") + self.__face.config(state="normal") + self.__face.tkraise() + self.tkraise(unhide) + self.face_up = 1 + + def showBack(self, unhide=1): + if self.face_up: + if TK_DASH_PATCH: + self.__face.config(state="hidden") + self.__back.config(state="normal") + self.__back.tkraise() + self.tkraise(unhide) + self.face_up = 0 + + def updateCardBackground(self, image): + self.__back.config(image=image) + + +# /*********************************************************************** +# // New idea since 2.90 +# // +# // The card consists of two CanvasImages. Instead of raising +# // one image above the other we move the inactive image out +# // of the visible canvas. +# ************************************************************************/ + +class _TwoImageCardWithHideItem(_HideableCard): + # Private instance variables: + # __face, __back -- the canvas items making up the card + def __init__(self, id, deck, suit, rank, game, x=0, y=0): + _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y) + self.item = MfxCanvasGroup(game.canvas) + self.__face = MfxCanvasImage(game.canvas, self.x, self.y + 11000, image=game.getCardFaceImage(deck, suit, rank), anchor="nw") + self.__back = MfxCanvasImage(game.canvas, self.x, self.y, image=game.getCardBackImage(deck, suit, rank), anchor="nw") + self.__face.addtag(self.item) + self.__back.addtag(self.item) + + def showFace(self, unhide=1): + if not self.face_up: + self.__back.move(0, 10000) + ##self.__face.tkraise() + self.__face.move(0, -11000) + self.tkraise(unhide) + self.face_up = 1 + + def showBack(self, unhide=1): + if self.face_up: + self.__face.move(0, 11000) + ##self.__back.tkraise() + self.__back.move(0, -10000) + self.tkraise(unhide) + self.face_up = 0 + + def updateCardBackground(self, image): + self.__back.config(image=image) + + + +# choose the implementation +Card = _TwoImageCardWithHideItem +Card = _TwoImageCard +Card = _OneImageCardWithHideByConfig +Card = _OneImageCard + diff --git a/pysollib/tk/colorsdialog.py b/pysollib/tk/colorsdialog.py new file mode 100644 index 00000000..f0d05062 --- /dev/null +++ b/pysollib/tk/colorsdialog.py @@ -0,0 +1,138 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['ColorsDialog'] + +# imports +import os, sys +from Tkinter import * +from tkColorChooser import askcolor + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import _ToplevelDialog, MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class ColorsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + frame = Frame(top_frame) + frame.pack(expand=YES, fill=BOTH, padx=5, pady=10) + frame.columnconfigure(0, weight=1) + + self.table_text_color_var = BooleanVar() + self.table_text_color_var.set(app.opt.table_text_color) + self.table_text_color_value_var = StringVar() + self.table_text_color_value_var.set(app.opt.table_text_color_value) + ##self.table_color_var = StringVar() + ##self.table_color_var.set(app.opt.table_color) + self.highlight_piles_colors_var = StringVar() + self.highlight_piles_colors_var.set(app.opt.highlight_piles_colors[1]) + self.highlight_cards_colors_1_var = StringVar() + self.highlight_cards_colors_1_var.set(app.opt.highlight_cards_colors[1]) + self.highlight_cards_colors_2_var = StringVar() + self.highlight_cards_colors_2_var.set(app.opt.highlight_cards_colors[3]) + self.highlight_samerank_colors_1_var = StringVar() + self.highlight_samerank_colors_1_var.set(app.opt.highlight_samerank_colors[1]) + self.highlight_samerank_colors_2_var = StringVar() + self.highlight_samerank_colors_2_var.set(app.opt.highlight_samerank_colors[3]) + self.hintarrow_color_var = StringVar() + self.hintarrow_color_var.set(app.opt.hintarrow_color) + self.highlight_not_matching_color_var = StringVar() + self.highlight_not_matching_color_var.set(app.opt.highlight_not_matching_color) + # + c = Checkbutton(frame, variable=self.table_text_color_var, + text=_("Text foreground:"), anchor=W) + c.grid(row=0, column=0, sticky=W+E) + l = Label(frame, width=10, height=2, + bg=self.table_text_color_value_var.get(), + textvariable=self.table_text_color_value_var) + l.grid(row=0, column=1, padx=5) + b = Button(frame, text=_('Change...'), width=10, + command=lambda l=l: self.selectColor(l)) + b.grid(row=0, column=2) + row = 1 + for title, var in ( + ##('Table:', self.table_color_var), + (_('Highlight piles:'), self.highlight_piles_colors_var), + (_('Highlight cards 1:'), self.highlight_cards_colors_1_var), + (_('Highlight cards 2:'), self.highlight_cards_colors_2_var), + (_('Highlight same rank 1:'), self.highlight_samerank_colors_1_var), + (_('Highlight same rank 2:'), self.highlight_samerank_colors_2_var), + (_('Hint arrow:'), self.hintarrow_color_var), + (_('Highlight not matching:'), self.highlight_not_matching_color_var), + ): + Label(frame, text=title, anchor=W).grid(row=row, column=0, sticky=W+E) + l = Label(frame, width=10, height=2, + bg=var.get(), textvariable=var) + l.grid(row=row, column=1, padx=5) + b = Button(frame, text=_('Change...'), width=10, + command=lambda l=l: self.selectColor(l)) + b.grid(row=row, column=2) + row += 1 + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + # + self.table_text_color = self.table_text_color_var.get() + self.table_text_color_value = self.table_text_color_value_var.get() + ##self.table_color = self.table_color_var.get() + self.highlight_piles_colors = (None, + self.highlight_piles_colors_var.get()) + self.highlight_cards_colors = (None, + self.highlight_cards_colors_1_var.get(), + None, + self.highlight_cards_colors_2_var.get()) + self.highlight_samerank_colors = (None, + self.highlight_samerank_colors_1_var.get(), + None, + self.highlight_samerank_colors_2_var.get()) + self.hintarrow_color = self.hintarrow_color_var.get() + self.highlight_not_matching_color = self.highlight_not_matching_color_var.get() + + def selectColor(self, label): + c = askcolor(master=self.top, initialcolor=label.cget('bg'), + title=_("Select color")) + if c and c[1]: + label.configure(bg=c[1]) + #label.configure(text=c[1]) # don't work + label.setvar(label.cget('textvariable'), c[1]) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Cancel")), default=0, + separatorwidth = 0, + ) + return MfxDialog.initKw(self, kw) + + + + diff --git a/pysollib/tk/demooptionsdialog.py b/pysollib/tk/demooptionsdialog.py new file mode 100644 index 00000000..ba62f499 --- /dev/null +++ b/pysollib/tk/demooptionsdialog.py @@ -0,0 +1,112 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['DemoOptionsDialog'] + +# imports +import os, sys, Tkinter + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import _ToplevelDialog, MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class DemoOptionsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.demo_logo_var = Tkinter.BooleanVar() + self.demo_logo_var.set(app.opt.demo_logo != 0) + self.demo_score_var = Tkinter.BooleanVar() + self.demo_score_var.set(app.opt.demo_score != 0) + self.demo_sleep_var = Tkinter.DoubleVar() + self.demo_sleep_var.set(app.opt.demo_sleep) + widget = Tkinter.Checkbutton(top_frame, variable=self.demo_logo_var, + text=_("Display floating Demo logo")) + widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + widget = Tkinter.Checkbutton(top_frame, variable=self.demo_score_var, + text=_("Show score in statusbar")) + widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + widget = Tkinter.Scale(top_frame, from_=0.2, to=9.9, + resolution=0.1, orient=Tkinter.HORIZONTAL, + length="3i", label=_("Set demo delay in seconds"), + variable=self.demo_sleep_var, takefocus=0) + widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + # + self.demo_logo = self.demo_logo_var.get() + self.demo_score = self.demo_score_var.get() + self.demo_sleep = self.demo_sleep_var.get() + + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Cancel")), default=0, + separatorwidth = 0, + ) + return MfxDialog.initKw(self, kw) + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +def demooptionsdialog_main(args): + from tkutil import wm_withdraw + opt = Struct(demo_logo=1, demo_sleep=1.5) + app = Struct(opt=opt) + tk = Tkinter.Tk() + wm_withdraw(tk) + tk.update() + d = DemoOptionsDialog(tk, "Demo options", app) + print d.status, d.button, ":", d.demo_logo, d.demo_sleep + return 0 + +if __name__ == "__main__": + import sys + sys.exit(demooptionsdialog_main(sys.argv)) + diff --git a/pysollib/tk/edittextdialog.py b/pysollib/tk/edittextdialog.py new file mode 100644 index 00000000..47705c5b --- /dev/null +++ b/pysollib/tk/edittextdialog.py @@ -0,0 +1,129 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['DisplayTextDialog', 'EditTextDialog'] + +# imports +import os, sys, Tkinter + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import _ToplevelDialog, MfxDialog +from tkhtml import MfxScrolledText, MfxReadonlyScrolledText + +# /*********************************************************************** +# // +# ************************************************************************/ + +class DisplayTextDialog(MfxDialog): + Text_Class = MfxReadonlyScrolledText + + def __init__(self, parent, title, text, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + bg = top_frame["bg"] + self.text_w = self.Text_Class(top_frame, bd=1, relief="sunken", + wrap="word", width=64, height=16, + bg=bg) + self.text = "" + if text: + self.text = text + old_state = self.text_w["state"] + self.text_w.config(state="normal") + self.text_w.insert("insert", self.text) + self.text_w.config(state=old_state) + self.text_w.pack(side="top", fill="both", expand=1) + ###self.text_w.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + # + focus = self.createButtons(bottom_frame, kw) + #focus = self.text_w + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"),), default=0, + resizable = 1, + separatorwidth = 0, + ) + return MfxDialog.initKw(self, kw) + + +class EditTextDialog(DisplayTextDialog): + Text_Class = MfxScrolledText + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Cancel")), default=-1, + resizable = 1, + separatorwidth = 0, + ) + return MfxDialog.initKw(self, kw) + + def destroy(self): + self.text = self.text_w.get("1.0", "end") + DisplayTextDialog.destroy(self) + + def wmDeleteWindow(self, *event): # ignore + pass + + def mCancel(self, *event): # ignore + pass + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +def edittextdialog_main(args): + from tkutil import wm_withdraw + tk = Tkinter.Tk() + wm_withdraw(tk) + tk.update() + d = DisplayTextDialog(tk, "Comment for game #12345", text="Test") + d = EditTextDialog(tk, "Comment for game #12345", text="Test") + print d.text + return 0 + +if __name__ == "__main__": + import sys + sys.exit(edittextdialog_main(sys.argv)) + diff --git a/pysollib/tk/fontsdialog.py b/pysollib/tk/fontsdialog.py new file mode 100644 index 00000000..a5a10203 --- /dev/null +++ b/pysollib/tk/fontsdialog.py @@ -0,0 +1,211 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['FontsDialog'] + +# imports +import os, sys +import types +from Tkinter import * +import tkFont + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import _ToplevelDialog, MfxDialog +from tkutil import bind + +# /*********************************************************************** +# // +# ************************************************************************/ + +class FontChooserDialog(MfxDialog): + def __init__(self, parent, title, init_font, **kw): + ##print init_font + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + self.font_family = 'Helvetica' + self.font_size = 12 + self.font_weight = 'normal' + self.font_slant = 'roman' + + if not init_font is None: + assert 2 <= len(init_font) <= 4 + assert type(init_font[1]) is types.IntType + self.font_family, self.font_size = init_font[:2] + if len(init_font) > 2: + if init_font[2] in ['bold', 'normal']: + self.font_weight = init_font[2] + elif init_font[2] in ['italic', 'roman']: + self.font_slant = init_font[2] + else: + raise TypeError, 'invalid font style: '+ init_font[2] + if len(init_font) > 3: + if init_font[3] in ['bold', 'normal']: + self.font_weight = init_font[3] + elif init_font[2] in ['italic', 'roman']: + self.font_slant = init_font[3] + else: + raise TypeError, 'invalid font style: '+ init_font[3] + + #self.family_var = StringVar() + self.weight_var = BooleanVar() + self.slant_var = BooleanVar() + self.size_var = IntVar() + + frame = Frame(top_frame) + frame.pack(expand=YES, fill=BOTH, padx=5, pady=10) + frame.columnconfigure(0, weight=1) + #frame.rowconfigure(1, weight=1) + self.entry = Entry(frame, bg='white') + self.entry.grid(row=0, column=0, columnspan=2, sticky=W+E+N+S) + self.entry.insert(END, _('abcdefghABCDEFGH')) + self.list_box = Listbox(frame, width=36) + sb = Scrollbar(frame) + self.list_box.configure(yscrollcommand=sb.set) + sb.configure(command=self.list_box.yview) + self.list_box.grid(row=1, column=0, sticky=W+E+N+S) # rowspan=4 + sb.grid(row=1, column=1, sticky=N+S) + bind(self.list_box, '<>', self.fontupdate) + ##self.list_box.focus() + cb1 = Checkbutton(frame, anchor=W, text=_('Bold'), + command=self.fontupdate, variable=self.weight_var) + cb1.grid(row=2, column=0, columnspan=2, sticky=W+E) + cb2 = Checkbutton(frame, anchor=W, text=_('Italic'), + command=self.fontupdate, variable=self.slant_var) + cb2.grid(row=3, column=0, columnspan=2, sticky=W+E) + + sc = Scale(frame, from_=6, to=40, resolution=1, + #label='Size', + orient=HORIZONTAL, + command=self.fontupdate, variable=self.size_var) + sc.grid(row=4, column=0, columnspan=2, sticky=W+E+N+S) + # + self.size_var.set(self.font_size) + self.weight_var.set(self.font_weight == 'bold') + self.slant_var.set(self.font_slant == 'italic') + font_families = list(tkFont.families()) + font_families.sort() + selected = -1 + n = 0 + for font in font_families: + self.list_box.insert(END, font) + if font.lower() == self.font_family.lower(): + selected = n + n += 1 + if selected >= 0: + self.list_box.select_set(selected) + self.list_box.see(selected) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + self.font = (self.font_family, self.font_size, + self.font_slant, self.font_weight) + + def fontupdate(self, *args): + if self.list_box.curselection(): + self.font_family = self.list_box.get(self.list_box.curselection()) + self.font_weight = self.weight_var.get() and 'bold' or 'normal' + self.font_slant = self.slant_var.get() and 'italic' or 'roman' + self.font_size = self.size_var.get() + self.entry.configure(font=(self.font_family, self.font_size, + self.font_slant, self.font_weight)) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Cancel")), default=0, + separatorwidth=0, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + +# /*********************************************************************** +# // +# ************************************************************************/ + +class FontsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + frame = Frame(top_frame) + frame.pack(expand=YES, fill=BOTH, padx=5, pady=10) + frame.columnconfigure(0, weight=1) + + self.fonts = {} + row = 0 + for fn in (#"default", + "sans", + "small", + "fixed", + "canvas_default", + #"canvas_card", + "canvas_fixed", + "canvas_large", + "canvas_small", + #"tree_small", + ): + font = app.opt.fonts[fn] + self.fonts[fn] = font + title = fn.replace("_", " ").capitalize()+": " + Label(frame, text=title, anchor=W).grid(row=row, column=0, sticky=W+E) + if font: + title = " ".join([str(i) for i in font if not i in ('roman', 'normal')]) + elif font is None: + title = 'Default' + l = Label(frame, font=font, text=title) + l.grid(row=row, column=1) + b = Button(frame, text=_('Change...'), width=10, + command=lambda l=l, fn=fn: self.selectFont(l, fn)) + b.grid(row=row, column=2) + row += 1 + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + + def selectFont(self, label, fn): + d = FontChooserDialog(self.top, _("Select font"), self.fonts[fn]) + if d.status == 0 and d.button == 0: + self.fonts[fn] = d.font + title = " ".join([str(i) for i in d.font if not i in ('roman', 'normal')]) + label.configure(font=d.font, text=title) + + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Cancel")), default=0, + separatorwidth = 0, + ) + return MfxDialog.initKw(self, kw) + + + + diff --git a/pysollib/tk/gameinfodialog.py b/pysollib/tk/gameinfodialog.py new file mode 100644 index 00000000..46c5071d --- /dev/null +++ b/pysollib/tk/gameinfodialog.py @@ -0,0 +1,136 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + + +__all__ = ['GameInfoDialog'] + +# imports +import os, sys +from Tkinter import * + +# PySol imports +from pysollib.mfxutil import KwStruct +from pysollib.gamedb import GI + +# Toolkit imports +from tkwidget import _ToplevelDialog, MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class GameInfoDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + frame = Frame(top_frame) + frame.pack(expand=YES, fill=BOTH, padx=5, pady=10) + frame.columnconfigure(0, weight=1) + + game = app.game + gi = game.gameinfo + # + if gi.redeals == -2: redeals = 'VARIABLE' + elif gi.redeals == -1: redeals = 'UNLIMITED' + else: redeals = str(gi.redeals) + cat = '' + type = '' + flags = [] + for attr in dir(GI): + if attr.startswith('GC_'): + c = getattr(GI, attr) + if gi.category == c: + cat = attr + elif attr.startswith('GT_'): + t = getattr(GI, attr) + if t < (1<<12)-1: + if gi.si.game_type == t: + type = attr + else: + if gi.si.game_flags & t: + flags.append(attr) + # + row = 0 + for n, t in (('Name:', gi.name), + ('Short name:', gi.short_name), + ('ID:', gi.id), + ('Alt names:', '\n'.join(gi.altnames)), + ('Decks:', gi.decks), + ('Cards:', gi.ncards), + ('Redeals:', redeals), + ('Category:', cat), + ('Type:', type), + ('Flags:', '\n'.join(flags)), + ('Rules filename:', gi.rules_filename), + ('Module:', game.__module__), + ('Class:', game.__class__.__name__), + ('Hint:', game.Hint_Class.__name__), + ): + if t: + Label(frame, text=n, anchor=W).grid(row=row, column=0, sticky=N+W) + Label(frame, text=t, anchor=W, justify=LEFT).grid(row=row, column=1, sticky=N+W) + row += 1 + + if game.s.talon: + self.showStacks(frame, row, 'Talon:', game.s.talon) + row += 1 + if game.s.waste: + self.showStacks(frame, row, 'Waste:', game.s.waste) + row += 1 + for t, s in ( + ('Foundations:', game.s.foundations,), + ('Rows:', game.s.rows,), + ('Reserves:', game.s.reserves,), + ): + if s: + self.showStacks(frame, row, t, s) + row += 1 + + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + + def showStacks(self, frame, row, title, stacks): + Label(frame, text=title, anchor=W).grid(row=row, column=0, sticky=N+W) + if isinstance(stacks, (list, tuple)): + fs = {} + for f in stacks: + cn = f.__class__.__name__ + if fs.has_key(cn): + fs[cn] += 1 + else: + fs[cn] = 1 + t = '\n'.join(['%s (%d)' % (i[0], i[1]) for i in fs.items()]) + else: + t = stacks.__class__.__name__ + Label(frame, text=t, anchor=W, justify=LEFT).grid(row=row, column=1, sticky=N+W) + + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"),), default=0, + separatorwidth = 2, + ) + return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py new file mode 100644 index 00000000..c360daf1 --- /dev/null +++ b/pysollib/tk/menubar.py @@ -0,0 +1,1052 @@ +# -*- coding: koi8-r -*- +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PysolMenubar'] + +# imports +import math, os, re, sys, types +import Tkinter, tkColorChooser, tkFileDialog + +# PySol imports +from pysollib.mfxutil import destruct, Struct, kwdefault +from pysollib.util import CARDSET +from pysollib.version import VERSION +from pysollib.settings import PACKAGE +from pysollib.settings import TOP_TITLE +from pysollib.gamedb import GI +from pysollib.actions import PysolMenubarActions +from pysollib.pysolaudio import pysolsoundserver + +# toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS +from tkutil import bind, after_idle +from selectgame import SelectGameDialog, SelectGameDialogWithPreview +from selectcardset import SelectCardsetDialogWithPreview +from selectcardset import SelectCardsetByTypeDialogWithPreview +from selecttile import SelectTileDialogWithPreview + +#from toolbar import TOOLBAR_BUTTONS +from tkconst import TOOLBAR_BUTTONS + +gettext = _ +n_ = lambda x: x + + +# /*********************************************************************** +# // +# ************************************************************************/ + +def createToolbarMenu(menubar, menu): + data_dir = os.path.join(menubar.app.dataloader.dir, 'images', 'toolbar') + tearoff = menu.cget('tearoff') + submenu = MfxMenu(menu, label=n_('Style'), tearoff=tearoff) + for f in os.listdir(data_dir): + d = os.path.join(data_dir, f) + if os.path.isdir(d): + name = f.replace('_', ' ').capitalize() + submenu.add_radiobutton(label=name, + variable=menubar.tkopt.toolbar_style, + value=f, command=menubar.mOptToolbarStyle) + + submenu = MfxMenu(menu, label=n_('Relief'), tearoff=tearoff) + submenu.add_radiobutton(label=n_('Flat'), + variable=menubar.tkopt.toolbar_relief, + value=Tkinter.FLAT, + command=menubar.mOptToolbarRelief) + submenu.add_radiobutton(label=n_('Raised'), + variable=menubar.tkopt.toolbar_relief, + value=Tkinter.RAISED, + command=menubar.mOptToolbarRelief) + + submenu = MfxMenu(menu, label=n_('Compound'), tearoff=tearoff) + for comp, label in COMPOUNDS: + submenu.add_radiobutton(label=label, + variable=menubar.tkopt.toolbar_compound, + value=comp, command=menubar.mOptToolbarCompound) + menu.add_separator() + menu.add_radiobutton(label=n_("Hide"), + variable=menubar.tkopt.toolbar, value=0, + command=menubar.mOptToolbar) + menu.add_radiobutton(label=n_("Top"), + variable=menubar.tkopt.toolbar, value=1, + command=menubar.mOptToolbar) + menu.add_radiobutton(label=n_("Bottom"), + variable=menubar.tkopt.toolbar, value=2, + command=menubar.mOptToolbar) + menu.add_radiobutton(label=n_("Left"), + variable=menubar.tkopt.toolbar, value=3, + command=menubar.mOptToolbar) + menu.add_radiobutton(label=n_("Right"), + variable=menubar.tkopt.toolbar, value=4, + command=menubar.mOptToolbar) + menu.add_separator() + menu.add_radiobutton(label=n_("Small icons"), + variable=menubar.tkopt.toolbar_size, value=0, + command=menubar.mOptToolbarSize) + menu.add_radiobutton(label=n_("Large icons"), + variable=menubar.tkopt.toolbar_size, value=1, + command=menubar.mOptToolbarSize) + # + #return + menu.add_separator() + submenu = MfxMenu(menu, label=n_('Customize toolbar'), tearoff=tearoff) + for w in TOOLBAR_BUTTONS: + submenu.add_checkbutton(label=gettext(w.capitalize()), + variable=menubar.tkopt.toolbar_vars[w], + command=lambda m=menubar, w=w: m.mOptToolbarConfig(w)) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxMenubar(Tkinter.Menu): + addPath = None + + def __init__(self, master, **kw): + self.name = kw["name"] + tearoff = 0 + self.n = kw["tearoff"] = int(kw.get("tearoff", tearoff)) + apply(Tkinter.Menu.__init__, (self, master, ), kw) + + def labeltoname(self, label): + #print label, type(label) + name = re.sub(r"[^0-9a-zA-Z]", "", label).lower() + label = gettext(label) + underline = -1 + m = re.search(r"^(.*)\&([^\&].*)$", label) + if m: + l1, l2 = m.group(1), m.group(2) + l1 = re.sub(r"\&\&", "&", l1) + l2 = re.sub(r"\&\&", "&", l2) + label = l1 + l2 + underline = len(l1) + return name, label, underline + + def add(self, itemType, cnf={}): + label = cnf.get("label") + if label: + name = cnf.get('name') + try: + del cnf['name'] # TclError: unknown option "-name" + except KeyError: + pass + if not name: + name, label, underline = self.labeltoname(label) + cnf["underline"] = cnf.get("underline", underline) + cnf["label"] = label + if name and self.addPath: + path = str(self._w) + "." + name + self.addPath(path, self, self.n, cnf.get("menu")) + Tkinter.Menu.add(self, itemType, cnf) + self.n = self.n + 1 + + +class MfxMenu(MfxMenubar): + def __init__(self, master, label, underline=None, **kw): + if kw.has_key('name'): + name, label_underline = kw['name'], -1 + else: + name, label, label_underline = self.labeltoname(label) + kwdefault(kw, name=name) + apply(MfxMenubar.__init__, (self, master,), kw) + if underline is None: + underline = label_underline + if master: + master.add_cascade(menu=self, name=name, label=label, underline=underline) + + +# /*********************************************************************** +# // - create menubar +# // - update menubar +# // - menu actions +# ************************************************************************/ + +class PysolMenubar(PysolMenubarActions): + def __init__(self, app, top): + PysolMenubarActions.__init__(self, app, top) + # init columnbreak + self.__cb_max = int(self.top.winfo_screenheight()/22) +## sh = self.top.winfo_screenheight() +## self.__cb_max = 22 +## if sh >= 600: self.__cb_max = 27 +## if sh >= 768: self.__cb_max = 32 +## if sh >= 1024: self.__cb_max = 40 + # create menus + self.__menubar = None + self.__menupath = {} + self.__keybindings = {} + self._createMenubar() + # set the menubar + self.updateBackgroundImagesMenu() + self.top.config(menu=self.__menubar) + + # create a GTK-like path + def _addPath(self, path, menu, index, submenu): + if not self.__menupath.has_key(path): + ##print path, menu, index, submenu + self.__menupath[path] = (menu, index, submenu) + + def _getEnabledState(self, enabled): + if enabled: + return "normal" + return "disabled" + + + # + # create the menubar + # + + def _createMenubar(self): + MfxMenubar.addPath = self._addPath + kw = { "name": "menubar" } + if 1 and os.name == "posix": + pass + kw["relief"] = "groove" + kw["activeborderwidth"] = 1 + self.__menubar = apply(MfxMenubar, (self.top,), kw) + + # init keybindings + bind(self.top, "", self._keyPressHandler) + + m = "Ctrl-" + if os.name == "mac": m = "Cmd-" + + menu = MfxMenu(self.__menubar, n_("&File")) + menu.add_command(label=n_("&New game"), command=self.mNewGame, accelerator="N") + submenu = MfxMenu(menu, label=n_("R&ecent games")) + ##menu.add_command(label=n_("Select &random game"), command=self.mSelectRandomGame, accelerator=m+"R") + submenu = MfxMenu(menu, label=n_("Select &random game")) + submenu.add_command(label=n_("&All games"), command=lambda self=self: self.mSelectRandomGame('all'), accelerator=m+"R") + submenu.add_command(label=n_("Games played and &won"), command=lambda self=self: self.mSelectRandomGame('won')) + submenu.add_command(label=n_("Games played and ¬ won"), command=lambda self=self: self.mSelectRandomGame('not won')) + submenu.add_command(label=n_("Games not &played"), command=lambda self=self: self.mSelectRandomGame('not played')) + menu.add_command(label=n_("Select game by nu&mber..."), command=self.mSelectGameById, accelerator=m+"M") + menu.add_separator() + submenu = MfxMenu(menu, label=n_("Fa&vorite games")) + menu.add_command(label=n_("A&dd to favorites"), command=self.mAddFavor) + menu.add_command(label=n_("R&emove from favorites"), command=self.mDelFavor) + menu.add_separator() + menu.add_command(label=n_("&Open..."), command=self.mOpen, accelerator=m+"O") + menu.add_command(label=n_("&Save"), command=self.mSave, accelerator=m+"S") + menu.add_command(label=n_("Save &as..."), command=self.mSaveAs) + menu.add_separator() + menu.add_command(label=n_("&Hold and quit"), command=self.mHoldAndQuit) + menu.add_command(label=n_("&Quit"), command=self.mQuit, accelerator=m+"Q") + + menu = MfxMenu(self.__menubar, label=n_("&Select")) + self._addSelectGameMenu(menu) + + menu = MfxMenu(self.__menubar, label=n_("&Edit")) + menu.add_command(label=n_("&Undo"), command=self.mUndo, accelerator="Z") + menu.add_command(label=n_("&Redo"), command=self.mRedo, accelerator="R") + menu.add_command(label=n_("Redo &all"), command=self.mRedoAll) + + menu.add_separator() + submenu = MfxMenu(menu, label=n_("&Set bookmark")) + for i in range(9): + label = _("Bookmark %d") % (i + 1) + submenu.add_command(label=label, command=lambda self=self, i=i: self.mSetBookmark(i)) + submenu = MfxMenu(menu, label=n_("Go&to bookmark")) + for i in range(9): + label = _("Bookmark %d") % (i + 1) + acc = m + "%d" % (i + 1) + submenu.add_command(label=label, command=lambda self=self, i=i: self.mGotoBookmark(i), accelerator=acc) + menu.add_command(label=n_("&Clear bookmarks"), command=self.mClearBookmarks) + menu.add_separator() + + menu.add_command(label=n_("Restart &game"), command=self.mRestart, accelerator=m+"G") + + menu = MfxMenu(self.__menubar, label=n_("&Game")) + menu.add_command(label=n_("&Deal cards"), command=self.mDeal, accelerator="D") + menu.add_command(label=n_("&Auto drop"), command=self.mDrop, accelerator="A") + menu.add_checkbutton(label=n_("&Pause"), variable=self.tkopt.pause, command=self.mPause, accelerator="P") + #menu.add_command(label=n_("&Pause"), command=self.mPause, accelerator="P") + menu.add_separator() + menu.add_command(label=n_("S&tatus..."), command=self.mStatus, accelerator="T") + menu.add_checkbutton(label=n_("&Comments..."), variable=self.tkopt.comment, command=self.mEditGameComment) + menu.add_separator() + submenu = MfxMenu(menu, label=n_("&Statistics")) + submenu.add_command(label=n_("Current game..."), command=lambda self=self: self.mPlayerStats(mode=101)) + submenu.add_command(label=n_("All games..."), command=lambda self=self: self.mPlayerStats(mode=102)) + submenu.add_separator() + submenu.add_command(label=n_("Session log..."), command=lambda self=self: self.mPlayerStats(mode=104)) + submenu.add_command(label=n_("Full log..."), command=lambda self=self: self.mPlayerStats(mode=103)) + submenu.add_separator() + submenu.add_command(label=TOP_TITLE+"...", command=self.mTop10, accelerator=m+"T") + submenu = MfxMenu(menu, label=n_("D&emo statistics")) + submenu.add_command(label=n_("Current game..."), command=lambda self=self: self.mPlayerStats(mode=1101)) + submenu.add_command(label=n_("All games..."), command=lambda self=self: self.mPlayerStats(mode=1102)) + + menu = MfxMenu(self.__menubar, label=n_("&Assist")) + menu.add_command(label=n_("&Hint"), command=self.mHint, accelerator="H") + menu.add_command(label=n_("Highlight p&iles"), command=self.mHighlightPiles, accelerator="I") + menu.add_separator() + menu.add_command(label=n_("&Demo"), command=self.mDemo, accelerator=m+"D") + menu.add_command(label=n_("Demo (&all games)"), command=self.mMixedDemo) + menu = MfxMenu(self.__menubar, label=n_("&Options")) + menu.add_command(label=n_("&Player options..."), command=self.mOptPlayerOptions) + submenu = MfxMenu(menu, label=n_("&Automatic play")) + submenu.add_checkbutton(label=n_("Auto &face up"), variable=self.tkopt.autofaceup, command=self.mOptAutoFaceUp) + submenu.add_checkbutton(label=n_("&Auto drop"), variable=self.tkopt.autodrop, command=self.mOptAutoDrop) + submenu.add_checkbutton(label=n_("Auto &deal"), variable=self.tkopt.autodeal, command=self.mOptAutoDeal) + submenu.add_separator() + submenu.add_checkbutton(label=n_("&Quick play"), variable=self.tkopt.quickplay, command=self.mOptQuickPlay) + submenu = MfxMenu(menu, label=n_("Assist &level")) + submenu.add_checkbutton(label=n_("Enable &undo"), variable=self.tkopt.undo, command=self.mOptEnableUndo) + submenu.add_checkbutton(label=n_("Enable &bookmarks"), variable=self.tkopt.bookmarks, command=self.mOptEnableBookmarks) + submenu.add_checkbutton(label=n_("Enable &hint"), variable=self.tkopt.hint, command=self.mOptEnableHint) + submenu.add_checkbutton(label=n_("Enable highlight p&iles"), variable=self.tkopt.highlight_piles, command=self.mOptEnableHighlightPiles) + submenu.add_checkbutton(label=n_("Enable highlight &cards"), variable=self.tkopt.highlight_cards, command=self.mOptEnableHighlightCards) + submenu.add_checkbutton(label=n_("Enable highlight same &rank"), variable=self.tkopt.highlight_samerank, command=self.mOptEnableHighlightSameRank) + submenu.add_checkbutton(label=n_("Highlight &no matching"), variable=self.tkopt.highlight_not_matching, command=self.mOptEnableHighlightNotMatching) + submenu.add_separator() + submenu.add_checkbutton(label=n_("Show removed tiles (in Mahjongg games)"), variable=self.tkopt.mahjongg_show_removed, command=self.mOptMahjonggShowRemoved) + submenu.add_checkbutton(label=n_("Show hint arrow (in Shisen-Sho games)"), variable=self.tkopt.shisen_show_hint, command=self.mOptShisenShowHint) + menu.add_separator() + label = n_("&Sound") + if self.app.audio.audiodev is None: + menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSound, state=Tkinter.DISABLED) + elif pysolsoundserver: + menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSoundDialog) + else: + menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSound) + # cardsets + #manager = self.app.cardset_manager + #n = manager.len() + menu.add_command(label=n_("Cards&et..."), command=self.mSelectCardsetDialog, accelerator=m+"E") + menu.add_command(label=n_("Table t&ile..."), command=self.mSelectTileDialog) + # this submenu will get set by updateBackgroundImagesMenu() + submenu = MfxMenu(menu, label=n_("Card &background")) + submenu = MfxMenu(menu, label=n_("Card &view")) + submenu.add_checkbutton(label=n_("Card shado&w"), variable=self.tkopt.shadow, command=self.mOptShadow) + submenu.add_checkbutton(label=n_("Shade &legal moves"), variable=self.tkopt.shade, command=self.mOptShade) + submenu.add_checkbutton(label=n_("&Negative card bottom"), variable=self.tkopt.negative_bottom, command=self.mOptNegativeBottom) + submenu = MfxMenu(menu, label=n_("A&nimations")) + submenu.add_radiobutton(label=n_("&None"), variable=self.tkopt.animations, value=0, command=self.mOptAnimations) + submenu.add_radiobutton(label=n_("&Timer based"), variable=self.tkopt.animations, value=2, command=self.mOptAnimations) + submenu.add_radiobutton(label=n_("&Fast"), variable=self.tkopt.animations, value=1, command=self.mOptAnimations) + submenu.add_radiobutton(label=n_("&Slow"), variable=self.tkopt.animations, value=3, command=self.mOptAnimations) + submenu.add_radiobutton(label=n_("&Very slow"), variable=self.tkopt.animations, value=4, command=self.mOptAnimations) + menu.add_checkbutton(label=n_("Stick&y mouse"), variable=self.tkopt.sticky_mouse, command=self.mOptStickyMouse) + menu.add_separator() + #menu.add_command(label="&Hint options...", command=self.mOptHintOptions) + #menu.add_command(label="&Demo options...", command=self.mOptDemoOptions) + menu.add_command(label=n_("&Fonts..."), command=self.mOptFontsOptions) + menu.add_command(label=n_("&Colors..."), command=self.mOptColorsOptions) + menu.add_command(label=n_("Time&outs..."), command=self.mOptTimeoutsOptions) + menu.add_separator() + submenu = MfxMenu(menu, label=n_("&Toolbar")) + createToolbarMenu(self, submenu) + submenu = MfxMenu(menu, label=n_("Stat&usbar")) + submenu.add_checkbutton(label=n_("Show &statusbar"), variable=self.tkopt.statusbar, command=self.mOptStatusbar) + submenu.add_checkbutton(label=n_("Show &number of cards"), variable=self.tkopt.num_cards, command=self.mOptNumCards) + submenu.add_checkbutton(label=n_("Show &help bar"), variable=self.tkopt.helpbar, command=self.mOptHelpbar) + menu.add_checkbutton(label=n_("&Demo logo"), variable=self.tkopt.demo_logo, command=self.mOptDemoLogo) + menu.add_checkbutton(label=n_("Startup splash sc&reen"), variable=self.tkopt.splashscreen, command=self.mOptSplashscreen) +### menu.add_separator() +### menu.add_command(label="Save options", command=self.mOptSave) + + menu = MfxMenu(self.__menubar, label=n_("&Help")) + menu.add_command(label=n_("&Contents"), command=self.mHelp, accelerator=m+"F1") + menu.add_command(label=n_("&How to play"), command=self.mHelpHowToPlay) + menu.add_command(label=n_("&Rules for this game"), command=self.mHelpRules, accelerator="F1") + menu.add_command(label=n_("&License terms"), command=self.mHelpLicense) + ##menu.add_command(label=n_("What's &new ?"), command=self.mHelpNews) + menu.add_separator() + menu.add_command(label=n_("&About ")+PACKAGE+"...", command=self.mHelpAbout) + + MfxMenubar.addPath = None + + ### FIXME: all key bindings should be *added* to keyPressHandler + ctrl = "Control-" + self._bindKey("", "n", self.mNewGame) + self._bindKey("", "g", self.mSelectGameDialog) + self._bindKey("", "v", self.mSelectGameDialogWithPreview) + self._bindKey(ctrl, "r", lambda e, self=self: self.mSelectRandomGame()) + self._bindKey(ctrl, "m", self.mSelectGameById) + self._bindKey(ctrl, "n", self.mNewGameWithNextId) + self._bindKey(ctrl, "o", self.mOpen) + ##self._bindKey("", "F3", self.mOpen) # undocumented + self._bindKey(ctrl, "s", self.mSave) + ##self._bindKey("", "F2", self.mSaveAs) # undocumented + self._bindKey(ctrl, "q", self.mQuit) + self._bindKey("", "z", self.mUndo) + self._bindKey("", "BackSpace", self.mUndo) # undocumented + self._bindKey("", "r", self.mRedo) + self._bindKey(ctrl, "g", self.mRestart) + self._bindKey("", "space", self.mDeal) # undocumented + self._bindKey("", "t", self.mStatus) + self._bindKey(ctrl, "t", self.mTop10) + self._bindKey("", "h", self.mHint) + self._bindKey(ctrl, "h", self.mHint1) # undocumented + ##self._bindKey("", "Shift_L", self.mHighlightPiles) + ##self._bindKey("", "Shift_R", self.mHighlightPiles) + self._bindKey("", "i", self.mHighlightPiles) + self._bindKey(ctrl, "d", self.mDemo) + self._bindKey(ctrl, "e", self.mSelectCardsetDialog) + self._bindKey(ctrl, "b", self.mOptChangeCardback) # undocumented + self._bindKey(ctrl, "i", self.mOptChangeTableTile) # undocumented + self._bindKey(ctrl, "p", self.mOptPlayerOptions) # undocumented + self._bindKey(ctrl, "F1", self.mHelp) + self._bindKey("", "F1", self.mHelpRules) + self._bindKey("", "Print", self.mScreenshot) + self._bindKey(ctrl, "u", self.mPlayNextMusic) # undocumented + self._bindKey("", "p", self.mPause) + self._bindKey("", "Pause", self.mPause) + self._bindKey("", "Escape", self.mIconify) + # ASD and LKJ + self._bindKey("", "a", self.mDrop) + self._bindKey(ctrl, "a", self.mDrop1) + self._bindKey("", "s", self.mUndo) + self._bindKey("", "d", self.mDeal) + self._bindKey("", "l", self.mDrop) + self._bindKey(ctrl, "l", self.mDrop1) + self._bindKey("", "k", self.mUndo) + self._bindKey("", "j", self.mDeal) + # + self._bindKey("", "slash", self.mGameInfo) # undocumented, devel + + for i in range(9): + self._bindKey(ctrl, str(i+1), lambda event, self=self, i=i: self.mGotoBookmark(i, confirm=0)) + + # undocumented, devel + self._bindKey(ctrl, "End", self.mPlayNextMusic) + self._bindKey(ctrl, "Prior", self.mSelectPrevGameByName) + self._bindKey(ctrl, "Next", self.mSelectNextGameByName) + self._bindKey(ctrl, "Up", self.mSelectPrevGameById) + self._bindKey(ctrl, "Down", self.mSelectNextGameById) + + + # + # key binding utility + # + + def _bindKey(self, modifier, key, func): + if 0 and not modifier and len(key) == 1: + self.__keybindings[key.lower()] = func + self.__keybindings[key.upper()] = func + return + sequence = "<" + modifier + "KeyPress-" + key + ">" + try: + bind(self.top, sequence, func) + if len(key) == 1 and key != key.upper(): + key = key.upper() + sequence = "<" + modifier + "KeyPress-" + key + ">" + bind(self.top, sequence, func) + except: + raise + + + def _keyPressHandler(self, event): + r = EVENT_PROPAGATE + if event and self.game: + ##print event.__dict__ + if self.game.demo: + # stop the demo by setting self.game.demo.keypress + if event.char: # ignore Ctrl/Shift/etc. + self.game.demo.keypress = event.char + r = EVENT_HANDLED + func = self.__keybindings.get(event.char) + if func and (event.state & ~2) == 0: + func(event) + r = EVENT_HANDLED + return r + + # + # Select Game menu creation + # + + def _addSelectGameMenu(self, menu): + #games = map(self.app.gdb.get, self.app.gdb.getGamesIdSortedByShortName()) + games = map(self.app.gdb.get, self.app.gdb.getGamesIdSortedByName()) + ##games = tuple(games) + ###menu = MfxMenu(menu, label="Select &game") + menu.add_command(label=n_("All &games..."), command=self.mSelectGameDialog, accelerator="G") + menu.add_command(label=n_("Playable pre&view..."), command=self.mSelectGameDialogWithPreview, accelerator="V") + menu.add_separator() + data = (n_("&Popular games"), lambda gi: gi.si.game_flags & GI.GT_POPULAR) + self._addSelectGameSubMenu(menu, games, (data, ), + self.mSelectGamePopular, self.tkopt.gameid_popular) + submenu = MfxMenu(menu, label=n_("&French games")) + self._addSelectGameSubMenu(submenu, games, GI.SELECT_GAME_BY_TYPE, + self.mSelectGame, self.tkopt.gameid) + submenu = MfxMenu(menu, label=n_("&Mahjongg games")) + self._addSelectMahjonggGameSubMenu(submenu, + self.mSelectGame, self.tkopt.gameid) + submenu = MfxMenu(menu, label=n_("&Oriental games")) + self._addSelectGameSubMenu(submenu, games, + GI.SELECT_ORIENTAL_GAME_BY_TYPE, + self.mSelectGame, self.tkopt.gameid) + submenu = MfxMenu(menu, label=n_("&Special games")) + self._addSelectGameSubMenu(submenu, games, GI.SELECT_SPECIAL_GAME_BY_TYPE, + self.mSelectGame, self.tkopt.gameid) + menu.add_separator() + submenu = MfxMenu(menu, label=n_("All games by name")) + self._addSelectAllGameSubMenu(submenu, games, + self.mSelectGame, self.tkopt.gameid) + + + def _addSelectGameSubMenu(self, menu, games, select_data, command, variable): + ##print select_data + need_sep = 0 + for label, select_func in select_data: + if label is None: + need_sep = 1 + continue + g = filter(select_func, games) + if not g: + continue + if need_sep: + menu.add_separator() + need_sep = 0 + submenu = MfxMenu(menu, label=label) + self._addSelectGameSubSubMenu(submenu, g, command, variable) + + def _addSelectMahjonggGameSubMenu(self, menu, command, variable): +## games = [] +## g = [] +## c0 = c1 = None +## for i in self.app.gdb.getGamesIdSortedByShortName(): +## gi = self.app.gdb.get(i) +## if gi.si.game_type == GI.GT_MAHJONGG: +## c = gettext(gi.short_name).strip()[0] +## if c0 is None: +## c0 = c +## elif c != c0: +## if g: +## games.append((c0, g)) +## g = [] +## c0 = c +## #else: +## #if g: +## g.append(gi) +## if g: +## games.append((c0, g)) +## n = 0 +## gg = [] +## c0 = c1 = None +## for c, g in games: +## if c0 is None: +## c0 = c +## if len(gg) + len(g) > self.__cb_max: +## if gg: +## if c0 != c1: +## label = c0+' - '+c1 +## else: +## label = c1 +## c0 = c +## submenu = MfxMenu(menu, label=label, name=None) +## self._addSelectGameSubSubMenu(submenu, gg, command, +## variable, short_name=True) +## gg = [] +## c1 = c +## gg += g +## if gg: +## label = c0+' - '+c +## submenu = MfxMenu(menu, label=label, name=None) +## self._addSelectGameSubSubMenu(submenu, gg, command, +## variable, short_name=True) +## return + + + g = [] + c0 = c1 = None + for i in self.app.gdb.getGamesIdSortedByShortName(): + gi = self.app.gdb.get(i) + if gi.si.game_type == GI.GT_MAHJONGG: + c = gettext(gi.short_name).strip()[0] + if c0 is None: + c0 = c + if len(g) >= self.__cb_max and c != c1: + label = c0 + ' - ' + c1 + if c0 == c1: + label = c0 + submenu = MfxMenu(menu, label=label, name=None) + self._addSelectGameSubSubMenu(submenu, g, command, + variable, short_name=True) + g = [gi] + c0 = c + else: + g.append(gi) + c1 = c + if g: + label = c0 + ' - ' + c1 + submenu = MfxMenu(menu, label=label, name=None) + self._addSelectGameSubSubMenu(submenu, g, command, + variable, short_name=True) + + def _addSelectAllGameSubMenu(self, menu, g, command, variable): + n, d = 0, self.__cb_max + i = 0 + while True: + columnbreak = i > 0 and (i % d) == 0 + i += 1 + if not g[n:n+d]: + break + m = min(n+d-1, len(g)-1) + label = gettext(g[n].name)[:3]+' - '+gettext(g[m].name)[:3] + submenu = MfxMenu(menu, label=label, name=None) + self._addSelectGameSubSubMenu(submenu, g[n:n+d], command, variable) + n += d + if columnbreak: + menu.entryconfigure(i, columnbreak=columnbreak) + + def _addSelectGameSubSubMenu(self, menu, g, command, variable, short_name=False): + ##cb = (25, self.__cb_max) [ len(g) > 4 * 25 ] + ##cb = min(cb, self.__cb_max) + cb = self.__cb_max + for i in range(len(g)): + gi = g[i] + columnbreak = i > 0 and (i % cb) == 0 + if short_name: + label = gi.short_name + else: + label = gi.name + menu.add_radiobutton(command=command, variable=variable, + columnbreak=columnbreak, + value=gi.id, label=label, name=None) + + + # + # Select Game menu actions + # + + def _mSelectGameDialog(self, d): + if d.status == 0 and d.button == 0 and d.gameid != self.game.id: + self.tkopt.gameid.set(d.gameid) + self.tkopt.gameid_popular.set(d.gameid) + if 0: + self._mSelectGame(d.gameid, random=d.random) + else: + # don't ask areYouSure() + self._cancelDrag() + self.game.endGame() + self.game.quitGame(d.gameid, random=d.random) + return EVENT_HANDLED + + def __restoreCursor(self, *event): + self.game.setCursor(cursor=self.app.top_cursor) + + def mSelectGameDialog(self, *event): + if self._cancelDrag(break_pause=False): return + self.game.setCursor(cursor=CURSOR_WATCH) + after_idle(self.top, self.__restoreCursor) + d = SelectGameDialog(self.top, title=_("Select game"), + app=self.app, gameid=self.game.id) + return self._mSelectGameDialog(d) + + def mSelectGameDialogWithPreview(self, *event): + if self._cancelDrag(break_pause=False): return + self.game.setCursor(cursor=CURSOR_WATCH) + bookmark = None + if 0: + # use a bookmark for our preview game + if self.game.setBookmark(-2, confirm=0): + bookmark = self.game.gsaveinfo.bookmarks[-2][0] + del self.game.gsaveinfo.bookmarks[-2] + after_idle(self.top, self.__restoreCursor) + d = SelectGameDialogWithPreview(self.top, title=_("Select game"), + app=self.app, gameid=self.game.id, + bookmark=bookmark) + return self._mSelectGameDialog(d) + + + # + # menubar overrides + # + + def updateFavoriteGamesMenu(self): + gameids = self.app.opt.favorite_gameid + # delete all entries + submenu = self.__menupath[".menubar.file.favoritegames"][2] + submenu.delete(0, "last") + # insert games + for id in gameids: + gi = self.app.getGameInfo(id) + if not gi: + continue + submenu.add_radiobutton(command=self.mSelectGame, + variable=self.tkopt.gameid, + value=gi.id, label=gi.name) + + state = self._getEnabledState + in_favor = self.app.game.id in gameids + menu, index, submenu = self.__menupath[".menubar.file.addtofavorites"] + menu.entryconfig(index, state=state(not in_favor)) + menu, index, submenu = self.__menupath[".menubar.file.removefromfavorites"] + menu.entryconfig(index, state=state(in_favor)) + + + def updateRecentGamesMenu(self, gameids): + # delete all entries + submenu = self.__menupath[".menubar.file.recentgames"][2] + submenu.delete(0, "last") + # insert games + cb = (25, self.__cb_max) [ len(gameids) > 4 * 25 ] + i = 0 + for id in gameids: + gi = self.app.getGameInfo(id) + if not gi: + continue + columnbreak = i > 0 and (i % cb) == 0 + submenu.add_radiobutton(command=self.mSelectGame, + variable=self.tkopt.gameid, + columnbreak=columnbreak, + value=gi.id, label=gi.name) + i = i + 1 + + def updateBookmarkMenuState(self): + state = self._getEnabledState + mp1 = self.__menupath.get(".menubar.edit.setbookmark") + mp2 = self.__menupath.get(".menubar.edit.gotobookmark") + mp3 = self.__menupath.get(".menubar.edit.clearbookmarks") + if mp1 is None or mp2 is None or mp3 is None: + return + x = self.app.opt.bookmarks and self.game.canSetBookmark() + # + menu, index, submenu = mp1 + for i in range(9): + submenu.entryconfig(i, state=state(x)) + menu.entryconfig(index, state=state(x)) + # + menu, index, submenu = mp2 + ms = 0 + for i in range(9): + s = self.game.gsaveinfo.bookmarks.get(i) is not None + submenu.entryconfig(i, state=state(s and x)) + ms = ms or s + menu.entryconfig(index, state=state(ms and x)) + # + menu, index, submenu = mp3 + menu.entryconfig(index, state=state(ms and x)) + + def updateBackgroundImagesMenu(self): + mp = self.__menupath.get(".menubar.options.cardbackground") + # delete all entries + submenu = mp[2] + submenu.delete(0, "last") + # insert new cardbacks + mbacks = self.app.images.getCardbacks() + cb = int(math.ceil(math.sqrt(len(mbacks)))) + for i in range(len(mbacks)): + columnbreak = i > 0 and (i % cb) == 0 + submenu.add_radiobutton(label=mbacks[i].name, image=mbacks[i].menu_image, variable=self.tkopt.cardback, value=i, + command=self.mOptCardback, columnbreak=columnbreak, indicatoron=0, hidemargin=0) + + + # + # menu updates + # + + def setMenuState(self, state, path): + #print state, path + path = ".menubar." + path + mp = self.__menupath.get(path) + menu, index, submenu = mp + s = self._getEnabledState(state) + menu.entryconfig(index, state=s) + + def setToolbarState(self, state, path): + #print state, path + s = self._getEnabledState(state) + w = getattr(self.app.toolbar, path + "_button") + w["state"] = s + + + # + # menu actions + # + + DEFAULTEXTENSION = ".pso" + FILETYPES = ((PACKAGE+" files", "*"+DEFAULTEXTENSION), ("All files", "*")) + + def mAddFavor(self, *event): + gameid = self.app.game.id + if gameid not in self.app.opt.favorite_gameid: + self.app.opt.favorite_gameid.append(gameid) + self.updateFavoriteGamesMenu() + + def mDelFavor(self, *event): + gameid = self.app.game.id + if gameid in self.app.opt.favorite_gameid: + self.app.opt.favorite_gameid.remove(gameid) + self.updateFavoriteGamesMenu() + + def mOpen(self, *event): + if self._cancelDrag(break_pause=False): return + filename = self.game.filename + if filename: + idir, ifile = os.path.split(os.path.normpath(filename)) + else: + idir, ifile = "", "" + if not idir: + idir = self.app.dn.savegames + d = tkFileDialog.Open() + filename = d.show(filetypes=self.FILETYPES, defaultextension=self.DEFAULTEXTENSION, + initialdir=idir, initialfile=ifile) + if filename: + filename = os.path.normpath(filename) + ##filename = os.path.normcase(filename) + if os.path.isfile(filename): + self.game.loadGame(filename) + + def mSaveAs(self, *event): + if self._cancelDrag(break_pause=False): return + if not self.menustate.save_as: + return + filename = self.game.filename + if not filename: + filename = self.app.getGameSaveName(self.game.id) + if os.name == "posix": + filename = filename + "-" + self.game.getGameNumber(format=0) + else: + filename = filename + "-01" + filename = filename + self.DEFAULTEXTENSION + idir, ifile = os.path.split(os.path.normpath(filename)) + if not idir: + idir = self.app.dn.savegames + ##print self.game.filename, ifile + d = tkFileDialog.SaveAs() + filename = d.show(filetypes=self.FILETYPES, defaultextension=self.DEFAULTEXTENSION, + initialdir=idir, initialfile=ifile) + if filename: + filename = os.path.normpath(filename) + ##filename = os.path.normcase(filename) + self.game.saveGame(filename) + self.updateMenus() + + def mSelectCardsetDialog(self, *event): + if self._cancelDrag(break_pause=False): return + ##strings, default = ("OK", "Load", "Cancel"), 0 + strings, default = (None, _("Load"), _("Cancel"),), 1 + ##if os.name == "posix": + strings, default = (None, _("Load"), _("Cancel"), _("Info..."),), 1 + t = CARDSET + key = self.app.nextgame.cardset.index + d = SelectCardsetDialogWithPreview(self.top, title=_("Select ")+t, + app=self.app, manager=self.app.cardset_manager, key=key, + strings=strings, default=default) + cs = self.app.cardset_manager.get(d.key) + if cs is None or d.key == self.app.cardset.index: + return + if d.status == 0 and d.button in (0, 1) and d.key >= 0: + self.app.nextgame.cardset = cs + if d.button == 1: + self._cancelDrag() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def _mOptCardback(self, index): + if self._cancelDrag(break_pause=False): return + cs = self.app.cardset + old_index = cs.backindex + cs.updateCardback(backindex=index) + if cs.backindex == old_index: + return + self.app.updateCardset(self.game.id) + for card in self.game.cards: + image = self.app.images.getBack(card.deck, card.suit, card.rank) + card.updateCardBackground(image=image) + self.app.canvas.update_idletasks() + self.tkopt.cardback.set(cs.backindex) + + def mOptCardback(self, *event): + self._mOptCardback(self.tkopt.cardback.get()) + + def mOptChangeCardback(self, *event): + self._mOptCardback(self.app.cardset.backindex + 1) + + def _mOptTableTile(self, i): + if self.app.setTile(i): + self.tkopt.tabletile.set(i) + + def _mOptTableColor(self, color): + tile = self.app.tabletile_manager.get(0) + tile.color = color + if self.app.setTile(0): + self.tkopt.tabletile.set(0) + + def mOptTableTile(self, *event): + if self._cancelDrag(break_pause=False): return + self._mOptTableTile(self.tkopt.tabletile.get()) + + def mOptChangeTableTile(self, *event): + if self._cancelDrag(break_pause=False): return + n = self.app.tabletile_manager.len() + if n >= 2: + i = (self.tkopt.tabletile.get() + 1) % n + self._mOptTableTile(i) + + def mSelectTileDialog(self, *event): + if self._cancelDrag(break_pause=False): return + key = self.app.tabletile_index + if key <= 0: + key = self.app.opt.table_color.lower() + d = SelectTileDialogWithPreview(self.top, app=self.app, + title=_("Select table background"), + manager=self.app.tabletile_manager, + key=key) + if d.status == 0 and d.button in (0, 1): + if type(d.key) is types.StringType: + self._mOptTableColor(d.key) + elif d.key > 0 and d.key != self.app.tabletile_index: + self._mOptTableTile(d.key) + + def mOptTableColor(self, *event): + if self._cancelDrag(break_pause=False): return + c = tkColorChooser.askcolor(initialcolor=self.app.opt.table_color, + title=_("Select table color")) + if c and c[1]: + self._mOptTableColor(c[1]) + + def mOptToolbar(self, *event): + ##if self._cancelDrag(break_pause=False): return + self.setToolbarSide(self.tkopt.toolbar.get()) + + def mOptToolbarStyle(self, *event): + ##if self._cancelDrag(break_pause=False): return + self.setToolbarStyle(self.tkopt.toolbar_style.get()) + + def mOptToolbarCompound(self, *event): + ##if self._cancelDrag(break_pause=False): return + self.setToolbarCompound(self.tkopt.toolbar_compound.get()) + + def mOptToolbarSize(self, *event): + ##if self._cancelDrag(break_pause=False): return + self.setToolbarSize(self.tkopt.toolbar_size.get()) + + def mOptToolbarRelief(self, *event): + ##if self._cancelDrag(break_pause=False): return + self.setToolbarRelief(self.tkopt.toolbar_relief.get()) + + def mOptToolbarConfig(self, w): + self.toolbarConfig(w, self.tkopt.toolbar_vars[w].get()) + + def mOptStatusbar(self, *event): + if self._cancelDrag(break_pause=False): return + if not self.app.statusbar: return + side = self.tkopt.statusbar.get() + self.app.opt.statusbar = side + if self.app.statusbar.show(side): + self.top.update_idletasks() + + def mOptNumCards(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.num_cards = self.tkopt.num_cards.get() + + def mOptHelpbar(self, *event): + if self._cancelDrag(break_pause=False): return + if not self.app.helpbar: return + show = self.tkopt.helpbar.get() + self.app.opt.helpbar = show + if self.app.helpbar.show(show): + self.top.update_idletasks() + + def mOptDemoLogo(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.demo_logo = self.tkopt.demo_logo.get() + + def mOptSplashscreen(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.splashscreen = self.tkopt.splashscreen.get() + + def mOptStickyMouse(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.sticky_mouse = self.tkopt.sticky_mouse.get() + + def mOptNegativeBottom(self, *event): + if self._cancelDrag(): return + n = self.tkopt.negative_bottom.get() + self.app.opt.negative_bottom = n + self.app.updateCardset() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + + # + # toolbar support + # + + def setToolbarSide(self, side): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar = side + self.tkopt.toolbar.set(side) # update radiobutton + if self.app.toolbar.show(side): + self.top.update_idletasks() + + def setToolbarSize(self, size): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_size = size + self.tkopt.toolbar_size.set(size) # update radiobutton + dir = self.app.getToolbarImagesDir() + if self.app.toolbar.updateImages(dir, size): + self.game.updateStatus(player=self.app.opt.player) + self.top.update_idletasks() + + def setToolbarStyle(self, style): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_style = style + self.tkopt.toolbar_style.set(style) # update radiobutton + dir = self.app.getToolbarImagesDir() + size = self.app.opt.toolbar_size + if self.app.toolbar.updateImages(dir, size): + ##self.game.updateStatus(player=self.app.opt.player) + self.top.update_idletasks() + + def setToolbarCompound(self, compound): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_compound = compound + self.tkopt.toolbar_compound.set(compound) # update radiobutton + if self.app.toolbar.setCompound(compound): + self.game.updateStatus(player=self.app.opt.player) + self.top.update_idletasks() + + def setToolbarRelief(self, relief): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_relief = relief + self.tkopt.toolbar_relief.set(relief) # update radiobutton + self.app.toolbar.setRelief(relief) + self.top.update_idletasks() + + def toolbarConfig(self, w, v): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_vars[w] = v + self.app.toolbar.config(w, v) + self.top.update_idletasks() + + + diff --git a/pysollib/tk/playeroptionsdialog.py b/pysollib/tk/playeroptionsdialog.py new file mode 100644 index 00000000..3cd0892e --- /dev/null +++ b/pysollib/tk/playeroptionsdialog.py @@ -0,0 +1,188 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PlayerOptionsDialog'] + +# imports +import os, sys, Tkinter + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import _ToplevelDialog, MfxDialog +from tkutil import bind + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class SelectUserNameDialog(MfxDialog): + def __init__(self, parent, title, usernames=[], **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, + kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + listbox = Tkinter.Listbox(top_frame) + listbox.pack(side='left', fill='both', expand=1) + scrollbar = Tkinter.Scrollbar(top_frame) + scrollbar.pack(side='right', fill='y') + listbox.configure(yscrollcommand=scrollbar.set) + scrollbar.configure(command=listbox.yview) + + self.username = None + self.listbox = listbox + bind(listbox, '<>', self.updateUserName) + # + for un in usernames: + listbox.insert('end', un) + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + #if listbox.curselection(): + # self.username = listbox.get(listbox.curselection()) + + def updateUserName(self, *args): + self.username = self.listbox.get(self.listbox.curselection()) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Cancel")), default=0, + separatorwidth=0, + resizable=0, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + + +class PlayerOptionsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + self.app = app + # + self.update_stats_var = Tkinter.BooleanVar() + self.update_stats_var.set(app.opt.update_player_stats != 0) + self.confirm_var = Tkinter.BooleanVar() + self.confirm_var.set(app.opt.confirm != 0) + self.win_animation_var = Tkinter.BooleanVar() + self.win_animation_var.set(app.opt.win_animation != 0) + # + frame = Tkinter.Frame(top_frame) + frame.pack(expand=1, fill='both', padx=5, pady=10) + widget = Tkinter.Label(frame, text=_("\nPlease enter your name"), + #justify='left', anchor='w', + takefocus=0) + widget.grid(row=0, column=0, columnspan=2, sticky='ew', padx=0, pady=5) + w = kw.get("e_width", 30) # width in characters + self.player_var = Tkinter.Entry(frame, exportselection=1, width=w) + self.player_var.insert(0, app.opt.player) + self.player_var.grid(row=1, column=0, sticky='ew', padx=0, pady=5) + widget = Tkinter.Button(frame, text=_('Select...'), + command=self.selectUserName) + widget.grid(row=1, column=1, padx=5, pady=5) + widget = Tkinter.Checkbutton(frame, variable=self.confirm_var, + anchor='w', text=_("Confirm quit")) + widget.grid(row=2, column=0, columnspan=2, sticky='ew', padx=0, pady=5) + widget = Tkinter.Checkbutton(frame, variable=self.update_stats_var, + anchor='w', + text=_("Update statistics and logs")) + widget.grid(row=3, column=0, columnspan=2, sticky='ew', padx=0, pady=5) +### widget = Tkinter.Checkbutton(frame, variable=self.win_animation_var, +### text="Win animation") +### widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + frame.columnconfigure(0, weight=1) + # + self.player = self.player_var.get() + self.confirm = self.confirm_var.get() + self.update_stats = self.update_stats_var.get() + self.win_animation = self.win_animation_var.get() + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + def selectUserName(self, *args): + names = self.app.getAllUserNames() + d = SelectUserNameDialog(self.top, _("Select name"), names) + if d.status == 0 and d.button == 0 and d.username: + self.player_var.delete(0, 'end') + self.player_var.insert(0, d.username) + + def mDone(self, button): + self.button = button + self.player = self.player_var.get() + self.confirm = self.confirm_var.get() + self.update_stats = self.update_stats_var.get() + self.win_animation = self.win_animation_var.get() + raise SystemExit + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Cancel")), default=0, + separatorwidth=2, + resizable=0, + padx=10, pady=10, + ) + return MfxDialog.initKw(self, kw) + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +def playeroptionsdialog_main(args): + from tkutil import wm_withdraw + opt = Struct(player="Test", update_player_stats=1) + app = Struct(opt=opt) + tk = Tkinter.Tk() + wm_withdraw(tk) + tk.update() + d = PlayerOptionsDialog(tk, "Player options", app) + print d.status, d.button, ":", d.player, d.update_stats + return 0 + +if __name__ == "__main__": + import sys + sys.exit(playeroptionsdialog_main(sys.argv)) + diff --git a/pysollib/tk/progressbar.py b/pysollib/tk/progressbar.py new file mode 100644 index 00000000..fc8df506 --- /dev/null +++ b/pysollib/tk/progressbar.py @@ -0,0 +1,157 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PysolProgressBar'] + +# imports +import os, sys, Tkinter + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkutil import makeToplevel, setTransient, wm_set_icon + + +# /*********************************************************************** +# // a simple progress bar +# ************************************************************************/ + +class PysolProgressBar: + def __init__(self, app, parent, title=None, images=None, + color="blue", width=300, height=25, show_text=1): + self.parent = parent + self.percent = 0 + self.top = makeToplevel(parent, title=title) + self.top.wm_protocol("WM_DELETE_WINDOW", self.wmDeleteWindow) + self.top.wm_group(parent) + self.top.wm_resizable(0, 0) + self.frame = Tkinter.Frame(self.top, relief=Tkinter.FLAT, bd=0, + takefocus=0) + self.cframe = Tkinter.Frame(self.frame, relief=Tkinter.SUNKEN, bd=1, + takefocus=0) + self.canvas = Tkinter.Canvas(self.cframe, width=width, height=height, + takefocus=0, bd=0, highlightthickness=0) + self.scale = self.canvas.create_rectangle(-10, -10, 0, height, + outline=color, fill=color) + self.text = -1 + if show_text: + self.text = self.canvas.create_text(0, 0, anchor=Tkinter.CENTER) + self.cframe.grid_configure(column=0, row=0, sticky="ew") + if images: + self.f1 = Tkinter.Label(self.frame, image=images[0]) + self.f1.grid_configure(column=0, row=0, sticky="ew", ipadx=8, ipady=4) + self.cframe.grid_configure(column=1, row=0, sticky="ew", padx=8) + self.f2 = Tkinter.Label(self.frame, image=images[1]) + self.f2.grid_configure(column=2, row=0, sticky="ew", ipadx=8, ipady=4) + self.top.config(cursor="watch") + if app: + try: + wm_set_icon(self.top, app.dataloader.findIcon()) + except: pass + self.pack() + if 1: + setTransient(self.top, None, relx=0.5, rely=0.5) + else: + self.update(percent=0) + + def wmDeleteWindow(self): + return EVENT_HANDLED + + def destroy(self): + if self.top is None: # already destroyed + return + self.top.wm_withdraw() + self.top.quit() + self.top.destroy() + self.top = None + + def pack(self, **kw): + self.canvas.pack(fill=Tkinter.X, expand=0) + apply(self.frame.pack, (), kw) + + def reset(self, percent=0): + self.percent = percent + + def update(self, percent=None, step=1): + if self.top is None: # already destroyed + return + if percent is None: + self.percent = self.percent + step + elif percent > self.percent: + self.percent = percent + else: + return + self.percent = min(100, max(0, self.percent)) + c = self.canvas + width, height = c.winfo_reqwidth(), c.winfo_reqheight() + c.coords(self.scale, -10, -10, + (self.percent * width ) / 100.0, height) + if self.text >= 0: + c.coords(self.text, width/2, height/2) + c.itemconfig(self.text, text="%d %%" % int(round(self.percent))) + c.update() + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +class TestProgressBar: + def __init__(self, parent): + self.parent = parent + self.progress = PysolProgressBar(None, parent, title="Progress", color="#008200") + self.progress.pack(ipadx=10, ipady=10) + self.progress.frame.after(1000, self.update) + + def update(self, event=None): + if self.progress.percent >= 100: + self.parent.after_idle(self.progress.destroy) + return + self.progress.update(step=1) + self.progress.frame.after(30, self.update) + +def progressbar_main(args): + from tkutil import wm_withdraw + tk = Tkinter.Tk() + wm_withdraw(tk) + pb = TestProgressBar(tk) + tk.mainloop() + return 0 + +if __name__ == "__main__": + import sys + sys.exit(progressbar_main(sys.argv)) + + diff --git a/pysollib/tk/selectcardset.py b/pysollib/tk/selectcardset.py new file mode 100644 index 00000000..7c9b4d0a --- /dev/null +++ b/pysollib/tk/selectcardset.py @@ -0,0 +1,404 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['SelectCardsetByTypeDialogWithPreview'] + +# imports +import os, re, sys, types, Tkinter + +# PySol imports +from pysollib.mfxutil import destruct, Struct, KwStruct +from pysollib.util import CARDSET +from pysollib.resource import CSI + +# Toolkit imports +from tkutil import loadImage +from tkwidget import _ToplevelDialog, MfxDialog, MfxScrolledCanvas +from tkcanvas import MfxCanvasImage +from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode +from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas + + +# /*********************************************************************** +# // Nodes +# ************************************************************************/ + +class SelectCardsetLeaf(SelectDialogTreeLeaf): + pass + + +class SelectCardsetNode(SelectDialogTreeNode): + def _getContents(self): + contents = [] + for obj in self.tree.data.all_objects: + if self.select_func(obj): + node = SelectCardsetLeaf(self.tree, self, text=obj.name, key=obj.index) + contents.append(node) + return contents or self.tree.data.no_contents + + +# /*********************************************************************** +# // Tree database +# ************************************************************************/ + +class SelectCardsetData(SelectDialogTreeData): + def __init__(self, manager, key): + SelectDialogTreeData.__init__(self) + self.all_objects = manager.getAllSortedByName() + self.all_objects = filter(lambda obj: not obj.error, self.all_objects) + self.no_contents = [ SelectCardsetLeaf(None, None, _("(no cardsets)"), key=None), ] + # + select_by_type = None + items = CSI.TYPE.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + nodes = [] + for key, name in items: + if manager.registered_types.get(key): + nodes.append(SelectCardsetNode(None, name, lambda cs, key=key: key == cs.si.type)) + if nodes: + select_by_type = SelectCardsetNode(None, _("by Type"), tuple(nodes), expanded=1) + # + select_by_style = None + items = CSI.STYLE.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + nodes = [] + for key, name in items: + if manager.registered_styles.get(key): + nodes.append(SelectCardsetNode(None, name, lambda cs, key=key: key in cs.si.styles)) + if nodes: + nodes.append(SelectCardsetNode(None, _("Uncategorized"), lambda cs: not cs.si.styles)) + select_by_style = SelectCardsetNode(None, _("by Style"), tuple(nodes)) + # + select_by_nationality = None + items = CSI.NATIONALITY.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + nodes = [] + for key, name in items: + if manager.registered_nationalities.get(key): + nodes.append(SelectCardsetNode(None, name, lambda cs, key=key: key in cs.si.nationalities)) + if nodes: + nodes.append(SelectCardsetNode(None, _("Uncategorized"), lambda cs: not cs.si.nationalities)) + select_by_nationality = SelectCardsetNode(None, _("by Nationality"), tuple(nodes)) + # + select_by_date = None + items = CSI.DATE.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + nodes = [] + for key, name in items: + if manager.registered_dates.get(key): + nodes.append(SelectCardsetNode(None, name, lambda cs, key=key: key in cs.si.dates)) + if nodes: + nodes.append(SelectCardsetNode(None, _("Uncategorized"), lambda cs: not cs.si.dates)) + select_by_date = SelectCardsetNode(None, _("by Date"), tuple(nodes)) + # + self.rootnodes = filter(None, ( + SelectCardsetNode(None, _("All Cardsets"), lambda cs: 1, expanded=len(self.all_objects)<=12), + SelectCardsetNode(None, _("by Size"), ( + SelectCardsetNode(None, _("Tiny cardsets"), lambda cs: cs.si.size == CSI.SIZE_TINY), + SelectCardsetNode(None, _("Small cardsets"), lambda cs: cs.si.size == CSI.SIZE_SMALL), + SelectCardsetNode(None, _("Medium cardsets"), lambda cs: cs.si.size == CSI.SIZE_MEDIUM), + SelectCardsetNode(None, _("Large cardsets"), lambda cs: cs.si.size == CSI.SIZE_LARGE), + SelectCardsetNode(None, _("XLarge cardsets"), lambda cs: cs.si.size == CSI.SIZE_XLARGE), + ), expanded=1), + select_by_type, + select_by_style, + select_by_date, + select_by_nationality, + )) + + +class SelectCardsetByTypeData(SelectDialogTreeData): + def __init__(self, manager, key): + SelectDialogTreeData.__init__(self) + self.all_objects = manager.getAllSortedByName() + self.no_contents = [ SelectCardsetLeaf(None, None, _("(no cardsets)"), key=None), ] + # + items = CSI.TYPE.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + nodes = [] + for key, name in items: + if manager.registered_types.get(key): + nodes.append(SelectCardsetNode(None, name, lambda cs, key=key: key == cs.si.type)) + select_by_type = SelectCardsetNode(None, _("by Type"), tuple(nodes), expanded=1) + # + self.rootnodes = filter(None, ( + select_by_type, + )) + + +# /*********************************************************************** +# // Canvas that shows the tree +# ************************************************************************/ + +class SelectCardsetTree(SelectDialogTreeCanvas): + data = None + + +class SelectCardsetByTypeTree(SelectDialogTreeCanvas): + data = None + + +# /*********************************************************************** +# // Dialog +# ************************************************************************/ + +class SelectCardsetDialogWithPreview(MfxDialog): + Tree_Class = SelectCardsetTree + TreeDataHolder_Class = SelectCardsetTree + TreeData_Class = SelectCardsetData + + def __init__(self, parent, title, app, manager, key=None, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + if key is None: + key = manager.getSelected() + self.manager = manager + self.key = key + #padx, pady = kw.padx, kw.pady + padx, pady = 5, 5 + if self.TreeDataHolder_Class.data is None: + self.TreeDataHolder_Class.data = self.TreeData_Class(manager, key) + # + self.top.wm_minsize(400, 200) + if self.top.winfo_screenwidth() >= 800: + w1, w2 = 216, 400 + else: + w1, w2 = 200, 300 + if Tkinter.TkVersion >= 8.4: + paned_window = Tkinter.PanedWindow(top_frame) + paned_window.pack(expand=1, fill='both') + left_frame = Tkinter.Frame(paned_window) + right_frame = Tkinter.Frame(paned_window) + paned_window.add(left_frame) + paned_window.add(right_frame) + else: + left_frame = Tkinter.Frame(top_frame) + right_frame = Tkinter.Frame(top_frame) + left_frame.pack(side='left', expand=0, fill='both') + right_frame.pack(side='right', expand=1, fill='both') + font = app.getFont("default") + self.tree = self.Tree_Class(self, left_frame, key=key, + default=kw.default, + font=font, width=w1) + self.tree.frame.pack(fill='both', expand=1, padx=padx, pady=pady) + self.preview = MfxScrolledCanvas(right_frame, width=w2) + self.preview.setTile(app, app.tabletile_index, force=True) + self.preview.pack(fill='both', expand=1, padx=padx, pady=pady) + # create a preview of the current state + self.preview_key = -1 + self.preview_images = [] + self.updatePreview(key) + # + focus = self.createButtons(bottom_frame, kw) + focus = self.tree.frame + self.mainloop(focus, kw.timeout) + + def destroy(self): + self.tree.updateNodesWithTree(self.tree.rootnodes, None) + self.tree.destroy() + self.preview.unbind_all() + self.preview_images = [] + MfxDialog.destroy(self) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Load"), _("Cancel"),), default=0, + separatorwidth=2, resizable=1, + font=None, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + def mDone(self, button): + if button in (0, 1): # Ok/Load + self.key = self.tree.selection_key + self.tree.n_expansions = 1 # save xyview in any case + if button in (3, 4): + cs = self.manager.get(self.tree.selection_key) + if not cs: + return + ##title = CARDSET+" "+cs.name + title = CARDSET.capitalize()+" "+cs.name + CardsetInfoDialog(self.top, title=title, cardset=cs, images=self.preview_images) + return + MfxDialog.mDone(self, button) + + def updatePreview(self, key): + if key == self.preview_key: + return + canvas = self.preview.canvas + canvas.deleteAllItems() + self.preview_images = [] + cs = self.manager.get(key) + if not cs: + self.preview_key = -1 + return + names, columns = cs.getPreviewCardNames() + try: + #???names, columns = cs.getPreviewCardNames() + for n in names: + f = os.path.join(cs.dir, n + cs.ext) + self.preview_images.append(loadImage(file=f)) + except: + self.preview_key = -1 + self.preview_images = [] + return + i, x, y, sx, sy, dx, dy = 0, 10, 10, 0, 0, cs.CARDW + 10, cs.CARDH + 10 + for image in self.preview_images: + MfxCanvasImage(canvas, x, y, anchor="nw", image=image) + sx, sy = max(x, sx), max(y, sy) + i = i + 1 + if i % columns == 0: + x, y = 10, y + dy + else: + x = x + dx + canvas.config(scrollregion=(0, 0, sx+dx, sy+dy)) + canvas.config(width=sx+dx, height=sy+dy) + #canvas.config(xscrollincrement=dx, yscrollincrement=dy) +## self.preview.showHbar() +## self.preview.showVbar() + self.preview_key = key + + +class SelectCardsetByTypeDialogWithPreview(SelectCardsetDialogWithPreview): + Tree_Class = SelectCardsetByTypeTree + TreeDataHolder_Class = SelectCardsetByTypeTree + TreeData_Class = SelectCardsetByTypeData + +# /*********************************************************************** +# // Cardset Info +# ************************************************************************/ + +class CardsetInfoDialog(MfxDialog): + def __init__(self, parent, title, cardset, images, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + frame = Tkinter.Frame(top_frame) + frame.pack(fill="both", expand=True, padx=5, pady=10) + # + # + if Tkinter.TkVersion >= 8.4: + info_frame = Tkinter.LabelFrame(frame, text=_('About cardset')) + else: + info_frame = Tkinter.Frame(frame) + info_frame.grid(row=0, column=0, columnspan=2, sticky='ew', + padx=0, pady=5, ipadx=5, ipady=5) + styles = nationalities = year = None + if cardset.si.styles: + styles = '\n'.join([CSI.STYLE[i] for i in cardset.si.styles]) + if cardset.si.nationalities: + nationalities = '\n'.join([CSI.NATIONALITY[i] + for i in cardset.si.nationalities]) + if cardset.year: + year = str(cardset.year) + row = 0 + for n, t in ( + ##('Version:', str(cardset.version)), + (_('Type:'), CSI.TYPE[cardset.type]), + (_('Styles:'), styles), + (_('Nationality:'), nationalities), + (_('Year:'), year), + ##(_('Number of cards:'), str(cardset.ncards)), + (_('Size:'), '%d x %d' % (cardset.CARDW, cardset.CARDH)), + ): + if not t is None: + l = Tkinter.Label(info_frame, text=n, + anchor='w', justify='left') + l.grid(row=row, column=0, sticky='nw') + l = Tkinter.Label(info_frame, text=t, + anchor='w', justify='left') + l.grid(row=row, column=1, sticky='nw') + row += 1 + if images: + try: + from random import choice + im = choice(images) + f = os.path.join(cardset.dir, cardset.backname) + self.back_image = loadImage(file=f) + canvas = Tkinter.Canvas(info_frame, + width=2*im.width()+30, + height=im.height()+2) + canvas.create_image(10, 1, image=im, anchor='nw') + canvas.create_image(im.width()+20, 1, + image=self.back_image, anchor='nw') + canvas.grid(row=0, column=2, rowspan=row+1, sticky='ne') + info_frame.columnconfigure(2, weight=1) + info_frame.rowconfigure(row, weight=1) + except: + pass + ##bg = top_frame["bg"] + bg = 'white' + text_w = Tkinter.Text(frame, bd=1, relief="sunken", wrap="word", + padx=4, width=64, height=16, bg=bg) + text_w.grid(row=1, column=0, sticky='nsew') + sb = Tkinter.Scrollbar(frame) + sb.grid(row=1, column=1, sticky='ns') + text_w.configure(yscrollcommand=sb.set) + sb.configure(command=text_w.yview) + frame.columnconfigure(0, weight=1) + frame.rowconfigure(1, weight=1) + # + text = '' + f = os.path.join(cardset.dir, "COPYRIGHT") + try: + text = open(f).read() + except: + pass + if text: + text_w.config(state="normal") + text_w.insert("insert", text) + text_w.config(state="disabled") + # + focus = self.createButtons(bottom_frame, kw) + #focus = text_w + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"),), default=0, + resizable = 1, + separatorwidth = 2, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py new file mode 100644 index 00000000..f254e2b6 --- /dev/null +++ b/pysollib/tk/selectgame.py @@ -0,0 +1,571 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import os, re, sys, types, Tkinter +from UserList import UserList + +# PySol imports +from pysollib.mfxutil import destruct, Struct, KwStruct +from pysollib.mfxutil import format_time +from pysollib.gamedb import GI +from pysollib.help import helpHTML +from pysollib.resource import CSI + +# Toolkit imports +from tkutil import unbind_destroy +from tkwidget import _ToplevelDialog, MfxDialog, MfxScrolledCanvas +from tkcanvas import MfxCanvasText +from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode +from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas + +gettext = _ + +# /*********************************************************************** +# // Nodes +# ************************************************************************/ + +class SelectGameLeaf(SelectDialogTreeLeaf): + pass + + +class SelectGameNode(SelectDialogTreeNode): + def _getContents(self): + contents = [] + if isinstance(self.select_func, UserList): + # key/value pairs + for id, name in self.select_func: + if id and name: + name = gettext(name) # name of game + node = SelectGameLeaf(self.tree, self, name, key=id) + contents.append(node) + else: + for gi in self.tree.data.all_games_gi: + if gi and self.select_func is None: + # All games + ##name = '%s (%s)' % (gi.name, CSI.TYPE_NAME[gi.category]) + name = gi.name + name = gettext(name) # name of game + node = SelectGameLeaf(self.tree, self, name, key=gi.id) + contents.append(node) + elif gi and self.select_func(gi): + name = gi.name + name = gettext(name) # name of game + node = SelectGameLeaf(self.tree, self, name, key=gi.id) + contents.append(node) + return contents or self.tree.data.no_games + + +# /*********************************************************************** +# // Tree database +# ************************************************************************/ + +class SelectGameData(SelectDialogTreeData): + def __init__(self, app): + SelectDialogTreeData.__init__(self) + self.all_games_gi = map(app.gdb.get, app.gdb.getGamesIdSortedByName()) + self.no_games = [ SelectGameLeaf(None, None, _("(no games)"), None), ] + # + s_by_type = s_oriental = s_special = s_original = s_contrib = None + g = [] + for data in (GI.SELECT_GAME_BY_TYPE, + GI.SELECT_ORIENTAL_GAME_BY_TYPE, + GI.SELECT_SPECIAL_GAME_BY_TYPE, + GI.SELECT_ORIGINAL_GAME_BY_TYPE, + GI.SELECT_CONTRIB_GAME_BY_TYPE): + gg = [] + for name, select_func in data: + if name is None or not filter(select_func, self.all_games_gi): + continue + name = gettext(name) + name = name.replace("&", "") + gg.append(SelectGameNode(None, name, select_func)) + g.append(gg) + if 1 and g[0]: + s_by_type = SelectGameNode(None, _("French games"), tuple(g[0]), expanded=1) + pass + if 1 and g[1]: + s_oriental = SelectGameNode(None, _("Oriental Games"), tuple(g[1])) + pass + if 1 and g[2]: + s_special = SelectGameNode(None, _("Special Games"), tuple(g[2])) + pass + if 1 and g[3]: + s_original = SelectGameNode(None, _("Original Games"), tuple(g[3])) + pass + if 1 and g[4]: + ##s_contrib = SelectGameNode(None, "Contributed Games", tuple(g[4])) + pass + # + s_by_compatibility, gg = None, [] + for name, games in GI.GAMES_BY_COMPATIBILITY: + select_func = lambda gi, games=games: gi.id in games + if name is None or not filter(select_func, self.all_games_gi): + continue + name = gettext(name) + gg.append(SelectGameNode(None, name, select_func)) + if 1 and gg: + s_by_compatibility = SelectGameNode(None, _("by Compatibility"), tuple(gg)) + pass +## # +## s_mahjongg, gg = None, [] +## for name, games in GI.GAMES_BY_COMPATIBILITY: +## select_func = lambda gi, games=games: gi.id in games +## if name is None or not filter(select_func, self.all_games_gi): +## continue +## gg.append(SelectGameNode(None, name, select_func)) +## if 1 and gg: +## s_by_compatibility = SelectGameNode(None, "by Compatibility", tuple(gg)) +## pass + # + s_by_pysol_version, gg = None, [] + for name, games in GI.GAMES_BY_PYSOL_VERSION: + select_func = lambda gi, games=games: gi.id in games + if name is None or not filter(select_func, self.all_games_gi): + continue + name = _("New games in v") + name + gg.append(SelectGameNode(None, name, select_func)) + if 1 and gg: + s_by_pysol_version = SelectGameNode(None, _("by PySol version"), tuple(gg)) + pass + # + ul_alternate_names = UserList(list(app.gdb.getGamesTuplesSortedByAlternateName())) + # + self.rootnodes = filter(None, ( + #SelectGameNode(None, "All Games", lambda gi: 1, expanded=0), + SelectGameNode(None, _("All Games"), None, expanded=0), + SelectGameNode(None, _("Alternate Names"), ul_alternate_names), + SelectGameNode(None, _("Popular Games"), lambda gi: gi.si.game_flags & GI.GT_POPULAR, expanded=0), + SelectGameNode(None, _("Mahjongg Games"), + lambda gi: gi.si.game_type == GI.GT_MAHJONGG, + expanded=0), + s_oriental, + s_special, + s_by_type, + SelectGameNode(None, _("by Game Feature"), ( + SelectGameNode(None, _("by Number of Cards"), ( + SelectGameNode(None, _("32 cards"), lambda gi: gi.si.ncards == 32), + SelectGameNode(None, _("48 cards"), lambda gi: gi.si.ncards == 48), + SelectGameNode(None, _("52 cards"), lambda gi: gi.si.ncards == 52), + SelectGameNode(None, _("64 cards"), lambda gi: gi.si.ncards == 64), + SelectGameNode(None, _("78 cards"), lambda gi: gi.si.ncards == 78), + SelectGameNode(None, _("104 cards"), lambda gi: gi.si.ncards == 104), + SelectGameNode(None, _("144 cards"), lambda gi: gi.si.ncards == 144), + SelectGameNode(None, _("Other number"), lambda gi: gi.si.ncards not in (32, 48, 52, 64, 78, 104, 144)), + )), + SelectGameNode(None, _("by Number of Decks"), ( + SelectGameNode(None, _("1 deck games"), lambda gi: gi.si.decks == 1), + SelectGameNode(None, _("2 deck games"), lambda gi: gi.si.decks == 2), + SelectGameNode(None, _("3 deck games"), lambda gi: gi.si.decks == 3), + SelectGameNode(None, _("4 deck games"), lambda gi: gi.si.decks == 4), + )), + SelectGameNode(None, _("by Number of Redeals"), ( + SelectGameNode(None, _("No redeal"), lambda gi: gi.si.redeals == 0), + SelectGameNode(None, _("1 redeal"), lambda gi: gi.si.redeals == 1), + SelectGameNode(None, _("2 redeals"), lambda gi: gi.si.redeals == 2), + SelectGameNode(None, _("3 redeals"), lambda gi: gi.si.redeals == 3), + SelectGameNode(None, _("Unlimited redeals"), lambda gi: gi.si.redeals == -1), +## SelectGameNode(None, "Variable redeals", lambda gi: gi.si.redeals == -2), + SelectGameNode(None, _("Other number of redeals"), lambda gi: gi.si.redeals not in (-1, 0, 1, 2, 3)), + )), + s_by_compatibility, + )), + s_by_pysol_version, + SelectGameNode(None, _("Other Categories"), ( + SelectGameNode(None, _("Games for Children (very easy)"), lambda gi: gi.si.game_flags & GI.GT_CHILDREN), + SelectGameNode(None, _("Games with Scoring"), lambda gi: gi.si.game_flags & GI.GT_SCORE), + SelectGameNode(None, _("Games with Separate Decks"), lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS), + SelectGameNode(None, _("Open Games (all cards visible)"), lambda gi: gi.si.game_flags & GI.GT_OPEN), + SelectGameNode(None, _("Relaxed Variants"), lambda gi: gi.si.game_flags & GI.GT_RELAXED), + )), + s_original, + s_contrib, + )) + + +# /*********************************************************************** +# // Canvas that shows the tree +# ************************************************************************/ + +class SelectGameTreeWithPreview(SelectDialogTreeCanvas): + data = None + html_viewer = None + + +class SelectGameTree(SelectGameTreeWithPreview): + def singleClick(self, event=None): + self.doubleClick(event) + + +# /*********************************************************************** +# // Dialog +# ************************************************************************/ + +class SelectGameDialog(MfxDialog): + Tree_Class = SelectGameTree + TreeDataHolder_Class = SelectGameTreeWithPreview + TreeData_Class = SelectGameData + + def __init__(self, parent, title, app, gameid, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.app = app + self.gameid = gameid + self.random = None + if self.TreeDataHolder_Class.data is None: + self.TreeDataHolder_Class.data = self.TreeData_Class(app) + # + self.top.wm_minsize(200, 200) + font = app.getFont("default") + self.tree = self.Tree_Class(self, top_frame, key=gameid, + font=font, + default=kw.default) + self.tree.frame.pack(fill=Tkinter.BOTH, expand=1, + padx=kw.padx, pady=kw.pady) + # + focus = self.createButtons(bottom_frame, kw) + focus = self.tree.frame + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(None, None, _("Cancel"),), default=0, + separatorwidth=2, resizable=1, + font=None, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + def destroy(self): + self.app = None + self.tree.updateNodesWithTree(self.tree.rootnodes, None) + self.tree.destroy() + MfxDialog.destroy(self) + + def mDone(self, button): + if button == 0: # Ok or double click + self.gameid = self.tree.selection_key + self.tree.n_expansions = 1 # save xyview in any case + if button == 1: # Rules + doc = self.app.getGameRulesFilename(self.tree.selection_key) + if not doc: + return + dir = os.path.join("html", "rules") + helpHTML(self.app, doc, dir, self.top) + return + MfxDialog.mDone(self, button) + + +# /*********************************************************************** +# // Dialog +# ************************************************************************/ + +class SelectGameDialogWithPreview(SelectGameDialog): + Tree_Class = SelectGameTreeWithPreview + + def __init__(self, parent, title, app, gameid, bookmark=None, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.app = app + self.gameid = gameid + self.bookmark = bookmark + self.random = None + if self.TreeDataHolder_Class.data is None: + self.TreeDataHolder_Class.data = self.TreeData_Class(app) + # + self.top.wm_minsize(400, 200) + sw = self.top.winfo_screenwidth() + if sw >= 1100: + w1, w2 = 250, 600 + elif sw >= 900: + w1, w2 = 250, 500 + elif sw >= 800: + w1, w2 = 220, 480 + else: + w1, w2 = 200, 300 + ##print sw, w1, w2 + w2 = max(200, min(w2, 10 + 12*(app.subsampled_images.CARDW+10))) + ##print sw, w1, w2 + ##padx, pady = kw.padx, kw.pady + padx, pady = kw.padx/2, kw.pady/2 + # PanedWindow + if Tkinter.TkVersion >= 8.4: + paned_window = Tkinter.PanedWindow(top_frame) + paned_window.pack(expand=1, fill='both') + left_frame = Tkinter.Frame(paned_window) + right_frame = Tkinter.Frame(paned_window) + paned_window.add(left_frame) + paned_window.add(right_frame) + else: + left_frame = Tkinter.Frame(top_frame) + right_frame = Tkinter.Frame(top_frame) + left_frame.pack(side='left', expand=1, fill='both') + right_frame.pack(side='right', expand=1, fill='both') + # Tree + font = app.getFont("default") + self.tree = self.Tree_Class(self, left_frame, key=gameid, + default=kw.default, font=font, width=w1) + self.tree.frame.pack(padx=padx, pady=pady, expand=1, fill='both') + # LabelFrame + if Tkinter.TkVersion >= 8.4: + info_frame = Tkinter.LabelFrame(right_frame, text=_('About game')) + stats_frame = Tkinter.LabelFrame(right_frame, text=_('Statistics')) + else: + info_frame = Tkinter.Frame(right_frame) + stats_frame = Tkinter.Frame(right_frame) + info_frame.grid(row=0, column=0, padx=padx, pady=pady, + ipadx=padx, ipady=pady, sticky='nws') + stats_frame.grid(row=0, column=1, padx=padx, pady=pady, + ipadx=padx, ipady=pady, sticky='nws') + # Info + self.info_labels = {} + i = 0 + for n, t, f, row in ( + ('name', _('Name:'), info_frame, 0), + ('altnames', _('Alternate names:'), info_frame, 1), + ('category', _('Category:'), info_frame, 2), + ('type', _('Type:'), info_frame, 3), + ('decks', _('Decks:'), info_frame, 4), + ('redeals', _('Redeals:'), info_frame, 5), + # + ('played', _('Played:'), stats_frame, 0), + ('won', _('Won:'), stats_frame, 1), + ('lost', _('Lost:'), stats_frame, 2), + ('time', _('Playing time:'), stats_frame, 3), + ('moves', _('Moves:'), stats_frame, 4), + ('percent', _('% won:'), stats_frame, 5), + ): + title_label = Tkinter.Label(f, text=t, justify='left', anchor='w') + title_label.grid(row=row, column=0, sticky='nw') + text_label = Tkinter.Label(f, justify='left', anchor='w') + text_label.grid(row=row, column=1, sticky='nw') + self.info_labels[n] = (title_label, text_label) + ##info_frame.columnconfigure(1, weight=1) + info_frame.rowconfigure(6, weight=1) + stats_frame.rowconfigure(6, weight=1) + # Canvas + self.preview = MfxScrolledCanvas(right_frame, width=w2) + self.preview.setTile(app, app.tabletile_index, force=True) + self.preview.grid(row=1, column=0, columnspan=3, + padx=padx, pady=pady, sticky='nsew') + right_frame.columnconfigure(1, weight=1) + right_frame.rowconfigure(1, weight=1) + + # set the scale factor + self.preview.canvas.preview = 2 + # create a preview of the current game + self.preview_key = -1 + self.preview_game = None + self.preview_app = None + self.updatePreview(gameid, animations=0) + # + focus = self.createButtons(bottom_frame, kw) + ##focus = self.tree.frame + SelectGameTreeWithPreview.html_viewer = None + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("Select"), _("Rules"), _("Cancel"),), + default=0, + ) + return SelectGameDialog.initKw(self, kw) + + def destroy(self): + self.deletePreview(destroy=1) + self.preview.unbind_all() + SelectGameDialog.destroy(self) + + def deletePreview(self, destroy=0): + self.preview_key = -1 + # clean up the canvas + if self.preview: + unbind_destroy(self.preview.canvas) + self.preview.canvas.deleteAllItems() + if destroy: + self.preview.canvas.delete("all") + # + #for l in self.info_labels.values(): + # l.config(text='') + # destruct the game + if self.preview_game: + self.preview_game.endGame() + self.preview_game.destruct() + destruct(self.preview_game) + self.preview_game = None + # destruct the app + if destroy: + if self.preview_app: + destruct(self.preview_app) + self.preview_app = None + + def updatePreview(self, gameid, animations=5): + if gameid == self.preview_key: + return + self.deletePreview() + canvas = self.preview.canvas + # + gi = self.app.gdb.get(gameid) + if not gi: + self.preview_key = -1 + return + # + if self.preview_app is None: + self.preview_app = Struct( + # variables + audio = self.app.audio, + canvas = canvas, + cardset = self.app.cardset.copy(), + comments = self.app.comments.new(), + debug = 0, + gamerandom = self.app.gamerandom, + gdb = self.app.gdb, + gimages = self.app.gimages, + images = self.app.subsampled_images, + menubar = None, + miscrandom = self.app.miscrandom, + opt = self.app.opt.copy(), + startup_opt = self.app.startup_opt, + stats = self.app.stats.new(), + top = None, + top_cursor = self.app.top_cursor, + toolbar = None, + # methods + constructGame = self.app.constructGame, + getFont = self.app.getFont, + ) + self.preview_app.opt.shadow = 0 + self.preview_app.opt.shade = 0 + # + self.preview_app.audio = None # turn off audio for intial dealing + if animations >= 0: + self.preview_app.opt.animations = animations + # + if self.preview_game: + self.preview_game.endGame() + self.preview_game.destruct() + ##self.top.wm_title("Select Game - " + self.app.getGameTitleName(gameid)) + #title = gettext(unicode(self.app.getGameTitleName(gameid), 'utf-8')) + title = gettext(self.app.getGameTitleName(gameid)) + self.top.wm_title(_("Playable Preview - ") + title) +## if False: +## cw, ch = canvas.winfo_width(), canvas.winfo_height() +## if cw >= 100 and ch >= 100: +## MfxCanvasText(canvas, cw / 2, ch - 4, +## preview=0, anchor="s", text=_("Playable Area"), +## font=self.app.getFont("canvas_large")) +## if self.app.opt.table_text_color: +## canvas.setTextColor(self.app.opt.table_text_color_value) + # + self.preview_game = gi.gameclass(gi) + self.preview_game.createPreview(self.preview_app) + tx, ty = 0, 0 + gw, gh = self.preview_game.width, self.preview_game.height + canvas.config(scrollregion=(-tx, -ty, -tx, -ty)) + canvas.xview_moveto(0) + canvas.yview_moveto(0) + # + random = None + if gameid == self.gameid: + random = self.app.game.random.copy() + if gameid == self.gameid and self.bookmark: + self.preview_game.restoreGameFromBookmark(self.bookmark) + else: + self.preview_game.newGame(random=random, autoplay=1) + canvas.config(scrollregion=(-tx, -ty, gw, gh)) + # + self.preview_app.audio = self.app.audio + if self.app.opt.animations: + self.preview_app.opt.animations = 5 + else: + self.preview_app.opt.animations = 0 + # save seed + self.random = self.preview_game.random.copy() + self.random.origin = self.random.ORIGIN_PREVIEW + self.preview_key = gameid + # + self.updateInfo(gameid) + + def updateInfo(self, gameid): + gi = self.app.gdb.get(gameid) + # info + name = gettext(gi.name) + altnames = '\n'.join([gettext(n) for n in gi.altnames]) + category = gettext(CSI.TYPE[gi.category]) + type = '' + if GI.TYPE_NAMES.has_key(gi.si.game_type): + type = gettext(GI.TYPE_NAMES[gi.si.game_type]) + if gi.redeals == -2: redeals = _('variable') + elif gi.redeals == -1: redeals = _('unlimited') + else: redeals = str(gi.redeals) + # stats + won, lost, time, moves = self.app.stats.getFullStats(self.app.opt.player, gameid) + if won+lost > 0: percent = "%.1f" % (100.0*won/(won+lost)) + else: percent = "0.0" + time = format_time(time) + moves = str(round(moves, 1)) + for n, t in ( + ('name', name), + ('altnames', altnames), + ('category', category), + ('type', type), + ('decks', gi.decks), + ('redeals', redeals), + ('played', won+lost), + ('won', won), + ('lost', lost), + ('time', time), + ('moves', moves), + ('percent', percent), + ): + title_label, text_label = self.info_labels[n] + if t == '': + title_label.grid_remove() + text_label.grid_remove() + else: + title_label.grid() + text_label.grid() + text_label.config(text=t) + #self.info_labels[n].config(text=t) + + diff --git a/pysollib/tk/selecttile.py b/pysollib/tk/selecttile.py new file mode 100644 index 00000000..d50c3896 --- /dev/null +++ b/pysollib/tk/selecttile.py @@ -0,0 +1,205 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import os, string, sys, types +import Tkinter, tkColorChooser + +# PySol imports +from pysollib.mfxutil import destruct, Struct, KwStruct +from pysollib.resource import CSI + +# Toolkit imports +from tkutil import loadImage +from tkwidget import _ToplevelDialog, MfxDialog, MfxScrolledCanvas +from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode +from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas + + +# /*********************************************************************** +# // Nodes +# ************************************************************************/ + +class SelectTileLeaf(SelectDialogTreeLeaf): + pass + + +class SelectTileNode(SelectDialogTreeNode): + def _getContents(self): + contents = [] + for obj in self.tree.data.all_objects: + if self.select_func(obj): + node = SelectTileLeaf(self.tree, self, text=obj.name, key=obj.index) + contents.append(node) + return contents or self.tree.data.no_contents + + +# /*********************************************************************** +# // Tree database +# ************************************************************************/ + +class SelectTileData(SelectDialogTreeData): + def __init__(self, manager, key): + SelectDialogTreeData.__init__(self) + self.all_objects = manager.getAllSortedByName() + self.all_objects = filter(lambda obj: not obj.error, self.all_objects) + self.all_objects = filter(lambda tile: tile.index > 0 and tile.filename, self.all_objects) + self.no_contents = [ SelectTileLeaf(None, None, _("(no tiles)"), key=None), ] + e1 = type(key) is types.StringType or len(self.all_objects) <=17 + e2 = 1 + self.rootnodes = ( + SelectTileNode(None, _("Solid Colors"), ( + SelectTileLeaf(None, None, _("Blue"), key="#0082df"), + SelectTileLeaf(None, None, _("Green"), key="#008200"), + SelectTileLeaf(None, None, _("Navy"), key="#000086"), + SelectTileLeaf(None, None, _("Olive"), key="#868200"), + SelectTileLeaf(None, None, _("Orange"), key="#f79600"), + SelectTileLeaf(None, None, _("Teal"), key="#008286"), + ), expanded=e1), + SelectTileNode(None, _("All Backgrounds"), lambda tile: 1, expanded=e2), + ) + + +# /*********************************************************************** +# // Canvas that shows the tree +# ************************************************************************/ + +class SelectTileTree(SelectDialogTreeCanvas): + data = None + + +# /*********************************************************************** +# // Dialog +# ************************************************************************/ + +class SelectTileDialogWithPreview(MfxDialog): + Tree_Class = SelectTileTree + TreeDataHolder_Class = SelectTileTree + TreeData_Class = SelectTileData + + def __init__(self, parent, title, app, manager, key=None, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + if key is None: + key = manager.getSelected() + self.app = app + self.manager = manager + self.key = key + self.table_color = app.opt.table_color + if self.TreeDataHolder_Class.data is None: + self.TreeDataHolder_Class.data = self.TreeData_Class(manager, key) + # + self.top.wm_minsize(400, 200) + if self.top.winfo_screenwidth() >= 800: + w1, w2 = 200, 400 + else: + w1, w2 = 200, 300 + font = app.getFont("default") + self.tree = self.Tree_Class(self, top_frame, key=key, + default=kw.default, + font=font, + width=w1) + self.tree.frame.pack(side="left", fill=Tkinter.BOTH, expand=0, padx=kw.padx, pady=kw.pady) + self.preview = MfxScrolledCanvas(top_frame, width=w2, hbar=0, vbar=0) + self.preview.pack(side="right", fill=Tkinter.BOTH, expand=1, + padx=kw.padx, pady=kw.pady) + # create a preview of the current state + self.preview_key = -1 + self.updatePreview(key) + # + focus = self.createButtons(bottom_frame, kw) + focus = self.tree.frame + self.mainloop(focus, kw.timeout) + + def destroy(self): + self.tree.updateNodesWithTree(self.tree.rootnodes, None) + self.tree.destroy() + self.preview.unbind_all() + MfxDialog.destroy(self) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Solid color..."), _("Cancel"),), default=0, + separatorwidth=2, resizable=1, + font=None, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + def mDone(self, button): + if button == 0: # "OK" or double click + if type(self.tree.selection_key) in types.StringTypes: + self.key = str(self.tree.selection_key) + else: + self.key = self.tree.selection_key + self.tree.n_expansions = 1 # save xyview in any case + if button == 1: # "Solid color..." + c = tkColorChooser.askcolor(master=self.top, + initialcolor=self.table_color, + title=_("Select table color")) + if c and c[1]: + color = str(c[1]) + self.key = color.lower() + self.table_color = self.key + self.tree.updateSelection(self.key) + self.updatePreview(self.key) + return + MfxDialog.mDone(self, button) + + def updatePreview(self, key): + ##print key + if key == self.preview_key: + return + canvas = self.preview.canvas + canvas.deleteAllItems() + if type(key) in types.StringTypes: + # solid color + canvas.config(bg=key) + canvas.setTile(None) + canvas.setTextColor(None) + self.preview_key = key + self.table_color = key + return + tile = self.manager.get(key) + if tile: + if self.preview.setTile(self.app, key): + return + self.preview_key = -1 + diff --git a/pysollib/tk/selecttree.py b/pysollib/tk/selecttree.py new file mode 100644 index 00000000..1eddef43 --- /dev/null +++ b/pysollib/tk/selecttree.py @@ -0,0 +1,190 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['SelectDialogTreeData'] + +# imports +import os, re, sys, types +import Tkinter, tkFont + +# PySol imports +from pysollib.mfxutil import destruct, Struct, KwStruct, kwdefault + +# Toolkit imports +from tkutil import makeImage +from tkwidget import _ToplevelDialog, MfxDialog, MfxScrolledCanvas +from tkcanvas import MfxCanvas +from tktree import MfxTreeLeaf, MfxTreeNode, MfxTreeInCanvas + + +# /*********************************************************************** +# // Nodes +# ************************************************************************/ + +class SelectDialogTreeLeaf(MfxTreeLeaf): + def drawSymbol(self, x, y, **kw): + if self.tree.nodes.get(self.symbol_id) is not self: + self.symbol_id = self.tree.canvas.create_image(x, y, + image=self.tree.data.img[2+(self.key is None)], anchor="nw") + self.tree.nodes[self.symbol_id] = self + + +class SelectDialogTreeNode(MfxTreeNode): + def __init__(self, tree, text, select_func, expanded=0, parent_node=None): + MfxTreeNode.__init__(self, tree, parent_node, text, key=None, expanded=expanded) + # callable or a tuple/list of MfxTreeNodes + self.select_func = select_func + + def drawSymbol(self, x, y, **kw): + if self.tree.nodes.get(self.symbol_id) is not self: + self.symbol_id = self.tree.canvas.create_image(x, y, + image=self.tree.data.img[self.expanded], anchor="nw") + self.tree.nodes[self.symbol_id] = self + + def getContents(self): + # cached values + if self.subnodes is not None: + return self.subnodes + ##print self.whoami() + if type(self.select_func) in (types.TupleType, types.ListType): + return self.select_func + return self._getContents() + + def _getContents(self): + # subclass + return [] + + +# /*********************************************************************** +# // Tree database +# ************************************************************************/ + +class SelectDialogTreeData: + img = None + def __init__(self): + self.tree_xview = (0.0, 1.0) + self.tree_yview = (0.0, 1.0) + + +# /*********************************************************************** +# // Canvas that shows the tree (left side) +# ************************************************************************/ + +class SelectDialogTreeCanvas(MfxTreeInCanvas): + def __init__(self, dialog, parent, key, default, + font=None, width=-1, height=-1, hbar=2, vbar=3): + self.dialog = dialog + self.default = default + self.n_selections = 0 + self.n_expansions = 0 + # + disty = 16 + if width < 0: + width = 400 + if height < 0: + height = 20 * disty + if parent and parent.winfo_screenheight() >= 600: + height = 25 * disty + if parent and parent.winfo_screenheight() >= 800: + height = 30 * disty + self.lines = height / disty + MfxTreeInCanvas.__init__(self, parent, self.data.rootnodes, + width=width, height=height, + hbar=hbar, vbar=vbar) + self.style.distx = 20 + self.style.disty = disty + self.style.width = 16 # width of symbol + self.style.height = 14 # height of symbol + if font: + self.style.font = font + f = tkFont.Font(parent, font) + h = f.metrics()["linespace"] + self.style.disty = max(self.style.width, h) + + self.draw() + self.updateSelection(key) + if self.hbar: + ##print self.data.tree_yview + ##print self.canvas.xview() + self.canvas.xview_moveto(self.data.tree_xview[0]) + if self.vbar: + ##print self.data.tree_yview + ##print self.canvas.yview() + self.canvas.yview_moveto(self.data.tree_yview[0]) + + def destroy(self): + if self.n_expansions > 0: # must save updated xyview + self.data.tree_xview = self.canvas.xview() + self.data.tree_yview = self.canvas.yview() + MfxTreeInCanvas.destroy(self) + + def getContents(self, node): + return node.getContents() + + def singleClick(self, event=None): + node = self.findNode() + if isinstance(node, MfxTreeLeaf): + if not node.selected and node.key is not None: + oldcur = self.canvas["cursor"] + self.canvas["cursor"] = "watch" + self.canvas.update_idletasks() + self.n_selections = self.n_selections + 1 + self.updateSelection(node.key) + self.dialog.updatePreview(self.selection_key) + self.canvas["cursor"] = oldcur + elif isinstance(node, MfxTreeNode): + self.n_expansions = self.n_expansions + 1 + node.expanded = not node.expanded + self.redraw() + return "break" + + def doubleClick(self, event=None): + node = self.findNode() + if isinstance(node, MfxTreeLeaf): + if node.key is not None: + self.n_selections = self.n_selections + 1 + self.updateSelection(node.key) + self.dialog.mDone(self.default) + elif isinstance(node, MfxTreeNode): + self.n_expansions = self.n_expansions + 1 + node.expanded = not node.expanded + self.redraw() + return "break" + +# /*********************************************************************** +# // Canvas for a preview (right side) +# ************************************************************************/ + +##SelectDialogPreviewCanvas = MfxScrolledCanvas diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py new file mode 100644 index 00000000..bb0c70b3 --- /dev/null +++ b/pysollib/tk/soundoptionsdialog.py @@ -0,0 +1,180 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['SoundOptionsDialog'] + +# imports +import os, sys, string, Tkinter +import traceback + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct, spawnvp +from pysollib.settings import PACKAGE +from pysollib.pysolaudio import pysolsoundserver +from pysollib.settings import MIXERS + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import _ToplevelDialog, MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class SoundOptionsDialog(MfxDialog): + MIXER = () + + def __init__(self, parent, title, app, **kw): + self.app = app + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.saved_opt = app.opt.copy() + self.sound = Tkinter.BooleanVar() + self.sound.set(app.opt.sound != 0) + self.sound_mode = Tkinter.BooleanVar() + self.sound_mode.set(app.opt.sound_mode != 0) + self.sample_volume = Tkinter.IntVar() + self.sample_volume.set(app.opt.sound_sample_volume) + self.music_volume = Tkinter.IntVar() + self.music_volume.set(app.opt.sound_music_volume) + widget = Tkinter.Checkbutton(top_frame, variable=self.sound, + text=_("Sound enabled"), + anchor=Tkinter.W) + widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady, + expand=Tkinter.YES, fill=Tkinter.BOTH) + if os.name == "nt" and pysolsoundserver: + widget = Tkinter.Checkbutton(top_frame, variable=self.sound_mode, + text=_("Use DirectX for sound playing"), + command=self.mOptSoundDirectX) + widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + if pysolsoundserver and app.startup_opt.sound_mode > 0: + widget = Tkinter.Scale(top_frame, from_=0, to=128, + resolution=1, orient=Tkinter.HORIZONTAL, + length="3i", label=_("Sample volume"), + variable=self.sample_volume, takefocus=0) + widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady, + expand=Tkinter.YES, fill=Tkinter.BOTH) + widget = Tkinter.Scale(top_frame, from_=0, to=128, + resolution=1, orient=Tkinter.HORIZONTAL, + length="3i", label=_("Music volume"), + variable=self.music_volume, takefocus=0) + widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady, + expand=Tkinter.YES, fill=Tkinter.BOTH) + else: + # remove "Apply" button + kw.strings[1] = None + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + strings=[_("OK"), _("Apply"), _("Mixer..."), _("Cancel"),] + if self.MIXER is None: + strings[2] = (_("Mixer..."), -1) +## if os.name != "nt" and not self.app.debug: +## strings[2] = None + kw = KwStruct(kw, + strings=strings, default=0, + separatorwidth=2, resizable=1, + font=None, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + def mDone(self, button): + if button == 0 or button == 1: + self.app.opt.sound = self.sound.get() + self.app.opt.sound_mode = self.sound_mode.get() + self.app.opt.sound_sample_volume = self.sample_volume.get() + self.app.opt.sound_music_volume = self.music_volume.get() + elif button == 2: + for name, args in MIXERS: + try: + f = spawnvp(name, args) + if f: + self.MIXER = (f, args) + return + except: + if traceback: traceback.print_exc() + pass + self.MIXER = None + elif button == 3: + self.app.opt = self.saved_opt + if self.app.audio: + self.app.audio.updateSettings() + if button == 1: + self.app.audio.playSample("drop", priority=1000) + if button == 1: + return EVENT_HANDLED + return MfxDialog.mDone(self, button) + + def mCancel(self, *event): + return self.mDone(2) + + def wmDeleteWindow(self, *event): + return self.mDone(0) + + def mOptSoundDirectX(self, *event): + ##print self.sound_mode.get() + d = MfxDialog(self.top, title=_("Sound preferences info"), + text=_("Changing DirectX settings will take effect\nthe next time you restart ")+PACKAGE, + bitmap="warning", + default=0, strings=(_("OK"),)) + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +def soundoptionsdialog_main(args): + from tkutil import wm_withdraw + opt = Struct(sound=1, sound_mode=1, sound_sample_volume=128, sound_music_volume=96) + app = Struct(opt=opt, audio=None, debug=0) + tk = Tkinter.Tk() + wm_withdraw(tk) + tk.update() + d = SoundOptionsDialog(tk, "Sound settings", app) + print d.status, d.button + return 0 + +if __name__ == "__main__": + import sys + sys.exit(soundoptionsdialog_main(sys.argv)) + diff --git a/pysollib/tk/statusbar.py b/pysollib/tk/statusbar.py new file mode 100644 index 00000000..2ca8645f --- /dev/null +++ b/pysollib/tk/statusbar.py @@ -0,0 +1,182 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PysolStatusbar', + 'HelpStatusbar'] + +# imports +import os, sys, Tkinter + +# PySol imports +from pysollib.mfxutil import destruct + +# Toolkit imports +from tkwidget import MfxTooltip + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxStatusbar: + def __init__(self, top, row, column, columnspan): + self.top = top + self._show = True + self._widgets = [] + self._tooltips = [] + # + self._row = row + self._column = column + self._columnspan = columnspan + self.padx = 0 + self.pady = 0 + # + self.frame = Tkinter.Frame(self.top, bd=1, relief='raised') + self.frame.grid(row=self._row, column=self._column, + columnspan=self._columnspan, sticky='ew') + + # util + def _createLabel(self, name, + text="", relief='sunken', + side='left', fill='none', + padx=-1, expand=0, width=0, + tooltip=None): + if padx < 0: padx = self.padx + label = Tkinter.Label(self.frame, text=text, + width=width, relief=relief) + label.pack(side=side, fill=fill, padx=padx, expand=expand) + setattr(self, name + "_label", label) + self._widgets.append(label) + if tooltip: + b = MfxTooltip(label) + self._tooltips.append(b) + b.setText(tooltip) + return label + + + # + # public methods + # + + def updateText(self, **kw): + for k, v in kw.items(): + label = getattr(self, k + "_label") + #label["text"] = str(v) + label["text"] = unicode(v) + + def configLabel(self, name, **kw): + label = getattr(self, name + "_label") + apply(label.config, (), kw) + + def show(self, show=True, resize=False): + if self._show == show: + return False + if resize: + self.top.wm_geometry("") # cancel user-specified geometry + if not show: + # hide + self.frame.grid_forget() + else: + # show + self.frame.grid(row=self._row, column=self._column, + columnspan=self._columnspan, sticky='ew') + self._show = show + return True + + def hide(self, resize=0): + self.show(None, resize) + + def destroy(self): + for w in self._tooltips: + if w: w.destroy() + self._tooltips = [] + for w in self._widgets: + if w: w.destroy() + self._widgets = [] + + +class PysolStatusbar(MfxStatusbar): + def __init__(self, top): + MfxStatusbar.__init__(self, top, row=3, column=0, columnspan=3) + # + for n, t, w in ( + ("time", _("Playing time"), 10), + ("moves", _('Moves/Total moves'), 10), + ("gamenumber", _("Game number"), 26), + ("stats", _("Games played: won/lost"), 12), + ): + self._createLabel(n, tooltip=t, width=w) + # + l = self._createLabel("info", fill='both', expand=1) + ##l.config(text="", justify="left", anchor='w') + l.config(padx=8) + + +class HelpStatusbar(MfxStatusbar): + def __init__(self, top): + MfxStatusbar.__init__(self, top, row=4, column=0, columnspan=3) + l = self._createLabel("info", fill='both', expand=1) + l.config(text="", justify="left", anchor='w', padx=8) + + +class HtmlStatusbar(MfxStatusbar): + def __init__(self, top, row, column, columnspan): + MfxStatusbar.__init__(self, top, + row=row, column=column, columnspan=columnspan) + l = self._createLabel("url", fill='both', expand=1) + l.config(text="", justify="left", anchor='w', padx=8) + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +class TestStatusbar(PysolStatusbar): + def __init__(self, top, args): + PysolStatusbar.__init__(self, top) + # test some settings + self.updateText(moves=999, gamenumber="#0123456789ABCDEF0123") + self.updateText(info="Some info text.") + +def statusbar_main(args): + tk = Tkinter.Tk() + statusbar = TestStatusbar(tk, args) + tk.mainloop() + return 0 + +if __name__ == "__main__": + sys.exit(statusbar_main(sys.argv)) + + diff --git a/pysollib/tk/timeoutsdialog.py b/pysollib/tk/timeoutsdialog.py new file mode 100644 index 00000000..caff5154 --- /dev/null +++ b/pysollib/tk/timeoutsdialog.py @@ -0,0 +1,99 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['TimeoutsDialog'] + +# imports +import os, sys +from Tkinter import * + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import _ToplevelDialog, MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class TimeoutsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + #self.createBitmaps(top_frame, kw) + + frame = Frame(top_frame) + frame.pack(expand=YES, fill=BOTH, padx=5, pady=10) + frame.columnconfigure(0, weight=1) + + self.demo_sleep_var = DoubleVar() + self.demo_sleep_var.set(app.opt.demo_sleep) + self.hint_sleep_var = DoubleVar() + self.hint_sleep_var.set(app.opt.hint_sleep) + self.raise_card_sleep_var = DoubleVar() + self.raise_card_sleep_var.set(app.opt.raise_card_sleep) + self.highlight_piles_sleep_var = DoubleVar() + self.highlight_piles_sleep_var.set(app.opt.highlight_piles_sleep) + self.highlight_cards_sleep_var = DoubleVar() + self.highlight_cards_sleep_var.set(app.opt.highlight_cards_sleep) + self.highlight_samerank_sleep_var = DoubleVar() + self.highlight_samerank_sleep_var.set(app.opt.highlight_samerank_sleep) + # + #Label(frame, text='Set delays in seconds').grid(row=0, column=0, columnspan=2) + row = 0 + for title, var in ((_('Demo:'), self.demo_sleep_var), + (_('Hint:'), self.hint_sleep_var), + (_('Raise card:'), self.raise_card_sleep_var), + (_('Highlight piles:'), self.highlight_piles_sleep_var), + (_('Highlight cards:'), self.highlight_cards_sleep_var), + (_('Highlight same rank:'), self.highlight_samerank_sleep_var), + ): + Label(frame, text=title, anchor=W).grid(row=row, column=0, sticky=W+E) + widget = Scale(frame, from_=0.2, to=9.9, + resolution=0.1, orient=HORIZONTAL, + length="3i", + variable=var, takefocus=0) + widget.grid(row=row, column=1) + row += 1 + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + # + self.demo_sleep = self.demo_sleep_var.get() + self.hint_sleep = self.hint_sleep_var.get() + self.raise_card_sleep = self.raise_card_sleep_var.get() + self.highlight_piles_sleep = self.highlight_piles_sleep_var.get() + self.highlight_cards_sleep = self.highlight_cards_sleep_var.get() + self.highlight_samerank_sleep = self.highlight_samerank_sleep_var.get() + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Cancel")), default=0, + separatorwidth=0, + ) + return MfxDialog.initKw(self, kw) + + + + diff --git a/pysollib/tk/tkcanvas.py b/pysollib/tk/tkcanvas.py new file mode 100644 index 00000000..334a4319 --- /dev/null +++ b/pysollib/tk/tkcanvas.py @@ -0,0 +1,343 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['MfxCanvasGroup', + 'MfxCanvasImage', + 'MfxCanvasText', + 'MfxCanvasLine', + 'MfxCanvasRectangle', + 'MfxCanvas'] + +# imports +import os, sys, types +import Tkinter, Canvas +try: + # PIL (Python Image Library) + import Image +except ImportError: + Image = None +else: + import ImageTk + # for py2exe + import GifImagePlugin, PngImagePlugin, JpegImagePlugin, BmpImagePlugin, PpmImagePlugin + Image._initialized=2 + +# Toolkit imports +from tkutil import bind, unbind_destroy, loadImage + + +# /*********************************************************************** +# // canvas items +# ************************************************************************/ + +class MfxCanvasGroup(Canvas.Group): + def __init__(self, canvas, tag=None): + Canvas.Group.__init__(self, canvas=canvas, tag=tag) + # register ourself so that we can unbind from the canvas + assert not self.canvas.items.has_key(self.id) + self.canvas.items[self.id] = self + def addtag(self, tag, option="withtag"): + self.canvas.addtag(tag, option, self.id) + def delete(self): + del self.canvas.items[self.id] + Canvas.Group.delete(self) + def gettags(self): + return self.canvas.tk.splitlist(self._do("gettags")) + +class MfxCanvasImage(Canvas.ImageItem): + def moveTo(self, x, y): + c = self.coords() + self.move(x - int(c[0]), y - int(c[1])) + +MfxCanvasLine = Canvas.Line + +MfxCanvasRectangle = Canvas.Rectangle + +class MfxCanvasText(Canvas.CanvasText): + def __init__(self, canvas, x, y, preview=-1, **kw): + if preview < 0: + preview = canvas.preview + if preview > 1: + return + if not kw.has_key("fill"): + kw["fill"] = canvas._text_color + apply(Canvas.CanvasText.__init__, (self, canvas, x, y), kw) + self.text_format = None + canvas._text_items.append(self) + + +# /*********************************************************************** +# // canvas +# ************************************************************************/ + +class MfxCanvas(Tkinter.Canvas): + def __init__(self, *args, **kw): + apply(Tkinter.Canvas.__init__, (self,) + args, kw) + self.preview = 0 + # this is also used by lib-tk/Canvas.py + self.items = {} + # private + self.__tileimage = None + self.__tiles = [] # id of canvas items + self.__topimage = None + self.__tops = [] # id of canvas items + # friend MfxCanvasText + self._text_color = "#000000" + self._stretch_bg_image = 0 + self._text_items = [] + # resize bg image + self.bind('', lambda e: self.set_bg_image()) + + def set_bg_image(self): + ##print 'set_bg_image', self._bg_img + if not hasattr(self, '_bg_img'): + return + if not self._bg_img: # solid color + return + stretch = self._stretch_bg_image + if Image: + if stretch: + w = max(self.winfo_width(), int(self.cget('width'))) + h = max(self.winfo_height(), int(self.cget('height'))) + im = self._bg_img.resize((w, h)) + image = ImageTk.PhotoImage(im) + else: + image = ImageTk.PhotoImage(self._bg_img) + else: # not Image + stretch = 0 + image = self._bg_img + for id in self.__tiles: + self.delete(id) + self.__tiles = [] + # must keep a reference to the image, otherwise Python will + # garbage collect it... + self.__tileimage = image + if stretch: + # + id = self._x_create("image", 0, 0, image=image, anchor="nw") + self.tag_lower(id) # also see tag_lower above + self.__tiles.append(id) + else: + iw, ih = image.width(), image.height() + #sw = max(self.winfo_screenwidth(), 1024) + #sh = max(self.winfo_screenheight(), 768) + sw = max(self.winfo_width(), int(self.cget('width'))) + sh = max(self.winfo_height(), int(self.cget('height'))) + for x in range(0, sw - 1, iw): + for y in range(0, sh - 1, ih): + id = self._x_create("image", x, y, image=image, anchor="nw") + self.tag_lower(id) # also see tag_lower above + self.__tiles.append(id) + return 1 + + + # + # top-image support + # + + def _x_create(self, itemType, *args, **kw): + return Tkinter.Canvas._create(self, itemType, args, kw) + + def _create(self, itemType, args, kw): + ##print "_create:", itemType, args, kw + id = Tkinter.Canvas._create(self, itemType, args, kw) + if self.__tops: + self.tk.call(self._w, "lower", id, self.__tops[0]) + return id + + def tag_raise(self, id, aboveThis=None): + ##print "tag_raise:", id, aboveThis + if aboveThis is None and self.__tops: + self.tk.call(self._w, "lower", id, self.__tops[0]) + else: + self.tk.call(self._w, "raise", id, aboveThis) + + def tag_lower(self, id, belowThis=None): + ##print "tag_lower:", id, belowThis + if belowThis is None and self.__tiles: + self.tk.call(self._w, "raise", id, self.__tiles[-1]) + else: + self.tk.call(self._w, "lower", id, belowThis) + + + # + # + # + + def setInitialSize(self, width, height): + ##print 'setInitialSize:', width, height + self.config(width=width, height=height) + self.config(scrollregion=(0, 0, width, height)) + + + # + # + # + + # delete all CanvasItems, but keep the background and top tiles + def deleteAllItems(self): + self._text_items = [] + for id in self.items.keys(): + assert not id in self.__tiles # because the tile is created by id + unbind_destroy(self.items[id]) + self.items[id].delete() + assert self.items == {} + + def findCard(self, stack, event): + if isinstance(stack.cards[0].item, Canvas.Group): + current = self.gettags("current") # get tags + for i in range(len(stack.cards)): + if stack.cards[i].item.tag in current: + return i + else: + current = self.find("withtag", "current") # get item ids + for i in range(len(stack.cards)): + if stack.cards[i].item.id in current: + return i + return -1 + + def setTextColor(self, color): + if color is None: + c = self.cget("bg") + if type(c) is not types.StringType or c[0] != "#" or len(c) != 7: + return + v = [] + for i in (1, 3, 5): + v.append(int(c[i:i+2], 16)) + luminance = (0.212671 * v[0] + 0.715160 * v[1] + 0.072169 * v[2]) / 255 + ##print c, ":", v, "luminance", luminance + color = ("#000000", "#ffffff") [luminance < 0.3] + if self._text_color != color: + self._text_color = color + for item in self._text_items: + item.config(fill=self._text_color) + + def setTile(self, image, stretch=0): + ##print 'setTile:', image, stretch + if image: + if Image: + try: + self._bg_img = Image.open(image) + except: + return 0 + else: + try: + self._bg_img = loadImage(file=image, dither=1) + except: + return 0 + self._stretch_bg_image = stretch + self.set_bg_image() + else: + for id in self.__tiles: + self.delete(id) + self.__tiles = [] + self._bg_img = None + return 1 + + def setTopImage(self, image, cw=0, ch=0): + try: + if image and type(image) is types.StringType: + image = loadImage(file=image) + except Tkinter.TclError: + return 0 + if len(self.__tops) == 1 and image is self.__tops[0]: + return 1 + for id in self.__tops: + self.delete(id) + self.__tops = [] + # must keep a reference to the image, otherwise Python will + # garbage collect it... + self.__topimage = image + if image is None: + return 1 + iw, ih = image.width(), image.height() + if cw <= 0: + ##cw = max(int(self.cget("width")), self.winfo_width()) + cw = self.winfo_width() + if ch <= 0: + ##ch = max(int(self.cget("height")), self.winfo_height()) + ch = self.winfo_height() + ###print iw, ih, cw, ch + x = (cw - iw) / 2 + y = (ch - ih) / 2 + id = self._x_create("image", x, y, image=image, anchor="nw") + self.tk.call(self._w, "raise", id) + self.__tops.append(id) + return 1 + + # + # Pause support + # + + def hideAllItems(self): + for item in self.items.values(): + item.config(state='hidden') + + def showAllItems(self): + for item in self.items.values(): + item.config(state='normal') + + + # + # restricted but fast _bind and _substitute + # + + def _bind(self, what, sequence, func, add, needcleanup=1): + funcid = self._register(func, self._substitute, needcleanup) + cmd = ('%sif {"[%s %s]" == "break"} break\n' % + (add and '+' or '', funcid, "%x %y")) + self.tk.call(what + (sequence, cmd)) + return funcid + + def _substitute(self, *args): + e = Tkinter.Event() + e.x = int(args[0]) + e.y = int(args[1]) + return (e,) + + + # + # debug + # + + def update(self): + ##import mfxutil; print mfxutil.callername() + # ?????? + Tkinter.Canvas.update(self) + + def update_idletasks(self): + ##import mfxutil; print mfxutil.callername() + Tkinter.Canvas.update_idletasks(self) + diff --git a/pysollib/tk/tkconst.py b/pysollib/tk/tkconst.py new file mode 100644 index 00000000..94c52dbc --- /dev/null +++ b/pysollib/tk/tkconst.py @@ -0,0 +1,124 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['tkname', + 'tkversion', + 'TK_DASH_PATCH', + 'EVENT_HANDLED', + 'EVENT_PROPAGATE', + 'CURSOR_DRAG', + 'CURSOR_WATCH', + 'ANCHOR_CENTER', + 'ANCHOR_N', + 'ANCHOR_NW', + 'ANCHOR_NE', + 'ANCHOR_S', + 'ANCHOR_SW', + 'ANCHOR_SE', + 'ANCHOR_W', + 'ANCHOR_E', + 'TOOLBAR_BUTTONS', + ] + +# imports +import sys, os +import Tkinter + +# Toolkit imports + +n_ = lambda x: x + +# /*********************************************************************** +# // constants +# ************************************************************************/ + +tkname = "tk" + +# (major version, minor version, micro version, patchlevel) +tkversion = (8, 0, 0, 0) +try: + m = str(Tkinter._tkinter.TK_VERSION).split(".") + if m: + m = map(int, m) + 4*[0] + tkversion = tuple(m[:4]) + del m +except: + pass + +# experimental +TK_DASH_PATCH = 0 + + +EVENT_HANDLED = "break" +EVENT_PROPAGATE = None + +CURSOR_DRAG = "hand1" +CURSOR_WATCH = "watch" + +ANCHOR_CENTER = Tkinter.CENTER +ANCHOR_N = Tkinter.N +ANCHOR_NW = Tkinter.NW +ANCHOR_NE = Tkinter.NE +ANCHOR_S = Tkinter.S +ANCHOR_SW = Tkinter.SW +ANCHOR_SE = Tkinter.SE +ANCHOR_W = Tkinter.W +ANCHOR_E = Tkinter.E + +COMPOUNDS = ( + ##(Tkinter.BOTTOM, 'bottom'), + ##(Tkinter.CENTER, 'center'), + ##(Tkinter.RIGHT, 'right'), + (Tkinter.NONE, n_('Icons only')), + (Tkinter.TOP, n_('Text below icons')), + (Tkinter.LEFT, n_('Text beside icons')), + ('text', n_('Text only')), + ) + +TOOLBAR_BUTTONS = ( + "new", + "restart", + "open", + "save", + "undo", + "redo", + "autodrop", + "pause", + "statistics", + "rules", + "quit", + "player", + ) + diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py new file mode 100644 index 00000000..afe0f2ce --- /dev/null +++ b/pysollib/tk/tkhtml.py @@ -0,0 +1,549 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['tkHTMLViewer'] + +# imports +import os, sys, re, string, types +import htmllib, formatter +import Tkinter + +# PySol imports +from pysollib.mfxutil import Struct, openURL +from pysollib.settings import PACKAGE + +# Toolkit imports +from tkutil import bind, unbind_destroy, loadImage +from tkwidget import MfxDialog +from statusbar import HtmlStatusbar + + +REMOTE_PROTOCOLS = ("ftp:", "gopher:", "http:", "mailto:", "news:", "telnet:") + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxScrolledText(Tkinter.Text): + def __init__(self, parent=None, **cnf): + fcnf = {} + for k in cnf.keys(): + if type(k) is types.ClassType or k == "name": + fcnf[k] = cnf[k] + del cnf[k] + if cnf.has_key("bg"): + fcnf["bg"] = cnf["bg"] + self.frame = apply(Tkinter.Frame, (parent,), fcnf) + self.vbar = Tkinter.Scrollbar(self.frame, name="vbar") + self.vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y) + cnf["name"] = "text" + apply(Tkinter.Text.__init__, (self, self.frame), cnf) + self.pack(side=Tkinter.LEFT, fill=Tkinter.BOTH, expand=1) + self["yscrollcommand"] = self.vbar.set + self.vbar["command"] = self.yview + + # FIXME: copy Pack methods of self.frame -- this is a hack! + for m in Tkinter.Pack.__dict__.keys(): + if m[0] != "_" and m != "config" and m != "configure": + ##print m, getattr(self.frame, m) + setattr(self, m, getattr(self.frame, m)) + + self.frame["highlightthickness"] = 0 + self.vbar["highlightthickness"] = 0 + ##print self.__dict__ + + # XXX these are missing in Tkinter.py + def xview_moveto(self, fraction): + return self.tk.call(self._w, "xview", "moveto", fraction) + def xview_scroll(self, number, what): + return self.tk.call(self._w, "xview", "scroll", number, what) + def yview_moveto(self, fraction): + return self.tk.call(self._w, "yview", "moveto", fraction) + def yview_scroll(self, number, what): + return self.tk.call(self._w, "yview", "scroll", number, what) + + +class MfxReadonlyScrolledText(MfxScrolledText): + def __init__(self, parent=None, **cnf): + apply(MfxScrolledText.__init__, (self, parent), cnf) + self.config(state="disabled", insertofftime=0) + self.frame.config(takefocus=0) + self.config(takefocus=0) + self.vbar.config(takefocus=0) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class tkHTMLWriter(formatter.DumbWriter): + def __init__(self, text, viewer, app): + formatter.DumbWriter.__init__(self, self, maxcol=9999) + + self.text = text + self.viewer = viewer + + ## + font = app.getFont("sans") + size = font[1] + fixed = app.getFont("fixed") + sign = 1 + if size < 0: sign = -1 + self.fontmap = { + "h1" : (font[0], size + 12*sign, "bold"), + "h2" : (font[0], size + 8*sign, "bold"), + "h3" : (font[0], size + 6*sign, "bold"), + "h4" : (font[0], size + 4*sign, "bold"), + "h5" : (font[0], size + 2*sign, "bold"), + "h6" : (font[0], size + 1*sign, "bold"), + "bold" : (font[0], size, "bold"), + "italic" : (font[0], size, "italic"), + "pre" : fixed, + } + + self.text.config(cursor=self.viewer.defcursor, font=font) + for f in self.fontmap.keys(): + self.text.tag_config(f, font=self.fontmap[f]) + + self.anchor = None + self.anchor_mark = None + self.font = None + self.font_mark = None + self.indent = "" + + def createCallback(self, href): + class Functor: + def __init__(self, viewer, arg): + self.viewer = viewer + self.arg = arg + def __call__(self, *args): + self.viewer.updateHistoryXYView() + return self.viewer.display(self.arg) + return Functor(self.viewer, href) + + def write(self, data): + ## FIXME + ##if self.col == 0 and self.atbreak == 0: + ## self.text.insert("insert", self.indent) + self.text.insert("insert", data) + + def __write(self, data): + self.text.insert("insert", data) + + def anchor_bgn(self, href, name, type): + if href: + ##self.text.update_idletasks() # update display during parsing + self.anchor = (href, name, type) + self.anchor_mark = self.text.index("insert") + + def anchor_end(self): + if self.anchor: + url = self.anchor[0] + tag = "href_" + url + self.text.tag_add(tag, self.anchor_mark, "insert") + self.text.tag_bind(tag, "<1>", self.createCallback(url)) + self.text.tag_bind(tag, "", lambda e: self.anchor_enter(url)) + self.text.tag_bind(tag, "", self.anchor_leave) + self.text.tag_config(tag, foreground="blue", underline=1) + self.anchor = None + + def anchor_enter(self, url): + for p in REMOTE_PROTOCOLS: + if url.startswith(p): + break + else: + url = 'file://'+self.viewer.basejoin(url) + self.viewer.statusbar.updateText(url=url) + self.text.config(cursor=self.viewer.handcursor) + + def anchor_leave(self, *args): + self.viewer.statusbar.updateText(url='') + self.text.config(cursor=self.viewer.defcursor) + + def new_font(self, font): + # end the current font + if self.font: + ##print "end_font(%s)" % `self.font` + self.text.tag_add(self.font, self.font_mark, "insert") + self.font = None + # start the new font + if font: + ##print "start_font(%s)" % `font` + self.font_mark = self.text.index("insert") + if self.fontmap.has_key(font[0]): + self.font = font[0] + elif font[3]: + self.font = "pre" + elif font[2]: + self.font = "bold" + elif font[1]: + self.font = "italic" + else: + self.font = None + + def new_margin(self, margin, level): + self.indent = " " * level + + def send_label_data(self, data): + self.__write(self.indent + data + " ") + + def send_paragraph(self, blankline): + if self.col > 0: + self.__write("\n") + if blankline > 0: + self.__write("\n" * blankline) + self.col = 0 + self.atbreak = 0 + + def send_hor_rule(self, *args): + width = int(int(self.text["width"]) * 0.9) + self.__write("_" * width) + self.__write("\n") + self.col = 0 + self.atbreak = 0 + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class tkHTMLParser(htmllib.HTMLParser): + def anchor_bgn(self, href, name, type): + htmllib.HTMLParser.anchor_bgn(self, href, name, type) + self.formatter.writer.anchor_bgn(href, name, type) + + def anchor_end(self): + if self.anchor: + self.anchor = None + self.formatter.writer.anchor_end() + + def do_dt(self, attrs): + self.formatter.end_paragraph(1) + self.ddpop() + + def handle_image(self, src, alt, ismap, align, width, height): + self.formatter.writer.viewer.showImage(src, alt, ismap, align, width, height) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class tkHTMLViewer: + def __init__(self, parent): + self.parent = parent + self.home = None + self.url = None + self.history = Struct( + list = [], + index = 0, + ) + self.images = {} # need to keep a reference because of garbage collection + self.defcursor = parent["cursor"] + self.handcursor = "hand2" + + # create buttons + button_width = 8 + self.homeButton = Tkinter.Button(parent, text=_("Index"), + width=button_width, + command=self.goHome) + self.homeButton.grid(row=0, column=0, sticky='w') + self.backButton = Tkinter.Button(parent, text=_("Back"), + width=button_width, + command=self.goBack) + self.backButton.grid(row=0, column=1, sticky='w') + self.forwardButton = Tkinter.Button(parent, text=_("Forward"), + width=button_width, + command=self.goForward) + self.forwardButton.grid(row=0, column=2, sticky='w') + self.closeButton = Tkinter.Button(parent, text=_("Close"), + width=button_width, + command=self.destroy) + self.closeButton.grid(row=0, column=3, sticky='e') + + # create text widget + text_frame = Tkinter.Frame(parent) + text_frame.grid(row=1, column=0, columnspan=4, sticky='nsew') + self.text = MfxReadonlyScrolledText(text_frame, + fg="#000000", bg="#f7f3ff", + cursor=self.defcursor, + wrap="word", padx=20, pady=20) + self.text.pack(side="top", fill="both", expand=1) + + # statusbar + self.statusbar = HtmlStatusbar(parent, row=2, column=0, columnspan=4) + + parent.columnconfigure(2, weight=1) + parent.rowconfigure(1, weight=1) + + self.initBindings() + + def initBindings(self): + w = self.parent + bind(w, "WM_DELETE_WINDOW", self.destroy) + bind(w, "", self.destroy) + bind(w, "", self.page_up) + bind(w, "", self.page_down) + bind(w, "", self.unit_up) + bind(w, "", self.unit_down) + bind(w, "", self.scroll_top) + bind(w, "", self.scroll_top) + bind(w, "", self.scroll_bottom) + bind(w, "", self.goBack) + + def destroy(self, *event): + unbind_destroy(self.parent) + try: + self.parent.wm_withdraw() + except: pass + try: + self.parent.destroy() + except: pass + self.parent = None + + def page_up(self, *event): + self.text.yview_scroll(-1, "page") + return "break" + def page_down(self, *event): + self.text.yview_scroll(1, "page") + return "break" + def unit_up(self, *event): + self.text.yview_scroll(-1, "unit") + return "break" + def unit_down(self, *event): + self.text.yview_scroll(1, "unit") + return "break" + def scroll_top(self, *event): + self.text.yview_moveto(0) + return "break" + def scroll_bottom(self, *event): + self.text.yview_moveto(1) + return "break" + + # locate a file relative to the current self.url + def basejoin(self, url, baseurl=None, relpath=1): + if baseurl is None: + baseurl = self.url + if 0: + import urllib + url = urllib.pathname2url(url) + if relpath and self.url: + url = urllib.basejoin(baseurl, url) + else: + url = os.path.normpath(url) + if relpath and baseurl and not os.path.isabs(url): + h1, t1 = os.path.split(url) + h2, t2 = os.path.split(baseurl) + if cmp(h1, h2) != 0: + url = os.path.join(h2, h1, t1) + url = os.path.normpath(url) + return url + + def openfile(self, url): + if url[-1:] == "/" or os.path.isdir(url): + url = os.path.join(url, "index.html") + url = os.path.normpath(url) + return open(url, "rb"), url + + def display(self, url, add=1, relpath=1, xview=0, yview=0): + # for some reason we have to stop the PySol demo + # (is this a multithread problem with Tkinter ?) + if self.__dict__.get("app"): + if self.app and self.app.game: + self.app.game.stopDemo() + ##self.app.game._cancelDrag() + + # ftp: and http: would work if we use urllib, but this widget is + # far too limited to display anything but our documentation... + for p in REMOTE_PROTOCOLS: + if url.startswith(p): + if not openURL(url): + self.errorDialog(PACKAGE + _(''' HTML limitation: +The %s protocol is not supported yet. + +Please use your standard web browser +to open the following URL: +%s +''') % (p, url)) + return + + # locate the file relative to the current url + url = self.basejoin(url, relpath=relpath) + + # read the file + try: + file = None + if 0: + import urllib + file = urllib.urlopen(url) + else: + file, url = self.openfile(url) + data = file.read() + file.close() + file = None + except Exception, ex: + if file: file.close() + self.errorDialog(_("Unable to service request:\n") + url + "\n\n" + str(ex)) + return + except: + if file: file.close() + self.errorDialog(_("Unable to service request:\n") + url) + return + + self.url = url + if self.home is None: + self.home = self.url + if add: + self.addHistory(self.url, xview=xview, yview=yview) + + ##print self.history.index, self.history.list + if self.history.index > 1: + self.backButton.config(state="normal") + else: + self.backButton.config(state="disabled") + if self.history.index < len(self.history.list): + self.forwardButton.config(state="normal") + else: + self.forwardButton.config(state="disabled") + + old_c1, old_c2 = self.defcursor, self.handcursor + self.defcursor = self.handcursor = "watch" + self.text.config(cursor=self.defcursor) + self.text.update_idletasks() + ##self.frame.config(cursor=self.defcursor) + ##self.frame.update_idletasks() + self.text.config(state="normal") + self.text.delete("1.0", "end") + ##self.images = {} + writer = tkHTMLWriter(self.text, self, self.app) + fmt = formatter.AbstractFormatter(writer) + parser = tkHTMLParser(fmt) + parser.feed(data) + parser.close() + self.text.config(state="disabled") + if 0.0 <= xview <= 1.0: + self.text.xview_moveto(xview) + if 0.0 <= yview <= 1.0: + self.text.yview_moveto(yview) + self.parent.wm_title(parser.title) + self.parent.wm_iconname(parser.title) + self.defcursor, self.handcursor = old_c1, old_c2 + self.text.config(cursor=self.defcursor) + ##self.frame.config(cursor=self.defcursor) + + def addHistory(self, url, xview=0, yview=0): + if self.history.index > 0: + u, xv, yv = self.history.list[self.history.index-1] + if cmp(u, url) == 0: + self.updateHistoryXYView() + return + del self.history.list[self.history.index : ] + self.history.list.append((url, xview, yview)) + self.history.index = self.history.index + 1 + + def updateHistoryXYView(self): + if self.history.index > 0: + url, xview, yview = self.history.list[self.history.index-1] + xview = self.text.xview()[0] + yview = self.text.yview()[0] + self.history.list[self.history.index-1] = (url, xview, yview) + + def goBack(self, *event): + if self.history.index > 1: + self.updateHistoryXYView() + self.history.index = self.history.index - 1 + url, xview, yview = self.history.list[self.history.index-1] + self.display(url, add=0, relpath=0, xview=xview, yview=yview) + + def goForward(self, *event): + if self.history.index < len(self.history.list): + self.updateHistoryXYView() + url, xview, yview = self.history.list[self.history.index] + self.history.index = self.history.index + 1 + self.display(url, add=0, relpath=0, xview=xview, yview=yview) + + def goHome(self, *event): + if self.home and cmp(self.home, self.url) != 0: + self.updateHistoryXYView() + self.display(self.home, relpath=0) + + def errorDialog(self, msg): + d = MfxDialog(self.parent, title=PACKAGE+" HTML Problem", + text=msg, bitmap="warning", + strings=(_("OK"),), default=0) + + def showImage(self, src, alt, ismap, align, width, height): + url = self.basejoin(src) + ##print url, ":", src, alt, ismap, align, width, height + if self.images.has_key(url): + img = self.images[url] + else: + try: + img = Tkinter.PhotoImage(master=self.parent, file=url) + except: + img = None + self.images[url] = img + ##print url, img + if img: + padx, pady = 10, 10 + padx, pady = 0, 20 + if align.lower() == "left": + padx = 0 + self.text.image_create(index="insert", image=img, padx=padx, pady=pady) + + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +def tkhtml_main(args): + try: + url = args[1] + except: + url = os.path.join(os.pardir, os.pardir, "data", "html", "index.html") + top = Tkinter.Tk() + top.wm_minsize(400, 200) + viewer = tkHTMLViewer(top) + viewer.display(url) + top.mainloop() + return 0 + +if __name__ == "__main__": + sys.exit(tkhtml_main(sys.argv)) + + diff --git a/pysollib/tk/tkstats.py b/pysollib/tk/tkstats.py new file mode 100644 index 00000000..279a68af --- /dev/null +++ b/pysollib/tk/tkstats.py @@ -0,0 +1,864 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['SingleGame_StatsDialog', + 'AllGames_StatsDialog', + 'FullLog_StatsDialog', + 'SessionLog_StatsDialog', + 'Status_StatsDialog', + 'Top_StatsDialog'] + +# imports +import os, string, sys, types +import time +import Tkinter, tkFont + +# PySol imports +from pysollib.mfxutil import destruct, Struct, kwdefault, KwStruct +from pysollib.mfxutil import format_time +##from pysollib.util import * +from pysollib.stats import PysolStatsFormatter +from pysollib.settings import TOP_TITLE + +# Toolkit imports +from tkutil import bind, unbind_destroy, loadImage +from tkwidget import _ToplevelDialog, MfxDialog +from tkwidget import MfxScrolledCanvas + +gettext = _ + + +# FIXME - this file a quick hack and needs a rewrite + +# /*********************************************************************** +# // +# ************************************************************************/ + +class SingleGame_StatsDialog(MfxDialog): + def __init__(self, parent, title, app, player, gameid, **kw): + self.app = app + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.top_frame = top_frame + self.createBitmaps(top_frame, kw) + # + self.player = player or _("Demo games") + self.top.wm_minsize(200, 200) + self.button = kw.default + # + ##createChart = self.create3DBarChart + createChart = self.createPieChart + ##createChart = self.createSimpleChart +## if parent.winfo_screenwidth() < 800 or parent.winfo_screenheight() < 600: +## createChart = self.createPieChart +## createChart = self.createSimpleChart + # + self.font = self.app.getFont("default") + self.tk_font = tkFont.Font(self.top, self.font) + self.font_metrics = self.tk_font.metrics() + self._calc_tabs() + # + won, lost = app.stats.getStats(player, gameid) + createChart(app, won, lost, _("Total")) + won, lost = app.stats.getSessionStats(player, gameid) + createChart(app, won, lost, _("Current session")) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + # + # helpers + # + + def _calc_tabs(self): + # + font = self.tk_font + t0 = 160 + t = '' + for i in (_("Won:"), + _("Lost:"), + _("Total:")): + if len(i) > len(t): + t = i + t1 = font.measure(t) +## t1 = max(font.measure(_("Won:")), +## font.measure(_("Lost:")), +## font.measure(_("Total:"))) + t1 += 10 + ##t2 = font.measure('99999')+10 + t2 = 45 + ##t3 = font.measure('100%')+10 + t3 = 45 + tx = (t0, t0+t1+t2, t0+t1+t2+t3) + # + ls = self.font_metrics['linespace'] + ls += 5 + ls = max(ls, 20) + ty = (ls, 2*ls, 3*ls+15, 3*ls+25) + # + self.tab_x, self.tab_y = tx, ty + + def _getPwon(self, won, lost): + pwon, plost = 0.0, 0.0 + if won + lost > 0: + pwon = float(won) / (won + lost) + pwon = min(max(pwon, 0.00001), 0.99999) + plost = 1.0 - pwon + return pwon, plost + + def _createChartInit(self, text): + w, h = self.tab_x[-1]+20, self.tab_y[-1]+20 + c = Tkinter.Canvas(self.top_frame, width=w, height=h) + c.pack(side=Tkinter.TOP, fill=Tkinter.BOTH, expand=0, padx=20, pady=10) + self.canvas = c + ##self.fg = c.cget("insertbackground") + self.fg = c.option_get('foreground', '') or c.cget("insertbackground") + # + c.create_rectangle(2, 7, w, h, fill="", outline="#7f7f7f") + l = Tkinter.Label(c, text=text, font=self.font, bd=0, padx=3, pady=1) + dy = int(self.font_metrics['ascent']) - 10 + dy = dy/2 + c.create_window(20, -dy, window=l, anchor="nw") + + def _createChartTexts(self, tx, ty, won, lost): + c, tfont, fg = self.canvas, self.font, self.fg + pwon, plost = self._getPwon(won, lost) + # + x = tx[0] + dy = int(self.font_metrics['ascent']) - 10 + dy = dy/2 + c.create_text(x, ty[0]-dy, text=_("Won:"), anchor="nw", font=tfont, fill=fg) + c.create_text(x, ty[1]-dy, text=_("Lost:"), anchor="nw", font=tfont, fill=fg) + c.create_text(x, ty[2]-dy, text=_("Total:"), anchor="nw", font=tfont, fill=fg) + x = tx[1] - 16 + c.create_text(x, ty[0]-dy, text="%d" % won, anchor="ne", font=tfont, fill=fg) + c.create_text(x, ty[1]-dy, text="%d" % lost, anchor="ne", font=tfont, fill=fg) + c.create_text(x, ty[2]-dy, text="%d" % (won + lost), anchor="ne", font=tfont, fill=fg) + y = ty[2] - 11 + c.create_line(tx[0], y, x, y, fill=fg) + if won + lost > 0: + x = tx[2] + pw = int(round(100.0 * pwon)) + c.create_text(x, ty[0]-dy, text="%d%%" % pw, anchor="ne", font=tfont, fill=fg) + c.create_text(x, ty[1]-dy, text="%d%%" % (100-pw), anchor="ne", font=tfont, fill=fg) + + +## def _createChart3DBar(self, canvas, perc, x, y, p, col): +## if perc < 0.005: +## return +## # translate and scale +## p = list(p[:]) +## for i in (0, 1, 2, 3): +## p[i] = (x + p[i][0], y + p[i][1]) +## j = i + 4 +## dx = int(round(p[j][0] * perc)) +## dy = int(round(p[j][1] * perc)) +## p[j] = (p[i][0] + dx, p[i][1] + dy) +## # draw rects +## def draw_rect(a, b, c, d, col, canvas=canvas, p=p): +## points = (p[a][0], p[a][1], p[b][0], p[b][1], +## p[c][0], p[c][1], p[d][0], p[d][1]) +## canvas.create_polygon(points, fill=col) +## draw_rect(0, 1, 5, 4, col[0]) +## draw_rect(1, 2, 6, 5, col[1]) +## draw_rect(4, 5, 6, 7, col[2]) +## # draw lines +## def draw_line(a, b, canvas=canvas, p=p): +## ##print a, b, p[a], p[b] +## canvas.create_line(p[a][0], p[a][1], p[b][0], p[b][1]) +## draw_line(0, 1) +## draw_line(1, 2) +## draw_line(0, 4) +## draw_line(1, 5) +## draw_line(2, 6) +## ###draw_line(3, 7) ## test +## draw_line(4, 5) +## draw_line(5, 6) +## draw_line(6, 7) +## draw_line(7, 4) + + + # + # charts + # + +## def createSimpleChart(self, app, won, lost, text): +## #c, tfont, fg = self._createChartInit(frame, 300, 100, text) +## self._createChartInit(300, 100, text) +## c, tfont, fg = self.canvas, self.font, self.fg +## # +## tx = (90, 180, 210) +## ty = (21, 41, 75) +## self._createChartTexts(tx, ty, won, lost) + +## def create3DBarChart(self, app, won, lost, text): +## image = app.gimages.stats[0] +## iw, ih = image.width(), image.height() +## #c, tfont, fg = self._createChartInit(frame, iw+160, ih, text) +## self._createChartInit(iw+160, ih, text) +## c, tfont, fg = self.canvas, self.font, self.fg +## pwon, plost = self._getPwon(won, lost) +## # +## tx = (iw+20, iw+110, iw+140) +## yy = ih/2 ## + 7 +## ty = (yy+21-46, yy+41-46, yy+75-46) +## # +## c.create_image(0, 7, image=image, anchor="nw") +## # +## p = ((0, 0), (44, 6), (62, -9), (20, -14), +## (-3, -118), (-1, -120), (-1, -114), (-4, -112)) +## col = ("#00ff00", "#008200", "#00c300") +## self._createChart3DBar(c, pwon, 102, 145+7, p, col) +## p = ((0, 0), (49, 6), (61, -10), (15, -15), +## (1, -123), (3, -126), (4, -120), (1, -118)) +## col = ("#ff0000", "#860400", "#c70400") +## self._createChart3DBar(c, plost, 216, 159+7, p, col) +## # +## self._createChartTexts(tx, ty, won, lost) +## c.create_text(tx[0], ty[0]-48, text=self.player, anchor="nw", font=tfont, fill=fg) + + def createPieChart(self, app, won, lost, text): + #c, tfont, fg = self._createChartInit(frame, 300, 100, text) + # + self._createChartInit(text) + c, tfont, fg = self.canvas, self.font, self.fg + pwon, plost = self._getPwon(won, lost) + # + #tx = (160, 250, 280) + #ty = (21, 41, 75) + # + tx, ty = self.tab_x, self.tab_y + if won + lost > 0: + ##s, ewon, elost = 90.0, -360.0 * pwon, -360.0 * plost + s, ewon, elost = 0.0, 360.0 * pwon, 360.0 * plost + c.create_arc(20, 25+9, 110, 75+9, fill="#007f00", start=s, extent=ewon) + c.create_arc(20, 25+9, 110, 75+9, fill="#7f0000", start=s+ewon, extent=elost) + c.create_arc(20, 25, 110, 75, fill="#00ff00", start=s, extent=ewon) + c.create_arc(20, 25, 110, 75, fill="#ff0000", start=s+ewon, extent=elost) + x, y = tx[0] - 25, ty[0] + c.create_rectangle(x, y, x+10, y+10, fill="#00ff00") + y = ty[1] + c.create_rectangle(x, y, x+10, y+10, fill="#ff0000") + else: + c.create_oval(20, 25+10, 110, 75+10, fill="#7f7f7f") + c.create_oval(20, 25, 110, 75, fill="#f0f0f0") + c.create_text(65, 50, text=_("No games"), anchor="center", font=tfont, fill="#bfbfbf") + # + self._createChartTexts(tx, ty, won, lost) + + # + # + # + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), + (_("All games..."), 102), + (TOP_TITLE+"...", 105), + (_("Reset..."), 302)), default=0, + image=self.app.gimages.logos[5], + separatorwidth=2, + resizable=0, + padx=10, pady=10, + ) + return MfxDialog.initKw(self, kw) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class CanvasWriter(PysolStatsFormatter.StringWriter): + def __init__(self, canvas, parent_window, font, w, h): + self.canvas = canvas + self.parent_window = parent_window + ##self.fg = canvas.cget("insertbackground") + self.fg = canvas.option_get('foreground', '') or canvas.cget("insertbackground") + self.font = font + self.w = w + self.h = h + self.x = self.y = 0 + self.gameid = None + self.gamenumber = None + self.canvas.config(yscrollincrement=h) + self._tabs = None + + def _addItem(self, id): + self.canvas.dialog.nodes[id] = (self.gameid, self.gamenumber) + + def p(self, s): + if self.y > 16000: + return + h1, h2 = 0, 0 + while s and s[0] == "\n": + s = s[1:] + h1 = h1 + self.h + while s and s[-1] == "\n": + s = s[:-1] + h2 = h2 + self.h + self.y = self.y + h1 + if s: + id = self.canvas.create_text(self.x, self.y, text=s, anchor="nw", + font=self.font, fill=self.fg) + self._addItem(id) + self.y = self.y + h2 + + def pheader(self, s): + pass + + def _calc_tabs(self, arg): + tw = 15*self.w + ##tw = 160 + self._tabs = [tw] + font = tkFont.Font(self.canvas, self.font) + for t in arg[1:]: + tw = font.measure(t)+20 + self._tabs.append(tw) + self._tabs.append(10) + + def pstats(self, *args, **kwargs): + gameid=kwargs.get('gameid', None) + header = False + if self._tabs is None: + # header + header = True + self._calc_tabs(args) + self.gameid = 'header' + self.gamenumber = None +## if False: +## sort_by = ( 'name', 'played', 'won', 'lost', +## 'time', 'moves', 'percent', ) +## frame = Tkinter.Frame(self.canvas) +## i = 0 +## for t in args: +## w = self._tabs[i] +## if i == 0: +## w += 10 +## b = Tkinter.Button(frame, text=t) +## b.grid(row=0, column=i, sticky='ew') +## b.bind('<1>', lambda e, f=self.parent_window.rearrange, s=sort_by[i]: f(s)) +## frame.columnconfigure(i, minsize=w) +## i += 1 +## self.canvas.create_window(0, 0, window=frame, anchor='nw') +## self.y += 20 +## return +## if False: +## i = 0 +## x = 0 +## for t in args: +## w = self._tabs[i] +## h = 18 +## anchor = 'ne' +## y = 0 +## self.canvas.create_rectangle(x+2, y, x+w, y+h, width=1, +## fill="#00ff00", outline="#000000") +## x += w +## self.canvas.create_text(x-3, y+3, text=t, anchor=anchor) +## i += 1 +## self.y += 20 +## return + + else: + self.gameid = gameid + self.gamenumber = None + if self.y > 16000: + return + x, y = 1, self.y + p = self._pstats_text + t1, t2, t3, t4, t5, t6, t7 = args + h = 0 + if not header: t1=gettext(t1) # game name + + for var, text, anchor, tab in ( + ('name', t1, 'nw', self._tabs[0]+self._tabs[1]), + ('played', t2, 'ne', self._tabs[2]), + ('won', t3, 'ne', self._tabs[3]), + ('lost', t4, 'ne', self._tabs[4]), + ('time', t5, 'ne', self._tabs[5]), + ('moves', t6, 'ne', self._tabs[6]), + ('percent', t7, 'ne', self._tabs[7]), ): + if header: self.gamenumber=var + h = max(h, p(x, y, anchor=anchor, text=text)) + x += tab + + self.pstats_perc(x, y, t7) + self.y += h + self.gameid = None + return + +## h = max(h, p(x, y, anchor="nw", text=t1)) +## if header: self.gamenumber='played' +## x += self._tabs[0]+self._tabs[1] +## h = max(h, p(x, y, anchor="ne", text=t2)) +## if header: self.gamenumber='won' +## x += self._tabs[2] +## h = max(h, p(x, y, anchor="ne", text=t3)) +## if header: self.gamenumber='lost' +## x += self._tabs[3] +## h = max(h, p(x, y, anchor="ne", text=t4)) +## if header: self.gamenumber='time' +## x += self._tabs[4] +## h = max(h, p(x, y, anchor="ne", text=t5)) +## if header: self.gamenumber='moves' +## x += self._tabs[5] +## h = max(h, p(x, y, anchor="ne", text=t6)) +## if header: self.gamenumber='percent' +## x += self._tabs[6] +## h = max(h, p(x, y, anchor="ne", text=t7)) +## x += self._tabs[7] +## self.pstats_perc(x, y, t7) +## self.y += h +## self.gameid = None + + def _pstats_text(self, x, y, **kw): + kwdefault(kw, font=self.font, fill=self.fg) + id = apply(self.canvas.create_text, (x, y), kw) + self._addItem(id) + return self.h + ##bbox = self.canvas.bbox(id) + ##return bbox[3] - bbox[1] + + def pstats_perc(self, x, y, t): + if not (t and "0" <= t[0] <= "9"): + return + perc = int(round(float(str(t)))) + if perc < 1: + return + rx, ry, rw, rh = x, y+1, 2 + 8*10, self.h-5 + if 1: + w = int(round(rw*perc/100.0)) + if 1 and w < 1: + return + if w > 0: + w = max(3, w) + w = min(rw - 2, w) + id = self.canvas.create_rectangle(rx, ry, rx+w, ry+rh, width=1, + fill="#00ff00", outline="#000000") + if w < rw: + id = self.canvas.create_rectangle(rx+w, ry, rx+rw, ry+rh, width=1, + fill="#ff0000", outline="#000000") + return + ##fill = "#ffffff" + ##fill = self.canvas["bg"] + fill = None + id = self.canvas.create_rectangle(rx, ry, rx+rw, ry+rh, width=1, + fill=fill, outline="#808080") + if 1: + rx, rw = rx + 1, rw - 1 + ry, rh = ry + 1, rh - 1 + w = int(round(rw*perc/100.0)) + if w > 0: + id = self.canvas.create_rectangle(rx, ry, rx+w, ry+rh, width=0, + fill="#00ff00", outline="") + if w < rw: + id = self.canvas.create_rectangle(rx+w, ry, rx+rw, ry+rh, width=0, + fill="#ff0000", outline="") + return + p = 1.0 + ix = rx + 2 + for i in (1, 11, 21, 31, 41, 51, 61, 71, 81, 91): + if perc < i: + break + ##c = "#ff8040" + r, g, b = 255, 128*p, 64*p + c = "#%02x%02x%02x" % (int(r), int(g), int(b)) + id = self.canvas.create_rectangle(ix, ry+2, ix+6, ry+rh-2, width=0, + fill=c, outline=c) + ix = ix + 8 + p = max(0.0, p - 0.1) + + def plog(self, gamename, gamenumber, date, status, gameid=-1, won=-1): + if gameid > 0 and "0" <= gamenumber[0:1] <= "9": + self.gameid = gameid + self.gamenumber = gamenumber + self.p("%-25s %-20s %17s %s\n" % (gamename, gamenumber, date, status)) + self.gameid = None + self.gamenumber = None + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class AllGames_StatsDialogScrolledCanvas(MfxScrolledCanvas): + pass + + +class AllGames_StatsDialog(MfxDialog): + # for font "canvas_fixed" + #CHAR_W, CHAR_H = 7, 16 + #if os.name == "mac": CHAR_W = 6 + # + YVIEW = 0 + FONT_TYPE = "default" + + def __init__(self, parent, title, app, player, **kw): + lines = 25 + #if parent and parent.winfo_screenheight() < 600: + # lines = 20 + # + self.font = app.getFont(self.FONT_TYPE) + font = tkFont.Font(parent, self.font) + self.font_metrics = font.metrics() + self.CHAR_H = self.font_metrics['linespace'] + self.CHAR_W = font.measure('M') + self.app = app + # + self.player = player + self.title = title + self.sort_by = 'name' + # + kwdefault(kw, width=self.CHAR_W*64, height=lines*self.CHAR_H) + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.top.wm_minsize(200, 200) + self.button = kw.default + # + self.sc = AllGames_StatsDialogScrolledCanvas(top_frame, + width=kw.width, height=kw.height) + self.sc.pack(fill=Tkinter.BOTH, expand=1, padx=kw.padx, pady=kw.pady) + # + self.nodes = {} + self.canvas = self.sc.canvas + self.canvas.dialog = self + bind(self.canvas, "<1>", self.singleClick) + self.fillCanvas(player, title) + bbox = self.canvas.bbox("all") + ##print bbox + ##self.canvas.config(scrollregion=bbox) + self.canvas.config(scrollregion=(0,0,bbox[2],bbox[3])) + self.canvas.yview_moveto(self.YVIEW) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), + (_("Save to file"), 202), + (_("Reset all..."), 301),), + default=0, + separatorwidth=2, resizable=1, + padx=10, pady=10, + #width=900, + ) + return MfxDialog.initKw(self, kw) + + def destroy(self): + self.app = None + self.canvas.dialog = None + self.nodes = {} + self.sc.destroy() + MfxDialog.destroy(self) + + def rearrange(self, sort_by): + if self.sort_by == sort_by: return + self.sort_by = sort_by + self.fillCanvas(self.player, self.title) + + def singleClick(self, event=None): + id = self.canvas.find_withtag(Tkinter.CURRENT) + if not id: + return + ##print id, self.nodes.get(id[0]) + gameid, gamenumber = self.nodes.get(id[0], (None, None)) + if gameid == 'header': + if self.sort_by == gamenumber: return + self.sort_by = gamenumber + self.fillCanvas(self.player, self.title) + return + ## FIXME / TODO + return + if gameid and gamenumber: + print gameid, gamenumber + elif gameid: + print gameid + + # + # + # + + def fillCanvas(self, player, header): + self.canvas.delete('all') + self.nodes = {} + a = PysolStatsFormatter(self.app) + #print 'CHAR_W:', self.CHAR_W + writer = CanvasWriter(self.canvas, self, + self.font, self.CHAR_W, self.CHAR_H) + if not a.writeStats(writer, player, header, sort_by=self.sort_by): + writer.p(_("No entries for player ") + player + "\n") + destruct(writer) + destruct(a) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class FullLog_StatsDialog(AllGames_StatsDialog): + YVIEW = 1 + FONT_TYPE = "fixed" + + def fillCanvas(self, player, header): + a = PysolStatsFormatter(self.app) + writer = CanvasWriter(self.canvas, self, self.font, self.CHAR_W, self.CHAR_H) + if not a.writeFullLog(writer, player, header): + writer.p(_("No log entries for %s\n") % player) + destruct(a) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), (_("Session log..."), 104), (_("Save to file"), 203)), default=0, + width=76*self.CHAR_W, + ) + return AllGames_StatsDialog.initKw(self, kw) + + +class SessionLog_StatsDialog(FullLog_StatsDialog): + def fillCanvas(self, player, header): + a = PysolStatsFormatter(self.app) + writer = CanvasWriter(self.canvas, self, self.font, self.CHAR_W, self.CHAR_H) + if not a.writeSessionLog(writer, player, header): + writer.p(_("No current session log entries for %s\n") % player) + destruct(a) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), (_("Full log..."), 103), (_("Save to file"), 204)), default=0, + ) + return FullLog_StatsDialog.initKw(self, kw) + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Status_StatsDialog(MfxDialog): + def __init__(self, parent, game): + stats, gstats = game.stats, game.gstats + w1 = w2 = "" + n = 0 + for s in game.s.foundations: + n = n + len(s.cards) + w1 = (_("Highlight piles: ") + str(stats.highlight_piles) + "\n" + + _("Highlight cards: ") + str(stats.highlight_cards) + "\n" + + _("Highlight same rank: ") + str(stats.highlight_samerank) + "\n") + if game.s.talon: + if game.gameinfo.redeals != 0: + w2 = w2 + _("\nRedeals: ") + str(game.s.talon.round - 1) + w2 = w2 + _("\nCards in Talon: ") + str(len(game.s.talon.cards)) + if game.s.waste and game.s.waste not in game.s.foundations: + w2 = w2 + _("\nCards in Waste: ") + str(len(game.s.waste.cards)) + if game.s.foundations: + w2 = w2 + _("\nCards in Foundations: ") + str(n) + # + date = time.strftime("%Y-%m-%d %H:%M", time.localtime(game.gstats.start_time)) + MfxDialog.__init__(self, parent, title=_("Game status"), + text=game.getTitleName() + "\n" + + game.getGameNumber(format=1) + "\n" + + _("Playing time: ") + game.getTime() + "\n" + + _("Started at: ") + date + "\n\n"+ + _("Moves: ") + str(game.moves.index) + "\n" + + _("Undo moves: ") + str(stats.undo_moves) + "\n" + + _("Bookmark moves: ") + str(gstats.goto_bookmark_moves) + "\n" + + _("Demo moves: ") + str(stats.demo_moves) + "\n" + + _("Total player moves: ") + str(stats.player_moves) + "\n" + + _("Total moves in this game: ") + str(stats.total_moves) + "\n" + + _("Hints: ") + str(stats.hints) + "\n" + + "\n" + + w1 + w2, + strings=(_("OK"), + (_("Statistics..."), 101), + (TOP_TITLE+"...", 105), ), + image=game.app.gimages.logos[3], + image_side="left", image_padx=20, + padx=20, separatorwidth=2) + +# /*********************************************************************** +# // +# ************************************************************************/ + +class _TopDialog(MfxDialog): + def __init__(self, parent, title, top, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + cnf = {'master': top_frame, + 'highlightthickness': 1, + 'highlightbackground': 'black', + } + frame = apply(Tkinter.Frame, (), cnf) + frame.pack(expand=Tkinter.YES, fill=Tkinter.BOTH, padx=10, pady=10) + frame.columnconfigure(0, weight=1) + cnf['master'] = frame + cnf['text'] = _('N') + l = apply(Tkinter.Label, (), cnf) + l.grid(row=0, column=0, sticky='ew') + cnf['text'] = _('Game number') + l = apply(Tkinter.Label, (), cnf) + l.grid(row=0, column=1, sticky='ew') + cnf['text'] = _('Started at') + l = apply(Tkinter.Label, (), cnf) + l.grid(row=0, column=2, sticky='ew') + cnf['text'] = _('Result') + l = apply(Tkinter.Label, (), cnf) + l.grid(row=0, column=3, sticky='ew') + + row = 1 + for i in top: + # N + cnf['text'] = str(row) + l = apply(Tkinter.Label, (), cnf) + l.grid(row=row, column=0, sticky='ew') + # Game number + cnf['text'] = '#'+str(i.game_number) + l = apply(Tkinter.Label, (), cnf) + l.grid(row=row, column=1, sticky='ew') + # Start time + t = time.strftime('%Y-%m-%d %H:%M', time.localtime(i.game_start_time)) + cnf['text'] = t + l = apply(Tkinter.Label, (), cnf) + l.grid(row=row, column=2, sticky='ew') + # Result + if isinstance(i.value, float): + # time + s = format_time(i.value) + else: + # moves + s = str(i.value) + cnf['text'] = s + l = apply(Tkinter.Label, (), cnf) + l.grid(row=row, column=3, sticky='ew') + row += 1 + + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + + def initKw(self, kw): + kw = KwStruct(kw, strings=(_('OK'),), default=0, separatorwidth = 2) + return MfxDialog.initKw(self, kw) + + +class Top_StatsDialog(MfxDialog): + def __init__(self, parent, title, app, player, gameid, **kw): + self.app = app + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + frame = Tkinter.Frame(top_frame) + frame.pack(expand=Tkinter.YES, fill=Tkinter.BOTH, padx=5, pady=10) + frame.columnconfigure(0, weight=1) + + if app.stats.games_stats.has_key(player) \ + and app.stats.games_stats[player].has_key(gameid) \ + and app.stats.games_stats[player][gameid].time_result.top: + + Tkinter.Label(frame, text=_('Minimum')).grid(row=0, column=1) + Tkinter.Label(frame, text=_('Maximum')).grid(row=0, column=2) + Tkinter.Label(frame, text=_('Average')).grid(row=0, column=3) + ##Tkinter.Label(frame, text=_('Total')).grid(row=0, column=4) + + s = app.stats.games_stats[player][gameid] + row = 1 + ll = [ + (_('Playing time:'), + format_time(s.time_result.min), + format_time(s.time_result.max), + format_time(s.time_result.average), + format_time(s.time_result.total), + s.time_result.top, + ), + (_('Moves:'), + s.moves_result.min, + s.moves_result.max, + round(s.moves_result.average, 2), + s.moves_result.total, + s.moves_result.top, + ), + (_('Total moves:'), + s.total_moves_result.min, + s.total_moves_result.max, + round(s.total_moves_result.average, 2), + s.total_moves_result.total, + s.total_moves_result.top, + ), + ] +## if s.score_result.min: +## ll.append(('Score:', +## s.score_result.min, +## s.score_result.max, +## round(s.score_result.average, 2), +## s.score_result.top, +## )) +## if s.score_casino_result.min: +## ll.append(('Casino Score:', +## s.score_casino_result.min, +## s.score_casino_result.max, +## round(s.score_casino_result.average, 2), )) + for l, min, max, avr, tot, top in ll: + Tkinter.Label(frame, text=l).grid(row=row, column=0) + Tkinter.Label(frame, text=str(min)).grid(row=row, column=1) + Tkinter.Label(frame, text=str(max)).grid(row=row, column=2) + Tkinter.Label(frame, text=str(avr)).grid(row=row, column=3) + ##Tkinter.Label(frame, text=str(tot)).grid(row=row, column=4) + b = Tkinter.Button(frame, text=TOP_TITLE+' ...', width=10, + command=lambda top=top: self.showTop(top)) + b.grid(row=row, column=5) + row += 1 + else: + Tkinter.Label(frame, text=_('No TOP for this game')).pack() + + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + def showTop(self, top): + #print top + d = _TopDialog(self.top, TOP_TITLE, top) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_('OK'),), + default=0, + image=self.app.gimages.logos[4], + separatorwidth = 2) + return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/tktree.py b/pysollib/tk/tktree.py new file mode 100644 index 00000000..dd047d30 --- /dev/null +++ b/pysollib/tk/tktree.py @@ -0,0 +1,422 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +# imports +import os, string, types +import Tkinter + +# Toolkit imports +from tkutil import bind, unbind_destroy +from tkwidget import MfxScrolledCanvas + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxTreeBaseNode: + def __init__(self, tree, parent_node, text, key): + self.tree = tree + self.parent_node = parent_node + self.text = text + self.key = key + # state + self.selected = 0 + self.subnodes = None + # canvas item ids + self.symbol_id = None + self.text_id = None + self.textrect_id = None + + def registerKey(self): + if self.key is not None: + l = self.tree.keys.get(self.key, []) + l.append(self) + self.tree.keys[self.key] = l + + def whoami(self): + if self.parent_node is None: + return (self.text, ) + else: + return self.parent_node.whoami() + (self.text, ) + + def draw(self, x, y, lastx=None, lasty=None): + canvas, style = self.tree.canvas, self.tree.style + topleftx = x + style.distx + toplefty = y - style.height / 2 #+++ + # draw the horizontal line + if lastx is not None: + canvas.create_line(x, y, topleftx, y, stipple=style.linestyle, fill=style.linecolor) + # draw myself - ugly, ugly... + self.selected = 0 + self.symbol_id = -1 + self.drawSymbol(topleftx, toplefty) + linestart = style.distx + style.width + 5 + self.text_id = -1 + self.drawText(x + linestart, y) + return x, y, x, y + style.disty + + # + # + # + + def drawText(self, x, y): + canvas, style = self.tree.canvas, self.tree.style + if self.selected: + fg, bg = style.text_selected_fg, style.text_selected_bg + else: + fg, bg = style.text_normal_fg, style.text_normal_bg + # + if self.tree.nodes.get(self.text_id) is self: + canvas.itemconfig(self.text_id, fill=fg) + else: + # note: I don't use Label + canvas.create_window here + # because it doesn't propagate events to the canvas + # and has some other re-display annoyances + ##print 'style.font:', style.font + self.text_id = canvas.create_text(x+1, y, text=self.text, + anchor="w", justify="left", + font=style.font, + fill=fg) + self.tree.nodes[self.text_id] = self + # + if self.tree.nodes.get(self.textrect_id) is self: + try: + # _tkinter.TclError: unknown option "-fill" ??? + canvas.itemconfig(self.textrect_id, fill=bg) + except Tkinter.TclError: + pass + elif self.selected: + b = canvas.bbox(self.text_id) + self.textrect_id = canvas.create_rectangle(b[0]-1, b[1]-1, b[2]+1, b[3]+1, + fill=bg, outline="") + canvas.tag_lower(self.textrect_id, self.text_id) + self.tree.nodes[self.textrect_id] = self + + def updateText(self): + if self.tree.nodes.get(self.text_id) is self: + self.drawText(-1, -1) + + # + # + # + + def drawSymbol(self, x, y, **kw): + canvas, style = self.tree.canvas, self.tree.style + color = kw.get("color") + if color is None: + if self.selected: + color = "darkgreen" + else: + color = "green" + # note: rectangle outline is one pixel + if self.tree.nodes.get(self.symbol_id) is self: + canvas.itemconfig(self.symbol_id, fill=color) + else: + self.symbol_id = canvas.create_rectangle( + x+1, y+1, x + style.width, y + style.height, fill=color) + self.tree.nodes[self.symbol_id] = self + + def updateSymbol(self): + if self.tree.nodes.get(self.symbol_id) is self: + self.drawSymbol(-1, -1) + + +# /*********************************************************************** +# // Terminal and non-terminal nodes +# ************************************************************************/ + +class MfxTreeLeaf(MfxTreeBaseNode): + def drawText(self, x, y): + if self.text_id < 0: + self.registerKey() + MfxTreeBaseNode.drawText(self, x, y) + + +class MfxTreeNode(MfxTreeBaseNode): + def __init__(self, tree, parent_node, text, key, expanded=0): + MfxTreeBaseNode.__init__(self, tree, parent_node, text, key) + self.expanded = expanded + + def drawChildren(self, x, y, lastx, lasty): + # get subnodes + self.subnodes = self.tree.getContents(self) + # draw subnodes + lx, ly = lastx, lasty + nx, ny = x, y + for node in self.subnodes: + # update tree + node.tree = self.tree + # draw node + lx, ly, nx, ny = node.draw(nx, ny, lx, ly) + # draw the vertical line + if self.subnodes: + style = self.tree.style + dy = (style.disty-style.width)/2 + y = y-style.disty/2-dy + self.tree.canvas.create_line(x, y, nx, ly, + stipple=style.linestyle, + fill=style.linecolor) + return ny + + + def draw(self, x, y, ilastx=None, ilasty=None): + # draw myself + lx, ly, nx, ny = MfxTreeBaseNode.draw(self, x, y, ilastx, ilasty) + if self.expanded: + style = self.tree.style + childx = nx + style.distx + style.width / 2 + childy = ny + clastx = nx + style.distx + style.width / 2 + clasty = ly + style.height /2 + ny = self.drawChildren(childx, childy, clastx, clasty) + return lx, ly, x, ny + + # + # + # + + def drawSymbol(self, x, y, **kw): + color = kw.get("color") + if color is None: + if self.expanded: + color = "red" + else: + color = "pink" + MfxTreeBaseNode.drawSymbol(self, x, y, color=color) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxTreeInCanvas(MfxScrolledCanvas): + class Style: + def __init__(self): + self.distx = 16 + self.disty = 18 + self.width = 16 # width of symbol + self.height = 16 # height of symbol + self.originx = 0 + self.originy = 0 + self.text_normal_fg = "black" + self.text_normal_bg = "white" + self.text_selected_fg = "white" + self.text_selected_bg = "#00008b" # "darkblue" + self.font = None + self.linestyle = "gray50" + self.linecolor = "black" + if os.name == "nt": + self.linestyle = "" # Tk bug ? + self.linecolor = "gray50" + + def __init__(self, parent, rootnodes, **kw): + bg = kw["bg"] = kw.get("bg") or parent.cget("bg") + apply(MfxScrolledCanvas.__init__, (self, parent,), kw) + # + self.rootnodes = rootnodes + self.updateNodesWithTree(self.rootnodes, self) + self.selection_key = None + self.nodes = {} + self.keys = {} + # + self.style = self.Style() + ##self.style.text_normal_fg = self.canvas.cget("insertbackground") + self.style.text_normal_fg = self.canvas.option_get('foreground', '') or self.canvas.cget("insertbackground") + self.style.text_normal_bg = bg + # + bind(self.canvas, "", self.singleClick) + bind(self.canvas, "", self.doubleClick) + ##bind(self.canvas, "", xxx) + self.pack(fill=Tkinter.BOTH, expand=1) + + def destroy(self): + for node in self.keys.get(self.selection_key, []): + node.selected = 0 + MfxScrolledCanvas.destroy(self) + + def findNode(self, event=None): + id = self.canvas.find_withtag(Tkinter.CURRENT) + if id: + return self.nodes.get(id[0]) + return None + + # + # draw nodes + # + + def draw(self): + nx, ny = self.style.originx, self.style.originy + # Account for initial offsets, see topleft[xy] in BaseNode.draw(). + # We do this so that our bounding box always starts at (0,0) + # and the yscrollincrement works nicely. + nx = nx - self.style.distx + ny = ny + self.style.height / 2 + for node in self.rootnodes: + # update tree + node.tree = self + # draw + try: + lx, ly, nx, ny = node.draw(nx, ny, None, None) + except Tkinter.TclError: + # FIXME: Tk bug ??? + raise + # set scroll region + bbox = self.canvas.bbox("all") + ##self.canvas.config(scrollregion=bbox) + self.canvas.config(scrollregion=(0,0,bbox[2],bbox[3])) + self.canvas.config(yscrollincrement=self.style.disty) + + def clear(self): + self.nodes = {} + self.keys = {} + self.canvas.delete("all") + + def redraw(self): + oldcur = self.canvas["cursor"] + self.canvas["cursor"] = "watch" + self.canvas.update_idletasks() + self.clear() + self.draw() + self.updateSelection(self.selection_key) + self.canvas["cursor"] = oldcur + + # + # + # + + def getContents(self, node): + # Overload this, supposed to return a list of subnodes of node. + pass + + def singleClick(self, event=None): + # Overload this if you want to know when a node is clicked on. + pass + + def doubleClick(self, event=None): + # Overload this if you want to know when a node is d-clicked on. + self.singleClick(event) + + # + # + # + + def updateSelection(self, key): + l1 = self.keys.get(self.selection_key, []) + l2 = self.keys.get(key, []) + for node in l1: + if node.selected and not node in l2: + node.selected = 0 + node.updateSymbol() + node.updateText() + for node in l2: + if not node.selected: + node.selected = 1 + node.updateSymbol() + node.updateText() + self.selection_key = key + + def updateNodesWithTree(self, nodes, tree): + for node in nodes: + node.tree = tree + if node.subnodes: + self.updateNodesWithTree(node.subnodes, tree) + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +class DirectoryBrowser(MfxTreeInCanvas): + def __init__(self, parent, dirs): + nodes = [] + if type(dirs) is types.StringType: + dirs = (dirs,) + for dir in dirs: + self.addNode(nodes, None, dir, dir) + # note: best results if height is a multiple of style.disty + MfxTreeInCanvas.__init__(self, parent, nodes, height=25*18) + self.draw() + + def addNode(self, list, node, filename, text): + try: + if os.path.isdir(filename): + list.append(MfxTreeNode(self, node, text, key=filename)) + else: + list.append(MfxTreeLeaf(self, node, text, key=filename)) + except EnvironmentError: + pass + + def getContents(self, node): + # use cached values + if node.subnodes is not None: + return node.subnodes + # + dir = node.key + print "Getting %s" % dir + try: + filenames = os.listdir(dir) + filenames.sort() + except EnvironmentError: + return () + contents = [] + for filename in filenames: + self.addNode(contents, node, os.path.join(dir, filename), filename) + ##print "gotten" + return contents + + def singleClick(self, event=None): + node = self.findNode(event) + if not node: + return + print "Clicked node %s %s" % (node.text, node.key) + if isinstance(node, MfxTreeLeaf): + self.updateSelection(key=node.key) + elif isinstance(node, MfxTreeNode): + node.expanded = not node.expanded + self.redraw() + return "break" + + +if __name__ == "__main__": + tk = Tkinter.Tk() + if os.name == "nt": + app = DirectoryBrowser(tk, ("c:\\", "c:\\windows")) + else: + app = DirectoryBrowser(tk, ("/", "/home")) + tk.mainloop() + + diff --git a/pysollib/tk/tkutil.py b/pysollib/tk/tkutil.py new file mode 100644 index 00000000..d728d33b --- /dev/null +++ b/pysollib/tk/tkutil.py @@ -0,0 +1,396 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['wm_withdraw', + 'wm_deiconify', + 'wm_map', + 'wm_set_icon', + 'wm_get_geometry', + #'setTransient', + #'makeToplevel', + 'makeHelpToplevel', + 'bind', + 'unbind_destroy', + 'after', + 'after_idle', + 'after_cancel', + #'makeImage', + 'copyImage', + 'loadImage', + #'fillImage', + 'createImage', + ] + +# imports +import sys, os, re +import Tkinter +try: + # PIL + import Image + import ImageTk +except ImportError: + Image = None + +# Toolkit imports +from tkconst import tkversion +from pysollib.settings import PACKAGE + + +# /*********************************************************************** +# // window manager util +# ************************************************************************/ + +def wm_withdraw(window): + window.wm_withdraw() + +def wm_deiconify(window): + need_fix = os.name == "nt" and tkversion < (8, 3, 0, 0) + if need_fix: + # FIXME: This is needed so the window pops up on top on Windows. + try: + window.wm_iconify() + window.update_idletasks() + except Tkinter.TclError: + # wm_iconify() may fail if the window is transient + pass + window.wm_deiconify() + +def wm_map(window, maximized=0): + if window.wm_state() != "iconic": + if maximized and os.name == "nt": + window.wm_state("zoomed") + else: + wm_deiconify(window) + +def wm_set_icon(window, filename): + if not filename: + return + if os.name == "posix": + window.wm_iconbitmap("@" + filename) + window.wm_iconmask("@" + filename) + +__wm_get_geometry_re = re.compile(r"^(\d+)x(\d+)\+([\-]?\d+)\+([\-]?\d+)$") + +def wm_get_geometry(window): + g = window.wm_geometry() + m = __wm_get_geometry_re.search(g) + if not m: + raise Tkinter.TclError, "invalid geometry " + str(g) + l = map(int, m.groups()) + if window.wm_state() == "zoomed": + # workaround as Tk returns the "unzoomed" origin + l[2] = l[3] = 0 + return l + + +# /*********************************************************************** +# // window util +# ************************************************************************/ + +def setTransient(window, parent, relx=None, rely=None, expose=1): + # Make an existing toplevel window transient for a parent. + # + # The window must exist but should not yet have been placed; in + # other words, this should be called after creating all the + # subwidget but before letting the user interact. + + # remain invisible while we figure out the geometry + window.wm_withdraw() + window.wm_group(parent) + need_fix = os.name == "nt" and tkversion < (8, 3, 0, 0) + if need_fix: + # FIXME: This is needed to avoid ugly frames on Windows. + window.wm_geometry("+%d+%d" % (-10000, -10000)) + if expose and parent is not None: + # FIXME: This is needed so the window pops up on top on Windows. + window.wm_iconify() + if parent and parent.wm_state() != "withdrawn": + window.wm_transient(parent) + # actualize geometry information + window.update_idletasks() + # show + x, y = __getWidgetXY(window, parent, relx=relx, rely=rely) + if need_fix: + if expose: + wm_deiconify(window) + window.wm_geometry("+%d+%d" % (x, y)) + else: + window.wm_geometry("+%d+%d" % (x, y)) + if expose: + window.wm_deiconify() + +def makeToplevel(parent, title=None): + # Create a Toplevel window. + # + # This is a shortcut for a Toplevel() instantiation plus calls to + # set the title and icon name of the window. + window = Tkinter.Toplevel(parent) #, class_=PACKAGE) + ##window.wm_group(parent) + ##window.wm_command("") + if os.name == "posix": + window.wm_command("/bin/true") + ##window.wm_protocol("WM_SAVE_YOURSELF", None) + if title: + window.wm_title(title) + window.wm_iconname(title) + return window + +def makeHelpToplevel(app, title=None): + # Create an independent Toplevel window. + parent = app.top + window = Tkinter.Tk(className=PACKAGE) + font = parent.option_get('font', '') + if font: + window.option_add('*font', font) + fg, bg = app.top_palette + if bg: + window.tk_setPalette(bg) + if fg: + window.option_add('*foreground', fg) + window.option_add('*selectBackground', '#00008b', 50) + window.option_add('*selectForeground', 'white', 50) + if title: + window.wm_title(title) + window.wm_iconname(title) + return window + +#makeHelpToplevel = makeToplevel + + +def __getWidgetXY(widget, parent, relx=None, rely=None, + w_width=None, w_height=None): + if w_width is None: + w_width = widget.winfo_reqwidth() + if w_height is None: + w_height = widget.winfo_reqheight() + s_width = widget.winfo_screenwidth() + s_height = widget.winfo_screenheight() + m_x = m_y = 0 + m_width, m_height = s_width, s_height + if parent and parent.winfo_ismapped(): + ##print parent.wm_geometry() + ##print parent.winfo_geometry(), parent.winfo_x(), parent.winfo_y(), parent.winfo_rootx(), parent.winfo_rooty(), parent.winfo_vrootx(), parent.winfo_vrooty() + m_x = m_y = None + if os.name == "nt": + try: + m_width, m_height, m_x, m_y = wm_get_geometry(parent) + except: + pass + if m_x is None: + m_x = parent.winfo_x() + m_y = parent.winfo_y() + m_width = parent.winfo_width() + m_height = parent.winfo_height() + if relx is None: relx = 0.5 + if rely is None: rely = 0.3 + else: + if relx is None: relx = 0.5 + if rely is None: rely = 0.5 + m_x = max(m_x, 0) + m_y = max(m_y, 0) + else: + if relx is None: relx = 0.5 + if rely is None: rely = 0.3 + x = m_x + int((m_width - w_width) * relx) + y = m_y + int((m_height - w_height) * rely) + ##print x, y, w_width, w_height, m_x, m_y, m_width, m_height + # make sure the widget is fully on screen + if x < 0: x = 0 + elif x + w_width + 32 > s_width: x = max(0, (s_width - w_width) / 2) + if y < 0: y = 0 + elif y + w_height + 32 > s_height: y = max(0, (s_height - w_height) / 2) + return x, y + + +# /*********************************************************************** +# // bind wrapper - Tkinter doesn't properly delete all bindings +# ************************************************************************/ + +__mfx_bindings = {} +__mfx_wm_protocols = ("WM_DELETE_WINDOW", "WM_TAKE_FOCUS", "WM_SAVE_YOURSELF") + +def bind(widget, sequence, func, add=None): + assert callable(func) + if sequence in __mfx_wm_protocols: + funcid = widget._register(func) + widget.tk.call("wm", "protocol", widget._w, sequence, funcid) + elif add is None: + funcid = widget.bind(sequence, func) + else: + ##add = add and "+" or "" + funcid = widget.bind(sequence, func, add) + k = id(widget) + if __mfx_bindings.has_key(k): + __mfx_bindings[k].append((sequence, funcid)) + else: + __mfx_bindings[k] = [(sequence, funcid)] + +def unbind_destroy(widget): + if widget is None: + return + k = id(widget) + if __mfx_bindings.has_key(k): + for sequence, funcid in __mfx_bindings[k]: + ##print widget, sequence, funcid + try: + if sequence in __mfx_wm_protocols: + widget.tk.call("wm", "protocol", widget._w, sequence, "") + ##widget.deletecommand(funcid) + else: + widget.unbind(sequence, funcid) + except Tkinter.TclError: + pass + del __mfx_bindings[k] + ##for k in __mfx_bindings.keys(): print __mfx_bindings[k] + ##print len(__mfx_bindings.keys()) + + +# /*********************************************************************** +# // timer wrapper - Tkinter doesn't properly delete all commands +# ************************************************************************/ + +def after(widget, ms, func, *args): + timer = apply(widget.after, (ms, func) + args) + command = widget._tclCommands[-1] + return (timer, command, widget) + +def after_idle(widget, func, *args): + return apply(after, (widget, "idle", func) + args) + +def after_cancel(t): + if t is not None: + t[2].after_cancel(t[0]) + try: + t[2].deletecommand(t[1]) + except Tkinter.TclError: + pass + + +# /*********************************************************************** +# // image handling +# ************************************************************************/ + +if Image: + class PIL_Image(ImageTk.PhotoImage): + def __init__(self, file): + im = Image.open(file).convert('RGBA') + ImageTk.PhotoImage.__init__(self, im) + self._pil_image = im + def subsample(self, r): + im = self._pil_image + w, h = im.size + w, h = int(float(w)/r), int(float(h)/r) + im = ImageTk.PhotoImage(im.resize((w, h))) + return im + + +def makeImage(file=None, data=None, dither=None, alpha=None): + kw = {} + if data is None: + assert file is not None + kw["file"] = file + else: + #assert data is not None + kw["data"] = data + if Image: + # use PIL + if file: + im = PIL_Image(file) + return im + # fromstring(mode, size, data, decoder_name='raw', *args) + else: + return Tkinter.PhotoImage(data=data) + if os.name == "nt": + # not available in Tk after about 8.0 + #if dither is not None: + # kw["dither"] = dither + if alpha is not None: + kw["alpha"] = alpha + return apply(Tkinter.PhotoImage, (), kw) + +loadImage = makeImage + +def copyImage(image, x, y, width, height): + if Image: + if isinstance(image, PIL_Image): + return ImageTk.PhotoImage(image._pil_image.crop((x, y, x+width, y+height))) + dest = Tkinter.PhotoImage(width=width, height=height) + assert dest.width() == width + assert dest.height() == height + dest.blank() + image.tk.call(dest, "copy", image.name, "-from", x, y, x+width, y+height) + assert dest.width() == width + assert dest.height() == height + return dest + +def fillImage(image, fill, outline=None): + if not fill and not outline: + return + width = image.width() + height = image.height() + ow = 1 # outline width + if width <= 2*ow or height <= 2*ow: + fill = fill or outline + outline = None + if not outline: + f = (fill,) * width + f = (f,) * height + assert len(f) == height + image.put(f) + elif not fill: + l = ((outline,) * width,) + for y in range(0, ow): + image.put(l, (0, y)) + for y in range(height-ow, height): + image.put(l, (0, y)) + p = ((outline,) * ow,) + for y in range(ow, height-ow): + image.put(p, (0, y)) + image.put(p, (width-ow, y)) + else: + l1 = (outline,) * width + l2 = (outline,) * ow + (fill,) * (width-2*ow) + (outline,) * ow + f = (l1,) * ow + (l2,) * (height-2*ow) + (l1,) * ow + assert len(f) == height + image.put(f) + +def createImage(width, height, fill, outline=None): + image = Tkinter.PhotoImage(width=width, height=height) + assert image.width() == width + assert image.height() == height + image.blank() + fillImage(image, fill, outline) + return image + diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py new file mode 100644 index 00000000..ae5030ff --- /dev/null +++ b/pysollib/tk/tkwidget.py @@ -0,0 +1,646 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['MfxDialog', + 'MfxExceptionDialog', + 'MfxSimpleEntry', + 'MfxTooltip', + 'MfxScrolledCanvas', + ] + +# imports +import os, sys, types, Tkinter +import traceback + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct +from pysollib.mfxutil import win32api + +# Toolkit imports +from tkconst import tkversion +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkutil import after, after_idle, after_cancel +from tkutil import bind, unbind_destroy, makeImage +from tkutil import makeToplevel, setTransient +from tkcanvas import MfxCanvas + +# /*********************************************************************** +# // abstract base class for the dialogs in this module +# ************************************************************************/ + +class _ToplevelDialog: + img = None + def __init__(self, parent, title="", resizable=0, default=-1): + self.parent = parent + self.status = 0 + self.button = default + self.timer = None + self.top = makeToplevel(parent, title=title) + self.top.wm_resizable(resizable, resizable) + ##w, h = self.top.winfo_screenwidth(), self.top.winfo_screenheight() + ##self.top.wm_maxsize(w-4, h-32) + bind(self.top, "WM_DELETE_WINDOW", self.wmDeleteWindow) + + def mainloop(self, focus=None, timeout=0): + bind(self.top, "", self.mCancel) + if focus is not None: + focus.focus() + setTransient(self.top, self.parent) + try: + self.top.grab_set() + except Tkinter.TclError: + if traceback: traceback.print_exc() + pass + if timeout > 0: + self.timer = after(self.top, timeout, self.mTimeout) + try: self.top.mainloop() + except SystemExit: + pass + self.destroy() + + def destroy(self): + after_cancel(self.timer) + unbind_destroy(self.top) + try: + self.top.wm_withdraw() + except: + if traceback: traceback.print_exc() + pass + try: + self.top.destroy() + except: + if traceback: traceback.print_exc() + pass + #destruct(self.top) + if 1 and self.parent: # ??? + try: + ##self.parent.update_idletasks() + # FIXME: why do we need this under Windows ? + if hasattr(self.parent, "busyUpdate"): + self.parent.busyUpdate() + else: + self.parent.update() + except: + if traceback: traceback.print_exc() + pass + self.top = None + self.parent = None + + def wmDeleteWindow(self, *event): + self.status = 1 + raise SystemExit + ##return EVENT_HANDLED + + def mCancel(self, *event): + self.status = 1 + raise SystemExit + + def mTimeout(self, *event): + self.status = 2 + raise SystemExit + + +# /*********************************************************************** +# // replacement for the tk_dialog script +# ************************************************************************/ + +class MfxDialog(_ToplevelDialog): + def __init__(self, parent, title, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.button = kw.default + msg = Tkinter.Label(top_frame, text=kw.text, justify=kw.justify, + width=kw.width) + msg.pack(fill=Tkinter.BOTH, expand=1, padx=kw.padx, pady=kw.pady) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + timeout=0, resizable=0, + text="", justify="center", + strings=(_("OK"),), default=0, + width=0, + padx=20, pady=20, + bitmap=None, bitmap_side="left", + bitmap_padx=10, bitmap_pady=20, + image=None, image_side="left", + image_padx=10, image_pady=20, + ) + # default to separator if more than one button + sw = 2 * (len(kw.strings) > 1) + kwdefault(kw.__dict__, separatorwidth=sw) + return kw + + def createFrames(self, kw): + bottom_frame = Tkinter.Frame(self.top) + bottom_frame.pack(side=Tkinter.BOTTOM, fill=Tkinter.BOTH, ipady=3) + if kw.separatorwidth > 0: + separator = Tkinter.Frame(self.top, relief="sunken", + height=kw.separatorwidth, width=kw.separatorwidth, + borderwidth=kw.separatorwidth / 2) + separator.pack(side=Tkinter.BOTTOM, fill=Tkinter.X) + top_frame = Tkinter.Frame(self.top) + top_frame.pack(side=Tkinter.TOP, fill=Tkinter.BOTH, expand=1) + return top_frame, bottom_frame + + def createBitmaps(self, frame, kw): + bm = ["error", "info", "question", "warning"] + if kw.bitmap in bm: + img = None + if self.img: + img = self.img[bm.index(kw.bitmap)] + b = Tkinter.Label(frame, image=img) + b.pack(side=kw.bitmap_side, padx=kw.bitmap_padx, pady=kw.bitmap_pady) + elif kw.bitmap: + b = Tkinter.Label(frame, bitmap=kw.bitmap) + b.pack(side=kw.bitmap_side, padx=kw.bitmap_padx, pady=kw.bitmap_pady) + elif kw.image: + b = Tkinter.Label(frame, image=kw.image) + b.pack(side=kw.image_side, padx=kw.image_padx, pady=kw.image_pady) + + def createButtons(self, frame, kw): + button = column = -1 + padx, pady = kw.get("buttonpadx", 10), kw.get("buttonpady", 10) + focus = None + max_len = 0 + for s in kw.strings: + if type(s) is types.TupleType: + s = s[0] + if s: + ##s = re.sub(r"[\s\.\,]", "", s) + s = s.replace('...', '.') + max_len = max(max_len, len(s)) + ##print s, len(s) + if max_len > 12 and os.name == 'posix': button_width = max_len + elif max_len > 9 : button_width = max_len+1 + elif max_len > 6 : button_width = max_len+2 + else : button_width = 8 + #print 'button_width =', button_width + for s in kw.strings: + xbutton = button = button + 1 + if type(s) is types.TupleType: + assert len(s) == 2 + button = int(s[1]) + s = s[0] + if s is None: + continue + if button < 0: + b = Tkinter.Button(frame, text=s, state="disabled") + button = xbutton + else: + b = Tkinter.Button(frame, text=s, default="normal", + command=(lambda self=self, button=button: self.mDone(button))) + if button == kw.default: + focus = b + focus.config(default="active") + l = len(s) +## if 1 and l < max_len: +## l = l + (max_len - l) / 2 +## b.config(width=l) + b.config(width=button_width) + column = column + 1 + b.grid_configure(column=column, row=0, sticky="ew", padx=padx, pady=pady) + b.grid_columnconfigure(column) + if focus is not None: + l = (lambda event=None, self=self, button=kw.default: self.mDone(button)) + bind(self.top, "", l) + bind(self.top, "", l) + return focus + + def mDone(self, button): + self.button = button + raise SystemExit + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxExceptionDialog(MfxDialog): + def __init__(self, parent, ex, title="Error", **kw): + kw = KwStruct(kw, bitmap="error") + text = kw.get("text", "") + if not text.endswith("\n"): + text = text + "\n" + text = text + "\n" + if isinstance(ex, EnvironmentError) and ex.filename is not None: + t = "[Errno %s] %s:\n%s" % (ex.errno, ex.strerror, repr(ex.filename)) + else: + t = str(ex) + kw.text = text + unicode(t, errors='replace') + apply(MfxDialog.__init__, (self, parent, title), kw.getKw()) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxSimpleEntry(MfxDialog): + def __init__(self, parent, title, label, value, **kw): + kw = self.initKw(kw) + _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.value = value + if label: + label = Tkinter.Label(top_frame, text=label, takefocus=0) + label.pack(pady=5) + w = kw.get("e_width", 0) # width in characters + self.var = Tkinter.Entry(top_frame, exportselection=1, width=w) + self.var.insert(0, value) + self.var.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + # + focus = self.createButtons(bottom_frame, kw) + focus = self.var + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("OK"), _("Cancel")), default=0, + separatorwidth = 0, + ) + return MfxDialog.initKw(self, kw) + + def mDone(self, button): + self.button = button + self.value = self.var.get() + raise SystemExit + + +# /*********************************************************************** +# // a simple tooltip +# ************************************************************************/ + +class MfxTooltip: + def __init__(self, widget): + # private vars + self.widget = widget + self.text = None + self.timer = None + self.cancel_timer = None + self.tooltip = None + self.label = None + self.bindings = [] + self.bindings.append(self.widget.bind("", self._enter)) + self.bindings.append(self.widget.bind("", self._leave)) + self.bindings.append(self.widget.bind("", self._leave)) + # user overrideable settings + self.time = 600 # milliseconds + self.cancel_time = 5000 + self.relief = Tkinter.SOLID + self.justify = Tkinter.LEFT + self.fg = "#000000" + self.bg = "#ffffe0" + self.xoffset = 0 + self.yoffset = 4 + + def setText(self, text): + self.text = text + + def _unbind(self): + if self.bindings and self.widget: + self.widget.unbind("", self.bindings[0]) + self.widget.unbind("", self.bindings[1]) + self.widget.unbind("", self.bindings[2]) + self.bindings = [] + + def destroy(self): + self._unbind() + self._leave() + + def _enter(self, *event): + after_cancel(self.timer) + after_cancel(self.cancel_timer) + self.cancel_timer = None + self.timer = after(self.widget, self.time, self._showTip) + + def _leave(self, *event): + after_cancel(self.timer) + after_cancel(self.cancel_timer) + self.timer = self.cancel_timer = None + if self.tooltip: + self.label.destroy() + destruct(self.label) + self.label = None + self.tooltip.destroy() + destruct(self.tooltip) + self.tooltip = None + + def _showTip(self): + self.timer = None + if self.tooltip or not self.text: + return + if isinstance(self.widget, Tkinter.Button): + if self.widget["state"] == Tkinter.DISABLED: + return + ##x = self.widget.winfo_rootx() + x = self.widget.winfo_pointerx() + y = self.widget.winfo_rooty() + self.widget.winfo_height() + x += self.xoffset + y += self.yoffset + self.tooltip = Tkinter.Toplevel() + self.tooltip.wm_iconify() + self.tooltip.wm_overrideredirect(1) + self.tooltip.wm_protocol("WM_DELETE_WINDOW", self.destroy) + self.label = Tkinter.Label(self.tooltip, text=self.text, + relief=self.relief, justify=self.justify, + fg=self.fg, bg=self.bg, bd=1, takefocus=0) + self.label.pack(ipadx=1, ipady=1) + self.tooltip.wm_geometry("%+d%+d" % (x, y)) + self.tooltip.wm_deiconify() + self.cancel_timer = after(self.widget, self.cancel_time, self._leave) + ##self.tooltip.tkraise() + + +# /*********************************************************************** +# // A canvas widget with scrollbars and some useful bindings. +# ************************************************************************/ + +class MfxScrolledCanvas: + def __init__(self, parent, hbar=2, vbar=2, **kw): + bg = kw.get("bg", parent.cget("bg")) + kwdefault(kw, bg=bg, highlightthickness=0) + self.parent = parent + self.createFrame(kw) + self.canvas = None + self.hbar = None + self.hbar_mode = hbar + self.vbar = None + self.vbar_mode = vbar + self.hbar_show = 0 + self.vbar_show = 0 + self.resize_pending = 0 + self.timer = None + self.createCanvas(kw) + self.frame.grid_rowconfigure(0, weight=1) + self.frame.grid_columnconfigure(0, weight=1) + if hbar: + if hbar == 3: + w = 21 + if win32api: + w = win32api.GetSystemMetrics(3) # SM_CYHSCROLL + self.frame.grid_rowconfigure(1, minsize=w) + self.createHbar(bg) + if not vbar: + bind(self.hbar, "", self._mapBar) + self.bindHbar() + if vbar: + if vbar == 3: + w = 21 + if win32api: + w = win32api.GetSystemMetrics(2) # SM_CXVSCROLL + self.frame.grid_columnconfigure(1, minsize=w) + self.createVbar(bg) + bind(self.vbar, "", self._mapBar) + self.bindVbar() + ###self.canvas.focus_set() + + # + # + # + + def destroy(self): + after_cancel(self.timer) + self.timer = None + self.unbind_all() + self.canvas.destroy() + self.frame.destroy() + + def pack(self, **kw): + apply(self.frame.pack, (), kw) + + def grid(self, **kw): + apply(self.frame.grid, (), kw) + + # + # + # + + def setTile(self, app, i, force=False): + tile = app.tabletile_manager.get(i) + if tile is None or tile.error: + return False + ##print i, tile + if i == 0: + assert tile.color + assert tile.filename is None + else: + assert tile.color is None + assert tile.filename + assert tile.basename + if not force: + if i == app.tabletile_index and tile.color == app.opt.table_color: + return False + # + if not self.canvas.setTile(tile.filename, tile.stretch): + tile.error = True + return False + + if i == 0: + self.canvas.config(bg=tile.color) + ##app.top.config(bg=tile.color) + color = None + else: + self.canvas.config(bg=app.top_bg) + ##app.top.config(bg=app.top_bg) + color = tile.text_color + + if app.opt.table_text_color: + self.canvas.setTextColor(app.opt.table_text_color_value) + else: + self.canvas.setTextColor(color) + + return True + + # + # + # + + def unbind_all(self): + unbind_destroy(self.hbar) + unbind_destroy(self.vbar) + unbind_destroy(self.canvas) + unbind_destroy(self.frame) + + def createFrame(self, kw): + width = kw.get("width") + height = kw.get("height") + self.frame = Tkinter.Frame(self.parent, width=width, height=height, bg=None) + + def createCanvas(self, kw): + #self.canvas = apply(Tkinter.Canvas, (self.frame,), kw) + self.canvas = apply(MfxCanvas, (self.frame,), kw) + self.canvas.grid(row=0, column=0, sticky="news") + def createHbar(self, bg): + self.hbar = Tkinter.Scrollbar(self.frame, name="hbar", bg=bg, takefocus=0, orient="horizontal") + self.canvas["xscrollcommand"] = self._setHbar + self.hbar["command"] = self.canvas.xview + def createVbar(self, bg): + self.vbar = Tkinter.Scrollbar(self.frame, name="vbar", bg=bg, takefocus=0) + self.canvas["yscrollcommand"] = self._setVbar + self.vbar["command"] = self.canvas.yview + def bindHbar(self, w=None): + if w is None: + w = self.canvas + bind(w, "", self.unit_left) + bind(w, "", self.unit_right) + def bindVbar(self, w=None): + if w is None: + w = self.canvas + bind(w, "", self.page_up) + bind(w, "", self.page_down) + bind(w, "", self.unit_up) + bind(w, "", self.unit_down) + bind(w, "", self.scroll_top) + bind(w, "", self.scroll_top) + bind(w, "", self.scroll_bottom) + # mousewheel support + if os.name == 'posix': + bind(w, '<4>', self.mouse_wheel_up) + bind(w, '<5>', self.mouse_wheel_down) + # don't work on Linux + #bind(w, '', self.mouse_wheel) + + + def mouse_wheel(self, *args): + print 'MfxScrolledCanvas.mouse_wheel', args + + def _mapBar(self, event): + # see: autoscroll.tcl, http://mini.net/cgi-bin/wikit/950.html + top = event.widget.winfo_toplevel() + g = top.wm_geometry() + if self.resize_pending: + self.resize_pending = 0 + self.canvas.update() + self.canvas.update_idletasks() + top.wm_geometry(g) + + def _setHbar(self, *args): + ##apply(self.hbar.set, args) + self.canvas.update() + apply(self.hbar.set, self.canvas.xview()) + self.showHbar() + ##self.hbar.update_idletasks() + def _setVbar(self, *args): + ##apply(self.vbar.set, args) + self.canvas.update() + apply(self.vbar.set, self.canvas.yview()) + self.showVbar() + ##self.vbar.update_idletasks() + + def showHbar(self, show=-1): + if not self.hbar: + return 0 + if show < 0: + show = self.hbar_mode + if show > 1: + if not self.canvas.winfo_ismapped(): + return 0 + ##self.canvas.update() + view = self.canvas.xview() + show = abs(view[0]) > 0.0001 or abs(view[1] - 1.0) > 0.0001 + if show == self.hbar_show: + return 0 + if show: + self.hbar.grid(row=1, column=0, sticky="we") + else: + self.hbar.grid_forget() + self.hbar_show = show + return 1 + + def showVbar(self, show=-1): + if not self.vbar: + return 0 + if show < 0: + show = self.vbar_mode + if show > 1: + if not self.canvas.winfo_ismapped(): + return 0 + ##self.canvas.update() + view = self.canvas.yview() + show = abs(view[0]) > 0.0001 or abs(view[1] - 1.0) > 0.0001 + if show == self.vbar_show: + return 0 + if show: + self.vbar.grid(row=0, column=1, sticky="ns") + else: + self.vbar.grid_forget() + self.vbar_show = show + return 1 + + def page_up(self, *event): + self.canvas.yview_scroll(-1, "page") + return "break" + def page_down(self, *event): + self.canvas.yview_scroll(1, "page") + return "break" + def unit_up(self, *event): + self.canvas.yview_scroll(-1, "unit") + return "break" + def unit_down(self, *event): + self.canvas.yview_scroll(1, "unit") + return "break" + def mouse_wheel_up(self, *event): + self.canvas.yview_scroll(-5, "unit") + return "break" + def mouse_wheel_down(self, *event): + self.canvas.yview_scroll(5, "unit") + return "break" + def page_left(self, *event): + self.canvas.xview_scroll(-1, "page") + return "break" + def page_right(self, *event): + self.canvas.xview_scroll(1, "page") + return "break" + def unit_left(self, *event): + self.canvas.xview_scroll(-1, "unit") + return "break" + def unit_right(self, *event): + self.canvas.xview_scroll(1, "unit") + return "break" + def scroll_top(self, *event): + self.canvas.yview_moveto(0) + return "break" + def scroll_bottom(self, *event): + self.canvas.yview_moveto(1) + return "break" + + diff --git a/pysollib/tk/tkwrap.py b/pysollib/tk/tkwrap.py new file mode 100644 index 00000000..dfb21889 --- /dev/null +++ b/pysollib/tk/tkwrap.py @@ -0,0 +1,172 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['TclError', + 'BooleanVar', + 'IntVar', + 'StringVar', + 'MfxRoot'] + +# imports +import os, sys, time, types +import Tkinter +from Tkinter import TclError + +# PySol imports +from pysollib.mfxutil import destruct, Struct +from tkutil import after_idle +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE + +# /*********************************************************************** +# // menubar +# ************************************************************************/ + +BooleanVar = Tkinter.BooleanVar +IntVar = Tkinter.IntVar +StringVar = Tkinter.StringVar + + +# /*********************************************************************** +# // Wrapper class for Tk. +# // Required so that a Game will get properly destroyed. +# ************************************************************************/ + +class MfxRoot(Tkinter.Tk): + def __init__(self, **kw): + apply(Tkinter.Tk.__init__, (self,), kw) + self.app = None + # for interruptible sleep + #self.sleep_var = Tkinter.IntVar(self) + #self.sleep_var.set(0) + self.sleep_var = 0 + self.after_id = None + ##self.bind('', self._sleepEvent, add=True) + + def connectApp(self, app): + self.app = app + + # sometimes an update() is needed under Windows, whereas + # under Unix an update_idletasks() would be enough... + def busyUpdate(self): + game = None + if self.app: game = self.app.game + if not game: + self.update() + else: + old_busy = game.busy + game.busy = 1 + if game.canvas: + game.canvas.update() + self.update() + game.busy = old_busy + + def mainquit(self): + self.after_idle(self.quit) + + def screenshot(self, filename): + ##print 'MfxRoot.screenshot not yet implemented' + pass + + def setCursor(self, cursor): + if 0: + ## FIXME: this causes ugly resizes ! + Tkinter.Tk.config(self, cursor=cursor) + elif 0: + ## and this is even worse + ##print self.children + for v in self.children.values(): + v.config(cursor=cursor) + else: + pass + + # + # sleep + # + + def sleep(self, seconds): + #time.sleep(seconds) + self.after(int(seconds*1000)) + return + print 'sleep', seconds + timeout = int(seconds*1000) + self.sleep_var = 0 + while timeout > 0: + self.update() + self.update_idletasks() + if self.sleep_var: + break + self.after(100) + timeout -= 100 + print 'finish sleep' + return + if self.after_id: + self.after_cancel(self.after_id) + self.after_id = self.after(int(seconds*1000), self._sleepEvent) + self.sleep_var.set(1) + self.update() + self.wait_variable(self.sleep_var) + if self.after_id: + self.after_cancel(self.after_id) + self.after_id = None + print 'finish sleep' + + def _sleepEvent(self, *args): + return + print '_sleepEvent', args + self.interruptSleep() + return EVENT_PROPAGATE + + def interruptSleep(self): + return + print 'interruptSleep' + self.update() + self.update_idletasks() + self.sleep_var = 1 + #self.sleep_var.set(0) + #self.after_idle(self.sleep_var.set, 0) + + # + # + # + + def update(self): + Tkinter.Tk.update(self) + + def wmDeleteWindow(self): + if self.app and self.app.menubar: + self.app.menubar.mQuit() + else: + ##self.after_idle(self.quit) + pass diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py new file mode 100644 index 00000000..01d99f3f --- /dev/null +++ b/pysollib/tk/toolbar.py @@ -0,0 +1,526 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PysolToolbar'] #, 'TOOLBAR_BUTTONS'] + +# imports +import os, sys, types, Tkinter +import traceback +try: + # PIL + import Image, ImageTk +except ImportError: + Image = None + +# PySol imports +from pysollib.mfxutil import destruct +from pysollib.util import IMAGE_EXTENSIONS +from pysollib.settings import PACKAGE +from pysollib.actions import PysolToolbarActions + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import MfxTooltip +from menubar import createToolbarMenu, MfxMenu + +gettext = _ +n_ = lambda x: x + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class ToolbarButton(Tkinter.Button): + def __init__(self, parent, toolbar, toolbar_name, position, **kwargs): + Tkinter.Button.__init__(self, parent, kwargs) + self.toolbar = toolbar + self.toolbar_name = toolbar_name + self.position = position + self.visible = False + def show(self, orient, force=False): + if self.visible and not force: + return + self.visible = True + padx, pady= 2, 2 + if orient == Tkinter.HORIZONTAL: + self.grid(row=0, + column=self.position, + ipadx=padx, ipady=pady, + sticky='nsew') + else: + self.grid(row=self.position, + column=0, + ipadx=padx, ipady=pady, + sticky='nsew') + def hide(self): + if not self.visible: return + self.visible = False + self.grid_forget() + +class ToolbarSeparator(Tkinter.Frame): + def __init__(self, parent, toolbar, position, **kwargs): + Tkinter.Frame.__init__(self, parent, kwargs) + self.toolbar = toolbar + self.position = position + self.visible = False + def show(self, orient, force=False): + if self.visible and not force: + return + self.visible = True + width = 4 + height = 4 + padx = 6 + pady = 4 + if orient == Tkinter.HORIZONTAL: + self.config(width=width, height=height) + self.grid(row=0, + column=self.position, + padx=padx, pady=pady, + sticky='ns') + else: + self.config(width=height, height=width) + self.grid(row=self.position, + column=0, + padx=pady, pady=padx, + sticky='ew') + def hide(self): + if not self.visible: return + self.visible = False + self.grid_forget() + +class ToolbarFlatSeparator(ToolbarSeparator): + pass + +class ToolbarLabel(Tkinter.Message): + def __init__(self, parent, toolbar, toolbar_name, position, **kwargs): + Tkinter.Message.__init__(self, parent, kwargs) + self.toolbar = toolbar + self.toolbar_name = toolbar_name + self.position = position + self.visible = False + def show(self, orient, force=False): + if self.visible and not force: + return + self.visible = True + padx = 4 + pady = 4 + if orient == Tkinter.HORIZONTAL: + self.grid(row=0, + column=self.position, + padx=padx, pady=pady, + sticky='nsew') + else: + self.grid(row=self.position, + column=0, + padx=padx, pady=pady, + sticky='nsew') + def hide(self): + if not self.visible: return + self.visible = False + self.grid_forget() + + +# /*********************************************************************** +# // Note: Applications should call show/hide after constructor. +# ************************************************************************/ + +class PysolToolbar(PysolToolbarActions): + + def __init__(self, top, dir, size=0, relief=Tkinter.FLAT, + compound=Tkinter.NONE): + + PysolToolbarActions.__init__(self) + + self.top = top + self._setRelief(relief) + self.side = -1 + self._tooltips = [] + self._widgets = [] + self.dir = dir + self.size = size + self.compound = compound + self.orient=Tkinter.HORIZONTAL + self.label_padx = 4 + self.label_pady = 4 + self.button_pad = 2 + # + self.frame = Tkinter.Frame(top) + # + for l, f, t in ( + (n_("New"), self.mNewGame, _("New game")), + (n_("Restart"), self.mRestart, _("Restart the\ncurrent game")), + (None, None, None), + (n_("Open"), self.mOpen, _("Open a\nsaved game")), + (n_("Save"), self.mSave, _("Save game")), + (None, None, None), + (n_("Undo"), self.mUndo, _("Undo last move")), + (n_("Redo"), self.mRedo, _("Redo last move")), + (n_("Autodrop"), self.mDrop, _("Auto drop cards")), + (n_("Pause"), self.mPause, _("Pause game")), + (None, None, None), + (n_("Statistics"), self.mPlayerStats, _("View statistics")), + (n_("Rules"), self.mHelpRules, _("Rules for this game")), + (None, None, None), + (n_("Quit"), self.mQuit, _("Quit ")+PACKAGE), + ): + if l is None: + sep = self._createSeparator() + sep.bind("<1>", self.clickHandler) + sep.bind("<3>", self.rightclickHandler) + else: + self._createButton(l, f, tooltip=t) + + sep = self._createFlatSeparator() + sep.bind("<1>", self.clickHandler) + sep.bind("<3>", self.rightclickHandler) + self._createLabel("player", label=n_('Player'), + tooltip=_("Player options")) + # + self.player_label.bind("<1>",self.mOptPlayerOptions) + ##self.player_label.bind("<3>",self.mOptPlayerOptions) + self.popup = None + self.frame.bind("<1>", self.clickHandler) + self.frame.bind("<3>", self.rightclickHandler) + # + self.setCompound(compound, force=True) + # Change the look of the frame to match the platform look + # (see also setRelief) + if os.name == 'posix': + #self.frame.config(bd=0, highlightthickness=1) + self.frame.config(bd=1, relief='raised', highlightthickness=0) + elif os.name == "nt": + self.frame.config(bd=2, relief="groove", padx=2, pady=2) + #self._createSeparator(width=4, side=Tkinter.LEFT, relief=Tkinter.FLAT) + #self._createSeparator(width=4, side=Tkinter.RIGHT, relief=Tkinter.FLAT) + else: + self.frame.config(bd=0, highlightthickness=1) + + def config(self, w, v): + if w == 'player': + # label + if v: + self.player_label.show(orient=self.orient) + else: + self.player_label.hide() + else: + # button + widget = getattr(self, w+'_button') + position = widget.position + if v: + widget.show(orient=self.orient) + else: + widget.hide() + # + prev_visible = None + for w in self._widgets: + if w.__class__ is ToolbarSeparator: + if prev_visible is None or prev_visible.__class__ is ToolbarSeparator: + w.hide() + else: + w.show(orient=self.orient) + elif w.__class__ is ToolbarFlatSeparator: + if prev_visible.__class__ is ToolbarSeparator: + prev_visible.hide() + if w.visible: + prev_visible = w + + def _setRelief(self, relief): + if type(relief) is types.IntType: + relief = (Tkinter.RAISED, Tkinter.FLAT)[relief] + elif relief in (Tkinter.RAISED, Tkinter.FLAT): + pass + else: + relief = Tkinter.FLAT + self.button_relief = relief + if relief == Tkinter.RAISED: + self.separator_relief = Tkinter.FLAT + else: + self.separator_relief = Tkinter.RAISED + return relief + + # util + def _loadImage(self, name): + file = os.path.join(self.dir, name) + image = None + for ext in IMAGE_EXTENSIONS: + file = os.path.join(self.dir, name+ext) + if os.path.isfile(file): + if Image: + image = ImageTk.PhotoImage(Image.open(file)) + else: + image = Tkinter.PhotoImage(file=file) + break + return image + + def _createSeparator(self): + position=len(self._widgets) + sep = ToolbarSeparator(self.frame, + position=position, + toolbar=self, + bd=1, + highlightthickness=1, + width=4, + takefocus=0, + relief=self.separator_relief) + sep.show(orient=self.orient) + self._widgets.append(sep) + return sep + + def _createFlatSeparator(self): + position=len(self._widgets) + sep = ToolbarFlatSeparator(self.frame, + position=position, + toolbar=self, + bd=1, + highlightthickness=1, + width=5, + takefocus=0, + relief='flat') + sep.show(orient=self.orient) + self.frame.rowconfigure(position, weight=1) + self.frame.columnconfigure(position, weight=1) + self._widgets.append(sep) + return sep + + def _createButton(self, label, command, tooltip=None): + name = label.lower() + image = self._loadImage(name) + position = len(self._widgets) + button = ToolbarButton(self.frame, + position=position, + toolbar=self, + toolbar_name=name, + command=command, takefocus=0, + text=gettext(label), + relief=self.button_relief, + padx=self.button_pad, + pady=self.button_pad) + if image: + button.config(image=image) + button.show(orient=self.orient) + setattr(self, name + "_image", image) + setattr(self, name + "_button", button) + self._widgets.append(button) + if tooltip: + b = MfxTooltip(button) + self._tooltips.append(b) + b.setText(tooltip) + return button + + def _createLabel(self, name, label=None, tooltip=None): + aspect = (400, 300) [self.getSize() != 0] + position = len(self._widgets) + label = ToolbarLabel(self.frame, + position=position, + toolbar=self, + toolbar_name=name, + relief="ridge", + justify="center", + aspect=aspect) + label.show(orient=self.orient) + setattr(self, name + "_label", label) + self._widgets.append(label) + if tooltip: + b = MfxTooltip(label) + self._tooltips.append(b) + b.setText(tooltip) + return label + + def _busy(self): + if not self.side or not self.game or not self.menubar: + return 1 + self.game.stopDemo() + self.game.interruptSleep() + return self.game.busy + + + # + # public methods + # + + def show(self, side=1, resize=1): + if self.side == side: + return 0 + if resize: + self.top.wm_geometry("") # cancel user-specified geometry + if not side: + # hide + self.frame.grid_forget() + else: + # show + pack_func = self.frame.grid_configure + + if side == 1: + # top + pack_func(row=0, column=1, sticky='ew') + elif side == 2: + # bottom + pack_func(row=2, column=1, sticky='ew') + elif side == 3: + # left + pack_func(row=1, column=0, sticky='ns') + else: + # right + pack_func(row=1, column=2, sticky='ns') + # set orient + orient = side in (1, 2) and Tkinter.HORIZONTAL or Tkinter.VERTICAL + self._setOrient(orient) + self.side = side + return 1 + + def hide(self, resize=1): + self.show(0, resize) + + def destroy(self): + for w in self._tooltips: + if w: w.destroy() + self._tooltips = [] + for w in self._widgets: + if w: w.destroy() + self._widgets = [] + + def setCursor(self, cursor): + if self.side: + self.frame.config(cursor=cursor) + self.frame.update_idletasks() + + def connectGame(self, game, menubar): + PysolToolbarActions.connectGame(self, game, menubar) + if self.popup: + self.popup.destroy() + destruct(self.popup) + self.popup = None + if menubar: + tkopt = menubar.tkopt + self.popup = MfxMenu(master=None, label=n_('Toolbar'), tearoff=0) + createToolbarMenu(menubar, self.popup) + + def updateText(self, **kw): + for name in kw.keys(): + label = getattr(self, name + "_label") + label["text"] = kw[name] + + def updateImages(self, dir, size): + if dir == self.dir and size == self.size: + return 0 + if not os.path.isdir(dir): + return 0 + old_dir, old_size = self.dir, self.size + self.dir, self.size = dir, size + data = [] + try: + for w in self._widgets: + if not isinstance(w, ToolbarButton): + continue + name = w.toolbar_name + image = self._loadImage(name) + data.append((name, w, image)) + except: + self.dir, self.size = old_dir, old_size + return 0 + l = self.player_label + aspect = (400, 300) [size != 0] + l.config(aspect=aspect) + for name, w, image in data: + w.config(image=image) + setattr(self, name + "_image", image) + self.setCompound(self.compound, force=True) + return 1 + + def setRelief(self, relief): + if self.button_relief == relief: + return False + self._setRelief(relief) + if os.name == 'posix': + self.frame.config(relief=self.separator_relief) + for w in self._widgets: + if isinstance(w, ToolbarButton): + w.config(relief=self.button_relief) + elif w.__class__ is ToolbarSeparator: # not ToolbarFlatSeparator + w.config(relief=self.separator_relief) + return True + + def setCompound(self, compound, force=False): + if not force and self.compound == compound: + return False + for w in self._widgets: + if not isinstance(w, ToolbarButton): + continue + if compound == 'text': + w.config(compound=Tkinter.NONE, image='') + else: + image = getattr(self, w.toolbar_name+'_image') + w.config(compound=compound, image=image) + self.compound = compound + return True + + def _setOrient(self, orient=Tkinter.HORIZONTAL, force=False): + if not force and self.orient == orient: + return False + for w in self._widgets: + if w.visible: + w.show(orient=orient, force=True) + self.orient = orient + return True + + # + # Mouse event handlers + # + + def clickHandler(self, event): + if self._busy(): return EVENT_HANDLED + return EVENT_HANDLED + + def rightclickHandler(self, event): + if self._busy(): return EVENT_HANDLED + if self.popup: + ##print event.x, event.y, event.x_root, event.y_root, event.__dict__ + self.popup.tk_popup(event.x_root, event.y_root) + return EVENT_HANDLED + + def middleclickHandler(self, event): + if self._busy(): return EVENT_HANDLED + if 1 <= self.side <= 2: + self.menubar.setToolbarSide(3 - self.side) + return EVENT_HANDLED + + def getSize(self): + if self.compound == 'text': + return 0 + size = self.size + comp = int(self.compound in (Tkinter.TOP, Tkinter.BOTTOM)) + return int((size+comp) != 0) + diff --git a/pysollib/util.py b/pysollib/util.py new file mode 100644 index 00000000..3ae41ec9 --- /dev/null +++ b/pysollib/util.py @@ -0,0 +1,228 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['SUITS', + 'COLORS', + 'RANKS', + 'ACE', + 'JACK', + 'QUEEN', + 'KING', + 'ANY_SUIT', + 'ANY_COLOR', + 'ANY_RANK', + 'NO_SUIT', + 'NO_COLOR', + 'NO_RANK', + 'UNLIMITED_MOVES', + 'UNLIMITED_ACCEPTS', + 'UNLIMITED_CARDS', + 'NO_REDEAL', + 'UNLIMITED_REDEALS', + 'VARIABLE_REDEALS', + 'CARDSET', + 'IMAGE_EXTENSIONS', + 'get_version_tuple', + 'Timer', + 'DataLoader', + ] + +# imports +import sys, os, re, time, types + +# PySol imports +from version import VERSION, VERSION_TUPLE +from mfxutil import Pickler, Unpickler, UnpicklingError +from mfxutil import Struct, EnvError +from settings import DATA_DIRS, PACKAGE + +# /*********************************************************************** +# // constants +# ************************************************************************/ + +# Suits values are 0-3. This maps to colors 0-1. +SUITS = (_("Club"), _("Spade"), _("Heart"), _("Diamond")) +COLORS = (_("black"), _("red")) + +# Card ranks are 0-12. We also define symbolic names for the picture cards. +RANKS = (_("Ace"), "2", "3", "4", "5", "6", "7", "8", "9", "10", + _("Jack"), _("Queen"), _("King")) +ACE = 0 +JACK = 10 +QUEEN = 11 +KING = 12 + +# Special values for Stack.cap: +ANY_SUIT = -1 +ANY_COLOR = -1 +ANY_RANK = -1 +NO_SUIT = 999999 # no card can ever match this suit +NO_COLOR = 999999 # no card can ever match this color +NO_RANK = 999999 # no card can ever match this rank +UNLIMITED_MOVES = 999999 # for max_move +UNLIMITED_ACCEPTS = 999999 # for max_accept +UNLIMITED_CARDS = 999999 # for max_cards +# +NO_REDEAL = 0 +UNLIMITED_REDEALS = -1 +VARIABLE_REDEALS = -2 + +CARDSET = _("cardset") + +IMAGE_EXTENSIONS = (".gif", ".ppm",) +if 1 and os.name == "nt": + IMAGE_EXTENSIONS = (".png", ".gif", ".ppm", ".jpg",) + pass +try: + import Image +except ImportError: + pass +else: + IMAGE_EXTENSIONS = (".png", ".gif", ".jpg", ".ppm", ".bmp") + + +def get_version_tuple(version_string): + v = re.split(r"[^\d\.]", version_string) + if not v or not v[0]: + return (0,) + v = v[0].split(".") + v = filter(lambda x: x != "", v) + if not v or not v[0]: + return (0,) + return tuple(map(int, v)) + + +# /*********************************************************************** +# // simple benchmarking +# ************************************************************************/ + +class Timer: + def __init__(self, msg = ""): + self.msg = msg + self.clock = time.time + if os.name == "nt": + self.clock = time.clock + self.start = self.clock() + def reset(self): + self.start = self.clock() + def get(self): + return self.clock() - self.start + def __repr__(self): + return "%-20s %6.3f seconds" % (self.msg, self.clock() - self.start) + + +# /*********************************************************************** +# // DataLoader +# ************************************************************************/ + +class DataLoader: + def __init__(self, argv0, filenames, path=[]): + self.dir = None + if type(filenames) is types.StringType: + filenames = (filenames,) + assert type(filenames) in (types.TupleType, types.ListType) + #$ init path + path = path[:] + head, tail = os.path.split(argv0) + if not head: + head = os.curdir + # dir where placed startup script + path.append(head) + path.append(os.path.join(head, "data")) + path.append(os.path.join(head, os.pardir, "data")) + # dir where placed pysol package + path.append(os.path.join(sys.path[0], "data")) + path.append(os.path.join(sys.path[0], "pysollib", "data")) + # from settings.py + path.extend(DATA_DIRS) + # check path for valid directories + self.path = [] + for p in path: + if not p: continue + np = os.path.abspath(p) + if np and (not np in self.path) and os.path.isdir(np): + self.path.append(np) + # now try to find all filenames along path + for p in self.path: + n = 0 + for filename in filenames: + f = os.path.join(p, filename) + if os.path.isfile(f): + n = n + 1 + else: + break + if n == len(filenames): + self.dir = p + break + else: + raise os.error, str(argv0) + ": DataLoader could not find " + str(filenames) + ##print path, self.path, self.dir + + + def __findFile(self, func, filename, subdirs=None, do_raise=1): + if subdirs is None: + subdirs = ("",) + elif type(subdirs) is types.StringType: + subdirs = (subdirs,) + for dir in subdirs: + f = os.path.join(self.dir, dir, filename) + f = os.path.normpath(f) + if func(f): + return f + if do_raise: + raise os.error, "DataLoader could not find " + filename + " in " + self.dir + " " + str(subdirs) + return None + + def findFile(self, filename, subdirs=None): + return self.__findFile(os.path.isfile, filename, subdirs) + + def findImage(self, filename, subdirs=None): + for ext in IMAGE_EXTENSIONS: + f = self.__findFile(os.path.isfile, filename+ext, subdirs, 0) + if f: + return f + raise os.error, "DataLoader could not find image " + filename + " in " + self.dir + " " + str(subdirs) + + def findIcon(self, filename=None, subdirs=None): + if not filename: + filename = PACKAGE.lower() + root, ext = os.path.splitext(filename) + if not ext: + filename = filename + ".xbm" + return self.findFile(filename, subdirs) + + def findDir(self, filename, subdirs=None): + return self.__findFile(os.path.isdir, filename, subdirs) + diff --git a/pysollib/version.py b/pysollib/version.py new file mode 100644 index 00000000..1ed2586b --- /dev/null +++ b/pysollib/version.py @@ -0,0 +1,30 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +VERSION = "4.82" +#VERSION_DATE = "20 Aug 2003" +VERSION_MAJOR = 4 +VERSION_MINOR = 82 +VERSION_TUPLE = (4, 82) + +FC_VERSION = "0.9.2" +#FC_VERSION_TUPLE = (0, 4, 0) + diff --git a/scripts/all_games.py b/scripts/all_games.py new file mode 100755 index 00000000..2084532b --- /dev/null +++ b/scripts/all_games.py @@ -0,0 +1,231 @@ +#!/usr/bin/env python +# -*- mode: python; coding: koi8-r; -*- +# + +import sys, os, re, time +from pprint import pprint + +import gettext +gettext.install('pysol', 'locale', unicode=True) + +pysollib_path = os.path.join(sys.path[0], '..') +sys.path[0] = os.path.normpath(pysollib_path) +rules_dir = os.path.normpath(os.path.join(pysollib_path, 'data/html/rules')) +#pprint(sys.path) +#print rules_dir + +import pysollib.games +import pysollib.games.contrib +import pysollib.games.special +import pysollib.games.ultra +import pysollib.games.mahjongg + +from pysollib.gamedb import GAME_DB +from pysollib.gamedb import GI +from pysollib.mfxutil import latin1_to_ascii +from pysollib.resource import CSI + +def getGameRulesFilename(n): + if n.startswith('Mahjongg'): return 'mahjongg.html' + n = re.sub(r"[\[\(].*$", "", n) + n = latin1_to_ascii(n) + n = re.sub(r"[^\w]", "", n) + n = n.lower() + ".html" + return n + +GAME_BY_TYPE = { + GI.GT_BAKERS_DOZEN: "Baker's Dozen", + GI.GT_BELEAGUERED_CASTLE: "Beleaguered Castle", + GI.GT_CANFIELD: "Canfield", + GI.GT_FAN_TYPE: "Fan", + GI.GT_FORTY_THIEVES: "Forty Thieves", + GI.GT_FREECELL: "FreeCell", + GI.GT_GOLF: "Golf", + GI.GT_GYPSY: "Gypsy", + GI.GT_KLONDIKE: "Klondike", + GI.GT_MONTANA: "Montana", + GI.GT_NAPOLEON: "Napoleon", + GI.GT_NUMERICA: "Numerica", + GI.GT_PAIRING_TYPE: "Pairing", + GI.GT_RAGLAN: "Raglan", + GI.GT_SIMPLE_TYPE: "Simple game", + GI.GT_SPIDER: "Spider", + GI.GT_TERRACE: "Terrace", + GI.GT_YUKON: "Yukon", + GI.GT_1DECK_TYPE: "One-Deck game", + GI.GT_2DECK_TYPE: "Two-Deck game", + GI.GT_3DECK_TYPE: "Three-Deck game", + GI.GT_4DECK_TYPE: "Four-Deck game", + + GI.GT_MATRIX: "Matrix", + GI.GT_MEMORY: "Memory", + GI.GT_POKER_TYPE: "Poker", + GI.GT_PUZZLE_TYPE: "Puzzle", + GI.GT_TAROCK: "Tarock", + GI.GT_HEXADECK: "Hex A Deck", + GI.GT_HANAFUDA: "Hanafuda", + GI.GT_DASHAVATARA_GANJIFA: "Dashavatara Ganjifa", + GI.GT_MAHJONGG: "Mahjongg", + GI.GT_MUGHAL_GANJIFA:"Mughal Ganjifa", + GI.GT_SHISEN_SHO:"Shisen-Sho", + +} + +def by_category(): + games = GAME_DB.getGamesIdSortedById() + games_by_cat = {} + for id in games: + gi = GAME_DB.get(id) + gt = CSI.TYPE_NAME[gi.category] + if games_by_cat.has_key(gt): + games_by_cat[gt] += 1 + else: + games_by_cat[gt] = 1 + games_by_cat_list = [(i, j) for i, j in games_by_cat.items()] + games_by_cat_list.sort(lambda i, j: cmp(j[1], i[1])) +## print '' +## for i in games_by_cat_list: +## print '' % i +## print '
NameNumber
%s%s
' + print '
    ' + for i in games_by_cat_list: + print '
  • %s (%s games)
    • ' % i + print '
' + return + +def by_type(): + games = GAME_DB.getGamesIdSortedById() + games_by_type = {} + for id in games: + gi = GAME_DB.get(id) + if not GAME_BY_TYPE.has_key(gi.si.game_type): + print gi.si.game_type + continue + gt = GAME_BY_TYPE[gi.si.game_type] + if games_by_type.has_key(gt): + games_by_type[gt] += 1 + else: + games_by_type[gt] = 1 + games_by_type_list = games_by_type.items() + games_by_type_list.sort(lambda i, j: cmp(i[0], j[0])) +## print '' +## for i in games_by_type_list: +## print '' % i +## print '
NameNumber
%s%s
' + print '
    ' + for i in games_by_type_list: + print '
  • %s (%s games)
    • ' % i + print '
' + return + +def all_games(sort_by='id'): + #rules_dir = 'rules' + print ''' + +''' + + if sort_by == 'id': + get_games_func = GAME_DB.getGamesIdSortedById + else: + get_games_func = GAME_DB.getGamesIdSortedByName + + for id in get_games_func(): + gi = GAME_DB.get(id) + if not gi.rules_filename: + rules_fn = getGameRulesFilename(gi.name) + else: + rules_fn = gi.rules_filename + gt = CSI.TYPE_NAME[gi.category] + if gt == 'French': + gt = 'French (%s)' % GAME_BY_TYPE[gi.si.game_type] + if 1 and os.path.exists(os.path.join(rules_dir, rules_fn)): + fn = '../data/html/rules/'+rules_fn + print ''' +''' % (id, fn, + gi.name.encode('utf-8'), '
'.join(gi.altnames).encode('utf-8'), gt) + else: + print ''' +''' % (id, gi.name.encode('utf-8'), + '
'.join(gi.altnames).encode('utf-8'), gt) + print '
IDNameAlternate namesType
%s +%s +%s%s
%s%s%s%s
' + +def create_html(sort_by): + print '' + print 'Total games: %d' % len(GAME_DB.getGamesIdSortedById()) + print '

Categories

' + by_category() + print '

Types

' + by_type() + print '

All games

' + all_games(sort_by) + print '' + + +def get_text(): + #get_games_func = GAME_DB.getGamesIdSortedById + get_games_func = GAME_DB.getGamesIdSortedByName + + games_list = {} # for unique + for id in get_games_func(): + gi = GAME_DB.get(id) + games_list[gi.name] = '' + if gi.name != gi.short_name: + games_list[gi.short_name] = '' + for n in gi.altnames: + games_list[n] = '' + games_list = games_list.keys() + games_list.sort() + print '''\ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR ORGANIZATION +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PySol 0.0.1\\n" +"POT-Creation-Date: %s\\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: ENCODING\\n" +"Generated-By: %s 0.1\\n" + +''' % (time.asctime(), sys.argv[0]) + for g in games_list: + print 'msgid "%s"\nmsgstr ""\n' % g.encode('utf-8') + +def plain_text(): + #get_games_func = GAME_DB.getGamesIdSortedById + get_games_func = GAME_DB.getGamesIdSortedByName + games_list = {} # for unique + for id in get_games_func(): + gi = GAME_DB.get(id) + games_list[gi.name] = '' + #if gi.name != gi.short_name: + # games_list[gi.short_name] = '' + for n in gi.altnames: + games_list[n] = '' + games_list = games_list.keys() + games_list.sort() + for g in games_list: + print g.encode('utf-8') + + + +## +if len(sys.argv) < 2 or sys.argv[1] == 'html': + sort_by = 'id' + if len(sys.argv) > 2: + sort_by = sys.argv[2] + create_html(sort_by) +elif sys.argv[1] == 'gettext': + get_text() +elif sys.argv[1] == 'text': + plain_text() + + + diff --git a/scripts/build.bat b/scripts/build.bat new file mode 100755 index 00000000..b5c9c0de --- /dev/null +++ b/scripts/build.bat @@ -0,0 +1,11 @@ +rem simple script for building windows package + +cd .. +rm -rf dist +mkdir dist +cp -r locale dist +cp freecell-solver\freecell-solver-2.8.6-bin\fc-solve.exe dist +python setup.py py2exe +python scripts\create_iss.py +"d:\Program Files\Inno Setup 5\ISCC.exe" setup.iss +pause diff --git a/scripts/cardset_viewer.py b/scripts/cardset_viewer.py new file mode 100755 index 00000000..d9491d9d --- /dev/null +++ b/scripts/cardset_viewer.py @@ -0,0 +1,256 @@ +#!/usr/bin/env python +# -*- mode: python; coding: koi8-r; -*- +# + +import sys, os +from glob import glob +from math import sqrt, sin, cos, pi +from Tkinter import * +try: + import Image, ImageTk +except ImportError: + Image = None + +cardset_type = { + '1': 'French', + '2': 'Hanafuda', + '3': 'Tarock', + '4': 'Mahjongg', + '5': 'Hexadeck', + '6': 'Mughal Ganjifa', + '7': 'Navagraha Ganjifa', + '8': 'Dashavatara Ganjifa', + '9': 'Trump only', + } + +class Cardset: + def __init__(self, dir, name, type, ext, x, y): + self.dir, self.name, self.type, self.ext, self.x, self.y = dir, name, type, ext, x, y + +def create_cs_list(ls): + cardsets_list = {} + for f in ls: + dir = os.path.split(f)[0] + lines = open(f).readlines() + l0 = lines[0].split(';') + try: + ext = l0[2] + except IndexError: + ##print f + ext = '.gif' + if len(l0) > 3: + type = cardset_type[l0[3]] + else: + #type = 'Unknown' + type = 'French' + l1 = lines[1].split(';') + name = l1[1].strip() + l2 = lines[2].split() + x, y = int(l2[0]), int(l2[1]) + cs = Cardset(dir, name, type, ext, x, y) + cardsets_list[name] = cs + return cardsets_list + +tk_images = [] +zoom = 0 +def show_cardset(*args): + global tk_images + tk_images = [] + if list_box.curselection(): + cs_name = list_box.get(list_box.curselection()) + cs = cardsets_dict[cs_name] + ls = glob(os.path.join(cs.dir, '[0-9][0-9][a-z]'+cs.ext)) + ls += glob(os.path.join(cs.dir, 'back*'+cs.ext)) + #ls += glob(os.path.join(cs.dir, 'bottom*.gif')) + #ls += glob(os.path.join(cs.dir, 'l*.gif')) + #ls = glob(os.path.join(cs.dir, '*.gif')) + ##if not ls: return + ls.sort() + n = 0 + pf = None + x, y = 10, 10 + width, height = 0, 0 + canvas.delete('all') + for f in ls: + if Image: + filter = { + 'NEAREST' : Image.NEAREST, + 'BILINEAR' : Image.BILINEAR, + 'BICUBIC' : Image.BICUBIC, + 'ANTIALIAS': Image.ANTIALIAS, + } [filter_var.get()] + ##filter = Image.BILINEAR + ##filter = Image.BICUBIC + ##filter = Image.ANTIALIAS + ##print f + im = Image.open(f) + if zoom != 0: + w, h = im.size + im = im.convert('RGBA') # for save transparency + if rotate_var.get(): + # rotate + #if filter == Image.ANTIALIAS: + # filter = Image.BICUBIC + z = zoom*5 + a = abs(pi/2/90*z) + neww = int(w*cos(a)+h*sin(a)) + newh = int(h*cos(a)+w*sin(a)) + ##print w, h, neww, newh + d = int(sqrt(w*w+h*h)) + dx, dy = (d-w)/2, (d-h)/2 + newim = Image.new('RGBA', (d, d)) + newim.paste(im, (dx, dy)) + im = newim + im = im.rotate(z, resample=filter) + x0, y0 = (d-neww)/2, (d-newh)/2 + x1, y1 = d-x0, d-y0 + im = im.crop((x0, y0, x1, y1)) + t = str(z) + else: + # zoom + z = 1.0 + zoom/10.0 + z = max(0.2, z) + im = im.resize((int(w*z), int(h*z)), resample=filter) + t = '%d %%' % int(z*100) + + zoom_label.config(text=t) + + else: + zoom_label.config(text='') + image = ImageTk.PhotoImage(im) + else: + image = PhotoImage(file=f) + tk_images.append(image) + ff = os.path.split(f)[1] + if pf is None: + pf = ff[:2] + x, y = 10, 10 + elif ff[:2] != pf: + pf = ff[:2] + x = 10 + y += image.height()+10 + else: + x += image.width()+10 + canvas.create_image(x, y, image=image, anchor=NW) + ##canvas.create_rectangle(x, y, x+image.width(), y+image.height()) + width = max(width, x) + height = max(height, y) + width, height = width+image.width()+10, height+image.height()+10 + canvas.config(scrollregion=(0, 0, width, height)) + ##print image.width(), image.height() + label.config(text='''\ +Name: %s +Type: %s +Directory: %s''' % (cs.name, cs.type, cs.dir)) + +def zoom_in(*args): + global zoom + zoom += 1 + show_cardset() + +def zoom_out(*args): + global zoom + zoom -= 1 + show_cardset() + +def zoom_cancel(*args): + global zoom + zoom = 0 + show_cardset() + +def show_info(*args): + if list_box.curselection(): + cs_name = list_box.get(list_box.curselection()) + cs = cardsets_dict[cs_name] + fn = os.path.join(cs.dir, 'COPYRIGHT') + top = Toplevel() + text = Text(top) + text.insert('insert', open(fn).read()) + text.pack(expand=YES, fill=BOTH) + b_frame = Frame(top) + b_frame.pack(fill=X) + button = Button(b_frame, text='Close', command=top.destroy) + button.pack(side=RIGHT) + +def create_widgets(): + global list_box, canvas, label, zoom_label + # + root = Tk() + # + list_box = Listbox(root) + list_box.grid(row=0, column=0, rowspan=2, sticky=NS) + cardsets_list = list(cardsets_dict) + cardsets_list.sort() + for cs in cardsets_list: + list_box.insert(END, cs) + list_box.bind('<>', show_cardset) + # + sb = Scrollbar(root) + sb.grid(row=0, column=1, rowspan=2, sticky=NS) + list_box.config(yscrollcommand=sb.set) + sb.config(command=list_box.yview) + # + canvas = Canvas(root, bg='#5eab6b') + canvas.grid(row=0, column=2, sticky=NSEW) + canvas.bind('<4>', lambda e: canvas.yview_scroll(-5, 'unit')) + canvas.bind('<5>', lambda e: canvas.yview_scroll(5, 'unit')) + # + sb = Scrollbar(root) + sb.grid(row=0, column=3, sticky=NS) + canvas.config(yscrollcommand=sb.set) + sb.config(command=canvas.yview) + # + if True: + sb = Scrollbar(root, orient=HORIZONTAL) + sb.grid(row=1, column=2, sticky=EW) + canvas.config(xscrollcommand=sb.set) + sb.config(command=canvas.xview) + # + label = Label(root) + label.grid(row=2, column=0, columnspan=4) + # + b_frame = Frame(root) + b_frame.grid(row=3, column=0, columnspan=4, sticky=EW) + button = Button(b_frame, text='Quit', command=root.quit, width=8) + button.pack(side=RIGHT) + button = Button(b_frame, text='Info', command=show_info, width=8) + button.pack(side=RIGHT) + if Image: + global rotate_var, filter_var + rotate_var = IntVar(root) + filter_var = StringVar(root) + button = Button(b_frame, text=' + ', command=zoom_in) + button.pack(side=LEFT) + button = Button(b_frame, text=' - ', command=zoom_out) + button.pack(side=LEFT) + button = Button(b_frame, text=' = ', command=zoom_cancel) + button.pack(side=LEFT) + button = Checkbutton(b_frame, text='Rotate', indicatoron=0, + selectcolor=b_frame['bg'], width=8, + variable=rotate_var, command=show_cardset) + button.pack(side=LEFT, fill='y') + om = OptionMenu(b_frame, filter_var, + 'NEAREST', 'BILINEAR', 'BICUBIC', 'ANTIALIAS', + command=show_cardset) + filter_var.set('NEAREST') + om.pack(side=LEFT, fill='y') + + zoom_label = Label(b_frame) + zoom_label.pack(side=LEFT) + # + root.columnconfigure(2, weight=1) + root.rowconfigure(0, weight=1) + + root.title('Show Cardsets') + + return root + +if __name__ == '__main__': + if len(sys.argv) > 1: + data_dir = sys.argv[1] + else: + data_dir = os.path.normpath(os.path.join(sys.path[0], os.pardir, 'data')) + ls = glob(os.path.join(data_dir, '*', 'config.txt')) + cardsets_dict = create_cs_list(ls) + root = create_widgets() + root.mainloop() diff --git a/scripts/create_iss.py b/scripts/create_iss.py new file mode 100755 index 00000000..80fbcbf0 --- /dev/null +++ b/scripts/create_iss.py @@ -0,0 +1,47 @@ +#!/usr/bin/env python + +prog_name = 'PySol Fan Club edition' +prog_version = '0.9.0' + +import os + +dirs_list = [] +files_list = [] +for root, dirs, files in os.walk('dist'): + if files: + files_list.append(root) + dirs_list.append(root) + +out = open('setup.iss', 'w') + +print >> out, ''' +[Setup] +AppName=%(prog_name)s +AppVerName=%(prog_name)s v.%(prog_version)s +DefaultDirName={pf}\\%(prog_name)s +DefaultGroupName=%(prog_name)s +UninstallDisplayIcon={app}\\pysol.exe +Compression=lzma +SolidCompression=yes +SourceDir=dist +OutputDir=. +OutputBaseFilename=PySolFC_%(prog_version)s_setup + +[Icons] +Name: "{group}\\%(prog_name)s"; Filename: "{app}\\pysol.exe" +Name: "{group}\\Uninstall %(prog_name)s"; Filename: "{uninstallexe}" +Name: "{userdesktop}\\%(prog_name)s"; Filename: "{app}\\pysol.exe" +''' % vars() + +print >> out, '[Dirs]' +for d in dirs_list[1:]: + print >> out, 'Name: "{app}%s"' % d.replace('dist', '') + +print >> out +print >> out, '[Files]' +print >> out, 'Source: "*"; DestDir: "{app}"' +for d in files_list[1:]: + d = d.replace('dist\\', '') + print >> out, 'Source: "%s\\*"; DestDir: "{app}\\%s"' % (d, d) + + diff --git a/scripts/mahjongg_utils.py b/scripts/mahjongg_utils.py new file mode 100755 index 00000000..fce6a1a6 --- /dev/null +++ b/scripts/mahjongg_utils.py @@ -0,0 +1,208 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- + +import sys, os, re + +alpha = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' + +def decode_layout(layout): + # decode tile positions + assert layout[0] == "0" + assert (len(layout) - 1) % 3 == 0 + tiles = [] + for i in range(1, len(layout), 3): + n = alpha.find(layout[i]) + level, height = n / 7, n % 7 + 1 + tx = alpha.find(layout[i+1]) + ty = alpha.find(layout[i+2]) + assert n >= 0 and tx >= 0 and ty >= 0 + for tl in range(level, level + height): + tiles.append((tl, tx, ty)) + tiles.sort() + return tiles + +def encode_layout(layout): + # encode positions + s = '0' + ##layout.sort() + x_max = max([t[1] for t in layout]) + y_max = max([t[2] for t in layout]) + for x in range(x_max+1): + for y in range(y_max+1): + l = [t[0] for t in layout if t[1] == x and t[2] == y] + if not l: + continue + i_0 = i_n = l[0] + for i in l[1:]: + if i == i_n+1: + i_n = i + continue + s += alpha[i_0*7+(i_n-i_0)] + alpha[x] + alpha[y] + i_0 = i_n = i + s += alpha[i_0*7+(i_n-i_0)] + alpha[x] + alpha[y] + +## for tl, tx, ty in layout: +## s += alpha[tl*7]+alpha[tx]+alpha[ty] + return s + + + +def parse_kyodai(filename): + # Kyodai (http://www.kyodai.com/) + + fd = open(filename) + fd.readline() + fd.readline() + + s = fd.readline() + i = 0 + y = 0 + z = 0 + layout = [] + while True: + ss = s[i:i+34] + if not ss: + break + x = 0 + for c in ss: + if c == '1': + layout.append((z, x, y)) + x += 1 + y += 1 + if y == 20: + y = 0 + z += 1 + i += 34 + layout.sort() + return normalize(layout) + + +def parse_ace(filename): + # Ace of Penguins (http://www.delorie.com/store/ace/) + l = open(filename).read().replace('\n', '').split(',') + l.reverse() + layout = [] + layer = 0 + while True: + x = int(l.pop()) + if x == 127: + break + if x <= 0: + x = -x + y, z = int(l.pop()), int(l.pop()) + if layer < z: + layer = z + layout.append((z, x, y)) + layout.sort() + return normalize(layout) + + +def parse_kmahjongg(filename): + # KMahjongg + fd = open(filename) + fd.readline() + lines = fd.readlines() + level = 0 + n = 0 + layout = [] + for s in lines: + i = 0 + while True: + i = s.find('1', i) + if i >= 0: + layout.append((level, i, n)) + i += 1 + else: + break + n += 1 + if n == 16: + n = 0 + level += 1 + layout.sort() + return normalize(layout) + + +def parse_xmahjongg(filename): + if open(filename).readline().startswith('Kyodai'): + return parse_kyodai(filename) + fd = open(filename) + layout = [] + for s in fd: + s = s.strip() + if not s: + continue + if s.startswith('#'): + continue + row, col, lev = s.split() + layout.append((int(lev), int(col), int(row))) + layout.sort() + return normalize(layout) + + +def normalize(l): + minx = min([i[1] for i in l]) + if minx: + l = [(i[0], i[1]-minx, i[2]) for i in l] + miny = min([i[2] for i in l]) + if miny: + l = [(i[0], i[1], i[2]-miny) for i in l] + return l + + +if __name__ == '__main__': + gameid = 5200 + + usage = '''usage: +%s TYPE FILE ... + where TYPE are: + k | kyodai - parse kyodai file + x | xmahjongg - parse xmahjongg file + m | kmahjongg - parse kmahjongg file + a | ace - parse ace of penguins file +''' % sys.argv[0] + + if len(sys.argv) < 3: + sys.exit(usage) + if sys.argv[1] in ['k', 'kyodai']: + parse_func = parse_kyodai + elif sys.argv[1] in ['x', 'xmahjongg']: + parse_func = parse_xmahjongg + elif sys.argv[1] in ['m', 'kmahjongg']: + parse_func = parse_kmahjongg + elif sys.argv[1] in ['a', 'ace']: + parse_func = parse_ace + else: + sys.exit(usage) + + for filename in sys.argv[2:]: + + layout = parse_func(filename) + layout = normalize(layout) + + #print filename, len(layout) + + s = encode_layout(layout) + + # check + lt = decode_layout(s) + if lt != layout: + print '*** ERROR ***' + else: + ##print s + + gamename = os.path.split(filename)[1].split('.')[0] + #classname = gamename.replace(' ', '_') + #classname = 'Mahjongg_' + re.sub('\W', '', classname) + + ncards = len(layout) + + if ncards != 144: + print '''r(%d, "%s", ncards=%d, layout="%s") +''' % (gameid, gamename, ncards, s) + + else: + print '''r(%d, "%s", layout="%s") +''' % (gameid, gamename, s) + + gameid += 1 + diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..ea699b17 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,8 @@ +[sdist] +formats = bztar +force_manifest = 1 + +[bdist_rpm] +release = 1 +doc_files = COPYING README +use_bzip2 = 1 diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..2da5fad8 --- /dev/null +++ b/setup.py @@ -0,0 +1,71 @@ +#!/usr/bin/env python +# -*- mode: python; -*- + +import os +from distutils.core import setup +from pysollib.version import FC_VERSION as VERSION +if os.name == 'nt': + import py2exe + +if os.name == 'posix': + data_dir = 'share/PySolFC' +elif os.name == 'nt': + data_dir = 'data' +else: + data_dir = 'data' + +datas = [ + 'html', + 'images', + 'sound', + 'tiles', + 'toolbar', + ] +for s in open('MANIFEST.in'): + if s.startswith('graft data/cardset-'): + datas.append(s[11:].strip()) +data_files = [] +for d in datas: + for root, dirs, files in os.walk(os.path.join('data', d)): + if files: + #files = map(lambda f: os.path.join(root, f), files) + files = [os.path.join(root, f) for f in files] + data_files.append((os.path.join(data_dir, root[5:]), files)) +if os.name == 'posix': + data_files.append(('share/pixmaps', ['data/pysol.xbm', 'data/pysol.xpm'])) + for l in ('ru', 'ru_RU'): + data_files.append(('share/locale/%s/LC_MESSAGES' % l, + ['locale/%s/LC_MESSAGES/pysol.mo' % l])) + +long_description = """\ +PySol is a solitaire card game. Its features include support for many +different games, very nice look and feel, multiple cardsets and +backgrounds, unlimited undo & redo, load & save games, player +statistics, hint system, demo games, support for user written plug-ins, +integrated HTML help browser, and it's free Open Source software. +""" +kw = { + 'name' : 'PySolFC', + 'version' : VERSION, + 'url' : 'http://sourceforge.net/projects/pysolfc/', + 'author' : 'Skomoroh', + 'author_email' : 'skomoroh@gmail.com', + 'description' : 'PySol - a solitaire game collection', + 'long_description' : long_description, + 'license' : 'GPL', + 'scripts' : ['pysol'], + 'packages' : ['pysollib', + 'pysollib.tk', + 'pysollib.games', + 'pysollib.games.contrib', + 'pysollib.games.special', + 'pysollib.games.ultra', + 'pysollib.games.mahjongg'], + 'data_files' : data_files, + } + +if os.name == 'nt': + kw['windows'] = [{'script': 'pysol', + 'icon_resources': [(1, "data/pysol.ico")], }] + +setup(**kw) From c5b941d95a940c5c939008ce124708cc5fb9f1f2 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 28 May 2006 23:55:49 +0000 Subject: [PATCH 002/266] - corrected rules of Whitehead git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@2 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/games/klondike.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index f24009e5..0c00c718 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -163,8 +163,12 @@ class ThumbAndPouch(Klondike): # // Whitehead # ************************************************************************/ +class Whitehead_RowStack(SS_RowStack): + def _isAcceptableSequence(self, cards): + return isSameColorSequence(cards, self.cap.mod, self.cap.dir) + class Whitehead(Klondike): - RowStack_Class = SC_RowStack + RowStack_Class = Whitehead_RowStack Hint_Class = CautiousDefaultHint def createGame(self): From 48672a12ecf082ca92f3f53c204d248109dd8b1d Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 29 May 2006 00:10:22 +0000 Subject: [PATCH 003/266] - corrected rules of Whitehead - added files to svn:ignore git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@3 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- Makefile | 7 ++-- pysollib/actions.py | 1 + pysollib/app.py | 7 +--- pysollib/tk/edittextdialog.py | 57 +++++++---------------------- pysollib/tk/menubar.py | 3 +- pysollib/tk/statusbar.py | 11 +++--- pysollib/tk/tkhtml.py | 69 ++++++----------------------------- pysollib/tk/toolbar.py | 18 +++++---- 8 files changed, 48 insertions(+), 125 deletions(-) diff --git a/Makefile b/Makefile index aab76980..7713424e 100644 --- a/Makefile +++ b/Makefile @@ -9,12 +9,11 @@ PYSOLLIB_FILES=pysollib/tk/*.py pysollib/*.py \ install: python setup.py install -dist: - ./scripts/all_games.py > docs/all_games.html +dist: all_games_html rules mo python setup.py sdist -rpm: - python setup.py bdist_rpm --use-bzip2 +rpm: all_games_html rules mo + python setup.py bdist_rpm all_games_html: ./scripts/all_games.py > docs/all_games.html diff --git a/pysollib/actions.py b/pysollib/actions.py index aabdad7a..426c80fa 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -1023,6 +1023,7 @@ class PysolMenubarActions: print "playing music:", music.filename def mIconify(self, *args): + if self._cancelDrag(break_pause=False): return self.top.wm_iconify() diff --git a/pysollib/app.py b/pysollib/app.py index 0c9c84a4..f43a4af6 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -711,11 +711,8 @@ class Application: self.toolbar.connectGame(self.game, self.menubar) self.game.updateStatus(player=self.opt.player) # update "Recent games" menubar entry - while 1: - try: - self.opt.recent_gameid.remove(id) - except ValueError: - break + if id in self.opt.recent_gameid: + self.opt.recent_gameid.remove(id) self.opt.recent_gameid.insert(0, id) del self.opt.recent_gameid[15:] self.menubar.updateRecentGamesMenu(self.opt.recent_gameid) diff --git a/pysollib/tk/edittextdialog.py b/pysollib/tk/edittextdialog.py index 47705c5b..c5d0cf22 100644 --- a/pysollib/tk/edittextdialog.py +++ b/pysollib/tk/edittextdialog.py @@ -33,7 +33,7 @@ ## ##---------------------------------------------------------------------------## -__all__ = ['DisplayTextDialog', 'EditTextDialog'] +__all__ = ['EditTextDialog'] # imports import os, sys, Tkinter @@ -42,16 +42,13 @@ import os, sys, Tkinter from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct # Toolkit imports -from tkconst import EVENT_HANDLED, EVENT_PROPAGATE from tkwidget import _ToplevelDialog, MfxDialog -from tkhtml import MfxScrolledText, MfxReadonlyScrolledText # /*********************************************************************** # // # ************************************************************************/ -class DisplayTextDialog(MfxDialog): - Text_Class = MfxReadonlyScrolledText +class EditTextDialog(MfxDialog): def __init__(self, parent, title, text, **kw): kw = self.initKw(kw) @@ -59,10 +56,15 @@ class DisplayTextDialog(MfxDialog): top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) # - bg = top_frame["bg"] - self.text_w = self.Text_Class(top_frame, bd=1, relief="sunken", - wrap="word", width=64, height=16, - bg=bg) + self.text_w = Tkinter.Text(top_frame, bd=1, relief="sunken", + wrap="word", width=64, height=16) + self.text_w.pack(side='left', fill="both", expand=1) + ###self.text_w.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + vbar = Tkinter.Scrollbar(top_frame) + vbar.pack(side='right', fill='y') + self.text_w["yscrollcommand"] = vbar.set + vbar["command"] = self.text_w.yview + # self.text = "" if text: self.text = text @@ -70,25 +72,11 @@ class DisplayTextDialog(MfxDialog): self.text_w.config(state="normal") self.text_w.insert("insert", self.text) self.text_w.config(state=old_state) - self.text_w.pack(side="top", fill="both", expand=1) - ###self.text_w.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) # focus = self.createButtons(bottom_frame, kw) - #focus = self.text_w + focus = self.text_w self.mainloop(focus, kw.timeout) - def initKw(self, kw): - kw = KwStruct(kw, - strings=(_("OK"),), default=0, - resizable = 1, - separatorwidth = 0, - ) - return MfxDialog.initKw(self, kw) - - -class EditTextDialog(DisplayTextDialog): - Text_Class = MfxScrolledText - def initKw(self, kw): kw = KwStruct(kw, strings=(_("OK"), _("Cancel")), default=-1, @@ -99,7 +87,7 @@ class EditTextDialog(DisplayTextDialog): def destroy(self): self.text = self.text_w.get("1.0", "end") - DisplayTextDialog.destroy(self) + MfxDialog.destroy(self) def wmDeleteWindow(self, *event): # ignore pass @@ -108,22 +96,3 @@ class EditTextDialog(DisplayTextDialog): pass -# /*********************************************************************** -# // -# ************************************************************************/ - - -def edittextdialog_main(args): - from tkutil import wm_withdraw - tk = Tkinter.Tk() - wm_withdraw(tk) - tk.update() - d = DisplayTextDialog(tk, "Comment for game #12345", text="Test") - d = EditTextDialog(tk, "Comment for game #12345", text="Test") - print d.text - return 0 - -if __name__ == "__main__": - import sys - sys.exit(edittextdialog_main(sys.argv)) - diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index c360daf1..1fdced3e 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -235,8 +235,9 @@ class PysolMenubar(PysolMenubarActions): kw = { "name": "menubar" } if 1 and os.name == "posix": pass - kw["relief"] = "groove" + ##kw["relief"] = "groove" kw["activeborderwidth"] = 1 + kw['bd'] = 1 self.__menubar = apply(MfxMenubar, (self.top,), kw) # init keybindings diff --git a/pysollib/tk/statusbar.py b/pysollib/tk/statusbar.py index 2ca8645f..c5cea311 100644 --- a/pysollib/tk/statusbar.py +++ b/pysollib/tk/statusbar.py @@ -59,12 +59,13 @@ class MfxStatusbar: self._row = row self._column = column self._columnspan = columnspan - self.padx = 0 - self.pady = 0 + self.padx = 1 + self.pady = 2 # - self.frame = Tkinter.Frame(self.top, bd=1, relief='raised') + self.frame = Tkinter.Frame(self.top, bd=1) #, relief='raised') self.frame.grid(row=self._row, column=self._column, - columnspan=self._columnspan, sticky='ew') + columnspan=self._columnspan, sticky='ew', + padx=self.padx, pady=self.pady) # util def _createLabel(self, name, @@ -74,7 +75,7 @@ class MfxStatusbar: tooltip=None): if padx < 0: padx = self.padx label = Tkinter.Label(self.frame, text=text, - width=width, relief=relief) + width=width, relief=relief, bd=1) label.pack(side=side, fill=fill, padx=padx, expand=expand) setattr(self, name + "_label", label) self._widgets.append(label) diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index afe0f2ce..c9ac8a84 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -36,7 +36,7 @@ __all__ = ['tkHTMLViewer'] # imports -import os, sys, re, string, types +import os, sys, re, types import htmllib, formatter import Tkinter @@ -53,58 +53,6 @@ from statusbar import HtmlStatusbar REMOTE_PROTOCOLS = ("ftp:", "gopher:", "http:", "mailto:", "news:", "telnet:") -# /*********************************************************************** -# // -# ************************************************************************/ - -class MfxScrolledText(Tkinter.Text): - def __init__(self, parent=None, **cnf): - fcnf = {} - for k in cnf.keys(): - if type(k) is types.ClassType or k == "name": - fcnf[k] = cnf[k] - del cnf[k] - if cnf.has_key("bg"): - fcnf["bg"] = cnf["bg"] - self.frame = apply(Tkinter.Frame, (parent,), fcnf) - self.vbar = Tkinter.Scrollbar(self.frame, name="vbar") - self.vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y) - cnf["name"] = "text" - apply(Tkinter.Text.__init__, (self, self.frame), cnf) - self.pack(side=Tkinter.LEFT, fill=Tkinter.BOTH, expand=1) - self["yscrollcommand"] = self.vbar.set - self.vbar["command"] = self.yview - - # FIXME: copy Pack methods of self.frame -- this is a hack! - for m in Tkinter.Pack.__dict__.keys(): - if m[0] != "_" and m != "config" and m != "configure": - ##print m, getattr(self.frame, m) - setattr(self, m, getattr(self.frame, m)) - - self.frame["highlightthickness"] = 0 - self.vbar["highlightthickness"] = 0 - ##print self.__dict__ - - # XXX these are missing in Tkinter.py - def xview_moveto(self, fraction): - return self.tk.call(self._w, "xview", "moveto", fraction) - def xview_scroll(self, number, what): - return self.tk.call(self._w, "xview", "scroll", number, what) - def yview_moveto(self, fraction): - return self.tk.call(self._w, "yview", "moveto", fraction) - def yview_scroll(self, number, what): - return self.tk.call(self._w, "yview", "scroll", number, what) - - -class MfxReadonlyScrolledText(MfxScrolledText): - def __init__(self, parent=None, **cnf): - apply(MfxScrolledText.__init__, (self, parent), cnf) - self.config(state="disabled", insertofftime=0) - self.frame.config(takefocus=0) - self.config(takefocus=0) - self.vbar.config(takefocus=0) - - # /*********************************************************************** # // # ************************************************************************/ @@ -273,6 +221,7 @@ class tkHTMLViewer: ) self.images = {} # need to keep a reference because of garbage collection self.defcursor = parent["cursor"] + ##self.defcursor = 'xterm' self.handcursor = "hand2" # create buttons @@ -297,11 +246,15 @@ class tkHTMLViewer: # create text widget text_frame = Tkinter.Frame(parent) text_frame.grid(row=1, column=0, columnspan=4, sticky='nsew') - self.text = MfxReadonlyScrolledText(text_frame, - fg="#000000", bg="#f7f3ff", - cursor=self.defcursor, - wrap="word", padx=20, pady=20) - self.text.pack(side="top", fill="both", expand=1) + self.text = Tkinter.Text(text_frame, + fg='black', bg='white', bd=0, + cursor=self.defcursor, + wrap='word', padx=20, pady=20) + self.text.pack(side=Tkinter.LEFT, fill=Tkinter.BOTH, expand=1) + vbar = Tkinter.Scrollbar(text_frame) + vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y) + self.text["yscrollcommand"] = vbar.set + vbar["command"] = self.text.yview # statusbar self.statusbar = HtmlStatusbar(parent, row=2, column=0, columnspan=4) diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index 01d99f3f..711ba3aa 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -103,7 +103,7 @@ class ToolbarSeparator(Tkinter.Frame): width = 4 height = 4 padx = 6 - pady = 4 + pady = 6 if orient == Tkinter.HORIZONTAL: self.config(width=width, height=height) self.grid(row=0, @@ -259,16 +259,16 @@ class PysolToolbar(PysolToolbarActions): def _setRelief(self, relief): if type(relief) is types.IntType: - relief = (Tkinter.RAISED, Tkinter.FLAT)[relief] - elif relief in (Tkinter.RAISED, Tkinter.FLAT): + relief = ('raised', 'flat')[relief] + elif relief in ('raised', 'flat'): pass else: - relief = Tkinter.FLAT + relief = 'flat' self.button_relief = relief - if relief == Tkinter.RAISED: - self.separator_relief = Tkinter.FLAT + if relief == 'raised': + self.separator_relief = 'flat' else: - self.separator_relief = Tkinter.RAISED + self.separator_relief = 'sunken' #'raised' return relief # util @@ -465,7 +465,9 @@ class PysolToolbar(PysolToolbarActions): return False self._setRelief(relief) if os.name == 'posix': - self.frame.config(relief=self.separator_relief) + relief = self.button_relief == 'flat' and 'raised' or 'flat' + self.frame.config(relief=relief) + #self.frame.config(relief=self.separator_relief) for w in self._widgets: if isinstance(w, ToolbarButton): w.config(relief=self.button_relief) From 16934784ba94c78627b4f1f3b36f4b020076d2a3 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 8 Jun 2006 01:35:18 +0000 Subject: [PATCH 004/266] - fixed game `Jane' - added game `Granada' - added support accel-keys for buttons of dialogs - changed widget's styles - updated russian translation - updated GAMES_BY_PYSOL_VERSION (gamedb.py) - other minor fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@4 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- Makefile | 3 +- po/games.pot | 8 +- po/pysol.pot | 1014 ++++++++++++++--------- po/ru_games.po | 16 +- po/ru_pysol.po | 1166 +++++++++++++++++---------- pysollib/actions.py | 39 +- pysollib/app.py | 38 +- pysollib/game.py | 79 +- pysollib/gamedb.py | 41 +- pysollib/games/algerian.py | 2 +- pysollib/games/beleagueredcastle.py | 4 +- pysollib/games/bisley.py | 16 +- pysollib/games/braid.py | 2 +- pysollib/games/curdsandwhey.py | 4 +- pysollib/games/freecell.py | 2 +- pysollib/games/katzenschwanz.py | 4 +- pysollib/games/klondike.py | 5 +- pysollib/games/montana.py | 4 +- pysollib/games/montecarlo.py | 2 +- pysollib/games/numerica.py | 6 +- pysollib/games/osmosis.py | 6 +- pysollib/games/pileon.py | 2 +- pysollib/games/royalcotillion.py | 86 +- pysollib/games/spider.py | 6 +- pysollib/games/yukon.py | 4 +- pysollib/help.py | 20 +- pysollib/hint.py | 21 +- pysollib/main.py | 55 +- pysollib/pysoltk.py | 1 - pysollib/resource.py | 158 ++-- pysollib/stack.py | 2 + pysollib/stats.py | 6 +- pysollib/tk/colorsdialog.py | 8 +- pysollib/tk/demooptionsdialog.py | 112 --- pysollib/tk/edittextdialog.py | 11 +- pysollib/tk/fontsdialog.py | 16 +- pysollib/tk/gameinfodialog.py | 9 +- pysollib/tk/menubar.py | 8 +- pysollib/tk/playeroptionsdialog.py | 13 +- pysollib/tk/selectcardset.py | 19 +- pysollib/tk/selectgame.py | 19 +- pysollib/tk/selecttile.py | 9 +- pysollib/tk/selecttree.py | 6 - pysollib/tk/soundoptionsdialog.py | 16 +- pysollib/tk/statusbar.py | 4 +- pysollib/tk/timeoutsdialog.py | 8 +- pysollib/tk/tkhtml.py | 2 +- pysollib/tk/tkstats.py | 84 +- pysollib/tk/tkutil.py | 4 + pysollib/tk/tkwidget.py | 113 +-- pysollib/tk/toolbar.py | 3 +- scripts/all_games.py | 2 +- 52 files changed, 1930 insertions(+), 1358 deletions(-) delete mode 100644 pysollib/tk/demooptionsdialog.py diff --git a/Makefile b/Makefile index 7713424e..baae7118 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,8 @@ PYSOLLIB_FILES=pysollib/tk/*.py pysollib/*.py \ pysollib/games/*.py pysollib/games/special/*.py \ - pysollib/games/contrib/*.py pysollib/games/ultra/*.py + pysollib/games/contrib/*.py pysollib/games/ultra/*.py \ + pysollib/games/mahjongg/*.py .PHONY : install dist all_games_html rules pot mo diff --git a/po/games.pot b/po/games.pot index f71d5e8f..cf68fcf9 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri May 26 20:25:43 2006\n" +"POT-Creation-Date: Tue Jun 6 02:20:52 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -63,9 +63,6 @@ msgstr "" msgid "Acme" msgstr "" -msgid "Adelaide" -msgstr "" - msgid "Agnes Bernauer" msgstr "" @@ -2322,6 +2319,9 @@ msgstr "" msgid "Raw Prawn" msgstr "" +msgid "Realm" +msgstr "" + msgid "Rectangle" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index d4b883af..e1d7e6e9 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Fri May 26 20:25:31 2006\n" +"POT-Creation-Date: Tue Jun 6 02:20:47 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,199 +15,196 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:345 pysollib/game.py:1205 pysollib/game.py:1220 -#: pysollib/game.py:1226 pysollib/game.py:1231 pysollib/tk/toolbar.py:183 +#: pysollib/actions.py:344 pysollib/tk/toolbar.py:183 msgid "New game" msgstr "" -#: pysollib/actions.py:358 pysollib/tk/menubar.py:668 -#: pysollib/tk/menubar.py:682 +#: pysollib/actions.py:357 pysollib/tk/menubar.py:667 +#: pysollib/tk/menubar.py:681 msgid "Select game" msgstr "" -#: pysollib/actions.py:381 +#: pysollib/actions.py:380 msgid "Invalid game number" msgstr "" -#: pysollib/actions.py:382 +#: pysollib/actions.py:381 msgid "" "Invalid game number\n" msgstr "" -#: pysollib/actions.py:399 +#: pysollib/actions.py:398 msgid "Select next game number" msgstr "" -#: pysollib/actions.py:408 pysollib/actions.py:418 +#: pysollib/actions.py:407 pysollib/actions.py:417 msgid "Select new game number" msgstr "" -#: pysollib/actions.py:409 +#: pysollib/actions.py:408 msgid "" "\n" "\n" "Enter new game number" msgstr "" -#: pysollib/actions.py:410 -msgid "Next number" +#: pysollib/actions.py:409 +msgid "&Next number" msgstr "" -#: pysollib/actions.py:410 pysollib/app.py:1085 pysollib/app.py:1097 -#: pysollib/game.py:828 pysollib/game.py:1641 pysollib/main.py:399 -#: pysollib/main.py:404 pysollib/tk/colorsdialog.py:131 -#: pysollib/tk/demooptionsdialog.py:87 pysollib/tk/edittextdialog.py:82 -#: pysollib/tk/edittextdialog.py:94 pysollib/tk/fontsdialog.py:140 +#: pysollib/actions.py:409 pysollib/app.py:1090 pysollib/app.py:1102 +#: pysollib/game.py:828 pysollib/game.py:1642 pysollib/main.py:413 +#: pysollib/main.py:421 pysollib/tk/colorsdialog.py:131 +#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 #: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:133 #: pysollib/tk/playeroptionsdialog.py:86 #: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 #: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:158 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:506 -#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 -#: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 -#: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:776 -#: pysollib/tk/tkstats.py:860 pysollib/tk/tkwidget.py:158 -#: pysollib/tk/tkwidget.py:297 -msgid "OK" +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:459 +#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:571 +#: pysollib/tk/tkstats.py:645 pysollib/tk/tkstats.py:661 +#: pysollib/tk/tkstats.py:703 pysollib/tk/tkstats.py:775 +#: pysollib/tk/tkstats.py:859 pysollib/tk/tkwidget.py:159 +#: pysollib/tk/tkwidget.py:312 +msgid "&OK" msgstr "" -#: pysollib/actions.py:410 pysollib/app.py:1097 pysollib/game.py:828 +#: pysollib/actions.py:409 pysollib/app.py:1102 pysollib/game.py:828 #: pysollib/game.py:1205 pysollib/game.py:1220 pysollib/game.py:1226 #: pysollib/game.py:1231 pysollib/tk/colorsdialog.py:131 -#: pysollib/tk/demooptionsdialog.py:87 pysollib/tk/edittextdialog.py:94 -#: pysollib/tk/fontsdialog.py:140 pysollib/tk/fontsdialog.py:204 -#: pysollib/tk/menubar.py:855 pysollib/tk/menubar.py:857 -#: pysollib/tk/playeroptionsdialog.py:86 +#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 +#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:854 +#: pysollib/tk/menubar.py:856 pysollib/tk/playeroptionsdialog.py:86 #: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectgame.py:268 pysollib/tk/selectgame.py:409 #: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:106 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:297 -msgid "Cancel" +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:312 +msgid "&Cancel" msgstr "" -#: pysollib/actions.py:426 +#: pysollib/actions.py:425 msgid "Select random game" msgstr "" -#: pysollib/actions.py:462 +#: pysollib/actions.py:461 msgid "Select next game" msgstr "" -#: pysollib/actions.py:495 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:494 pysollib/tk/toolbar.py:197 msgid "Quit " msgstr "" -#: pysollib/actions.py:545 +#: pysollib/actions.py:544 msgid "Clear bookmarks" msgstr "" -#: pysollib/actions.py:546 +#: pysollib/actions.py:545 msgid "Clear all bookmarks ?" msgstr "" -#: pysollib/actions.py:556 +#: pysollib/actions.py:555 msgid "Restart game" msgstr "" -#: pysollib/actions.py:557 +#: pysollib/actions.py:556 msgid "Restart this game ?" msgstr "" -#: pysollib/actions.py:594 +#: pysollib/actions.py:593 msgid "" "Comments for %s:\n" "\n" msgstr "" -#: pysollib/actions.py:596 +#: pysollib/actions.py:595 msgid "Comments for " msgstr "" -#: pysollib/actions.py:614 pysollib/actions.py:650 +#: pysollib/actions.py:613 pysollib/actions.py:649 msgid "Error while writing to file" msgstr "" -#: pysollib/actions.py:617 pysollib/actions.py:653 pysollib/actions.py:956 +#: pysollib/actions.py:616 pysollib/actions.py:652 pysollib/actions.py:941 msgid " Info" msgstr "" -#: pysollib/actions.py:618 +#: pysollib/actions.py:617 msgid "" "Comments were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:635 +#: pysollib/actions.py:634 msgid "Demo statistics" msgstr "" -#: pysollib/actions.py:638 +#: pysollib/actions.py:637 msgid "Your statistics" msgstr "" -#: pysollib/actions.py:654 +#: pysollib/actions.py:653 msgid "" " were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:668 +#: pysollib/actions.py:667 msgid " Demo" msgstr "" -#: pysollib/actions.py:668 +#: pysollib/actions.py:667 msgid " Demo " msgstr "" -#: pysollib/actions.py:671 pysollib/actions.py:689 +#: pysollib/actions.py:670 pysollib/actions.py:688 msgid " for " msgstr "" -#: pysollib/actions.py:677 pysollib/actions.py:696 +#: pysollib/actions.py:676 pysollib/actions.py:695 msgid "Statistics for " msgstr "" -#: pysollib/actions.py:680 pysollib/tk/selectgame.py:352 +#: pysollib/actions.py:679 pysollib/tk/selectgame.py:352 #: pysollib/tk/toolbar.py:194 msgid "Statistics" msgstr "" -#: pysollib/actions.py:683 +#: pysollib/actions.py:682 msgid "Full log" msgstr "" -#: pysollib/actions.py:686 +#: pysollib/actions.py:685 msgid "Session log" msgstr "" -#: pysollib/actions.py:692 +#: pysollib/actions.py:691 msgid "Game Info" msgstr "" -#: pysollib/actions.py:701 +#: pysollib/actions.py:700 msgid "Full log for " msgstr "" -#: pysollib/actions.py:706 +#: pysollib/actions.py:705 msgid "Session log for " msgstr "" -#: pysollib/actions.py:711 +#: pysollib/actions.py:710 msgid "Reset all statistics" msgstr "" -#: pysollib/actions.py:712 +#: pysollib/actions.py:711 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" msgstr "" -#: pysollib/actions.py:718 +#: pysollib/actions.py:717 msgid "Reset game statistics" msgstr "" -#: pysollib/actions.py:719 +#: pysollib/actions.py:718 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -215,65 +212,61 @@ msgid "" "%s ?" msgstr "" -#: pysollib/actions.py:775 +#: pysollib/actions.py:774 msgid "Play demo" msgstr "" -#: pysollib/actions.py:786 +#: pysollib/actions.py:785 msgid "Set player options" msgstr "" -#: pysollib/actions.py:875 +#: pysollib/actions.py:874 msgid "Sound settings" msgstr "" -#: pysollib/actions.py:896 -msgid "Set demo options" -msgstr "" - -#: pysollib/actions.py:910 +#: pysollib/actions.py:895 msgid "Set colors" msgstr "" -#: pysollib/actions.py:929 +#: pysollib/actions.py:914 msgid "Set fonts" msgstr "" -#: pysollib/actions.py:938 +#: pysollib/actions.py:923 msgid "Set timeouts" msgstr "" -#: pysollib/actions.py:953 +#: pysollib/actions.py:938 msgid "Error while saving options" msgstr "" -#: pysollib/actions.py:957 +#: pysollib/actions.py:942 msgid "" "Options were saved to\n" "\n" msgstr "" -#: pysollib/app.py:85 +#: pysollib/app.py:86 msgid "Unknown" msgstr "" -#: pysollib/app.py:947 +#: pysollib/app.py:952 msgid "Loading %s %s..." msgstr "" -#: pysollib/app.py:982 +#: pysollib/app.py:987 msgid " load error" msgstr "" -#: pysollib/app.py:983 +#: pysollib/app.py:988 msgid "Error while loading " msgstr "" -#: pysollib/app.py:1077 +#: pysollib/app.py:1082 msgid "Incompatible " msgstr "" -#: pysollib/app.py:1079 +#: pysollib/app.py:1084 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -282,7 +275,7 @@ msgid "" "Please select a %s type %s.\n" msgstr "" -#: pysollib/app.py:1095 +#: pysollib/app.py:1100 msgid "Please select a %s type %s" msgstr "" @@ -343,6 +336,11 @@ msgid "" "%s\n" msgstr "" +#: pysollib/game.py:1205 pysollib/game.py:1220 pysollib/game.py:1226 +#: pysollib/game.py:1231 pysollib/tk/menubar.py:250 +msgid "&New game" +msgstr "" + #: pysollib/game.py:1213 msgid "" "\n" @@ -357,7 +355,7 @@ msgstr "" msgid "Game finished" msgstr "" -#: pysollib/game.py:1225 pysollib/game.py:1642 +#: pysollib/game.py:1225 pysollib/game.py:1643 msgid "" "\n" "Game finished\n" @@ -369,8 +367,8 @@ msgid "" "Game finished, but not without my help...\n" msgstr "" -#: pysollib/game.py:1231 pysollib/tk/toolbar.py:184 -msgid "Restart" +#: pysollib/game.py:1231 +msgid "&Restart" msgstr "" #: pysollib/game.py:1535 @@ -378,22 +376,22 @@ msgid "Score %6d" msgstr "" #: pysollib/game.py:1634 -msgid "Cool" +msgid "&Cool" msgstr "" #: pysollib/game.py:1634 -msgid "Great" +msgid "&Great" msgstr "" #: pysollib/game.py:1634 -msgid "Wow" +msgid "&Wow" msgstr "" #: pysollib/game.py:1634 -msgid "Yeah" +msgid "&Yeah" msgstr "" -#: pysollib/game.py:1635 pysollib/game.py:1645 pysollib/game.py:1657 +#: pysollib/game.py:1635 pysollib/game.py:1646 pysollib/game.py:1658 msgid " Autopilot" msgstr "" @@ -403,49 +401,49 @@ msgid "" "Game solved in %d moves.\n" msgstr "" -#: pysollib/game.py:1656 -msgid "Hmm" +#: pysollib/game.py:1657 +msgid "&Hmm" msgstr "" -#: pysollib/game.py:1656 -msgid "Oh well" +#: pysollib/game.py:1657 +msgid "&Oh well" msgstr "" -#: pysollib/game.py:1656 -msgid "That's life" +#: pysollib/game.py:1657 +msgid "&That's life" msgstr "" -#: pysollib/game.py:1658 +#: pysollib/game.py:1659 msgid "" "\n" "This won't come out...\n" msgstr "" -#: pysollib/game.py:2062 +#: pysollib/game.py:2063 msgid "Set bookmark" msgstr "" -#: pysollib/game.py:2063 +#: pysollib/game.py:2064 msgid "Replace existing bookmark %d ?" msgstr "" -#: pysollib/game.py:2085 +#: pysollib/game.py:2086 msgid "Goto bookmark" msgstr "" -#: pysollib/game.py:2086 +#: pysollib/game.py:2087 msgid "Goto bookmark %d ?" msgstr "" -#: pysollib/game.py:2117 +#: pysollib/game.py:2118 msgid "Open game" msgstr "" -#: pysollib/game.py:2128 pysollib/game.py:2137 pysollib/game.py:2142 +#: pysollib/game.py:2129 pysollib/game.py:2138 pysollib/game.py:2143 msgid "Load game error" msgstr "" -#: pysollib/game.py:2129 +#: pysollib/game.py:2130 msgid "" "Error while loading game.\n" "\n" @@ -453,22 +451,22 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2138 +#: pysollib/game.py:2139 msgid "Error while loading game" msgstr "" -#: pysollib/game.py:2143 +#: pysollib/game.py:2144 msgid "" "Internal error while loading game.\n" "\n" "Please report this bug." msgstr "" -#: pysollib/game.py:2168 +#: pysollib/game.py:2169 msgid "Save game error" msgstr "" -#: pysollib/game.py:2169 +#: pysollib/game.py:2170 msgid "Error while saving game" msgstr "" @@ -724,7 +722,7 @@ msgid "Row. Build down in any suit but the same." msgstr "" #: pysollib/games/golf.py:114 pysollib/games/golf.py:413 -#: pysollib/stack.py:1740 +#: pysollib/stack.py:1742 msgid "Row. No building." msgstr "" @@ -732,7 +730,7 @@ msgstr "" msgid "Balance $%4d" msgstr "" -#: pysollib/games/golf.py:497 pysollib/stack.py:1673 +#: pysollib/games/golf.py:497 pysollib/stack.py:1675 msgid "Foundation. Build up regardless of suit." msgstr "" @@ -740,10 +738,47 @@ msgstr "" msgid "Balance $%d" msgstr "" -#: pysollib/games/klondike.py:387 +#: pysollib/games/klondike.py:391 msgid "Reserve. Only Kings are acceptable." msgstr "" +#: pysollib/games/mahjongg/mahjongg.py:294 +msgid "" +"No Free\n" +"Matching\n" +"Pairs" +msgstr "" + +#: pysollib/games/mahjongg/mahjongg.py:295 +msgid "" +"1 Free\n" +"Matching\n" +"Pair" +msgstr "" + +#: pysollib/games/mahjongg/mahjongg.py:296 +msgid "" +" Free\n" +"Matching\n" +"Pairs" +msgstr "" + +#: pysollib/games/mahjongg/mahjongg.py:297 +msgid "" +"\n" +"Tiles\n" +"Removed\n" +"\n" +msgstr "" + +#: pysollib/games/mahjongg/mahjongg.py:298 +msgid "" +"\n" +"Tiles\n" +"Remaining\n" +"\n" +msgstr "" + #: pysollib/games/matriarchy.py:125 msgid "Round %d/%d" msgstr "" @@ -806,7 +841,7 @@ msgstr "" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1190 pysollib/util.py:80 +#: pysollib/stack.py:1192 pysollib/util.py:80 msgid "Ace" msgstr "" @@ -818,12 +853,12 @@ msgstr "" msgid "Valet" msgstr "" -#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1188 +#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1190 #: pysollib/util.py:81 msgid "Queen" msgstr "" -#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1189 +#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1191 #: pysollib/util.py:81 msgid "King" msgstr "" @@ -1038,7 +1073,7 @@ msgstr "" msgid "Willow" msgstr "" -#: pysollib/games/ultra/larasgame.py:157 pysollib/stack.py:1368 +#: pysollib/games/ultra/larasgame.py:157 pysollib/stack.py:1370 msgid "Round %d" msgstr "" @@ -1117,15 +1152,15 @@ msgid "" msgstr "" #: pysollib/help.py:67 -msgid "Credits..." +msgid "&Credits..." msgstr "" #: pysollib/help.py:67 -msgid "Nice" +msgid "&Nice" msgstr "" #: pysollib/help.py:69 -msgid "Enjoy" +msgid "&Enjoy" msgstr "" #: pysollib/help.py:71 @@ -1187,7 +1222,7 @@ msgstr "" msgid " Help" msgstr "" -#: pysollib/main.py:68 pysollib/main.py:310 +#: pysollib/main.py:68 pysollib/main.py:321 msgid " installation error" msgstr "" @@ -1201,8 +1236,8 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:76 pysollib/main.py:319 pysollib/tk/toolbar.py:197 -msgid "Quit" +#: pysollib/main.py:76 pysollib/main.py:330 pysollib/tk/menubar.py:269 +msgid "&Quit" msgstr "" #: pysollib/main.py:95 @@ -1236,7 +1271,7 @@ msgid "" "try %s --help for more information" msgstr "" -#: pysollib/main.py:311 +#: pysollib/main.py:322 msgid "" "\n" "No games were found !!!\n" @@ -1247,198 +1282,462 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:397 pysollib/main.py:402 +#: pysollib/main.py:408 pysollib/main.py:416 msgid " installation problem" msgstr "" -#: pysollib/main.py:398 +#: pysollib/main.py:409 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:403 +#: pysollib/main.py:417 msgid "" "The pysolsoundserver module was not found.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:407 +#: pysollib/main.py:424 msgid "Welcome to " msgstr "" +#: pysollib/resource.py:242 +msgid "French type (52 cards)" +msgstr "" + +#: pysollib/resource.py:243 +msgid "Hanafuda type (48 cards)" +msgstr "" + +#: pysollib/resource.py:244 +msgid "Tarock type (78 cards)" +msgstr "" + +#: pysollib/resource.py:245 +msgid "Mahjongg type (42 tiles)" +msgstr "" + +#: pysollib/resource.py:246 +msgid "Hex A Deck type (68 cards)" +msgstr "" + +#: pysollib/resource.py:247 +msgid "Mughal Ganjifa type (96 cards)" +msgstr "" + +#: pysollib/resource.py:248 +msgid "Navagraha Ganjifa type (108 cards)" +msgstr "" + +#: pysollib/resource.py:249 +msgid "Dashavatara Ganjifa type (120 cards)" +msgstr "" + +#: pysollib/resource.py:250 +msgid "Trumps only type (variable cards)" +msgstr "" + +#: pysollib/resource.py:254 +msgid "French" +msgstr "" + +#: pysollib/resource.py:255 pysollib/resource.py:279 +msgid "Hanafuda" +msgstr "" + +#: pysollib/resource.py:256 pysollib/resource.py:295 +msgid "Tarock" +msgstr "" + +#: pysollib/resource.py:257 pysollib/resource.py:282 +msgid "Mahjongg" +msgstr "" + +#: pysollib/resource.py:258 pysollib/resource.py:280 +msgid "Hex A Deck" +msgstr "" + +#: pysollib/resource.py:259 +msgid "Mughal Ganjifa" +msgstr "" + +#: pysollib/resource.py:260 +msgid "Navagraha Ganjifa" +msgstr "" + +#: pysollib/resource.py:261 +msgid "Dashavatara Ganjifa" +msgstr "" + +#: pysollib/resource.py:262 +msgid "Trumps only" +msgstr "" + +#: pysollib/resource.py:267 +msgid "Adult" +msgstr "" + +#: pysollib/resource.py:268 +msgid "Animals" +msgstr "" + +#: pysollib/resource.py:269 +msgid "Anime" +msgstr "" + +#: pysollib/resource.py:270 +msgid "Art" +msgstr "" + +#: pysollib/resource.py:271 +msgid "Cartoons" +msgstr "" + +#: pysollib/resource.py:272 +msgid "Children" +msgstr "" + +#: pysollib/resource.py:273 +msgid "Classic look" +msgstr "" + +#: pysollib/resource.py:274 +msgid "Collectors" +msgstr "" + +#: pysollib/resource.py:275 +msgid "Computers" +msgstr "" + +#: pysollib/resource.py:276 +msgid "Engines" +msgstr "" + +#: pysollib/resource.py:277 +msgid "Fantasy" +msgstr "" + +#: pysollib/resource.py:278 +msgid "Ganjifa" +msgstr "" + +#: pysollib/resource.py:281 +msgid "Holiday" +msgstr "" + +#: pysollib/resource.py:283 +msgid "Movies" +msgstr "" + +#: pysollib/resource.py:284 +msgid "Matrix" +msgstr "" + +#: pysollib/resource.py:285 +msgid "Music" +msgstr "" + +#: pysollib/resource.py:286 +msgid "Nature" +msgstr "" + +#: pysollib/resource.py:287 +msgid "Operating Systems" +msgstr "" + +#: pysollib/resource.py:288 +msgid "People" +msgstr "" + +#: pysollib/resource.py:289 +msgid "Places" +msgstr "" + +#: pysollib/resource.py:290 +msgid "Plain" +msgstr "" + +#: pysollib/resource.py:291 +msgid "Products" +msgstr "" + +#: pysollib/resource.py:292 +msgid "Round cardsets" +msgstr "" + +#: pysollib/resource.py:293 +msgid "Science Fiction" +msgstr "" + +#: pysollib/resource.py:294 +msgid "Sports" +msgstr "" + +#: pysollib/resource.py:296 +msgid "Vehicels" +msgstr "" + +#: pysollib/resource.py:297 +msgid "Video Games" +msgstr "" + +#: pysollib/resource.py:302 +msgid "Australia" +msgstr "" + +#: pysollib/resource.py:303 +msgid "Austria" +msgstr "" + +#: pysollib/resource.py:304 +msgid "Belgium" +msgstr "" + +#: pysollib/resource.py:305 +msgid "Canada" +msgstr "" + +#: pysollib/resource.py:306 +msgid "China" +msgstr "" + +#: pysollib/resource.py:307 +msgid "Czech Republic" +msgstr "" + +#: pysollib/resource.py:308 +msgid "Denmark" +msgstr "" + +#: pysollib/resource.py:309 +msgid "England" +msgstr "" + +#: pysollib/resource.py:310 +msgid "France" +msgstr "" + +#: pysollib/resource.py:311 +msgid "Germany" +msgstr "" + +#: pysollib/resource.py:312 +msgid "Great Britain" +msgstr "" + +#: pysollib/resource.py:313 +msgid "Hungary" +msgstr "" + +#: pysollib/resource.py:314 +msgid "India" +msgstr "" + +#: pysollib/resource.py:315 +msgid "Italy" +msgstr "" + +#: pysollib/resource.py:316 +msgid "Japan" +msgstr "" + +#: pysollib/resource.py:317 +msgid "Netherlands" +msgstr "" + +#: pysollib/resource.py:318 +msgid "Russia" +msgstr "" + +#: pysollib/resource.py:319 +msgid "Spain" +msgstr "" + +#: pysollib/resource.py:320 +msgid "Sweden" +msgstr "" + +#: pysollib/resource.py:321 +msgid "Switzerland" +msgstr "" + +#: pysollib/resource.py:322 +msgid "USA" +msgstr "" + #: pysollib/settings.py:58 msgid "Top 10" msgstr "" -#: pysollib/stack.py:1184 +#: pysollib/stack.py:1186 msgid "Base card - %s." msgstr "" -#: pysollib/stack.py:1185 +#: pysollib/stack.py:1187 msgid "Empty row cannot be filled." msgstr "" -#: pysollib/stack.py:1186 +#: pysollib/stack.py:1188 msgid "any card" msgstr "" -#: pysollib/stack.py:1187 pysollib/util.py:81 +#: pysollib/stack.py:1189 pysollib/util.py:81 msgid "Jack" msgstr "" -#: pysollib/stack.py:1196 +#: pysollib/stack.py:1198 msgid "No cards" msgstr "" -#: pysollib/stack.py:1197 +#: pysollib/stack.py:1199 msgid "1 card" msgstr "" -#: pysollib/stack.py:1198 +#: pysollib/stack.py:1200 msgid " cards" msgstr "" -#: pysollib/stack.py:1377 pysollib/stack.py:1379 pysollib/stack.py:1410 +#: pysollib/stack.py:1379 pysollib/stack.py:1381 pysollib/stack.py:1412 msgid "Redeal" msgstr "" -#: pysollib/stack.py:1379 +#: pysollib/stack.py:1381 msgid "Stop" msgstr "" -#: pysollib/stack.py:1430 +#: pysollib/stack.py:1432 msgid "Variable redeals." msgstr "" -#: pysollib/stack.py:1431 +#: pysollib/stack.py:1433 msgid "Unlimited redeals." msgstr "" -#: pysollib/stack.py:1432 +#: pysollib/stack.py:1434 msgid "No redeals." msgstr "" -#: pysollib/stack.py:1433 +#: pysollib/stack.py:1435 msgid "One redeal." msgstr "" -#: pysollib/stack.py:1434 +#: pysollib/stack.py:1436 msgid " redeals." msgstr "" -#: pysollib/stack.py:1436 +#: pysollib/stack.py:1438 msgid "Talon." msgstr "" -#: pysollib/stack.py:1611 pysollib/stack.py:2035 +#: pysollib/stack.py:1613 pysollib/stack.py:2037 msgid "Reserve. No building." msgstr "" -#: pysollib/stack.py:1657 +#: pysollib/stack.py:1659 msgid "Foundation. Build up by suit." msgstr "" -#: pysollib/stack.py:1658 +#: pysollib/stack.py:1660 msgid "Foundation. Build down by suit." msgstr "" -#: pysollib/stack.py:1659 pysollib/stack.py:1675 pysollib/stack.py:1697 +#: pysollib/stack.py:1661 pysollib/stack.py:1677 pysollib/stack.py:1699 msgid "Foundation. Build by same rank." msgstr "" -#: pysollib/stack.py:1674 +#: pysollib/stack.py:1676 msgid "Foundation. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1695 +#: pysollib/stack.py:1697 msgid "Foundation. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1696 +#: pysollib/stack.py:1698 msgid "Foundation. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1770 +#: pysollib/stack.py:1772 msgid "Row. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1771 +#: pysollib/stack.py:1773 msgid "Row. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1772 pysollib/stack.py:1782 pysollib/stack.py:1791 -#: pysollib/stack.py:1800 pysollib/stack.py:1828 +#: pysollib/stack.py:1774 pysollib/stack.py:1784 pysollib/stack.py:1793 +#: pysollib/stack.py:1802 pysollib/stack.py:1830 msgid "Row. Build by same rank." msgstr "" -#: pysollib/stack.py:1780 +#: pysollib/stack.py:1782 msgid "Row. Build up by color." msgstr "" -#: pysollib/stack.py:1781 +#: pysollib/stack.py:1783 msgid "Row. Build down by color." msgstr "" -#: pysollib/stack.py:1789 +#: pysollib/stack.py:1791 msgid "Row. Build up by suit." msgstr "" -#: pysollib/stack.py:1790 +#: pysollib/stack.py:1792 msgid "Row. Build down by suit." msgstr "" -#: pysollib/stack.py:1798 pysollib/stack.py:1826 +#: pysollib/stack.py:1800 pysollib/stack.py:1828 msgid "Row. Build up regardless of suit." msgstr "" -#: pysollib/stack.py:1799 pysollib/stack.py:1827 +#: pysollib/stack.py:1801 pysollib/stack.py:1829 msgid "Row. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1849 +#: pysollib/stack.py:1851 msgid "Row. Build up by alternate color, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:1850 +#: pysollib/stack.py:1852 msgid "Row. Build down by alternate color, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:1851 pysollib/stack.py:1862 +#: pysollib/stack.py:1853 pysollib/stack.py:1864 msgid "Row. Build by same rank, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:1860 +#: pysollib/stack.py:1862 msgid "Row. Build up by suit, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:1861 +#: pysollib/stack.py:1863 msgid "Row. Build down by suit, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:1894 +#: pysollib/stack.py:1896 msgid "Row. Build up or down by color." msgstr "" -#: pysollib/stack.py:1905 +#: pysollib/stack.py:1907 msgid "Row. Build up or down by alternate color." msgstr "" -#: pysollib/stack.py:1916 +#: pysollib/stack.py:1918 msgid "Row. Build up or down by suit." msgstr "" -#: pysollib/stack.py:1927 +#: pysollib/stack.py:1929 msgid "Row. Build up or down regardless of suit." msgstr "" -#: pysollib/stack.py:1938 +#: pysollib/stack.py:1940 msgid "Waste." msgstr "" -#: pysollib/stack.py:2036 +#: pysollib/stack.py:2038 msgid "Free cell." msgstr "" @@ -1458,7 +1757,7 @@ msgstr "" msgid "Lost" msgstr "" -#: pysollib/stats.py:124 pysollib/tk/statusbar.py:134 +#: pysollib/stats.py:124 pysollib/tk/statusbar.py:137 msgid "Playing time" msgstr "" @@ -1478,19 +1777,19 @@ msgstr "" msgid "Game" msgstr "" -#: pysollib/stats.py:164 -msgid "Started at " -msgstr "" - #: pysollib/stats.py:164 msgid "Status" msgstr "" -#: pysollib/stats.py:164 pysollib/tk/statusbar.py:136 -#: pysollib/tk/tkstats.py:734 +#: pysollib/stats.py:164 pysollib/tk/statusbar.py:139 +#: pysollib/tk/tkstats.py:733 msgid "Game number" msgstr "" +#: pysollib/stats.py:164 pysollib/tk/tkstats.py:736 +msgid "Started at" +msgstr "" + #: pysollib/stats.py:187 msgid "** UNKNOWN %d **" msgstr "" @@ -1552,18 +1851,6 @@ msgstr "" msgid "Select color" msgstr "" -#: pysollib/tk/demooptionsdialog.py:66 -msgid "Display floating Demo logo" -msgstr "" - -#: pysollib/tk/demooptionsdialog.py:69 -msgid "Show score in statusbar" -msgstr "" - -#: pysollib/tk/demooptionsdialog.py:73 -msgid "Set demo delay in seconds" -msgstr "" - #: pysollib/tk/fontsdialog.py:85 msgid "abcdefghABCDEFGH" msgstr "" @@ -1632,421 +1919,412 @@ msgstr "" msgid "Customize toolbar" msgstr "" -#: pysollib/tk/menubar.py:248 +#: pysollib/tk/menubar.py:249 msgid "&File" msgstr "" -#: pysollib/tk/menubar.py:249 -msgid "&New game" -msgstr "" - -#: pysollib/tk/menubar.py:250 +#: pysollib/tk/menubar.py:251 msgid "R&ecent games" msgstr "" -#: pysollib/tk/menubar.py:252 +#: pysollib/tk/menubar.py:253 msgid "Select &random game" msgstr "" -#: pysollib/tk/menubar.py:253 +#: pysollib/tk/menubar.py:254 msgid "&All games" msgstr "" -#: pysollib/tk/menubar.py:254 +#: pysollib/tk/menubar.py:255 msgid "Games played and &won" msgstr "" -#: pysollib/tk/menubar.py:255 +#: pysollib/tk/menubar.py:256 msgid "Games played and ¬ won" msgstr "" -#: pysollib/tk/menubar.py:256 +#: pysollib/tk/menubar.py:257 msgid "Games not &played" msgstr "" -#: pysollib/tk/menubar.py:257 +#: pysollib/tk/menubar.py:258 msgid "Select game by nu&mber..." msgstr "" -#: pysollib/tk/menubar.py:259 +#: pysollib/tk/menubar.py:260 msgid "Fa&vorite games" msgstr "" -#: pysollib/tk/menubar.py:260 +#: pysollib/tk/menubar.py:261 msgid "A&dd to favorites" msgstr "" -#: pysollib/tk/menubar.py:261 +#: pysollib/tk/menubar.py:262 msgid "R&emove from favorites" msgstr "" -#: pysollib/tk/menubar.py:263 +#: pysollib/tk/menubar.py:264 msgid "&Open..." msgstr "" -#: pysollib/tk/menubar.py:264 +#: pysollib/tk/menubar.py:265 msgid "&Save" msgstr "" -#: pysollib/tk/menubar.py:265 +#: pysollib/tk/menubar.py:266 msgid "Save &as..." msgstr "" -#: pysollib/tk/menubar.py:267 +#: pysollib/tk/menubar.py:268 msgid "&Hold and quit" msgstr "" -#: pysollib/tk/menubar.py:268 -msgid "&Quit" -msgstr "" - -#: pysollib/tk/menubar.py:270 +#: pysollib/tk/menubar.py:271 pysollib/tk/selectgame.py:409 msgid "&Select" msgstr "" -#: pysollib/tk/menubar.py:273 +#: pysollib/tk/menubar.py:274 msgid "&Edit" msgstr "" -#: pysollib/tk/menubar.py:274 +#: pysollib/tk/menubar.py:275 msgid "&Undo" msgstr "" -#: pysollib/tk/menubar.py:275 +#: pysollib/tk/menubar.py:276 msgid "&Redo" msgstr "" -#: pysollib/tk/menubar.py:276 +#: pysollib/tk/menubar.py:277 msgid "Redo &all" msgstr "" -#: pysollib/tk/menubar.py:279 +#: pysollib/tk/menubar.py:280 msgid "&Set bookmark" msgstr "" -#: pysollib/tk/menubar.py:281 pysollib/tk/menubar.py:285 +#: pysollib/tk/menubar.py:282 pysollib/tk/menubar.py:286 msgid "Bookmark %d" msgstr "" -#: pysollib/tk/menubar.py:283 +#: pysollib/tk/menubar.py:284 msgid "Go&to bookmark" msgstr "" -#: pysollib/tk/menubar.py:288 +#: pysollib/tk/menubar.py:289 msgid "&Clear bookmarks" msgstr "" -#: pysollib/tk/menubar.py:291 +#: pysollib/tk/menubar.py:292 msgid "Restart &game" msgstr "" -#: pysollib/tk/menubar.py:293 +#: pysollib/tk/menubar.py:294 msgid "&Game" msgstr "" -#: pysollib/tk/menubar.py:294 +#: pysollib/tk/menubar.py:295 msgid "&Deal cards" msgstr "" -#: pysollib/tk/menubar.py:295 pysollib/tk/menubar.py:324 +#: pysollib/tk/menubar.py:296 pysollib/tk/menubar.py:325 msgid "&Auto drop" msgstr "" -#: pysollib/tk/menubar.py:296 +#: pysollib/tk/menubar.py:297 msgid "&Pause" msgstr "" -#: pysollib/tk/menubar.py:299 +#: pysollib/tk/menubar.py:300 msgid "S&tatus..." msgstr "" -#: pysollib/tk/menubar.py:300 +#: pysollib/tk/menubar.py:301 msgid "&Comments..." msgstr "" -#: pysollib/tk/menubar.py:302 +#: pysollib/tk/menubar.py:303 msgid "&Statistics" msgstr "" -#: pysollib/tk/menubar.py:303 pysollib/tk/menubar.py:311 +#: pysollib/tk/menubar.py:304 pysollib/tk/menubar.py:312 msgid "Current game..." msgstr "" -#: pysollib/tk/menubar.py:304 pysollib/tk/menubar.py:312 -#: pysollib/tk/tkstats.py:289 +#: pysollib/tk/menubar.py:305 pysollib/tk/menubar.py:313 msgid "All games..." msgstr "" -#: pysollib/tk/menubar.py:306 pysollib/tk/tkstats.py:647 +#: pysollib/tk/menubar.py:307 msgid "Session log..." msgstr "" -#: pysollib/tk/menubar.py:307 pysollib/tk/tkstats.py:663 +#: pysollib/tk/menubar.py:308 msgid "Full log..." msgstr "" -#: pysollib/tk/menubar.py:310 +#: pysollib/tk/menubar.py:311 msgid "D&emo statistics" msgstr "" -#: pysollib/tk/menubar.py:314 +#: pysollib/tk/menubar.py:315 msgid "&Assist" msgstr "" -#: pysollib/tk/menubar.py:315 +#: pysollib/tk/menubar.py:316 msgid "&Hint" msgstr "" -#: pysollib/tk/menubar.py:316 +#: pysollib/tk/menubar.py:317 msgid "Highlight p&iles" msgstr "" -#: pysollib/tk/menubar.py:318 +#: pysollib/tk/menubar.py:319 msgid "&Demo" msgstr "" -#: pysollib/tk/menubar.py:319 +#: pysollib/tk/menubar.py:320 msgid "Demo (&all games)" msgstr "" -#: pysollib/tk/menubar.py:320 +#: pysollib/tk/menubar.py:321 msgid "&Options" msgstr "" -#: pysollib/tk/menubar.py:321 +#: pysollib/tk/menubar.py:322 msgid "&Player options..." msgstr "" -#: pysollib/tk/menubar.py:322 +#: pysollib/tk/menubar.py:323 msgid "&Automatic play" msgstr "" -#: pysollib/tk/menubar.py:323 +#: pysollib/tk/menubar.py:324 msgid "Auto &face up" msgstr "" -#: pysollib/tk/menubar.py:325 +#: pysollib/tk/menubar.py:326 msgid "Auto &deal" msgstr "" -#: pysollib/tk/menubar.py:327 +#: pysollib/tk/menubar.py:328 msgid "&Quick play" msgstr "" -#: pysollib/tk/menubar.py:328 +#: pysollib/tk/menubar.py:329 msgid "Assist &level" msgstr "" -#: pysollib/tk/menubar.py:329 +#: pysollib/tk/menubar.py:330 msgid "Enable &undo" msgstr "" -#: pysollib/tk/menubar.py:330 +#: pysollib/tk/menubar.py:331 msgid "Enable &bookmarks" msgstr "" -#: pysollib/tk/menubar.py:331 +#: pysollib/tk/menubar.py:332 msgid "Enable &hint" msgstr "" -#: pysollib/tk/menubar.py:332 +#: pysollib/tk/menubar.py:333 msgid "Enable highlight p&iles" msgstr "" -#: pysollib/tk/menubar.py:333 +#: pysollib/tk/menubar.py:334 msgid "Enable highlight &cards" msgstr "" -#: pysollib/tk/menubar.py:334 +#: pysollib/tk/menubar.py:335 msgid "Enable highlight same &rank" msgstr "" -#: pysollib/tk/menubar.py:335 +#: pysollib/tk/menubar.py:336 msgid "Highlight &no matching" msgstr "" -#: pysollib/tk/menubar.py:337 +#: pysollib/tk/menubar.py:338 msgid "Show removed tiles (in Mahjongg games)" msgstr "" -#: pysollib/tk/menubar.py:338 +#: pysollib/tk/menubar.py:339 msgid "Show hint arrow (in Shisen-Sho games)" msgstr "" -#: pysollib/tk/menubar.py:340 +#: pysollib/tk/menubar.py:341 msgid "&Sound" msgstr "" -#: pysollib/tk/menubar.py:350 +#: pysollib/tk/menubar.py:351 msgid "Cards&et..." msgstr "" -#: pysollib/tk/menubar.py:351 +#: pysollib/tk/menubar.py:352 msgid "Table t&ile..." msgstr "" -#: pysollib/tk/menubar.py:353 +#: pysollib/tk/menubar.py:354 msgid "Card &background" msgstr "" -#: pysollib/tk/menubar.py:354 +#: pysollib/tk/menubar.py:355 msgid "Card &view" msgstr "" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:356 msgid "Card shado&w" msgstr "" -#: pysollib/tk/menubar.py:356 +#: pysollib/tk/menubar.py:357 msgid "Shade &legal moves" msgstr "" -#: pysollib/tk/menubar.py:357 +#: pysollib/tk/menubar.py:358 msgid "&Negative card bottom" msgstr "" -#: pysollib/tk/menubar.py:358 +#: pysollib/tk/menubar.py:359 msgid "A&nimations" msgstr "" -#: pysollib/tk/menubar.py:359 +#: pysollib/tk/menubar.py:360 msgid "&None" msgstr "" -#: pysollib/tk/menubar.py:360 +#: pysollib/tk/menubar.py:361 msgid "&Timer based" msgstr "" -#: pysollib/tk/menubar.py:361 +#: pysollib/tk/menubar.py:362 msgid "&Fast" msgstr "" -#: pysollib/tk/menubar.py:362 +#: pysollib/tk/menubar.py:363 msgid "&Slow" msgstr "" -#: pysollib/tk/menubar.py:363 +#: pysollib/tk/menubar.py:364 msgid "&Very slow" msgstr "" -#: pysollib/tk/menubar.py:364 +#: pysollib/tk/menubar.py:365 msgid "Stick&y mouse" msgstr "" -#: pysollib/tk/menubar.py:368 +#: pysollib/tk/menubar.py:367 msgid "&Fonts..." msgstr "" -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:368 msgid "&Colors..." msgstr "" -#: pysollib/tk/menubar.py:370 +#: pysollib/tk/menubar.py:369 msgid "Time&outs..." msgstr "" -#: pysollib/tk/menubar.py:372 +#: pysollib/tk/menubar.py:371 msgid "&Toolbar" msgstr "" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:373 msgid "Stat&usbar" msgstr "" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:374 msgid "Show &statusbar" msgstr "" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:375 msgid "Show &number of cards" msgstr "" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:376 msgid "Show &help bar" msgstr "" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:377 msgid "&Demo logo" msgstr "" -#: pysollib/tk/menubar.py:379 +#: pysollib/tk/menubar.py:378 msgid "Startup splash sc&reen" msgstr "" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:382 msgid "&Help" msgstr "" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:383 msgid "&Contents" msgstr "" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:384 msgid "&How to play" msgstr "" -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:385 msgid "&Rules for this game" msgstr "" -#: pysollib/tk/menubar.py:387 +#: pysollib/tk/menubar.py:386 msgid "&License terms" msgstr "" -#: pysollib/tk/menubar.py:390 +#: pysollib/tk/menubar.py:389 msgid "&About " msgstr "" -#: pysollib/tk/menubar.py:498 +#: pysollib/tk/menubar.py:497 msgid "All &games..." msgstr "" -#: pysollib/tk/menubar.py:499 +#: pysollib/tk/menubar.py:498 msgid "Playable pre&view..." msgstr "" -#: pysollib/tk/menubar.py:501 +#: pysollib/tk/menubar.py:500 msgid "&Popular games" msgstr "" -#: pysollib/tk/menubar.py:504 +#: pysollib/tk/menubar.py:503 msgid "&French games" msgstr "" -#: pysollib/tk/menubar.py:507 +#: pysollib/tk/menubar.py:506 msgid "&Mahjongg games" msgstr "" -#: pysollib/tk/menubar.py:510 +#: pysollib/tk/menubar.py:509 msgid "&Oriental games" msgstr "" -#: pysollib/tk/menubar.py:514 +#: pysollib/tk/menubar.py:513 msgid "&Special games" msgstr "" -#: pysollib/tk/menubar.py:518 +#: pysollib/tk/menubar.py:517 msgid "All games by name" msgstr "" -#: pysollib/tk/menubar.py:855 pysollib/tk/menubar.py:857 +#: pysollib/tk/menubar.py:854 pysollib/tk/menubar.py:856 #: pysollib/tk/selectcardset.py:240 -msgid "Load" +msgid "&Load" msgstr "" -#: pysollib/tk/menubar.py:857 -msgid "Info..." +#: pysollib/tk/menubar.py:856 +msgid "&Info..." msgstr "" -#: pysollib/tk/menubar.py:860 +#: pysollib/tk/menubar.py:859 msgid "Select " msgstr "" -#: pysollib/tk/menubar.py:920 +#: pysollib/tk/menubar.py:919 msgid "Select table background" msgstr "" -#: pysollib/tk/menubar.py:932 pysollib/tk/selecttile.py:176 +#: pysollib/tk/menubar.py:931 pysollib/tk/selecttile.py:177 msgid "Select table color" msgstr "" @@ -2174,7 +2452,7 @@ msgid "by Compatibility" msgstr "" #: pysollib/tk/selectgame.py:159 -msgid "New games in v" +msgid "New games in v." msgstr "" #: pysollib/tk/selectgame.py:162 @@ -2347,11 +2625,11 @@ msgstr "" msgid "Lost:" msgstr "" -#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:804 +#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:803 msgid "Playing time:" msgstr "" -#: pysollib/tk/selectgame.py:375 pysollib/tk/tkstats.py:811 +#: pysollib/tk/selectgame.py:375 pysollib/tk/tkstats.py:810 msgid "Moves:" msgstr "" @@ -2360,22 +2638,18 @@ msgid "% won:" msgstr "" #: pysollib/tk/selectgame.py:409 -msgid "Select" +msgid "&Rules" msgstr "" -#: pysollib/tk/selectgame.py:409 pysollib/tk/toolbar.py:195 -msgid "Rules" -msgstr "" - -#: pysollib/tk/selectgame.py:490 +#: pysollib/tk/selectgame.py:489 msgid "Playable Preview - " msgstr "" -#: pysollib/tk/selectgame.py:538 +#: pysollib/tk/selectgame.py:537 msgid "variable" msgstr "" -#: pysollib/tk/selectgame.py:539 +#: pysollib/tk/selectgame.py:538 msgid "unlimited" msgstr "" @@ -2404,7 +2678,7 @@ msgid "All Backgrounds" msgstr "" #: pysollib/tk/selecttile.py:158 -msgid "Solid color..." +msgid "&Solid color..." msgstr "" #: pysollib/tk/soundoptionsdialog.py:76 @@ -2424,11 +2698,11 @@ msgid "Music volume" msgstr "" #: pysollib/tk/soundoptionsdialog.py:106 -msgid "Apply" +msgid "&Apply" msgstr "" #: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:108 -msgid "Mixer..." +msgid "&Mixer..." msgstr "" #: pysollib/tk/soundoptionsdialog.py:155 @@ -2441,11 +2715,11 @@ msgid "" "the next time you restart " msgstr "" -#: pysollib/tk/statusbar.py:135 +#: pysollib/tk/statusbar.py:138 msgid "Moves/Total moves" msgstr "" -#: pysollib/tk/statusbar.py:137 +#: pysollib/tk/statusbar.py:140 msgid "Games played: won/lost" msgstr "" @@ -2485,23 +2759,23 @@ msgstr "" msgid "Text only" msgstr "" -#: pysollib/tk/tkhtml.py:280 +#: pysollib/tk/tkhtml.py:229 msgid "Index" msgstr "" -#: pysollib/tk/tkhtml.py:284 +#: pysollib/tk/tkhtml.py:233 msgid "Back" msgstr "" -#: pysollib/tk/tkhtml.py:288 +#: pysollib/tk/tkhtml.py:237 msgid "Forward" msgstr "" -#: pysollib/tk/tkhtml.py:292 +#: pysollib/tk/tkhtml.py:241 msgid "Close" msgstr "" -#: pysollib/tk/tkhtml.py:394 +#: pysollib/tk/tkhtml.py:347 msgid "" " HTML limitation:\n" "The %s protocol is not supported yet.\n" @@ -2511,7 +2785,7 @@ msgid "" "%s\n" msgstr "" -#: pysollib/tk/tkhtml.py:419 pysollib/tk/tkhtml.py:423 +#: pysollib/tk/tkhtml.py:372 pysollib/tk/tkhtml.py:376 msgid "" "Unable to service request:\n" msgstr "" @@ -2532,142 +2806,150 @@ msgstr "" msgid "No games" msgstr "" +#: pysollib/tk/tkstats.py:289 +msgid "&All games..." +msgstr "" + #: pysollib/tk/tkstats.py:291 -msgid "Reset..." +msgid "&Reset..." msgstr "" -#: pysollib/tk/tkstats.py:574 pysollib/tk/tkstats.py:647 -#: pysollib/tk/tkstats.py:663 -msgid "Save to file" +#: pysollib/tk/tkstats.py:572 pysollib/tk/tkstats.py:645 +#: pysollib/tk/tkstats.py:661 +msgid "&Save to file" msgstr "" -#: pysollib/tk/tkstats.py:575 -msgid "Reset all..." +#: pysollib/tk/tkstats.py:573 +msgid "&Reset all..." msgstr "" -#: pysollib/tk/tkstats.py:625 +#: pysollib/tk/tkstats.py:623 msgid "No entries for player " msgstr "" -#: pysollib/tk/tkstats.py:642 +#: pysollib/tk/tkstats.py:640 msgid "" "No log entries for %s\n" msgstr "" -#: pysollib/tk/tkstats.py:658 +#: pysollib/tk/tkstats.py:645 +msgid "Session &log..." +msgstr "" + +#: pysollib/tk/tkstats.py:656 msgid "" "No current session log entries for %s\n" msgstr "" -#: pysollib/tk/tkstats.py:678 +#: pysollib/tk/tkstats.py:661 +msgid "&Full log..." +msgstr "" + +#: pysollib/tk/tkstats.py:676 msgid "Highlight piles: " msgstr "" -#: pysollib/tk/tkstats.py:679 +#: pysollib/tk/tkstats.py:677 msgid "Highlight cards: " msgstr "" -#: pysollib/tk/tkstats.py:680 +#: pysollib/tk/tkstats.py:678 msgid "Highlight same rank: " msgstr "" -#: pysollib/tk/tkstats.py:683 +#: pysollib/tk/tkstats.py:681 msgid "" "\n" "Redeals: " msgstr "" -#: pysollib/tk/tkstats.py:684 +#: pysollib/tk/tkstats.py:682 msgid "" "\n" "Cards in Talon: " msgstr "" -#: pysollib/tk/tkstats.py:686 +#: pysollib/tk/tkstats.py:684 msgid "" "\n" "Cards in Waste: " msgstr "" -#: pysollib/tk/tkstats.py:688 +#: pysollib/tk/tkstats.py:686 msgid "" "\n" "Cards in Foundations: " msgstr "" -#: pysollib/tk/tkstats.py:691 +#: pysollib/tk/tkstats.py:689 msgid "Game status" msgstr "" -#: pysollib/tk/tkstats.py:694 +#: pysollib/tk/tkstats.py:692 msgid "Playing time: " msgstr "" -#: pysollib/tk/tkstats.py:695 +#: pysollib/tk/tkstats.py:693 msgid "Started at: " msgstr "" -#: pysollib/tk/tkstats.py:696 +#: pysollib/tk/tkstats.py:694 msgid "Moves: " msgstr "" -#: pysollib/tk/tkstats.py:697 +#: pysollib/tk/tkstats.py:695 msgid "Undo moves: " msgstr "" -#: pysollib/tk/tkstats.py:698 +#: pysollib/tk/tkstats.py:696 msgid "Bookmark moves: " msgstr "" -#: pysollib/tk/tkstats.py:699 +#: pysollib/tk/tkstats.py:697 msgid "Demo moves: " msgstr "" -#: pysollib/tk/tkstats.py:700 +#: pysollib/tk/tkstats.py:698 msgid "Total player moves: " msgstr "" -#: pysollib/tk/tkstats.py:701 +#: pysollib/tk/tkstats.py:699 msgid "Total moves in this game: " msgstr "" -#: pysollib/tk/tkstats.py:702 +#: pysollib/tk/tkstats.py:700 msgid "Hints: " msgstr "" -#: pysollib/tk/tkstats.py:706 -msgid "Statistics..." +#: pysollib/tk/tkstats.py:704 +msgid "&Statistics..." msgstr "" -#: pysollib/tk/tkstats.py:731 +#: pysollib/tk/tkstats.py:730 msgid "N" msgstr "" -#: pysollib/tk/tkstats.py:737 -msgid "Started at" -msgstr "" - -#: pysollib/tk/tkstats.py:740 +#: pysollib/tk/tkstats.py:739 msgid "Result" msgstr "" -#: pysollib/tk/tkstats.py:796 +#: pysollib/tk/tkstats.py:795 msgid "Minimum" msgstr "" -#: pysollib/tk/tkstats.py:797 +#: pysollib/tk/tkstats.py:796 msgid "Maximum" msgstr "" -#: pysollib/tk/tkstats.py:798 +#: pysollib/tk/tkstats.py:797 msgid "Average" msgstr "" -#: pysollib/tk/tkstats.py:818 +#: pysollib/tk/tkstats.py:817 msgid "Total moves:" msgstr "" -#: pysollib/tk/tkstats.py:849 +#: pysollib/tk/tkstats.py:848 msgid "No TOP for this game" msgstr "" @@ -2675,6 +2957,10 @@ msgstr "" msgid "New" msgstr "" +#: pysollib/tk/toolbar.py:184 +msgid "Restart" +msgstr "" + #: pysollib/tk/toolbar.py:184 msgid "" "Restart the\n" @@ -2735,10 +3021,18 @@ msgstr "" msgid "View statistics" msgstr "" +#: pysollib/tk/toolbar.py:195 +msgid "Rules" +msgstr "" + #: pysollib/tk/toolbar.py:195 msgid "Rules for this game" msgstr "" +#: pysollib/tk/toolbar.py:197 +msgid "Quit" +msgstr "" + #: pysollib/tk/toolbar.py:209 msgid "Player" msgstr "" @@ -2747,7 +3041,7 @@ msgstr "" msgid "Player options" msgstr "" -#: pysollib/tk/toolbar.py:428 +#: pysollib/tk/toolbar.py:429 msgid "Toolbar" msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index e6f25882..0a209d3b 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri May 26 20:25:43 2006\n" -"PO-Revision-Date: 2006-05-13 17:41+0400\n" +"POT-Creation-Date: Tue Jun 6 02:20:52 2006\n" +"PO-Revision-Date: 2006-06-03 03:28+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -63,10 +63,6 @@ msgstr "" msgid "Acme" msgstr "" -#, fuzzy -msgid "Adelaide" -msgstr "Поляна" - msgid "Agnes Bernauer" msgstr "Агнесса Берно" @@ -2417,6 +2413,10 @@ msgstr "Крыса" msgid "Raw Prawn" msgstr "" +#, fuzzy +msgid "Realm" +msgstr "Овен" + msgid "Rectangle" msgstr "Прямоугольник" @@ -3186,3 +3186,7 @@ msgstr "Церлин (3 колоды)" msgid "Zeus" msgstr "Зевс" + +#, fuzzy +#~ msgid "Adelaide" +#~ msgstr "Аделаида" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 6cbde4ce..c51e0a27 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri May 26 20:25:31 2006\n" -"PO-Revision-Date: 2006-05-13 00:53+0400\n" +"POT-Creation-Date: Tue Jun 6 02:20:47 2006\n" +"PO-Revision-Date: 2006-06-06 09:08+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -14,33 +14,32 @@ msgstr "" "Content-Transfer-Encoding: utf-8\n" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:345 pysollib/game.py:1205 pysollib/game.py:1220 -#: pysollib/game.py:1226 pysollib/game.py:1231 pysollib/tk/toolbar.py:183 +#: pysollib/actions.py:344 pysollib/tk/toolbar.py:183 msgid "New game" msgstr "Новая игра" -#: pysollib/actions.py:358 pysollib/tk/menubar.py:668 -#: pysollib/tk/menubar.py:682 +#: pysollib/actions.py:357 pysollib/tk/menubar.py:667 +#: pysollib/tk/menubar.py:681 msgid "Select game" msgstr "Выбрать игру" -#: pysollib/actions.py:381 +#: pysollib/actions.py:380 msgid "Invalid game number" msgstr "Неправильный номер игры" -#: pysollib/actions.py:382 +#: pysollib/actions.py:381 msgid "Invalid game number\n" msgstr "Неправильный номер игры\n" -#: pysollib/actions.py:399 +#: pysollib/actions.py:398 msgid "Select next game number" msgstr "Выберите номер следующей игры" -#: pysollib/actions.py:408 pysollib/actions.py:418 +#: pysollib/actions.py:407 pysollib/actions.py:417 msgid "Select new game number" msgstr "Выберите номер новой игры" -#: pysollib/actions.py:409 +#: pysollib/actions.py:408 msgid "" "\n" "\n" @@ -50,72 +49,70 @@ msgstr "" "\n" "Введите номер новой игры" -#: pysollib/actions.py:410 -msgid "Next number" -msgstr "Следующий номер" +#: pysollib/actions.py:409 +msgid "&Next number" +msgstr "&Следующий номер" -#: pysollib/actions.py:410 pysollib/app.py:1085 pysollib/app.py:1097 -#: pysollib/game.py:828 pysollib/game.py:1641 pysollib/main.py:399 -#: pysollib/main.py:404 pysollib/tk/colorsdialog.py:131 -#: pysollib/tk/demooptionsdialog.py:87 pysollib/tk/edittextdialog.py:82 -#: pysollib/tk/edittextdialog.py:94 pysollib/tk/fontsdialog.py:140 +#: pysollib/actions.py:409 pysollib/app.py:1090 pysollib/app.py:1102 +#: pysollib/game.py:828 pysollib/game.py:1642 pysollib/main.py:413 +#: pysollib/main.py:421 pysollib/tk/colorsdialog.py:131 +#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 #: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:133 #: pysollib/tk/playeroptionsdialog.py:86 #: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 #: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:158 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:506 -#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 -#: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 -#: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:776 -#: pysollib/tk/tkstats.py:860 pysollib/tk/tkwidget.py:158 -#: pysollib/tk/tkwidget.py:297 -msgid "OK" -msgstr "ОК" +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:459 +#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:571 +#: pysollib/tk/tkstats.py:645 pysollib/tk/tkstats.py:661 +#: pysollib/tk/tkstats.py:703 pysollib/tk/tkstats.py:775 +#: pysollib/tk/tkstats.py:859 pysollib/tk/tkwidget.py:159 +#: pysollib/tk/tkwidget.py:312 +msgid "&OK" +msgstr "&ОК" -#: pysollib/actions.py:410 pysollib/app.py:1097 pysollib/game.py:828 +#: pysollib/actions.py:409 pysollib/app.py:1102 pysollib/game.py:828 #: pysollib/game.py:1205 pysollib/game.py:1220 pysollib/game.py:1226 #: pysollib/game.py:1231 pysollib/tk/colorsdialog.py:131 -#: pysollib/tk/demooptionsdialog.py:87 pysollib/tk/edittextdialog.py:94 -#: pysollib/tk/fontsdialog.py:140 pysollib/tk/fontsdialog.py:204 -#: pysollib/tk/menubar.py:855 pysollib/tk/menubar.py:857 -#: pysollib/tk/playeroptionsdialog.py:86 +#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 +#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:854 +#: pysollib/tk/menubar.py:856 pysollib/tk/playeroptionsdialog.py:86 #: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectgame.py:268 pysollib/tk/selectgame.py:409 #: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:106 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:297 -msgid "Cancel" -msgstr "Отмена" +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:312 +msgid "&Cancel" +msgstr "От&мена" -#: pysollib/actions.py:426 +#: pysollib/actions.py:425 msgid "Select random game" msgstr "Выбор случайной игры" -#: pysollib/actions.py:462 +#: pysollib/actions.py:461 msgid "Select next game" msgstr "Выбрать следующую игру" -#: pysollib/actions.py:495 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:494 pysollib/tk/toolbar.py:197 msgid "Quit " msgstr "Выйти из " -#: pysollib/actions.py:545 +#: pysollib/actions.py:544 msgid "Clear bookmarks" msgstr "Удалить закладки" -#: pysollib/actions.py:546 +#: pysollib/actions.py:545 msgid "Clear all bookmarks ?" msgstr "Удалить все закладки?" -#: pysollib/actions.py:556 +#: pysollib/actions.py:555 msgid "Restart game" msgstr "Начать игру с начала" -#: pysollib/actions.py:557 +#: pysollib/actions.py:556 msgid "Restart this game ?" msgstr "Начать игру с начала?" -#: pysollib/actions.py:594 +#: pysollib/actions.py:593 msgid "" "Comments for %s:\n" "\n" @@ -123,19 +120,19 @@ msgstr "" "Комментарий для %s:\n" "\n" -#: pysollib/actions.py:596 +#: pysollib/actions.py:595 msgid "Comments for " msgstr "Комментарий для " -#: pysollib/actions.py:614 pysollib/actions.py:650 +#: pysollib/actions.py:613 pysollib/actions.py:649 msgid "Error while writing to file" msgstr "Ошибка при записи в файл" -#: pysollib/actions.py:617 pysollib/actions.py:653 pysollib/actions.py:956 +#: pysollib/actions.py:616 pysollib/actions.py:652 pysollib/actions.py:941 msgid " Info" msgstr " Информация" -#: pysollib/actions.py:618 +#: pysollib/actions.py:617 msgid "" "Comments were appended to\n" "\n" @@ -143,15 +140,15 @@ msgstr "" "Комментарий добавлен в файл\n" "\n" -#: pysollib/actions.py:635 +#: pysollib/actions.py:634 msgid "Demo statistics" msgstr "Статистика демо" -#: pysollib/actions.py:638 +#: pysollib/actions.py:637 msgid "Your statistics" msgstr "Ваша статистика" -#: pysollib/actions.py:654 +#: pysollib/actions.py:653 msgid "" " were appended to\n" "\n" @@ -159,52 +156,52 @@ msgstr "" " добавлена в файл\n" "\n" -#: pysollib/actions.py:668 +#: pysollib/actions.py:667 msgid " Demo" msgstr " Демо" -#: pysollib/actions.py:668 +#: pysollib/actions.py:667 msgid " Demo " msgstr " Демо " -#: pysollib/actions.py:671 pysollib/actions.py:689 +#: pysollib/actions.py:670 pysollib/actions.py:688 msgid " for " msgstr " для " -#: pysollib/actions.py:677 pysollib/actions.py:696 +#: pysollib/actions.py:676 pysollib/actions.py:695 msgid "Statistics for " msgstr "Статистика игры " -#: pysollib/actions.py:680 pysollib/tk/selectgame.py:352 +#: pysollib/actions.py:679 pysollib/tk/selectgame.py:352 #: pysollib/tk/toolbar.py:194 msgid "Statistics" msgstr "Статистика" -#: pysollib/actions.py:683 +#: pysollib/actions.py:682 msgid "Full log" msgstr "Полный лог" -#: pysollib/actions.py:686 +#: pysollib/actions.py:685 msgid "Session log" msgstr "Лог сессии" -#: pysollib/actions.py:692 +#: pysollib/actions.py:691 msgid "Game Info" msgstr "Информация об игре" -#: pysollib/actions.py:701 +#: pysollib/actions.py:700 msgid "Full log for " msgstr "Полный лог для " -#: pysollib/actions.py:706 +#: pysollib/actions.py:705 msgid "Session log for " msgstr "Лог сессии для " -#: pysollib/actions.py:711 +#: pysollib/actions.py:710 msgid "Reset all statistics" msgstr "Очистить всю статистику" -#: pysollib/actions.py:712 +#: pysollib/actions.py:711 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" @@ -212,11 +209,11 @@ msgstr "" "Очистить всю статистику и лог для игрока\n" "%s?" -#: pysollib/actions.py:718 +#: pysollib/actions.py:717 msgid "Reset game statistics" msgstr "Очистить статистику игры" -#: pysollib/actions.py:719 +#: pysollib/actions.py:718 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -228,39 +225,35 @@ msgstr "" "и игры\n" "%s?" -#: pysollib/actions.py:775 +#: pysollib/actions.py:774 msgid "Play demo" msgstr "Показать демо" -#: pysollib/actions.py:786 +#: pysollib/actions.py:785 msgid "Set player options" msgstr "Установить настройки игрока" -#: pysollib/actions.py:875 +#: pysollib/actions.py:874 msgid "Sound settings" msgstr "Настройка звука" -#: pysollib/actions.py:896 -msgid "Set demo options" -msgstr "Настройка демо" - -#: pysollib/actions.py:910 +#: pysollib/actions.py:895 msgid "Set colors" msgstr "Настроить цвета" -#: pysollib/actions.py:929 +#: pysollib/actions.py:914 msgid "Set fonts" msgstr "Настроить шрифт" -#: pysollib/actions.py:938 +#: pysollib/actions.py:923 msgid "Set timeouts" msgstr "Настроить таймауты" -#: pysollib/actions.py:953 +#: pysollib/actions.py:938 msgid "Error while saving options" msgstr "Ошибка при сохранении настроек" -#: pysollib/actions.py:957 +#: pysollib/actions.py:942 msgid "" "Options were saved to\n" "\n" @@ -268,27 +261,27 @@ msgstr "" "Опции сохранены в\n" "\n" -#: pysollib/app.py:85 +#: pysollib/app.py:86 msgid "Unknown" msgstr "Неизвестный" -#: pysollib/app.py:947 +#: pysollib/app.py:952 msgid "Loading %s %s..." msgstr "Загружается %s %s..." -#: pysollib/app.py:982 +#: pysollib/app.py:987 msgid " load error" msgstr " ошибка при загрузке" -#: pysollib/app.py:983 +#: pysollib/app.py:988 msgid "Error while loading " msgstr "Ошибка при загрузке" -#: pysollib/app.py:1077 +#: pysollib/app.py:1082 msgid "Incompatible " msgstr "Несовместимый " -#: pysollib/app.py:1079 +#: pysollib/app.py:1084 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -302,7 +295,7 @@ msgstr "" "\n" "Необходимо выбрать %s типа %s.\n" -#: pysollib/app.py:1095 +#: pysollib/app.py:1100 msgid "Please select a %s type %s" msgstr "Выберите %s типа %s" @@ -383,6 +376,11 @@ msgstr "" "Количество ходов: %s\n" "%s\n" +#: pysollib/game.py:1205 pysollib/game.py:1220 pysollib/game.py:1226 +#: pysollib/game.py:1231 pysollib/tk/menubar.py:250 +msgid "&New game" +msgstr "&Новая игра" + #: pysollib/game.py:1213 msgid "" "\n" @@ -404,7 +402,7 @@ msgstr "" msgid "Game finished" msgstr "Игра закончена" -#: pysollib/game.py:1225 pysollib/game.py:1642 +#: pysollib/game.py:1225 pysollib/game.py:1643 msgid "" "\n" "Game finished\n" @@ -420,31 +418,31 @@ msgstr "" "\n" "Игра закончена, но не без моей помощи...\n" -#: pysollib/game.py:1231 pysollib/tk/toolbar.py:184 -msgid "Restart" -msgstr "Начало" +#: pysollib/game.py:1231 +msgid "&Restart" +msgstr "&Начало" #: pysollib/game.py:1535 msgid "Score %6d" msgstr "Счет %6d" #: pysollib/game.py:1634 -msgid "Cool" -msgstr "Отлично" +msgid "&Cool" +msgstr "&Отлично" #: pysollib/game.py:1634 -msgid "Great" -msgstr "Эдорово" +msgid "&Great" +msgstr "&Эдорово" #: pysollib/game.py:1634 -msgid "Wow" -msgstr "Ура" +msgid "&Wow" +msgstr "&Ура" #: pysollib/game.py:1634 -msgid "Yeah" -msgstr "Ага" +msgid "&Yeah" +msgstr "&Ага" -#: pysollib/game.py:1635 pysollib/game.py:1645 pysollib/game.py:1657 +#: pysollib/game.py:1635 pysollib/game.py:1646 pysollib/game.py:1658 msgid " Autopilot" msgstr " Автопилот" @@ -456,19 +454,19 @@ msgstr "" "\n" "Игра решена за %d ходов\n" -#: pysollib/game.py:1656 -msgid "Hmm" -msgstr "Хмм" +#: pysollib/game.py:1657 +msgid "&Hmm" +msgstr "&Хмм" -#: pysollib/game.py:1656 -msgid "Oh well" -msgstr "Ох" +#: pysollib/game.py:1657 +msgid "&Oh well" +msgstr "&Ох" -#: pysollib/game.py:1656 -msgid "That's life" -msgstr "Такова жизнь" +#: pysollib/game.py:1657 +msgid "&That's life" +msgstr "&Такова жизнь" -#: pysollib/game.py:1658 +#: pysollib/game.py:1659 msgid "" "\n" "This won't come out...\n" @@ -476,31 +474,31 @@ msgstr "" "\n" "Не удалось...\n" -#: pysollib/game.py:2062 +#: pysollib/game.py:2063 msgid "Set bookmark" msgstr "Установить закладку" -#: pysollib/game.py:2063 +#: pysollib/game.py:2064 msgid "Replace existing bookmark %d ?" msgstr "Заменить существующую закладку %d ?" -#: pysollib/game.py:2085 +#: pysollib/game.py:2086 msgid "Goto bookmark" msgstr "Перейти к закладке" -#: pysollib/game.py:2086 +#: pysollib/game.py:2087 msgid "Goto bookmark %d ?" msgstr "Перейти к закладке %d ?" -#: pysollib/game.py:2117 +#: pysollib/game.py:2118 msgid "Open game" msgstr "Открыть игру" -#: pysollib/game.py:2128 pysollib/game.py:2137 pysollib/game.py:2142 +#: pysollib/game.py:2129 pysollib/game.py:2138 pysollib/game.py:2143 msgid "Load game error" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2129 +#: pysollib/game.py:2130 msgid "" "Error while loading game.\n" "\n" @@ -508,11 +506,11 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2138 +#: pysollib/game.py:2139 msgid "Error while loading game" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2143 +#: pysollib/game.py:2144 msgid "" "Internal error while loading game.\n" "\n" @@ -522,11 +520,11 @@ msgstr "" "\n" "Пожалуйста сообщите об этой ошибке." -#: pysollib/game.py:2168 +#: pysollib/game.py:2169 msgid "Save game error" msgstr "Ошибка при сохранении игры" -#: pysollib/game.py:2169 +#: pysollib/game.py:2170 msgid "Error while saving game" msgstr "Ошибка при сохранении игры" @@ -692,11 +690,11 @@ msgstr "Классические" #: pysollib/gamedb.py:189 pysollib/gamedb.py:197 pysollib/gamedb.py:206 msgid "Ganjifa type" -msgstr "Игры типа Ганджифа (Ganjifa)" +msgstr "Игры типа Ганджифа" #: pysollib/gamedb.py:190 pysollib/gamedb.py:198 pysollib/gamedb.py:207 msgid "Hanafuda type" -msgstr "Игры типа Ханафуда (Hanafuda)" +msgstr "Игры типа Ханафуда" #: pysollib/gamedb.py:191 pysollib/gamedb.py:199 pysollib/gamedb.py:214 msgid "Hex A Deck type" @@ -708,19 +706,19 @@ msgstr "Таро" #: pysollib/gamedb.py:205 msgid "Dashavatara Ganjifa type" -msgstr "Игры типа Дашаватара Ганджифа (Dashavatara Ganjifa)" +msgstr "Игры типа Дашаватара Ганджифа" #: pysollib/gamedb.py:208 msgid "Mughal Ganjifa type" -msgstr "Игры типа Мугал Ганджифа (Mughal Ganjifa)" +msgstr "Игры типа Мугал Ганджифа" #: pysollib/gamedb.py:209 msgid "Navagraha Ganjifa type" -msgstr "Игры типа Наваграха Ганджифа (Navagraha Ganjifa)" +msgstr "Игры типа Наваграха Ганджифа" #: pysollib/gamedb.py:213 msgid "Shisen-Sho" -msgstr "" +msgstr "Шисен-Сё" #: pysollib/gamedb.py:215 msgid "Matrix type" @@ -786,7 +784,7 @@ msgid "Row. Build down in any suit but the same." msgstr "" #: pysollib/games/golf.py:114 pysollib/games/golf.py:413 -#: pysollib/stack.py:1740 +#: pysollib/stack.py:1742 msgid "Row. No building." msgstr "" @@ -794,7 +792,7 @@ msgstr "" msgid "Balance $%4d" msgstr "Баланс $%4d" -#: pysollib/games/golf.py:497 pysollib/stack.py:1673 +#: pysollib/games/golf.py:497 pysollib/stack.py:1675 msgid "Foundation. Build up regardless of suit." msgstr "" @@ -802,10 +800,62 @@ msgstr "" msgid "Balance $%d" msgstr "Баланс $%d" -#: pysollib/games/klondike.py:387 +#: pysollib/games/klondike.py:391 msgid "Reserve. Only Kings are acceptable." msgstr "" +#: pysollib/games/mahjongg/mahjongg.py:294 +msgid "" +"No Free\n" +"Matching\n" +"Pairs" +msgstr "" +"Нет\n" +"свободных\n" +"пар" + +#: pysollib/games/mahjongg/mahjongg.py:295 +msgid "" +"1 Free\n" +"Matching\n" +"Pair" +msgstr "" +"1\n" +"свободная\n" +"пара" + +#: pysollib/games/mahjongg/mahjongg.py:296 +msgid "" +" Free\n" +"Matching\n" +"Pairs" +msgstr "" +" \n" +"свободных\n" +"пар" + +#: pysollib/games/mahjongg/mahjongg.py:297 +msgid "" +"\n" +"Tiles\n" +"Removed\n" +"\n" +msgstr "" +"\n" +"удалено\n" +"\n" + +#: pysollib/games/mahjongg/mahjongg.py:298 +msgid "" +"\n" +"Tiles\n" +"Remaining\n" +"\n" +msgstr "" +"\n" +"осталось\n" +"\n" + #: pysollib/games/matriarchy.py:125 msgid "Round %d/%d" msgstr "Раунд %d/%d" @@ -879,7 +929,7 @@ msgstr "Жезлы" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1190 pysollib/util.py:80 +#: pysollib/stack.py:1192 pysollib/util.py:80 msgid "Ace" msgstr "Туз" @@ -891,12 +941,12 @@ msgstr "Паж" msgid "Valet" msgstr "Валет" -#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1188 +#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1190 #: pysollib/util.py:81 msgid "Queen" msgstr "Королева" -#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1189 +#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1191 #: pysollib/util.py:81 msgid "King" msgstr "Король" @@ -1111,7 +1161,7 @@ msgstr "" msgid "Willow" msgstr "Ива" -#: pysollib/games/ultra/larasgame.py:157 pysollib/stack.py:1368 +#: pysollib/games/ultra/larasgame.py:157 pysollib/stack.py:1370 msgid "Round %d" msgstr "Раунд %d" @@ -1201,16 +1251,16 @@ msgid "A World Domination Project\n" msgstr "Всемирный непревзойденный проект\n" #: pysollib/help.py:67 -msgid "Credits..." -msgstr "Благодарности..." +msgid "&Credits..." +msgstr "&Благодарности..." #: pysollib/help.py:67 -msgid "Nice" -msgstr "Отлично" +msgid "&Nice" +msgstr "&Отлично" #: pysollib/help.py:69 -msgid "Enjoy" -msgstr "Наслаждайтесь" +msgid "&Enjoy" +msgstr "&Наслаждайтесь" #: pysollib/help.py:71 msgid "" @@ -1286,7 +1336,7 @@ msgstr "Не найден файл помощи\n" msgid " Help" msgstr " Помощь" -#: pysollib/main.py:68 pysollib/main.py:310 +#: pysollib/main.py:68 pysollib/main.py:321 msgid " installation error" msgstr " проблема с установкой" @@ -1300,9 +1350,9 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:76 pysollib/main.py:319 pysollib/tk/toolbar.py:197 -msgid "Quit" -msgstr "Выйти" +#: pysollib/main.py:76 pysollib/main.py:330 pysollib/tk/menubar.py:269 +msgid "&Quit" +msgstr "В&ыход" #: pysollib/main.py:95 msgid "" @@ -1350,7 +1400,7 @@ msgstr "" "%s: неправильное имя файла\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:311 +#: pysollib/main.py:322 msgid "" "\n" "No games were found !!!\n" @@ -1361,18 +1411,18 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:397 pysollib/main.py:402 +#: pysollib/main.py:408 pysollib/main.py:416 msgid " installation problem" msgstr "" -#: pysollib/main.py:398 +#: pysollib/main.py:409 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:403 +#: pysollib/main.py:417 msgid "" "The pysolsoundserver module was not found.\n" "\n" @@ -1382,187 +1432,452 @@ msgstr "" "\n" "Звук и фоновая музыка будут недоступны" -#: pysollib/main.py:407 +#: pysollib/main.py:424 msgid "Welcome to " msgstr "Добро пожаловать в " +#: pysollib/resource.py:242 +msgid "French type (52 cards)" +msgstr "Классические (52 карты)" + +#: pysollib/resource.py:243 +msgid "Hanafuda type (48 cards)" +msgstr "Ханафуда (48 карт)" + +#: pysollib/resource.py:244 +msgid "Tarock type (78 cards)" +msgstr "Таро (78 карт)" + +#: pysollib/resource.py:245 +msgid "Mahjongg type (42 tiles)" +msgstr "Маджонг (42 фишки)" + +#: pysollib/resource.py:246 +msgid "Hex A Deck type (68 cards)" +msgstr "Hex A Deck (68 карт)" + +#: pysollib/resource.py:247 +msgid "Mughal Ganjifa type (96 cards)" +msgstr "Мугал Ганджифа (96 карт)" + +#: pysollib/resource.py:248 +msgid "Navagraha Ganjifa type (108 cards)" +msgstr "Наваграха Ганджифа (108 карт)" + +#: pysollib/resource.py:249 +msgid "Dashavatara Ganjifa type (120 cards)" +msgstr "Дашаватара Ганджифа (120 карт)" + +#: pysollib/resource.py:250 +msgid "Trumps only type (variable cards)" +msgstr "" + +#: pysollib/resource.py:254 +msgid "French" +msgstr "Классические" + +#: pysollib/resource.py:255 pysollib/resource.py:279 +msgid "Hanafuda" +msgstr "Ханафуда" + +#: pysollib/resource.py:256 pysollib/resource.py:295 +msgid "Tarock" +msgstr "Таро" + +#: pysollib/resource.py:257 pysollib/resource.py:282 +msgid "Mahjongg" +msgstr "Маджонг" + +#: pysollib/resource.py:258 pysollib/resource.py:280 +msgid "Hex A Deck" +msgstr "Hex A Deck" + +#: pysollib/resource.py:259 +msgid "Mughal Ganjifa" +msgstr "Мугал Ганджифа" + +#: pysollib/resource.py:260 +msgid "Navagraha Ganjifa" +msgstr "Наваграха Ганджифа" + +#: pysollib/resource.py:261 +msgid "Dashavatara Ganjifa" +msgstr "Дашаватара Ганджифа" + +#: pysollib/resource.py:262 +#, fuzzy +msgid "Trumps only" +msgstr "Козырь" + +#: pysollib/resource.py:267 +msgid "Adult" +msgstr "Для взрослых" + +#: pysollib/resource.py:268 +msgid "Animals" +msgstr "Животные" + +#: pysollib/resource.py:269 +msgid "Anime" +msgstr "Мультфильмы" + +#: pysollib/resource.py:270 +msgid "Art" +msgstr "Искусство" + +#: pysollib/resource.py:271 +msgid "Cartoons" +msgstr "Комиксы" + +#: pysollib/resource.py:272 +msgid "Children" +msgstr "Дети" + +#: pysollib/resource.py:273 +msgid "Classic look" +msgstr "Классический вид" + +#: pysollib/resource.py:274 +msgid "Collectors" +msgstr "Коллекционные" + +#: pysollib/resource.py:275 +msgid "Computers" +msgstr "Компьютеры" + +#: pysollib/resource.py:276 +msgid "Engines" +msgstr "Машины" + +#: pysollib/resource.py:277 +msgid "Fantasy" +msgstr "Фентези" + +#: pysollib/resource.py:278 +msgid "Ganjifa" +msgstr "Ганджифа" + +#: pysollib/resource.py:281 +msgid "Holiday" +msgstr "Праздники" + +#: pysollib/resource.py:283 +msgid "Movies" +msgstr "Фильмы" + +#: pysollib/resource.py:284 +msgid "Matrix" +msgstr "Мозаика" + +#: pysollib/resource.py:285 +msgid "Music" +msgstr "Музыка" + +#: pysollib/resource.py:286 +msgid "Nature" +msgstr "Природа" + +#: pysollib/resource.py:287 +msgid "Operating Systems" +msgstr "Операционные системы" + +#: pysollib/resource.py:288 +msgid "People" +msgstr "Люди" + +#: pysollib/resource.py:289 +msgid "Places" +msgstr "Дома" + +#: pysollib/resource.py:290 +msgid "Plain" +msgstr "Простые" + +#: pysollib/resource.py:291 +msgid "Products" +msgstr "Продукты" + +#: pysollib/resource.py:292 +msgid "Round cardsets" +msgstr "Закруглённые" + +#: pysollib/resource.py:293 +msgid "Science Fiction" +msgstr "Научная фантастика" + +#: pysollib/resource.py:294 +msgid "Sports" +msgstr "Спорт" + +#: pysollib/resource.py:296 +msgid "Vehicels" +msgstr "Транспортные средства" + +#: pysollib/resource.py:297 +msgid "Video Games" +msgstr "Видеоигры" + +#: pysollib/resource.py:302 +msgid "Australia" +msgstr "Австралия" + +#: pysollib/resource.py:303 +msgid "Austria" +msgstr "Австрия" + +#: pysollib/resource.py:304 +msgid "Belgium" +msgstr "Бельгия" + +#: pysollib/resource.py:305 +msgid "Canada" +msgstr "Канада" + +#: pysollib/resource.py:306 +msgid "China" +msgstr "Китай" + +#: pysollib/resource.py:307 +msgid "Czech Republic" +msgstr "Чехия" + +#: pysollib/resource.py:308 +msgid "Denmark" +msgstr "Дания" + +#: pysollib/resource.py:309 +msgid "England" +msgstr "Англия" + +#: pysollib/resource.py:310 +msgid "France" +msgstr "Франция" + +#: pysollib/resource.py:311 +msgid "Germany" +msgstr "Германия" + +#: pysollib/resource.py:312 +msgid "Great Britain" +msgstr "Великобритания" + +#: pysollib/resource.py:313 +msgid "Hungary" +msgstr "Венгрия" + +#: pysollib/resource.py:314 +msgid "India" +msgstr "Индия" + +#: pysollib/resource.py:315 +msgid "Italy" +msgstr "Италия" + +#: pysollib/resource.py:316 +msgid "Japan" +msgstr "Япония" + +#: pysollib/resource.py:317 +msgid "Netherlands" +msgstr "Голландия" + +#: pysollib/resource.py:318 +msgid "Russia" +msgstr "Россия" + +#: pysollib/resource.py:319 +msgid "Spain" +msgstr "Испания" + +#: pysollib/resource.py:320 +msgid "Sweden" +msgstr "Швеция" + +#: pysollib/resource.py:321 +msgid "Switzerland" +msgstr "Швейцария" + +#: pysollib/resource.py:322 +msgid "USA" +msgstr "США" + #: pysollib/settings.py:58 msgid "Top 10" msgstr "Top 10" -#: pysollib/stack.py:1184 +#: pysollib/stack.py:1186 msgid "Base card - %s." msgstr "" -#: pysollib/stack.py:1185 +#: pysollib/stack.py:1187 msgid "Empty row cannot be filled." msgstr "" -#: pysollib/stack.py:1186 +#: pysollib/stack.py:1188 msgid "any card" msgstr "" -#: pysollib/stack.py:1187 pysollib/util.py:81 +#: pysollib/stack.py:1189 pysollib/util.py:81 msgid "Jack" msgstr "Валет" -#: pysollib/stack.py:1196 +#: pysollib/stack.py:1198 msgid "No cards" msgstr "Нет карт" -#: pysollib/stack.py:1197 +#: pysollib/stack.py:1199 msgid "1 card" msgstr "1 карта" -#: pysollib/stack.py:1198 +#: pysollib/stack.py:1200 msgid " cards" msgstr " карт" -#: pysollib/stack.py:1377 pysollib/stack.py:1379 pysollib/stack.py:1410 +#: pysollib/stack.py:1379 pysollib/stack.py:1381 pysollib/stack.py:1412 msgid "Redeal" msgstr "Сдать" -#: pysollib/stack.py:1379 +#: pysollib/stack.py:1381 msgid "Stop" msgstr "Стоп" -#: pysollib/stack.py:1430 +#: pysollib/stack.py:1432 msgid "Variable redeals." msgstr "Переменное количество пересдач." -#: pysollib/stack.py:1431 +#: pysollib/stack.py:1433 msgid "Unlimited redeals." msgstr "Неограниченное количество пересдач." -#: pysollib/stack.py:1432 +#: pysollib/stack.py:1434 msgid "No redeals." msgstr "Без пересдачи." -#: pysollib/stack.py:1433 +#: pysollib/stack.py:1435 msgid "One redeal." msgstr "1 пересдача." -#: pysollib/stack.py:1434 +#: pysollib/stack.py:1436 msgid " redeals." msgstr " пересдачи." -#: pysollib/stack.py:1436 +#: pysollib/stack.py:1438 msgid "Talon." msgstr "" -#: pysollib/stack.py:1611 pysollib/stack.py:2035 +#: pysollib/stack.py:1613 pysollib/stack.py:2037 msgid "Reserve. No building." msgstr "" -#: pysollib/stack.py:1657 +#: pysollib/stack.py:1659 msgid "Foundation. Build up by suit." msgstr "" -#: pysollib/stack.py:1658 +#: pysollib/stack.py:1660 msgid "Foundation. Build down by suit." msgstr "" -#: pysollib/stack.py:1659 pysollib/stack.py:1675 pysollib/stack.py:1697 +#: pysollib/stack.py:1661 pysollib/stack.py:1677 pysollib/stack.py:1699 msgid "Foundation. Build by same rank." msgstr "" -#: pysollib/stack.py:1674 +#: pysollib/stack.py:1676 msgid "Foundation. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1695 +#: pysollib/stack.py:1697 msgid "Foundation. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1696 +#: pysollib/stack.py:1698 msgid "Foundation. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1770 +#: pysollib/stack.py:1772 msgid "Row. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1771 +#: pysollib/stack.py:1773 msgid "Row. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1772 pysollib/stack.py:1782 pysollib/stack.py:1791 -#: pysollib/stack.py:1800 pysollib/stack.py:1828 +#: pysollib/stack.py:1774 pysollib/stack.py:1784 pysollib/stack.py:1793 +#: pysollib/stack.py:1802 pysollib/stack.py:1830 msgid "Row. Build by same rank." msgstr "" -#: pysollib/stack.py:1780 +#: pysollib/stack.py:1782 msgid "Row. Build up by color." msgstr "" -#: pysollib/stack.py:1781 +#: pysollib/stack.py:1783 msgid "Row. Build down by color." msgstr "" -#: pysollib/stack.py:1789 +#: pysollib/stack.py:1791 msgid "Row. Build up by suit." msgstr "" -#: pysollib/stack.py:1790 +#: pysollib/stack.py:1792 msgid "Row. Build down by suit." msgstr "" -#: pysollib/stack.py:1798 pysollib/stack.py:1826 +#: pysollib/stack.py:1800 pysollib/stack.py:1828 msgid "Row. Build up regardless of suit." msgstr "" -#: pysollib/stack.py:1799 pysollib/stack.py:1827 +#: pysollib/stack.py:1801 pysollib/stack.py:1829 msgid "Row. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1849 +#: pysollib/stack.py:1851 msgid "" "Row. Build up by alternate color, can move any face-up cards regardless of " "sequence." msgstr "" -#: pysollib/stack.py:1850 +#: pysollib/stack.py:1852 msgid "" "Row. Build down by alternate color, can move any face-up cards regardless of " "sequence." msgstr "" -#: pysollib/stack.py:1851 pysollib/stack.py:1862 +#: pysollib/stack.py:1853 pysollib/stack.py:1864 msgid "" "Row. Build by same rank, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:1860 +#: pysollib/stack.py:1862 msgid "" "Row. Build up by suit, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:1861 +#: pysollib/stack.py:1863 msgid "" "Row. Build down by suit, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:1894 +#: pysollib/stack.py:1896 msgid "Row. Build up or down by color." msgstr "" -#: pysollib/stack.py:1905 +#: pysollib/stack.py:1907 msgid "Row. Build up or down by alternate color." msgstr "" -#: pysollib/stack.py:1916 +#: pysollib/stack.py:1918 msgid "Row. Build up or down by suit." msgstr "" -#: pysollib/stack.py:1927 +#: pysollib/stack.py:1929 msgid "Row. Build up or down regardless of suit." msgstr "" -#: pysollib/stack.py:1938 +#: pysollib/stack.py:1940 msgid "Waste." msgstr "" -#: pysollib/stack.py:2036 +#: pysollib/stack.py:2038 msgid "Free cell." msgstr "Свободная ячейка." @@ -1582,7 +1897,7 @@ msgstr "Выиграл" msgid "Lost" msgstr "Проиграл" -#: pysollib/stats.py:124 pysollib/tk/statusbar.py:134 +#: pysollib/stats.py:124 pysollib/tk/statusbar.py:137 msgid "Playing time" msgstr "Время игры" @@ -1602,19 +1917,19 @@ msgstr "Всего (%d из %d игр)" msgid "Game" msgstr "Игра" -#: pysollib/stats.py:164 -msgid "Started at " -msgstr "Игра начата " - #: pysollib/stats.py:164 msgid "Status" msgstr "Статус" -#: pysollib/stats.py:164 pysollib/tk/statusbar.py:136 -#: pysollib/tk/tkstats.py:734 +#: pysollib/stats.py:164 pysollib/tk/statusbar.py:139 +#: pysollib/tk/tkstats.py:733 msgid "Game number" msgstr "Номер игры" +#: pysollib/stats.py:164 pysollib/tk/tkstats.py:736 +msgid "Started at" +msgstr "Игра начата" + #: pysollib/stats.py:187 msgid "** UNKNOWN %d **" msgstr "" @@ -1676,18 +1991,6 @@ msgstr "Подсветка отсутствия совпадения:" msgid "Select color" msgstr "Выбрать цвет" -#: pysollib/tk/demooptionsdialog.py:66 -msgid "Display floating Demo logo" -msgstr "Показывать демо лого" - -#: pysollib/tk/demooptionsdialog.py:69 -msgid "Show score in statusbar" -msgstr "Показывать счет в строке состояния" - -#: pysollib/tk/demooptionsdialog.py:73 -msgid "Set demo delay in seconds" -msgstr "Установить задуржку демо в секундах" - #: pysollib/tk/fontsdialog.py:85 msgid "abcdefghABCDEFGH" msgstr "abcdeABCDE абвгдАБВГД" @@ -1756,421 +2059,412 @@ msgstr "Большие пиктограммы" msgid "Customize toolbar" msgstr "Настроить панель инструментов" -#: pysollib/tk/menubar.py:248 +#: pysollib/tk/menubar.py:249 msgid "&File" msgstr "&Файл" -#: pysollib/tk/menubar.py:249 -msgid "&New game" -msgstr "&Новая игра" - -#: pysollib/tk/menubar.py:250 +#: pysollib/tk/menubar.py:251 msgid "R&ecent games" msgstr "Выбрать н&едавнюю игру" -#: pysollib/tk/menubar.py:252 +#: pysollib/tk/menubar.py:253 msgid "Select &random game" msgstr "С&лучайная игра" -#: pysollib/tk/menubar.py:253 +#: pysollib/tk/menubar.py:254 msgid "&All games" msgstr "&Все игры" -#: pysollib/tk/menubar.py:254 +#: pysollib/tk/menubar.py:255 msgid "Games played and &won" msgstr "&Выигранные игры" -#: pysollib/tk/menubar.py:255 +#: pysollib/tk/menubar.py:256 msgid "Games played and ¬ won" msgstr "&Невыигранные игры" -#: pysollib/tk/menubar.py:256 +#: pysollib/tk/menubar.py:257 msgid "Games not &played" msgstr "Не&сыгранные игры" -#: pysollib/tk/menubar.py:257 +#: pysollib/tk/menubar.py:258 msgid "Select game by nu&mber..." msgstr "Выбрать игру по &номеру..." -#: pysollib/tk/menubar.py:259 +#: pysollib/tk/menubar.py:260 msgid "Fa&vorite games" msgstr "&Избранные игры" -#: pysollib/tk/menubar.py:260 +#: pysollib/tk/menubar.py:261 msgid "A&dd to favorites" msgstr "&Добавить в избранное" -#: pysollib/tk/menubar.py:261 +#: pysollib/tk/menubar.py:262 msgid "R&emove from favorites" msgstr "&Удалить из избранных" -#: pysollib/tk/menubar.py:263 +#: pysollib/tk/menubar.py:264 msgid "&Open..." msgstr "&Открыть..." -#: pysollib/tk/menubar.py:264 +#: pysollib/tk/menubar.py:265 msgid "&Save" msgstr "&Сохранить" -#: pysollib/tk/menubar.py:265 +#: pysollib/tk/menubar.py:266 msgid "Save &as..." msgstr "Сохранить &как..." -#: pysollib/tk/menubar.py:267 +#: pysollib/tk/menubar.py:268 msgid "&Hold and quit" msgstr "Со&храниться и выйти" -#: pysollib/tk/menubar.py:268 -msgid "&Quit" -msgstr "В&ыход" - -#: pysollib/tk/menubar.py:270 +#: pysollib/tk/menubar.py:271 pysollib/tk/selectgame.py:409 msgid "&Select" msgstr "&Выбрать" -#: pysollib/tk/menubar.py:273 +#: pysollib/tk/menubar.py:274 msgid "&Edit" msgstr "Р&едактировать" -#: pysollib/tk/menubar.py:274 +#: pysollib/tk/menubar.py:275 msgid "&Undo" msgstr "&Отмена" -#: pysollib/tk/menubar.py:275 +#: pysollib/tk/menubar.py:276 msgid "&Redo" msgstr "&Повтор" -#: pysollib/tk/menubar.py:276 +#: pysollib/tk/menubar.py:277 msgid "Redo &all" msgstr "Вернуть все" -#: pysollib/tk/menubar.py:279 +#: pysollib/tk/menubar.py:280 msgid "&Set bookmark" msgstr "Установить &закладку" -#: pysollib/tk/menubar.py:281 pysollib/tk/menubar.py:285 +#: pysollib/tk/menubar.py:282 pysollib/tk/menubar.py:286 msgid "Bookmark %d" msgstr "Закладка %d" -#: pysollib/tk/menubar.py:283 +#: pysollib/tk/menubar.py:284 msgid "Go&to bookmark" msgstr "&Перейти к закладке" -#: pysollib/tk/menubar.py:288 +#: pysollib/tk/menubar.py:289 msgid "&Clear bookmarks" msgstr "О&чистить закладки" -#: pysollib/tk/menubar.py:291 +#: pysollib/tk/menubar.py:292 msgid "Restart &game" msgstr "&Начать с начала" -#: pysollib/tk/menubar.py:293 +#: pysollib/tk/menubar.py:294 msgid "&Game" msgstr "&Игра" -#: pysollib/tk/menubar.py:294 +#: pysollib/tk/menubar.py:295 msgid "&Deal cards" msgstr "&Сдать карты" -#: pysollib/tk/menubar.py:295 pysollib/tk/menubar.py:324 +#: pysollib/tk/menubar.py:296 pysollib/tk/menubar.py:325 msgid "&Auto drop" msgstr "С&бросить карты" -#: pysollib/tk/menubar.py:296 +#: pysollib/tk/menubar.py:297 msgid "&Pause" msgstr "&Пауза" -#: pysollib/tk/menubar.py:299 +#: pysollib/tk/menubar.py:300 msgid "S&tatus..." msgstr "С&татус" -#: pysollib/tk/menubar.py:300 +#: pysollib/tk/menubar.py:301 msgid "&Comments..." msgstr "&Комментарии..." -#: pysollib/tk/menubar.py:302 +#: pysollib/tk/menubar.py:303 msgid "&Statistics" msgstr "Ст&атистика" -#: pysollib/tk/menubar.py:303 pysollib/tk/menubar.py:311 +#: pysollib/tk/menubar.py:304 pysollib/tk/menubar.py:312 msgid "Current game..." msgstr "Текущая игра..." -#: pysollib/tk/menubar.py:304 pysollib/tk/menubar.py:312 -#: pysollib/tk/tkstats.py:289 +#: pysollib/tk/menubar.py:305 pysollib/tk/menubar.py:313 msgid "All games..." msgstr "Все игры..." -#: pysollib/tk/menubar.py:306 pysollib/tk/tkstats.py:647 +#: pysollib/tk/menubar.py:307 msgid "Session log..." msgstr "Лог сессии..." -#: pysollib/tk/menubar.py:307 pysollib/tk/tkstats.py:663 +#: pysollib/tk/menubar.py:308 msgid "Full log..." msgstr "Полный лог..." -#: pysollib/tk/menubar.py:310 +#: pysollib/tk/menubar.py:311 msgid "D&emo statistics" msgstr "Статистика демо" -#: pysollib/tk/menubar.py:314 +#: pysollib/tk/menubar.py:315 msgid "&Assist" msgstr "&Подсказка" -#: pysollib/tk/menubar.py:315 +#: pysollib/tk/menubar.py:316 msgid "&Hint" msgstr "Подсказать &ход" -#: pysollib/tk/menubar.py:316 +#: pysollib/tk/menubar.py:317 msgid "Highlight p&iles" msgstr "П&оказать группы" -#: pysollib/tk/menubar.py:318 +#: pysollib/tk/menubar.py:319 msgid "&Demo" msgstr "&Демо" -#: pysollib/tk/menubar.py:319 +#: pysollib/tk/menubar.py:320 msgid "Demo (&all games)" msgstr "Демо (&все игры)" -#: pysollib/tk/menubar.py:320 +#: pysollib/tk/menubar.py:321 msgid "&Options" msgstr "&Настройка" -#: pysollib/tk/menubar.py:321 +#: pysollib/tk/menubar.py:322 msgid "&Player options..." msgstr "Настройки &игрока..." -#: pysollib/tk/menubar.py:322 +#: pysollib/tk/menubar.py:323 msgid "&Automatic play" msgstr "Настройки &автоматической игры" -#: pysollib/tk/menubar.py:323 +#: pysollib/tk/menubar.py:324 msgid "Auto &face up" msgstr "Автоматически переворачивать" -#: pysollib/tk/menubar.py:325 +#: pysollib/tk/menubar.py:326 msgid "Auto &deal" msgstr "Автоматически &сдавать карты" -#: pysollib/tk/menubar.py:327 +#: pysollib/tk/menubar.py:328 msgid "&Quick play" msgstr "&Быстрая игра" -#: pysollib/tk/menubar.py:328 +#: pysollib/tk/menubar.py:329 msgid "Assist &level" msgstr "&Уровень подсказки" -#: pysollib/tk/menubar.py:329 +#: pysollib/tk/menubar.py:330 msgid "Enable &undo" msgstr "Разрешить &возврат хода" -#: pysollib/tk/menubar.py:330 +#: pysollib/tk/menubar.py:331 msgid "Enable &bookmarks" msgstr "Разрешить &закладки" -#: pysollib/tk/menubar.py:331 +#: pysollib/tk/menubar.py:332 msgid "Enable &hint" msgstr "Разрешить &подсказки" -#: pysollib/tk/menubar.py:332 +#: pysollib/tk/menubar.py:333 msgid "Enable highlight p&iles" msgstr "Разрешить показывать к&учи" -#: pysollib/tk/menubar.py:333 +#: pysollib/tk/menubar.py:334 msgid "Enable highlight &cards" msgstr "Разрешить показывать &карты" -#: pysollib/tk/menubar.py:334 +#: pysollib/tk/menubar.py:335 msgid "Enable highlight same &rank" msgstr "Разрешить показывать карты &одного достоинства" -#: pysollib/tk/menubar.py:335 +#: pysollib/tk/menubar.py:336 msgid "Highlight &no matching" msgstr "Подсветка отсутствия &совпадения:" -#: pysollib/tk/menubar.py:337 -msgid "Show removed tiles (in Mahjongg games)" -msgstr "Показывать удаленные (в Маджонгг)" - #: pysollib/tk/menubar.py:338 -msgid "Show hint arrow (in Shisen-Sho games)" -msgstr "Показывать стрелку (в Shisen-Sho)" +msgid "Show removed tiles (in Mahjongg games)" +msgstr "Показывать удаленные (в Маджонг)" -#: pysollib/tk/menubar.py:340 +#: pysollib/tk/menubar.py:339 +msgid "Show hint arrow (in Shisen-Sho games)" +msgstr "Показывать стрелку (в Шисен-Сё)" + +#: pysollib/tk/menubar.py:341 msgid "&Sound" msgstr "&Звук" -#: pysollib/tk/menubar.py:350 +#: pysollib/tk/menubar.py:351 msgid "Cards&et..." msgstr "Коло&да..." -#: pysollib/tk/menubar.py:351 +#: pysollib/tk/menubar.py:352 msgid "Table t&ile..." msgstr "&Игровой стол..." -#: pysollib/tk/menubar.py:353 +#: pysollib/tk/menubar.py:354 msgid "Card &background" msgstr "&Рубашка карты" -#: pysollib/tk/menubar.py:354 +#: pysollib/tk/menubar.py:355 msgid "Card &view" msgstr "&Вид карты" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:356 msgid "Card shado&w" msgstr "Тень карты" -#: pysollib/tk/menubar.py:356 +#: pysollib/tk/menubar.py:357 msgid "Shade &legal moves" msgstr "Подсвечивать &разрешенные ходы" -#: pysollib/tk/menubar.py:357 +#: pysollib/tk/menubar.py:358 msgid "&Negative card bottom" msgstr "&Негативные контуры карты" -#: pysollib/tk/menubar.py:358 +#: pysollib/tk/menubar.py:359 msgid "A&nimations" msgstr "&Анимация" -#: pysollib/tk/menubar.py:359 +#: pysollib/tk/menubar.py:360 msgid "&None" msgstr "&Нет" -#: pysollib/tk/menubar.py:360 +#: pysollib/tk/menubar.py:361 msgid "&Timer based" msgstr "Базирующаяся на &таймере" -#: pysollib/tk/menubar.py:361 +#: pysollib/tk/menubar.py:362 msgid "&Fast" msgstr "&Быстрая" -#: pysollib/tk/menubar.py:362 +#: pysollib/tk/menubar.py:363 msgid "&Slow" msgstr "&Медленная" -#: pysollib/tk/menubar.py:363 +#: pysollib/tk/menubar.py:364 msgid "&Very slow" msgstr "&Очень медленная" -#: pysollib/tk/menubar.py:364 +#: pysollib/tk/menubar.py:365 msgid "Stick&y mouse" msgstr "&Липкая мышь" -#: pysollib/tk/menubar.py:368 +#: pysollib/tk/menubar.py:367 msgid "&Fonts..." msgstr "&Шрифты..." -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:368 msgid "&Colors..." msgstr "&Цвета..." -#: pysollib/tk/menubar.py:370 +#: pysollib/tk/menubar.py:369 msgid "Time&outs..." msgstr "Тайма&уты..." -#: pysollib/tk/menubar.py:372 +#: pysollib/tk/menubar.py:371 msgid "&Toolbar" msgstr "Панель &инструментов" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:373 msgid "Stat&usbar" msgstr "Панель состояния" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:374 msgid "Show &statusbar" msgstr "Показывать панель состояния" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:375 msgid "Show &number of cards" msgstr "Показывать количество карт" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:376 msgid "Show &help bar" msgstr "Показывать панель помощи" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:377 msgid "&Demo logo" msgstr "&Демо лого" -#: pysollib/tk/menubar.py:379 +#: pysollib/tk/menubar.py:378 msgid "Startup splash sc&reen" msgstr "Окно &запуска" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:382 msgid "&Help" msgstr "&Помощь" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:383 msgid "&Contents" msgstr "&Содержание" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:384 msgid "&How to play" msgstr "Как &играть" -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:385 msgid "&Rules for this game" msgstr "&Правила текущей игры" -#: pysollib/tk/menubar.py:387 +#: pysollib/tk/menubar.py:386 msgid "&License terms" msgstr "&Лицензия" -#: pysollib/tk/menubar.py:390 +#: pysollib/tk/menubar.py:389 msgid "&About " msgstr "&О программе " -#: pysollib/tk/menubar.py:498 +#: pysollib/tk/menubar.py:497 msgid "All &games..." msgstr "&Все игры..." -#: pysollib/tk/menubar.py:499 +#: pysollib/tk/menubar.py:498 msgid "Playable pre&view..." msgstr "Играемый &предпросмотр..." -#: pysollib/tk/menubar.py:501 +#: pysollib/tk/menubar.py:500 msgid "&Popular games" msgstr "&Популярные игры" -#: pysollib/tk/menubar.py:504 +#: pysollib/tk/menubar.py:503 msgid "&French games" msgstr "&Классические игры" -#: pysollib/tk/menubar.py:507 +#: pysollib/tk/menubar.py:506 msgid "&Mahjongg games" msgstr "Игры маджонг" -#: pysollib/tk/menubar.py:510 +#: pysollib/tk/menubar.py:509 msgid "&Oriental games" msgstr "&Восточные игры" -#: pysollib/tk/menubar.py:514 +#: pysollib/tk/menubar.py:513 msgid "&Special games" msgstr "&Особые игры" -#: pysollib/tk/menubar.py:518 +#: pysollib/tk/menubar.py:517 msgid "All games by name" msgstr "Все игры по имени" -#: pysollib/tk/menubar.py:855 pysollib/tk/menubar.py:857 +#: pysollib/tk/menubar.py:854 pysollib/tk/menubar.py:856 #: pysollib/tk/selectcardset.py:240 -msgid "Load" -msgstr "Загрузить" +msgid "&Load" +msgstr "&Загрузить" -#: pysollib/tk/menubar.py:857 -msgid "Info..." -msgstr "Информация..." +#: pysollib/tk/menubar.py:856 +msgid "&Info..." +msgstr "&Информация..." -#: pysollib/tk/menubar.py:860 +#: pysollib/tk/menubar.py:859 msgid "Select " msgstr "Выбрать " -#: pysollib/tk/menubar.py:920 +#: pysollib/tk/menubar.py:919 msgid "Select table background" msgstr "Выбрать фоновое изображение" -#: pysollib/tk/menubar.py:932 pysollib/tk/selecttile.py:176 +#: pysollib/tk/menubar.py:931 pysollib/tk/selecttile.py:177 msgid "Select table color" msgstr "Выбрать цвет" @@ -2300,7 +2594,7 @@ msgid "by Compatibility" msgstr "По совместимости с другими программами" #: pysollib/tk/selectgame.py:159 -msgid "New games in v" +msgid "New games in v." msgstr "Новые игры в версии " #: pysollib/tk/selectgame.py:162 @@ -2473,11 +2767,11 @@ msgstr "Выиграл:" msgid "Lost:" msgstr "Проиграл:" -#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:804 +#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:803 msgid "Playing time:" msgstr "Игровое время:" -#: pysollib/tk/selectgame.py:375 pysollib/tk/tkstats.py:811 +#: pysollib/tk/selectgame.py:375 pysollib/tk/tkstats.py:810 msgid "Moves:" msgstr "Ходов:" @@ -2486,22 +2780,18 @@ msgid "% won:" msgstr "% побед:" #: pysollib/tk/selectgame.py:409 -msgid "Select" -msgstr "Выбрать" +msgid "&Rules" +msgstr "&Правила" -#: pysollib/tk/selectgame.py:409 pysollib/tk/toolbar.py:195 -msgid "Rules" -msgstr "Правила" - -#: pysollib/tk/selectgame.py:490 +#: pysollib/tk/selectgame.py:489 msgid "Playable Preview - " msgstr "Играемый предпросмотр - " -#: pysollib/tk/selectgame.py:538 +#: pysollib/tk/selectgame.py:537 msgid "variable" msgstr "переменное кол-во" -#: pysollib/tk/selectgame.py:539 +#: pysollib/tk/selectgame.py:538 msgid "unlimited" msgstr "неограниченное кол-во" @@ -2530,8 +2820,8 @@ msgid "All Backgrounds" msgstr "Все фоновые изображения" #: pysollib/tk/selecttile.py:158 -msgid "Solid color..." -msgstr "Монотонный цвет..." +msgid "&Solid color..." +msgstr "&Монотонный цвет..." #: pysollib/tk/soundoptionsdialog.py:76 msgid "Sound enabled" @@ -2550,12 +2840,12 @@ msgid "Music volume" msgstr "Уровень музыки" #: pysollib/tk/soundoptionsdialog.py:106 -msgid "Apply" -msgstr "Применить" +msgid "&Apply" +msgstr "&Применить" #: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:108 -msgid "Mixer..." -msgstr "Миксер..." +msgid "&Mixer..." +msgstr "&Миксер..." #: pysollib/tk/soundoptionsdialog.py:155 msgid "Sound preferences info" @@ -2569,11 +2859,11 @@ msgstr "" "Изменения установок DirectX вступят в силу\n" "при следующем запуске " -#: pysollib/tk/statusbar.py:135 +#: pysollib/tk/statusbar.py:138 msgid "Moves/Total moves" msgstr "Ходов/Всего ходов" -#: pysollib/tk/statusbar.py:137 +#: pysollib/tk/statusbar.py:140 msgid "Games played: won/lost" msgstr "Игр: выиграно/проиграно" @@ -2613,23 +2903,23 @@ msgstr "Текст рядом с пиктограммами" msgid "Text only" msgstr "Только текст" -#: pysollib/tk/tkhtml.py:280 +#: pysollib/tk/tkhtml.py:229 msgid "Index" msgstr "Индекс" -#: pysollib/tk/tkhtml.py:284 +#: pysollib/tk/tkhtml.py:233 msgid "Back" msgstr "Назад" -#: pysollib/tk/tkhtml.py:288 +#: pysollib/tk/tkhtml.py:237 msgid "Forward" msgstr "Вперед" -#: pysollib/tk/tkhtml.py:292 +#: pysollib/tk/tkhtml.py:241 msgid "Close" msgstr "Закрыть" -#: pysollib/tk/tkhtml.py:394 +#: pysollib/tk/tkhtml.py:347 msgid "" " HTML limitation:\n" "The %s protocol is not supported yet.\n" @@ -2645,7 +2935,7 @@ msgstr "" "чтобы открыть URL:\n" "%s\n" -#: pysollib/tk/tkhtml.py:419 pysollib/tk/tkhtml.py:423 +#: pysollib/tk/tkhtml.py:372 pysollib/tk/tkhtml.py:376 msgid "Unable to service request:\n" msgstr "" @@ -2665,46 +2955,56 @@ msgstr "Всего:" msgid "No games" msgstr "Нет игр" +#: pysollib/tk/tkstats.py:289 +msgid "&All games..." +msgstr "&Все игры..." + #: pysollib/tk/tkstats.py:291 -msgid "Reset..." -msgstr "Очистить..." +msgid "&Reset..." +msgstr "О&чистить..." -#: pysollib/tk/tkstats.py:574 pysollib/tk/tkstats.py:647 -#: pysollib/tk/tkstats.py:663 -msgid "Save to file" -msgstr "Сохранить в файл" +#: pysollib/tk/tkstats.py:572 pysollib/tk/tkstats.py:645 +#: pysollib/tk/tkstats.py:661 +msgid "&Save to file" +msgstr "&Сохранить в файл" -#: pysollib/tk/tkstats.py:575 -msgid "Reset all..." -msgstr "Очистить все..." +#: pysollib/tk/tkstats.py:573 +msgid "&Reset all..." +msgstr "О&чистить все..." -#: pysollib/tk/tkstats.py:625 +#: pysollib/tk/tkstats.py:623 msgid "No entries for player " msgstr "Нет записей для игрока " -#: pysollib/tk/tkstats.py:642 -#, fuzzy +#: pysollib/tk/tkstats.py:640 msgid "No log entries for %s\n" -msgstr "Нет записей для " +msgstr "Нет записей для %s\n" -#: pysollib/tk/tkstats.py:658 -#, fuzzy +#: pysollib/tk/tkstats.py:645 +msgid "Session &log..." +msgstr "&Лог сессии..." + +#: pysollib/tk/tkstats.py:656 msgid "No current session log entries for %s\n" -msgstr "В текущем сеансе нет записей для " +msgstr "В текущем сеансе нет записей для %s\n" -#: pysollib/tk/tkstats.py:678 +#: pysollib/tk/tkstats.py:661 +msgid "&Full log..." +msgstr "&Полный лог..." + +#: pysollib/tk/tkstats.py:676 msgid "Highlight piles: " msgstr "Подсветка групп: " -#: pysollib/tk/tkstats.py:679 +#: pysollib/tk/tkstats.py:677 msgid "Highlight cards: " msgstr "Подсветка карт: " -#: pysollib/tk/tkstats.py:680 +#: pysollib/tk/tkstats.py:678 msgid "Highlight same rank: " msgstr "Подсветка карт одного достоинства: " -#: pysollib/tk/tkstats.py:683 +#: pysollib/tk/tkstats.py:681 msgid "" "\n" "Redeals: " @@ -2712,7 +3012,7 @@ msgstr "" "\n" "Раздач: " -#: pysollib/tk/tkstats.py:684 +#: pysollib/tk/tkstats.py:682 msgid "" "\n" "Cards in Talon: " @@ -2720,7 +3020,7 @@ msgstr "" "\n" "Карт в колоде: " -#: pysollib/tk/tkstats.py:686 +#: pysollib/tk/tkstats.py:684 msgid "" "\n" "Cards in Waste: " @@ -2728,7 +3028,7 @@ msgstr "" "\n" "Карт в сбросе: " -#: pysollib/tk/tkstats.py:688 +#: pysollib/tk/tkstats.py:686 msgid "" "\n" "Cards in Foundations: " @@ -2736,87 +3036,86 @@ msgstr "" "\n" "Карт в игре: " -#: pysollib/tk/tkstats.py:691 +#: pysollib/tk/tkstats.py:689 msgid "Game status" msgstr "Статус игры" -#: pysollib/tk/tkstats.py:694 +#: pysollib/tk/tkstats.py:692 msgid "Playing time: " msgstr "Игровое время: " -#: pysollib/tk/tkstats.py:695 +#: pysollib/tk/tkstats.py:693 msgid "Started at: " msgstr "Игра начата: " -#: pysollib/tk/tkstats.py:696 +#: pysollib/tk/tkstats.py:694 msgid "Moves: " msgstr "Ходов: " -#: pysollib/tk/tkstats.py:697 +#: pysollib/tk/tkstats.py:695 msgid "Undo moves: " msgstr "Отменено ходов: " -#: pysollib/tk/tkstats.py:698 +#: pysollib/tk/tkstats.py:696 msgid "Bookmark moves: " msgstr "Ходов по закладкам: " -#: pysollib/tk/tkstats.py:699 +#: pysollib/tk/tkstats.py:697 msgid "Demo moves: " msgstr "Демо ходов: " -#: pysollib/tk/tkstats.py:700 +#: pysollib/tk/tkstats.py:698 msgid "Total player moves: " msgstr "Всего ходов игрока:" -#: pysollib/tk/tkstats.py:701 +#: pysollib/tk/tkstats.py:699 msgid "Total moves in this game: " msgstr "Всего ходов в этой игре: " -#: pysollib/tk/tkstats.py:702 +#: pysollib/tk/tkstats.py:700 msgid "Hints: " msgstr "Подсказок: " -#: pysollib/tk/tkstats.py:706 -msgid "Statistics..." -msgstr "Статистика..." +#: pysollib/tk/tkstats.py:704 +msgid "&Statistics..." +msgstr "&Статистика..." -#: pysollib/tk/tkstats.py:731 +#: pysollib/tk/tkstats.py:730 msgid "N" msgstr "N" -#: pysollib/tk/tkstats.py:737 -msgid "Started at" -msgstr "Игра начата" - -#: pysollib/tk/tkstats.py:740 +#: pysollib/tk/tkstats.py:739 msgid "Result" msgstr "Результат" -#: pysollib/tk/tkstats.py:796 +#: pysollib/tk/tkstats.py:795 msgid "Minimum" msgstr "Минимум" -#: pysollib/tk/tkstats.py:797 +#: pysollib/tk/tkstats.py:796 msgid "Maximum" msgstr "Максимум" -#: pysollib/tk/tkstats.py:798 +#: pysollib/tk/tkstats.py:797 msgid "Average" msgstr "Среднее" -#: pysollib/tk/tkstats.py:818 +#: pysollib/tk/tkstats.py:817 msgid "Total moves:" msgstr "Всего ходов:" -#: pysollib/tk/tkstats.py:849 -#, fuzzy +#: pysollib/tk/tkstats.py:848 msgid "No TOP for this game" -msgstr "Не имеется" +msgstr "TOP для текущей игры отсутствует" #: pysollib/tk/toolbar.py:183 msgid "New" msgstr "Новая" +#: pysollib/tk/toolbar.py:184 +msgid "Restart" +msgstr "Начало" + #: pysollib/tk/toolbar.py:184 msgid "" "Restart the\n" @@ -2881,10 +3180,18 @@ msgstr "Пауза в игре" msgid "View statistics" msgstr "Посмотреть статистику" +#: pysollib/tk/toolbar.py:195 +msgid "Rules" +msgstr "Правила" + #: pysollib/tk/toolbar.py:195 msgid "Rules for this game" msgstr "Правила текущей игры" +#: pysollib/tk/toolbar.py:197 +msgid "Quit" +msgstr "Выйти" + #: pysollib/tk/toolbar.py:209 msgid "Player" msgstr "Игрок" @@ -2893,7 +3200,7 @@ msgstr "Игрок" msgid "Player options" msgstr "Установки игрока" -#: pysollib/tk/toolbar.py:428 +#: pysollib/tk/toolbar.py:429 msgid "Toolbar" msgstr "Панель инструментов" @@ -2925,52 +3232,23 @@ msgstr "красный" msgid "cardset" msgstr "набор карт" -#~ msgid "" -#~ "No Free\n" -#~ "Matching\n" -#~ "Pairs" -#~ msgstr "" -#~ "Нет\n" -#~ "свободных\n" -#~ "пар" +#~ msgid "Set demo options" +#~ msgstr "Настройка демо" -#~ msgid "" -#~ "1 Free\n" -#~ "Matching\n" -#~ "Pair" -#~ msgstr "" -#~ "1\n" -#~ "свободная\n" -#~ "пара" +#~ msgid "Display floating Demo logo" +#~ msgstr "Показывать демо лого" -#~ msgid "" -#~ " Free\n" -#~ "Matching\n" -#~ "Pairs" -#~ msgstr "" -#~ " \n" -#~ "свободных\n" -#~ "пар" +#~ msgid "Show score in statusbar" +#~ msgstr "Показывать счет в строке состояния" -#~ msgid "" -#~ "\n" -#~ "Tiles\n" -#~ "Removed\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "удалено\n" -#~ "\n" +#~ msgid "Set demo delay in seconds" +#~ msgstr "Установить задуржку демо в секундах" -#~ msgid "" -#~ "\n" -#~ "Tiles\n" -#~ "Remaining\n" -#~ "\n" -#~ msgstr "" -#~ "\n" -#~ "осталось\n" -#~ "\n" +#~ msgid "Select" +#~ msgstr "Выбрать" + +#~ msgid "Started at " +#~ msgstr "Игра начата " #~ msgid "Playable Area" #~ msgstr "Область игры" diff --git a/pysollib/actions.py b/pysollib/actions.py index 426c80fa..8a1ff42f 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -55,12 +55,11 @@ from pysoltk import GameInfoDialog # toolkit imports from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE -from pysoltk import MfxDialog, MfxSimpleEntry +from pysoltk import MfxMessageDialog, MfxSimpleEntry from pysoltk import MfxExceptionDialog from pysoltk import BooleanVar, IntVar, StringVar from pysoltk import PlayerOptionsDialog from pysoltk import SoundOptionsDialog -from pysoltk import DemoOptionsDialog #from pysoltk import HintOptionsDialog from pysoltk import TimeoutsDialog from pysoltk import ColorsDialog @@ -378,9 +377,9 @@ class PysolMenubarActions: if not self.app.getGameInfo(id): raise ValueError except (ValueError, TypeError), ex: - d = MfxDialog(self.top, title=_("Invalid game number"), - text=_("Invalid game number\n") + str(seed), - bitmap="error") + d = MfxMessageDialog(self.top, title=_("Invalid game number"), + text=_("Invalid game number\n") + str(seed), + bitmap="error") return f = self.game.nextGameFlags(id, random) if f & 17 == 0: @@ -407,7 +406,7 @@ class PysolMenubarActions: id, f = None, self.game.getGameNumber(format=0) d = MfxSimpleEntry(self.top, _("Select new game number"), _("\n\nEnter new game number"), f, - strings=(_("OK"), _("Next number"), _("Cancel")), + strings=(_("&OK"), _("&Next number"), _("&Cancel")), default=0, e_width=25) if d.status != 0: return if d.button == 2: return @@ -614,8 +613,8 @@ class PysolMenubarActions: text=_("Error while writing to file")) else: if fd: fd.close() - d = MfxDialog(self.top, title=PACKAGE+_(" Info"), bitmap="info", - text=_("Comments were appended to\n\n") + fn) + d = MfxMessageDialog(self.top, title=PACKAGE+_(" Info"), bitmap="info", + text=_("Comments were appended to\n\n") + fn) self.tkopt.comment.set(bool(game.gsaveinfo.comment)) @@ -650,8 +649,8 @@ class PysolMenubarActions: text=_("Error while writing to file")) else: if file: file.close() - d = MfxDialog(self.top, title=PACKAGE+_(" Info"), bitmap="info", - text=text + _(" were appended to\n\n") + filename) + d = MfxMessageDialog(self.top, title=PACKAGE+_(" Info"), bitmap="info", + text=text + _(" were appended to\n\n") + filename) def mPlayerStats(self, *args, **kw): @@ -891,20 +890,6 @@ class PysolMenubarActions: if self._cancelDrag(): return self.app.opt.irregular_piles = self.tkopt.irregular_piles.get() - def mOptDemoOptions(self, *args): - if self._cancelDrag(break_pause=False): return - d = DemoOptionsDialog(self.top, _("Set demo options"), self.app) - if d.status == 0 and d.button == 0: - self.app.opt.demo_logo = d.demo_logo - self.app.opt.demo_score = d.demo_score - self.app.opt.demo_sleep = d.demo_sleep - -## def mOptHintOptions(self, *args): -## if self._cancelDrag(break_pause=False): return -## d = HintOptionsDialog(self.top, "Set hint options", self.app) -## if d.status == 0 and d.button == 0: -## self.app.opt.hint_sleep = d.hint_sleep - def mOptColorsOptions(self, *args): if self._cancelDrag(break_pause=False): return d = ColorsDialog(self.top, _("Set colors"), self.app) @@ -953,9 +938,9 @@ class PysolMenubarActions: text=_("Error while saving options")) else: # tell the player where their config files reside - d = MfxDialog(self.top, title=PACKAGE+_(" Info"), - text=_("Options were saved to\n\n") + self.app.fn.opt, - bitmap="info") + d = MfxMessageDialog(self.top, title=PACKAGE+_(" Info"), bitmap="info", + text=_("Options were saved to\n\n") + self.app.fn.opt) + # # Help menu diff --git a/pysollib/app.py b/pysollib/app.py index f43a4af6..5ea9c0f6 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -60,7 +60,7 @@ from settings import TOP_SIZE, TOP_TITLE # Toolkit imports from pysoltk import tkname, tkversion, wm_withdraw, loadImage from pysoltk import bind, unbind_destroy -from pysoltk import MfxDialog, MfxExceptionDialog +from pysoltk import MfxMessageDialog, MfxExceptionDialog from pysoltk import TclError, MfxRoot, MfxCanvas, MfxScrolledCanvas from pysoltk import PysolMenubar from pysoltk import PysolProgressBar @@ -77,6 +77,7 @@ gettext = _ # // Options # ************************************************************************/ + class Options: def __init__(self): self.version_tuple = VERSION_TUPLE @@ -158,8 +159,8 @@ class Options: self.recent_gameid = [] self.favorite_gameid = [] self.last_gameid = 0 # last game played - self.last_player = None # last player - self.last_save_dir = None # last directory for load/save + #self.last_player = None # last player + #self.last_save_dir = None # last directory for load/save self.game_holded = 0 self.wm_maximized = 0 # @@ -176,7 +177,6 @@ class Options: if top: sw, sh, sd = top.winfo_screenwidth(), top.winfo_screenheight(), top.winfo_screendepth() if sd > 8: - #self.tabletile_name = "Fade_Green.ppm" # basename self.tabletile_name = "Nostalgy.gif" # basename else: self.tabletile_name = None @@ -185,8 +185,6 @@ class Options: c = "Standard" if sw < 800 or sh < 600: c = "2000" -## elif sw >= 1024 and sh >= 768 and sd > 8: -## c = "Dondorf Whist A" self.cardset = { 0: (c, ""), CSI.TYPE_FRENCH: (c, ""), @@ -517,8 +515,9 @@ class Application: self.dn.__dict__[k] = v # file names self.fn = Struct( - opt = os.path.join(self.dn.config, "options.dat"), - stats = os.path.join(self.dn.config, "statistics.dat"), + opt = os.path.join(self.dn.config, "options.dat"), + opt_conf = os.path.join(self.dn.config, "options.conf"), + stats = os.path.join(self.dn.config, "statistics.dat"), holdgame = os.path.join(self.dn.config, "holdgame.dat"), comments = os.path.join(self.dn.config, "comments.dat"), ) @@ -822,13 +821,22 @@ class Application: ## self.gimages.stats.append(self.dataloader.findImage(f, dir)) def loadImages3(self): - MfxDialog.img = [] + MfxMessageDialog.img = {} #dir = os.path.join('images', 'dialog', 'default') dir = os.path.join('images', 'dialog', 'bluecurve') for f in ('error', 'info', 'question', 'warning'): fn = self.dataloader.findImage(f, dir) im = loadImage(fn) - MfxDialog.img.append(im) + MfxMessageDialog.img[f] = im +## MfxMessageDialog.button_img = {} +## dir = os.path.join('images', 'buttons', 'bluecurve') +## for n, f in ( +## (_('OK'), 'ok'), +## (_('Cancel'), 'cancel'), +## ): +## fn = self.dataloader.findImage(f, dir) +## im = loadImage(fn) +## MfxMessageDialog.button_img[n] = im SelectDialogTreeData.img = [] dir = os.path.join('images', 'tree') for f in ('folder', 'openfolder', 'node', 'emptynode'): @@ -1071,7 +1079,7 @@ class Application: return 1 # t = self.checkCompatibleCardsetType(gi, self.cardset) - d = MfxDialog(self.top, title=_("Incompatible ")+CARDSET, + d = MfxMessageDialog(self.top, title=_("Incompatible ")+CARDSET, bitmap="warning", text=_('''The currently selected %s %s is not compatible with the game @@ -1079,7 +1087,7 @@ is not compatible with the game Please select a %s type %s. ''') % (CARDSET, self.cardset.name, gi.name, t[0], CARDSET), - strings=(_("OK"),), default=0) + strings=(_("&OK"),), default=0) cs = self.__selectCardsetDialog(t) if cs is None: return -1 @@ -1091,7 +1099,7 @@ Please select a %s type %s. d = SelectCardsetByTypeDialogWithPreview( self.top, title=_("Please select a %s type %s") % (t[0], CARDSET), app=self, manager=self.cardset_manager, key=key, - strings=(None, _("OK"), _("Cancel")), default=1) + strings=(None, _("&OK"), _("&Cancel")), default=1) if d.status != 0 or d.button != 1: return None cs = self.cardset_manager.get(d.key) @@ -1240,7 +1248,7 @@ Please select a %s type %s. def getGameMenuitemName(self, id): gi = self.gdb.get(id) if gi is None: return None - return gi.short_name + return gettext(gi.short_name) def getGameRulesFilename(self, id): gi = self.gdb.get(id) @@ -1248,7 +1256,7 @@ Please select a %s type %s. if gi.rules_filename is not None: return gi.rules_filename n = gi.name - n = re.sub(r"[\[\(].*$", "", n) + ##n = re.sub(r"[\[\(].*$", "", n) n = latin1_to_ascii(n) n = re.sub(r"[^\w]", "", n) n = n.lower() + ".html" diff --git a/pysollib/game.py b/pysollib/game.py index fe193ef3..5b498956 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -55,7 +55,7 @@ from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE from pysoltk import CURSOR_WATCH, ANCHOR_SW, ANCHOR_SE from pysoltk import tkname, bind, wm_map from pysoltk import after, after_idle, after_cancel -from pysoltk import MfxDialog, MfxExceptionDialog +from pysoltk import MfxMessageDialog, MfxExceptionDialog from pysoltk import MfxCanvasText, MfxCanvasImage from pysoltk import MfxCanvasLine, MfxCanvasRectangle from pysoltk import Card @@ -823,18 +823,18 @@ class Game: if not title: title = PACKAGE if not text: text = _("Discard current game ?") self.playSample("areyousure") - d = MfxDialog(self.top, title=title, text=text, - bitmap="question", - Default=default, strings=(_("OK"), _("Cancel"))) + d = MfxMessageDialog(self.top, title=title, text=text, + bitmap="question", + strings=(_("&OK"), _("&Cancel"))) if d.status != 0 or d.button != 0: return 0 return 1 def notYetImplemented(self): # don't used - d = MfxDialog(self.top, title="Not yet implemented", - text="This function is\nnot yet implemented.", - bitmap="error") + d = MfxMessageDialog(self.top, title="Not yet implemented", + text="This function is\nnot yet implemented.", + bitmap="error") # main animation method def animatedMoveTo(self, from_stack, to_stack, cards, x, y, tkraise=1, frames=-1, shadow=-1): @@ -1193,8 +1193,8 @@ class Game: time = self.getTime() self.finished = True self.playSample("winperfect", priority=1000) - d = MfxDialog(self.top, title=_("Game won"), - text=_(''' + d = MfxMessageDialog(self.top, title=_("Game won"), + text=_(''' Congratulations, this was a truly perfect game ! @@ -1202,33 +1202,33 @@ Your playing time is %s for %d moves. %s ''') % (time, self.moves.index, top_msg), - strings=(_("New game"), None, _("Cancel")), - image=self.app.gimages.logos[5], separatorwidth=2) + strings=(_("&New game"), None, _("&Cancel")), + image=self.app.gimages.logos[5], separatorwidth=2) elif status == 1: top_msg = self.updateStats() time = self.getTime() self.finished = True self.playSample("winwon", priority=1000) - d = MfxDialog(self.top, title=_("Game won"), - text=_(''' + d = MfxMessageDialog(self.top, title=_("Game won"), + text=_(''' Congratulations, you did it ! Your playing time is %s for %d moves. %s ''') % (time, self.moves.index, top_msg), - strings=(_("New game"), None, _("Cancel")), - image=self.app.gimages.logos[4], separatorwidth=2) + strings=(_("&New game"), None, _("&Cancel")), + image=self.app.gimages.logos[4], separatorwidth=2) elif self.gstats.updated < 0: self.playSample("winfinished", priority=1000) - d = MfxDialog(self.top, title=_("Game finished"), bitmap="info", - text=_("\nGame finished\n"), - strings=(_("New game"), None, _("Cancel"))) + d = MfxMessageDialog(self.top, title=_("Game finished"), bitmap="info", + text=_("\nGame finished\n"), + strings=(_("&New game"), None, _("&Cancel"))) else: self.playSample("winlost", priority=1000) - d = MfxDialog(self.top, title=_("Game finished"), bitmap="info", - text=_("\nGame finished, but not without my help...\n"), - strings=(_("New game"), _("Restart"), _("Cancel"))) + d = MfxMessageDialog(self.top, title=_("Game finished"), bitmap="info", + text=_("\nGame finished, but not without my help...\n"), + strings=(_("&New game"), _("&Restart"), _("&Cancel"))) self.updateMenus() if d.status == 0 and d.button == 0: # new game @@ -1631,20 +1631,21 @@ for %d moves. status = 2 elif player_moves == 0: self.playSample("autopilotwon") - s = self.app.miscrandom.choice((_("Great"), _("Cool"), _("Yeah"), _("Wow"))) - d = MfxDialog(self.top, title=PACKAGE+_(" Autopilot"), - text=_("\nGame solved in %d moves.\n") % self.moves.index, - image=self.app.gimages.logos[4], strings=(s,), - separatorwidth=2, timeout=timeout) + s = self.app.miscrandom.choice((_("&Great"), _("&Cool"), _("&Yeah"), _("&Wow"))) # ??? accelerators + d = MfxMessageDialog(self.top, title=PACKAGE+_(" Autopilot"), + text=_("\nGame solved in %d moves.\n") % self.moves.index, + image=self.app.gimages.logos[4], strings=(s,), + separatorwidth=2, timeout=timeout) status = d.status else: - s = self.app.miscrandom.choice((_("OK"), _("OK"))) + ##s = self.app.miscrandom.choice((_("&OK"), _("&OK"))) + s = _("&OK") text = _("\nGame finished\n") if self.app.debug: text = text + "\n%d %d\n" % (self.stats.player_moves, self.stats.demo_moves) - d = MfxDialog(self.top, title=PACKAGE+_(" Autopilot"), - text=text, bitmap=bitmap, strings=(s,), - padx=30, timeout=timeout) + d = MfxMessageDialog(self.top, title=PACKAGE+_(" Autopilot"), + text=text, bitmap=bitmap, strings=(s,), + padx=30, timeout=timeout) status = d.status elif finished: ##self.stopPlayTimer() @@ -1653,11 +1654,11 @@ for %d moves. else: if player_moves == 0: self.playSample("autopilotlost") - s = self.app.miscrandom.choice((_("Oh well"), _("That's life"), _("Hmm"))) - d = MfxDialog(self.top, title=PACKAGE+_(" Autopilot"), - text=_("\nThis won't come out...\n"), - bitmap=bitmap, strings=(s,), - padx=30, timeout=timeout) + s = self.app.miscrandom.choice((_("&Oh well"), _("&That's life"), _("&Hmm"))) # ??? accelerators + d = MfxMessageDialog(self.top, title=PACKAGE+_(" Autopilot"), + text=_("\nThis won't come out...\n"), + bitmap=bitmap, strings=(s,), + padx=30, timeout=timeout) status = d.status if finished: self.updateStats(demo=1) @@ -2125,8 +2126,8 @@ for %d moves. except AssertionError, ex: self.updateMenus() self.setCursor(cursor=self.app.top_cursor) - d = MfxDialog(self.top, title=_("Load game error"), bitmap="error", - text=_("""\ + d = MfxMessageDialog(self.top, title=_("Load game error"), bitmap="error", + text=_("""\ Error while loading game. Probably the game file is damaged, @@ -2139,8 +2140,8 @@ but this could also be a bug you might want to report.""")) except: self.updateMenus() self.setCursor(cursor=self.app.top_cursor) - d = MfxDialog(self.top, title=_("Load game error"), bitmap="error", - text=_("""\ + d = MfxMessageDialog(self.top, title=_("Load game error"), bitmap="error", + text=_("""\ Internal error while loading game. Please report this bug.""")) diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index d889c3ff..cc566b9c 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -307,7 +307,7 @@ class GI: 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 107, 108,)), ("3.10", (109, 110, 111, 112, 113, 114, 116, 117, 118, 119, - 120,-121,-122, 123, 124, 125, 127)), + 120, 121, 122, 123, 124, 125, 127)), ("3.20", (128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 12345, 12346, 12347, 12348, 12349, 12350, 12351, 12352)), @@ -318,16 +318,35 @@ class GI: ("4.20", (165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178)), ("4.30", (179, 180, 181, 182, 183, 184)), - ("4.41", (185, 186,-187,-188,-189,-190,-191,-192, 193,-194, - 195, 196,-197,-198, 199)), + ("4.41", (185, 186, 187, 188, 189, 190, 191, 192, 193, 194, + 195, 196, 197, 198, 199)), ("4.60", (200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236)), -## ## + tuple(range(353, 370)), -## ), ("4.70", (237,)), + ('fc-0.5.0', (#121, 122, 187, 188, 189, 190, 191, 192, 194, 197, 198, + 5301, 5302, 9011, 11001, 11002, 11003, 11004, 11005, + 11006, 12353, 12354, 12355, 12356, 12357, 12358, 12359, + 12360, 12361, 12362, 12363, 12364, 12365, 12366, 12367, + 12368, 12369, 12370, 12371, 12372, 12373, 12374, 12375, + 12376, 12377, 12378, 12379, 12380, 12381, 12382, 12383, + 12384, 12385, 13001, 13002, 13003, 13004, 13005, 13006, + 13007, 13008, 13009, 13010, 13011, 13012, 13013, 13014, + 13163, 13164, 13165, 13166, 13167, 14401, 14402, 14403, + 14404, 14405, 14406, 14407, 14408, 14409, 14410, 14411, + 14412, 14413, 15406, 15407, 15408, 15409, 15410, 15411, + 15412, 15413, 15414, 15415, 15416, 15417, 15418, 15419, + 15420, 15421, 15422, 16000, 16001, 16002, 16003, 16004, + 16666, 16667, 16668, 16669, 16670, 16671, 16672, 16673, + 16674, 16675, 16676, 16677, 16678, 16679, 16680, 22216, + 22217, 22218, 22219, 22220, 22221, 22223, 22224, 22225, + 22226, 22227, 22228, 22229, 22230, 22231, 22232,)), + ('fc-0.8.0', tuple(range(263, 323))), + ('fc-0.9.0', tuple(range(323, 421))), + ('fc-0.9.1', tuple(range(421, 441))), + ('fc-0.9.2', tuple(range(441, 466))), ) # deprecated - the correct way is to or a GI.GT_XXX flag @@ -489,11 +508,8 @@ class GameManager: for n in gi.altnames: if self.__all_gamenames.has_key(n): raise GameInfoException, "duplicate altgame name " + str(gi.id) + ": " + n - if 0 and gi.si.game_flags & GI.GT_XORIGINAL: - return - if 0 and (206 <= gi.id <= 236): - ##print gi.id - return + ##if 0 and gi.si.game_flags & GI.GT_XORIGINAL: + ## return ##print gi.id, gi.name self.__all_games[gi.id] = gi self.__all_gamenames[gi.name] = gi @@ -510,6 +526,11 @@ class GameManager: # update registry k = gi.si.game_type self.registered_game_types[k] = self.registered_game_types.get(k, 0) + 1 +## if not gi.si.game_type == GI.GT_MAHJONGG: +## for v, k in GI.GAMES_BY_PYSOL_VERSION: +## if gi.id in k: break +## else: +## print gi.id # diff --git a/pysollib/games/algerian.py b/pysollib/games/algerian.py index a7e20961..ce375ceb 100644 --- a/pysollib/games/algerian.py +++ b/pysollib/games/algerian.py @@ -165,5 +165,5 @@ registerGame(GameInfo(321, Carthage, "Carthage", registerGame(GameInfo(322, AlgerianPatience, "Algerian Patience", GI.GT_2DECK_TYPE, 2, 0)) registerGame(GameInfo(457, AlgerianPatience3, "Algerian Patience (3 decks)", - GI.GT_3DECK_TYPE, 3, 0)) + GI.GT_3DECK_TYPE | GI.GT_ORIGINAL, 3, 0)) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index b8012d3b..83e38eaa 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -641,7 +641,7 @@ registerGame(GameInfo(148, Chessboard, "Chessboard", registerGame(GameInfo(300, Stronghold, "Stronghold", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) registerGame(GameInfo(301, Fastness, "Fastness", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) registerGame(GameInfo(306, Zerline, "Zerline", GI.GT_BELEAGUERED_CASTLE, 2, 0)) registerGame(GameInfo(324, Bastion, "Bastion", @@ -653,7 +653,7 @@ registerGame(GameInfo(351, Chequers, "Chequers", registerGame(GameInfo(393, CastleOfIndolence, "Castle of Indolence", GI.GT_BELEAGUERED_CASTLE, 2, 0)) registerGame(GameInfo(395, Zerline3Decks, "Zerline (3 decks)", - GI.GT_BELEAGUERED_CASTLE, 3, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_ORIGINAL, 3, 0)) registerGame(GameInfo(400, Rittenhouse, "Rittenhouse", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 2, 0)) diff --git a/pysollib/games/bisley.py b/pysollib/games/bisley.py index 559baf57..279de5a7 100644 --- a/pysollib/games/bisley.py +++ b/pysollib/games/bisley.py @@ -190,11 +190,11 @@ class Gloria(Game): # /*********************************************************************** -# // Adelaide +# // Realm # // Mancunian # ************************************************************************/ -class Adelaide(Game): +class Realm(Game): Hint_Class = CautiousDefaultHint RowStack_Class = StackWrapper(UD_AC_RowStack, base_rank=NO_RANK) @@ -236,7 +236,7 @@ class Adelaide(Game): return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 -class Mancunian(Adelaide): +class Mancunian(Realm): RowStack_Class = StackWrapper(UD_RK_RowStack, base_rank=NO_RANK) def shallHighlightMatch(self, stack1, card1, stack2, card2): @@ -247,11 +247,11 @@ class Mancunian(Adelaide): registerGame(GameInfo(290, Bisley, "Bisley", GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) registerGame(GameInfo(372, DoubleBisley, "Double Bisley", - GI.GT_2DECK_TYPE | GI.GT_OPEN, 2, 0)) + GI.GT_2DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) registerGame(GameInfo(373, Gloria, "Gloria", - GI.GT_2DECK_TYPE | GI.GT_OPEN, 2, 0)) -registerGame(GameInfo(374, Adelaide, "Adelaide", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_2DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) +registerGame(GameInfo(374, Realm, "Realm", + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) registerGame(GameInfo(375, Mancunian, "Mancunian", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py index ea59bf4b..76880e72 100644 --- a/pysollib/games/braid.py +++ b/pysollib/games/braid.py @@ -312,7 +312,7 @@ class Backbone(Game): l, s = Layout(self), self.s # set window - w, h = l.XM+(rows+2)*l.XS, l.YM+3*l.XS+10*l.YOFFSET + w, h = l.XM+(rows+2)*l.XS, max(l.YM+3*l.XS+10*l.YOFFSET, l.YM+2*l.YS+11*l.YOFFSET+20) self.setSize(w, h) # create stacks diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index 26235fdb..43157a7c 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -313,13 +313,13 @@ registerGame(GameInfo(311, Dumfries, "Dumfries", registerGame(GameInfo(312, Galloway, "Galloway", GI.GT_1DECK_TYPE, 1, 0)) registerGame(GameInfo(313, Robin, "Robin", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0)) registerGame(GameInfo(348, Arachnida, "Arachnida", GI.GT_SPIDER, 2, 0)) registerGame(GameInfo(349, MissMuffet, "Miss Muffet", GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) registerGame(GameInfo(352, Nordic, "Nordic", - GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) + GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) registerGame(GameInfo(414, GermanPatience, "German Patience", GI.GT_2DECK_TYPE, 2, 0)) registerGame(GameInfo(415, BavarianPatience, "Bavarian Patience", diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index dce7fd75..148fbccb 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -520,7 +520,7 @@ registerGame(GameInfo(365, SevenByFive, "Seven by Five", registerGame(GameInfo(383, Bath, "Bath", GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) registerGame(GameInfo(394, Clink, "Clink", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) registerGame(GameInfo(448, Repair, "Repair", GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) registerGame(GameInfo(451, Cell11, "Cell 11", diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index b987ab50..51a215f3 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -343,10 +343,10 @@ registerGame(GameInfo(142, DieSchlange, "Snake", registerGame(GameInfo(279, Kings, "Kings", GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) registerGame(GameInfo(286, Retinue, "Retinue", - GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) + GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) registerGame(GameInfo(299, SalicLaw, "Salic Law", GI.GT_2DECK_TYPE, 2, 0)) registerGame(GameInfo(442, Deep, "Deep", - GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) + GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 0c00c718..feac717c 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -576,8 +576,9 @@ class Jane(Klondike): self.sg.dropstacks.append(s.talon) x, y = l.XM, self.height - l.YM # ??? - self.texts.info = MfxCanvasText(self.canvas, x, y, anchor="sw", - font=self.app.getFont("canvas_default")) + #self.texts.info = MfxCanvasText(self.canvas, x, y, anchor="sw", + # font=self.app.getFont("canvas_default")) + l.createText(s.talon, 'ss') def startGame(self, flip=0, reverse=1): for i in range(1, len(self.s.rows)): diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py index 4b29dee4..8fc3f2c4 100644 --- a/pysollib/games/montana.py +++ b/pysollib/games/montana.py @@ -396,9 +396,9 @@ registerGame(GameInfo(63, BlueMoon, "Blue Moon", registerGame(GameInfo(117, RedMoon, "Red Moon", GI.GT_MONTANA | GI.GT_OPEN, 1, 2)) registerGame(GameInfo(275, Galary, "Galary", - GI.GT_MONTANA | GI.GT_OPEN, 1, 2)) + GI.GT_MONTANA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 2)) registerGame(GameInfo(276, Moonlight, "Moonlight", - GI.GT_MONTANA | GI.GT_OPEN, 1, 2, + GI.GT_MONTANA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 2, si={"ncards": 48})) registerGame(GameInfo(380, Jungle, "Jungle", GI.GT_MONTANA | GI.GT_OPEN, 1, 1)) diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index 708008cb..2cb3c029 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -791,7 +791,7 @@ registerGame(GameInfo(328, TheWish, "The Wish", GI.GT_PAIRING_TYPE, 1, 0, ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) registerGame(GameInfo(329, TheWishOpen, "The Wish (open)", - GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, + GI.GT_PAIRING_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) registerGame(GameInfo(368, Vertical, "Vertical", GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0)) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index 7c321c9a..05c9a8b8 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -532,11 +532,11 @@ registerGame(GameInfo(356, Fly, "Fly", registerGame(GameInfo(357, Gnat, "Gnat", GI.GT_NUMERICA, 1, 0)) registerGame(GameInfo(378, Gloaming, "Gloaming", - GI.GT_NUMERICA | GI.GT_OPEN, 1, 0)) + GI.GT_NUMERICA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) registerGame(GameInfo(379, Chamberlain, "Chamberlain", - GI.GT_NUMERICA | GI.GT_OPEN, 1, 0)) + GI.GT_NUMERICA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) registerGame(GameInfo(402, Toad, "Toad", - GI.GT_NUMERICA, 2, 0)) + GI.GT_NUMERICA | GI.GT_ORIGINAL, 2, 0)) registerGame(GameInfo(430, PussInTheCorner, "Puss in the Corner", GI.GT_NUMERICA, 1, 0)) registerGame(GameInfo(435, Shifting, "Shifting", diff --git a/pysollib/games/osmosis.py b/pysollib/games/osmosis.py index 75d74a98..7c1f907a 100644 --- a/pysollib/games/osmosis.py +++ b/pysollib/games/osmosis.py @@ -292,11 +292,11 @@ registerGame(GameInfo(59, Osmosis, "Osmosis", registerGame(GameInfo(60, Peek, "Peek", GI.GT_1DECK_TYPE, 1, -1)) registerGame(GameInfo(298, OpenPeek, "Open Peek", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) registerGame(GameInfo(370, Genesis, "Genesis", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) registerGame(GameInfo(371, GenesisPlus, "Genesis +", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) registerGame(GameInfo(409, Bridesmaids, "Bridesmaids", GI.GT_1DECK_TYPE, 1, -1)) diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index 789d6ec6..e1203bc2 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -131,7 +131,7 @@ registerGame(GameInfo(41, PileOn, "PileOn", GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, altnames=("Fifteen Puzzle",) )) registerGame(GameInfo(289, SmallPileOn, "Small PileOn", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, ranks=(0, 5, 6, 7, 8, 9, 10, 11, 12), rules_filename = "pileon.html")) ## registerGame(GameInfo(341, PileOn2Decks, "PileOn (2 decks)", diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index a1ef2122..c10beae1 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -219,21 +219,49 @@ class Kingdom(RoyalCotillion): # /*********************************************************************** # // Alhambra +# // Granada # ************************************************************************/ -class Alhambra_Waste(WasteStack): - def acceptsCards(self, from_stack, cards): - if not WasteStack.acceptsCards(self, from_stack, cards): - return 0 - # check cards - if not self.cards: - return 0 - c1, c2 = self.cards[-1], cards[0] - return c1.suit == c2.suit and ((c1.rank + 1) % self.cap.mod == c2.rank or (c2.rank + 1) % self.cap.mod == c1.rank) +class Alhambra_RowStack(UD_SS_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class Alhambra_Talon(DealRowTalonStack): + def canDealCards(self): + r_cards = sum([len(r.cards) for r in self.game.s.rows]) + if self.cards: + return True + elif r_cards and self.round != self.max_rounds: + return True + return False + + def dealCards(self, sound=0): + old_state = self.game.enterState(self.game.S_DEAL) + num_cards = 0 + rows = self.game.s.rows + r_cards = sum([len(r.cards) for r in self.game.s.rows]) + if self.cards: + if sound and not self.game.demo: + self.game.playSample("dealwaste") + num_cards = self.dealRowAvail(sound=0, frames=4) + elif r_cards and self.round != self.max_rounds: + if sound: + self.game.playSample("turnwaste", priority=20) + for r in rows: + for i in range(len(r.cards)): + self.game.moveMove(1, r, self, frames=0) + self.game.flipMove(self) + num_cards = self.dealRowAvail(sound=0, frames=4) + self.game.nextRoundMove(self) + self.game.leaveState(old_state) + return num_cards class Alhambra(Game): - def createGame(self): + Hint_Class = CautiousDefaultHint + + def createGame(self, rows=1): # create layout l, s = Layout(self), self.s @@ -243,35 +271,40 @@ class Alhambra(Game): # create stacks x, y, = l.XM, l.YM for i in range(4): - s.foundations.append(SS_FoundationStack(x, y, self, suit=i, max_move=0)) + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + max_move=0)) x = x + l.XS for i in range(4): - s.foundations.append(SS_FoundationStack(x, y, self, suit=i, max_move=0, - base_rank=KING, dir=-1)) + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + max_move=0, base_rank=KING, dir=-1)) x = x + l.XS x, y, = l.XM, y + l.YS for i in range(8): - s.reserves.append(BasicRowStack(x, y, self, max_accept=0)) + stack = OpenStack(x, y, self, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.reserves.append(stack) x = x + l.XS - x, y = l.XM + 3*l.XS, y + 2*l.YS - s.talon = WasteTalonStack(x, y, self, max_rounds=3) + x, y = l.XM+(8-1-rows)*l.XS/2, y+l.YS+5*l.YOFFSET + s.talon = Alhambra_Talon(x, y, self, max_rounds=3) l.createText(s.talon, "sw") - x = x + l.XS - s.waste = Alhambra_Waste(x, y, self, mod=13, max_accept=1) - l.createText(s.waste, "se") + x += l.XS + for i in range(rows): + stack = Alhambra_RowStack(x, y, self, mod=13, + max_accept=1, base_rank=ANY_RANK) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + s.rows.append(stack) + x += l.XS # define stack-groups (non default) - s.rows.append(s.waste) l.defaultStackGroups() - # # game overrides # def _shuffleHook(self, cards): # move one Aces and Kings of first deck to top of the Talon (i.e. first card to be dealt) - return self._shuffleHookMoveToTop(cards, lambda c: (c.deck == 0 and c.rank in (0, 12), (c.rank, c.suit)), 8) + return self._shuffleHookMoveToTop(cards, lambda c: (c.deck == 0 and c.rank in (ACE, KING), (c.rank, c.suit)), 8) def startGame(self): self.s.talon.dealRow(rows=self.s.foundations, frames=0) @@ -282,6 +315,11 @@ class Alhambra(Game): self.s.talon.dealCards() +class Granada(Alhambra): + def createGame(self): + Alhambra.createGame(self, rows=4) + + # /*********************************************************************** # // Carpet # ************************************************************************/ @@ -502,9 +540,11 @@ registerGame(GameInfo(391, BritishConstitution, "British Constitution", ranks=range(11) # without Queens and Kings )) registerGame(GameInfo(392, NewBritishConstitution, "New British Constitution", - GI.GT_2DECK_TYPE, 2, 0, + GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0, ranks=range(11) # without Queens and Kings )) registerGame(GameInfo(443, Twenty, "Twenty", GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(465, Granada, "Granada", + GI.GT_2DECK_TYPE, 2, 2)) diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 06c3d5ea..d3f6a541 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -1020,9 +1020,9 @@ registerGame(GameInfo(401, GroundForADivorce3Decks, "Ground for a Divorce (3 decks)", GI.GT_SPIDER, 3, 0)) registerGame(GameInfo(441, York, "York", - GI.GT_SPIDER | GI.GT_OPEN, 2, 0)) + GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) registerGame(GameInfo(444, TripleYork, "Triple York", - GI.GT_SPIDER | GI.GT_OPEN, 3, 0)) + GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0)) registerGame(GameInfo(445, BigSpider1Suit, "Big Spider (1 suit)", GI.GT_SPIDER, 3, 0, suits=(0, 0, 0, 0), @@ -1032,7 +1032,7 @@ registerGame(GameInfo(446, BigSpider2Suits, "Big Spider (2 suits)", suits=(0, 0, 2, 2), rules_filename = "bigspider.html")) registerGame(GameInfo(449, Spider3x3, "Spider 3x3", - GI.GT_SPIDER, 3, 0, + GI.GT_SPIDER | GI.GT_ORIGINAL, 3, 0, suits=(0, 1, 2), rules_filename = "bigspider.html")) registerGame(GameInfo(454, Spider4Decks, "Spider (4 decks)", diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index ced4d9ef..ac365573 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -532,7 +532,7 @@ registerGame(GameInfo(272, TripleYukon, "Triple Yukon", registerGame(GameInfo(284, TenAcross, "Ten Across", GI.GT_YUKON, 1, 0)) registerGame(GameInfo(285, Panopticon, "Panopticon", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON | GI.GT_ORIGINAL, 1, 0)) registerGame(GameInfo(339, Moosehide, "Moosehide", GI.GT_YUKON, 1, 0)) registerGame(GameInfo(387, Roslin, "Roslin", @@ -542,4 +542,4 @@ registerGame(GameInfo(447, AustralianPatience, "Australian Patience", registerGame(GameInfo(450, RawPrawn, "Raw Prawn", GI.GT_YUKON, 1, 0)) registerGame(GameInfo(456, BimBom, "Bim Bom", - GI.GT_YUKON, 2, 0)) + GI.GT_YUKON | GI.GT_ORIGINAL, 2, 0)) diff --git a/pysollib/help.py b/pysollib/help.py index 20e232c0..45ede3ea 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -44,7 +44,7 @@ from mfxutil import EnvError from settings import PACKAGE, PACKAGE_URL from version import VERSION, FC_VERSION from pysoltk import tkname, makeHelpToplevel, wm_map, wm_set_icon -from pysoltk import MfxDialog +from pysoltk import MfxMessageDialog from pysoltk import tkHTMLViewer from gamedb import GAME_DB @@ -52,9 +52,9 @@ from gamedb import GAME_DB # // # ************************************************************************/ -class AboutDialog(MfxDialog): +class AboutDialog(MfxMessageDialog): def createFrames(self, kw): - top_frame, bottom_frame = MfxDialog.createFrames(self, kw) + top_frame, bottom_frame = MfxMessageDialog.createFrames(self, kw) return top_frame, bottom_frame @@ -64,9 +64,9 @@ def helpAbout(app, timeout=0, sound=1): t = _("A Python Solitaire Game Collection\n") if app.miscrandom.random() < 0.8: t = _("A World Domination Project\n") - strings=(_("Nice"), _("Credits...")) + strings=(_("&Nice"), _("&Credits...")) if timeout: - strings=(_("Enjoy"),) + strings=(_("&Enjoy"),) ##version = _("Version %s (%s)\n\n") % (FC_VERSION, VERSION) version = _("Version %s\n\n") % FC_VERSION d = AboutDialog(app.top, title=_("About ") + PACKAGE, timeout=timeout, @@ -99,8 +99,8 @@ def helpCredits(app, timeout=0, sound=1): elif tkname == "gnome": t = "PyGTK, " elif tkname == "kde": t = "pyKDE, " elif tkname == "wx": t = "wxPython, " - d = MfxDialog(app.top, title=_("Credits"), timeout=timeout, - text=PACKAGE+_(''' credits go to: + d = MfxMessageDialog(app.top, title=_("Credits"), timeout=timeout, + text=PACKAGE+_(''' credits go to: Volker Weidner for getting me into Solitaire Guido van Rossum for the initial example program @@ -135,9 +135,9 @@ def helpHTML(app, document, dir_, top=None): document, dir_ = "index.html", "html" help_html_index = app.dataloader.findFile(document, dir_) except EnvError: - d = MfxDialog(app.top, title=PACKAGE + _(" HTML Problem"), - text=_("Cannot find help document\n") + document, - bitmap="warning") + d = MfxMessageDialog(app.top, title=PACKAGE + _(" HTML Problem"), + text=_("Cannot find help document\n") + document, + bitmap="warning") return None ##print doc, help_html_index try: diff --git a/pysollib/hint.py b/pysollib/hint.py index 4bb2cee0..4a0144f3 100644 --- a/pysollib/hint.py +++ b/pysollib/hint.py @@ -700,14 +700,17 @@ if os.name == 'nt': fcs_command = os.path.join(os.path.split(sys.path[0])[0], 'fc-solve.exe') fcs_command = '"%s"' % fcs_command -try: - pin, pout, perr = os.popen3(fcs_command+' --help') - if pout.readline().startswith('fc-solve'): - FreecellSolver = True - del pin, pout, perr -except: - ##traceback.print_exc() - pass +if os.name in ('posix', 'nt'): + try: + pin, pout, perr = os.popen3(fcs_command+' --help') + if pout.readline().startswith('fc-solve'): + FreecellSolver = True + del pin, pout, perr + if os.name == 'posix': + os.wait() + except: + ##traceback.print_exc() + pass class FreeCellSolverWrapper: @@ -855,6 +858,8 @@ class FreeCellSolverWrapper: if hint: self.hints.append(hint) ##print self.hints + if os.name == 'posix': + os.wait() def computeHints_mod(self): diff --git a/pysollib/main.py b/pysollib/main.py index dbf733e3..1da70ab7 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -53,7 +53,7 @@ from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient, Win32A # Toolkit imports from pysoltk import tkname, tkversion, wm_withdraw, wm_set_icon, loadImage -from pysoltk import MfxDialog, MfxExceptionDialog +from pysoltk import MfxMessageDialog, MfxExceptionDialog from pysoltk import TclError, MfxRoot from pysoltk import PysolProgressBar @@ -65,15 +65,15 @@ from tkFont import Font def fatal_no_cardsets(app): app.wm_withdraw() - d = MfxDialog(app.top, title=PACKAGE + _(" installation error"), - text=_('''No %ss were found !!! + d = MfxMessageDialog(app.top, title=PACKAGE + _(" installation error"), + text=_('''No %ss were found !!! Main data directory is: %s Please check your %s installation. ''') % (CARDSET, app.dataloader.dir, PACKAGE), - bitmap="error", strings=(_("Quit"),)) + bitmap="error", strings=(_("&Quit"),)) ##raise Exception, "no "+CARDSET+"s found !" @@ -256,10 +256,7 @@ def pysol_init(app, args): # set global color scheme if not opts["fg"] and not opts["bg"]: if os.name == "posix": # Unix/X11 - top.option_add('*selectBackground', '#00008b', 50) - top.option_add('*selectForeground', 'white', 50) - top.option_add('*Entry.background', 'white', 50) - top.option_add('*Listbox.background', 'white', 50) + pass if os.name == "mac": color, priority = "#d9d9d9", "60" classes = ( @@ -280,6 +277,20 @@ def pysol_init(app, args): top.option_add("*foreground", fg) app.top_palette[0] = fg + # + if os.name == "posix": # Unix/X11 + top.option_add('*Entry.background', 'white', 60) + top.option_add('*Entry.foreground', 'black', 60) + top.option_add('*Listbox.background', 'white', 60) + top.option_add('*Listbox.foreground', 'black', 60) + ##top.option_add('*borderWidth', '1', 50) + ##top.option_add('*Button.borderWidth', '1', 50) + top.option_add('*Scrollbar.elementBorderWidth', '1', 60) + top.option_add('*Scrollbar.borderWidth', '1', 60) + top.option_add('*Menu.borderWidth', '1', 60) + #top.option_add('*Button.HighlightBackground', '#595d59') + #top.option_add('*Button.HighlightThickness', '1') + # font if opts["fn"]: font = opts["fn"] @@ -307,8 +318,8 @@ def pysol_init(app, args): # check games if len(app.gdb.getGamesIdSortedByName()) == 0: app.wm_withdraw() - d = MfxDialog(top, title=PACKAGE + _(" installation error"), - text=_(''' + d = MfxMessageDialog(top, title=PACKAGE + _(" installation error"), + text=_(''' No games were found !!! Main data directory is: @@ -316,7 +327,7 @@ Main data directory is: Please check your %s installation. ''') % (app.dataloader.dir, PACKAGE), - bitmap="error", strings=(_("Quit"),)) + bitmap="error", strings=(_("&Quit"),)) return 1 # init cardsets @@ -394,14 +405,20 @@ Please check your %s installation. if not opts["nosound"]: if warn_thread: top.update() - d = MfxDialog(top, title=PACKAGE + _(" installation problem"), - text=_("Your Python installation is compiled without thread support.\n\nSounds and background music will be disabled."), - bitmap="warning", strings=(_("OK"),)) + d = MfxMessageDialog(top, title=PACKAGE + _(" installation problem"), + text=_('''\ +Your Python installation is compiled without thread support. + +Sounds and background music will be disabled.'''), + bitmap="warning", strings=(_("&OK"),)) elif warn_pysolsoundserver: top.update() - d = MfxDialog(top, title=PACKAGE + _(" installation problem"), - text=_("The pysolsoundserver module was not found.\n\nSounds and background music will be disabled."), - bitmap="warning", strings=(_("OK"),)) + d = MfxMessageDialog(top, title=PACKAGE + _(" installation problem"), + text=_('''\ +The pysolsoundserver module was not found. + +Sounds and background music will be disabled.'''), + bitmap="warning", strings=(_("&OK"),)) # create the progress bar title = _("Welcome to ") + PACKAGE @@ -486,9 +503,9 @@ def pysol_main(args): ## raise ## t = str(ex.__class__) ## if str(ex): t = t + ":\n" + str(ex) -## d = MfxDialog(app.top, title=PACKAGE + " internal error", +## d = MfxMessageDialog(app.top, title=PACKAGE + " internal error", ## text="Internal errror. Please report this bug:\n\n"+t, -## strings=("Quit",), bitmap="error") +## strings=("&Quit",), bitmap="error") try: pysol_exit(app) except: diff --git a/pysollib/pysoltk.py b/pysollib/pysoltk.py index 64c4f7b8..28b38121 100644 --- a/pysollib/pysoltk.py +++ b/pysollib/pysoltk.py @@ -29,7 +29,6 @@ from tk.edittextdialog import * from tk.tkstats import * from tk.playeroptionsdialog import * from tk.soundoptionsdialog import * -from tk.demooptionsdialog import * from tk.timeoutsdialog import * from tk.colorsdialog import * from tk.fontsdialog import * diff --git a/pysollib/resource.py b/pysollib/resource.py index 527e48ff..d9932001 100644 --- a/pysollib/resource.py +++ b/pysollib/resource.py @@ -239,75 +239,87 @@ class CSI: TYPE_TRUMP_ONLY = 9 TYPE = { - 1: "French type (52 cards)", - 2: "Hanafuda type (48 cards)", - 3: "Tarock type (78 cards)", - 4: "Mahjongg type (42 tiles)", - 5: "Hex A Deck type (68 cards)", - 6: "Mughal Ganjifa type (96 cards)", - 7: "Navagraha Ganjifa type (108 cards)", - 8: "Dashavatara Ganjifa type (120 cards)", - 9: "Trumps only type (variable cards)", + 1: _("French type (52 cards)"), + 2: _("Hanafuda type (48 cards)"), + 3: _("Tarock type (78 cards)"), + 4: _("Mahjongg type (42 tiles)"), + 5: _("Hex A Deck type (68 cards)"), + 6: _("Mughal Ganjifa type (96 cards)"), + 7: _("Navagraha Ganjifa type (108 cards)"), + 8: _("Dashavatara Ganjifa type (120 cards)"), + 9: _("Trumps only type (variable cards)"), + } + + TYPE_NAME = { + 1: _("French"), + 2: _("Hanafuda"), + 3: _("Tarock"), + 4: _("Mahjongg"), + 5: _("Hex A Deck"), + 6: _("Mughal Ganjifa"), + 7: _("Navagraha Ganjifa"), + 8: _("Dashavatara Ganjifa"), + 9: _("Trumps only"), } # cardset styles STYLE = { - 1: "Adult", # - 2: "Animals", # - 3: "Anime", # - 4: "Art", # - 5: "Cartoons", # - 6: "Children", # - 7: "Classic look", # - 8: "Collectors", # scanned collectors cardsets - 9: "Computers", # - 10: "Engines", # - 11: "Fantasy", # - 30: "Ganjifa", # - 12: "Hanafuda", # - 29: "Hex A Deck", # - 13: "Holiday", # - 28: "Mahjongg", # - 14: "Movies", # - 31: "Matrix", # - 15: "Music", # - 16: "Nature", # - 17: "Operating Systems", # e.g. cards with Linux logos - 19: "People", # famous people - 20: "Places", # - 21: "Plain", # - 22: "Products", # - 18: "Round cardsets", # - 23: "Science Fiction", # - 24: "Sports", # - 27: "Tarock", # - 25: "Vehicels", # - 26: "Video Games", # + 1: _("Adult"), # + 2: _("Animals"), # + 3: _("Anime"), # + 4: _("Art"), # + 5: _("Cartoons"), # + 6: _("Children"), # + 7: _("Classic look"), # + 8: _("Collectors"), # scanned collectors cardsets + 9: _("Computers"), # + 10: _("Engines"), # + 11: _("Fantasy"), # + 30: _("Ganjifa"), # + 12: _("Hanafuda"), # + 29: _("Hex A Deck"), # + 13: _("Holiday"), # + 28: _("Mahjongg"), # + 14: _("Movies"), # + 31: _("Matrix"), # + 15: _("Music"), # + 16: _("Nature"), # + 17: _("Operating Systems"), # e.g. cards with Linux logos + 19: _("People"), # famous people + 20: _("Places"), # + 21: _("Plain"), # + 22: _("Products"), # + 18: _("Round cardsets"), # + 23: _("Science Fiction"), # + 24: _("Sports"), # + 27: _("Tarock"), # + 25: _("Vehicels"), # + 26: _("Video Games"), # } # cardset nationality (suit and rank symbols) NATIONALITY = { - 1021: "Australia", # - 1001: "Austria", # - 1019: "Belgium", # - 1010: "Canada", # - 1011: "China", # - 1012: "Czech Republic", # - 1013: "Denmark", # - 1003: "England", # - 1004: "France", # - 1006: "Germany", # - 1014: "Great Britain", # - 1015: "Hungary", # - 1020: "India", # - 1005: "Italy", # - 1016: "Japan", # - 1002: "Netherlands", # - 1007: "Russia", # - 1008: "Spain", # - 1017: "Sweden", # - 1009: "Switzerland", # - 1018: "USA", # + 1021: _("Australia"), # + 1001: _("Austria"), # + 1019: _("Belgium"), # + 1010: _("Canada"), # + 1011: _("China"), # + 1012: _("Czech Republic"), # + 1013: _("Denmark"), # + 1003: _("England"), # + 1004: _("France"), # + 1006: _("Germany"), # + 1014: _("Great Britain"), # + 1015: _("Hungary"), # + 1020: _("India"), # + 1005: _("Italy"), # + 1016: _("Japan"), # + 1002: _("Netherlands"), # + 1007: _("Russia"), # + 1008: _("Spain"), # + 1017: _("Sweden"), # + 1009: _("Switzerland"), # + 1018: _("USA"), # } # cardset creation date @@ -327,19 +339,17 @@ class CSI: 22: "2200 - 2299", } - # - TYPE_NAME = {} - -def create_csi_type_name(): - for id, type in CSI.TYPE.items(): - i = type.find('type') - if i > 0: - CSI.TYPE_NAME[id] = type[:i-1] - else: - CSI.TYPE_NAME[id] = type - -if not CSI.TYPE_NAME: - create_csi_type_name() +## # +## TYPE_NAME = {} +## def create_csi_type_name(): +## for id, type in CSI.TYPE.items(): +## i = type.find('type') +## if i > 0: +## CSI.TYPE_NAME[id] = type[:i-1] +## else: +## CSI.TYPE_NAME[id] = type +## if not CSI.TYPE_NAME: +## create_csi_type_name() class CardsetConfig(Struct): diff --git a/pysollib/stack.py b/pysollib/stack.py index 2168e16b..620f9337 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -327,6 +327,8 @@ class Stack: def prepareView(self): ##assertView(self) + if (self.CARD_XOFFSET == 0 and self.CARD_YOFFSET == 0): + assert self.cap.max_move <= 1 # prepare some variables ox, oy = self.CARD_XOFFSET, self.CARD_YOFFSET if type(ox) is types.IntType: diff --git a/pysollib/stats.py b/pysollib/stats.py index d3039bfa..feb166bb 100644 --- a/pysollib/stats.py +++ b/pysollib/stats.py @@ -43,8 +43,6 @@ from mfxutil import format_time from util import PACKAGE, VERSION from gamedb import GI -# Toolkit imports -from pysoltk import MfxDialog # // FIXME - this a quick hack and needs a rewrite @@ -128,7 +126,7 @@ class PysolStatsFormatter: twon, tlost, tgames, ttime, tmoves = 0, 0, 0, 0, 0 g = sort_func() for id in g: - name = app.getGameMenuitemName(id) + name = app.getGameTitleName(id) #won, lost = app.stats.getStats(player, id) won, lost, time, moves = app.stats.getFullStats(player, id) twon, tlost = twon + won, tlost + lost @@ -161,7 +159,7 @@ class PysolStatsFormatter: if not player or not prev_games: return 0 self.writeHeader(writer, header, 71) - writer.plog(_("Game"), _("Game number"), _("Started at "), _("Status")) + writer.plog(_("Game"), _("Game number"), _("Started at"), _("Status")) writer.nl() twon, tlost = 0, 0 for pg in prev_games: diff --git a/pysollib/tk/colorsdialog.py b/pysollib/tk/colorsdialog.py index f0d05062..a9fe39a3 100644 --- a/pysollib/tk/colorsdialog.py +++ b/pysollib/tk/colorsdialog.py @@ -31,7 +31,7 @@ from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE -from tkwidget import _ToplevelDialog, MfxDialog +from tkwidget import MfxDialog # /*********************************************************************** # // @@ -40,7 +40,7 @@ from tkwidget import _ToplevelDialog, MfxDialog class ColorsDialog(MfxDialog): def __init__(self, parent, title, app, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) @@ -128,8 +128,8 @@ class ColorsDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), _("Cancel")), default=0, - separatorwidth = 0, + strings=(_("&OK"), _("&Cancel")), + default=0, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/demooptionsdialog.py b/pysollib/tk/demooptionsdialog.py deleted file mode 100644 index ba62f499..00000000 --- a/pysollib/tk/demooptionsdialog.py +++ /dev/null @@ -1,112 +0,0 @@ -## vim:ts=4:et:nowrap -## -##---------------------------------------------------------------------------## -## -## PySol -- a Python Solitaire game -## -## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer -## All Rights Reserved. -## -## 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 2 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; see the file COPYING. -## If not, write to the Free Software Foundation, Inc., -## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## -## Markus F.X.J. Oberhumer -## -## http://www.oberhumer.com/pysol -## -##---------------------------------------------------------------------------## - -__all__ = ['DemoOptionsDialog'] - -# imports -import os, sys, Tkinter - -# PySol imports -from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct - -# Toolkit imports -from tkconst import EVENT_HANDLED, EVENT_PROPAGATE -from tkwidget import _ToplevelDialog, MfxDialog - -# /*********************************************************************** -# // -# ************************************************************************/ - -class DemoOptionsDialog(MfxDialog): - def __init__(self, parent, title, app, **kw): - kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) - top_frame, bottom_frame = self.createFrames(kw) - self.createBitmaps(top_frame, kw) - # - self.demo_logo_var = Tkinter.BooleanVar() - self.demo_logo_var.set(app.opt.demo_logo != 0) - self.demo_score_var = Tkinter.BooleanVar() - self.demo_score_var.set(app.opt.demo_score != 0) - self.demo_sleep_var = Tkinter.DoubleVar() - self.demo_sleep_var.set(app.opt.demo_sleep) - widget = Tkinter.Checkbutton(top_frame, variable=self.demo_logo_var, - text=_("Display floating Demo logo")) - widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) - widget = Tkinter.Checkbutton(top_frame, variable=self.demo_score_var, - text=_("Show score in statusbar")) - widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) - widget = Tkinter.Scale(top_frame, from_=0.2, to=9.9, - resolution=0.1, orient=Tkinter.HORIZONTAL, - length="3i", label=_("Set demo delay in seconds"), - variable=self.demo_sleep_var, takefocus=0) - widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) - # - focus = self.createButtons(bottom_frame, kw) - self.mainloop(focus, kw.timeout) - # - self.demo_logo = self.demo_logo_var.get() - self.demo_score = self.demo_score_var.get() - self.demo_sleep = self.demo_sleep_var.get() - - - def initKw(self, kw): - kw = KwStruct(kw, - strings=(_("OK"), _("Cancel")), default=0, - separatorwidth = 0, - ) - return MfxDialog.initKw(self, kw) - - -# /*********************************************************************** -# // -# ************************************************************************/ - - -def demooptionsdialog_main(args): - from tkutil import wm_withdraw - opt = Struct(demo_logo=1, demo_sleep=1.5) - app = Struct(opt=opt) - tk = Tkinter.Tk() - wm_withdraw(tk) - tk.update() - d = DemoOptionsDialog(tk, "Demo options", app) - print d.status, d.button, ":", d.demo_logo, d.demo_sleep - return 0 - -if __name__ == "__main__": - import sys - sys.exit(demooptionsdialog_main(sys.argv)) - diff --git a/pysollib/tk/edittextdialog.py b/pysollib/tk/edittextdialog.py index c5d0cf22..f18969b3 100644 --- a/pysollib/tk/edittextdialog.py +++ b/pysollib/tk/edittextdialog.py @@ -42,7 +42,7 @@ import os, sys, Tkinter from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct # Toolkit imports -from tkwidget import _ToplevelDialog, MfxDialog +from tkwidget import MfxDialog # /*********************************************************************** # // @@ -52,7 +52,7 @@ class EditTextDialog(MfxDialog): def __init__(self, parent, title, text, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) # @@ -79,9 +79,10 @@ class EditTextDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), _("Cancel")), default=-1, - resizable = 1, - separatorwidth = 0, + strings=(_("&OK"), _("&Cancel")), + default=-1, + resizable=1, + separatorwidth=0, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/fontsdialog.py b/pysollib/tk/fontsdialog.py index a5a10203..6ea9da64 100644 --- a/pysollib/tk/fontsdialog.py +++ b/pysollib/tk/fontsdialog.py @@ -32,7 +32,7 @@ from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE -from tkwidget import _ToplevelDialog, MfxDialog +from tkwidget import MfxDialog from tkutil import bind # /*********************************************************************** @@ -43,7 +43,7 @@ class FontChooserDialog(MfxDialog): def __init__(self, parent, title, init_font, **kw): ##print init_font kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) @@ -83,7 +83,7 @@ class FontChooserDialog(MfxDialog): self.entry = Entry(frame, bg='white') self.entry.grid(row=0, column=0, columnspan=2, sticky=W+E+N+S) self.entry.insert(END, _('abcdefghABCDEFGH')) - self.list_box = Listbox(frame, width=36) + self.list_box = Listbox(frame, width=36, exportselection=False) sb = Scrollbar(frame) self.list_box.configure(yscrollcommand=sb.set) sb.configure(command=self.list_box.yview) @@ -137,8 +137,8 @@ class FontChooserDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), _("Cancel")), default=0, - separatorwidth=0, + strings=(_("&OK"), _("&Cancel")), + default=0, padx=10, pady=10, buttonpadx=10, buttonpady=5, ) @@ -151,7 +151,7 @@ class FontChooserDialog(MfxDialog): class FontsDialog(MfxDialog): def __init__(self, parent, title, app, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) @@ -201,8 +201,8 @@ class FontsDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), _("Cancel")), default=0, - separatorwidth = 0, + strings=(_("&OK"), _("&Cancel")), + default=0, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/gameinfodialog.py b/pysollib/tk/gameinfodialog.py index 46c5071d..cb6ee333 100644 --- a/pysollib/tk/gameinfodialog.py +++ b/pysollib/tk/gameinfodialog.py @@ -31,7 +31,7 @@ from pysollib.mfxutil import KwStruct from pysollib.gamedb import GI # Toolkit imports -from tkwidget import _ToplevelDialog, MfxDialog +from tkwidget import MfxDialog # /*********************************************************************** # // @@ -40,7 +40,7 @@ from tkwidget import _ToplevelDialog, MfxDialog class GameInfoDialog(MfxDialog): def __init__(self, parent, title, app, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) @@ -130,7 +130,8 @@ class GameInfoDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"),), default=0, - separatorwidth = 2, + strings=(_("&OK"),), + default=0, + separatorwidth=2, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 1fdced3e..4a61cc79 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -364,8 +364,6 @@ class PysolMenubar(PysolMenubarActions): submenu.add_radiobutton(label=n_("&Very slow"), variable=self.tkopt.animations, value=4, command=self.mOptAnimations) menu.add_checkbutton(label=n_("Stick&y mouse"), variable=self.tkopt.sticky_mouse, command=self.mOptStickyMouse) menu.add_separator() - #menu.add_command(label="&Hint options...", command=self.mOptHintOptions) - #menu.add_command(label="&Demo options...", command=self.mOptDemoOptions) menu.add_command(label=n_("&Fonts..."), command=self.mOptFontsOptions) menu.add_command(label=n_("&Colors..."), command=self.mOptColorsOptions) menu.add_command(label=n_("Time&outs..."), command=self.mOptTimeoutsOptions) @@ -852,10 +850,10 @@ class PysolMenubar(PysolMenubarActions): def mSelectCardsetDialog(self, *event): if self._cancelDrag(break_pause=False): return - ##strings, default = ("OK", "Load", "Cancel"), 0 - strings, default = (None, _("Load"), _("Cancel"),), 1 + ##strings, default = ("&OK", "&Load", "&Cancel"), 0 + strings, default = (None, _("&Load"), _("&Cancel"),), 1 ##if os.name == "posix": - strings, default = (None, _("Load"), _("Cancel"), _("Info..."),), 1 + strings, default = (None, _("&Load"), _("&Cancel"), _("&Info..."),), 1 t = CARDSET key = self.app.nextgame.cardset.index d = SelectCardsetDialogWithPreview(self.top, title=_("Select ")+t, diff --git a/pysollib/tk/playeroptionsdialog.py b/pysollib/tk/playeroptionsdialog.py index 3cd0892e..6881c961 100644 --- a/pysollib/tk/playeroptionsdialog.py +++ b/pysollib/tk/playeroptionsdialog.py @@ -43,7 +43,7 @@ from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE -from tkwidget import _ToplevelDialog, MfxDialog +from tkwidget import MfxDialog from tkutil import bind @@ -54,8 +54,7 @@ from tkutil import bind class SelectUserNameDialog(MfxDialog): def __init__(self, parent, title, usernames=[], **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, - kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) # @@ -83,7 +82,7 @@ class SelectUserNameDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), _("Cancel")), default=0, + strings=(_("&OK"), _("&Cancel")), default=0, separatorwidth=0, resizable=0, padx=10, pady=10, @@ -96,7 +95,7 @@ class SelectUserNameDialog(MfxDialog): class PlayerOptionsDialog(MfxDialog): def __init__(self, parent, title, app, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) self.app = app @@ -158,9 +157,7 @@ class PlayerOptionsDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), _("Cancel")), default=0, - separatorwidth=2, - resizable=0, + strings=(_("&OK"), _("&Cancel")), default=0, padx=10, pady=10, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/selectcardset.py b/pysollib/tk/selectcardset.py index 7c9b4d0a..8612ea36 100644 --- a/pysollib/tk/selectcardset.py +++ b/pysollib/tk/selectcardset.py @@ -45,7 +45,7 @@ from pysollib.resource import CSI # Toolkit imports from tkutil import loadImage -from tkwidget import _ToplevelDialog, MfxDialog, MfxScrolledCanvas +from tkwidget import MfxDialog, MfxScrolledCanvas from tkcanvas import MfxCanvasImage from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas @@ -181,7 +181,7 @@ class SelectCardsetDialogWithPreview(MfxDialog): def __init__(self, parent, title, app, manager, key=None, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) # @@ -237,9 +237,9 @@ class SelectCardsetDialogWithPreview(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), _("Load"), _("Cancel"),), default=0, - separatorwidth=2, resizable=1, - font=None, + strings=(_("&OK"), _("&Load"), _("&Cancel"),), + default=0, + resizable=1, padx=10, pady=10, buttonpadx=10, buttonpady=5, ) @@ -308,7 +308,7 @@ class SelectCardsetByTypeDialogWithPreview(SelectCardsetDialogWithPreview): class CardsetInfoDialog(MfxDialog): def __init__(self, parent, title, cardset, images, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) frame = Tkinter.Frame(top_frame) @@ -393,9 +393,10 @@ class CardsetInfoDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"),), default=0, - resizable = 1, - separatorwidth = 2, + strings=(_("&OK"),), + default=0, + resizable=1, + separatorwidth=2, padx=10, pady=10, buttonpadx=10, buttonpady=5, ) diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index f254e2b6..d5575260 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -47,7 +47,7 @@ from pysollib.resource import CSI # Toolkit imports from tkutil import unbind_destroy -from tkwidget import _ToplevelDialog, MfxDialog, MfxScrolledCanvas +from tkwidget import MfxDialog, MfxScrolledCanvas from tkcanvas import MfxCanvasText from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas @@ -156,7 +156,7 @@ class SelectGameData(SelectDialogTreeData): select_func = lambda gi, games=games: gi.id in games if name is None or not filter(select_func, self.all_games_gi): continue - name = _("New games in v") + name + name = _("New games in v.") + name gg.append(SelectGameNode(None, name, select_func)) if 1 and gg: s_by_pysol_version = SelectGameNode(None, _("by PySol version"), tuple(gg)) @@ -241,7 +241,7 @@ class SelectGameDialog(MfxDialog): def __init__(self, parent, title, app, gameid, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) # @@ -265,9 +265,9 @@ class SelectGameDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(None, None, _("Cancel"),), default=0, - separatorwidth=2, resizable=1, - font=None, + strings=(None, None, _("&Cancel"),), default=0, + separatorwidth=2, + resizable=1, padx=10, pady=10, buttonpadx=10, buttonpady=5, ) @@ -302,7 +302,7 @@ class SelectGameDialogWithPreview(SelectGameDialog): def __init__(self, parent, title, app, gameid, bookmark=None, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) # @@ -406,7 +406,7 @@ class SelectGameDialogWithPreview(SelectGameDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("Select"), _("Rules"), _("Cancel"),), + strings=(_("&Select"), _("&Rules"), _("&Cancel"),), default=0, ) return SelectGameDialog.initKw(self, kw) @@ -485,8 +485,7 @@ class SelectGameDialogWithPreview(SelectGameDialog): self.preview_game.endGame() self.preview_game.destruct() ##self.top.wm_title("Select Game - " + self.app.getGameTitleName(gameid)) - #title = gettext(unicode(self.app.getGameTitleName(gameid), 'utf-8')) - title = gettext(self.app.getGameTitleName(gameid)) + title = self.app.getGameTitleName(gameid) self.top.wm_title(_("Playable Preview - ") + title) ## if False: ## cw, ch = canvas.winfo_width(), canvas.winfo_height() diff --git a/pysollib/tk/selecttile.py b/pysollib/tk/selecttile.py index d50c3896..c82bf12b 100644 --- a/pysollib/tk/selecttile.py +++ b/pysollib/tk/selecttile.py @@ -44,7 +44,7 @@ from pysollib.resource import CSI # Toolkit imports from tkutil import loadImage -from tkwidget import _ToplevelDialog, MfxDialog, MfxScrolledCanvas +from tkwidget import MfxDialog, MfxScrolledCanvas from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas @@ -112,7 +112,7 @@ class SelectTileDialogWithPreview(MfxDialog): def __init__(self, parent, title, app, manager, key=None, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) # @@ -155,8 +155,9 @@ class SelectTileDialogWithPreview(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), _("Solid color..."), _("Cancel"),), default=0, - separatorwidth=2, resizable=1, + strings=(_("&OK"), _("&Solid color..."), _("&Cancel"),), + default=0, + resizable=1, font=None, padx=10, pady=10, buttonpadx=10, buttonpady=5, diff --git a/pysollib/tk/selecttree.py b/pysollib/tk/selecttree.py index 1eddef43..db299b57 100644 --- a/pysollib/tk/selecttree.py +++ b/pysollib/tk/selecttree.py @@ -44,7 +44,6 @@ from pysollib.mfxutil import destruct, Struct, KwStruct, kwdefault # Toolkit imports from tkutil import makeImage -from tkwidget import _ToplevelDialog, MfxDialog, MfxScrolledCanvas from tkcanvas import MfxCanvas from tktree import MfxTreeLeaf, MfxTreeNode, MfxTreeInCanvas @@ -183,8 +182,3 @@ class SelectDialogTreeCanvas(MfxTreeInCanvas): self.redraw() return "break" -# /*********************************************************************** -# // Canvas for a preview (right side) -# ************************************************************************/ - -##SelectDialogPreviewCanvas = MfxScrolledCanvas diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index bb0c70b3..0ca59eaa 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -47,7 +47,7 @@ from pysollib.settings import MIXERS # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE -from tkwidget import _ToplevelDialog, MfxDialog +from tkwidget import MfxDialog # /*********************************************************************** # // @@ -59,7 +59,7 @@ class SoundOptionsDialog(MfxDialog): def __init__(self, parent, title, app, **kw): self.app = app kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) # @@ -103,15 +103,15 @@ class SoundOptionsDialog(MfxDialog): self.mainloop(focus, kw.timeout) def initKw(self, kw): - strings=[_("OK"), _("Apply"), _("Mixer..."), _("Cancel"),] + strings=[_("&OK"), _("&Apply"), _("&Mixer..."), _("&Cancel"),] if self.MIXER is None: - strings[2] = (_("Mixer..."), -1) + strings[2] = (_("&Mixer..."), -1) ## if os.name != "nt" and not self.app.debug: ## strings[2] = None kw = KwStruct(kw, - strings=strings, default=0, - separatorwidth=2, resizable=1, - font=None, + strings=strings, + default=0, + resizable=1, padx=10, pady=10, buttonpadx=10, buttonpady=5, ) @@ -155,7 +155,7 @@ class SoundOptionsDialog(MfxDialog): d = MfxDialog(self.top, title=_("Sound preferences info"), text=_("Changing DirectX settings will take effect\nthe next time you restart ")+PACKAGE, bitmap="warning", - default=0, strings=(_("OK"),)) + default=0, strings=(_("&OK"),)) # /*********************************************************************** diff --git a/pysollib/tk/statusbar.py b/pysollib/tk/statusbar.py index c5cea311..e87947ac 100644 --- a/pysollib/tk/statusbar.py +++ b/pysollib/tk/statusbar.py @@ -62,10 +62,12 @@ class MfxStatusbar: self.padx = 1 self.pady = 2 # - self.frame = Tkinter.Frame(self.top, bd=1) #, relief='raised') + self.frame = Tkinter.Frame(self.top, bd=1) self.frame.grid(row=self._row, column=self._column, columnspan=self._columnspan, sticky='ew', padx=self.padx, pady=self.pady) + #if os.name == "mac": + # Tkinter.Label(self.frame, width=2).pack(side='right') # util def _createLabel(self, name, diff --git a/pysollib/tk/timeoutsdialog.py b/pysollib/tk/timeoutsdialog.py index caff5154..1ec23785 100644 --- a/pysollib/tk/timeoutsdialog.py +++ b/pysollib/tk/timeoutsdialog.py @@ -30,7 +30,7 @@ from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE -from tkwidget import _ToplevelDialog, MfxDialog +from tkwidget import MfxDialog # /*********************************************************************** # // @@ -39,7 +39,7 @@ from tkwidget import _ToplevelDialog, MfxDialog class TimeoutsDialog(MfxDialog): def __init__(self, parent, title, app, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) #self.createBitmaps(top_frame, kw) @@ -89,8 +89,8 @@ class TimeoutsDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), _("Cancel")), default=0, - separatorwidth=0, + strings=(_("&OK"), _("&Cancel")), default=0, + padx=10, pady=10, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index c9ac8a84..9e630012 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -456,7 +456,7 @@ to open the following URL: def errorDialog(self, msg): d = MfxDialog(self.parent, title=PACKAGE+" HTML Problem", text=msg, bitmap="warning", - strings=(_("OK"),), default=0) + strings=(_("&OK"),), default=0) def showImage(self, src, alt, ismap, align, width, height): url = self.basejoin(src) diff --git a/pysollib/tk/tkstats.py b/pysollib/tk/tkstats.py index 279a68af..33723a3e 100644 --- a/pysollib/tk/tkstats.py +++ b/pysollib/tk/tkstats.py @@ -54,7 +54,7 @@ from pysollib.settings import TOP_TITLE # Toolkit imports from tkutil import bind, unbind_destroy, loadImage -from tkwidget import _ToplevelDialog, MfxDialog +from tkwidget import MfxDialog, MfxMessageDialog from tkwidget import MfxScrolledCanvas gettext = _ @@ -70,7 +70,7 @@ class SingleGame_StatsDialog(MfxDialog): def __init__(self, parent, title, app, player, gameid, **kw): self.app = app kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.top_frame = top_frame self.createBitmaps(top_frame, kw) @@ -285,13 +285,11 @@ class SingleGame_StatsDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), - (_("All games..."), 102), + strings=(_("&OK"), + (_("&All games..."), 102), (TOP_TITLE+"...", 105), - (_("Reset..."), 302)), default=0, + (_("&Reset..."), 302)), default=0, image=self.app.gimages.logos[5], - separatorwidth=2, - resizable=0, padx=10, pady=10, ) return MfxDialog.initKw(self, kw) @@ -543,7 +541,7 @@ class AllGames_StatsDialog(MfxDialog): # kwdefault(kw, width=self.CHAR_W*64, height=lines*self.CHAR_H) kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) # @@ -570,13 +568,13 @@ class AllGames_StatsDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), - (_("Save to file"), 202), - (_("Reset all..."), 301),), + strings=(_("&OK"), + (_("&Save to file"), 202), + (_("&Reset all..."), 301),), default=0, - separatorwidth=2, resizable=1, - padx=10, pady=10, - #width=900, + resizable=1, + padx=10, pady=10, + #width=900, ) return MfxDialog.initKw(self, kw) @@ -644,7 +642,7 @@ class FullLog_StatsDialog(AllGames_StatsDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), (_("Session log..."), 104), (_("Save to file"), 203)), default=0, + strings=(_("&OK"), (_("Session &log..."), 104), (_("&Save to file"), 203)), default=0, width=76*self.CHAR_W, ) return AllGames_StatsDialog.initKw(self, kw) @@ -660,7 +658,7 @@ class SessionLog_StatsDialog(FullLog_StatsDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), (_("Full log..."), 103), (_("Save to file"), 204)), default=0, + strings=(_("&OK"), (_("&Full log..."), 103), (_("&Save to file"), 204)), default=0, ) return FullLog_StatsDialog.initKw(self, kw) @@ -668,7 +666,7 @@ class SessionLog_StatsDialog(FullLog_StatsDialog): # // # ************************************************************************/ -class Status_StatsDialog(MfxDialog): +class Status_StatsDialog(MfxMessageDialog): def __init__(self, parent, game): stats, gstats = game.stats, game.gstats w1 = w2 = "" @@ -688,26 +686,27 @@ class Status_StatsDialog(MfxDialog): w2 = w2 + _("\nCards in Foundations: ") + str(n) # date = time.strftime("%Y-%m-%d %H:%M", time.localtime(game.gstats.start_time)) - MfxDialog.__init__(self, parent, title=_("Game status"), - text=game.getTitleName() + "\n" + - game.getGameNumber(format=1) + "\n" + - _("Playing time: ") + game.getTime() + "\n" + - _("Started at: ") + date + "\n\n"+ - _("Moves: ") + str(game.moves.index) + "\n" + - _("Undo moves: ") + str(stats.undo_moves) + "\n" + - _("Bookmark moves: ") + str(gstats.goto_bookmark_moves) + "\n" + - _("Demo moves: ") + str(stats.demo_moves) + "\n" + - _("Total player moves: ") + str(stats.player_moves) + "\n" + - _("Total moves in this game: ") + str(stats.total_moves) + "\n" + - _("Hints: ") + str(stats.hints) + "\n" + - "\n" + - w1 + w2, - strings=(_("OK"), - (_("Statistics..."), 101), - (TOP_TITLE+"...", 105), ), - image=game.app.gimages.logos[3], - image_side="left", image_padx=20, - padx=20, separatorwidth=2) + MfxMessageDialog.__init__(self, parent, title=_("Game status"), + text=game.getTitleName() + "\n" + + game.getGameNumber(format=1) + "\n" + + _("Playing time: ") + game.getTime() + "\n" + + _("Started at: ") + date + "\n\n"+ + _("Moves: ") + str(game.moves.index) + "\n" + + _("Undo moves: ") + str(stats.undo_moves) + "\n" + + _("Bookmark moves: ") + str(gstats.goto_bookmark_moves) + "\n" + + _("Demo moves: ") + str(stats.demo_moves) + "\n" + + _("Total player moves: ") + str(stats.player_moves) + "\n" + + _("Total moves in this game: ") + str(stats.total_moves) + "\n" + + _("Hints: ") + str(stats.hints) + "\n" + + "\n" + + w1 + w2, + strings=(_("&OK"), + (_("&Statistics..."), 101), + (TOP_TITLE+"...", 105), ), + image=game.app.gimages.logos[3], + image_side="left", image_padx=20, + padx=20, + ) # /*********************************************************************** # // @@ -716,7 +715,7 @@ class Status_StatsDialog(MfxDialog): class _TopDialog(MfxDialog): def __init__(self, parent, title, top, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) @@ -773,7 +772,7 @@ class _TopDialog(MfxDialog): def initKw(self, kw): - kw = KwStruct(kw, strings=(_('OK'),), default=0, separatorwidth = 2) + kw = KwStruct(kw, strings=(_('&OK'),), default=0, separatorwidth=2) return MfxDialog.initKw(self, kw) @@ -781,7 +780,7 @@ class Top_StatsDialog(MfxDialog): def __init__(self, parent, title, app, player, gameid, **kw): self.app = app kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) @@ -857,8 +856,9 @@ class Top_StatsDialog(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_('OK'),), + strings=(_('&OK'),), default=0, image=self.app.gimages.logos[4], - separatorwidth = 2) + separatorwidth=2, + ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/tkutil.py b/pysollib/tk/tkutil.py index d728d33b..234b93c6 100644 --- a/pysollib/tk/tkutil.py +++ b/pysollib/tk/tkutil.py @@ -181,6 +181,10 @@ def makeHelpToplevel(app, title=None): window.option_add('*foreground', fg) window.option_add('*selectBackground', '#00008b', 50) window.option_add('*selectForeground', 'white', 50) + if os.name == "posix": + window.option_add('*Scrollbar.elementBorderWidth', '1', 60) + window.option_add('*Scrollbar.borderWidth', '1', 60) + if title: window.wm_title(title) window.wm_iconname(title) diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index ae5030ff..80a51ef8 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -33,7 +33,7 @@ ## ##---------------------------------------------------------------------------## -__all__ = ['MfxDialog', +__all__ = ['MfxMessageDialog', 'MfxExceptionDialog', 'MfxSimpleEntry', 'MfxTooltip', @@ -56,25 +56,30 @@ from tkutil import bind, unbind_destroy, makeImage from tkutil import makeToplevel, setTransient from tkcanvas import MfxCanvas + # /*********************************************************************** # // abstract base class for the dialogs in this module # ************************************************************************/ -class _ToplevelDialog: - img = None +class MfxDialog: # ex. _ToplevelDialog + img = {} + button_img = {} def __init__(self, parent, title="", resizable=0, default=-1): self.parent = parent self.status = 0 self.button = default self.timer = None + self.accel_keys = {} self.top = makeToplevel(parent, title=title) self.top.wm_resizable(resizable, resizable) ##w, h = self.top.winfo_screenwidth(), self.top.winfo_screenheight() ##self.top.wm_maxsize(w-4, h-32) bind(self.top, "WM_DELETE_WINDOW", self.wmDeleteWindow) + # def mainloop(self, focus=None, timeout=0): bind(self.top, "", self.mCancel) + bind(self.top, '', self.altKeyEvent) # for accelerators if focus is not None: focus.focus() setTransient(self.top, self.parent) @@ -131,31 +136,24 @@ class _ToplevelDialog: self.status = 2 raise SystemExit + def mDone(self, button): + self.button = button + raise SystemExit -# /*********************************************************************** -# // replacement for the tk_dialog script -# ************************************************************************/ + def altKeyEvent(self, event): + key = event.char.lower() + key = unicode(key, 'utf-8') + button = self.accel_keys.get(key) + if not button is None: + self.mDone(button) -class MfxDialog(_ToplevelDialog): - def __init__(self, parent, title, **kw): - kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) - top_frame, bottom_frame = self.createFrames(kw) - self.createBitmaps(top_frame, kw) - # - self.button = kw.default - msg = Tkinter.Label(top_frame, text=kw.text, justify=kw.justify, - width=kw.width) - msg.pack(fill=Tkinter.BOTH, expand=1, padx=kw.padx, pady=kw.pady) - # - focus = self.createButtons(bottom_frame, kw) - self.mainloop(focus, kw.timeout) def initKw(self, kw): kw = KwStruct(kw, timeout=0, resizable=0, text="", justify="center", - strings=(_("OK"),), default=0, + strings=(_("&OK"),), + default=0, width=0, padx=20, pady=20, bitmap=None, bitmap_side="left", @@ -170,27 +168,21 @@ class MfxDialog(_ToplevelDialog): def createFrames(self, kw): bottom_frame = Tkinter.Frame(self.top) - bottom_frame.pack(side=Tkinter.BOTTOM, fill=Tkinter.BOTH, ipady=3) + bottom_frame.pack(side='bottom', fill='both', expand=1, ipady=3) if kw.separatorwidth > 0: separator = Tkinter.Frame(self.top, relief="sunken", height=kw.separatorwidth, width=kw.separatorwidth, borderwidth=kw.separatorwidth / 2) - separator.pack(side=Tkinter.BOTTOM, fill=Tkinter.X) + separator.pack(side='bottom', fill='x') top_frame = Tkinter.Frame(self.top) - top_frame.pack(side=Tkinter.TOP, fill=Tkinter.BOTH, expand=1) + top_frame.pack(side='top', fill='both', expand=1) return top_frame, bottom_frame def createBitmaps(self, frame, kw): - bm = ["error", "info", "question", "warning"] - if kw.bitmap in bm: - img = None - if self.img: - img = self.img[bm.index(kw.bitmap)] + if kw.bitmap: ## in ("error", "info", "question", "warning") + img = self.img.get(kw.bitmap) b = Tkinter.Label(frame, image=img) b.pack(side=kw.bitmap_side, padx=kw.bitmap_padx, pady=kw.bitmap_pady) - elif kw.bitmap: - b = Tkinter.Label(frame, bitmap=kw.bitmap) - b.pack(side=kw.bitmap_side, padx=kw.bitmap_padx, pady=kw.bitmap_pady) elif kw.image: b = Tkinter.Label(frame, image=kw.image) b.pack(side=kw.image_side, padx=kw.image_padx, pady=kw.image_pady) @@ -206,6 +198,7 @@ class MfxDialog(_ToplevelDialog): if s: ##s = re.sub(r"[\s\.\,]", "", s) s = s.replace('...', '.') + s = s.replace('&', '') max_len = max(max_len, len(s)) ##print s, len(s) if max_len > 12 and os.name == 'posix': button_width = max_len @@ -213,6 +206,8 @@ class MfxDialog(_ToplevelDialog): elif max_len > 6 : button_width = max_len+2 else : button_width = 8 #print 'button_width =', button_width + # + # for s in kw.strings: xbutton = button = button + 1 if type(s) is types.TupleType: @@ -221,6 +216,8 @@ class MfxDialog(_ToplevelDialog): s = s[0] if s is None: continue + accel_indx = s.find('&') + s = s.replace('&', '') if button < 0: b = Tkinter.Button(frame, text=s, state="disabled") button = xbutton @@ -230,30 +227,54 @@ class MfxDialog(_ToplevelDialog): if button == kw.default: focus = b focus.config(default="active") - l = len(s) -## if 1 and l < max_len: -## l = l + (max_len - l) / 2 -## b.config(width=l) + # b.config(width=button_width) - column = column + 1 - b.grid_configure(column=column, row=0, sticky="ew", padx=padx, pady=pady) - b.grid_columnconfigure(column) + if accel_indx >= 0: + # key accelerator + b.config(underline=accel_indx) + key = s[accel_indx] + self.accel_keys[key.lower()] = button + # +## img = None +## if self.button_img: +## img = self.button_img.get(s) +## b.config(compound='left', image=img) + column += 1 + b.grid(column=column, row=0, sticky="nse", padx=padx, pady=pady) if focus is not None: l = (lambda event=None, self=self, button=kw.default: self.mDone(button)) bind(self.top, "", l) bind(self.top, "", l) + # left justify + ##frame.columnconfigure(0, weight=1) return focus - def mDone(self, button): - self.button = button - raise SystemExit + +# /*********************************************************************** +# // replacement for the tk_dialog script +# ************************************************************************/ + +class MfxMessageDialog(MfxDialog): + def __init__(self, parent, title, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.button = kw.default + msg = Tkinter.Label(top_frame, text=kw.text, justify=kw.justify, + width=kw.width) + msg.pack(fill=Tkinter.BOTH, expand=1, padx=kw.padx, pady=kw.pady) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) # /*********************************************************************** # // # ************************************************************************/ -class MfxExceptionDialog(MfxDialog): +class MfxExceptionDialog(MfxMessageDialog): def __init__(self, parent, ex, title="Error", **kw): kw = KwStruct(kw, bitmap="error") text = kw.get("text", "") @@ -265,7 +286,7 @@ class MfxExceptionDialog(MfxDialog): else: t = str(ex) kw.text = text + unicode(t, errors='replace') - apply(MfxDialog.__init__, (self, parent, title), kw.getKw()) + apply(MfxMessageDialog.__init__, (self, parent, title), kw.getKw()) # /*********************************************************************** @@ -275,7 +296,7 @@ class MfxExceptionDialog(MfxDialog): class MfxSimpleEntry(MfxDialog): def __init__(self, parent, title, label, value, **kw): kw = self.initKw(kw) - _ToplevelDialog.__init__(self, parent, title, kw.resizable, kw.default) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) # @@ -294,7 +315,7 @@ class MfxSimpleEntry(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("OK"), _("Cancel")), default=0, + strings=(_("&OK"), _("&Cancel")), default=0, separatorwidth = 0, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index 711ba3aa..b0e48703 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -220,7 +220,8 @@ class PysolToolbar(PysolToolbarActions): # (see also setRelief) if os.name == 'posix': #self.frame.config(bd=0, highlightthickness=1) - self.frame.config(bd=1, relief='raised', highlightthickness=0) + relief = self.button_relief == 'flat' and 'raised' or 'flat' + self.frame.config(bd=1, relief=relief, highlightthickness=0) elif os.name == "nt": self.frame.config(bd=2, relief="groove", padx=2, pady=2) #self._createSeparator(width=4, side=Tkinter.LEFT, relief=Tkinter.FLAT) diff --git a/scripts/all_games.py b/scripts/all_games.py index 2084532b..60686ea0 100755 --- a/scripts/all_games.py +++ b/scripts/all_games.py @@ -27,7 +27,7 @@ from pysollib.resource import CSI def getGameRulesFilename(n): if n.startswith('Mahjongg'): return 'mahjongg.html' - n = re.sub(r"[\[\(].*$", "", n) + ##n = re.sub(r"[\[\(].*$", "", n) n = latin1_to_ascii(n) n = re.sub(r"[^\w]", "", n) n = n.lower() + ".html" From 0c3f1915daa50d3247461573c250bd3ecbed2eba Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 9 Jun 2006 22:39:18 +0000 Subject: [PATCH 005/266] - added check of os.environ['LANG'] - fixed `win32_gethomedir' - minor changes of widgets style - other minor fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@5 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- Makefile | 2 ++ pysol | 2 +- pysollib/app.py | 2 +- pysollib/mfxutil.py | 3 +++ pysollib/tk/statusbar.py | 27 ++++++++++++--------------- pysollib/tk/tkwidget.py | 6 ++++-- pysollib/tk/toolbar.py | 17 ++++++++++------- scripts/build.bat | 2 +- scripts/create_iss.py | 4 +++- 9 files changed, 37 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index baae7118..44afc81e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,7 @@ # Makefile for PySolFC +override LANG=C + PYSOLLIB_FILES=pysollib/tk/*.py pysollib/*.py \ pysollib/games/*.py pysollib/games/special/*.py \ pysollib/games/contrib/*.py pysollib/games/ultra/*.py \ diff --git a/pysol b/pysol index b841ac68..77070ee1 100755 --- a/pysol +++ b/pysol @@ -38,7 +38,7 @@ import sys, os -if os.name == 'nt': +if os.name == 'nt' and not os.environ.has_key('LANG'): try: import locale l = locale.getdefaultlocale() diff --git a/pysollib/app.py b/pysollib/app.py index 5ea9c0f6..6b8bdabd 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -137,7 +137,7 @@ class Options: if os.name == 'posix': self.fonts["sans"] = ("helvetica", 12) if os.name == 'nt': - self.fonts["sans"] = ("times new roman", 14) + self.fonts["sans"] = ("times new roman", 12) self.fonts["fixed"] = ("courier new", 10) # colors self.table_color = "#008200" diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py index 412cbca3..94316078 100644 --- a/pysollib/mfxutil.py +++ b/pysollib/mfxutil.py @@ -204,6 +204,9 @@ def win32_getprefdir(package): def win32_gethomedir(): # %USERPROFILE%, %APPDATA% + hd = os.environ.get('APPDATA') + if hd: + return hd hd = os.path.expanduser('~') if hd == '~': # win9x return os.path.abspath('/') diff --git a/pysollib/tk/statusbar.py b/pysollib/tk/statusbar.py index e87947ac..7f0664cf 100644 --- a/pysollib/tk/statusbar.py +++ b/pysollib/tk/statusbar.py @@ -59,26 +59,24 @@ class MfxStatusbar: self._row = row self._column = column self._columnspan = columnspan - self.padx = 1 - self.pady = 2 # + self.padx = 1 self.frame = Tkinter.Frame(self.top, bd=1) self.frame.grid(row=self._row, column=self._column, columnspan=self._columnspan, sticky='ew', - padx=self.padx, pady=self.pady) + padx=1, pady=1) #if os.name == "mac": # Tkinter.Label(self.frame, width=2).pack(side='right') + if os.name == 'nt': + self.frame.config(relief='raised') + self.padx = 0 # util - def _createLabel(self, name, - text="", relief='sunken', - side='left', fill='none', - padx=-1, expand=0, width=0, + def _createLabel(self, name, side='left', + fill='none', expand=0, width=0, tooltip=None): - if padx < 0: padx = self.padx - label = Tkinter.Label(self.frame, text=text, - width=width, relief=relief, bd=1) - label.pack(side=side, fill=fill, padx=padx, expand=expand) + label = Tkinter.Label(self.frame, width=width, relief='sunken', bd=1) + label.pack(side=side, fill=fill, padx=self.padx, expand=expand) setattr(self, name + "_label", label) self._widgets.append(label) if tooltip: @@ -150,15 +148,14 @@ class HelpStatusbar(MfxStatusbar): def __init__(self, top): MfxStatusbar.__init__(self, top, row=4, column=0, columnspan=3) l = self._createLabel("info", fill='both', expand=1) - l.config(text="", justify="left", anchor='w', padx=8) + l.config(justify="left", anchor='w', padx=8) class HtmlStatusbar(MfxStatusbar): def __init__(self, top, row, column, columnspan): - MfxStatusbar.__init__(self, top, - row=row, column=column, columnspan=columnspan) + MfxStatusbar.__init__(self, top, row=row, column=column, columnspan=columnspan) l = self._createLabel("url", fill='both', expand=1) - l.config(text="", justify="left", anchor='w', padx=8) + l.config(justify="left", anchor='w', padx=8) # /*********************************************************************** diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 80a51ef8..ca288979 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -141,8 +141,9 @@ class MfxDialog: # ex. _ToplevelDialog raise SystemExit def altKeyEvent(self, event): - key = event.char.lower() + key = event.char key = unicode(key, 'utf-8') + key = key.lower() button = self.accel_keys.get(key) if not button is None: self.mDone(button) @@ -197,7 +198,8 @@ class MfxDialog: # ex. _ToplevelDialog s = s[0] if s: ##s = re.sub(r"[\s\.\,]", "", s) - s = s.replace('...', '.') + #if os.name == 'posix': + # s = s.replace('...', '.') s = s.replace('&', '') max_len = max(max_len, len(s)) ##print s, len(s) diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index b0e48703..f717603a 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -220,10 +220,9 @@ class PysolToolbar(PysolToolbarActions): # (see also setRelief) if os.name == 'posix': #self.frame.config(bd=0, highlightthickness=1) - relief = self.button_relief == 'flat' and 'raised' or 'flat' - self.frame.config(bd=1, relief=relief, highlightthickness=0) + self.frame.config(bd=1, relief=self.frame_relief, highlightthickness=0) elif os.name == "nt": - self.frame.config(bd=2, relief="groove", padx=2, pady=2) + self.frame.config(bd=2, relief=self.frame_relief, padx=2, pady=2) #self._createSeparator(width=4, side=Tkinter.LEFT, relief=Tkinter.FLAT) #self._createSeparator(width=4, side=Tkinter.RIGHT, relief=Tkinter.FLAT) else: @@ -267,9 +266,16 @@ class PysolToolbar(PysolToolbarActions): relief = 'flat' self.button_relief = relief if relief == 'raised': + self.frame_relief = 'flat' self.separator_relief = 'flat' + if os.name == 'nt': + self.frame_relief = 'groove' else: + self.frame_relief = 'raised' self.separator_relief = 'sunken' #'raised' + if os.name == 'nt': + self.frame_relief = 'groove' + self.separator_relief = 'groove' return relief # util @@ -465,10 +471,7 @@ class PysolToolbar(PysolToolbarActions): if self.button_relief == relief: return False self._setRelief(relief) - if os.name == 'posix': - relief = self.button_relief == 'flat' and 'raised' or 'flat' - self.frame.config(relief=relief) - #self.frame.config(relief=self.separator_relief) + self.frame.config(relief=self.frame_relief) for w in self._widgets: if isinstance(w, ToolbarButton): w.config(relief=self.button_relief) diff --git a/scripts/build.bat b/scripts/build.bat index b5c9c0de..3b1f4879 100755 --- a/scripts/build.bat +++ b/scripts/build.bat @@ -4,7 +4,7 @@ cd .. rm -rf dist mkdir dist cp -r locale dist -cp freecell-solver\freecell-solver-2.8.6-bin\fc-solve.exe dist +cp fc-solve.exe dist python setup.py py2exe python scripts\create_iss.py "d:\Program Files\Inno Setup 5\ISCC.exe" setup.iss diff --git a/scripts/create_iss.py b/scripts/create_iss.py index 80fbcbf0..52d8db50 100755 --- a/scripts/create_iss.py +++ b/scripts/create_iss.py @@ -1,7 +1,6 @@ #!/usr/bin/env python prog_name = 'PySol Fan Club edition' -prog_version = '0.9.0' import os @@ -12,6 +11,9 @@ for root, dirs, files in os.walk('dist'): files_list.append(root) dirs_list.append(root) +execfile(os.path.join('pysollib', 'version.py')) +prog_version = FC_VERSION + out = open('setup.iss', 'w') print >> out, ''' From 314f1a54b66c7720c8e89e42919ce6d436eb3925 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 10 Jun 2006 21:21:22 +0000 Subject: [PATCH 006/266] - updated russian translation - added customization of sound-samples - improved soundoptionsdialog git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@7 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/games.pot | 5 +- po/pysol.pot | 294 ++++++++++++++-------------- po/ru_games.po | 123 +++++------- po/ru_pysol.po | 314 +++++++++++++++--------------- pysollib/actions.py | 38 ++-- pysollib/app.py | 28 +++ pysollib/game.py | 12 +- pysollib/tk/menubar.py | 6 +- pysollib/tk/soundoptionsdialog.py | 144 +++++++++----- pysollib/tk/tkwidget.py | 2 +- 10 files changed, 503 insertions(+), 463 deletions(-) diff --git a/po/games.pot b/po/games.pot index cf68fcf9..b7c609f4 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Jun 6 02:20:52 2006\n" +"POT-Creation-Date: Sun Jun 11 00:30:03 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -939,6 +939,9 @@ msgstr "" msgid "Grampus" msgstr "" +msgid "Granada" +msgstr "" + msgid "Grandfather" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index e1d7e6e9..62f17f65 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Tue Jun 6 02:20:47 2006\n" +"POT-Creation-Date: Sun Jun 11 00:29:57 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -19,8 +19,8 @@ msgstr "" msgid "New game" msgstr "" -#: pysollib/actions.py:357 pysollib/tk/menubar.py:667 -#: pysollib/tk/menubar.py:681 +#: pysollib/actions.py:357 pysollib/tk/menubar.py:665 +#: pysollib/tk/menubar.py:679 msgid "Select game" msgstr "" @@ -52,34 +52,34 @@ msgstr "" msgid "&Next number" msgstr "" -#: pysollib/actions.py:409 pysollib/app.py:1090 pysollib/app.py:1102 -#: pysollib/game.py:828 pysollib/game.py:1642 pysollib/main.py:413 +#: pysollib/actions.py:409 pysollib/app.py:1118 pysollib/app.py:1130 +#: pysollib/game.py:830 pysollib/game.py:1644 pysollib/main.py:413 #: pysollib/main.py:421 pysollib/tk/colorsdialog.py:131 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 #: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:133 -#: pysollib/tk/playeroptionsdialog.py:86 -#: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 +#: pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 -#: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:158 +#: pysollib/tk/soundoptionsdialog.py:169 pysollib/tk/soundoptionsdialog.py:223 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:459 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:571 #: pysollib/tk/tkstats.py:645 pysollib/tk/tkstats.py:661 #: pysollib/tk/tkstats.py:703 pysollib/tk/tkstats.py:775 -#: pysollib/tk/tkstats.py:859 pysollib/tk/tkwidget.py:159 -#: pysollib/tk/tkwidget.py:312 +#: pysollib/tk/tkstats.py:859 pysollib/tk/tkwidget.py:156 +#: pysollib/tk/tkwidget.py:320 msgid "&OK" msgstr "" -#: pysollib/actions.py:409 pysollib/app.py:1102 pysollib/game.py:828 -#: pysollib/game.py:1205 pysollib/game.py:1220 pysollib/game.py:1226 -#: pysollib/game.py:1231 pysollib/tk/colorsdialog.py:131 +#: pysollib/actions.py:409 pysollib/app.py:1130 pysollib/game.py:830 +#: pysollib/game.py:1207 pysollib/game.py:1222 pysollib/game.py:1228 +#: pysollib/game.py:1233 pysollib/tk/colorsdialog.py:131 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 -#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:854 -#: pysollib/tk/menubar.py:856 pysollib/tk/playeroptionsdialog.py:86 -#: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 +#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:852 +#: pysollib/tk/menubar.py:854 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectgame.py:268 pysollib/tk/selectgame.py:409 -#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:106 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:312 +#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:169 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:320 msgid "&Cancel" msgstr "" @@ -125,7 +125,7 @@ msgstr "" msgid "Error while writing to file" msgstr "" -#: pysollib/actions.py:616 pysollib/actions.py:652 pysollib/actions.py:941 +#: pysollib/actions.py:616 pysollib/actions.py:652 msgid " Info" msgstr "" @@ -236,37 +236,27 @@ msgstr "" msgid "Set timeouts" msgstr "" -#: pysollib/actions.py:938 -msgid "Error while saving options" -msgstr "" - -#: pysollib/actions.py:942 -msgid "" -"Options were saved to\n" -"\n" -msgstr "" - #: pysollib/app.py:86 msgid "Unknown" msgstr "" -#: pysollib/app.py:952 +#: pysollib/app.py:980 msgid "Loading %s %s..." msgstr "" -#: pysollib/app.py:987 +#: pysollib/app.py:1015 msgid " load error" msgstr "" -#: pysollib/app.py:988 +#: pysollib/app.py:1016 msgid "Error while loading " msgstr "" -#: pysollib/app.py:1082 +#: pysollib/app.py:1110 msgid "Incompatible " msgstr "" -#: pysollib/app.py:1084 +#: pysollib/app.py:1112 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -275,7 +265,7 @@ msgid "" "Please select a %s type %s.\n" msgstr "" -#: pysollib/app.py:1100 +#: pysollib/app.py:1128 msgid "Please select a %s type %s" msgstr "" @@ -284,48 +274,48 @@ msgid "" "Player\n" msgstr "" -#: pysollib/game.py:824 +#: pysollib/game.py:826 msgid "Discard current game ?" msgstr "" -#: pysollib/game.py:1159 +#: pysollib/game.py:1161 msgid "" "\n" "You have reached\n" "#%d in the %s of playing time" msgstr "" -#: pysollib/game.py:1162 +#: pysollib/game.py:1164 msgid "" "\n" "and #%d in the %s of moves" msgstr "" -#: pysollib/game.py:1164 +#: pysollib/game.py:1166 msgid "" "\n" "You have reached\n" "#%d in the %s of moves" msgstr "" -#: pysollib/game.py:1167 +#: pysollib/game.py:1169 msgid "" "\n" "and #%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1169 +#: pysollib/game.py:1171 msgid "" "\n" "You have reached\n" "#%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1196 pysollib/game.py:1212 +#: pysollib/game.py:1198 pysollib/game.py:1214 msgid "Game won" msgstr "" -#: pysollib/game.py:1197 +#: pysollib/game.py:1199 msgid "" "\n" "Congratulations, this\n" @@ -336,12 +326,12 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1205 pysollib/game.py:1220 pysollib/game.py:1226 -#: pysollib/game.py:1231 pysollib/tk/menubar.py:250 +#: pysollib/game.py:1207 pysollib/game.py:1222 pysollib/game.py:1228 +#: pysollib/game.py:1233 pysollib/tk/menubar.py:250 msgid "&New game" msgstr "" -#: pysollib/game.py:1213 +#: pysollib/game.py:1215 msgid "" "\n" "Congratulations, you did it !\n" @@ -351,99 +341,99 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1224 pysollib/game.py:1229 +#: pysollib/game.py:1226 pysollib/game.py:1231 msgid "Game finished" msgstr "" -#: pysollib/game.py:1225 pysollib/game.py:1643 +#: pysollib/game.py:1227 pysollib/game.py:1645 msgid "" "\n" "Game finished\n" msgstr "" -#: pysollib/game.py:1230 +#: pysollib/game.py:1232 msgid "" "\n" "Game finished, but not without my help...\n" msgstr "" -#: pysollib/game.py:1231 +#: pysollib/game.py:1233 msgid "&Restart" msgstr "" -#: pysollib/game.py:1535 +#: pysollib/game.py:1537 msgid "Score %6d" msgstr "" -#: pysollib/game.py:1634 +#: pysollib/game.py:1636 msgid "&Cool" msgstr "" -#: pysollib/game.py:1634 +#: pysollib/game.py:1636 msgid "&Great" msgstr "" -#: pysollib/game.py:1634 +#: pysollib/game.py:1636 msgid "&Wow" msgstr "" -#: pysollib/game.py:1634 +#: pysollib/game.py:1636 msgid "&Yeah" msgstr "" -#: pysollib/game.py:1635 pysollib/game.py:1646 pysollib/game.py:1658 +#: pysollib/game.py:1637 pysollib/game.py:1648 pysollib/game.py:1660 msgid " Autopilot" msgstr "" -#: pysollib/game.py:1636 +#: pysollib/game.py:1638 msgid "" "\n" "Game solved in %d moves.\n" msgstr "" -#: pysollib/game.py:1657 +#: pysollib/game.py:1659 msgid "&Hmm" msgstr "" -#: pysollib/game.py:1657 +#: pysollib/game.py:1659 msgid "&Oh well" msgstr "" -#: pysollib/game.py:1657 +#: pysollib/game.py:1659 msgid "&That's life" msgstr "" -#: pysollib/game.py:1659 +#: pysollib/game.py:1661 msgid "" "\n" "This won't come out...\n" msgstr "" -#: pysollib/game.py:2063 +#: pysollib/game.py:2065 msgid "Set bookmark" msgstr "" -#: pysollib/game.py:2064 +#: pysollib/game.py:2066 msgid "Replace existing bookmark %d ?" msgstr "" -#: pysollib/game.py:2086 +#: pysollib/game.py:2088 msgid "Goto bookmark" msgstr "" -#: pysollib/game.py:2087 +#: pysollib/game.py:2089 msgid "Goto bookmark %d ?" msgstr "" -#: pysollib/game.py:2118 +#: pysollib/game.py:2120 msgid "Open game" msgstr "" -#: pysollib/game.py:2129 pysollib/game.py:2138 pysollib/game.py:2143 +#: pysollib/game.py:2131 pysollib/game.py:2140 pysollib/game.py:2145 msgid "Load game error" msgstr "" -#: pysollib/game.py:2130 +#: pysollib/game.py:2132 msgid "" "Error while loading game.\n" "\n" @@ -451,22 +441,22 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2139 +#: pysollib/game.py:2141 msgid "Error while loading game" msgstr "" -#: pysollib/game.py:2144 +#: pysollib/game.py:2146 msgid "" "Internal error while loading game.\n" "\n" "Please report this bug." msgstr "" -#: pysollib/game.py:2169 +#: pysollib/game.py:2171 msgid "Save game error" msgstr "" -#: pysollib/game.py:2170 +#: pysollib/game.py:2172 msgid "Error while saving game" msgstr "" @@ -1741,72 +1731,72 @@ msgstr "" msgid "Free cell." msgstr "" -#: pysollib/stats.py:120 pysollib/tk/tkstats.py:78 +#: pysollib/stats.py:118 pysollib/tk/tkstats.py:78 msgid "Demo games" msgstr "" -#: pysollib/stats.py:121 +#: pysollib/stats.py:119 msgid "Played" msgstr "" -#: pysollib/stats.py:122 pysollib/stats.py:202 +#: pysollib/stats.py:120 pysollib/stats.py:200 msgid "Won" msgstr "" -#: pysollib/stats.py:123 pysollib/stats.py:202 +#: pysollib/stats.py:121 pysollib/stats.py:200 msgid "Lost" msgstr "" -#: pysollib/stats.py:124 pysollib/tk/statusbar.py:137 +#: pysollib/stats.py:122 pysollib/tk/statusbar.py:135 msgid "Playing time" msgstr "" -#: pysollib/stats.py:125 +#: pysollib/stats.py:123 msgid "Moves" msgstr "" -#: pysollib/stats.py:126 +#: pysollib/stats.py:124 msgid "% won" msgstr "" -#: pysollib/stats.py:155 +#: pysollib/stats.py:153 msgid "Total (%d out of %d games)" msgstr "" -#: pysollib/stats.py:164 +#: pysollib/stats.py:162 msgid "Game" msgstr "" -#: pysollib/stats.py:164 +#: pysollib/stats.py:162 msgid "Status" msgstr "" -#: pysollib/stats.py:164 pysollib/tk/statusbar.py:139 +#: pysollib/stats.py:162 pysollib/tk/statusbar.py:137 #: pysollib/tk/tkstats.py:733 msgid "Game number" msgstr "" -#: pysollib/stats.py:164 pysollib/tk/tkstats.py:736 +#: pysollib/stats.py:162 pysollib/tk/tkstats.py:736 msgid "Started at" msgstr "" -#: pysollib/stats.py:187 +#: pysollib/stats.py:185 msgid "** UNKNOWN %d **" msgstr "" -#: pysollib/stats.py:195 +#: pysollib/stats.py:193 msgid "** ERROR **" msgstr "" -#: pysollib/stats.py:202 +#: pysollib/stats.py:200 msgid "Loaded" msgstr "" -#: pysollib/stats.py:202 +#: pysollib/stats.py:200 msgid "Not won" msgstr "" -#: pysollib/stats.py:202 +#: pysollib/stats.py:200 msgid "Perfect" msgstr "" @@ -2155,198 +2145,198 @@ msgstr "" msgid "&Sound" msgstr "" -#: pysollib/tk/menubar.py:351 +#: pysollib/tk/menubar.py:349 msgid "Cards&et..." msgstr "" -#: pysollib/tk/menubar.py:352 +#: pysollib/tk/menubar.py:350 msgid "Table t&ile..." msgstr "" -#: pysollib/tk/menubar.py:354 +#: pysollib/tk/menubar.py:352 msgid "Card &background" msgstr "" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:353 msgid "Card &view" msgstr "" -#: pysollib/tk/menubar.py:356 +#: pysollib/tk/menubar.py:354 msgid "Card shado&w" msgstr "" -#: pysollib/tk/menubar.py:357 +#: pysollib/tk/menubar.py:355 msgid "Shade &legal moves" msgstr "" -#: pysollib/tk/menubar.py:358 +#: pysollib/tk/menubar.py:356 msgid "&Negative card bottom" msgstr "" -#: pysollib/tk/menubar.py:359 +#: pysollib/tk/menubar.py:357 msgid "A&nimations" msgstr "" -#: pysollib/tk/menubar.py:360 +#: pysollib/tk/menubar.py:358 msgid "&None" msgstr "" -#: pysollib/tk/menubar.py:361 +#: pysollib/tk/menubar.py:359 msgid "&Timer based" msgstr "" -#: pysollib/tk/menubar.py:362 +#: pysollib/tk/menubar.py:360 msgid "&Fast" msgstr "" -#: pysollib/tk/menubar.py:363 +#: pysollib/tk/menubar.py:361 msgid "&Slow" msgstr "" -#: pysollib/tk/menubar.py:364 +#: pysollib/tk/menubar.py:362 msgid "&Very slow" msgstr "" -#: pysollib/tk/menubar.py:365 +#: pysollib/tk/menubar.py:363 msgid "Stick&y mouse" msgstr "" -#: pysollib/tk/menubar.py:367 +#: pysollib/tk/menubar.py:365 msgid "&Fonts..." msgstr "" -#: pysollib/tk/menubar.py:368 +#: pysollib/tk/menubar.py:366 msgid "&Colors..." msgstr "" -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:367 msgid "Time&outs..." msgstr "" -#: pysollib/tk/menubar.py:371 +#: pysollib/tk/menubar.py:369 msgid "&Toolbar" msgstr "" -#: pysollib/tk/menubar.py:373 +#: pysollib/tk/menubar.py:371 msgid "Stat&usbar" msgstr "" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:372 msgid "Show &statusbar" msgstr "" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:373 msgid "Show &number of cards" msgstr "" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:374 msgid "Show &help bar" msgstr "" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:375 msgid "&Demo logo" msgstr "" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:376 msgid "Startup splash sc&reen" msgstr "" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:380 msgid "&Help" msgstr "" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:381 msgid "&Contents" msgstr "" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:382 msgid "&How to play" msgstr "" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:383 msgid "&Rules for this game" msgstr "" -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:384 msgid "&License terms" msgstr "" -#: pysollib/tk/menubar.py:389 +#: pysollib/tk/menubar.py:387 msgid "&About " msgstr "" -#: pysollib/tk/menubar.py:497 +#: pysollib/tk/menubar.py:495 msgid "All &games..." msgstr "" -#: pysollib/tk/menubar.py:498 +#: pysollib/tk/menubar.py:496 msgid "Playable pre&view..." msgstr "" -#: pysollib/tk/menubar.py:500 +#: pysollib/tk/menubar.py:498 msgid "&Popular games" msgstr "" -#: pysollib/tk/menubar.py:503 +#: pysollib/tk/menubar.py:501 msgid "&French games" msgstr "" -#: pysollib/tk/menubar.py:506 +#: pysollib/tk/menubar.py:504 msgid "&Mahjongg games" msgstr "" -#: pysollib/tk/menubar.py:509 +#: pysollib/tk/menubar.py:507 msgid "&Oriental games" msgstr "" -#: pysollib/tk/menubar.py:513 +#: pysollib/tk/menubar.py:511 msgid "&Special games" msgstr "" -#: pysollib/tk/menubar.py:517 +#: pysollib/tk/menubar.py:515 msgid "All games by name" msgstr "" -#: pysollib/tk/menubar.py:854 pysollib/tk/menubar.py:856 +#: pysollib/tk/menubar.py:852 pysollib/tk/menubar.py:854 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "" -#: pysollib/tk/menubar.py:856 +#: pysollib/tk/menubar.py:854 msgid "&Info..." msgstr "" -#: pysollib/tk/menubar.py:859 +#: pysollib/tk/menubar.py:857 msgid "Select " msgstr "" -#: pysollib/tk/menubar.py:919 +#: pysollib/tk/menubar.py:917 msgid "Select table background" msgstr "" -#: pysollib/tk/menubar.py:931 pysollib/tk/selecttile.py:177 +#: pysollib/tk/menubar.py:929 pysollib/tk/selecttile.py:177 msgid "Select table color" msgstr "" -#: pysollib/tk/playeroptionsdialog.py:113 +#: pysollib/tk/playeroptionsdialog.py:112 msgid "" "\n" "Please enter your name" msgstr "" -#: pysollib/tk/playeroptionsdialog.py:121 +#: pysollib/tk/playeroptionsdialog.py:120 msgid "Select..." msgstr "" -#: pysollib/tk/playeroptionsdialog.py:125 +#: pysollib/tk/playeroptionsdialog.py:124 msgid "Confirm quit" msgstr "" -#: pysollib/tk/playeroptionsdialog.py:129 +#: pysollib/tk/playeroptionsdialog.py:128 msgid "Update statistics and logs" msgstr "" -#: pysollib/tk/playeroptionsdialog.py:146 +#: pysollib/tk/playeroptionsdialog.py:145 msgid "Select name" msgstr "" @@ -2681,45 +2671,49 @@ msgstr "" msgid "&Solid color..." msgstr "" -#: pysollib/tk/soundoptionsdialog.py:76 +#: pysollib/tk/soundoptionsdialog.py:111 msgid "Sound enabled" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:82 +#: pysollib/tk/soundoptionsdialog.py:117 msgid "Use DirectX for sound playing" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:88 -msgid "Sample volume" +#: pysollib/tk/soundoptionsdialog.py:123 +msgid "Sample volume:" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:94 -msgid "Music volume" +#: pysollib/tk/soundoptionsdialog.py:131 +msgid "Music volume:" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:106 +#: pysollib/tk/soundoptionsdialog.py:144 +msgid "Enable samles" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:169 msgid "&Apply" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:108 +#: pysollib/tk/soundoptionsdialog.py:169 pysollib/tk/soundoptionsdialog.py:171 msgid "&Mixer..." msgstr "" -#: pysollib/tk/soundoptionsdialog.py:155 +#: pysollib/tk/soundoptionsdialog.py:220 msgid "Sound preferences info" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:156 +#: pysollib/tk/soundoptionsdialog.py:221 msgid "" "Changing DirectX settings will take effect\n" "the next time you restart " msgstr "" -#: pysollib/tk/statusbar.py:138 +#: pysollib/tk/statusbar.py:136 msgid "Moves/Total moves" msgstr "" -#: pysollib/tk/statusbar.py:140 +#: pysollib/tk/statusbar.py:138 msgid "Games played: won/lost" msgstr "" @@ -3041,7 +3035,7 @@ msgstr "" msgid "Player options" msgstr "" -#: pysollib/tk/toolbar.py:429 +#: pysollib/tk/toolbar.py:435 msgid "Toolbar" msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 0a209d3b..8c5b3024 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Jun 6 02:20:52 2006\n" -"PO-Revision-Date: 2006-06-03 03:28+0400\n" +"POT-Creation-Date: Sun Jun 11 00:30:03 2006\n" +"PO-Revision-Date: 2006-06-10 11:07+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -81,9 +81,8 @@ msgstr "Аляска" msgid "Algerian Patience" msgstr "Алжирский пасьянс" -#, fuzzy msgid "Algerian Patience (3 decks)" -msgstr "Алжирский пасьянс" +msgstr "Алжирский пасьянс (3 колоды)" msgid "Alhambra" msgstr "Алхамбра" @@ -148,13 +147,11 @@ msgstr "Старые добрые времена" msgid "Aunt Mary" msgstr "" -#, fuzzy msgid "Australian Patience" -msgstr "Русский пасьянс" +msgstr "Австралийский пасьянс" -#, fuzzy msgid "Baby Spiderette" -msgstr "Паучок" +msgstr "Крошка Паучок" msgid "Backbone" msgstr "Основа" @@ -191,9 +188,8 @@ msgstr "Летучая мышь" msgid "Batsford" msgstr "Бетсфорд" -#, fuzzy msgid "Bavarian Patience" -msgstr "Алжирский пасьянс" +msgstr "Баварский пасьянс" msgid "Beak and Flipper" msgstr "Клюв и ласты" @@ -233,20 +229,18 @@ msgstr "Большая гора" msgid "Big Spider" msgstr "Большой паук" -#, fuzzy msgid "Big Spider (1 suit)" -msgstr "Паук (1 масть)" +msgstr "Большой Паук (1 масть)" -#, fuzzy msgid "Big Spider (2 suits)" -msgstr "Паук (2 масти)" +msgstr "Большой Паук (2 масти)" #, fuzzy msgid "Big Sumo" msgstr "Большая дыра" msgid "Bim Bom" -msgstr "" +msgstr "Бим-Бом" msgid "Bisley" msgstr "Бисли" @@ -319,9 +313,8 @@ msgstr "Бристоль" msgid "British Constitution" msgstr "Британская конституция" -#, fuzzy msgid "British Square" -msgstr "Восемь квадратов" +msgstr "Британский квадрат" msgid "Brunswick" msgstr "Брюнсвик" @@ -519,9 +512,8 @@ msgstr "Дашаватара" msgid "Dead King Golf" msgstr "Гольф Смертельный Король" -#, fuzzy msgid "Deep" -msgstr "Глубокий колодец" +msgstr "Глубокий" msgid "Deep Well" msgstr "Глубокий колодец" @@ -598,9 +590,8 @@ msgstr "Двойной Кенфилд" msgid "Double Cockroach" msgstr "Двойной таракан" -#, fuzzy msgid "Double Dot" -msgstr "Дубликаты" +msgstr "Двоеточие" msgid "Double Drawbridge" msgstr "Двойной разводной мост" @@ -842,7 +833,7 @@ msgstr "Крепостные башни" #, fuzzy msgid "Fortune's Favor" -msgstr "Судьба" +msgstr "Благосклонность фортуны" msgid "Fortunes" msgstr "Судьба" @@ -853,9 +844,8 @@ msgstr "Сорок разбойников" msgid "Forty and Eight" msgstr "Сорок и восемь" -#, fuzzy msgid "Four Colours" -msgstr "Четырёхлистный клевер" +msgstr "Четыре цвета" msgid "Four Kings" msgstr "Четыре короля" @@ -875,13 +865,11 @@ msgstr "Четыре ветра" msgid "Fourteen" msgstr "Четырнадцать" -#, fuzzy msgid "Fred's Spider" -msgstr "Смягчённый Паук" +msgstr "Паук Фреда" -#, fuzzy msgid "Fred's Spider (3 decks)" -msgstr "Церлин (3 колоды)" +msgstr "Паук Фреда (3 колоды)" msgid "Free Fan" msgstr "Свободный веер" @@ -946,9 +934,8 @@ msgstr "Происхождение" msgid "Genesis +" msgstr "Происхождение +" -#, fuzzy msgid "German Patience" -msgstr "Алжирский пасьянс" +msgstr "Германский пасьянс" msgid "Ghulam" msgstr "" @@ -980,6 +967,10 @@ msgstr "Полная мера" msgid "Grampus" msgstr "Касатка" +#, fuzzy +msgid "Granada" +msgstr "Алмаз" + msgid "Grandfather" msgstr "Дедушка" @@ -1010,9 +1001,8 @@ msgstr "Повод для разрыва" msgid "Ground for a Divorce (3 decks)" msgstr "Повод для разрыва (3 колоды)" -#, fuzzy msgid "Ground for a Divorce (4 decks)" -msgstr "Повод для разрыва (3 колоды)" +msgstr "Повод для разрыва (4 колоды)" msgid "Gypsy" msgstr "Цыганский" @@ -1124,9 +1114,8 @@ msgstr "" msgid "Indian" msgstr "Индийский" -#, fuzzy msgid "Indian Patience" -msgstr "Русский пасьянс" +msgstr "Индийский пасьянс" msgid "Inner Circle" msgstr "Внутренний круг" @@ -1364,9 +1353,8 @@ msgstr "Ограниченный" msgid "Lion" msgstr "Лион" -#, fuzzy msgid "Little Billie" -msgstr "Малые ворота" +msgstr "Малыш Билли" #, fuzzy msgid "Little Easy" @@ -1960,9 +1948,8 @@ msgstr "Марта" msgid "Matriarchy" msgstr "Матриархат" -#, fuzzy msgid "Matrimony" -msgstr "Матриархат" +msgstr "Супружество" msgid "MatsuKiri" msgstr "" @@ -2001,17 +1988,14 @@ msgstr "" msgid "Midshipman" msgstr "Гардемарин" -#, fuzzy msgid "Milligan Cell" -msgstr "Мисс Миллиган" +msgstr "Ячейка Миллиган" -#, fuzzy msgid "Milligan Harp" -msgstr "Большая арфа" +msgstr "Арфа Миллиган" -#, fuzzy msgid "Minerva" -msgstr "Джунгли" +msgstr "Минерва" #, fuzzy msgid "Mini Traditional" @@ -2100,7 +2084,6 @@ msgstr "Изгнание Наполеона" msgid "Napoleon's Favorite" msgstr "Фаворит Наполеона" -#, fuzzy msgid "Napoleon's Flank" msgstr "Фланг Наполеона" @@ -2157,9 +2140,8 @@ msgstr "Номер десять" msgid "Numerica" msgstr "Числовой" -#, fuzzy msgid "Octagon" -msgstr "Дракон" +msgstr "Восьмиугольник" msgid "Octave" msgstr "Восемь" @@ -2198,12 +2180,11 @@ msgstr "Открытый гигант" msgid "Open Peek" msgstr "" -#, fuzzy msgid "Open Spider" -msgstr "Паук" +msgstr "Открытый паук" msgid "Opus" -msgstr "" +msgstr "Опус" msgid "Orbital" msgstr "Орбитальный" @@ -2248,9 +2229,8 @@ msgstr "Сольный танец" msgid "Pas de Deux" msgstr "Па-де-де" -#, fuzzy msgid "Patriarchs" -msgstr "Матриархат" +msgstr "Патриархи" msgid "Pattern" msgstr "Образец" @@ -2302,7 +2282,7 @@ msgstr "Картинная галерея" #, fuzzy msgid "Pigtail" -msgstr "Портал" +msgstr "Косичка" msgid "PileOn" msgstr "" @@ -2344,9 +2324,8 @@ msgstr "Припасы" msgid "Push Pin" msgstr "Пуш-пин" -#, fuzzy msgid "Puss in the Corner" -msgstr "Дом в лесу" +msgstr "Кошка в углу" msgid "Pyramid" msgstr "Пирамида" @@ -2400,9 +2379,8 @@ msgstr "Овен" msgid "Rambling" msgstr "Бродячий" -#, fuzzy msgid "Rangoon" -msgstr "Дракон" +msgstr "Рангун" msgid "Rank and File" msgstr "Ряд и шеренга" @@ -2413,9 +2391,8 @@ msgstr "Крыса" msgid "Raw Prawn" msgstr "" -#, fuzzy msgid "Realm" -msgstr "Овен" +msgstr "Царство" msgid "Rectangle" msgstr "Прямоугольник" @@ -2448,7 +2425,7 @@ msgid "Relaxed Spider" msgstr "Смягчённый Паук" msgid "Repair" -msgstr "" +msgstr "Ремонт" msgid "Retinue" msgstr "Свита" @@ -2465,9 +2442,8 @@ msgstr "Риттенхаус" msgid "River Bridge" msgstr "Мост через реку" -#, fuzzy msgid "Robert" -msgstr "Ракета" +msgstr "Роберт" msgid "Robin" msgstr "Робин" @@ -2732,13 +2708,11 @@ msgstr "Паук (1 масть)" msgid "Spider (2 suits)" msgstr "Паук (2 масти)" -#, fuzzy msgid "Spider (4 decks)" -msgstr "Паук (1 масть)" +msgstr "Паук (4 колоды)" -#, fuzzy msgid "Spider 3x3" -msgstr "Паук" +msgstr "Паук 3x3" msgid "Spider Web" msgstr "Паутина" @@ -2754,9 +2728,8 @@ msgstr "Паучок" msgid "Spidike" msgstr "Паук" -#, fuzzy msgid "Squadron" -msgstr "Квадрат" +msgstr "Эскадрон" msgid "Square" msgstr "Квадрат" @@ -2863,9 +2836,8 @@ msgstr "" msgid "Superior Canfield" msgstr "Двойной Кенфилд" -#, fuzzy msgid "Surprise" -msgstr "Предприятие" +msgstr "Сюрприз" msgid "Surukh" msgstr "" @@ -3027,19 +2999,17 @@ msgstr "Тройной Клондайк" msgid "Triple Klondike by Threes" msgstr "Тройной Клондайк по три" -#, fuzzy msgid "Triple Line" -msgstr "Тройной Юкон" +msgstr "Тройная линия" -#, fuzzy msgid "Triple York" -msgstr "Тройной Юкон" +msgstr "Тройной Йорк" msgid "Triple Yukon" msgstr "Тройной Юкон" msgid "Twenty" -msgstr "" +msgstr "Двенадцать" msgid "Twin" msgstr "" @@ -3165,9 +3135,8 @@ msgstr "Маджонг X-Files" msgid "X-Shape" msgstr "Маджонг X-Shape" -#, fuzzy msgid "York" -msgstr "Нью-Йорк" +msgstr "Йорк" msgid "Yukon" msgstr "Юкон" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index c51e0a27..cdafff22 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Jun 6 02:20:47 2006\n" -"PO-Revision-Date: 2006-06-06 09:08+0400\n" +"POT-Creation-Date: Sun Jun 11 00:29:57 2006\n" +"PO-Revision-Date: 2006-06-11 00:32+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -18,8 +18,8 @@ msgstr "" msgid "New game" msgstr "Новая игра" -#: pysollib/actions.py:357 pysollib/tk/menubar.py:667 -#: pysollib/tk/menubar.py:681 +#: pysollib/actions.py:357 pysollib/tk/menubar.py:665 +#: pysollib/tk/menubar.py:679 msgid "Select game" msgstr "Выбрать игру" @@ -53,34 +53,34 @@ msgstr "" msgid "&Next number" msgstr "&Следующий номер" -#: pysollib/actions.py:409 pysollib/app.py:1090 pysollib/app.py:1102 -#: pysollib/game.py:828 pysollib/game.py:1642 pysollib/main.py:413 +#: pysollib/actions.py:409 pysollib/app.py:1118 pysollib/app.py:1130 +#: pysollib/game.py:830 pysollib/game.py:1644 pysollib/main.py:413 #: pysollib/main.py:421 pysollib/tk/colorsdialog.py:131 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 #: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:133 -#: pysollib/tk/playeroptionsdialog.py:86 -#: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 +#: pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 -#: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:158 +#: pysollib/tk/soundoptionsdialog.py:169 pysollib/tk/soundoptionsdialog.py:223 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:459 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:571 #: pysollib/tk/tkstats.py:645 pysollib/tk/tkstats.py:661 #: pysollib/tk/tkstats.py:703 pysollib/tk/tkstats.py:775 -#: pysollib/tk/tkstats.py:859 pysollib/tk/tkwidget.py:159 -#: pysollib/tk/tkwidget.py:312 +#: pysollib/tk/tkstats.py:859 pysollib/tk/tkwidget.py:156 +#: pysollib/tk/tkwidget.py:320 msgid "&OK" msgstr "&ОК" -#: pysollib/actions.py:409 pysollib/app.py:1102 pysollib/game.py:828 -#: pysollib/game.py:1205 pysollib/game.py:1220 pysollib/game.py:1226 -#: pysollib/game.py:1231 pysollib/tk/colorsdialog.py:131 +#: pysollib/actions.py:409 pysollib/app.py:1130 pysollib/game.py:830 +#: pysollib/game.py:1207 pysollib/game.py:1222 pysollib/game.py:1228 +#: pysollib/game.py:1233 pysollib/tk/colorsdialog.py:131 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 -#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:854 -#: pysollib/tk/menubar.py:856 pysollib/tk/playeroptionsdialog.py:86 -#: pysollib/tk/playeroptionsdialog.py:161 pysollib/tk/selectcardset.py:240 +#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:852 +#: pysollib/tk/menubar.py:854 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectgame.py:268 pysollib/tk/selectgame.py:409 -#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:106 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:312 +#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:169 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:320 msgid "&Cancel" msgstr "От&мена" @@ -128,7 +128,7 @@ msgstr "Комментарий для " msgid "Error while writing to file" msgstr "Ошибка при записи в файл" -#: pysollib/actions.py:616 pysollib/actions.py:652 pysollib/actions.py:941 +#: pysollib/actions.py:616 pysollib/actions.py:652 msgid " Info" msgstr " Информация" @@ -249,39 +249,27 @@ msgstr "Настроить шрифт" msgid "Set timeouts" msgstr "Настроить таймауты" -#: pysollib/actions.py:938 -msgid "Error while saving options" -msgstr "Ошибка при сохранении настроек" - -#: pysollib/actions.py:942 -msgid "" -"Options were saved to\n" -"\n" -msgstr "" -"Опции сохранены в\n" -"\n" - #: pysollib/app.py:86 msgid "Unknown" msgstr "Неизвестный" -#: pysollib/app.py:952 +#: pysollib/app.py:980 msgid "Loading %s %s..." msgstr "Загружается %s %s..." -#: pysollib/app.py:987 +#: pysollib/app.py:1015 msgid " load error" msgstr " ошибка при загрузке" -#: pysollib/app.py:988 +#: pysollib/app.py:1016 msgid "Error while loading " msgstr "Ошибка при загрузке" -#: pysollib/app.py:1082 +#: pysollib/app.py:1110 msgid "Incompatible " msgstr "Несовместимый " -#: pysollib/app.py:1084 +#: pysollib/app.py:1112 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -295,7 +283,7 @@ msgstr "" "\n" "Необходимо выбрать %s типа %s.\n" -#: pysollib/app.py:1100 +#: pysollib/app.py:1128 msgid "Please select a %s type %s" msgstr "Выберите %s типа %s" @@ -303,11 +291,11 @@ msgstr "Выберите %s типа %s" msgid "Player\n" msgstr "Игрок\n" -#: pysollib/game.py:824 +#: pysollib/game.py:826 msgid "Discard current game ?" msgstr "Завершить текущую игру?" -#: pysollib/game.py:1159 +#: pysollib/game.py:1161 msgid "" "\n" "You have reached\n" @@ -317,7 +305,7 @@ msgstr "" "Вы достигли\n" "#%d в %s игрового времени" -#: pysollib/game.py:1162 +#: pysollib/game.py:1164 msgid "" "\n" "and #%d in the %s of moves" @@ -325,7 +313,7 @@ msgstr "" "\n" "и #%d в %s количества ходов" -#: pysollib/game.py:1164 +#: pysollib/game.py:1166 msgid "" "\n" "You have reached\n" @@ -335,7 +323,7 @@ msgstr "" "Вы достигли\n" "#%d в %s количества ходов" -#: pysollib/game.py:1167 +#: pysollib/game.py:1169 msgid "" "\n" "and #%d in the %s of total moves" @@ -343,7 +331,7 @@ msgstr "" "\n" "и #%d в %s общего количества ходов" -#: pysollib/game.py:1169 +#: pysollib/game.py:1171 msgid "" "\n" "You have reached\n" @@ -353,11 +341,11 @@ msgstr "" "Вы достигли\n" "#%d в %s общего количества ходов" -#: pysollib/game.py:1196 pysollib/game.py:1212 +#: pysollib/game.py:1198 pysollib/game.py:1214 msgid "Game won" msgstr "Игра выиграна" -#: pysollib/game.py:1197 +#: pysollib/game.py:1199 msgid "" "\n" "Congratulations, this\n" @@ -376,12 +364,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1205 pysollib/game.py:1220 pysollib/game.py:1226 -#: pysollib/game.py:1231 pysollib/tk/menubar.py:250 +#: pysollib/game.py:1207 pysollib/game.py:1222 pysollib/game.py:1228 +#: pysollib/game.py:1233 pysollib/tk/menubar.py:250 msgid "&New game" msgstr "&Новая игра" -#: pysollib/game.py:1213 +#: pysollib/game.py:1215 msgid "" "\n" "Congratulations, you did it !\n" @@ -398,11 +386,11 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1224 pysollib/game.py:1229 +#: pysollib/game.py:1226 pysollib/game.py:1231 msgid "Game finished" msgstr "Игра закончена" -#: pysollib/game.py:1225 pysollib/game.py:1643 +#: pysollib/game.py:1227 pysollib/game.py:1645 msgid "" "\n" "Game finished\n" @@ -410,7 +398,7 @@ msgstr "" "\n" "Игра закончена\n" -#: pysollib/game.py:1230 +#: pysollib/game.py:1232 msgid "" "\n" "Game finished, but not without my help...\n" @@ -418,35 +406,35 @@ msgstr "" "\n" "Игра закончена, но не без моей помощи...\n" -#: pysollib/game.py:1231 +#: pysollib/game.py:1233 msgid "&Restart" msgstr "&Начало" -#: pysollib/game.py:1535 +#: pysollib/game.py:1537 msgid "Score %6d" msgstr "Счет %6d" -#: pysollib/game.py:1634 +#: pysollib/game.py:1636 msgid "&Cool" msgstr "&Отлично" -#: pysollib/game.py:1634 +#: pysollib/game.py:1636 msgid "&Great" msgstr "&Эдорово" -#: pysollib/game.py:1634 +#: pysollib/game.py:1636 msgid "&Wow" msgstr "&Ура" -#: pysollib/game.py:1634 +#: pysollib/game.py:1636 msgid "&Yeah" msgstr "&Ага" -#: pysollib/game.py:1635 pysollib/game.py:1646 pysollib/game.py:1658 +#: pysollib/game.py:1637 pysollib/game.py:1648 pysollib/game.py:1660 msgid " Autopilot" msgstr " Автопилот" -#: pysollib/game.py:1636 +#: pysollib/game.py:1638 msgid "" "\n" "Game solved in %d moves.\n" @@ -454,19 +442,19 @@ msgstr "" "\n" "Игра решена за %d ходов\n" -#: pysollib/game.py:1657 +#: pysollib/game.py:1659 msgid "&Hmm" msgstr "&Хмм" -#: pysollib/game.py:1657 +#: pysollib/game.py:1659 msgid "&Oh well" msgstr "&Ох" -#: pysollib/game.py:1657 +#: pysollib/game.py:1659 msgid "&That's life" msgstr "&Такова жизнь" -#: pysollib/game.py:1659 +#: pysollib/game.py:1661 msgid "" "\n" "This won't come out...\n" @@ -474,31 +462,31 @@ msgstr "" "\n" "Не удалось...\n" -#: pysollib/game.py:2063 +#: pysollib/game.py:2065 msgid "Set bookmark" msgstr "Установить закладку" -#: pysollib/game.py:2064 +#: pysollib/game.py:2066 msgid "Replace existing bookmark %d ?" msgstr "Заменить существующую закладку %d ?" -#: pysollib/game.py:2086 +#: pysollib/game.py:2088 msgid "Goto bookmark" msgstr "Перейти к закладке" -#: pysollib/game.py:2087 +#: pysollib/game.py:2089 msgid "Goto bookmark %d ?" msgstr "Перейти к закладке %d ?" -#: pysollib/game.py:2118 +#: pysollib/game.py:2120 msgid "Open game" msgstr "Открыть игру" -#: pysollib/game.py:2129 pysollib/game.py:2138 pysollib/game.py:2143 +#: pysollib/game.py:2131 pysollib/game.py:2140 pysollib/game.py:2145 msgid "Load game error" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2130 +#: pysollib/game.py:2132 msgid "" "Error while loading game.\n" "\n" @@ -506,11 +494,11 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2139 +#: pysollib/game.py:2141 msgid "Error while loading game" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2144 +#: pysollib/game.py:2146 msgid "" "Internal error while loading game.\n" "\n" @@ -520,11 +508,11 @@ msgstr "" "\n" "Пожалуйста сообщите об этой ошибке." -#: pysollib/game.py:2169 +#: pysollib/game.py:2171 msgid "Save game error" msgstr "Ошибка при сохранении игры" -#: pysollib/game.py:2170 +#: pysollib/game.py:2172 msgid "Error while saving game" msgstr "Ошибка при сохранении игры" @@ -1881,72 +1869,72 @@ msgstr "" msgid "Free cell." msgstr "Свободная ячейка." -#: pysollib/stats.py:120 pysollib/tk/tkstats.py:78 +#: pysollib/stats.py:118 pysollib/tk/tkstats.py:78 msgid "Demo games" msgstr "Демо игры" -#: pysollib/stats.py:121 +#: pysollib/stats.py:119 msgid "Played" msgstr "Играл" -#: pysollib/stats.py:122 pysollib/stats.py:202 +#: pysollib/stats.py:120 pysollib/stats.py:200 msgid "Won" msgstr "Выиграл" -#: pysollib/stats.py:123 pysollib/stats.py:202 +#: pysollib/stats.py:121 pysollib/stats.py:200 msgid "Lost" msgstr "Проиграл" -#: pysollib/stats.py:124 pysollib/tk/statusbar.py:137 +#: pysollib/stats.py:122 pysollib/tk/statusbar.py:135 msgid "Playing time" msgstr "Время игры" -#: pysollib/stats.py:125 +#: pysollib/stats.py:123 msgid "Moves" msgstr "Ходов" -#: pysollib/stats.py:126 +#: pysollib/stats.py:124 msgid "% won" msgstr "% побед" -#: pysollib/stats.py:155 +#: pysollib/stats.py:153 msgid "Total (%d out of %d games)" msgstr "Всего (%d из %d игр)" -#: pysollib/stats.py:164 +#: pysollib/stats.py:162 msgid "Game" msgstr "Игра" -#: pysollib/stats.py:164 +#: pysollib/stats.py:162 msgid "Status" msgstr "Статус" -#: pysollib/stats.py:164 pysollib/tk/statusbar.py:139 +#: pysollib/stats.py:162 pysollib/tk/statusbar.py:137 #: pysollib/tk/tkstats.py:733 msgid "Game number" msgstr "Номер игры" -#: pysollib/stats.py:164 pysollib/tk/tkstats.py:736 +#: pysollib/stats.py:162 pysollib/tk/tkstats.py:736 msgid "Started at" msgstr "Игра начата" -#: pysollib/stats.py:187 +#: pysollib/stats.py:185 msgid "** UNKNOWN %d **" msgstr "" -#: pysollib/stats.py:195 +#: pysollib/stats.py:193 msgid "** ERROR **" msgstr "" -#: pysollib/stats.py:202 +#: pysollib/stats.py:200 msgid "Loaded" msgstr "Загружал" -#: pysollib/stats.py:202 +#: pysollib/stats.py:200 msgid "Not won" msgstr "Не выиграл" -#: pysollib/stats.py:202 +#: pysollib/stats.py:200 msgid "Perfect" msgstr "Великолепная" @@ -2295,180 +2283,180 @@ msgstr "Показывать стрелку (в Шисен-Сё)" msgid "&Sound" msgstr "&Звук" -#: pysollib/tk/menubar.py:351 +#: pysollib/tk/menubar.py:349 msgid "Cards&et..." msgstr "Коло&да..." -#: pysollib/tk/menubar.py:352 +#: pysollib/tk/menubar.py:350 msgid "Table t&ile..." msgstr "&Игровой стол..." -#: pysollib/tk/menubar.py:354 +#: pysollib/tk/menubar.py:352 msgid "Card &background" msgstr "&Рубашка карты" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:353 msgid "Card &view" msgstr "&Вид карты" -#: pysollib/tk/menubar.py:356 +#: pysollib/tk/menubar.py:354 msgid "Card shado&w" msgstr "Тень карты" -#: pysollib/tk/menubar.py:357 +#: pysollib/tk/menubar.py:355 msgid "Shade &legal moves" msgstr "Подсвечивать &разрешенные ходы" -#: pysollib/tk/menubar.py:358 +#: pysollib/tk/menubar.py:356 msgid "&Negative card bottom" msgstr "&Негативные контуры карты" -#: pysollib/tk/menubar.py:359 +#: pysollib/tk/menubar.py:357 msgid "A&nimations" msgstr "&Анимация" -#: pysollib/tk/menubar.py:360 +#: pysollib/tk/menubar.py:358 msgid "&None" msgstr "&Нет" -#: pysollib/tk/menubar.py:361 +#: pysollib/tk/menubar.py:359 msgid "&Timer based" msgstr "Базирующаяся на &таймере" -#: pysollib/tk/menubar.py:362 +#: pysollib/tk/menubar.py:360 msgid "&Fast" msgstr "&Быстрая" -#: pysollib/tk/menubar.py:363 +#: pysollib/tk/menubar.py:361 msgid "&Slow" msgstr "&Медленная" -#: pysollib/tk/menubar.py:364 +#: pysollib/tk/menubar.py:362 msgid "&Very slow" msgstr "&Очень медленная" -#: pysollib/tk/menubar.py:365 +#: pysollib/tk/menubar.py:363 msgid "Stick&y mouse" msgstr "&Липкая мышь" -#: pysollib/tk/menubar.py:367 +#: pysollib/tk/menubar.py:365 msgid "&Fonts..." msgstr "&Шрифты..." -#: pysollib/tk/menubar.py:368 +#: pysollib/tk/menubar.py:366 msgid "&Colors..." msgstr "&Цвета..." -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:367 msgid "Time&outs..." msgstr "Тайма&уты..." -#: pysollib/tk/menubar.py:371 +#: pysollib/tk/menubar.py:369 msgid "&Toolbar" msgstr "Панель &инструментов" -#: pysollib/tk/menubar.py:373 +#: pysollib/tk/menubar.py:371 msgid "Stat&usbar" msgstr "Панель состояния" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:372 msgid "Show &statusbar" msgstr "Показывать панель состояния" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:373 msgid "Show &number of cards" msgstr "Показывать количество карт" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:374 msgid "Show &help bar" msgstr "Показывать панель помощи" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:375 msgid "&Demo logo" msgstr "&Демо лого" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:376 msgid "Startup splash sc&reen" msgstr "Окно &запуска" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:380 msgid "&Help" msgstr "&Помощь" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:381 msgid "&Contents" msgstr "&Содержание" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:382 msgid "&How to play" msgstr "Как &играть" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:383 msgid "&Rules for this game" msgstr "&Правила текущей игры" -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:384 msgid "&License terms" msgstr "&Лицензия" -#: pysollib/tk/menubar.py:389 +#: pysollib/tk/menubar.py:387 msgid "&About " msgstr "&О программе " -#: pysollib/tk/menubar.py:497 +#: pysollib/tk/menubar.py:495 msgid "All &games..." msgstr "&Все игры..." -#: pysollib/tk/menubar.py:498 +#: pysollib/tk/menubar.py:496 msgid "Playable pre&view..." msgstr "Играемый &предпросмотр..." -#: pysollib/tk/menubar.py:500 +#: pysollib/tk/menubar.py:498 msgid "&Popular games" msgstr "&Популярные игры" -#: pysollib/tk/menubar.py:503 +#: pysollib/tk/menubar.py:501 msgid "&French games" msgstr "&Классические игры" -#: pysollib/tk/menubar.py:506 +#: pysollib/tk/menubar.py:504 msgid "&Mahjongg games" msgstr "Игры маджонг" -#: pysollib/tk/menubar.py:509 +#: pysollib/tk/menubar.py:507 msgid "&Oriental games" msgstr "&Восточные игры" -#: pysollib/tk/menubar.py:513 +#: pysollib/tk/menubar.py:511 msgid "&Special games" msgstr "&Особые игры" -#: pysollib/tk/menubar.py:517 +#: pysollib/tk/menubar.py:515 msgid "All games by name" msgstr "Все игры по имени" -#: pysollib/tk/menubar.py:854 pysollib/tk/menubar.py:856 +#: pysollib/tk/menubar.py:852 pysollib/tk/menubar.py:854 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "&Загрузить" -#: pysollib/tk/menubar.py:856 +#: pysollib/tk/menubar.py:854 msgid "&Info..." msgstr "&Информация..." -#: pysollib/tk/menubar.py:859 +#: pysollib/tk/menubar.py:857 msgid "Select " msgstr "Выбрать " -#: pysollib/tk/menubar.py:919 +#: pysollib/tk/menubar.py:917 msgid "Select table background" msgstr "Выбрать фоновое изображение" -#: pysollib/tk/menubar.py:931 pysollib/tk/selecttile.py:177 +#: pysollib/tk/menubar.py:929 pysollib/tk/selecttile.py:177 msgid "Select table color" msgstr "Выбрать цвет" -#: pysollib/tk/playeroptionsdialog.py:113 +#: pysollib/tk/playeroptionsdialog.py:112 msgid "" "\n" "Please enter your name" @@ -2476,19 +2464,19 @@ msgstr "" "\n" "Пожалуйста введите Ваше имя" -#: pysollib/tk/playeroptionsdialog.py:121 +#: pysollib/tk/playeroptionsdialog.py:120 msgid "Select..." msgstr "Выбрать..." -#: pysollib/tk/playeroptionsdialog.py:125 +#: pysollib/tk/playeroptionsdialog.py:124 msgid "Confirm quit" msgstr "Подтверждение выхода" -#: pysollib/tk/playeroptionsdialog.py:129 +#: pysollib/tk/playeroptionsdialog.py:128 msgid "Update statistics and logs" msgstr "Обнавлять статистику и лог" -#: pysollib/tk/playeroptionsdialog.py:146 +#: pysollib/tk/playeroptionsdialog.py:145 msgid "Select name" msgstr "Выбрать имя" @@ -2823,35 +2811,39 @@ msgstr "Все фоновые изображения" msgid "&Solid color..." msgstr "&Монотонный цвет..." -#: pysollib/tk/soundoptionsdialog.py:76 +#: pysollib/tk/soundoptionsdialog.py:111 msgid "Sound enabled" msgstr "Звук доступен" -#: pysollib/tk/soundoptionsdialog.py:82 +#: pysollib/tk/soundoptionsdialog.py:117 msgid "Use DirectX for sound playing" -msgstr "Использовать DirectX длы вывода звука" +msgstr "Использовать DirectX для вывода звука" -#: pysollib/tk/soundoptionsdialog.py:88 -msgid "Sample volume" -msgstr "Уровень звуков" +#: pysollib/tk/soundoptionsdialog.py:123 +msgid "Sample volume:" +msgstr "Уровень звуков:" -#: pysollib/tk/soundoptionsdialog.py:94 -msgid "Music volume" -msgstr "Уровень музыки" +#: pysollib/tk/soundoptionsdialog.py:131 +msgid "Music volume:" +msgstr "Уровень музыки:" -#: pysollib/tk/soundoptionsdialog.py:106 +#: pysollib/tk/soundoptionsdialog.py:144 +msgid "Enable samles" +msgstr "Включить звуки" + +#: pysollib/tk/soundoptionsdialog.py:169 msgid "&Apply" msgstr "&Применить" -#: pysollib/tk/soundoptionsdialog.py:106 pysollib/tk/soundoptionsdialog.py:108 +#: pysollib/tk/soundoptionsdialog.py:169 pysollib/tk/soundoptionsdialog.py:171 msgid "&Mixer..." msgstr "&Миксер..." -#: pysollib/tk/soundoptionsdialog.py:155 +#: pysollib/tk/soundoptionsdialog.py:220 msgid "Sound preferences info" msgstr "Информация о настройках звука" -#: pysollib/tk/soundoptionsdialog.py:156 +#: pysollib/tk/soundoptionsdialog.py:221 msgid "" "Changing DirectX settings will take effect\n" "the next time you restart " @@ -2859,11 +2851,11 @@ msgstr "" "Изменения установок DirectX вступят в силу\n" "при следующем запуске " -#: pysollib/tk/statusbar.py:138 +#: pysollib/tk/statusbar.py:136 msgid "Moves/Total moves" msgstr "Ходов/Всего ходов" -#: pysollib/tk/statusbar.py:140 +#: pysollib/tk/statusbar.py:138 msgid "Games played: won/lost" msgstr "Игр: выиграно/проиграно" @@ -3200,7 +3192,7 @@ msgstr "Игрок" msgid "Player options" msgstr "Установки игрока" -#: pysollib/tk/toolbar.py:429 +#: pysollib/tk/toolbar.py:435 msgid "Toolbar" msgstr "Панель инструментов" @@ -3232,6 +3224,16 @@ msgstr "красный" msgid "cardset" msgstr "набор карт" +#~ msgid "Error while saving options" +#~ msgstr "Ошибка при сохранении настроек" + +#~ msgid "" +#~ "Options were saved to\n" +#~ "\n" +#~ msgstr "" +#~ "Опции сохранены в\n" +#~ "\n" + #~ msgid "Set demo options" #~ msgstr "Настройка демо" diff --git a/pysollib/actions.py b/pysollib/actions.py index 8a1ff42f..f3df4f29 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -863,11 +863,11 @@ class PysolMenubarActions: self.app.opt.shisen_show_hint = self.tkopt.shisen_show_hint.get() ##self.game.updateMenus() - def mOptSound(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.sound = self.tkopt.sound.get() - if not self.app.opt.sound: - self.app.audio.stopAll() +## def mOptSound(self, *args): +## if self._cancelDrag(break_pause=False): return +## self.app.opt.sound = self.tkopt.sound.get() +## if not self.app.opt.sound: +## self.app.audio.stopAll() def mOptSoundDialog(self, *args): if self._cancelDrag(break_pause=False): return @@ -886,9 +886,9 @@ class PysolMenubarActions: if self._cancelDrag(break_pause=False): return self.app.opt.shade = self.tkopt.shade.get() - def mOptIrregularPiles(self, *args): - if self._cancelDrag(): return - self.app.opt.irregular_piles = self.tkopt.irregular_piles.get() +## def mOptIrregularPiles(self, *args): +## if self._cancelDrag(): return +## self.app.opt.irregular_piles = self.tkopt.irregular_piles.get() def mOptColorsOptions(self, *args): if self._cancelDrag(break_pause=False): return @@ -929,17 +929,17 @@ class PysolMenubarActions: self.app.opt.highlight_cards_sleep = d.highlight_cards_sleep self.app.opt.highlight_samerank_sleep = d.highlight_samerank_sleep - def mOptSave(self, *args): - if self._cancelDrag(break_pause=False): return - try: - self.app.saveOptions() - except Exception, ex: - d = MfxExceptionDialog(self.top, ex, - text=_("Error while saving options")) - else: - # tell the player where their config files reside - d = MfxMessageDialog(self.top, title=PACKAGE+_(" Info"), bitmap="info", - text=_("Options were saved to\n\n") + self.app.fn.opt) +## def mOptSave(self, *args): +## if self._cancelDrag(break_pause=False): return +## try: +## self.app.saveOptions() +## except Exception, ex: +## d = MfxExceptionDialog(self.top, ex, +## text=_("Error while saving options")) +## else: +## # tell the player where their config files reside +## d = MfxMessageDialog(self.top, title=PACKAGE+_(" Info"), bitmap="info", +## text=_("Options were saved to\n\n") + self.app.fn.opt) # diff --git a/pysollib/app.py b/pysollib/app.py index 6b8bdabd..bd41e1eb 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -117,10 +117,38 @@ class Options: self.statusbar = 1 self.num_cards = 0 self.helpbar = 0 + # sound self.sound = 1 self.sound_mode = 1 self.sound_sample_volume = 128 self.sound_music_volume = 128 + self.sound_samples = { + 'areyousure' : True, + 'autodrop' : True, + 'autoflip' : True, + 'autopilotlost' : True, + 'autopilotwon' : True, + 'deal' : True, + 'deal01' : True, + 'deal02' : True, + 'deal04' : True, + 'deal08' : True, + 'dealwaste' : True, + 'droppair' : True, + 'drop' : True, + 'extra' : True, + 'flip' : True, + 'move' : True, + 'nomove' : True, + 'redo' : True, + 'startdrag' : True, + 'turnwaste' : True, + 'undo' : True, + 'gamefinished' : True, + 'gamelost' : True, + 'gameperfect' : True, + 'gamewon' : True, + } # fonts self.fonts = {"default" : None, #"default" : ("helvetica", 12), diff --git a/pysollib/game.py b/pysollib/game.py index 5b498956..28bd6deb 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -784,6 +784,8 @@ class Game: # def playSample(self, name, priority=0, loop=0): + if not self.app.opt.sound_samples[name]: + return 0 ##print "playSample:", name, priority, loop if self.app.audio: return self.app.audio.playSample(name, priority=priority, loop=loop) @@ -801,7 +803,7 @@ class Game: a = self.app.opt.animations if a and not self.preview: self.canvas.update_idletasks() - if self.app.audio and self.app.opt.sound: + if self.app.audio and self.app.opt.sound and self.app.opt.sound_samples['deal']: if a in (1, 2, 5): self.playSample("deal01", priority=100, loop=loop) elif a == 3: @@ -1192,7 +1194,7 @@ class Game: top_msg = self.updateStats() time = self.getTime() self.finished = True - self.playSample("winperfect", priority=1000) + self.playSample("gameperfect", priority=1000) d = MfxMessageDialog(self.top, title=_("Game won"), text=_(''' Congratulations, this @@ -1208,7 +1210,7 @@ for %d moves. top_msg = self.updateStats() time = self.getTime() self.finished = True - self.playSample("winwon", priority=1000) + self.playSample("gamewon", priority=1000) d = MfxMessageDialog(self.top, title=_("Game won"), text=_(''' Congratulations, you did it ! @@ -1220,12 +1222,12 @@ for %d moves. strings=(_("&New game"), None, _("&Cancel")), image=self.app.gimages.logos[4], separatorwidth=2) elif self.gstats.updated < 0: - self.playSample("winfinished", priority=1000) + self.playSample("gamefinished", priority=1000) d = MfxMessageDialog(self.top, title=_("Game finished"), bitmap="info", text=_("\nGame finished\n"), strings=(_("&New game"), None, _("&Cancel"))) else: - self.playSample("winlost", priority=1000) + self.playSample("gamelost", priority=1000) d = MfxMessageDialog(self.top, title=_("Game finished"), bitmap="info", text=_("\nGame finished, but not without my help...\n"), strings=(_("&New game"), _("&Restart"), _("&Cancel"))) diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 4a61cc79..a38b69a3 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -340,11 +340,9 @@ class PysolMenubar(PysolMenubarActions): menu.add_separator() label = n_("&Sound") if self.app.audio.audiodev is None: - menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSound, state=Tkinter.DISABLED) - elif pysolsoundserver: - menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSoundDialog) + menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSoundDialog, state=Tkinter.DISABLED) else: - menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSound) + menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSoundDialog) # cardsets #manager = self.app.cardset_manager #n = manager.len() diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index 0ca59eaa..f6adaaf8 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -36,7 +36,8 @@ __all__ = ['SoundOptionsDialog'] # imports -import os, sys, string, Tkinter +import os, sys, string +from Tkinter import * import traceback # PySol imports @@ -47,7 +48,7 @@ from pysollib.settings import MIXERS # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE -from tkwidget import MfxDialog +from tkwidget import MfxDialog, MfxMessageDialog # /*********************************************************************** # // @@ -64,41 +65,103 @@ class SoundOptionsDialog(MfxDialog): self.createBitmaps(top_frame, kw) # self.saved_opt = app.opt.copy() - self.sound = Tkinter.BooleanVar() + self.sound = BooleanVar() self.sound.set(app.opt.sound != 0) - self.sound_mode = Tkinter.BooleanVar() + self.sound_mode = BooleanVar() self.sound_mode.set(app.opt.sound_mode != 0) - self.sample_volume = Tkinter.IntVar() + self.sample_volume = IntVar() self.sample_volume.set(app.opt.sound_sample_volume) - self.music_volume = Tkinter.IntVar() + self.music_volume = IntVar() self.music_volume.set(app.opt.sound_music_volume) - widget = Tkinter.Checkbutton(top_frame, variable=self.sound, - text=_("Sound enabled"), - anchor=Tkinter.W) - widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady, - expand=Tkinter.YES, fill=Tkinter.BOTH) + self.samples = [ + ('areyousure', 'AreYouSure', BooleanVar()), + ('autodrop', 'AutoDrop', BooleanVar()), + ('autoflip', 'AutoFlip', BooleanVar()), + ('autopilotlost', 'AutopilotLost', BooleanVar()), + ('autopilotwon', 'AutopilotWon', BooleanVar()), + ('deal', 'Deal', BooleanVar()), + #('deal01', 'Deal01', BooleanVar()), + #('deal02', 'Deal02', BooleanVar()), + #('deal04', 'Deal04', BooleanVar()), + #('deal08', 'Deal08', BooleanVar()), + ('dealwaste', 'DealWaste', BooleanVar()), + ('droppair', 'DropPair', BooleanVar()), + ('drop', 'Drop', BooleanVar()), + #('extra', 'Extra', BooleanVar()), + ('flip', 'Flip', BooleanVar()), + ('move', 'Move', BooleanVar()), + ('nomove', 'NoMove', BooleanVar()), + ('redo', 'Redo', BooleanVar()), + ('startdrag', 'StartDrag', BooleanVar()), + ('turnwaste', 'TurnWaste', BooleanVar()), + ('undo', 'Undo', BooleanVar()), + ('gamefinished', 'GameFinished', BooleanVar()), + ('gamelost', 'GameLost', BooleanVar()), + ('gameperfect', 'GamePerfect', BooleanVar()), + ('gamewon', 'GameWon', BooleanVar()), + ] + + # + frame = Frame(top_frame) + frame.pack(expand=1, fill='both', padx=5, pady=5) + frame.columnconfigure(1, weight=1) + # + row = 0 + w = Checkbutton(frame, variable=self.sound, + text=_("Sound enabled"), anchor='w') + w.grid(row=row, column=0, columnspan=2, sticky='ew') + # if os.name == "nt" and pysolsoundserver: - widget = Tkinter.Checkbutton(top_frame, variable=self.sound_mode, - text=_("Use DirectX for sound playing"), - command=self.mOptSoundDirectX) - widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + row += 1 + w = Checkbutton(frame, variable=self.sound_mode, + text=_("Use DirectX for sound playing"), + command=self.mOptSoundDirectX, anchor='w') + w.grid(row=row, column=0, columnspan=2, sticky='ew') + # if pysolsoundserver and app.startup_opt.sound_mode > 0: - widget = Tkinter.Scale(top_frame, from_=0, to=128, - resolution=1, orient=Tkinter.HORIZONTAL, - length="3i", label=_("Sample volume"), - variable=self.sample_volume, takefocus=0) - widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady, - expand=Tkinter.YES, fill=Tkinter.BOTH) - widget = Tkinter.Scale(top_frame, from_=0, to=128, - resolution=1, orient=Tkinter.HORIZONTAL, - length="3i", label=_("Music volume"), - variable=self.music_volume, takefocus=0) - widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady, - expand=Tkinter.YES, fill=Tkinter.BOTH) + row += 1 + w = Label(frame, text=_('Sample volume:')) + w.grid(row=row, column=0, sticky='w') + w = Scale(frame, from_=0, to=128, resolution=1, + orient='horizontal', takefocus=0, + length="3i", #label=_('Sample volume'), + variable=self.sample_volume) + w.grid(row=row, column=1, sticky='w', padx=5) + row += 1 + w = Label(frame, text=_('Music volume:')) + w.grid(row=row, column=0, sticky='w', padx=5) + w = Scale(frame, from_=0, to=128, resolution=1, + orient='horizontal', takefocus=0, + length="3i", #label=_('Music volume'), + variable=self.music_volume) + w.grid(row=row, column=1, sticky='w', padx=5) + else: # remove "Apply" button kw.strings[1] = None # + if TkVersion >= 8.4: + frame = LabelFrame(top_frame, text=_('Enable samles'), padx=5, pady=5) + else: + frame = Frame(top_frame) + frame.pack(expand=1, fill='both', padx=5, pady=5) + frame.columnconfigure(0, weight=1) + frame.columnconfigure(1, weight=1) + # + row = 0 + col = 0 + for n, t, v in self.samples: + v.set(app.opt.sound_samples[n]) + w = Checkbutton(frame, text=t, anchor='w', variable=v) + w.grid(row=row, column=col, sticky='ew') + if col == 1: + col = 0 + row += 1 + else: + col = 1 + # + top_frame.columnconfigure(1, weight=1) + # focus = self.createButtons(bottom_frame, kw) self.mainloop(focus, kw.timeout) @@ -113,7 +176,7 @@ class SoundOptionsDialog(MfxDialog): default=0, resizable=1, padx=10, pady=10, - buttonpadx=10, buttonpady=5, + buttonpadx=1, buttonpady=5, ) return MfxDialog.initKw(self, kw) @@ -123,6 +186,8 @@ class SoundOptionsDialog(MfxDialog): self.app.opt.sound_mode = self.sound_mode.get() self.app.opt.sound_sample_volume = self.sample_volume.get() self.app.opt.sound_music_volume = self.music_volume.get() + for n, t, v in self.samples: + self.app.opt.sound_samples[n] = v.get() elif button == 2: for name, args in MIXERS: try: @@ -152,29 +217,8 @@ class SoundOptionsDialog(MfxDialog): def mOptSoundDirectX(self, *event): ##print self.sound_mode.get() - d = MfxDialog(self.top, title=_("Sound preferences info"), + d = MfxMessageDialog(self.top, title=_("Sound preferences info"), text=_("Changing DirectX settings will take effect\nthe next time you restart ")+PACKAGE, bitmap="warning", default=0, strings=(_("&OK"),)) - -# /*********************************************************************** -# // -# ************************************************************************/ - - -def soundoptionsdialog_main(args): - from tkutil import wm_withdraw - opt = Struct(sound=1, sound_mode=1, sound_sample_volume=128, sound_music_volume=96) - app = Struct(opt=opt, audio=None, debug=0) - tk = Tkinter.Tk() - wm_withdraw(tk) - tk.update() - d = SoundOptionsDialog(tk, "Sound settings", app) - print d.status, d.button - return 0 - -if __name__ == "__main__": - import sys - sys.exit(soundoptionsdialog_main(sys.argv)) - diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index ca288979..85e7ed88 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -169,7 +169,7 @@ class MfxDialog: # ex. _ToplevelDialog def createFrames(self, kw): bottom_frame = Tkinter.Frame(self.top) - bottom_frame.pack(side='bottom', fill='both', expand=1, ipady=3) + bottom_frame.pack(side='bottom', fill='both', expand=1, ipadx=3, ipady=3) if kw.separatorwidth > 0: separator = Tkinter.Frame(self.top, relief="sunken", height=kw.separatorwidth, width=kw.separatorwidth, From f9c7a04cc5e755c77b8a54a2a510b8b42858f5ba Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 14 Jun 2006 21:19:47 +0000 Subject: [PATCH 007/266] - new option: `save games geometry' - 5 new games: `double russian solitaire', `zodiac', `spike', `phantom blockade', `moving left' - tkhtmlviewer: highlight visited urls git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@8 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/games.pot | 2 +- po/pysol.pot | 4 +- po/ru_games.po | 2 +- po/ru_pysol.po | 24 +++--- pysollib/actions.py | 8 +- pysollib/app.py | 50 ++++++------ pysollib/game.py | 13 ++- pysollib/games/__init__.py | 1 + pysollib/games/bristol.py | 55 ++++++++++--- pysollib/games/gypsy.py | 23 ++++++ pysollib/games/klondike.py | 23 ++++++ pysollib/games/spider.py | 6 ++ pysollib/games/yukon.py | 18 ++++- pysollib/games/zodiac.py | 126 ++++++++++++++++++++++++++++++ pysollib/tk/menubar.py | 17 +++- pysollib/tk/soundoptionsdialog.py | 52 ++++++------ pysollib/tk/tkhtml.py | 53 ++++++++----- pysollib/tk/tktree.py | 3 +- pysollib/tk/tkwidget.py | 45 +++++------ 19 files changed, 386 insertions(+), 139 deletions(-) create mode 100644 pysollib/games/zodiac.py diff --git a/po/games.pot b/po/games.pot index b7c609f4..a91b4ca4 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sun Jun 11 00:30:03 2006\n" +"POT-Creation-Date: Sun Jun 11 10:16:06 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/pysol.pot b/po/pysol.pot index 62f17f65..46e8d15f 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Sun Jun 11 00:29:57 2006\n" +"POT-Creation-Date: Sun Jun 11 10:16:01 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2142,7 +2142,7 @@ msgid "Show hint arrow (in Shisen-Sho games)" msgstr "" #: pysollib/tk/menubar.py:341 -msgid "&Sound" +msgid "&Sound..." msgstr "" #: pysollib/tk/menubar.py:349 diff --git a/po/ru_games.po b/po/ru_games.po index 8c5b3024..84aee5c1 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sun Jun 11 00:30:03 2006\n" +"POT-Creation-Date: Sun Jun 11 10:16:06 2006\n" "PO-Revision-Date: 2006-06-10 11:07+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index cdafff22..cb0eef34 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sun Jun 11 00:29:57 2006\n" -"PO-Revision-Date: 2006-06-11 00:32+0400\n" +"POT-Creation-Date: Sun Jun 11 10:16:01 2006\n" +"PO-Revision-Date: 2006-06-12 15:31+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -2280,8 +2280,8 @@ msgid "Show hint arrow (in Shisen-Sho games)" msgstr "Показывать стрелку (в Шисен-Сё)" #: pysollib/tk/menubar.py:341 -msgid "&Sound" -msgstr "&Звук" +msgid "&Sound..." +msgstr "&Звук..." #: pysollib/tk/menubar.py:349 msgid "Cards&et..." @@ -2289,7 +2289,7 @@ msgstr "Коло&да..." #: pysollib/tk/menubar.py:350 msgid "Table t&ile..." -msgstr "&Игровой стол..." +msgstr "Игровой &стол..." #: pysollib/tk/menubar.py:352 msgid "Card &background" @@ -2313,7 +2313,7 @@ msgstr "&Негативные контуры карты" #: pysollib/tk/menubar.py:357 msgid "A&nimations" -msgstr "&Анимация" +msgstr "Анимаци&я" #: pysollib/tk/menubar.py:358 msgid "&None" @@ -2353,11 +2353,11 @@ msgstr "Тайма&уты..." #: pysollib/tk/menubar.py:369 msgid "&Toolbar" -msgstr "Панель &инструментов" +msgstr "Панель и&нструментов" #: pysollib/tk/menubar.py:371 msgid "Stat&usbar" -msgstr "Панель состояния" +msgstr "Панель с&остояния" #: pysollib/tk/menubar.py:372 msgid "Show &statusbar" @@ -2373,11 +2373,11 @@ msgstr "Показывать панель помощи" #: pysollib/tk/menubar.py:375 msgid "&Demo logo" -msgstr "&Демо лого" +msgstr "Д&емо лого" #: pysollib/tk/menubar.py:376 msgid "Startup splash sc&reen" -msgstr "Окно &запуска" +msgstr "О&кно запуска" #: pysollib/tk/menubar.py:380 msgid "&Help" @@ -2809,7 +2809,7 @@ msgstr "Все фоновые изображения" #: pysollib/tk/selecttile.py:158 msgid "&Solid color..." -msgstr "&Монотонный цвет..." +msgstr "М&онотонный цвет..." #: pysollib/tk/soundoptionsdialog.py:111 msgid "Sound enabled" @@ -2837,7 +2837,7 @@ msgstr "&Применить" #: pysollib/tk/soundoptionsdialog.py:169 pysollib/tk/soundoptionsdialog.py:171 msgid "&Mixer..." -msgstr "&Миксер..." +msgstr "Ми&ксер..." #: pysollib/tk/soundoptionsdialog.py:220 msgid "Sound preferences info" diff --git a/pysollib/actions.py b/pysollib/actions.py index f3df4f29..59ba57d1 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -130,6 +130,7 @@ class PysolMenubarActions: statusbar = BooleanVar(), num_cards = BooleanVar(), helpbar = BooleanVar(), + save_games_geometry = BooleanVar(), splashscreen = BooleanVar(), demo_logo = BooleanVar(), sticky_mouse = BooleanVar(), @@ -180,6 +181,7 @@ class PysolMenubarActions: tkopt.statusbar.set(opt.statusbar) tkopt.num_cards.set(opt.num_cards) tkopt.helpbar.set(opt.helpbar) + tkopt.save_games_geometry.set(opt.save_games_geometry) tkopt.demo_logo.set(opt.demo_logo) tkopt.splashscreen.set(opt.splashscreen) tkopt.sticky_mouse.set(opt.sticky_mouse) @@ -743,19 +745,19 @@ class PysolMenubarActions: if self._cancelDrag(): return if self.app.opt.hint: if self.game.showHint(0, self.app.opt.hint_sleep): - self.game.stats.hints = self.game.stats.hints + 1 + self.game.stats.hints += 1 def mHint1(self, *args): if self._cancelDrag(): return if self.app.opt.hint: if self.game.showHint(1, self.app.opt.hint_sleep): - self.game.stats.hints = self.game.stats.hints + 1 + self.game.stats.hints += 1 def mHighlightPiles(self, *args): if self._cancelDrag(): return if self.app.opt.highlight_piles: if self.game.highlightPiles(self.app.opt.highlight_piles_sleep): - self.game.stats.highlight_piles = self.game.stats.highlight_piles + 1 + self.game.stats.highlight_piles += 1 def mDemo(self, *args): if self._cancelDrag(): return diff --git a/pysollib/app.py b/pysollib/app.py index bd41e1eb..ea1c99b9 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -129,14 +129,14 @@ class Options: 'autopilotlost' : True, 'autopilotwon' : True, 'deal' : True, - 'deal01' : True, - 'deal02' : True, - 'deal04' : True, - 'deal08' : True, + #'deal01' : True, + #'deal02' : True, + #'deal04' : True, + #'deal08' : True, 'dealwaste' : True, 'droppair' : True, 'drop' : True, - 'extra' : True, + #'extra' : True, 'flip' : True, 'move' : True, 'nomove' : True, @@ -184,6 +184,7 @@ class Options: self.highlight_cards_sleep = 1.0 self.highlight_samerank_sleep = 1.0 # additional startup information + self.num_recent_games = 15 self.recent_gameid = [] self.favorite_gameid = [] self.last_gameid = 0 # last game played @@ -191,6 +192,8 @@ class Options: #self.last_save_dir = None # last directory for load/save self.game_holded = 0 self.wm_maximized = 0 + self.save_games_geometry = False + self.games_geometry = {} # saved games geometry (gameid: (width, height)) # self.splashscreen = True self.sticky_mouse = False @@ -668,7 +671,13 @@ class Application: self.game._saveGame(self.fn.holdgame) self.opt.game_holded = self.game.id except: + traceback.print_exc() pass + # save game geometry + self.wm_save_state() + if self.opt.save_games_geometry and not self.opt.wm_maximized: + geom = (self.canvas.winfo_width(), self.canvas.winfo_height()) + self.opt.games_geometry[self.game.id] = geom self.freeGame() # if self.nextgame.id <= 0: @@ -681,35 +690,25 @@ class Application: finally: # update options self.opt.last_gameid = id -## if self.debug: -## self.wm_save_state() -## # save options -## self.saveOptions() -## # save statistics -## self.saveStatistics() -## # save comments -## self.saveComments() -## # shut down audio -## self.audio.destroy() -## else: - try: self.wm_save_state() - except: - pass # save options try: self.saveOptions() except: + traceback.print_exc() pass # save statistics try: self.saveStatistics() except: + traceback.print_exc() pass # save comments try: self.saveComments() except: + traceback.print_exc() pass # shut down audio try: self.audio.destroy() except: + traceback.print_exc() pass @@ -741,7 +740,7 @@ class Application: if id in self.opt.recent_gameid: self.opt.recent_gameid.remove(id) self.opt.recent_gameid.insert(0, id) - del self.opt.recent_gameid[15:] + del self.opt.recent_gameid[self.opt.num_recent_games:] self.menubar.updateRecentGamesMenu(self.opt.recent_gameid) self.menubar.updateFavoriteGamesMenu() # delete intro progress bar @@ -789,7 +788,6 @@ class Application: self.toolbar.connectGame(None, None) self.menubar.connectGame(None) # clean up the canvas - unbind_destroy(self.canvas) self.canvas.deleteAllItems() self.canvas.update_idletasks() # destruct the game @@ -808,7 +806,7 @@ class Application: if self.top: s = self.top.wm_state() ##print "wm_save_state", s - if s == "zoomed": + if s == "zoomed": # Windows only self.opt.wm_maximized = 1 elif s == "normal": self.opt.wm_maximized = 0 @@ -842,7 +840,7 @@ class Application: for f in ("demo01", "demo02", "demo03", "demo04", "demo05",): self.gimages.demo.append(self.dataloader.findImage(f, dir)) dir = os.path.join("images", "pause") - for f in ("pause01", "pause02",): + for f in ("pause01", "pause02", "pause03",): self.gimages.pause.append(self.dataloader.findImage(f, dir)) ##dir = os.path.join("images", "stats") ##for f in ("barchart",): @@ -950,8 +948,7 @@ class Application: self.opt.cardset[gi.category] = (cs.name, cs.backname) if update & 8: self.opt.cardset[(1, gi.id)] = (cs.name, cs.backname) - #from pprint import pprint - #pprint(self.opt.cardset) + #from pprint import pprint; pprint(self.opt.cardset) def loadCardset(self, cs, id=0, update=7, progress=None): #print 'loadCardset', cs.ident @@ -1146,8 +1143,7 @@ Please select a %s type %s. return opt = unpickle(self.fn.opt) if opt: - ##import pprint - ##pprint.pprint(opt.__dict__) + ##import pprint; pprint.pprint(opt.__dict__) #cardset = self.opt.cardset #cardset.update(opt.cardset) self.opt.__dict__.update(opt.__dict__) diff --git a/pysollib/game.py b/pysollib/game.py index 28bd6deb..c33f3812 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -184,12 +184,18 @@ class Game: if not self.cards: self.cards = self.createCards(progress=self.app.intro.progress) self.initBindings() - self.top.bind('', self.top._sleepEvent) - self.top.bind('<3>', self.top._sleepEvent) + ##self.top.bind('', self.top._sleepEvent) + ##self.top.bind('<3>', self.top._sleepEvent) ##print timer # update display properties self.top.wm_geometry("") # cancel user-specified geometry self.canvas.setInitialSize(self.width, self.height) + # restore game geometry + if self.app.opt.save_games_geometry: + w, h = self.app.opt.games_geometry.get(self.id, (0, 0)) + w, h = max(w, self.width), max(h, self.height) + self.canvas.config(width=w, height=h) + # self.stats.update_time = time.time() self.busy = old_busy ##print timer @@ -784,7 +790,8 @@ class Game: # def playSample(self, name, priority=0, loop=0): - if not self.app.opt.sound_samples[name]: + if self.app.opt.sound_samples.has_key(name) and \ + not self.app.opt.sound_samples[name]: return 0 ##print "playSample:", name, priority, loop if self.app.audio: diff --git a/pysollib/games/__init__.py b/pysollib/games/__init__.py index e1de4c40..d5b56af9 100644 --- a/pysollib/games/__init__.py +++ b/pysollib/games/__init__.py @@ -57,3 +57,4 @@ import unionsquare import wavemotion import windmill import yukon +import zodiac diff --git a/pysollib/games/bristol.py b/pysollib/games/bristol.py index e98f6377..528c4bdf 100644 --- a/pysollib/games/bristol.py +++ b/pysollib/games/bristol.py @@ -187,22 +187,25 @@ class Dover_RowStack(RK_RowStack): class Dover(Bristol): Talon_Class = Bristol_Talon - Foundation_Class = SS_FoundationStack - RowStack_Class = Dover_RowStack + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + RowStack_Class = StackWrapper(Dover_RowStack, base_rank=NO_RANK, max_move=1) ReserveStack_Class = StackWrapper(ReserveStack, max_accept=0, max_cards=UNLIMITED_CARDS) - def createGame(self, text=False): + def createGame(self, rows=8, text=False): # create layout l, s = Layout(self), self.s # set window - self.setSize(2*l.XM+9*l.XS, l.YM+20+5*l.YS) + max_rows = max(rows, self.gameinfo.decks*4) + w, h = 2*l.XM+l.XS+max_rows*l.XS, l.YM+20+5*l.YS + self.setSize(w, h) # create stacks - x, y, = l.XM+l.XM+l.XS, l.YM - for i in range(8): - s.foundations.append(self.Foundation_Class(x, y, self, suit=i/2, max_move=0)) - x += l.XS + x, y, = 2*l.XM+l.XS+l.XS*(max_rows-self.gameinfo.decks*4), l.YM + for j in range(self.gameinfo.decks): + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) + x += l.XS if text: x, y = l.XM+8*l.XS, l.YM tx, ty, ta, tf = l.getTextAttr(None, "s") @@ -210,12 +213,12 @@ class Dover(Bristol): font = self.app.getFont("canvas_default") self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) - x, y = l.XM+l.XM, l.YM+l.YS + x, y = 2*l.XM+(max_rows-rows)*l.XS, l.YM+l.YS if text: y += 20 - for i in range(8): + for i in range(rows): x += l.XS - stack = self.RowStack_Class(x, y, self, base_rank=NO_RANK, max_move=1) + stack = self.RowStack_Class(x, y, self) stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET s.rows.append(stack) x, y, = l.XM, l.YM @@ -262,9 +265,9 @@ class NewYork_RowStack(AC_RowStack): class NewYork(Dover): - Foundation_Class = StackWrapper(SS_FoundationStack, mod=13) + Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, max_move=0) Talon_Class = NewYork_Talon - RowStack_Class = StackWrapper(NewYork_RowStack, base_rank=ANY_RANK, mod=13) + RowStack_Class = StackWrapper(NewYork_RowStack, base_rank=ANY_RANK, mod=13, max_move=1) ReserveStack_Class = StackWrapper(NewYork_ReserveStack, max_accept=1, max_cards=UNLIMITED_CARDS, mod=13) def createGame(self): @@ -315,6 +318,30 @@ class NewYork(Dover): p.dump(self.base_card.id) +# /*********************************************************************** +# // Spike +# ************************************************************************/ + +class Spike(Dover): + + Foundation_Class = SS_FoundationStack + RowStack_Class = KingAC_RowStack + + def createGame(self): + Dover.createGame(self, rows=7) + + def startGame(self): + for i in range(1, 7): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + abs(card1.rank-card2.rank) == 1) + + # register the game registerGame(GameInfo(42, Bristol, "Bristol", GI.GT_FAN_TYPE, 1, 0)) @@ -324,4 +351,6 @@ registerGame(GameInfo(266, Dover, "Dover", GI.GT_FAN_TYPE, 2, 0)) registerGame(GameInfo(425, NewYork, "New York", GI.GT_FAN_TYPE, 2, 0)) +registerGame(GameInfo(468, Spike, "Spike", + GI.GT_KLONDIKE, 1, 0)) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index cf6ff610..0d382683 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -325,6 +325,8 @@ class LexingtonHarp(MilliganHarp): GAME_VERSION = 2 RowStack_Class = Yukon_AC_RowStack Hint_Class = YukonType_Hint + def getHighlightPilesStacks(self): + return () class Brunswick(LexingtonHarp): @@ -344,6 +346,7 @@ class Griffon(Mississippi): # /*********************************************************************** # // Blockade +# // Phantom Blockade # ************************************************************************/ class Blockade(Gypsy): @@ -364,6 +367,24 @@ class Blockade(Gypsy): self.s.talon.moveMove(1, stack) self.leaveState(old_state) + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + abs(card1.rank-card2.rank) == 1) + + +class PhantomBlockade(Gypsy): + Layout_Method = Layout.klondikeLayout + RowStack_Class = KingAC_RowStack + + def createGame(self): + Gypsy.createGame(self, rows=13, playcards=24) + + def startGame(self): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + # /*********************************************************************** # // Cone @@ -507,4 +528,6 @@ registerGame(GameInfo(412, Cone, "Cone", GI.GT_GYPSY, 2, 0)) registerGame(GameInfo(463, Surprise, "Surprise", GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(469, PhantomBlockade, "Phantom Blockade", + GI.GT_GYPSY, 2, 0)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index feac717c..cc42ebd1 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -950,6 +950,27 @@ class SevenDevils(Klondike): self.s.talon.dealRow(rows=self.s.reserves) +# /*********************************************************************** +# // Moving Left +# ************************************************************************/ + +class MovingLeft(Klondike): + + def createGame(self): + Klondike.createGame(self, max_rounds=1, rows=10, playcards=24) + + def fillStack(self, stack): + if not stack.cards: + old_state = self.enterState(self.S_FILL) + if stack in self.s.rows: + i = list(self.s.rows).index(stack) + if i < 9: + from_stack = self.s.rows[i+1] + pile = from_stack.getPile() + if pile: + from_stack.moveMove(len(pile), stack) + self.leaveState(old_state) + # register the game registerGame(GameInfo(2, Klondike, "Klondike", @@ -1042,4 +1063,6 @@ registerGame(GameInfo(452, DoubleEasthaven, "Double Easthaven", GI.GT_GYPSY, 2, 0)) registerGame(GameInfo(453, TripleEasthaven, "Triple Easthaven", GI.GT_GYPSY, 3, 0)) +registerGame(GameInfo(470, MovingLeft, "Moving Left", + GI.GT_KLONDIKE, 2, 0)) diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index d3f6a541..6e083183 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -640,6 +640,9 @@ class Chelicera(Game): for i in range(3): self.s.talon.dealRow(rows=self.s.rows[4:]) + def getHighlightPilesStacks(self): + return () + def shallHighlightMatch(self, stack1, card1, stack2, card2): return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 @@ -793,6 +796,9 @@ class Applegate(Game): return False return True + def getHighlightPilesStacks(self): + return () + def shallHighlightMatch(self, stack1, card1, stack2, card2): return (card1.suit == card2.suit and ((card1.rank + 1) % stack1.cap.mod == card2.rank or diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index ac365573..949425cd 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -347,21 +347,31 @@ Diamond: 4 8 Q 3 7 J 2 6 T A 5 9 K''')) # /*********************************************************************** # // Double Yukon +# // Double Russian Solitaire # ************************************************************************/ class DoubleYukon(Yukon): def createGame(self): Yukon.createGame(self, rows=10) def startGame(self): - for i in range(1, len(self.s.rows)): + for i in range(1, len(self.s.rows)-1): self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + #self.s.talon.dealRow(rows=self.s.rows, flip=0, frames=0) for i in range(5): - self.s.talon.dealRow(rows=self.s.rows, flip=1, frames=0) + self.s.talon.dealRow(flip=1, frames=0) self.startDealSample() - self.s.talon.dealRow(rows=self.s.rows[:-1]) + self.s.talon.dealRow() assert len(self.s.talon.cards) == 0 +class DoubleRussianSolitaire(DoubleYukon): + RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + # /*********************************************************************** # // Triple Yukon # ************************************************************************/ @@ -543,3 +553,5 @@ registerGame(GameInfo(450, RawPrawn, "Raw Prawn", GI.GT_YUKON, 1, 0)) registerGame(GameInfo(456, BimBom, "Bim Bom", GI.GT_YUKON | GI.GT_ORIGINAL, 2, 0)) +registerGame(GameInfo(466, DoubleRussianSolitaire, "Double Russian Solitaire", + GI.GT_YUKON | GI.GT_ORIGINAL, 2, 0)) diff --git a/pysollib/games/zodiac.py b/pysollib/games/zodiac.py new file mode 100644 index 00000000..aed43fbb --- /dev/null +++ b/pysollib/games/zodiac.py @@ -0,0 +1,126 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint + +# /*********************************************************************** +# // Zodiac +# ************************************************************************/ + +class Zodiac_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return False + if self.game.s.waste.cards or self.game.s.talon.cards: + return False + return True + + +class Zodiac_RowStack(UD_SS_RowStack): + def acceptsCards(self, from_stack, cards): + if not UD_SS_RowStack.acceptsCards(self, from_stack, cards): + return False + if from_stack in self.game.s.rows: + return False + return True + +class Zodiac_ReserveStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return False + if from_stack in self.game.s.rows: + return False + return True + + + +class Zodiac(Game): + + def createGame(self): + + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+12*l.XS, l.YM+5*l.YS + self.setSize(w, h) + + # create stacks + x = l.XM + for i in range(12): + for y in (l.YM, l.YM+4*l.YS): + stack = Zodiac_RowStack(x, y, self, base_rank=NO_RANK) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + x += l.XS + + x = l.XM+4*l.XS + for i in range(4): + y = l.YM+l.YS + s.foundations.append(Zodiac_Foundation(x, y, self, suit=i)) + y += 2*l.YS + s.foundations.append(Zodiac_Foundation(x, y, self, suit=i, + base_rank=KING, dir=-1)) + x += l.XS + + x, y = l.XM+2*l.XS, l.YM+2*l.YS + for i in range(8): + s.reserves.append(Zodiac_ReserveStack(x, y, self)) + x += l.XS + + x, y = l.XM+l.XS, l.YM+l.YS + s.talon = WasteTalonStack(x, y, self, + max_rounds=UNLIMITED_REDEALS) + l.createText(s.talon, 'sw') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'se') + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow() + self.s.talon.dealCards() + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +# register the game +registerGame(GameInfo(467, Zodiac, "Zodiac", + GI.GT_2DECK_TYPE, 2, -1)) diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index a38b69a3..cd7b277a 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -338,7 +338,7 @@ class PysolMenubar(PysolMenubarActions): submenu.add_checkbutton(label=n_("Show removed tiles (in Mahjongg games)"), variable=self.tkopt.mahjongg_show_removed, command=self.mOptMahjonggShowRemoved) submenu.add_checkbutton(label=n_("Show hint arrow (in Shisen-Sho games)"), variable=self.tkopt.shisen_show_hint, command=self.mOptShisenShowHint) menu.add_separator() - label = n_("&Sound") + label = n_("&Sound...") if self.app.audio.audiodev is None: menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSoundDialog, state=Tkinter.DISABLED) else: @@ -372,6 +372,7 @@ class PysolMenubar(PysolMenubarActions): submenu.add_checkbutton(label=n_("Show &statusbar"), variable=self.tkopt.statusbar, command=self.mOptStatusbar) submenu.add_checkbutton(label=n_("Show &number of cards"), variable=self.tkopt.num_cards, command=self.mOptNumCards) submenu.add_checkbutton(label=n_("Show &help bar"), variable=self.tkopt.helpbar, command=self.mOptHelpbar) + menu.add_checkbutton(label=n_("Save games &geometry"), variable=self.tkopt.save_games_geometry, command=self.mOptSaveGamesGeometry) menu.add_checkbutton(label=n_("&Demo logo"), variable=self.tkopt.demo_logo, command=self.mOptDemoLogo) menu.add_checkbutton(label=n_("Startup splash sc&reen"), variable=self.tkopt.splashscreen, command=self.mOptSplashscreen) ### menu.add_separator() @@ -866,6 +867,7 @@ class PysolMenubar(PysolMenubarActions): self._cancelDrag() self.game.endGame(bookmark=1) self.game.quitGame(bookmark=1) + self.app.opt.games_geometry = {} # clear saved games geometry def _mOptCardback(self, index): if self._cancelDrag(break_pause=False): return @@ -958,7 +960,8 @@ class PysolMenubar(PysolMenubarActions): if not self.app.statusbar: return side = self.tkopt.statusbar.get() self.app.opt.statusbar = side - if self.app.statusbar.show(side): + resize = not self.app.opt.save_games_geometry + if self.app.statusbar.show(side, resize=resize): self.top.update_idletasks() def mOptNumCards(self, *event): @@ -970,9 +973,14 @@ class PysolMenubar(PysolMenubarActions): if not self.app.helpbar: return show = self.tkopt.helpbar.get() self.app.opt.helpbar = show - if self.app.helpbar.show(show): + resize = not self.app.opt.save_games_geometry + if self.app.helpbar.show(show, resize=resize): self.top.update_idletasks() + def mOptSaveGamesGeometry(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.save_games_geometry = self.tkopt.save_games_geometry.get() + def mOptDemoLogo(self, *event): if self._cancelDrag(break_pause=False): return self.app.opt.demo_logo = self.tkopt.demo_logo.get() @@ -1002,7 +1010,8 @@ class PysolMenubar(PysolMenubarActions): if self._cancelDrag(break_pause=False): return self.app.opt.toolbar = side self.tkopt.toolbar.set(side) # update radiobutton - if self.app.toolbar.show(side): + resize = not self.app.opt.save_games_geometry + if self.app.toolbar.show(side, resize=resize): self.top.update_idletasks() def setToolbarSize(self, size): diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index f6adaaf8..b4cff8cf 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -74,31 +74,33 @@ class SoundOptionsDialog(MfxDialog): self.music_volume = IntVar() self.music_volume.set(app.opt.sound_music_volume) self.samples = [ - ('areyousure', 'AreYouSure', BooleanVar()), - ('autodrop', 'AutoDrop', BooleanVar()), - ('autoflip', 'AutoFlip', BooleanVar()), - ('autopilotlost', 'AutopilotLost', BooleanVar()), - ('autopilotwon', 'AutopilotWon', BooleanVar()), - ('deal', 'Deal', BooleanVar()), - #('deal01', 'Deal01', BooleanVar()), - #('deal02', 'Deal02', BooleanVar()), - #('deal04', 'Deal04', BooleanVar()), - #('deal08', 'Deal08', BooleanVar()), - ('dealwaste', 'DealWaste', BooleanVar()), - ('droppair', 'DropPair', BooleanVar()), - ('drop', 'Drop', BooleanVar()), - #('extra', 'Extra', BooleanVar()), - ('flip', 'Flip', BooleanVar()), - ('move', 'Move', BooleanVar()), - ('nomove', 'NoMove', BooleanVar()), - ('redo', 'Redo', BooleanVar()), - ('startdrag', 'StartDrag', BooleanVar()), - ('turnwaste', 'TurnWaste', BooleanVar()), - ('undo', 'Undo', BooleanVar()), - ('gamefinished', 'GameFinished', BooleanVar()), - ('gamelost', 'GameLost', BooleanVar()), - ('gameperfect', 'GamePerfect', BooleanVar()), - ('gamewon', 'GameWon', BooleanVar()), + ('areyousure', _('Are You Sure'), BooleanVar()), + + ('deal', _('Deal'), BooleanVar()), + ('dealwaste', _('Deal waste'), BooleanVar()), + + ('turnwaste', _('Turn waste'), BooleanVar()), + ('startdrag', _('Start drag'), BooleanVar()), + + ('drop', _('Drop'), BooleanVar()), + ('droppair', _('Drop pair'), BooleanVar()), + ('autodrop', _('Auto drop'), BooleanVar()), + + ('flip', _('Flip'), BooleanVar()), + ('autoflip', _('Auto flip'), BooleanVar()), + ('move', _('Move'), BooleanVar()), + ('nomove', _('No move'), BooleanVar()), + + ('undo', _('Undo'), BooleanVar()), + ('redo', _('Redo'), BooleanVar()), + + ('autopilotlost', _('Autopilot lost'), BooleanVar()), + ('autopilotwon', _('Autopilot won'), BooleanVar()), + + ('gamefinished', _('Game finished'), BooleanVar()), + ('gamelost', _('Game lost'), BooleanVar()), + ('gamewon', _('Game won'), BooleanVar()), + ('gameperfect', _('Perfect game'), BooleanVar()), ] # diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 9e630012..b7466b2e 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -125,15 +125,15 @@ class tkHTMLWriter(formatter.DumbWriter): self.text.tag_bind(tag, "<1>", self.createCallback(url)) self.text.tag_bind(tag, "", lambda e: self.anchor_enter(url)) self.text.tag_bind(tag, "", self.anchor_leave) - self.text.tag_config(tag, foreground="blue", underline=1) + fg = 'blue' + u = self.viewer.normurl(url, with_protocol=False) + if u in self.viewer.visited_urls: + fg = '#303080' + self.text.tag_config(tag, foreground=fg, underline=1) self.anchor = None def anchor_enter(self, url): - for p in REMOTE_PROTOCOLS: - if url.startswith(p): - break - else: - url = 'file://'+self.viewer.basejoin(url) + url = self.viewer.normurl(url) self.viewer.statusbar.updateText(url=url) self.text.config(cursor=self.viewer.handcursor) @@ -219,6 +219,7 @@ class tkHTMLViewer: list = [], index = 0, ) + self.visited_urls = [] self.images = {} # need to keep a reference because of garbage collection self.defcursor = parent["cursor"] ##self.defcursor = 'xterm' @@ -247,7 +248,8 @@ class tkHTMLViewer: text_frame = Tkinter.Frame(parent) text_frame.grid(row=1, column=0, columnspan=4, sticky='nsew') self.text = Tkinter.Text(text_frame, - fg='black', bg='white', bd=0, + fg='black', bg='white', + bd=1, relief='sunken', cursor=self.defcursor, wrap='word', padx=20, pady=20) self.text.pack(side=Tkinter.LEFT, fill=Tkinter.BOTH, expand=1) @@ -287,24 +289,22 @@ class tkHTMLViewer: except: pass self.parent = None + def _yview(self, *args): + apply(self.text.yview, args, {}) + return 'break' + def page_up(self, *event): - self.text.yview_scroll(-1, "page") - return "break" + return self._yview('scroll', -1, 'page') def page_down(self, *event): - self.text.yview_scroll(1, "page") - return "break" + return self._yview('scroll', 1, 'page') def unit_up(self, *event): - self.text.yview_scroll(-1, "unit") - return "break" + return self._yview('scroll', -1, 'unit') def unit_down(self, *event): - self.text.yview_scroll(1, "unit") - return "break" + return self._yview('scroll', 1, 'unit') def scroll_top(self, *event): - self.text.yview_moveto(0) - return "break" + return self._yview('moveto', 0) def scroll_bottom(self, *event): - self.text.yview_moveto(1) - return "break" + return self._yview('moveto', 1) # locate a file relative to the current self.url def basejoin(self, url, baseurl=None, relpath=1): @@ -325,6 +325,18 @@ class tkHTMLViewer: url = os.path.normpath(url) return url + def normurl(self, url, with_protocol=True): + for p in REMOTE_PROTOCOLS: + if url.startswith(p): + break + else: + url = self.basejoin(url) + if with_protocol: + if os.name == 'nt': + url = url.replace('\\', '/') + url = 'file://'+url + return url + def openfile(self, url): if url[-1:] == "/" or os.path.isdir(url): url = os.path.join(url, "index.html") @@ -338,6 +350,7 @@ class tkHTMLViewer: if self.app and self.app.game: self.app.game.stopDemo() ##self.app.game._cancelDrag() + ##pass # ftp: and http: would work if we use urllib, but this widget is # far too limited to display anything but our documentation... @@ -418,6 +431,8 @@ to open the following URL: ##self.frame.config(cursor=self.defcursor) def addHistory(self, url, xview=0, yview=0): + if not url in self.visited_urls: + self.visited_urls.append(url) if self.history.index > 0: u, xv, yv = self.history.list[self.history.index-1] if cmp(u, url) == 0: diff --git a/pysollib/tk/tktree.py b/pysollib/tk/tktree.py index dd047d30..fe339fad 100644 --- a/pysollib/tk/tktree.py +++ b/pysollib/tk/tktree.py @@ -38,7 +38,7 @@ import os, string, types import Tkinter # Toolkit imports -from tkutil import bind, unbind_destroy +from tkutil import bind from tkwidget import MfxScrolledCanvas @@ -244,6 +244,7 @@ class MfxTreeInCanvas(MfxScrolledCanvas): def __init__(self, parent, rootnodes, **kw): bg = kw["bg"] = kw.get("bg") or parent.cget("bg") + kw['bd'] = 0 apply(MfxScrolledCanvas.__init__, (self, parent,), kw) # self.rootnodes = rootnodes diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 85e7ed88..5d7400dd 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -420,7 +420,7 @@ class MfxTooltip: class MfxScrolledCanvas: def __init__(self, parent, hbar=2, vbar=2, **kw): bg = kw.get("bg", parent.cget("bg")) - kwdefault(kw, bg=bg, highlightthickness=0) + kwdefault(kw, bg=bg, highlightthickness=0, bd=1, relief='sunken') self.parent = parent self.createFrame(kw) self.canvas = None @@ -629,41 +629,36 @@ class MfxScrolledCanvas: self.vbar_show = show return 1 + def _xview(self, *args): + if self.hbar_show: apply(self.canvas.xview, args, {}) + return 'break' + def _yview(self, *args): + if self.vbar_show: apply(self.canvas.yview, args, {}) + return 'break' + def page_up(self, *event): - self.canvas.yview_scroll(-1, "page") - return "break" + return self._yview('scroll', -1, 'page') def page_down(self, *event): - self.canvas.yview_scroll(1, "page") - return "break" + return self._yview('scroll', 1, 'page') def unit_up(self, *event): - self.canvas.yview_scroll(-1, "unit") - return "break" + return self._yview('scroll', -1, 'unit') def unit_down(self, *event): - self.canvas.yview_scroll(1, "unit") - return "break" + return self._yview('scroll', 1, 'unit') def mouse_wheel_up(self, *event): - self.canvas.yview_scroll(-5, "unit") - return "break" + return self._yview('scroll', -5, 'unit') def mouse_wheel_down(self, *event): - self.canvas.yview_scroll(5, "unit") - return "break" + return self._yview('scroll', 5, 'unit') def page_left(self, *event): - self.canvas.xview_scroll(-1, "page") - return "break" + return self._xview('scroll', -1, 'page') def page_right(self, *event): - self.canvas.xview_scroll(1, "page") - return "break" + return self._xview('scroll', 1, 'page') def unit_left(self, *event): - self.canvas.xview_scroll(-1, "unit") - return "break" + return self._xview('scroll', -1, 'unit') def unit_right(self, *event): - self.canvas.xview_scroll(1, "unit") - return "break" + return self._xview('scroll', 1, 'unit') def scroll_top(self, *event): - self.canvas.yview_moveto(0) - return "break" + return self._yview('moveto', 0) def scroll_bottom(self, *event): - self.canvas.yview_moveto(1) - return "break" + return self._yview('moveto', 1) From 36e28b5385b965ccd8b48bf1ffb6158285201850 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 17 Jun 2006 21:18:07 +0000 Subject: [PATCH 008/266] + 37 new games git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@9 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 8 +-- pysollib/games/auldlangsyne.py | 43 +++++++++++++ pysollib/games/beleagueredcastle.py | 54 +++++++++++++++- pysollib/games/canfield.py | 72 +++++++++++----------- pysollib/games/curdsandwhey.py | 88 ++++++++++++++++++++++++++ pysollib/games/diplomat.py | 62 ++++++++++++++++++- pysollib/games/fortythieves.py | 52 ++++++++++++++-- pysollib/games/gypsy.py | 56 +++++++++++++++++ pysollib/games/harp.py | 55 ++++++++++++++++- pysollib/games/klondike.py | 95 ++++++++++++++++++++++++++++- pysollib/games/numerica.py | 65 +++++++++++++++++++- pysollib/games/spider.py | 56 ++++++++++++----- pysollib/games/sultan.py | 58 ++++++++++++++++++ pysollib/games/terrace.py | 54 ++++++++++++---- pysollib/games/ultra/hanafuda1.py | 6 +- pysollib/games/windmill.py | 69 ++++++++++++++++++++- pysollib/games/yukon.py | 44 ++++++++++++- 17 files changed, 847 insertions(+), 90 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index ea1c99b9..bbdbcde3 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -96,7 +96,7 @@ class Options: self.highlight_piles = 1 self.highlight_cards = 1 self.highlight_samerank = 1 - self.highlight_not_matching = 0 + self.highlight_not_matching = 1 self.mahjongg_show_removed = False self.mahjongg_create_solvable = True self.shisen_show_hint = True @@ -108,6 +108,8 @@ class Options: self.toolbar = 1 ##self.toolbar_style = 'default' self.toolbar_style = 'crystal' + if os.name == 'posix': + self.toolbar_style = 'bluecurve' self.toolbar_relief = 'flat' self.toolbar_compound = 'none' # icons only self.toolbar_size = 0 @@ -129,10 +131,6 @@ class Options: 'autopilotlost' : True, 'autopilotwon' : True, 'deal' : True, - #'deal01' : True, - #'deal02' : True, - #'deal04' : True, - #'deal08' : True, 'dealwaste' : True, 'droppair' : True, 'drop' : True, diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index a12f2d8d..f654e657 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -442,6 +442,47 @@ class Amazons(Game): return ((), (), self.sg.dropstacks) +# /*********************************************************************** +# // Acquaintance +# ************************************************************************/ + +class Acquaintance_Talon(TalonStack): # TalonStack + + def canDealCards(self): + if self.round == self.max_rounds and not self.cards: + return False + return not self.game.isGameWon() + + def _redeal(self): + # move all cards to the Talon + lr = len(self.game.s.rows) + num_cards = 0 + assert len(self.cards) == 0 + rows = self.game.s.rows + for r in rows: + for i in range(len(r.cards)): + num_cards = num_cards + 1 + self.game.moveMove(1, r, self, frames=4) + self.game.flipMove(self) + assert len(self.cards) == num_cards + if num_cards == 0: # game already finished + return + self.game.nextRoundMove(self) + + def dealCards(self, sound=0): + if sound: + self.game.startDealSample() + if len(self.cards) == 0: + self._redeal() + n = self.dealRowAvail(sound=sound) + if sound: + self.game.stopSamples() + return n + +class Acquaintance(AuldLangSyne): + Talon_Class = StackWrapper(Acquaintance_Talon, max_rounds=3) + + # register the game registerGame(GameInfo(172, TamOShanter, "Tam O'Shanter", GI.GT_NUMERICA, 1, 0)) @@ -457,4 +498,6 @@ registerGame(GameInfo(406, Amazons, "Amazons", GI.GT_NUMERICA, 1, -1, ranks=(0, 6, 7, 8, 9, 10, 11), )) +registerGame(GameInfo(490, Acquaintance, "Acquaintance", + GI.GT_NUMERICA, 1, 2)) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 83e38eaa..fa3eb092 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -626,6 +626,57 @@ class Rittenhouse(Game): return abs(card1.rank - card2.rank) == 1 +# /*********************************************************************** +# // Castle Mount +# ************************************************************************/ + +class CastleMount(StreetsAndAlleys): + DEAL = (11, 1) + RowStack_Class = Spider_SS_RowStack + + def createGame(self, rows=12): + l, s = Layout(self), self.s + max_rows = max(12, rows) + self.setSize(l.XM+max_rows*l.XS, l.YM+2*l.YS+20*l.YOFFSET) + + x, y = l.XM+(max_rows-12)*l.XS/2, l.YM + for i in range(4): + for j in range(3): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + max_move=0)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + s.talon = InitialDealTalonStack(self.width-l.XS, self.height-l.YS, self) + + l.defaultAll() + + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, c.suit)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(self.DEAL[0]): + self.s.talon.dealRow(frames=0) + self.startDealSample() + for i in range(self.DEAL[1]): + self.s.talon.dealRowAvail() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1) % stack1.cap.mod == card2.rank or + (card2.rank + 1) % stack1.cap.mod == card1.rank) + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack.cards: + return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 + return 0 + + # register the game registerGame(GameInfo(146, StreetsAndAlleys, "Streets and Alleys", @@ -656,4 +707,5 @@ registerGame(GameInfo(395, Zerline3Decks, "Zerline (3 decks)", GI.GT_BELEAGUERED_CASTLE | GI.GT_ORIGINAL, 3, 0)) registerGame(GameInfo(400, Rittenhouse, "Rittenhouse", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 2, 0)) - +registerGame(GameInfo(507, CastleMount, "Castle Mount", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 3, 0)) diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 13d8538b..c1a58d21 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -111,8 +111,14 @@ class Canfield(Game): decks = self.gameinfo.decks # set window + if self.INITIAL_RESERVE_FACEUP == 1: + yoffset = l.YOFFSET ##min(l.YOFFSET, 14) + else: + yoffset = 10 + if self.INITIAL_RESERVE_CARDS > 30: + yoffset = 5 # (piles up to 20 cards are playable in default window size) - h = max(3*l.YS, l.YS+self.INITIAL_RESERVE_CARDS*l.YOFFSET) + h = max(3*l.YS, l.YS+self.INITIAL_RESERVE_CARDS*yoffset) self.setSize(l.XM + (2+max(rows, 4*decks))*l.XS + l.XM, l.YM + l.YS + 20 + h) # extra settings @@ -131,7 +137,7 @@ class Canfield(Game): x = x + l.XS s.foundations.append(self.Foundation_Class(x, y, self, i, mod=13, max_move=0)) if text: - if rows >= 4 * decks: + if rows > 4 * decks: tx, ty, ta, tf = l.getTextAttr(None, "se") tx, ty = x + tx + l.XM, y + ty else: @@ -141,10 +147,7 @@ class Canfield(Game): self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) x, y = l.XM, l.YM + l.YS + 20 s.reserves.append(self.ReserveStack_Class(x, y, self)) - if self.INITIAL_RESERVE_FACEUP == 1: - s.reserves[0].CARD_YOFFSET = l.YOFFSET ##min(l.YOFFSET, 14) - else: - s.reserves[0].CARD_YOFFSET = 10 + s.reserves[0].CARD_YOFFSET = yoffset x = l.XM + 2 * l.XS + l.XM for i in range(rows): s.rows.append(self.RowStack_Class(x, y, self)) @@ -509,17 +512,19 @@ class LittleGate(Gate): # /*********************************************************************** +# // Minerva # // Munger +# // Mystique # ************************************************************************/ -class Munger(Canfield): - - RowStack_Class = StackWrapper(AC_RowStack, base_rank=KING) +class Minerva(Canfield): + RowStack_Class = KingAC_RowStack FILL_EMPTY_ROWS = 0 + INITIAL_RESERVE_CARDS = 11 def createGame(self): - Canfield.createGame(self, rows=7, max_rounds=1, num_deal=1) + Canfield.createGame(self, rows=7, max_rounds=2, num_deal=1, text=False) def startGame(self): self.s.talon.dealRow(frames=0, flip=0) @@ -527,14 +532,13 @@ class Munger(Canfield): self.s.talon.dealRow(frames=0, flip=0) self.startDealSample() self.s.talon.dealRow() - for i in range(7): + for i in range(self.INITIAL_RESERVE_CARDS): self.moveMove(1, self.s.talon, self.s.reserves[0], frames=4, shadow=0) self.flipMove(self.s.reserves[0]) self.s.talon.dealCards() def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - abs(card1.rank-card2.rank) == 1) + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 def _restoreGameHook(self, game): pass @@ -544,6 +548,17 @@ class Munger(Canfield): pass +class Munger(Minerva): + INITIAL_RESERVE_CARDS = 7 + def createGame(self): + Canfield.createGame(self, rows=7, max_rounds=1, num_deal=1, text=False) + + +class Mystique(Munger): + RowStack_Class = AC_RowStack + INITIAL_RESERVE_CARDS = 9 + + # /*********************************************************************** # // Triple Canfield # ************************************************************************/ @@ -643,31 +658,14 @@ class Duke(Game): # /*********************************************************************** -# // Minerva +# // Demon # ************************************************************************/ -class Minerva(Canfield): - RowStack_Class = StackWrapper(AC_RowStack, base_rank=KING) - - INITIAL_RESERVE_CARDS = 11 - INITIAL_RESERVE_FACEUP = 1 - FILL_EMPTY_ROWS = 0 - +class Demon(Canfield): + INITIAL_RESERVE_CARDS = 40 + RowStack_Class = StackWrapper(AC_RowStack, mod=13) def createGame(self): - Canfield.createGame(self, rows=7, max_rounds=2, num_deal=1, text=False) - - def startGame(self): - for i in range(self.INITIAL_RESERVE_CARDS): - self.flipMove(self.s.talon) - self.moveMove(1, self.s.talon, self.s.reserves[0], frames=0, shadow=0) - flip = False - for i in range(3): - self.s.talon.dealRow(flip=flip, frames=0) - flip = not flip - self.startDealSample() - self.s.talon.dealRow() - self.s.talon.dealCards() - + Canfield.createGame(self, rows=8, max_rounds=UNLIMITED_REDEALS, num_deal=1) # register the game @@ -707,4 +705,8 @@ registerGame(GameInfo(413, Duke, "Duke", GI.GT_CANFIELD, 1, 2)) registerGame(GameInfo(422, Minerva, "Minerva", GI.GT_CANFIELD, 1, 1)) +registerGame(GameInfo(476, Demon, "Demon", + GI.GT_CANFIELD, 2, -1)) +registerGame(GameInfo(494, Mystique, "Mystique", + GI.GT_CANFIELD, 1, 0)) diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index 43157a7c..07bdb472 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -305,6 +305,88 @@ class BavarianPatience(GermanPatience): GermanPatience.createGame(self, rows=10) +# /*********************************************************************** +# // Trusty Twelve +# // Knotty Nines +# // Sweet Sixteen +# ************************************************************************/ + +class TrustyTwelve_Hint(AbstractHint): + def computeHints(self): + game = self.game + for r in game.s.rows: + for t in game.s.rows: + if r is t: + continue + card = r.cards[-1] + if len(r.cards) == 1 and t.acceptsCards(r, [card]): + if len(t.cards) > 1: + self.addHint(6000+card.rank, 1, r, t) + else: + self.addHint(5000+card.rank, 1, r, t) + + +class TrustyTwelve(Game): + Hint_Class = TrustyTwelve_Hint + + def createGame(self, rows=12): + l, s = Layout(self), self.s + self.setSize(l.XM+(rows+1)*l.XS, l.YM+l.YS+12*l.YOFFSET) + x, y = l.XM, l.YM + s.talon = TalonStack(x, y, self) + l.createText(s.talon, "ss") + x += l.XS + for i in range(rows): + s.rows.append(RK_RowStack(x, y, self, max_move=1)) + x += l.XS + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + def fillStack(self, stack): + if not stack.cards and stack in self.s.rows: + if self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) + + def isGameWon(self): + return len(self.s.talon.cards) == 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + +class KnottyNines(TrustyTwelve): + def createGame(self): + TrustyTwelve.createGame(self, rows=9) + + +class SweetSixteen(TrustyTwelve): + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+9*l.XS, l.YM+2*l.YS+20*l.YOFFSET) + x, y = l.XM, l.YM + s.talon = TalonStack(x, y, self) + l.createText(s.talon, "ss") + y = l.YM + for i in range(2): + x = l.XM+l.XS + for j in range(8): + s.rows.append(AC_RowStack(x, y, self, max_move=1)) + x += l.XS + y += l.YS+10*l.YOFFSET + l.defaultStackGroups() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + + # register the game registerGame(GameInfo(294, CurdsAndWhey, "Curds and Whey", GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) @@ -324,4 +406,10 @@ registerGame(GameInfo(414, GermanPatience, "German Patience", GI.GT_2DECK_TYPE, 2, 0)) registerGame(GameInfo(415, BavarianPatience, "Bavarian Patience", GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(480, TrustyTwelve, "Trusty Twelve", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(481, KnottyNines, "Knotty Nines", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(482, SweetSixteen, "Sweet Sixteen", + GI.GT_1DECK_TYPE, 1, 0)) diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py index 3e05366d..1f87a62f 100644 --- a/pysollib/games/diplomat.py +++ b/pysollib/games/diplomat.py @@ -42,7 +42,9 @@ from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint -from pysollib.games.fortythieves import FortyThieves_Hint +from fortythieves import FortyThieves_Hint +from spider import Spider_Hint + # /*********************************************************************** # // Diplomat @@ -65,7 +67,7 @@ class Diplomat(Game): l, s = Layout(self), self.s # set window - self.setSize(l.XM + 8*l.XS, l.YM + 5*l.YS) + self.setSize(l.XM+8*l.XS, l.YM+3*l.YS+12*l.YOFFSET+20) # create stacks x, y = l.XM, l.YM @@ -171,6 +173,58 @@ class RowsOfFour(Diplomat): Diplomat.createGame(self, max_rounds=3) +# /*********************************************************************** +# // Dieppe +# ************************************************************************/ + +class Dieppe(Diplomat): + RowStack_Class = RK_RowStack + + def _dealToFound(self): + talon = self.s.talon + if not talon.cards: + return False + talon.flipMove() + for f in self.s.foundations: + if f.acceptsCards(talon, talon.cards[-1:]): + talon.moveMove(1, f) + return True + return False + + def startGame(self): + self.startDealSample() + talon = self.s.talon + for i in range(3): + for r in self.s.rows: + while True: + if not self._dealToFound(): + break + if talon.cards: + talon.moveMove(1, r) + talon.dealCards() + + +# /*********************************************************************** +# // Little Napoleon +# ************************************************************************/ + +class LittleNapoleon(Diplomat): + RowStack_Class = Spider_SS_RowStack + Hint_Class = Spider_Hint + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0, flip=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack.cards: + return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 + return 0 + + # register the game registerGame(GameInfo(149, Diplomat, "Diplomat", GI.GT_FORTY_THIEVES, 2, 0)) @@ -180,4 +234,8 @@ registerGame(GameInfo(150, Congress, "Congress", GI.GT_FORTY_THIEVES, 2, 0)) registerGame(GameInfo(433, RowsOfFour, "Rows of Four", GI.GT_FORTY_THIEVES, 2, 2)) +registerGame(GameInfo(485, Dieppe, "Dieppe", + GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(489, LittleNapoleon, "Little Napoleon", + GI.GT_FORTY_THIEVES, 2, 0)) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index fd67d7b2..e9e9a530 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -73,16 +73,18 @@ class FortyThieves(Game): def createGame(self, max_rounds=1, num_deal=1, rows=10, playcards=12, XCARDS=64, XOFFSET=None): # create layout - XM = (10, 4)[rows > 10] if XOFFSET is None: - l, s = Layout(self, XM=XM, YBOTTOM=16), self.s + l, s = Layout(self, YBOTTOM=16), self.s else: - l, s = Layout(self, XM=XM, XOFFSET=XOFFSET, YBOTTOM=16), self.s + l, s = Layout(self, XOFFSET=XOFFSET, YBOTTOM=16), self.s # set window # (compute best XOFFSET - up to 64/72 cards can be in the Waste) decks = self.gameinfo.decks - maxrows = max(rows, 4*decks+2) + if rows < 12: + maxrows = max(rows, 4*decks+2) + else: + maxrows = max(rows, 4*decks) w1, w2 = maxrows*l.XS+l.XM, 2*l.XS if w2 + XCARDS * l.XOFFSET > w1: l.XOFFSET = int((w1 - w2) / XCARDS) @@ -155,6 +157,8 @@ class FortyThieves(Game): # // Napoleon's Square # // Carre Napoleon # // Josephine +# // Marie Rose +# // Big Courtyard # // rows build down by suit # ************************************************************************/ @@ -225,6 +229,22 @@ class Josephine(FortyThieves): ROW_MAX_MOVE = UNLIMITED_MOVES +class MarieRose(Josephine): + DEAL = (0, 5) + def createGame(self): + FortyThieves.createGame(self, rows=12, playcards=16, XCARDS=96) + + +class BigCourtyard(Courtyard): + def createGame(self): + FortyThieves.createGame(self, rows=12, playcards=16, XCARDS=96) + + +class Express(Limited): + def createGame(self): + FortyThieves.createGame(self, rows=14, playcards=16, XCARDS=96) + + # /*********************************************************************** # // Deuces # ************************************************************************/ @@ -303,6 +323,8 @@ class LittleForty(FortyThieves): # // Rank and File # // Emperor # // Triple Line +# // Big Streets +# // Number Twelve # // rows build down by alternate color # ************************************************************************/ @@ -345,6 +367,16 @@ class TripleLine(Streets): Streets.createGame(self, max_rounds=2, rows=12) +class BigStreets(Streets): + def createGame(self): + FortyThieves.createGame(self, rows=12, XCARDS=96) + + +class NumberTwelve(NumberTen): + def createGame(self): + FortyThieves.createGame(self, rows=12, XCARDS=96) + + # /*********************************************************************** # // Red and Black # // Zebra @@ -718,7 +750,7 @@ class Squadron(FortyThieves): registerGame(GameInfo(13, FortyThieves, "Forty Thieves", GI.GT_FORTY_THIEVES, 2, 0, altnames=("Napoleon at St.Helena", - "Big Forty", "Le Cadran"))) + "Le Cadran"))) registerGame(GameInfo(80, BusyAces, "Busy Aces", GI.GT_FORTY_THIEVES, 2, 0)) registerGame(GameInfo(228, Limited, "Limited", @@ -784,3 +816,13 @@ registerGame(GameInfo(440, Squadron, "Squadron", GI.GT_FORTY_THIEVES, 2, 0)) registerGame(GameInfo(462, Josephine, "Josephine", GI.GT_FORTY_THIEVES, 2, 0)) +registerGame(GameInfo(493, MarieRose, "Marie Rose", + GI.GT_FORTY_THIEVES, 3, 0)) +registerGame(GameInfo(503, BigStreets, "Big Streets", + GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 3, 0)) +registerGame(GameInfo(504, NumberTwelve, "Number Twelve", + GI.GT_FORTY_THIEVES| GI.GT_ORIGINAL, 3, 0)) +registerGame(GameInfo(505, BigCourtyard, "Big Courtyard", + GI.GT_FORTY_THIEVES| GI.GT_ORIGINAL, 3, 0)) +registerGame(GameInfo(506, Express, "Express", + GI.GT_FORTY_THIEVES| GI.GT_ORIGINAL, 3, 0)) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index 0d382683..af286125 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -45,6 +45,9 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.hint import KlondikeType_Hint, YukonType_Hint +from spider import Spider_Hint + + # /*********************************************************************** # // Gypsy # ************************************************************************/ @@ -207,6 +210,7 @@ class DieRussische(Gypsy): # /*********************************************************************** # // Miss Milligan +# // Imperial Guards # ************************************************************************/ class MissMilligan_ReserveStack(AC_RowStack): @@ -263,6 +267,10 @@ class MissMilligan(Gypsy): self.s.talon.dealRow() +class ImperialGuards(MissMilligan): + RowStack_Class = AC_RowStack + + # /*********************************************************************** # // Nomad # ************************************************************************/ @@ -297,6 +305,7 @@ class MilliganCell(MissMilligan): # /*********************************************************************** # // Milligan Harp # // Carlton +# // Steve # ************************************************************************/ class MilliganHarp(Gypsy): @@ -314,6 +323,14 @@ class Carlton(MilliganHarp): MilliganHarp.startGame(self, flip=1) +class Steve(Carlton): + Hint_Class = Spider_Hint + RowStack_Class = Spider_SS_RowStack + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + # /*********************************************************************** # // Lexington Harp # // Brunswick @@ -491,6 +508,37 @@ class Surprise(Gypsy): self.s.talon.dealRow() +# /*********************************************************************** +# // Elba +# ************************************************************************/ + +class Elba(Gypsy): + Layout_Method = Layout.klondikeLayout + RowStack_Class = KingAC_RowStack + + def createGame(self): + Gypsy.createGame(self, rows=10) + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Millie +# ************************************************************************/ + +class Millie(Gypsy): + Layout_Method = Layout.klondikeLayout + RowStack_Class = AC_RowStack + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + # register the game registerGame(GameInfo(1, Gypsy, "Gypsy", GI.GT_GYPSY, 2, 0)) @@ -530,4 +578,12 @@ registerGame(GameInfo(463, Surprise, "Surprise", GI.GT_GYPSY, 2, 0)) registerGame(GameInfo(469, PhantomBlockade, "Phantom Blockade", GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(478, Elba, "Elba", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(486, ImperialGuards, "Imperial Guards", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(487, Millie, "Millie", + GI.GT_GYPSY, 2, 0)) +registerGame(GameInfo(498, Steve, "Steve", + GI.GT_GYPSY, 2, 0)) diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index c7fd281c..e7566be0 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -46,6 +46,8 @@ from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.hint import KlondikeType_Hint from pysollib.pysoltk import MfxCanvasText +from spider import Spider_Hint + # /*********************************************************************** # // Double Klondike (Klondike with 2 decks and 9 rows) @@ -83,9 +85,9 @@ class DoubleKlondike(Game): font=self.app.getFont("canvas_default")) return l - def startGame(self): + def startGame(self, flip=0): for i in range(len(self.s.rows)): - self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=0, frames=0) + self.s.talon.dealRow(rows=self.s.rows[i+1:], flip=flip, frames=0) self.startDealSample() self.s.talon.dealRow() self.s.talon.dealCards() # deal first card to WasteStack @@ -166,6 +168,49 @@ class TripleKlondikeByThrees(DoubleKlondike): DoubleKlondike.createGame(self, rows=13, num_deal=3) +# /*********************************************************************** +# // Lady Jane +# // Inquisitor +# ************************************************************************/ + +class LadyJane(DoubleKlondike): + Hint_Class = Spider_Hint + RowStack_Class = Spider_SS_RowStack + + def createGame(self): + DoubleKlondike.createGame(self, rows=10, max_rounds=2, num_deal=3) + def startGame(self): + DoubleKlondike.startGame(self, flip=1) + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + +class Inquisitor(DoubleKlondike): + RowStack_Class = SS_RowStack + + def createGame(self): + DoubleKlondike.createGame(self, rows=10, max_rounds=3, num_deal=3) + def startGame(self): + DoubleKlondike.startGame(self, flip=1) + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Arabella +# ************************************************************************/ + +class Arabella(DoubleKlondike): + Hint_Class = Spider_Hint + RowStack_Class = StackWrapper(Spider_SS_RowStack, base_rank=KING) + def createGame(self): + DoubleKlondike.createGame(self, rows=13, max_rounds=1, playcards=24) + def startGame(self): + DoubleKlondike.startGame(self, flip=1) + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + # register the game registerGame(GameInfo(21, DoubleKlondike, "Double Klondike", GI.GT_KLONDIKE, 2, -1)) @@ -182,4 +227,10 @@ registerGame(GameInfo(273, TripleKlondike, "Triple Klondike", GI.GT_KLONDIKE, 3, -1)) registerGame(GameInfo(274, TripleKlondikeByThrees, "Triple Klondike by Threes", GI.GT_KLONDIKE, 3, -1)) +registerGame(GameInfo(495, LadyJane, "Lady Jane", + GI.GT_KLONDIKE, 2, 1)) +registerGame(GameInfo(496, Inquisitor, "Inquisitor", + GI.GT_KLONDIKE, 2, 2)) +registerGame(GameInfo(497, Arabella, "Arabella", + GI.GT_KLONDIKE, 3, 0)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index cc42ebd1..d6e961a0 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -952,6 +952,7 @@ class SevenDevils(Klondike): # /*********************************************************************** # // Moving Left +# // Souter # ************************************************************************/ class MovingLeft(Klondike): @@ -964,7 +965,7 @@ class MovingLeft(Klondike): old_state = self.enterState(self.S_FILL) if stack in self.s.rows: i = list(self.s.rows).index(stack) - if i < 9: + if i < len(self.s.rows)-1: from_stack = self.s.rows[i+1] pile = from_stack.getPile() if pile: @@ -972,6 +973,86 @@ class MovingLeft(Klondike): self.leaveState(old_state) +class Souter(MovingLeft): + def createGame(self): + Klondike.createGame(self, max_rounds=2, rows=10, playcards=24) + + +# /*********************************************************************** +# // Big Forty +# // Ali Baba +# // Cassim +# ************************************************************************/ + +class BigForty(Klondike): + RowStack_Class = SS_RowStack + + def createGame(self): + Klondike.createGame(self, rows=10) + + def startGame(self): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +class AliBaba(BigForty): + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, c.suit)) + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + BigForty.startGame(self) + + +class Cassim(AliBaba): + def createGame(self): + Klondike.createGame(self, rows=7) + + +# /*********************************************************************** +# // Saratoga +# ************************************************************************/ + +class Saratoga(Klondike): + def createGame(self): + Klondike.createGame(self, num_deal=3) + def startGame(self): + Klondike.startGame(self, flip=1) + + +# /*********************************************************************** +# // Whitehorse +# ************************************************************************/ + +class Whitehorse(Klondike): + + def createGame(self): + Klondike.createGame(self, num_deal=3) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def fillStack(self, stack): + if not stack.cards: + old_state = self.enterState(self.S_FILL) + if stack in self.s.rows: + if not self.s.waste.cards: + self.s.talon.dealCards() + if self.s.waste.cards: + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + # register the game registerGame(GameInfo(2, Klondike, "Klondike", GI.GT_KLONDIKE, 1, -1)) @@ -1065,4 +1146,16 @@ registerGame(GameInfo(453, TripleEasthaven, "Triple Easthaven", GI.GT_GYPSY, 3, 0)) registerGame(GameInfo(470, MovingLeft, "Moving Left", GI.GT_KLONDIKE, 2, 0)) +registerGame(GameInfo(471, Souter, "Souter", + GI.GT_KLONDIKE, 2, 1)) +registerGame(GameInfo(473, BigForty, "Big Forty", + GI.GT_KLONDIKE, 1, -1)) +registerGame(GameInfo(474, AliBaba, "Ali Baba", + GI.GT_KLONDIKE, 1, -1)) +registerGame(GameInfo(475, Cassim, "Cassim", + GI.GT_KLONDIKE, 1, -1)) +registerGame(GameInfo(479, Saratoga, "Saratoga", + GI.GT_KLONDIKE, 1, -1)) +registerGame(GameInfo(491, Whitehorse, "Whitehorse", + GI.GT_KLONDIKE, 1, -1)) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index 05c9a8b8..ca24b5cf 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -57,7 +57,7 @@ class Numerica_Hint(DefaultHint): #FIXME: implement this method def _getMoveWasteScore(self, score, color, r, t, pile, rpile): - assert r is self.game.s.waste and len(pile) == 1 + assert r in (self.game.s.waste, self.game.s.talon) and len(pile) == 1 score = 30000 if len(t.cards) == 0: score = score - (KING - r.cards[0].rank) * 1000 @@ -496,6 +496,7 @@ class Toad(Game): self.startDealSample() self.s.talon.dealRow(rows=self.s.reserves) + # /*********************************************************************** # // Shifting # ************************************************************************/ @@ -518,6 +519,65 @@ class Shifting(Numerica): RowStack_Class = StackWrapper(Shifting_RowStack, max_accept=1) +# /*********************************************************************** +# // Strategerie +# ************************************************************************/ + +class Strategerie_Talon(OpenTalonStack): + rightclickHandler = OpenStack.rightclickHandler + + +class Strategerie_RowStack(BasicRowStack): + + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return False + if from_stack is self.game.s.talon or from_stack in self.game.s.reserves: + return True + return False + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + def getHelp(self): + return _('Row. Build regardless of rank and suit.') + + +class Strategerie_ReserveStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return False + if from_stack is self.game.s.talon: + return True + return False + + +class Strategerie(Game): + Hint_Class = Numerica_Hint + + def createGame(self, **layout): + # create layout + l, s = Layout(self), self.s + l.freeCellLayout(rows=4, reserves=4, texts=1) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = Strategerie_Talon(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(RK_FoundationStack(r.x, r.y, self)) + for r in l.s.rows: + s.rows.append(Strategerie_RowStack(r.x, r.y, self, + max_accept=UNLIMITED_ACCEPTS)) + for r in l.s.reserves: + s.reserves.append(Strategerie_ReserveStack(r.x, r.y, self)) + # default + l.defaultAll() + self.sg.dropstacks.append(s.talon) + + def startGame(self): + self.startDealSample() + self.s.talon.fillStack() + + # register the game registerGame(GameInfo(257, Numerica, "Numerica", @@ -541,4 +601,5 @@ registerGame(GameInfo(430, PussInTheCorner, "Puss in the Corner", GI.GT_NUMERICA, 1, 0)) registerGame(GameInfo(435, Shifting, "Shifting", GI.GT_NUMERICA, 1, 0)) - +registerGame(GameInfo(472, Strategerie, "Strategerie", + GI.GT_NUMERICA, 1, 0)) diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 6e083183..02f51d7d 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -542,6 +542,7 @@ class Cicely(Game): # /*********************************************************************** # // Trillium # // Lily +# // Wake-Robin # ************************************************************************/ class Trillium(Game): @@ -549,21 +550,21 @@ class Trillium(Game): Hint_Class = Spider_Hint RowStack_Class = StackWrapper(AC_RowStack, base_rank=ANY_RANK) - def createGame(self, **layout): + def createGame(self, rows=13): # create layout l, s = Layout(self), self.s # set window - w, h = l.XM+13*l.XS, l.YM+l.YS+24*l.YOFFSET + w, h = l.XM+rows*l.XS, l.YM+l.YS+24*l.YOFFSET self.setSize(w, h) # create stacks x, y = l.XM, l.YM - for i in range(13): + for i in range(rows): s.rows.append(self.RowStack_Class(x, y, self)) x += l.XS - s.talon = DealRowTalonStack(l.XM+6*l.XS, h-l.YS, self) + s.talon = DealRowTalonStack(l.XM+(rows-1)*l.XS/2, h-l.YS, self) l.createText(s.talon, "se") # define stack-groups @@ -591,6 +592,29 @@ class Lily(Trillium): RowStack_Class = StackWrapper(AC_RowStack, base_rank=KING) +class WakeRobin(Trillium): + RowStack_Class = RK_RowStack + + def createGame(self): + Trillium.createGame(self, rows=9) + + def isGameWon(self): + for s in self.s.rows: + if s.cards: + if len(s.cards) != 13 or not isRankSequence(s.cards): + return False + return True + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + + +class TripleWakeRobin(WakeRobin): + def createGame(self): + Trillium.createGame(self, rows=13) + + # /*********************************************************************** # // Chelicera # ************************************************************************/ @@ -808,9 +832,9 @@ class Applegate(Game): # /*********************************************************************** # // Big Spider # // Spider 3x3 -# // Ground for a Divorce (3 decks) +# // Big Ground # // Spider (4 decks) -# // Ground for a Divorce (4 decks) +# // Very Big Ground # ************************************************************************/ class BigSpider(Spider): @@ -993,11 +1017,11 @@ registerGame(GameInfo(220, RougeEtNoir, "Rouge et Noir", registerGame(GameInfo(269, Spider1Suit, "Spider (1 suit)", GI.GT_SPIDER, 2, 0, suits=(0, 0, 0, 0), - rules_filename = "spider.html")) + rules_filename="spider.html")) registerGame(GameInfo(270, Spider2Suits, "Spider (2 suits)", GI.GT_SPIDER, 2, 0, suits=(0, 0, 2, 2), - rules_filename = "spider.html")) + rules_filename="spider.html")) registerGame(GameInfo(305, ThreeBlindMice, "Three Blind Mice", GI.GT_SPIDER, 1, 0)) registerGame(GameInfo(309, MrsMop, "Mrs. Mop", @@ -1022,8 +1046,7 @@ registerGame(GameInfo(382, Applegate, "Applegate", GI.GT_SPIDER, 1, 0)) registerGame(GameInfo(384, BigSpider, "Big Spider", GI.GT_SPIDER, 3, 0)) -registerGame(GameInfo(401, GroundForADivorce3Decks, - "Ground for a Divorce (3 decks)", +registerGame(GameInfo(401, GroundForADivorce3Decks, "Big Ground", GI.GT_SPIDER, 3, 0)) registerGame(GameInfo(441, York, "York", GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) @@ -1032,19 +1055,18 @@ registerGame(GameInfo(444, TripleYork, "Triple York", registerGame(GameInfo(445, BigSpider1Suit, "Big Spider (1 suit)", GI.GT_SPIDER, 3, 0, suits=(0, 0, 0, 0), - rules_filename = "bigspider.html")) + rules_filename="bigspider.html")) registerGame(GameInfo(446, BigSpider2Suits, "Big Spider (2 suits)", GI.GT_SPIDER, 3, 0, suits=(0, 0, 2, 2), - rules_filename = "bigspider.html")) + rules_filename="bigspider.html")) registerGame(GameInfo(449, Spider3x3, "Spider 3x3", GI.GT_SPIDER | GI.GT_ORIGINAL, 3, 0, suits=(0, 1, 2), - rules_filename = "bigspider.html")) + rules_filename="bigspider.html")) registerGame(GameInfo(454, Spider4Decks, "Spider (4 decks)", GI.GT_SPIDER, 4, 0)) -registerGame(GameInfo(455, GroundForADivorce4Decks, - "Ground for a Divorce (4 decks)", +registerGame(GameInfo(455, GroundForADivorce4Decks, "Very Big Ground", GI.GT_SPIDER, 4, 0)) registerGame(GameInfo(458, Spidike, "Spidike", GI.GT_SPIDER, 1, 0)) # GT_GYPSY ? @@ -1054,4 +1076,8 @@ registerGame(GameInfo(460, FredsSpider3Decks, "Fred's Spider (3 decks)", GI.GT_SPIDER, 3, 0)) registerGame(GameInfo(461, OpenSpider, "Open Spider", GI.GT_SPIDER, 2, 0)) +registerGame(GameInfo(501, WakeRobin, "Wake-Robin", + GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0)) +registerGame(GameInfo(502, TripleWakeRobin, "Wake-Robin (3 decks)", + GI.GT_SPIDER | GI.GT_ORIGINAL, 3, 0)) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 1d44bf30..aacea609 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -581,6 +581,7 @@ class Simplicity(Game): # ************************************************************************/ class SixesAndSevens(Game): + def createGame(self, max_rounds=2): l, s = Layout(self), self.s @@ -629,6 +630,61 @@ class SixesAndSevens(Game): self.s.talon.dealCards() +# /*********************************************************************** +# // Corner Suite +# ************************************************************************/ + +class CornerSuite_RowStack(RK_RowStack): + def acceptsCards(self, from_stack, cards): + if not RK_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return from_stack is self.game.s.waste + return True + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class CornerSuite(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+5*l.XS, l.YM+4*l.YS) + + suit = 0 + for x, y in ((0,0), (4,0), (0,4), (4,4)): + x, y = l.XM+x*l.XS, l.YM+y*l.YS + s.foundations.append(SS_FoundationStack(x, y, self, suit=suit)) + suit += 1 + + x, y = l.XM+3*l.XS/2, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 'nw') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'ne') + + y = l.YM+l.YS + for i in range(3): + x = l.XM+l.XS + for j in range(3): + stack = CornerSuite_RowStack(x, y, self, max_move=1) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + x += l.XS + y += l.YS + + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + # register the game registerGame(GameInfo(330, Sultan, "Sultan", @@ -654,3 +710,5 @@ registerGame(GameInfo(437, Simplicity, "Simplicity", GI.GT_1DECK_TYPE, 1, 0)) registerGame(GameInfo(438, SixesAndSevens, "Sixes and Sevens", GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(477, CornerSuite, "Corner Suite", + GI.GT_2DECK_TYPE, 1, 0)) diff --git a/pysollib/games/terrace.py b/pysollib/games/terrace.py index 11ce931c..fc1f0da1 100644 --- a/pysollib/games/terrace.py +++ b/pysollib/games/terrace.py @@ -132,16 +132,17 @@ class Terrace(Game): # game layout # - def createGame(self, rows=9, max_rounds=1, num_deal=1): + def createGame(self, rows=9, max_rounds=1, num_deal=1, playcards=16): # create layout l, s = Layout(self), self.s # set window - # (piles up to 20 cards are playable in default window size) - maxrows = max(rows, 9) - w1, w2 = (maxrows - 8)*l.XS/2, (maxrows - rows)*l.XS/2 - h = max(3*l.YS, 20*l.YOFFSET) - self.setSize(l.XM + maxrows*l.XS + l.XM, l.YM + 2*l.YS + h) + # (piles up to 16 cards are playable in default window size) + decks = self.gameinfo.decks + maxrows = max(rows, decks*4+1) + w1, w2 = (maxrows - decks*4)*l.XS/2, (maxrows - rows)*l.XS/2 + h = max(3*l.YS, playcards*l.YOFFSET) + self.setSize(l.XM + maxrows*l.XS + l.XM, l.YM + 3*l.YS + h) # extra settings self.base_card = None @@ -159,9 +160,10 @@ class Terrace(Game): l.createText(stack, "sw") s.reserves.append(stack) x, y = l.XM + w1, y + l.YS - for i in range(8): - s.foundations.append(self.Foundation_Class(x, y, self, suit=i/2)) - x = x + l.XS + for i in range(4): + for j in range(decks): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) + x = x + l.XS x, y = l.XM + w2, y + l.YS for i in range(rows): s.rows.append(self.RowStack_Class(x, y, self)) @@ -184,11 +186,11 @@ class Terrace(Game): # game overrides # - def startGame(self): + def startGame(self, nrows=4): self.startDealSample() for i in range(self.INITIAL_RESERVE_CARDS): self.s.talon.dealRow(rows=self.s.reserves) - self.s.talon.dealRow(rows=self.s.rows[:4]) + self.s.talon.dealRow(rows=self.s.rows[:nrows]) def fillStack(self, stack): if not stack.cards: @@ -235,7 +237,7 @@ class GeneralsPatience(Terrace): # /*********************************************************************** -# // +# // Blondes and Brunettes # ************************************************************************/ class BlondesAndBrunettes(Terrace): @@ -258,13 +260,35 @@ class BlondesAndBrunettes(Terrace): # /*********************************************************************** -# // +# // Falling Star # ************************************************************************/ class FallingStar(BlondesAndBrunettes): INITIAL_RESERVE_CARDS = 11 +# /*********************************************************************** +# // Signora +# ************************************************************************/ + +class Signora(Terrace): + def startGame(self): + Terrace.startGame(self, nrows=9) + + +# /*********************************************************************** +# // Madame +# ************************************************************************/ + +class Madame(Terrace): + INITIAL_RESERVE_CARDS = 15 + def createGame(self): + Terrace.createGame(self, rows=10, playcards=20) + def startGame(self): + Terrace.startGame(self, nrows=10) + + + # register the game registerGame(GameInfo(135, Terrace, "Terrace", GI.GT_TERRACE, 2, 0)) @@ -276,4 +300,8 @@ registerGame(GameInfo(138, FallingStar, "Falling Star", GI.GT_TERRACE, 2, 0)) registerGame(GameInfo(431, QueenOfItaly, "Queen of Italy", GI.GT_TERRACE, 2, 0)) +registerGame(GameInfo(499, Signora, "Signora", + GI.GT_TERRACE, 2, 0)) +registerGame(GameInfo(500, Madame, "Madame", + GI.GT_TERRACE, 3, 0)) diff --git a/pysollib/games/ultra/hanafuda1.py b/pysollib/games/ultra/hanafuda1.py index 1b30e53d..f6288d80 100644 --- a/pysollib/games/ultra/hanafuda1.py +++ b/pysollib/games/ultra/hanafuda1.py @@ -396,10 +396,10 @@ class SixTengus(SixSages): # /*********************************************************************** -# * Four Seasons +# * Hanafuda Four Seasons # ************************************************************************/ -class FourSeasons(AbstractFlowerGame): +class HanafudaFourSeasons(AbstractFlowerGame): # # Game layout @@ -706,7 +706,7 @@ r(12374, JapaneseGardenII, 'Japanese Garden II', GI.GT_HANAFUDA | GI.GT_OPEN, 1, r(12375, SixSages, 'Six Sages', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) r(12376, SixTengus, 'Six Tengus', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) r(12377, JapaneseGardenIII, 'Japanese Garden III', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12378, FourSeasons, 'Four Seasons', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) +r(12378, HanafudaFourSeasons, 'Hanafuda Four Seasons', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) r(12380, Eularia, 'Eularia', GI.GT_HANAFUDA, 1, -1) r(12381, Peony, 'Peony', GI.GT_HANAFUDA, 1, -1) r(12382, Iris, 'Iris', GI.GT_HANAFUDA, 1, 0) diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py index fc9e62a7..4d1d7389 100644 --- a/pysollib/games/windmill.py +++ b/pysollib/games/windmill.py @@ -201,8 +201,9 @@ class NapoleonsTomb(Windmill): # ************************************************************************/ class Corners(Game): + RowStack_Class = ReserveStack - def createGame(self): + def createGame(self, max_rounds=3): # create layout l, s = Layout(self, XM=20, YM=20), self.s @@ -211,7 +212,7 @@ class Corners(Game): # create stacks x, y = l.XM+l.XS, l.YM - s.talon = WasteTalonStack(x, y, self, max_rounds=3) + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds) l.createText(s.talon, "sw") x += l.XS s.waste = WasteStack(x, y, self) @@ -225,7 +226,9 @@ class Corners(Game): i += 1 for d in ((2,0), (1,1), (2,1), (3,1), (2,2)): x, y = x0+d[0]*l.XS, y0+d[1]*l.YS - s.rows.append(ReserveStack(x, y, self)) + stack = self.RowStack_Class(x, y, self) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 # define stack-groups l.defaultStackGroups() @@ -260,6 +263,62 @@ class Corners(Game): self.s.talon.dealCards() # deal first card to WasteStack +# /*********************************************************************** +# // Czarina +# // Four Seasons +# ************************************************************************/ + +class Czarina_RowStack(RK_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class Czarina(Corners): + Hint_Class = CautiousDefaultHint + RowStack_Class = StackWrapper(Czarina_RowStack, mod=13, max_move=1) + + def createGame(self): + # extra settings + self.base_card = None + Corners.createGame(self, max_rounds=1) + + def startGame(self): + self.startDealSample() + self.base_card = None + # deal base_card to Foundations, update foundations cap.base_rank + self.base_card = self.s.talon.getCard() + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, self.s.foundations[self.base_card.suit]) + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first 3 cards to WasteStack + + def _shuffleHook(self, cards): + return cards + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return ((card1.rank + 1) % 13 == card2.rank or + (card2.rank + 1) % 13 == card1.rank) + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + +class FourSeasons(Czarina): + def fillStack(self, stack): + pass + + # register the game registerGame(GameInfo(30, Windmill, "Windmill", GI.GT_2DECK_TYPE, 2, 0)) @@ -267,4 +326,8 @@ registerGame(GameInfo(277, NapoleonsTomb, "Napoleon's Tomb", GI.GT_1DECK_TYPE, 1, 0)) registerGame(GameInfo(417, Corners, "Corners", GI.GT_1DECK_TYPE, 1, 2)) +registerGame(GameInfo(483, Czarina, "Czarina", + GI.GT_1DECK_TYPE, 1, 0)) +registerGame(GameInfo(484, FourSeasons, "Four Seasons", + GI.GT_1DECK_TYPE, 1, 0)) diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index 949425cd..c9442e17 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -206,7 +206,7 @@ class Alaska(RussianSolitaire): # /*********************************************************************** -# // Roslin (like Russian Solitaire, but build up or down by alternate color) +# // Roslin (like Yukon, but build up or down by alternate color) # ************************************************************************/ class Roslin_RowStack(Yukon_AC_RowStack): @@ -374,11 +374,12 @@ class DoubleRussianSolitaire(DoubleYukon): # /*********************************************************************** # // Triple Yukon +# // Triple Russian Solitaire # ************************************************************************/ class TripleYukon(Yukon): def createGame(self): - Yukon.createGame(self, rows=13) + Yukon.createGame(self, rows=13, playcards=34) def startGame(self): for i in range(1, len(self.s.rows)): self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) @@ -389,6 +390,14 @@ class TripleYukon(Yukon): assert len(self.s.talon.cards) == 0 +class TripleRussianSolitaire(TripleYukon): + RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + + # /*********************************************************************** # // Ten Across # ************************************************************************/ @@ -469,6 +478,7 @@ class Panopticon(TenAcross): # /*********************************************************************** # // Australian Patience # // Raw Prawn +# // Bim Bom # ************************************************************************/ class AustralianPatience(RussianSolitaire): @@ -511,6 +521,29 @@ class BimBom(AustralianPatience): self.s.talon.dealCards() +# /*********************************************************************** +# // Geoffrey +# ************************************************************************/ + +class Geoffrey(Yukon): + Layout_Method = Layout.klondikeLayout + RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) + + def createGame(self): + Yukon.createGame(self, rows=8, waste=0) + + def startGame(self): + for i in (4, 4, 4, 4, 8): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=1, frames=0) + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.rows[:4]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + # register the game registerGame(GameInfo(19, Yukon, "Yukon", @@ -554,4 +587,9 @@ registerGame(GameInfo(450, RawPrawn, "Raw Prawn", registerGame(GameInfo(456, BimBom, "Bim Bom", GI.GT_YUKON | GI.GT_ORIGINAL, 2, 0)) registerGame(GameInfo(466, DoubleRussianSolitaire, "Double Russian Solitaire", - GI.GT_YUKON | GI.GT_ORIGINAL, 2, 0)) + GI.GT_YUKON, 2, 0)) +registerGame(GameInfo(488, TripleRussianSolitaire, "Triple Russian Solitaire", + GI.GT_YUKON, 3, 0)) +registerGame(GameInfo(492, Geoffrey, "Geoffrey", + GI.GT_YUKON, 1, 0)) + From 19aacdc92fbe6abee11f66793c43ec80c4c2f4b4 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 19 Jun 2006 21:08:25 +0000 Subject: [PATCH 009/266] + 3 new games git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@10 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/ru_games.po | 4 ++-- pysollib/games/beleagueredcastle.py | 30 +++++++++++++++---------- pysollib/games/braid.py | 34 +++++++++++++++++++---------- pysollib/games/freecell.py | 15 +++++++++++++ pysollib/games/klondike.py | 11 ++++------ pysollib/games/sultan.py | 2 +- 6 files changed, 64 insertions(+), 32 deletions(-) diff --git a/po/ru_games.po b/po/ru_games.po index 84aee5c1..27c7930e 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" "POT-Creation-Date: Sun Jun 11 10:16:06 2006\n" -"PO-Revision-Date: 2006-06-10 11:07+0400\n" +"PO-Revision-Date: 2006-06-18 11:28+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -375,7 +375,7 @@ msgid "Castle of Indolence" msgstr "Замок праздности" msgid "Castles in Spain" -msgstr "Замок в Испании" +msgstr "Воздушные замки" msgid "Cat and Mouse" msgstr "Кот и Мышь" diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index fa3eb092..0617beda 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -627,25 +627,27 @@ class Rittenhouse(Game): # /*********************************************************************** +# // Lightweight # // Castle Mount # ************************************************************************/ -class CastleMount(StreetsAndAlleys): - DEAL = (11, 1) - RowStack_Class = Spider_SS_RowStack +class Lightweight(StreetsAndAlleys): + DEAL = (7, 1) + RowStack_Class = StackWrapper(RK_RowStack, base_rank=KING) - def createGame(self, rows=12): + def createGame(self, rows=12, playcards=20): l, s = Layout(self), self.s - max_rows = max(12, rows) - self.setSize(l.XM+max_rows*l.XS, l.YM+2*l.YS+20*l.YOFFSET) + decks = self.gameinfo.decks + max_rows = max(decks*4, rows) + self.setSize(l.XM+max_rows*l.XS, l.YM+2*l.YS+playcards*l.YOFFSET) - x, y = l.XM+(max_rows-12)*l.XS/2, l.YM + x, y = l.XM+(max_rows-decks*4)*l.XS/2, l.YM for i in range(4): - for j in range(3): + for j in range(decks): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, max_move=0)) x += l.XS - x, y = l.XM, l.YM+l.YS + x, y = l.XM+(max_rows-rows)*l.XS/2, l.YM+l.YS for i in range(rows): s.rows.append(self.RowStack_Class(x, y, self)) x += l.XS @@ -653,7 +655,6 @@ class CastleMount(StreetsAndAlleys): l.defaultAll() - def _shuffleHook(self, cards): # move Aces to top of the Talon (i.e. first cards to be dealt) return self._shuffleHookMoveToTop(cards, @@ -667,6 +668,11 @@ class CastleMount(StreetsAndAlleys): for i in range(self.DEAL[1]): self.s.talon.dealRowAvail() + +class CastleMount(Lightweight): + DEAL = (11, 1) + RowStack_Class = Spider_SS_RowStack + def shallHighlightMatch(self, stack1, card1, stack2, card2): return ((card1.rank + 1) % stack1.cap.mod == card2.rank or (card2.rank + 1) % stack1.cap.mod == card1.rank) @@ -707,5 +713,7 @@ registerGame(GameInfo(395, Zerline3Decks, "Zerline (3 decks)", GI.GT_BELEAGUERED_CASTLE | GI.GT_ORIGINAL, 3, 0)) registerGame(GameInfo(400, Rittenhouse, "Rittenhouse", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 2, 0)) -registerGame(GameInfo(507, CastleMount, "Castle Mount", +registerGame(GameInfo(507, Lightweight, "Lightweight", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) +registerGame(GameInfo(508, CastleMount, "Castle Mount", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 3, 0)) diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py index 76880e72..85e555e7 100644 --- a/pysollib/games/braid.py +++ b/pysollib/games/braid.py @@ -119,8 +119,7 @@ class Braid_ReserveStack(ReserveStack): class Braid(Game): Hint_Class = Braid_Hint - Foundation_Class_1 = Braid_Foundation - Foundation_Class_2 = Braid_Foundation + Foundation_Classes = [Braid_Foundation, Braid_Foundation] BRAID_CARDS = 20 RANKS = RANKS # pull into class Braid @@ -135,8 +134,9 @@ class Braid(Game): # set window # (piles up to 20 cards are playable - needed for Braid_BraidStack) + decks = self.gameinfo.decks h = max(4*l.YS + 30, l.YS+(self.BRAID_CARDS-1)*l.YOFFSET) - self.setSize(10*l.XS+l.XM, l.YM + h) + self.setSize(l.XM+(8+decks)*l.XS, l.YM+h) # extra settings self.base_card = None @@ -167,15 +167,16 @@ class Braid(Game): x = x - l.XS s.waste = WasteStack(x, y, self) l.createText(s.waste, "ss") - x = l.XM + 8 * l.XS y = l.YM for i in range(4): - s.foundations.append(self.Foundation_Class_1(x, y, self, suit=i)) - s.foundations.append(self.Foundation_Class_2(x + l.XS, y, self, suit=i)) + x = l.XM+8*l.XS + for cl in self.Foundation_Classes: + s.foundations.append(cl(x, y, self, suit=i)) + x += l.XS y = y + l.YS + x = 8*l.XS+decks*l.XS/2 self.texts.info = MfxCanvasText(self.canvas, - x + l.CW + l.XM / 2, y, - anchor="n", + x, y, anchor="n", font=self.app.getFont("canvas_default")) # define stack-groups @@ -205,7 +206,7 @@ class Braid(Game): self.s.talon.dealRow(frames=4) # deal base_card to foundations self.base_card = self.s.talon.cards[-1] - to_stack = self.s.foundations[2 * self.base_card.suit] + to_stack = self.s.foundations[self.gameinfo.decks*self.base_card.suit] self.flipMove(self.s.talon) self.moveMove(1, self.s.talon, to_stack) self.updateText() @@ -263,8 +264,8 @@ class LongBraid(Braid): class Fort(Braid): - Foundation_Class_1 = SS_FoundationStack - Foundation_Class_2 = StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1) + Foundation_Classes = [SS_FoundationStack, + StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1)] BRAID_CARDS = 21 @@ -367,6 +368,15 @@ class BackbonePlus(Backbone): Backbone.createGame(self, rows=10) +# /*********************************************************************** +# // Big Braid +# ************************************************************************/ + +class BigBraid(Braid): + Foundation_Classes = [Braid_Foundation, Braid_Foundation, Braid_Foundation] + + + # register the game registerGame(GameInfo(12, Braid, "Braid", GI.GT_NAPOLEON, 2, 2, @@ -380,3 +390,5 @@ registerGame(GameInfo(376, Backbone, "Backbone", GI.GT_NAPOLEON, 2, 0)) registerGame(GameInfo(377, BackbonePlus, "Backbone +", GI.GT_NAPOLEON, 2, 0)) +registerGame(GameInfo(510, BigBraid, "Big Braid", + GI.GT_NAPOLEON, 3, 2)) diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index 148fbccb..0a71684c 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -310,6 +310,19 @@ class Cell11(TripleFreecell): self.s.talon.dealRow(rows=[self.s.reserves[0],self.s.reserves[-1]]) +class BigCell(TripleFreecell): + RowStack_Class = AC_RowStack + + def createGame(self): + TripleFreecell.createGame(self, rows=13, reserves=4) + + def startGame(self): + for i in range(11): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + # /*********************************************************************** # // Spidercells # ************************************************************************/ @@ -527,4 +540,6 @@ registerGame(GameInfo(451, Cell11, "Cell 11", GI.GT_FREECELL | GI.GT_OPEN, 3, 0)) registerGame(GameInfo(464, FourColours, "Four Colours", GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(509, BigCell, "Big Cell", + GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index d6e961a0..82de9dca 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -284,6 +284,7 @@ class BlindAlleys(Eastcliff): # /*********************************************************************** # // Somerset # // Morehead +# // Canister # ************************************************************************/ class Somerset(Klondike): @@ -306,10 +307,6 @@ class Morehead(Somerset): RowStack_Class = StackWrapper(ThumbAndPouch_RowStack, max_move=1) -# /*********************************************************************** -# // Canister -# ************************************************************************/ - class Canister(Klondike): Talon_Class = InitialDealTalonStack RowStack_Class = RK_RowStack @@ -1082,9 +1079,9 @@ registerGame(GameInfo(107, PasSeul, "Pas Seul", registerGame(GameInfo(81, BlindAlleys, "Blind Alleys", GI.GT_KLONDIKE, 1, 1)) registerGame(GameInfo(215, Somerset, "Somerset", - GI.GT_KLONDIKE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) registerGame(GameInfo(231, Canister, "Canister", - GI.GT_KLONDIKE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) registerGame(GameInfo(229, AgnesSorel, "Agnes Sorel", GI.GT_GYPSY, 1, 0)) registerGame(GameInfo(4, EightTimesEight, "8 x 8", @@ -1127,7 +1124,7 @@ registerGame(GameInfo(350, Q_C_, "Q.C.", registerGame(GameInfo(361, NorthwestTerritory, "Northwest Territory", GI.GT_RAGLAN, 1, 0)) registerGame(GameInfo(362, Morehead, "Morehead", - GI.GT_KLONDIKE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) registerGame(GameInfo(388, Senate, "Senate", GI.GT_RAGLAN, 2, 0)) registerGame(GameInfo(389, SenatePlus, "Senate +", diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index aacea609..9967e83c 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -650,7 +650,7 @@ class CornerSuite(Game): def createGame(self): l, s = Layout(self), self.s - self.setSize(l.XM+5*l.XS, l.YM+4*l.YS) + self.setSize(l.XM+5*l.XS, l.YM+5*l.YS) suit = 0 for x, y in ((0,0), (4,0), (0,4), (4,4)): From 758bdec2c4b8fa77e90fc9f08cd5f155f2b11c6a Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 21 Jun 2006 21:27:05 +0000 Subject: [PATCH 010/266] + new selection type: `by skill level' + new experimental options: `randomize_place' * added columnbreak to favorites menu git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@11 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/ru_pysol.po | 4 +- pysollib/acard.py | 9 ++- pysollib/app.py | 2 + pysollib/gamedb.py | 34 ++++----- pysollib/games/acesup.py | 10 +-- pysollib/games/algerian.py | 6 +- pysollib/games/auldlangsyne.py | 14 ++-- pysollib/games/bakersdozen.py | 20 +++--- pysollib/games/bakersgame.py | 14 ++-- pysollib/games/beleagueredcastle.py | 32 ++++----- pysollib/games/bisley.py | 10 +-- pysollib/games/braid.py | 12 ++-- pysollib/games/bristol.py | 10 +-- pysollib/games/buffalobill.py | 4 +- pysollib/games/calculation.py | 6 +- pysollib/games/camelot.py | 2 +- pysollib/games/canfield.py | 38 +++++----- pysollib/games/capricieuse.py | 4 +- pysollib/games/contrib/sanibel.py | 2 +- pysollib/games/curdsandwhey.py | 24 +++---- pysollib/games/dieboesesieben.py | 2 +- pysollib/games/diplomat.py | 12 ++-- pysollib/games/doublets.py | 2 +- pysollib/games/eiffeltower.py | 2 +- pysollib/games/fan.py | 28 ++++---- pysollib/games/fortythieves.py | 74 +++++++++---------- pysollib/games/freecell.py | 34 ++++----- pysollib/games/glenwood.py | 2 +- pysollib/games/golf.py | 20 +++--- pysollib/games/grandfathersclock.py | 2 +- pysollib/games/gypsy.py | 44 ++++++------ pysollib/games/harp.py | 20 +++--- pysollib/games/headsandtails.py | 2 +- pysollib/games/katzenschwanz.py | 12 ++-- pysollib/games/klondike.py | 102 +++++++++++++-------------- pysollib/games/mahjongg/mahjongg.py | 2 +- pysollib/games/mahjongg/shisensho.py | 2 +- pysollib/games/matriarchy.py | 2 +- pysollib/games/montana.py | 16 ++--- pysollib/games/montecarlo.py | 24 +++---- pysollib/games/napoleon.py | 8 +-- pysollib/games/needle.py | 6 +- pysollib/games/numerica.py | 22 +++--- pysollib/games/osmosis.py | 12 ++-- pysollib/games/parallels.py | 2 +- pysollib/games/pasdedeux.py | 2 +- pysollib/games/picturegallery.py | 8 +-- pysollib/games/pileon.py | 4 +- pysollib/games/poker.py | 4 +- pysollib/games/pushpin.py | 4 +- pysollib/games/pyramid.py | 4 +- pysollib/games/royalcotillion.py | 18 ++--- pysollib/games/royaleast.py | 2 +- pysollib/games/siebenbisas.py | 4 +- pysollib/games/simplex.py | 2 +- pysollib/games/special/hanoi.py | 8 +-- pysollib/games/special/memory.py | 8 +-- pysollib/games/special/pegged.py | 2 +- pysollib/games/special/tarock.py | 31 ++++---- pysollib/games/spider.py | 82 ++++++++++----------- pysollib/games/sthelena.py | 4 +- pysollib/games/sultan.py | 24 +++---- pysollib/games/takeaway.py | 4 +- pysollib/games/terrace.py | 14 ++-- pysollib/games/tournament.py | 6 +- pysollib/games/ultra/dashavatara.py | 40 +++++------ pysollib/games/ultra/hanafuda.py | 56 +++++++-------- pysollib/games/ultra/hanafuda1.py | 34 ++++----- pysollib/games/ultra/hexadeck.py | 40 +++++------ pysollib/games/ultra/larasgame.py | 31 ++++---- pysollib/games/ultra/matrix.py | 4 +- pysollib/games/ultra/mughal.py | 40 +++++------ pysollib/games/ultra/tarock.py | 14 ++-- pysollib/games/ultra/threepeaks.py | 15 ++-- pysollib/games/unionsquare.py | 4 +- pysollib/games/wavemotion.py | 2 +- pysollib/games/windmill.py | 10 +-- pysollib/games/yukon.py | 46 ++++++------ pysollib/games/zodiac.py | 2 +- pysollib/tk/gameinfodialog.py | 9 +++ pysollib/tk/menubar.py | 16 ++--- pysollib/tk/selectgame.py | 7 ++ pysollib/tk/tkstats.py | 4 +- scripts/all_games.py | 10 ++- 84 files changed, 676 insertions(+), 654 deletions(-) diff --git a/po/ru_pysol.po b/po/ru_pysol.po index cb0eef34..85412367 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" "POT-Creation-Date: Sun Jun 11 10:16:01 2006\n" -"PO-Revision-Date: 2006-06-12 15:31+0400\n" +"PO-Revision-Date: 2006-06-20 01:10+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -1143,7 +1143,7 @@ msgstr "Клен" #: pysollib/games/ultra/hanafuda_common.py:69 msgid "Paulownia" -msgstr "" +msgstr "Павловния" #: pysollib/games/ultra/hanafuda_common.py:69 msgid "Willow" diff --git a/pysollib/acard.py b/pysollib/acard.py index 81ac4b4a..e23f09c7 100644 --- a/pysollib/acard.py +++ b/pysollib/acard.py @@ -35,11 +35,11 @@ # imports +from random import randint # PySol imports from mfxutil import SubclassResponsibility - # /*********************************************************************** # // # ************************************************************************/ @@ -79,6 +79,7 @@ class AbstractCard: self.suit = suit self.color = suit / 2 self.rank = rank + self.game = game self.x = x self.y = y self.item = None @@ -99,7 +100,11 @@ class AbstractCard: def moveTo(self, x, y): # Move the card to absolute position (x, y). # The card remains hidden. - self.moveBy(x - self.x + self.hide_x, y - self.y + self.hide_y) + dx, dy = 0, 0 + if self.game.app.opt.randomize_place: + d = 1 + dx, dy = randint(-d, d), randint(-d, d) + self.moveBy(x - self.x + self.hide_x + dx, y - self.y + self.hide_y + dy) def moveBy(self, dx, dy): # Move the card by (dx, dy). diff --git a/pysollib/app.py b/pysollib/app.py index bbdbcde3..50222aa6 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -196,6 +196,7 @@ class Options: self.splashscreen = True self.sticky_mouse = False self.negative_bottom = False + self.randomize_place = True self.cache_carsets = True # defaults & constants self.setDefaults() @@ -228,6 +229,7 @@ class Options: CSI.TYPE_DASHAVATARA_GANJIFA: ("Dashavatara Ganjifa", ""), CSI.TYPE_TRUMP_ONLY: ("Matrix", ""), } + self.randomize_place = True # not changeable options def setConstants(self): diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index cc566b9c..c7ab0167 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -109,6 +109,13 @@ class GI: GT_SCORE = 1 << 20 # game has some type of scoring GT_SEPARATE_DECKS = 1 << 21 GT_XORIGINAL = 1 << 22 # original games by other people, not playable + # skill level + SL_LUCK = 1 + SL_MOSTLY_LUCK = 2 + SL_BALANCED = 3 + SL_MOSTLY_SKILL = 4 + SL_SKILL = 5 + # TYPE_NAMES = { GT_BAKERS_DOZEN: n_("Baker's Dozen"), GT_BELEAGUERED_CASTLE: n_("Beleaguered Castle"), @@ -167,23 +174,6 @@ class GI: (n_("Four-Deck games"),lambda gi, gt=GT_4DECK_TYPE: gi.si.game_type == gt), ) - - -## SELECT_SPECIAL_GAME_BY_TYPE = ( -## ("Dashavatara Ganjifa type", lambda gi, gt=GT_DASHAVATARA_GANJIFA: gi.si.game_type == gt), -## ("Ganjifa type", lambda gi, gt=(GT_MUGHAL_GANJIFA, GT_NAVAGRAHA_GANJIFA, GT_DASHAVATARA_GANJIFA,): gi.si.game_type in gt), -## ("Hanafuda type", lambda gi, gt=GT_HANAFUDA: gi.si.game_type == gt), -## ("Hex A Deck type", lambda gi, gt=GT_HEXADECK: gi.si.game_type == gt), -## ("Mahjongg type", lambda gi, gt=GT_MAHJONGG: gi.si.game_type == gt), -## ("Matrix type", lambda gi, gt=GT_MATRIX: gi.si.game_type == gt), -## ("Mughal Ganjifa type", lambda gi, gt=GT_MUGHAL_GANJIFA: gi.si.game_type == gt), -## ("Navagraha Ganjifa type", lambda gi, gt=GT_NAVAGRAHA_GANJIFA: gi.si.game_type == gt), -## ("Memory type", lambda gi, gt=GT_MEMORY: gi.si.game_type == gt), -## ("Poker type", lambda gi, gt=GT_POKER_TYPE: gi.si.game_type == gt), -## ("Puzzle type", lambda gi, gt=GT_PUZZLE_TYPE: gi.si.game_type == gt), -## ("Tarock type", lambda gi, gt=GT_TAROCK: gi.si.game_type == gt), -## ) - SELECT_ORIGINAL_GAME_BY_TYPE = ( (n_("French type"), lambda gi, gf=GT_ORIGINAL, gt=(GT_HANAFUDA, GT_HEXADECK, GT_MUGHAL_GANJIFA, GT_NAVAGRAHA_GANJIFA, GT_DASHAVATARA_GANJIFA, GT_TAROCK,): gi.si.game_flags & gf and gi.si.game_type not in gt), (n_("Ganjifa type"), lambda gi, gf=GT_ORIGINAL, gt=(GT_MUGHAL_GANJIFA, GT_NAVAGRAHA_GANJIFA, GT_DASHAVATARA_GANJIFA,): gi.si.game_flags & gf and gi.si.game_type in gt), @@ -200,7 +190,6 @@ class GI: (n_("Tarock type"), lambda gi, gf=GT_CONTRIB, gt=GT_TAROCK: gi.si.game_flags & gf and gi.si.game_type == gt), ) - # ----- SELECT_ORIENTAL_GAME_BY_TYPE = ( (n_("Dashavatara Ganjifa type"), lambda gi, gt=GT_DASHAVATARA_GANJIFA: gi.si.game_type == gt), (n_("Ganjifa type"), lambda gi, gt=(GT_MUGHAL_GANJIFA, GT_NAVAGRAHA_GANJIFA, GT_DASHAVATARA_GANJIFA,): gi.si.game_type in gt), @@ -391,10 +380,13 @@ class GameInfoException(Exception): class GameInfo(Struct): def __init__(self, id, gameclass, name, game_type, decks, redeals, + skill_level=None, # keyword arguments: - si={}, category=0, short_name=None, altnames=(), + si={}, category=0, + short_name=None, altnames=(), suits=range(4), ranks=range(13), trumps=(), - rules_filename=None): + rules_filename=None, + ): def to_unicode(s): if not type(s) is unicode: return unicode(s, 'utf-8') @@ -463,7 +455,7 @@ class GameInfo(Struct): name=name, short_name=short_name, altnames=tuple(altnames), decks=decks, redeals=redeals, ncards=ncards, - category=category, + category=category, skill_level=skill_level, suits=tuple(suits), ranks=tuple(ranks), trumps=tuple(trumps), si=gi_si, rules_filename=rules_filename, plugin=0) diff --git a/pysollib/games/acesup.py b/pysollib/games/acesup.py index 5df310cf..5c64663a 100644 --- a/pysollib/games/acesup.py +++ b/pysollib/games/acesup.py @@ -252,14 +252,14 @@ class AcesUp5(AcesUp): # register the game registerGame(GameInfo(903, AcesUp, "Aces Up", # was: 52 - GI.GT_1DECK_TYPE, 1, 0, + GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK, altnames=("Aces High", "Drivel") )) registerGame(GameInfo(206, Fortunes, "Fortunes", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK)) registerGame(GameInfo(213, RussianAces, "Russian Aces", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK)) registerGame(GameInfo(130, PerpetualMotion, "Perpetual Motion", - GI.GT_1DECK_TYPE, 1, -1, + GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK, altnames="First Law")) registerGame(GameInfo(353, AcesUp5, "Aces Up 5", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK)) diff --git a/pysollib/games/algerian.py b/pysollib/games/algerian.py index ce375ceb..ffab0455 100644 --- a/pysollib/games/algerian.py +++ b/pysollib/games/algerian.py @@ -161,9 +161,9 @@ class AlgerianPatience3(Carthage): # register the game registerGame(GameInfo(321, Carthage, "Carthage", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(322, AlgerianPatience, "Algerian Patience", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(457, AlgerianPatience3, "Algerian Patience (3 decks)", - GI.GT_3DECK_TYPE | GI.GT_ORIGINAL, 3, 0)) + GI.GT_3DECK_TYPE | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index f654e657..0bb1a914 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -485,19 +485,19 @@ class Acquaintance(AuldLangSyne): # register the game registerGame(GameInfo(172, TamOShanter, "Tam O'Shanter", - GI.GT_NUMERICA, 1, 0)) + GI.GT_NUMERICA, 1, 0, GI.SL_LUCK)) registerGame(GameInfo(95, AuldLangSyne, "Auld Lang Syne", - GI.GT_NUMERICA, 1, 0)) + GI.GT_NUMERICA, 1, 0, GI.SL_LUCK)) registerGame(GameInfo(173, Strategy, "Strategy", - GI.GT_NUMERICA, 1, 0)) + GI.GT_NUMERICA, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(123, Interregnum, "Interregnum", - GI.GT_NUMERICA, 2, 0)) + GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(296, Colorado, "Colorado", - GI.GT_NUMERICA, 2, 0)) + GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(406, Amazons, "Amazons", - GI.GT_NUMERICA, 1, -1, + GI.GT_NUMERICA, 1, -1, GI.SL_LUCK, ranks=(0, 6, 7, 8, 9, 10, 11), )) registerGame(GameInfo(490, Acquaintance, "Acquaintance", - GI.GT_NUMERICA, 1, 2)) + GI.GT_NUMERICA, 1, 2, GI.SL_BALANCED)) diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py index f3cbf8d7..1ceb4e8d 100644 --- a/pysollib/games/bakersdozen.py +++ b/pysollib/games/bakersdozen.py @@ -322,23 +322,23 @@ class RippleFan(CastlesInSpain): # register the game registerGame(GameInfo(83, CastlesInSpain, "Castles in Spain", - GI.GT_BAKERS_DOZEN, 1, 0)) + GI.GT_BAKERS_DOZEN, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(84, Martha, "Martha", - GI.GT_BAKERS_DOZEN, 1, 0)) + GI.GT_BAKERS_DOZEN, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(31, BakersDozen, "Baker's Dozen", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0)) + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(85, SpanishPatience, "Spanish Patience", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0)) + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(86, GoodMeasure, "Good Measure", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0)) + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(104, Cruel, "Cruel", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, -1)) + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(291, RoyalFamily, "Royal Family", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 1)) + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 1, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(308, PortugueseSolitaire, "Portuguese Solitaire", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0)) + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(404, Perseverance, "Perseverance", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 2)) + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(369, RippleFan, "Ripple Fan", - GI.GT_BAKERS_DOZEN, 1, -1)) + GI.GT_BAKERS_DOZEN, 1, -1, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/bakersgame.py b/pysollib/games/bakersgame.py index 6ea1147d..a43789a5 100644 --- a/pysollib/games/bakersgame.py +++ b/pysollib/games/bakersgame.py @@ -349,18 +349,18 @@ class Opus(Penguin): # register the game registerGame(GameInfo(45, BakersGame, "Baker's Game", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(26, KingOnlyBakersGame, "King Only Baker's Game", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(258, EightOff, "Eight Off", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(9, SeahavenTowers, "Seahaven Towers", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0, + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL, altnames=("Sea Towers", "Towers") )) registerGame(GameInfo(6, RelaxedSeahavenTowers, "Relaxed Seahaven Towers", - GI.GT_FREECELL | GI.GT_RELAXED | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_RELAXED | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(64, Penguin, "Penguin", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0, + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("Beak and Flipper",) )) registerGame(GameInfo(427, Opus, "Opus", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 0617beda..e33c773d 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -686,34 +686,34 @@ class CastleMount(Lightweight): # register the game registerGame(GameInfo(146, StreetsAndAlleys, "Streets and Alleys", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(34, BeleagueredCastle, "Beleaguered Castle", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(145, Citadel, "Citadel", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(147, Fortress, "Fortress", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(148, Chessboard, "Chessboard", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(300, Stronghold, "Stronghold", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(301, Fastness, "Fastness", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(306, Zerline, "Zerline", - GI.GT_BELEAGUERED_CASTLE, 2, 0)) + GI.GT_BELEAGUERED_CASTLE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(324, Bastion, "Bastion", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(325, TenByOne, "Ten by One", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(351, Chequers, "Chequers", - GI.GT_BELEAGUERED_CASTLE, 2, 0)) + GI.GT_BELEAGUERED_CASTLE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(393, CastleOfIndolence, "Castle of Indolence", - GI.GT_BELEAGUERED_CASTLE, 2, 0)) + GI.GT_BELEAGUERED_CASTLE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(395, Zerline3Decks, "Zerline (3 decks)", - GI.GT_BELEAGUERED_CASTLE | GI.GT_ORIGINAL, 3, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(400, Rittenhouse, "Rittenhouse", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 2, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(507, Lightweight, "Lightweight", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(508, CastleMount, "Castle Mount", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 3, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 3, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/bisley.py b/pysollib/games/bisley.py index 279de5a7..ebb22cca 100644 --- a/pysollib/games/bisley.py +++ b/pysollib/games/bisley.py @@ -245,13 +245,13 @@ class Mancunian(Realm): # register the game registerGame(GameInfo(290, Bisley, "Bisley", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(372, DoubleBisley, "Double Bisley", - GI.GT_2DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) + GI.GT_2DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(373, Gloria, "Gloria", - GI.GT_2DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) + GI.GT_2DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(374, Realm, "Realm", - GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(375, Mancunian, "Mancunian", - GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py index 85e555e7..b00a6200 100644 --- a/pysollib/games/braid.py +++ b/pysollib/games/braid.py @@ -379,16 +379,16 @@ class BigBraid(Braid): # register the game registerGame(GameInfo(12, Braid, "Braid", - GI.GT_NAPOLEON, 2, 2, + GI.GT_NAPOLEON, 2, 2, GI.SL_BALANCED, altnames=("Der Zopf", "Plait", "Pigtail") )) registerGame(GameInfo(175, LongBraid, "Long Braid", - GI.GT_NAPOLEON, 2, 2, + GI.GT_NAPOLEON, 2, 2, GI.SL_BALANCED, altnames=("Der lange Zopf",) )) registerGame(GameInfo(358, Fort, "Fort", - GI.GT_NAPOLEON, 2, 2)) + GI.GT_NAPOLEON, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(376, Backbone, "Backbone", - GI.GT_NAPOLEON, 2, 0)) + GI.GT_NAPOLEON, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(377, BackbonePlus, "Backbone +", - GI.GT_NAPOLEON, 2, 0)) + GI.GT_NAPOLEON, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(510, BigBraid, "Big Braid", - GI.GT_NAPOLEON, 3, 2)) + GI.GT_NAPOLEON | GI.GT_ORIGINAL, 3, 2, GI.SL_BALANCED)) diff --git a/pysollib/games/bristol.py b/pysollib/games/bristol.py index 528c4bdf..82d17b87 100644 --- a/pysollib/games/bristol.py +++ b/pysollib/games/bristol.py @@ -344,13 +344,13 @@ class Spike(Dover): # register the game registerGame(GameInfo(42, Bristol, "Bristol", - GI.GT_FAN_TYPE, 1, 0)) + GI.GT_FAN_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(214, Belvedere, "Belvedere", - GI.GT_FAN_TYPE, 1, 0)) + GI.GT_FAN_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(266, Dover, "Dover", - GI.GT_FAN_TYPE, 2, 0)) + GI.GT_FAN_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(425, NewYork, "New York", - GI.GT_FAN_TYPE, 2, 0)) + GI.GT_FAN_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(468, Spike, "Spike", - GI.GT_KLONDIKE, 1, 0)) + GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/buffalobill.py b/pysollib/games/buffalobill.py index aad131ee..24c0ebd4 100644 --- a/pysollib/games/buffalobill.py +++ b/pysollib/games/buffalobill.py @@ -104,8 +104,8 @@ class LittleBillie(BuffaloBill): # register the game registerGame(GameInfo(338, BuffaloBill, "Buffalo Bill", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(421, LittleBillie, "Little Billie", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index 35de5cb4..80a5bcfa 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -267,12 +267,12 @@ class BetsyRoss(Calculation): # register the game registerGame(GameInfo(256, Calculation, "Calculation", - GI.GT_1DECK_TYPE, 1, 0, + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("Progression",) )) registerGame(GameInfo(94, Hopscotch, "Hopscotch", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(134, BetsyRoss, "Betsy Ross", - GI.GT_1DECK_TYPE, 1, 2, + GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK, altnames=("Fairest", "Four Kings", "Musical Patience", "Quadruple Alliance", "Plus Belle") )) diff --git a/pysollib/games/camelot.py b/pysollib/games/camelot.py index 16ed9edb..8ddb419e 100644 --- a/pysollib/games/camelot.py +++ b/pysollib/games/camelot.py @@ -215,5 +215,5 @@ class Camelot(Game): # register the game registerGame(GameInfo(280, Camelot, "Camelot", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index c1a58d21..254b160e 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -670,43 +670,43 @@ class Demon(Canfield): # register the game registerGame(GameInfo(105, Canfield, "Canfield", # was: 262 - GI.GT_CANFIELD | GI.GT_CONTRIB, 1, -1)) + GI.GT_CANFIELD | GI.GT_CONTRIB, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(101, SuperiorCanfield, "Superior Canfield", - GI.GT_CANFIELD, 1, -1)) + GI.GT_CANFIELD, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(99, Rainfall, "Rainfall", - GI.GT_CANFIELD | GI.GT_ORIGINAL, 1, 2)) + GI.GT_CANFIELD | GI.GT_ORIGINAL, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(108, Rainbow, "Rainbow", - GI.GT_CANFIELD, 1, 0)) + GI.GT_CANFIELD, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(100, Storehouse, "Storehouse", - GI.GT_CANFIELD, 1, 2, + GI.GT_CANFIELD, 1, 2, GI.SL_BALANCED, altnames=("Provisions", "Straight Up", "Thirteen Up") )) registerGame(GameInfo(43, Chameleon, "Chameleon", - GI.GT_CANFIELD, 1, 0, + GI.GT_CANFIELD, 1, 0, GI.SL_BALANCED, altnames="Kansas")) registerGame(GameInfo(106, DoubleCanfield, "Double Canfield", # was: 22 - GI.GT_CANFIELD, 2, -1)) + GI.GT_CANFIELD, 2, -1, GI.SL_BALANCED)) registerGame(GameInfo(103, AmericanToad, "American Toad", - GI.GT_CANFIELD, 2, 1)) + GI.GT_CANFIELD, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(102, VariegatedCanfield, "Variegated Canfield", - GI.GT_CANFIELD, 2, 2)) + GI.GT_CANFIELD, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(112, EagleWing, "Eagle Wing", - GI.GT_CANFIELD, 1, 2)) + GI.GT_CANFIELD, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(315, Gate, "Gate", - GI.GT_CANFIELD, 1, 0)) + GI.GT_CANFIELD, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(316, LittleGate, "Little Gate", - GI.GT_CANFIELD, 1, 0)) + GI.GT_CANFIELD, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(360, Munger, "Munger", - GI.GT_CANFIELD, 1, 0)) + GI.GT_CANFIELD, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(396, TripleCanfield, "Triple Canfield", - GI.GT_CANFIELD, 3, -1)) + GI.GT_CANFIELD, 3, -1, GI.SL_BALANCED)) registerGame(GameInfo(403, Acme, "Acme", - GI.GT_CANFIELD, 1, 1)) + GI.GT_CANFIELD, 1, 1, GI.SL_BALANCED)) registerGame(GameInfo(413, Duke, "Duke", - GI.GT_CANFIELD, 1, 2)) + GI.GT_CANFIELD, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(422, Minerva, "Minerva", - GI.GT_CANFIELD, 1, 1)) + GI.GT_CANFIELD, 1, 1, GI.SL_BALANCED)) registerGame(GameInfo(476, Demon, "Demon", - GI.GT_CANFIELD, 2, -1)) + GI.GT_CANFIELD, 2, -1, GI.SL_BALANCED)) registerGame(GameInfo(494, Mystique, "Mystique", - GI.GT_CANFIELD, 1, 0)) + GI.GT_CANFIELD, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py index dac3860d..e7beec99 100644 --- a/pysollib/games/capricieuse.py +++ b/pysollib/games/capricieuse.py @@ -139,7 +139,7 @@ class Nationale(Capricieuse): # register the game registerGame(GameInfo(292, Capricieuse, "Capricieuse", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 2)) + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 2, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(293, Nationale, "Nationale", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0)) + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/contrib/sanibel.py b/pysollib/games/contrib/sanibel.py index 6760987f..7d6f9d00 100644 --- a/pysollib/games/contrib/sanibel.py +++ b/pysollib/games/contrib/sanibel.py @@ -71,5 +71,5 @@ class Sanibel(Gypsy): registerGame(GameInfo(201, Sanibel, "Sanibel", - GI.GT_YUKON | GI.GT_CONTRIB | GI.GT_ORIGINAL, 2, 0)) + GI.GT_YUKON | GI.GT_CONTRIB | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index 07bdb472..4f9fa7c2 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -389,27 +389,27 @@ class SweetSixteen(TrustyTwelve): # register the game registerGame(GameInfo(294, CurdsAndWhey, "Curds and Whey", - GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) + GI.GT_SPIDER | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(311, Dumfries, "Dumfries", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(312, Galloway, "Galloway", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(313, Robin, "Robin", - GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0)) + GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(348, Arachnida, "Arachnida", - GI.GT_SPIDER, 2, 0)) + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(349, MissMuffet, "Miss Muffet", - GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) + GI.GT_SPIDER | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(352, Nordic, "Nordic", - GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) + GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(414, GermanPatience, "German Patience", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(415, BavarianPatience, "Bavarian Patience", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(480, TrustyTwelve, "Trusty Twelve", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(481, KnottyNines, "Knotty Nines", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(482, SweetSixteen, "Sweet Sixteen", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/dieboesesieben.py b/pysollib/games/dieboesesieben.py index 2fb6f884..e3c7d8e4 100644 --- a/pysollib/games/dieboesesieben.py +++ b/pysollib/games/dieboesesieben.py @@ -120,7 +120,7 @@ class DieBoeseSieben(Game): # register the game registerGame(GameInfo(120, DieBoeseSieben, "Bad Seven", - GI.GT_2DECK_TYPE, 2, 1, + GI.GT_2DECK_TYPE, 2, 1, GI.SL_MOSTLY_LUCK, ranks=(0, 6, 7, 8, 9, 10, 11, 12), altnames=("Die böse Sieben",) )) diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py index 1f87a62f..312d0877 100644 --- a/pysollib/games/diplomat.py +++ b/pysollib/games/diplomat.py @@ -227,15 +227,15 @@ class LittleNapoleon(Diplomat): # register the game registerGame(GameInfo(149, Diplomat, "Diplomat", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(151, LadyPalk, "Lady Palk", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(150, Congress, "Congress", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(433, RowsOfFour, "Rows of Four", - GI.GT_FORTY_THIEVES, 2, 2)) + GI.GT_FORTY_THIEVES, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(485, Dieppe, "Dieppe", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(489, LittleNapoleon, "Little Napoleon", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/doublets.py b/pysollib/games/doublets.py index 6b1f1ed3..e6751384 100644 --- a/pysollib/games/doublets.py +++ b/pysollib/games/doublets.py @@ -138,5 +138,5 @@ class Doublets(Game): # register the game registerGame(GameInfo(111, Doublets, "Doublets", - GI.GT_1DECK_TYPE, 1, 2)) + GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/eiffeltower.py b/pysollib/games/eiffeltower.py index 9e53595a..b55f855b 100644 --- a/pysollib/games/eiffeltower.py +++ b/pysollib/games/eiffeltower.py @@ -120,7 +120,7 @@ class StrictEiffelTower(EiffelTower): # register the game registerGame(GameInfo(16, EiffelTower, "Eiffel Tower", - GI.GT_PAIRING_TYPE, 2, 0)) + GI.GT_PAIRING_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) ##registerGame(GameInfo(801, StrictEiffelTower, "Strict Eiffel Tower", ## GI.GT_PAIRING_TYPE, 2, 0)) diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index cc02c783..cf83fb5a 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -566,33 +566,33 @@ class BoxFan(Fan): # register the game registerGame(GameInfo(56, Fan, "Fan", - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(87, ScotchPatience, "Scotch Patience", - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(57, Shamrocks, "Shamrocks", - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(901, LaBelleLucie, "La Belle Lucie", # was: 32, 82 - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2, + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL, altnames=("Fair Lucy", "Midnight Oil") )) registerGame(GameInfo(132, SuperFlowerGarden, "Super Flower Garden", - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2)) + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(128, ThreeShufflesAndADraw, "Three Shuffles and a Draw", - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2)) + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(88, Trefoil, "Trefoil", - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2)) + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(227, Intelligence, "Intelligence", - GI.GT_FAN_TYPE, 2, 2)) + GI.GT_FAN_TYPE, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(340, IntelligencePlus, "Intelligence +", - GI.GT_FAN_TYPE, 2, 2)) + GI.GT_FAN_TYPE, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(268, HouseInTheWood, "House in the Wood", - GI.GT_FAN_TYPE | GI.GT_OPEN, 2, 0)) + GI.GT_FAN_TYPE | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(317, HouseOnTheHill, "House on the Hill", - GI.GT_FAN_TYPE | GI.GT_OPEN, 2, 0, + GI.GT_FAN_TYPE | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, rules_filename='houseinthewood.html')) registerGame(GameInfo(320, CloverLeaf, "Clover Leaf", - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(347, FreeFan, "Free Fan", - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(385, BoxFan, "Box Fan", - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index e9e9a530..7f62bf2f 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -748,81 +748,81 @@ class Squadron(FortyThieves): # register the game registerGame(GameInfo(13, FortyThieves, "Forty Thieves", - GI.GT_FORTY_THIEVES, 2, 0, + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL, altnames=("Napoleon at St.Helena", "Le Cadran"))) registerGame(GameInfo(80, BusyAces, "Busy Aces", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(228, Limited, "Limited", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(79, WaningMoon, "Waning Moon", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(125, Lucas, "Lucas", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(109, Deuces, "Deuces", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(196, Corona, "Corona", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(195, Quadrangle, "Quadrangle", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(110, Courtyard, "Courtyard", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(23, FortyAndEight, "Forty and Eight", - GI.GT_FORTY_THIEVES, 2, 1)) + GI.GT_FORTY_THIEVES, 2, 1, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(115, LittleForty, "Little Forty", # was: 72 - GI.GT_FORTY_THIEVES, 2, 3)) + GI.GT_FORTY_THIEVES, 2, 3, GI.SL_BALANCED)) registerGame(GameInfo(76, Streets, "Streets", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(73, Maria, "Maria", - GI.GT_FORTY_THIEVES, 2, 0, + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED, altnames=("Maria Luisa",) )) registerGame(GameInfo(70, NumberTen, "Number Ten", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(71, RankAndFile, "Rank and File", - GI.GT_FORTY_THIEVES, 2, 0, + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED, altnames=("Dress Parade") )) registerGame(GameInfo(197, TripleLine, "Triple Line", - GI.GT_FORTY_THIEVES | GI.GT_XORIGINAL, 2, 1)) + GI.GT_FORTY_THIEVES | GI.GT_XORIGINAL, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(126, RedAndBlack, "Red and Black", # was: 75 - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(113, Zebra, "Zebra", - GI.GT_FORTY_THIEVES, 2, 1)) + GI.GT_FORTY_THIEVES, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(69, Indian, "Indian", - GI.GT_FORTY_THIEVES, 2, 0, + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED, altnames=("Indian Patience",) )) registerGame(GameInfo(74, Midshipman, "Midshipman", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(198, NapoleonsExile, "Napoleon's Exile", - GI.GT_FORTY_THIEVES | GI.GT_XORIGINAL, 2, 0)) + GI.GT_FORTY_THIEVES | GI.GT_XORIGINAL, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(131, DoubleRail, "Double Rail", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(199, SingleRail, "Single Rail", - GI.GT_FORTY_THIEVES, 1, 0)) + GI.GT_FORTY_THIEVES, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(295, NapoleonsSquare, "Napoleon's Square", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(310, Emperor, "Emperor", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(323, Octave, "Octave", - GI.GT_FORTY_THIEVES, 2, 1)) + GI.GT_FORTY_THIEVES, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(332, Mumbai, "Mumbai", - GI.GT_FORTY_THIEVES, 3, 0)) + GI.GT_FORTY_THIEVES, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(411, CarreNapoleon, "Carre Napoleon", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(416, FortunesFavor, "Fortune's Favor", - GI.GT_FORTY_THIEVES, 1, 0)) + GI.GT_FORTY_THIEVES, 1, 0, GI.SL_LUCK)) registerGame(GameInfo(426, Octagon, "Octagon", - GI.GT_FORTY_THIEVES, 2, 3)) + GI.GT_FORTY_THIEVES, 2, 3, GI.SL_BALANCED)) registerGame(GameInfo(440, Squadron, "Squadron", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(462, Josephine, "Josephine", - GI.GT_FORTY_THIEVES, 2, 0)) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(493, MarieRose, "Marie Rose", - GI.GT_FORTY_THIEVES, 3, 0)) + GI.GT_FORTY_THIEVES, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(503, BigStreets, "Big Streets", - GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 3, 0)) + GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(504, NumberTwelve, "Number Twelve", - GI.GT_FORTY_THIEVES| GI.GT_ORIGINAL, 3, 0)) + GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 3, 0, GI.SL_BALANCED)) registerGame(GameInfo(505, BigCourtyard, "Big Courtyard", - GI.GT_FORTY_THIEVES| GI.GT_ORIGINAL, 3, 0)) + GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 3, 0, GI.SL_BALANCED)) registerGame(GameInfo(506, Express, "Express", - GI.GT_FORTY_THIEVES| GI.GT_ORIGINAL, 3, 0)) + GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index 0a71684c..3aafff6c 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -507,39 +507,39 @@ class FourColours(FreeCell): # register the game registerGame(GameInfo(5, RelaxedFreeCell, "Relaxed FreeCell", - GI.GT_FREECELL | GI.GT_RELAXED | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_RELAXED | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(8, FreeCell, "FreeCell", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(46, ForeCell, "ForeCell", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(77, Stalactites, "Stalactites", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0, + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("Grampus", "Old Mole") )) registerGame(GameInfo(264, DoubleFreecell, "Double FreeCell", - GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(265, TripleFreecell, "Triple FreeCell", - GI.GT_FREECELL | GI.GT_OPEN, 3, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(336, ChallengeFreeCell, "Challenge FreeCell", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0, + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL, rules_filename='freecell.html')) registerGame(GameInfo(337, SuperChallengeFreeCell, "Super Challenge FreeCell", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(363, Spidercells, "Spidercells", - GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) + GI.GT_SPIDER | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(364, SevenByFour, "Seven by Four", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(365, SevenByFive, "Seven by Five", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(383, Bath, "Bath", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(394, Clink, "Clink", - GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(448, Repair, "Repair", - GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(451, Cell11, "Cell 11", - GI.GT_FREECELL | GI.GT_OPEN, 3, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(464, FourColours, "Four Colours", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(509, BigCell, "Big Cell", - GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0)) + GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/glenwood.py b/pysollib/games/glenwood.py index fd54bf72..774fd83e 100644 --- a/pysollib/games/glenwood.py +++ b/pysollib/games/glenwood.py @@ -182,5 +182,5 @@ class Glenwood(Game): # register the game registerGame(GameInfo(282, Glenwood, "Glenwood", - GI.GT_CANFIELD, 1, 1)) + GI.GT_CANFIELD, 1, 1, GI.SL_BALANCED)) diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 648dd1c7..0da34ffc 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -612,23 +612,23 @@ class Robert(Game): # register the game registerGame(GameInfo(36, Golf, "Golf", - GI.GT_GOLF, 1, 0)) + GI.GT_GOLF, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(259, DeadKingGolf, "Dead King Golf", - GI.GT_GOLF, 1, 0)) + GI.GT_GOLF, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(260, RelaxedGolf, "Relaxed Golf", - GI.GT_GOLF | GI.GT_RELAXED, 1, 0)) + GI.GT_GOLF | GI.GT_RELAXED, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(40, Elevator, "Elevator", - GI.GT_GOLF, 1, 0, + GI.GT_GOLF, 1, 0, GI.SL_BALANCED, altnames=("Egyptian Solitaire", "Pyramid Golf") )) registerGame(GameInfo(237, TriPeaks, "Tri Peaks", - GI.GT_GOLF | GI.GT_SCORE, 1, 0)) + GI.GT_GOLF | GI.GT_SCORE, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(98, BlackHole, "Black Hole", - GI.GT_GOLF | GI.GT_OPEN, 1, 0)) + GI.GT_GOLF | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(267, FourLeafClovers, "Four Leaf Clovers", - GI.GT_GOLF | GI.GT_OPEN, 1, 0)) + GI.GT_GOLF | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(281, Escalator, "Escalator", - GI.GT_GOLF, 1, 0)) + GI.GT_GOLF, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(405, AllInARow, "All in a Row", - GI.GT_GOLF | GI.GT_OPEN, 1, 0)) + GI.GT_GOLF | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(432, Robert, "Robert", - GI.GT_GOLF, 1, 2)) + GI.GT_GOLF, 1, 2, GI.SL_LUCK)) diff --git a/pysollib/games/grandfathersclock.py b/pysollib/games/grandfathersclock.py index d2993ada..db9be246 100644 --- a/pysollib/games/grandfathersclock.py +++ b/pysollib/games/grandfathersclock.py @@ -138,5 +138,5 @@ class GrandfathersClock(Game): # register the game registerGame(GameInfo(261, GrandfathersClock, "Grandfather's Clock", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index af286125..40fed9c1 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -541,49 +541,49 @@ class Millie(Gypsy): # register the game registerGame(GameInfo(1, Gypsy, "Gypsy", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(65, Giant, "Giant", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(3, Irmgard, "Irmgard", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(119, DieKoenigsbergerin, "Die Königsbergerin", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(174, DieRussische, "Russian Patience", - GI.GT_2DECK_TYPE | GI.GT_OPEN, 2, 0, + GI.GT_2DECK_TYPE | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12), altnames=("Die Russische",) )) registerGame(GameInfo(62, MissMilligan, "Miss Milligan", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(200, Nomad, "Nomad", - GI.GT_GYPSY | GI.GT_CONTRIB | GI.GT_ORIGINAL, 2, 0)) + GI.GT_GYPSY | GI.GT_CONTRIB | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(78, MilliganCell, "Milligan Cell", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(217, MilliganHarp, "Milligan Harp", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(218, Carlton, "Carlton", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(68, LexingtonHarp, "Lexington Harp", - GI.GT_YUKON, 2, 0)) + GI.GT_YUKON, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(154, Brunswick, "Brunswick", - GI.GT_YUKON, 2, 0)) + GI.GT_YUKON, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(121, Mississippi, "Mississippi", - GI.GT_YUKON | GI.GT_XORIGINAL, 2, 0)) + GI.GT_YUKON | GI.GT_XORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(122, Griffon, "Griffon", - GI.GT_YUKON | GI.GT_XORIGINAL, 2, 0)) + GI.GT_YUKON | GI.GT_XORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(226, Blockade, "Blockade", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(412, Cone, "Cone", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(463, Surprise, "Surprise", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(469, PhantomBlockade, "Phantom Blockade", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(478, Elba, "Elba", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(486, ImperialGuards, "Imperial Guards", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(487, Millie, "Millie", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(498, Steve, "Steve", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index e7566be0..c86100e8 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -213,24 +213,24 @@ class Arabella(DoubleKlondike): # register the game registerGame(GameInfo(21, DoubleKlondike, "Double Klondike", - GI.GT_KLONDIKE, 2, -1)) + GI.GT_KLONDIKE, 2, -1, GI.SL_BALANCED)) registerGame(GameInfo(28, DoubleKlondikeByThrees, "Double Klondike by Threes", - GI.GT_KLONDIKE, 2, -1)) + GI.GT_KLONDIKE, 2, -1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(25, Gargantua, "Gargantua", - GI.GT_KLONDIKE, 2, 1)) + GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(15, BigHarp, "Big Harp", - GI.GT_KLONDIKE, 2, 0, + GI.GT_KLONDIKE, 2, 0, GI.SL_BALANCED, altnames=("Die große Harfe",) )) registerGame(GameInfo(51, Steps, "Steps", - GI.GT_KLONDIKE, 2, 1)) + GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(273, TripleKlondike, "Triple Klondike", - GI.GT_KLONDIKE, 3, -1)) + GI.GT_KLONDIKE, 3, -1, GI.SL_BALANCED)) registerGame(GameInfo(274, TripleKlondikeByThrees, "Triple Klondike by Threes", - GI.GT_KLONDIKE, 3, -1)) + GI.GT_KLONDIKE, 3, -1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(495, LadyJane, "Lady Jane", - GI.GT_KLONDIKE, 2, 1)) + GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(496, Inquisitor, "Inquisitor", - GI.GT_KLONDIKE, 2, 2)) + GI.GT_KLONDIKE, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(497, Arabella, "Arabella", - GI.GT_KLONDIKE, 3, 0)) + GI.GT_KLONDIKE, 3, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/headsandtails.py b/pysollib/games/headsandtails.py index 77d8c703..cae00cde 100644 --- a/pysollib/games/headsandtails.py +++ b/pysollib/games/headsandtails.py @@ -136,7 +136,7 @@ class HeadsAndTails(Game): # register the game registerGame(GameInfo(307, HeadsAndTails, "Heads and Tails", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index 51a215f3..7da00236 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -335,18 +335,18 @@ class Deep(DerKatzenschwanz): # register the game registerGame(GameInfo(141, DerKatzenschwanz, "Cat's Tail", - GI.GT_FREECELL | GI.GT_OPEN, 2, 0, + GI.GT_FREECELL | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, altnames=("Der Katzenschwanz",) )) registerGame(GameInfo(142, DieSchlange, "Snake", - GI.GT_FREECELL | GI.GT_OPEN, 2, 0, + GI.GT_FREECELL | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, altnames=("Die Schlange",) )) registerGame(GameInfo(279, Kings, "Kings", - GI.GT_FREECELL | GI.GT_OPEN, 2, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(286, Retinue, "Retinue", - GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) + GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(299, SalicLaw, "Salic Law", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(442, Deep, "Deep", - GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) + GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 82de9dca..06a81494 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -608,7 +608,7 @@ class AgnesBernauer(Jane): Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, base_rank=NO_RANK, max_move=0) def createGame(self): - Jane.createGame(self, max_rounds=1, waste=0, texts=1) + Jane.createGame(self, max_rounds=1, waste=0, texts=0) def startGame(self): Jane.startGame(self, flip=1) @@ -1052,107 +1052,107 @@ class Whitehorse(Klondike): # register the game registerGame(GameInfo(2, Klondike, "Klondike", - GI.GT_KLONDIKE, 1, -1)) + GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(61, CasinoKlondike, "Casino Klondike", - GI.GT_KLONDIKE | GI.GT_SCORE, 1, 2)) + GI.GT_KLONDIKE | GI.GT_SCORE, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(129, VegasKlondike, "Vegas Klondike", - GI.GT_KLONDIKE | GI.GT_SCORE, 1, 0)) + GI.GT_KLONDIKE | GI.GT_SCORE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(18, KlondikeByThrees, "Klondike by Threes", - GI.GT_KLONDIKE, 1, -1)) + GI.GT_KLONDIKE, 1, -1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(58, ThumbAndPouch, "Thumb and Pouch", - GI.GT_KLONDIKE, 1, 0)) + GI.GT_KLONDIKE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(67, Whitehead, "Whitehead", - GI.GT_KLONDIKE, 1, 0)) + GI.GT_KLONDIKE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(39, SmallHarp, "Small Harp", - GI.GT_KLONDIKE, 1, -1, + GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED, altnames=("Die kleine Harfe",) )) registerGame(GameInfo(66, Eastcliff, "Eastcliff", - GI.GT_KLONDIKE, 1, 0)) + GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(224, Easthaven, "Easthaven", - GI.GT_GYPSY, 1, 0)) + GI.GT_GYPSY, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(33, Westcliff, "Westcliff", - GI.GT_KLONDIKE, 1, 0)) + GI.GT_KLONDIKE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(225, Westhaven, "Westhaven", - GI.GT_GYPSY, 1, 0)) + GI.GT_GYPSY, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(107, PasSeul, "Pas Seul", - GI.GT_KLONDIKE, 1, 0)) + GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(81, BlindAlleys, "Blind Alleys", - GI.GT_KLONDIKE, 1, 1)) + GI.GT_KLONDIKE, 1, 1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(215, Somerset, "Somerset", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(231, Canister, "Canister", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(229, AgnesSorel, "Agnes Sorel", - GI.GT_GYPSY, 1, 0)) + GI.GT_GYPSY, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(4, EightTimesEight, "8 x 8", - GI.GT_KLONDIKE, 2, -1)) + GI.GT_KLONDIKE, 2, -1, GI.SL_BALANCED)) registerGame(GameInfo(127, AchtmalAcht, "Eight Times Eight", - GI.GT_KLONDIKE, 2, 2, + GI.GT_KLONDIKE, 2, 2, GI.SL_BALANCED, altnames=("Achtmal Acht",) )) registerGame(GameInfo(133, Batsford, "Batsford", - GI.GT_KLONDIKE, 2, 0)) + GI.GT_KLONDIKE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(221, Stonewall, "Stonewall", - GI.GT_RAGLAN, 1, 0)) + GI.GT_RAGLAN, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(222, FlowerGarden, "Flower Garden", - GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("The Bouquet", "The Garden",) )) registerGame(GameInfo(233, KingAlbert, "King Albert", - GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("Idiot's Delight",) )) registerGame(GameInfo(232, Raglan, "Raglan", - GI.GT_RAGLAN | GI.GT_OPEN, 1, 0)) + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(223, Brigade, "Brigade", - GI.GT_RAGLAN | GI.GT_OPEN, 1, 0)) + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(230, Jane, "Jane", - GI.GT_RAGLAN, 1, 0)) + GI.GT_RAGLAN, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(236, AgnesBernauer, "Agnes Bernauer", - GI.GT_RAGLAN, 1, 0)) + GI.GT_RAGLAN, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(263, Phoenix, "Phoenix", - GI.GT_RAGLAN | GI.GT_OPEN, 1, 0)) + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(283, Jumbo, "Jumbo", - GI.GT_KLONDIKE, 2, 1)) + GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(333, OpenJumbo, "Open Jumbo", - GI.GT_KLONDIKE, 2, 1)) + GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(297, Alternation, "Alternation", - GI.GT_KLONDIKE, 2, 0)) + GI.GT_KLONDIKE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(326, Lanes, "Lanes", - GI.GT_KLONDIKE, 1, 1)) + GI.GT_KLONDIKE, 1, 1, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(327, ThirtySix, "Thirty Six", - GI.GT_KLONDIKE, 1, 0)) + GI.GT_KLONDIKE, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(350, Q_C_, "Q.C.", - GI.GT_KLONDIKE, 2, 1)) + GI.GT_KLONDIKE, 2, 1, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(361, NorthwestTerritory, "Northwest Territory", - GI.GT_RAGLAN, 1, 0)) + GI.GT_RAGLAN, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(362, Morehead, "Morehead", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(388, Senate, "Senate", - GI.GT_RAGLAN, 2, 0)) + GI.GT_RAGLAN, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(389, SenatePlus, "Senate +", - GI.GT_RAGLAN, 2, 0)) + GI.GT_RAGLAN, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(390, Arizona, "Arizona", - GI.GT_RAGLAN | GI.GT_OPEN, 1, 0)) + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(407, AuntMary, "Aunt Mary", - GI.GT_KLONDIKE, 1, 0)) + GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(420, DoubleDot, "Double Dot", - GI.GT_KLONDIKE, 1, 0)) + GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(434, SevenDevils, "Seven Devils", - GI.GT_RAGLAN, 2, 0)) + GI.GT_RAGLAN, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(452, DoubleEasthaven, "Double Easthaven", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(453, TripleEasthaven, "Triple Easthaven", - GI.GT_GYPSY, 3, 0)) + GI.GT_GYPSY, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(470, MovingLeft, "Moving Left", - GI.GT_KLONDIKE, 2, 0)) + GI.GT_KLONDIKE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(471, Souter, "Souter", - GI.GT_KLONDIKE, 2, 1)) + GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(473, BigForty, "Big Forty", - GI.GT_KLONDIKE, 1, -1)) + GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(474, AliBaba, "Ali Baba", - GI.GT_KLONDIKE, 1, -1)) + GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(475, Cassim, "Cassim", - GI.GT_KLONDIKE, 1, -1)) + GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(479, Saratoga, "Saratoga", - GI.GT_KLONDIKE, 1, -1)) + GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(491, Whitehorse, "Whitehorse", - GI.GT_KLONDIKE, 1, -1)) + GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py index 6f26e6f0..3f542d74 100644 --- a/pysollib/games/mahjongg/mahjongg.py +++ b/pysollib/games/mahjongg/mahjongg.py @@ -708,7 +708,7 @@ def r(id, short_name, name=None, ncards=144, layout=None): gameclass.NCARDS = ncards decks, ranks, trumps = comp_cardset(ncards) gi = GameInfo(id, gameclass, name, - GI.GT_MAHJONGG, 4*decks, 0, + GI.GT_MAHJONGG, 4*decks, 0, ##GI.SL_MOSTLY_SKILL, category=GI.GC_MAHJONGG, short_name=short_name, suits=range(3), ranks=range(ranks), trumps=range(trumps), si={"decks": decks, "ncards": ncards}) diff --git a/pysollib/games/mahjongg/shisensho.py b/pysollib/games/mahjongg/shisensho.py index 5a231de3..58c05b69 100644 --- a/pysollib/games/mahjongg/shisensho.py +++ b/pysollib/games/mahjongg/shisensho.py @@ -449,7 +449,7 @@ def r(id, gameclass, short_name, name=None, decks=1, ranks=10, trumps=12): name = short_name decks, ranks, trumps = comp_cardset(gameclass.NCARDS) gi = GameInfo(id, gameclass, name, - GI.GT_SHISEN_SHO, 4*decks, 0, + GI.GT_SHISEN_SHO, 4*decks, 0, GI.SL_MOSTLY_SKILL, category=GI.GC_MAHJONGG, short_name=name, suits=range(3), ranks=range(ranks), trumps=range(trumps), si={"decks": decks, "ncards": gameclass.NCARDS}) diff --git a/pysollib/games/matriarchy.py b/pysollib/games/matriarchy.py index ee704826..84f8d4e4 100644 --- a/pysollib/games/matriarchy.py +++ b/pysollib/games/matriarchy.py @@ -225,5 +225,5 @@ class Matriarchy(Game): # register the game registerGame(GameInfo(17, Matriarchy, "Matriarchy", - GI.GT_2DECK_TYPE, 2, VARIABLE_REDEALS)) + GI.GT_2DECK_TYPE, 2, VARIABLE_REDEALS, GI.SL_BALANCED)) diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py index 8fc3f2c4..a3ca410b 100644 --- a/pysollib/games/montana.py +++ b/pysollib/games/montana.py @@ -385,23 +385,23 @@ class SpacesAndAces(BlueMoon): # register the game registerGame(GameInfo(53, Montana, "Montana", - GI.GT_MONTANA | GI.GT_OPEN, 1, 2, + GI.GT_MONTANA | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL, si={"ncards": 48}, altnames="Gaps")) registerGame(GameInfo(116, Spaces, "Spaces", - GI.GT_MONTANA | GI.GT_OPEN, 1, 2, + GI.GT_MONTANA | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL, si={"ncards": 48})) registerGame(GameInfo(63, BlueMoon, "Blue Moon", - GI.GT_MONTANA | GI.GT_OPEN, 1, 2, + GI.GT_MONTANA | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL, altnames=("Rangoon",) )) registerGame(GameInfo(117, RedMoon, "Red Moon", - GI.GT_MONTANA | GI.GT_OPEN, 1, 2)) + GI.GT_MONTANA | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(275, Galary, "Galary", - GI.GT_MONTANA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 2)) + GI.GT_MONTANA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 2, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(276, Moonlight, "Moonlight", - GI.GT_MONTANA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 2, + GI.GT_MONTANA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 2, GI.SL_MOSTLY_SKILL, si={"ncards": 48})) registerGame(GameInfo(380, Jungle, "Jungle", - GI.GT_MONTANA | GI.GT_OPEN, 1, 1)) + GI.GT_MONTANA | GI.GT_OPEN, 1, 1, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(381, SpacesAndAces, "Spaces and Aces", - GI.GT_MONTANA | GI.GT_OPEN, 1, 0)) + GI.GT_MONTANA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index 2cb3c029..f296c137 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -767,32 +767,32 @@ class DerLetzteMonarch(Game): # register the game registerGame(GameInfo(89, MonteCarlo, "Monte Carlo", - GI.GT_PAIRING_TYPE, 1, 0, + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK, altnames=("Quilt",) )) registerGame(GameInfo(216, Monaco, "Monaco", - GI.GT_PAIRING_TYPE, 2, 0)) + GI.GT_PAIRING_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(212, Weddings, "Weddings", - GI.GT_PAIRING_TYPE, 1, 0)) + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(90, SimpleCarlo, "Simple Carlo", - GI.GT_PAIRING_TYPE, 1, 0)) + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(91, SimplePairs, "Simple Pairs", - GI.GT_PAIRING_TYPE, 1, 0, + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_LUCK, altnames=("Jamestown",))) registerGame(GameInfo(92, Neighbour, "Neighbour", - GI.GT_PAIRING_TYPE, 1, 0)) + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(96, Fourteen, "Fourteen", - GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(235, Nestor, "Nestor", - GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(152, DerLetzteMonarch, "The last Monarch", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("Der letzte Monarch",) )) registerGame(GameInfo(328, TheWish, "The Wish", - GI.GT_PAIRING_TYPE, 1, 0, + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK, ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) registerGame(GameInfo(329, TheWishOpen, "The Wish (open)", - GI.GT_PAIRING_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, + GI.GT_PAIRING_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) registerGame(GameInfo(368, Vertical, "Vertical", - GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/napoleon.py b/pysollib/games/napoleon.py index 69ee4696..9b21e254 100644 --- a/pysollib/games/napoleon.py +++ b/pysollib/games/napoleon.py @@ -263,11 +263,11 @@ class FreeNapoleon(DerFreieNapoleon): # register the game registerGame(GameInfo(167, DerKleineNapoleon, "Der kleine Napoleon", - GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0)) + GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(168, DerFreieNapoleon, "Der freie Napoleon", - GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0)) + GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(169, Napoleon, "Napoleon", - GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0)) + GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(170, FreeNapoleon, "Free Napoleon", - GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0)) + GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/needle.py b/pysollib/games/needle.py index f95eb6f0..be541857 100644 --- a/pysollib/games/needle.py +++ b/pysollib/games/needle.py @@ -113,9 +113,9 @@ class Pitchfork(Needle): # register the game registerGame(GameInfo(318, Needle, "Needle", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(319, Haystack, "Haystack", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(367, Pitchfork, "Pitchfork", - GI.GT_FREECELL | GI.GT_OPEN, 1, 0)) + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index ca24b5cf..d8dd320c 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -581,25 +581,25 @@ class Strategerie(Game): # register the game registerGame(GameInfo(257, Numerica, "Numerica", - GI.GT_NUMERICA | GI.GT_CONTRIB, 1, 0, + GI.GT_NUMERICA | GI.GT_CONTRIB, 1, 0, GI.SL_BALANCED, altnames="Sir Tommy")) registerGame(GameInfo(171, LadyBetty, "Lady Betty", - GI.GT_NUMERICA, 1, 0)) + GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(355, Frog, "Frog", - GI.GT_NUMERICA, 2, 0)) + GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(356, Fly, "Fly", - GI.GT_NUMERICA, 2, 0)) + GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(357, Gnat, "Gnat", - GI.GT_NUMERICA, 1, 0)) + GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(378, Gloaming, "Gloaming", - GI.GT_NUMERICA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) + GI.GT_NUMERICA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(379, Chamberlain, "Chamberlain", - GI.GT_NUMERICA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) + GI.GT_NUMERICA | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(402, Toad, "Toad", - GI.GT_NUMERICA | GI.GT_ORIGINAL, 2, 0)) + GI.GT_NUMERICA | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(430, PussInTheCorner, "Puss in the Corner", - GI.GT_NUMERICA, 1, 0)) + GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(435, Shifting, "Shifting", - GI.GT_NUMERICA, 1, 0)) + GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(472, Strategerie, "Strategerie", - GI.GT_NUMERICA, 1, 0)) + GI.GT_NUMERICA, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/osmosis.py b/pysollib/games/osmosis.py index 7c1f907a..f30b928b 100644 --- a/pysollib/games/osmosis.py +++ b/pysollib/games/osmosis.py @@ -287,16 +287,16 @@ class Bridesmaids(Game): # register the game registerGame(GameInfo(59, Osmosis, "Osmosis", - GI.GT_1DECK_TYPE, 1, -1, + GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK, altnames=("Treasure Trove",) )) registerGame(GameInfo(60, Peek, "Peek", - GI.GT_1DECK_TYPE, 1, -1)) + GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(298, OpenPeek, "Open Peek", - GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(370, Genesis, "Genesis", - GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(371, GenesisPlus, "Genesis +", - GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(409, Bridesmaids, "Bridesmaids", - GI.GT_1DECK_TYPE, 1, -1)) + GI.GT_1DECK_TYPE, 1, -1, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/parallels.py b/pysollib/games/parallels.py index 1c196788..4eb5da93 100644 --- a/pysollib/games/parallels.py +++ b/pysollib/games/parallels.py @@ -168,7 +168,7 @@ class Parallels(Game): # register the game registerGame(GameInfo(428, Parallels, "Parallels", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/pasdedeux.py b/pysollib/games/pasdedeux.py index 38bab75c..3fc5d242 100644 --- a/pysollib/games/pasdedeux.py +++ b/pysollib/games/pasdedeux.py @@ -226,5 +226,5 @@ class PasDeDeux(Game): # register the game registerGame(GameInfo(153, PasDeDeux, "Pas de Deux", - GI.GT_MONTANA | GI.GT_SEPARATE_DECKS, 2, 1)) + GI.GT_MONTANA | GI.GT_SEPARATE_DECKS, 2, 1, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py index f120b5eb..d329ee9f 100644 --- a/pysollib/games/picturegallery.py +++ b/pysollib/games/picturegallery.py @@ -423,14 +423,14 @@ class Zeus(MountOlympus): # register the game registerGame(GameInfo(7, PictureGallery, "Picture Gallery", - GI.GT_2DECK_TYPE, 2, 0, + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, altnames=("Die Bildgallerie", "Mod-3") )) registerGame(GameInfo(397, GreatWheel, "Great Wheel", - GI.GT_2DECK_TYPE, 2, 0, + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, ranks=range(12) # without Kings )) registerGame(GameInfo(398, MountOlympus, "Mount Olympus", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(399, Zeus, "Zeus", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index e1203bc2..f78187d0 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -128,10 +128,10 @@ class PileOn2Decks(PileOn): # register the game registerGame(GameInfo(41, PileOn, "PileOn", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("Fifteen Puzzle",) )) registerGame(GameInfo(289, SmallPileOn, "Small PileOn", - GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL, ranks=(0, 5, 6, 7, 8, 9, 10, 11, 12), rules_filename = "pileon.html")) ## registerGame(GameInfo(341, PileOn2Decks, "PileOn (2 decks)", diff --git a/pysollib/games/poker.py b/pysollib/games/poker.py index daea0437..4257b8e7 100644 --- a/pysollib/games/poker.py +++ b/pysollib/games/poker.py @@ -286,9 +286,9 @@ class PokerShuffle(PokerSquare): # register the game registerGame(GameInfo(139, PokerSquare, "Poker Square", - GI.GT_POKER_TYPE | GI.GT_SCORE, 1, 0, + GI.GT_POKER_TYPE | GI.GT_SCORE, 1, 0, GI.SL_MOSTLY_SKILL, si={"ncards": 25})) registerGame(GameInfo(140, PokerShuffle, "Poker Shuffle", - GI.GT_POKER_TYPE | GI.GT_SCORE | GI.GT_OPEN, 1, 0, + GI.GT_POKER_TYPE | GI.GT_SCORE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, si={"ncards": 25})) diff --git a/pysollib/games/pushpin.py b/pysollib/games/pushpin.py index 4ce6f23a..4f491ff5 100644 --- a/pysollib/games/pushpin.py +++ b/pysollib/games/pushpin.py @@ -224,8 +224,8 @@ class Queens(PushPin): registerGame(GameInfo(287, PushPin, "Push Pin", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(288, RoyalMarriage, "Royal Marriage", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) ## registerGame(GameInfo(303, Queens, "Queens", ## GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index 22972373..ee0c4a39 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -293,9 +293,9 @@ class Thirteen(Pyramid): # register the game registerGame(GameInfo(38, Pyramid, "Pyramid", - GI.GT_PAIRING_TYPE, 1, 2)) + GI.GT_PAIRING_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(193, RelaxedPyramid, "Relaxed Pyramid", - GI.GT_PAIRING_TYPE | GI.GT_RELAXED, 1, 2)) + GI.GT_PAIRING_TYPE | GI.GT_RELAXED, 1, 2, GI.SL_MOSTLY_LUCK)) ##registerGame(GameInfo(44, Thirteen, "Thirteen", ## GI.GT_PAIRING_TYPE, 1, 0)) diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index c10beae1..5224ad76 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -526,25 +526,25 @@ class Twenty(Game): # register the game registerGame(GameInfo(54, RoyalCotillion, "Royal Cotillion", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_LUCK)) registerGame(GameInfo(55, OddAndEven, "Odd and Even", - GI.GT_2DECK_TYPE, 2, 1)) + GI.GT_2DECK_TYPE, 2, 1, GI.SL_LUCK)) registerGame(GameInfo(143, Kingdom, "Kingdom", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(234, Alhambra, "Alhambra", - GI.GT_2DECK_TYPE, 2, 2)) + GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(97, Carpet, "Carpet", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(391, BritishConstitution, "British Constitution", - GI.GT_2DECK_TYPE, 2, 0, + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, ranks=range(11) # without Queens and Kings )) registerGame(GameInfo(392, NewBritishConstitution, "New British Constitution", - GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0, + GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED, ranks=range(11) # without Queens and Kings )) registerGame(GameInfo(443, Twenty, "Twenty", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(465, Granada, "Granada", - GI.GT_2DECK_TYPE, 2, 2)) + GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED)) diff --git a/pysollib/games/royaleast.py b/pysollib/games/royaleast.py index 076350b9..64f680af 100644 --- a/pysollib/games/royaleast.py +++ b/pysollib/games/royaleast.py @@ -119,5 +119,5 @@ class RoyalEast(Game): # register the game registerGame(GameInfo(93, RoyalEast, "Royal East", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/siebenbisas.py b/pysollib/games/siebenbisas.py index a722b9cd..e1419612 100644 --- a/pysollib/games/siebenbisas.py +++ b/pysollib/games/siebenbisas.py @@ -260,9 +260,9 @@ class Maze(Game): # register the game registerGame(GameInfo(118, SiebenBisAs, "Sieben bis As", - GI.GT_MONTANA | GI.GT_OPEN, 1, 0, + GI.GT_MONTANA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12))) registerGame(GameInfo(144, Maze, "Maze", - GI.GT_MONTANA | GI.GT_OPEN, 1, 0, + GI.GT_MONTANA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, si={"ncards": 48})) diff --git a/pysollib/games/simplex.py b/pysollib/games/simplex.py index 7a3cc4fc..03cd8aec 100644 --- a/pysollib/games/simplex.py +++ b/pysollib/games/simplex.py @@ -100,4 +100,4 @@ class Simplex(Game): # register the game registerGame(GameInfo(436, Simplex, "Simplex", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/special/hanoi.py b/pysollib/games/special/hanoi.py index 8b39c70f..d790c60d 100644 --- a/pysollib/games/special/hanoi.py +++ b/pysollib/games/special/hanoi.py @@ -148,18 +148,18 @@ class HanoiPuzzle6(HanoiPuzzle4): # register the game registerGame(GameInfo(124, TowerOfHanoy, "Tower of Hanoy", - GI.GT_PUZZLE_TYPE, 1, 0, + GI.GT_PUZZLE_TYPE, 1, 0, GI.SL_SKILL, suits=(2,), ranks=range(9))) registerGame(GameInfo(207, HanoiPuzzle4, "Hanoi Puzzle 4", - GI.GT_PUZZLE_TYPE, 1, 0, + GI.GT_PUZZLE_TYPE, 1, 0, GI.SL_SKILL, suits=(2,), ranks=range(4), rules_filename="hanoipuzzle.html")) registerGame(GameInfo(208, HanoiPuzzle5, "Hanoi Puzzle 5", - GI.GT_PUZZLE_TYPE, 1, 0, + GI.GT_PUZZLE_TYPE, 1, 0, GI.SL_SKILL, suits=(2,), ranks=range(5), rules_filename="hanoipuzzle.html")) registerGame(GameInfo(209, HanoiPuzzle6, "Hanoi Puzzle 6", - GI.GT_PUZZLE_TYPE, 1, 0, + GI.GT_PUZZLE_TYPE, 1, 0, GI.SL_SKILL, suits=(2,), ranks=range(6), rules_filename="hanoipuzzle.html")) diff --git a/pysollib/games/special/memory.py b/pysollib/games/special/memory.py index 2d1e18f1..4bebc4ab 100644 --- a/pysollib/games/special/memory.py +++ b/pysollib/games/special/memory.py @@ -311,14 +311,14 @@ class Concentration(Memory24): # register the game registerGame(GameInfo(176, Memory24, "Memory 24", - GI.GT_MEMORY | GI.GT_SCORE, 2, 0, + GI.GT_MEMORY | GI.GT_SCORE, 2, 0, GI.SL_SKILL, suits=(0,2), ranks=(0,8,9,10,11,12))) registerGame(GameInfo(219, Memory30, "Memory 30", - GI.GT_MEMORY | GI.GT_SCORE, 2, 0, + GI.GT_MEMORY | GI.GT_SCORE, 2, 0, GI.SL_SKILL, suits=(0,2,3), ranks=(0,9,10,11,12))) registerGame(GameInfo(177, Memory40, "Memory 40", - GI.GT_MEMORY | GI.GT_SCORE, 2, 0, + GI.GT_MEMORY | GI.GT_SCORE, 2, 0, GI.SL_SKILL, suits=(0,2), ranks=(0,4,5,6,7,8,9,10,11,12))) registerGame(GameInfo(178, Concentration, "Concentration", - GI.GT_MEMORY | GI.GT_SCORE, 1, 0)) + GI.GT_MEMORY | GI.GT_SCORE, 1, 0, GI.SL_SKILL)) diff --git a/pysollib/games/special/pegged.py b/pysollib/games/special/pegged.py index 08d304b4..376818e4 100644 --- a/pysollib/games/special/pegged.py +++ b/pysollib/games/special/pegged.py @@ -244,7 +244,7 @@ def r(id, gameclass, name): for n in gameclass.ROWS: si_ncards = si_ncards + n gi = GameInfo(id, gameclass, name, - GI.GT_PUZZLE_TYPE, 1, 0, + GI.GT_PUZZLE_TYPE, 1, 0, GI.SL_SKILL, si={"ncards": si_ncards}, rules_filename = "pegged.html") registerGame(gi) diff --git a/pysollib/games/special/tarock.py b/pysollib/games/special/tarock.py index f3bd38fc..aed5f516 100644 --- a/pysollib/games/special/tarock.py +++ b/pysollib/games/special/tarock.py @@ -516,6 +516,7 @@ class Skiz(AbstractTarockGame): # ************************************************************************/ class FifteenPlus(AbstractTarockGame): + Hint_Class = CautiousDefaultHint # # Game layout @@ -918,26 +919,26 @@ class Nasty(Wicked): # // register the games # ************************************************************************/ -def r(id, gameclass, name, game_type, decks, redeals): +def r(id, gameclass, name, game_type, decks, redeals, skill_level): game_type = game_type | GI.GT_TAROCK | GI.GT_CONTRIB | GI.GT_ORIGINAL - gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level, ranks=range(14), trumps=range(22)) registerGame(gi) return gi -r(157, WheelOfFortune, "Wheel of Fortune", GI.GT_TAROCK, 1, 0) -r(158, ImperialTrumps, "Imperial Trumps", GI.GT_TAROCK, 1, -1) -r(159, Pagat, "Pagat", GI.GT_TAROCK | GI.GT_OPEN, 1, 0) -r(160, Skiz, "Skiz", GI.GT_TAROCK | GI.GT_OPEN, 1, 0) -r(161, FifteenPlus, "Fifteen plus", GI.GT_TAROCK, 1, 0) -r(162, Excuse, "Excuse", GI.GT_TAROCK | GI.GT_OPEN, 1, 0) -r(163, Grasshopper, "Grasshopper", GI.GT_TAROCK, 1, 1) -r(164, DoubleGrasshopper, "Double Grasshopper", GI.GT_TAROCK, 2, 1) -r(179, Ponytail, "Ponytail", GI.GT_TAROCK, 2, 2) -r(202, Cavalier, "Cavalier", GI.GT_TAROCK, 1, 0) -r(203, FiveAces, "Five Aces", GI.GT_TAROCK, 1, 0) -r(204, Wicked, "Wicked", GI.GT_TAROCK | GI.GT_OPEN, 1, -1) -r(205, Nasty, "Nasty", GI.GT_TAROCK | GI.GT_OPEN, 1, -1) +r(157, WheelOfFortune, "Wheel of Fortune", GI.GT_TAROCK, 1, 0, GI.SL_BALANCED) +r(158, ImperialTrumps, "Imperial Trumps", GI.GT_TAROCK, 1, -1, GI.SL_BALANCED) +r(159, Pagat, "Pagat", GI.GT_TAROCK | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(160, Skiz, "Skiz", GI.GT_TAROCK | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(161, FifteenPlus, "Fifteen plus", GI.GT_TAROCK, 1, 0, GI.SL_BALANCED) +r(162, Excuse, "Excuse", GI.GT_TAROCK | GI.GT_OPEN, 1, 0, GI.SL_BALANCED) +r(163, Grasshopper, "Grasshopper", GI.GT_TAROCK, 1, 1, GI.SL_MOSTLY_SKILL) +r(164, DoubleGrasshopper, "Double Grasshopper", GI.GT_TAROCK, 2, 1, GI.SL_MOSTLY_SKILL) +r(179, Ponytail, "Ponytail", GI.GT_TAROCK, 2, 2, GI.SL_MOSTLY_SKILL) +r(202, Cavalier, "Cavalier", GI.GT_TAROCK, 1, 0, GI.SL_MOSTLY_SKILL) +r(203, FiveAces, "Five Aces", GI.GT_TAROCK, 1, 0, GI.SL_MOSTLY_SKILL) +r(204, Wicked, "Wicked", GI.GT_TAROCK | GI.GT_OPEN, 1, -1, GI.SL_BALANCED) +r(205, Nasty, "Nasty", GI.GT_TAROCK | GI.GT_OPEN, 1, -1, GI.SL_BALANCED) del r diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 02f51d7d..928ee791 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -986,98 +986,98 @@ class FredsSpider3Decks(FredsSpider): # register the game registerGame(GameInfo(10, RelaxedSpider, "Relaxed Spider", - GI.GT_SPIDER | GI.GT_RELAXED, 2, 0)) + GI.GT_SPIDER | GI.GT_RELAXED, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(11, Spider, "Spider", - GI.GT_SPIDER, 2, 0, + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, altnames=("Tarantula",) )) registerGame(GameInfo(49, BlackWidow, "Black Widow", - GI.GT_SPIDER, 2, 0, + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, altnames=("Scarab",) )) registerGame(GameInfo(14, GroundForADivorce, "Ground for a Divorce", - GI.GT_SPIDER, 2, 0, + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, altnames=('Scheidungsgrund',) )) registerGame(GameInfo(114, GrandmothersGame, "Grandmother's Game", - GI.GT_SPIDER, 2, 0)) + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(24, Spiderette, "Spiderette", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(47, BabySpiderette, "Baby Spiderette", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(48, WillOTheWisp, "Will o' the Wisp", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(50, SimpleSimon, "Simple Simon", - GI.GT_SPIDER | GI.GT_OPEN, 1, 0)) + GI.GT_SPIDER | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(194, Rachel, "Rachel", - GI.GT_SPIDER | GI.GT_XORIGINAL, 1, 0)) + GI.GT_SPIDER | GI.GT_XORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(29, Scorpion, "Scorpion", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(185, Wasp, "Wasp", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(220, RougeEtNoir, "Rouge et Noir", - GI.GT_GYPSY, 2, 0)) + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(269, Spider1Suit, "Spider (1 suit)", - GI.GT_SPIDER, 2, 0, + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, suits=(0, 0, 0, 0), rules_filename="spider.html")) registerGame(GameInfo(270, Spider2Suits, "Spider (2 suits)", - GI.GT_SPIDER, 2, 0, + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, suits=(0, 0, 2, 2), rules_filename="spider.html")) registerGame(GameInfo(305, ThreeBlindMice, "Three Blind Mice", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(309, MrsMop, "Mrs. Mop", - GI.GT_SPIDER | GI.GT_OPEN, 2, 0)) + GI.GT_SPIDER | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(341, Cicely, "Cicely", - GI.GT_SPIDER, 2, 0)) + GI.GT_SPIDER, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(342, Trillium, "Trillium", - GI.GT_SPIDER, 2, 0)) + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(343, Lily, "Lily", - GI.GT_SPIDER, 2, 0)) + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(344, Chelicera, "Chelicera", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(345, ScorpionHead, "Scorpion Head", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(346, ScorpionTail, "Scorpion Tail", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(359, SpiderWeb, "Spider Web", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(366, SimonJester, "Simon Jester", - GI.GT_SPIDER | GI.GT_OPEN, 2, 0)) + GI.GT_SPIDER | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(382, Applegate, "Applegate", - GI.GT_SPIDER, 1, 0)) + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(384, BigSpider, "Big Spider", - GI.GT_SPIDER, 3, 0)) + GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(401, GroundForADivorce3Decks, "Big Ground", - GI.GT_SPIDER, 3, 0)) + GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(441, York, "York", - GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0)) + GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(444, TripleYork, "Triple York", - GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0)) + GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(445, BigSpider1Suit, "Big Spider (1 suit)", - GI.GT_SPIDER, 3, 0, + GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL, suits=(0, 0, 0, 0), rules_filename="bigspider.html")) registerGame(GameInfo(446, BigSpider2Suits, "Big Spider (2 suits)", - GI.GT_SPIDER, 3, 0, + GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL, suits=(0, 0, 2, 2), rules_filename="bigspider.html")) registerGame(GameInfo(449, Spider3x3, "Spider 3x3", - GI.GT_SPIDER | GI.GT_ORIGINAL, 3, 0, + GI.GT_SPIDER | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL, suits=(0, 1, 2), rules_filename="bigspider.html")) registerGame(GameInfo(454, Spider4Decks, "Spider (4 decks)", - GI.GT_SPIDER, 4, 0)) + GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(455, GroundForADivorce4Decks, "Very Big Ground", - GI.GT_SPIDER, 4, 0)) + GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(458, Spidike, "Spidike", - GI.GT_SPIDER, 1, 0)) # GT_GYPSY ? + GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) # GT_GYPSY ? registerGame(GameInfo(459, FredsSpider, "Fred's Spider", - GI.GT_SPIDER, 2, 0)) + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(460, FredsSpider3Decks, "Fred's Spider (3 decks)", - GI.GT_SPIDER, 3, 0)) + GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(461, OpenSpider, "Open Spider", - GI.GT_SPIDER, 2, 0)) + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(501, WakeRobin, "Wake-Robin", - GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0)) + GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(502, TripleWakeRobin, "Wake-Robin (3 decks)", - GI.GT_SPIDER | GI.GT_ORIGINAL, 3, 0)) + GI.GT_SPIDER | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/sthelena.py b/pysollib/games/sthelena.py index a1030513..1a28b85a 100644 --- a/pysollib/games/sthelena.py +++ b/pysollib/games/sthelena.py @@ -167,10 +167,10 @@ class BoxKite(StHelena): # register the game registerGame(GameInfo(302, StHelena, "St. Helena", - GI.GT_2DECK_TYPE, 2, 2, + GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED, altnames=("Napoleon's Favorite", "Washington's Favorite") )) registerGame(GameInfo(408, BoxKite, "Box Kite", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 9967e83c..a2d3d4af 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -688,27 +688,27 @@ class CornerSuite(Game): # register the game registerGame(GameInfo(330, Sultan, "Sultan", - GI.GT_2DECK_TYPE, 2, 2, + GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK, altnames=("Sultan of Turkey",) )) registerGame(GameInfo(331, SultanPlus, "Sultan +", - GI.GT_2DECK_TYPE, 2, 2)) + GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(354, Boudoir, "Boudoir", - GI.GT_2DECK_TYPE, 2, 2)) + GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(410, CaptiveQueens, "Captive Queens", - GI.GT_1DECK_TYPE, 1, 2)) + GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(418, Contradance, "Contradance", - GI.GT_2DECK_TYPE, 2, 1)) + GI.GT_2DECK_TYPE, 2, 1, GI.SL_LUCK)) registerGame(GameInfo(419, IdleAces, "Idle Aces", - GI.GT_2DECK_TYPE, 2, 2)) + GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(423, LadyOfTheManor, "Lady of the Manor", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(424, Matrimony, "Matrimony", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(429, Patriarchs, "Patriarchs", - GI.GT_2DECK_TYPE, 2, 1)) + GI.GT_2DECK_TYPE, 2, 1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(437, Simplicity, "Simplicity", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(438, SixesAndSevens, "Sixes and Sevens", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(477, CornerSuite, "Corner Suite", - GI.GT_2DECK_TYPE, 1, 0)) + GI.GT_2DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/takeaway.py b/pysollib/games/takeaway.py index e425c406..4e65dd14 100644 --- a/pysollib/games/takeaway.py +++ b/pysollib/games/takeaway.py @@ -104,9 +104,9 @@ class FourStacks(TakeAway): # register the game registerGame(GameInfo(334, TakeAway, "Take Away", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(335, FourStacks, "Four Stacks", - GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/terrace.py b/pysollib/games/terrace.py index fc1f0da1..802882a9 100644 --- a/pysollib/games/terrace.py +++ b/pysollib/games/terrace.py @@ -291,17 +291,17 @@ class Madame(Terrace): # register the game registerGame(GameInfo(135, Terrace, "Terrace", - GI.GT_TERRACE, 2, 0)) + GI.GT_TERRACE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(136, GeneralsPatience, "General's Patience", - GI.GT_TERRACE, 2, 0)) + GI.GT_TERRACE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(137, BlondesAndBrunettes, "Blondes and Brunettes", - GI.GT_TERRACE, 2, 0)) + GI.GT_TERRACE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(138, FallingStar, "Falling Star", - GI.GT_TERRACE, 2, 0)) + GI.GT_TERRACE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(431, QueenOfItaly, "Queen of Italy", - GI.GT_TERRACE, 2, 0)) + GI.GT_TERRACE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(499, Signora, "Signora", - GI.GT_TERRACE, 2, 0)) + GI.GT_TERRACE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(500, Madame, "Madame", - GI.GT_TERRACE, 3, 0)) + GI.GT_TERRACE, 3, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/tournament.py b/pysollib/games/tournament.py index fd6ee107..5838320e 100644 --- a/pysollib/games/tournament.py +++ b/pysollib/games/tournament.py @@ -235,13 +235,13 @@ class KingsdownEights(Game): # register the game registerGame(GameInfo(303, Tournament, "Tournament", - GI.GT_2DECK_TYPE, 2, 2)) + GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(304, LaNivernaise, "La Nivernaise", - GI.GT_2DECK_TYPE, 2, 2, + GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK, altnames = ("Napoleon's Flank", ), rules_filename = "tournament.html")) registerGame(GameInfo(386, KingsdownEights, "Kingsdown Eights", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/ultra/dashavatara.py b/pysollib/games/ultra/dashavatara.py index 98a7eeec..8e5ec00f 100644 --- a/pysollib/games/ultra/dashavatara.py +++ b/pysollib/games/ultra/dashavatara.py @@ -1266,29 +1266,29 @@ class Dashavatara(Game): # * # ***********************************************************************/ -def r(id, gameclass, name, game_type, decks, redeals): +def r(id, gameclass, name, game_type, decks, redeals, skill_level): game_type = game_type | GI.GT_DASHAVATARA_GANJIFA - gi = GameInfo(id, gameclass, name, game_type, decks, redeals, - suits=range(10), ranks=range(12)) + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level, + suits=range(10), ranks=range(12)) registerGame(gi) return gi -r(15406, Matsya, "Matsya", GI.GT_DASHAVATARA_GANJIFA, 1, 0) -r(15407, Kurma, "Kurma", GI.GT_DASHAVATARA_GANJIFA, 1, -1) -r(15408, Varaha, "Varaha", GI.GT_DASHAVATARA_GANJIFA, 1, -1) -r(15409, Narasimha, "Narasimha", GI.GT_DASHAVATARA_GANJIFA, 1, 0) -r(15410, Vamana, "Vamana", GI.GT_DASHAVATARA_GANJIFA, 1, -1) -r(15411, Parashurama, "Parashurama", GI.GT_DASHAVATARA_GANJIFA, 1, 1) -r(15412, TenAvatars, "Ten Avatars", GI.GT_DASHAVATARA_GANJIFA, 1, 0) -r(15413, DashavataraCircles, "Dashavatara Circles", GI.GT_DASHAVATARA_GANJIFA, 1, 0) -r(15414, Balarama, "Balarama", GI.GT_DASHAVATARA_GANJIFA, 1, 0) -r(15415, Hayagriva, "Hayagriva", GI.GT_DASHAVATARA_GANJIFA, 1, 0) -r(15416, Shanka, "Shanka", GI.GT_DASHAVATARA_GANJIFA, 1, 0) -r(15417, Journey, "Journey to Cuddapah", GI.GT_DASHAVATARA_GANJIFA, 1, 2) -r(15418, LongJourney, "Long Journey to Cuddapah", GI.GT_DASHAVATARA_GANJIFA, 2, 2) -r(15419, Surukh, "Surukh", GI.GT_DASHAVATARA_GANJIFA, 1, 0) -r(15420, AppachansWaterfall, "Appachan's Waterfall", GI.GT_DASHAVATARA_GANJIFA, 1, 0) -r(15421, Hiranyaksha, 'Hiranyaksha', GI.GT_DASHAVATARA_GANJIFA, 1, 0) -r(15422, Dashavatara, 'Dashavatara', GI.GT_DASHAVATARA_GANJIFA, 1, 0) +r(15406, Matsya, "Matsya", GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_BALANCED) +r(15407, Kurma, "Kurma", GI.GT_DASHAVATARA_GANJIFA, 1, -1, GI.SL_BALANCED) +r(15408, Varaha, "Varaha", GI.GT_DASHAVATARA_GANJIFA, 1, -1, GI.SL_BALANCED) +r(15409, Narasimha, "Narasimha", GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_BALANCED) +r(15410, Vamana, "Vamana", GI.GT_DASHAVATARA_GANJIFA, 1, -1, GI.SL_BALANCED) +r(15411, Parashurama, "Parashurama", GI.GT_DASHAVATARA_GANJIFA, 1, 1, GI.SL_BALANCED) +r(15412, TenAvatars, "Ten Avatars", GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(15413, DashavataraCircles, "Dashavatara Circles", GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(15414, Balarama, "Balarama", GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(15415, Hayagriva, "Hayagriva", GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(15416, Shanka, "Shanka", GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(15417, Journey, "Journey to Cuddapah", GI.GT_DASHAVATARA_GANJIFA, 1, 2, GI.SL_BALANCED) +r(15418, LongJourney, "Long Journey to Cuddapah", GI.GT_DASHAVATARA_GANJIFA, 2, 2, GI.SL_BALANCED) +r(15419, Surukh, "Surukh", GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_BALANCED) +r(15420, AppachansWaterfall, "Appachan's Waterfall", GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(15421, Hiranyaksha, 'Hiranyaksha', GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(15422, Dashavatara, 'Dashavatara', GI.GT_DASHAVATARA_GANJIFA, 1, 0, GI.SL_BALANCED) del r diff --git a/pysollib/games/ultra/hanafuda.py b/pysollib/games/ultra/hanafuda.py index 658f35f2..21eff49d 100644 --- a/pysollib/games/ultra/hanafuda.py +++ b/pysollib/games/ultra/hanafuda.py @@ -1015,38 +1015,38 @@ class Paulownia(AbstractFlowerGame): # // Register the games # ************************************************************************/ -def r(id, gameclass, name, game_type, decks, redeals): +def r(id, gameclass, name, game_type, decks, redeals, skill_level): game_type = game_type | GI.GT_HANAFUDA - gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level, suits=range(12), ranks=range(4)) registerGame(gi) return gi -r(12345, Oonsoo, "Oonsoo", GI.GT_HANAFUDA, 1, 0) -r(12346, MatsuKiri, "MatsuKiri", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12372, MatsuKiriStrict, 'MatsuKiri Strict', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12347, Gaji, "Gaji", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12348, FlowerClock, "Flower Clock", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12349, Pagoda, "Pagoda", GI.GT_HANAFUDA, 2, 0) -r(12350, Samuri, "Samuri", GI.GT_HANAFUDA, 1, 0) -r(12351, GreatWall, "Great Wall", GI.GT_HANAFUDA, 4, 0) -r(12352, FourWinds, "Four Winds", GI.GT_HANAFUDA, 1, 1) -r(12353, Sumo, "Sumo", GI.GT_HANAFUDA, 1, 0) -r(12354, BigSumo, "Big Sumo", GI.GT_HANAFUDA, 2, 0) -r(12355, LittleEasy, "Little Easy", GI.GT_HANAFUDA, 1, -1) -r(12356, BigEasy, "Big Easy", GI.GT_HANAFUDA, 2, -1) -r(12357, EasySupreme, "Easy Supreme", GI.GT_HANAFUDA, 4, -1) -r(12358, JustForFun, "Just For Fun", GI.GT_HANAFUDA, 1, 0) -r(12359, Firecracker, "Firecracker", GI.GT_HANAFUDA, 1, 0) -r(12360, EasyX1, "Easy x One", GI.GT_HANAFUDA, 1, 1) -r(12361, Relax, "Relax", GI.GT_HANAFUDA, 1, 1) -r(12362, DoubleSamuri, "Double Samuri", GI.GT_HANAFUDA, 2, 0) -r(12363, SuperSamuri, "Super Samuri", GI.GT_HANAFUDA, 4, 0) -r(12364, DoubleYourFun, "Double Your Fun", GI.GT_HANAFUDA, 2, 0) -r(12365, CherryBomb, "Cherry Bomb", GI.GT_HANAFUDA, 2, 0) -r(12366, OonsooToo, "Oonsoo Too", GI.GT_HANAFUDA, 1, 0) -r(12367, OonsooStrict, "Oonsoo Strict", GI.GT_HANAFUDA, 1, 0) -r(12368, OonsooOpen, "Oonsoo Open", GI.GT_HANAFUDA, 1, 0) -r(12379, OonsooTimesTwo, "Oonsoo Times Two", GI.GT_HANAFUDA, 2, 0) +r(12345, Oonsoo, "Oonsoo", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) +r(12346, MatsuKiri, "MatsuKiri", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12372, MatsuKiriStrict, 'MatsuKiri Strict', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12347, Gaji, "Gaji", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12348, FlowerClock, "Flower Clock", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12349, Pagoda, "Pagoda", GI.GT_HANAFUDA, 2, 0, GI.SL_BALANCED) +r(12350, Samuri, "Samuri", GI.GT_HANAFUDA, 1, 0, GI.SL_BALANCED) +r(12351, GreatWall, "Great Wall", GI.GT_HANAFUDA, 4, 0, GI.SL_MOSTLY_SKILL) +r(12352, FourWinds, "Four Winds", GI.GT_HANAFUDA, 1, 1, GI.SL_MOSTLY_SKILL) +r(12353, Sumo, "Sumo", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) +r(12354, BigSumo, "Big Sumo", GI.GT_HANAFUDA, 2, 0, GI.SL_MOSTLY_SKILL) +r(12355, LittleEasy, "Little Easy", GI.GT_HANAFUDA, 1, -1, GI.SL_BALANCED) +r(12356, BigEasy, "Big Easy", GI.GT_HANAFUDA, 2, -1, GI.SL_BALANCED) +r(12357, EasySupreme, "Easy Supreme", GI.GT_HANAFUDA, 4, -1, GI.SL_BALANCED) +r(12358, JustForFun, "Just For Fun", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) +r(12359, Firecracker, "Firecracker", GI.GT_HANAFUDA, 1, 0, GI.SL_BALANCED) +r(12360, EasyX1, "Easy x One", GI.GT_HANAFUDA, 1, 1, GI.SL_BALANCED) +r(12361, Relax, "Relax", GI.GT_HANAFUDA, 1, 1, GI.SL_BALANCED) +r(12362, DoubleSamuri, "Double Samuri", GI.GT_HANAFUDA, 2, 0, GI.SL_BALANCED) +r(12363, SuperSamuri, "Super Samuri", GI.GT_HANAFUDA, 4, 0, GI.SL_BALANCED) +r(12364, DoubleYourFun, "Double Your Fun", GI.GT_HANAFUDA, 2, 0, GI.SL_MOSTLY_SKILL) +r(12365, CherryBomb, "Cherry Bomb", GI.GT_HANAFUDA, 2, 0, GI.SL_BALANCED) +r(12366, OonsooToo, "Oonsoo Too", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) +r(12367, OonsooStrict, "Oonsoo Strict", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) +r(12368, OonsooOpen, "Oonsoo Open", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) +r(12379, OonsooTimesTwo, "Oonsoo Times Two", GI.GT_HANAFUDA, 2, 0, GI.SL_MOSTLY_SKILL) del r diff --git a/pysollib/games/ultra/hanafuda1.py b/pysollib/games/ultra/hanafuda1.py index f6288d80..4ddd5ab3 100644 --- a/pysollib/games/ultra/hanafuda1.py +++ b/pysollib/games/ultra/hanafuda1.py @@ -691,27 +691,27 @@ class FlowerArrangement(Game): # * Register the games # ************************************************************************/ -def r(id, gameclass, name, game_type, decks, redeals): +def r(id, gameclass, name, game_type, decks, redeals, skill_level): game_type = game_type | GI.GT_HANAFUDA - gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level, suits=range(12), ranks=range(4)) registerGame(gi) return gi -r(12369, Paulownia, 'Paulownia', GI.GT_HANAFUDA, 1, -1) -r(12370, LesserQueue, 'Lesser Queue', GI.GT_HANAFUDA, 2, 2) -r(12371, GreaterQueue, 'Greater Queue', GI.GT_HANAFUDA, 4, 2) -r(12373, JapaneseGarden, 'Japanese Garden', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12374, JapaneseGardenII, 'Japanese Garden II', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12375, SixSages, 'Six Sages', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12376, SixTengus, 'Six Tengus', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12377, JapaneseGardenIII, 'Japanese Garden III', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12378, HanafudaFourSeasons, 'Hanafuda Four Seasons', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0) -r(12380, Eularia, 'Eularia', GI.GT_HANAFUDA, 1, -1) -r(12381, Peony, 'Peony', GI.GT_HANAFUDA, 1, -1) -r(12382, Iris, 'Iris', GI.GT_HANAFUDA, 1, 0) -r(12383, Pine, 'Pine', GI.GT_HANAFUDA, 1, 0) -r(12384, Wisteria, 'Wisteria', GI.GT_HANAFUDA, 1, 0) -r(12385, FlowerArrangement, 'Flower Arrangement', GI.GT_HANAFUDA, 2, 0) +r(12369, Paulownia, 'Paulownia', GI.GT_HANAFUDA, 1, -1, GI.SL_BALANCED) +r(12370, LesserQueue, 'Lesser Queue', GI.GT_HANAFUDA, 2, 2, GI.SL_BALANCED) +r(12371, GreaterQueue, 'Greater Queue', GI.GT_HANAFUDA, 4, 2, GI.SL_BALANCED) +r(12373, JapaneseGarden, 'Japanese Garden', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12374, JapaneseGardenII, 'Japanese Garden II', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12375, SixSages, 'Six Sages', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12376, SixTengus, 'Six Tengus', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12377, JapaneseGardenIII, 'Japanese Garden III', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12378, HanafudaFourSeasons, 'Hanafuda Four Seasons', GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL) +r(12380, Eularia, 'Eularia', GI.GT_HANAFUDA, 1, -1, GI.SL_BALANCED) +r(12381, Peony, 'Peony', GI.GT_HANAFUDA, 1, -1, GI.SL_BALANCED) +r(12382, Iris, 'Iris', GI.GT_HANAFUDA, 1, 0, GI.SL_BALANCED) +r(12383, Pine, 'Pine', GI.GT_HANAFUDA, 1, 0, GI.SL_BALANCED) +r(12384, Wisteria, 'Wisteria', GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) +r(12385, FlowerArrangement, 'Flower Arrangement', GI.GT_HANAFUDA, 2, 0, GI.SL_BALANCED) del r diff --git a/pysollib/games/ultra/hexadeck.py b/pysollib/games/ultra/hexadeck.py index ae236aff..3fcf19cd 100644 --- a/pysollib/games/ultra/hexadeck.py +++ b/pysollib/games/ultra/hexadeck.py @@ -1376,30 +1376,30 @@ class Snakestone(Convolution): # // # ************************************************************************/ -def r(id, gameclass, name, game_type, decks, redeals): +def r(id, gameclass, name, game_type, decks, redeals, skill_level): game_type = game_type | GI.GT_HEXADECK - gi = GameInfo(id, gameclass, name, game_type, decks, redeals, - suits=range(4), ranks=range(16), trumps=range(4)) + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level, + suits=range(4), ranks=range(16), trumps=range(4)) registerGame(gi) return gi -r(165, BitsNBytes, 'Bits n Bytes', GI.GT_HEXADECK, 1, 1) -r(166, HexAKlon, 'Hex A Klon', GI.GT_HEXADECK, 1, -1) -r(16666, KlondikePlus16, 'Klondike Plus 16', GI.GT_HEXADECK, 1, 1) -r(16667, HexAKlonByThrees, 'Hex A Klon by Threes', GI.GT_HEXADECK, 1, -1) -r(16668, KingOnlyHexAKlon, 'King Only Hex A Klon', GI.GT_HEXADECK, 1, -1) -r(16669, TheFamiliar, 'The Familiar', GI.GT_HEXADECK, 1, 1) -r(16670, TwoFamiliars, 'Two Familiars', GI.GT_HEXADECK, 2, 1) -r(16671, TenByEight, '10 x 8', GI.GT_HEXADECK, 2, -1) -r(16672, Drawbridge, 'Drawbridge', GI.GT_HEXADECK, 1, 1) -r(16673, DoubleDrawbridge, 'Double Drawbridge', GI.GT_HEXADECK, 2, 1) -r(16674, HiddenPassages, 'Hidden Passages', GI.GT_HEXADECK, 1, 1) -r(16675, CluitjarsLair, 'Cluitjar\'s Lair', GI.GT_HEXADECK, 1, 0) -r(16676, MerlinsMeander, 'Merlin\'s Meander', GI.GT_HEXADECK, 2, 2) -r(16677, MagesGame, 'Mage\'s Game', GI.GT_HEXADECK, 1, 0) -r(16678, Convolution, 'Convolution', GI.GT_HEXADECK, 2, 0) -r(16679, Labyrinth, 'Hex Labyrinth', GI.GT_HEXADECK, 2, 0) -r(16680, Snakestone, 'Snakestone', GI.GT_HEXADECK, 2, 0) +r(165, BitsNBytes, 'Bits n Bytes', GI.GT_HEXADECK, 1, 1, GI.SL_BALANCED) +r(166, HexAKlon, 'Hex A Klon', GI.GT_HEXADECK, 1, -1, GI.SL_BALANCED) +r(16666, KlondikePlus16, 'Klondike Plus 16', GI.GT_HEXADECK, 1, 1, GI.SL_BALANCED) +r(16667, HexAKlonByThrees, 'Hex A Klon by Threes', GI.GT_HEXADECK, 1, -1, GI.SL_BALANCED) +r(16668, KingOnlyHexAKlon, 'King Only Hex A Klon', GI.GT_HEXADECK, 1, -1, GI.SL_BALANCED) +r(16669, TheFamiliar, 'The Familiar', GI.GT_HEXADECK, 1, 1, GI.SL_BALANCED) +r(16670, TwoFamiliars, 'Two Familiars', GI.GT_HEXADECK, 2, 1, GI.SL_BALANCED) +r(16671, TenByEight, '10 x 8', GI.GT_HEXADECK, 2, -1, GI.SL_BALANCED) +r(16672, Drawbridge, 'Drawbridge', GI.GT_HEXADECK, 1, 1, GI.SL_BALANCED) +r(16673, DoubleDrawbridge, 'Double Drawbridge', GI.GT_HEXADECK, 2, 1, GI.SL_BALANCED) +r(16674, HiddenPassages, 'Hidden Passages', GI.GT_HEXADECK, 1, 1, GI.SL_MOSTLY_LUCK) +r(16675, CluitjarsLair, 'Cluitjar\'s Lair', GI.GT_HEXADECK, 1, 0, GI.SL_BALANCED) +r(16676, MerlinsMeander, 'Merlin\'s Meander', GI.GT_HEXADECK, 2, 2, GI.SL_BALANCED) +r(16677, MagesGame, 'Mage\'s Game', GI.GT_HEXADECK, 1, 0, GI.SL_BALANCED) +r(16678, Convolution, 'Convolution', GI.GT_HEXADECK, 2, 0, GI.SL_MOSTLY_SKILL) +r(16679, Labyrinth, 'Hex Labyrinth', GI.GT_HEXADECK, 2, 0, GI.SL_MOSTLY_SKILL) +r(16680, Snakestone, 'Snakestone', GI.GT_HEXADECK, 2, 0, GI.SL_MOSTLY_SKILL) del r diff --git a/pysollib/games/ultra/larasgame.py b/pysollib/games/ultra/larasgame.py index d7124feb..f61180ba 100644 --- a/pysollib/games/ultra/larasgame.py +++ b/pysollib/games/ultra/larasgame.py @@ -717,58 +717,59 @@ class DoubleDojoujisGame(DojoujisGame): # register the game -registerGame(GameInfo(37, LarasGame, "Lara's Game", GI.GT_2DECK_TYPE, 2, 0)) +registerGame(GameInfo(37, LarasGame, "Lara's Game", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(13001, KatrinasGame, "Katrina's Game", - GI.GT_TAROCK, 2, 1, + GI.GT_TAROCK, 2, 1, GI.SL_BALANCED, ranks = range(14), trumps = range(22))) registerGame(GameInfo(13002, BridgetsGame, "Bridget's Game", - GI.GT_HEXADECK, 2, 1, + GI.GT_HEXADECK, 2, 1, GI.SL_BALANCED, ranks = range(16), trumps = range(4))) registerGame(GameInfo(13003, FatimehsGame, "Fatimeh's Game", - GI.GT_MUGHAL_GANJIFA, 1, 2, + GI.GT_MUGHAL_GANJIFA, 1, 2, GI.SL_BALANCED, suits = range(8), ranks = range(12))) registerGame(GameInfo(13004, KalisGame, "Kali's Game", - GI.GT_DASHAVATARA_GANJIFA, 1, 2, + GI.GT_DASHAVATARA_GANJIFA, 1, 2, GI.SL_BALANCED, suits = range(10), ranks = range(12))) registerGame(GameInfo(13005, DojoujisGame, "Dojouji's Game", - GI.GT_HANAFUDA, 2, 0, + GI.GT_HANAFUDA, 2, 0, GI.SL_BALANCED, suits = range(12), ranks = range(4))) registerGame(GameInfo(13006, RelaxedLarasGame, "Lara's Game Relaxed", - GI.GT_2DECK_TYPE, 2, 1)) + GI.GT_2DECK_TYPE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(13007, DoubleLarasGame, "Lara's Game Doubled", - GI.GT_2DECK_TYPE, 4, 2)) + GI.GT_2DECK_TYPE, 4, 2, GI.SL_BALANCED)) registerGame(GameInfo(13008, RelaxedKatrinasGame, "Katrina's Game Relaxed", - GI.GT_TAROCK, 2, 1, + GI.GT_TAROCK, 2, 1, GI.SL_BALANCED, ranks = range(14), trumps = range(22))) registerGame(GameInfo(13009, DoubleKatrinasGame, "Katrina's Game Doubled", - GI.GT_TAROCK, 4, 2, + GI.GT_TAROCK, 4, 2, GI.SL_BALANCED, ranks = range(14), trumps = range(22))) registerGame(GameInfo(13010, DoubleBridgetsGame, "Bridget's Game Doubled", - GI.GT_HEXADECK, 4, 2, + GI.GT_HEXADECK, 4, 2, GI.SL_BALANCED, ranks = range(16), trumps = range(4))) registerGame(GameInfo(13011, RelaxedKalisGame, "Kali's Game Relaxed", - GI.GT_DASHAVATARA_GANJIFA, 1, 2, + GI.GT_DASHAVATARA_GANJIFA, 1, 2, GI.SL_BALANCED, suits = range(10), ranks = range(12))) registerGame(GameInfo(13012, DoubleKalisGame, "Kali's Game Doubled", - GI.GT_DASHAVATARA_GANJIFA, 2, 3, + GI.GT_DASHAVATARA_GANJIFA, 2, 3, GI.SL_BALANCED, suits = range(10), ranks = range(12))) registerGame(GameInfo(13013, RelaxedFatimehsGame, "Fatimeh's Game Relaxed", - GI.GT_MUGHAL_GANJIFA, 1, 2, + GI.GT_MUGHAL_GANJIFA, 1, 2, GI.SL_BALANCED, suits = range(8), ranks = range(12))) registerGame(GameInfo(13014, DoubleDojoujisGame, "Dojouji's Game Doubled", - GI.GT_HANAFUDA, 4, 0, + GI.GT_HANAFUDA, 4, 0, GI.SL_BALANCED, suits = range(12), ranks = range(4))) diff --git a/pysollib/games/ultra/matrix.py b/pysollib/games/ultra/matrix.py index 6fdaa243..b20304aa 100644 --- a/pysollib/games/ultra/matrix.py +++ b/pysollib/games/ultra/matrix.py @@ -427,7 +427,7 @@ def r(id, gameclass, short_name): name = short_name ncards = int(name[:2]) * int(name[:2]) gi = GameInfo(id, gameclass, name, - GI.GT_MATRIX, 1, 0, + GI.GT_MATRIX, 1, 0, GI.SL_SKILL, category=GI.GC_TRUMP_ONLY, short_name=short_name, suits=(), ranks=(), trumps=range(ncards), si = {"decks": 1, "ncards": ncards}) @@ -453,7 +453,7 @@ def r(id, gameclass, short_name): ncards = 0 for n in gameclass.ROWS: ncards = ncards + n - gi = GameInfo(id, gameclass, name, GI.GT_MATRIX, 1, 0, + gi = GameInfo(id, gameclass, name, GI.GT_MATRIX, 1, 0, GI.SL_SKILL, category=GI.GC_TRUMP_ONLY, short_name=short_name, suits=(), ranks=(), trumps=range(ncards), si={"decks": 1, "ncards": ncards}) diff --git a/pysollib/games/ultra/mughal.py b/pysollib/games/ultra/mughal.py index b4b85a8a..48c25201 100644 --- a/pysollib/games/ultra/mughal.py +++ b/pysollib/games/ultra/mughal.py @@ -1145,30 +1145,30 @@ class AshtaDikapala(Game): # // # ************************************************************************/ -def r(id, gameclass, name, game_type, decks, redeals): +def r(id, gameclass, name, game_type, decks, redeals, skill_level): game_type = game_type | GI.GT_MUGHAL_GANJIFA - gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level, suits=range(8), ranks=range(12)) registerGame(gi) return gi -r(14401, MughalCircles, 'Mughal Circles', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(14402, Ghulam, 'Ghulam', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(14403, Shamsher, 'Shamsher', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(14404, EightLegions, 'Eight Legions', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(14405, Ashrafi, 'Ashrafi', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(14406, Tipati, 'Tipati', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(14407, Ashwapati, 'Ashwapati', GI.GT_MUGHAL_GANJIFA, 1, -1) -r(14408, Gajapati, 'Gajapati', GI.GT_MUGHAL_GANJIFA, 1, -1) -r(14409, Narpati, 'Narpati', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(14410, Garhpati, 'Garhpati', GI.GT_MUGHAL_GANJIFA, 1, -1) -r(14411, Dhanpati, 'Dhanpati', GI.GT_MUGHAL_GANJIFA, 1, 1) -r(14412, AkbarsTriumph, 'Akbar\'s Triumph', GI.GT_MUGHAL_GANJIFA, 1, 2) -r(14413, AkbarsConquest, 'Akbar\'s Conquest', GI.GT_MUGHAL_GANJIFA, 2, 2) -r(16000, Vajra, 'Vajra', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(16001, Danda, 'Danda', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(16002, Khadga, 'Khadga', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(16003, Makara, 'Makara', GI.GT_MUGHAL_GANJIFA, 1, 0) -r(16004, AshtaDikapala, 'Ashta Dikapala', GI.GT_MUGHAL_GANJIFA, 1, 0) +r(14401, MughalCircles, 'Mughal Circles', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(14402, Ghulam, 'Ghulam', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(14403, Shamsher, 'Shamsher', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(14404, EightLegions, 'Eight Legions', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(14405, Ashrafi, 'Ashrafi', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(14406, Tipati, 'Tipati', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_BALANCED) +r(14407, Ashwapati, 'Ashwapati', GI.GT_MUGHAL_GANJIFA, 1, -1, GI.SL_BALANCED) +r(14408, Gajapati, 'Gajapati', GI.GT_MUGHAL_GANJIFA, 1, -1, GI.SL_BALANCED) +r(14409, Narpati, 'Narpati', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_BALANCED) +r(14410, Garhpati, 'Garhpati', GI.GT_MUGHAL_GANJIFA, 1, -1, GI.SL_BALANCED) +r(14411, Dhanpati, 'Dhanpati', GI.GT_MUGHAL_GANJIFA, 1, 1, GI.SL_BALANCED) +r(14412, AkbarsTriumph, 'Akbar\'s Triumph', GI.GT_MUGHAL_GANJIFA, 1, 2, GI.SL_BALANCED) +r(14413, AkbarsConquest, 'Akbar\'s Conquest', GI.GT_MUGHAL_GANJIFA, 2, 2, GI.SL_BALANCED) +r(16000, Vajra, 'Vajra', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(16001, Danda, 'Danda', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(16002, Khadga, 'Khadga', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(16003, Makara, 'Makara', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_MOSTLY_SKILL) +r(16004, AshtaDikapala, 'Ashta Dikapala', GI.GT_MUGHAL_GANJIFA, 1, 0, GI.SL_BALANCED) del r diff --git a/pysollib/games/ultra/tarock.py b/pysollib/games/ultra/tarock.py index 331fbdd8..9e49ce1a 100644 --- a/pysollib/games/ultra/tarock.py +++ b/pysollib/games/ultra/tarock.py @@ -258,17 +258,17 @@ class Rambling(Corkscrew): # // register the games # ************************************************************************/ -def r(id, gameclass, name, game_type, decks, redeals): +def r(id, gameclass, name, game_type, decks, redeals, skill_level): game_type = game_type | GI.GT_TAROCK | GI.GT_CONTRIB | GI.GT_ORIGINAL - gi = GameInfo(id, gameclass, name, game_type, decks, redeals, + gi = GameInfo(id, gameclass, name, game_type, decks, redeals, skill_level, ranks=range(14), trumps=range(22)) registerGame(gi) return gi -r(13163, Cockroach, 'Cockroach', GI.GT_TAROCK, 1, 0) -r(13164, DoubleCockroach, 'Double Cockroach', GI.GT_TAROCK, 2, 0) -r(13165, Corkscrew, 'Corkscrew', GI.GT_TAROCK, 2, 0) -r(13166, Serpent, 'Serpent', GI.GT_TAROCK, 2, 0) -r(13167, Rambling, 'Rambling', GI.GT_TAROCK, 2, 0) +r(13163, Cockroach, 'Cockroach', GI.GT_TAROCK, 1, 0, GI.SL_MOSTLY_SKILL) +r(13164, DoubleCockroach, 'Double Cockroach', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) +r(13165, Corkscrew, 'Corkscrew', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) +r(13166, Serpent, 'Serpent', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) +r(13167, Rambling, 'Rambling', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) del r diff --git a/pysollib/games/ultra/threepeaks.py b/pysollib/games/ultra/threepeaks.py index 0600a54e..1de25809 100644 --- a/pysollib/games/ultra/threepeaks.py +++ b/pysollib/games/ultra/threepeaks.py @@ -280,21 +280,20 @@ class ThreePeaksNoScore(ThreePeaks): # /*********************************************************************** -# // Three Peaks Game Non-scoring +# // Le Grande Teton # ************************************************************************/ -class LeGrandeTeton(ThreePeaks): - SCORING = 0 +class LeGrandeTeton(ThreePeaksNoScore): + pass - def canUndo(self): - return 1 registerGame(GameInfo(22216, ThreePeaks, "Three Peaks", - GI.GT_PAIRING_TYPE, 1, 0)) + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(22231, ThreePeaksNoScore, "Three Peaks Non-scoring", - GI.GT_PAIRING_TYPE, 1, 0)) + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(22232, LeGrandeTeton, "Le Grande Teton", - GI.GT_TAROCK, 1, 0, ranks=range(14), trumps=range(22))) + GI.GT_TAROCK, 1, 0, GI.SL_BALANCED, + ranks=range(14), trumps=range(22))) diff --git a/pysollib/games/unionsquare.py b/pysollib/games/unionsquare.py index 3fed5d1e..f9870b89 100644 --- a/pysollib/games/unionsquare.py +++ b/pysollib/games/unionsquare.py @@ -176,8 +176,8 @@ class SolidSquare(UnionSquare): # register the game registerGame(GameInfo(35, UnionSquare, "Union Square", - GI.GT_2DECK_TYPE, 2, 0, + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL, altnames=('British Square',), )) registerGame(GameInfo(439, SolidSquare, "Solid Square", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/wavemotion.py b/pysollib/games/wavemotion.py index 74b1b5ef..72ba5442 100644 --- a/pysollib/games/wavemotion.py +++ b/pysollib/games/wavemotion.py @@ -97,4 +97,4 @@ class WaveMotion(Game): # register the game registerGame(GameInfo(314, WaveMotion, "Wave Motion", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py index 4d1d7389..b52e9567 100644 --- a/pysollib/games/windmill.py +++ b/pysollib/games/windmill.py @@ -321,13 +321,13 @@ class FourSeasons(Czarina): # register the game registerGame(GameInfo(30, Windmill, "Windmill", - GI.GT_2DECK_TYPE, 2, 0)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(277, NapoleonsTomb, "Napoleon's Tomb", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(417, Corners, "Corners", - GI.GT_1DECK_TYPE, 1, 2)) + GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(483, Czarina, "Czarina", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(484, FourSeasons, "Four Seasons", - GI.GT_1DECK_TYPE, 1, 0)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index c9442e17..d099bb81 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -547,49 +547,49 @@ class Geoffrey(Yukon): # register the game registerGame(GameInfo(19, Yukon, "Yukon", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(20, RussianSolitaire, "Russian Solitaire", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(27, Odessa, "Odessa", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(278, Grandfather, "Grandfather", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(186, Alaska, "Alaska", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(187, ChineseDiscipline, "Chinese Discipline", - GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(188, ChineseSolitaire, "Chinese Solitaire", - GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(189, Queenie, "Queenie", - GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(190, Rushdike, "Rushdike", - GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(191, RussianPoint, "Russian Point", - GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(192, Abacus, "Abacus", - GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0)) + GI.GT_YUKON | GI.GT_XORIGINAL, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(271, DoubleYukon, "Double Yukon", - GI.GT_YUKON, 2, 0)) + GI.GT_YUKON, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(272, TripleYukon, "Triple Yukon", - GI.GT_YUKON, 3, 0)) + GI.GT_YUKON, 3, 0, GI.SL_BALANCED)) registerGame(GameInfo(284, TenAcross, "Ten Across", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(285, Panopticon, "Panopticon", - GI.GT_YUKON | GI.GT_ORIGINAL, 1, 0)) + GI.GT_YUKON | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(339, Moosehide, "Moosehide", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(387, Roslin, "Roslin", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(447, AustralianPatience, "Australian Patience", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(450, RawPrawn, "Raw Prawn", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(456, BimBom, "Bim Bom", - GI.GT_YUKON | GI.GT_ORIGINAL, 2, 0)) + GI.GT_YUKON | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(466, DoubleRussianSolitaire, "Double Russian Solitaire", - GI.GT_YUKON, 2, 0)) + GI.GT_YUKON, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(488, TripleRussianSolitaire, "Triple Russian Solitaire", - GI.GT_YUKON, 3, 0)) + GI.GT_YUKON, 3, 0, GI.SL_BALANCED)) registerGame(GameInfo(492, Geoffrey, "Geoffrey", - GI.GT_YUKON, 1, 0)) + GI.GT_YUKON, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/zodiac.py b/pysollib/games/zodiac.py index aed43fbb..b6cea283 100644 --- a/pysollib/games/zodiac.py +++ b/pysollib/games/zodiac.py @@ -123,4 +123,4 @@ class Zodiac(Game): # register the game registerGame(GameInfo(467, Zodiac, "Zodiac", - GI.GT_2DECK_TYPE, 2, -1)) + GI.GT_2DECK_TYPE, 2, -1, GI.SL_BALANCED)) diff --git a/pysollib/tk/gameinfodialog.py b/pysollib/tk/gameinfodialog.py index cb6ee333..27730254 100644 --- a/pysollib/tk/gameinfodialog.py +++ b/pysollib/tk/gameinfodialog.py @@ -71,6 +71,14 @@ class GameInfoDialog(MfxDialog): if gi.si.game_flags & t: flags.append(attr) # + sl = { + 1: 'SL_LUCK', + 2: 'SL_MOSTLY_LUCK', + 3: 'SL_BALANCED', + 4: 'SL_MOSTLY_SKILL', + 5: 'SL_SKILL', + } + skill_level = sl.get(gi.skill_level) row = 0 for n, t in (('Name:', gi.name), ('Short name:', gi.short_name), @@ -82,6 +90,7 @@ class GameInfoDialog(MfxDialog): ('Category:', cat), ('Type:', type), ('Flags:', '\n'.join(flags)), + ('Skill level:', skill_level), ('Rules filename:', gi.rules_filename), ('Module:', game.__module__), ('Class:', game.__class__.__name__), diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index cd7b277a..9f90173b 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -199,7 +199,7 @@ class PysolMenubar(PysolMenubarActions): def __init__(self, app, top): PysolMenubarActions.__init__(self, app, top) # init columnbreak - self.__cb_max = int(self.top.winfo_screenheight()/22) + self.__cb_max = int(self.top.winfo_screenheight()/23) ## sh = self.top.winfo_screenheight() ## self.__cb_max = 22 ## if sh >= 600: self.__cb_max = 27 @@ -353,7 +353,7 @@ class PysolMenubar(PysolMenubarActions): submenu = MfxMenu(menu, label=n_("Card &view")) submenu.add_checkbutton(label=n_("Card shado&w"), variable=self.tkopt.shadow, command=self.mOptShadow) submenu.add_checkbutton(label=n_("Shade &legal moves"), variable=self.tkopt.shade, command=self.mOptShade) - submenu.add_checkbutton(label=n_("&Negative card bottom"), variable=self.tkopt.negative_bottom, command=self.mOptNegativeBottom) + submenu.add_checkbutton(label=n_("&Negative cards bottom"), variable=self.tkopt.negative_bottom, command=self.mOptNegativeBottom) submenu = MfxMenu(menu, label=n_("A&nimations")) submenu.add_radiobutton(label=n_("&None"), variable=self.tkopt.animations, value=0, command=self.mOptAnimations) submenu.add_radiobutton(label=n_("&Timer based"), variable=self.tkopt.animations, value=2, command=self.mOptAnimations) @@ -693,14 +693,10 @@ class PysolMenubar(PysolMenubarActions): submenu = self.__menupath[".menubar.file.favoritegames"][2] submenu.delete(0, "last") # insert games - for id in gameids: - gi = self.app.getGameInfo(id) - if not gi: - continue - submenu.add_radiobutton(command=self.mSelectGame, - variable=self.tkopt.gameid, - value=gi.id, label=gi.name) - + g = [self.app.getGameInfo(id) for id in gameids] + self._addSelectGameSubSubMenu(submenu, g, + command=self.mSelectGame, + variable=self.tkopt.gameid) state = self._getEnabledState in_favor = self.app.game.id in gameids menu, index, submenu = self.__menupath[".menubar.file.addtofavorites"] diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index d5575260..056d9733 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -175,6 +175,13 @@ class SelectGameData(SelectDialogTreeData): s_oriental, s_special, s_by_type, + SelectGameNode(None, _('by Skill Level'), ( + SelectGameNode(None, _('Luck only'), lambda gi: gi.skill_level == GI.SL_LUCK), + SelectGameNode(None, _('Mostly luck'), lambda gi: gi.skill_level == GI.SL_MOSTLY_LUCK), + SelectGameNode(None, _('Balanced'), lambda gi: gi.skill_level == GI.SL_BALANCED), + SelectGameNode(None, _('Mostly skill'), lambda gi: gi.skill_level == GI.SL_MOSTLY_SKILL), + SelectGameNode(None, _('Skill only'), lambda gi: gi.skill_level == GI.SL_SKILL), + )), SelectGameNode(None, _("by Game Feature"), ( SelectGameNode(None, _("by Number of Cards"), ( SelectGameNode(None, _("32 cards"), lambda gi: gi.si.ncards == 32), diff --git a/pysollib/tk/tkstats.py b/pysollib/tk/tkstats.py index 33723a3e..6bb4f433 100644 --- a/pysollib/tk/tkstats.py +++ b/pysollib/tk/tkstats.py @@ -560,7 +560,9 @@ class AllGames_StatsDialog(MfxDialog): bbox = self.canvas.bbox("all") ##print bbox ##self.canvas.config(scrollregion=bbox) - self.canvas.config(scrollregion=(0,0,bbox[2],bbox[3])) + dx, dy = 4, 0 + self.canvas.config(scrollregion=(-dx,-dy,bbox[2]+dx,bbox[3]+dy)) + self.canvas.xview_moveto(-dx) self.canvas.yview_moveto(self.YVIEW) # focus = self.createButtons(bottom_frame, kw) diff --git a/scripts/all_games.py b/scripts/all_games.py index 60686ea0..59f7e447 100755 --- a/scripts/all_games.py +++ b/scripts/all_games.py @@ -198,7 +198,7 @@ msgstr "" for g in games_list: print 'msgid "%s"\nmsgstr ""\n' % g.encode('utf-8') -def plain_text(): +def old_plain_text(): #get_games_func = GAME_DB.getGamesIdSortedById get_games_func = GAME_DB.getGamesIdSortedByName games_list = {} # for unique @@ -214,6 +214,14 @@ def plain_text(): for g in games_list: print g.encode('utf-8') +def plain_text(): + get_games_func = GAME_DB.getGamesIdSortedByName + for id in get_games_func(): + gi = GAME_DB.get(id) + if gi.category == GI.GC_FRENCH: + name = gi.name.lower() + name = re.sub('\W', '', name) + print id, name #, gi.si.game_type, gi.si.game_type == GI.GC_FRENCH ## From 3ed6a3c0b2162ad949bdc06f37b180efaa0998c3 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 22 Jun 2006 21:24:12 +0000 Subject: [PATCH 011/266] + 3 new games * added skill_level to gameinfodialog and playable preview git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@12 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 1 - pysollib/games/freecell.py | 31 +++++++++++++++++-- pysollib/games/spider.py | 39 ++++++++++++++++++++--- pysollib/hint.py | 2 ++ pysollib/stack.py | 4 +-- pysollib/tk/gameinfodialog.py | 1 + pysollib/tk/selectgame.py | 58 ++++++++++++++++++++--------------- 7 files changed, 101 insertions(+), 35 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index 50222aa6..3cdc7f3e 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -59,7 +59,6 @@ from settings import TOP_SIZE, TOP_TITLE # Toolkit imports from pysoltk import tkname, tkversion, wm_withdraw, loadImage -from pysoltk import bind, unbind_destroy from pysoltk import MfxMessageDialog, MfxExceptionDialog from pysoltk import TclError, MfxRoot, MfxCanvas, MfxScrolledCanvas from pysoltk import PysolMenubar diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index 3aafff6c..25c949e1 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -263,15 +263,16 @@ class TripleFreecell(FreeCell): l, s = Layout(self), self.s # set window - max_rows = max(12, rows, reserves) + decks = self.gameinfo.decks + max_rows = max(decks*4, rows, reserves) w, h = l.XM+max_rows*l.XS, l.YM+3*l.YS+playcards*l.YOFFSET self.setSize(w, h) # create stacks s.talon = self.Talon_Class(l.XM, h-l.YS, self) - x, y = l.XM+(max_rows-12)*l.XS/2, l.YM - for i in range(3): + x, y = l.XM+(max_rows-decks*4)*l.XS/2, l.YM + for i in range(decks): for j in range(4): s.foundations.append(self.Foundation_Class(x, y, self, suit=j)) x += l.XS @@ -504,6 +505,28 @@ class FourColours(FreeCell): self.dealOne(frames=-1) +# /*********************************************************************** +# // Ocean Towers +# ************************************************************************/ + +class OceanTowers(TripleFreecell): + Hint_Class = FreeCellType_Hint + RowStack_Class = StackWrapper(FreeCell_SS_RowStack, base_rank=KING) + + def createGame(self): + TripleFreecell.createGame(self, rows=14, reserves=8, playcards=20) + + def startGame(self): + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves[1:-1]) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + # register the game registerGame(GameInfo(5, RelaxedFreeCell, "Relaxed FreeCell", @@ -542,4 +565,6 @@ registerGame(GameInfo(464, FourColours, "Four Colours", GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(509, BigCell, "Big Cell", GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(513, OceanTowers, "Ocean Towers", + GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 928ee791..cc62099d 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -354,6 +354,31 @@ class ScorpionTail(Scorpion): return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 +class DoubleScorpion(Scorpion): + Talon_Class = InitialDealTalonStack + def createGame(self): + RelaxedSpider.createGame(self, rows=10, playcards=26, texts=0) + def startGame(self): + for i in (5, 5, 5, 5, 0, 0, 0, 0, 0): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0) + self.s.talon.dealRow(rows=self.s.rows[i:], flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRowAvail() + + +class TripleScorpion(Scorpion): + Talon_Class = InitialDealTalonStack + def createGame(self): + RelaxedSpider.createGame(self, rows=13, playcards=30, texts=0) + def startGame(self): + for i in (5, 5, 5, 5, 5, 0, 0, 0, 0, 0, 0): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0) + self.s.talon.dealRow(rows=self.s.rows[i:], flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + # /*********************************************************************** # // Wasp # ************************************************************************/ @@ -927,7 +952,7 @@ class York(RelaxedSpider): self.startDealSample() self.s.talon.dealRow(rows=self.s.rows[2:-2]) -class TripleYork(York): +class BigYork(York): def createGame(self): RelaxedSpider.createGame(self, rows=14, playcards=26, texts=0) @@ -1025,7 +1050,7 @@ registerGame(GameInfo(270, Spider2Suits, "Spider (2 suits)", registerGame(GameInfo(305, ThreeBlindMice, "Three Blind Mice", GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(309, MrsMop, "Mrs. Mop", - GI.GT_SPIDER | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) + GI.GT_SPIDER | GI.GT_OPEN, 2, 0, GI.SL_SKILL)) registerGame(GameInfo(341, Cicely, "Cicely", GI.GT_SPIDER, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(342, Trillium, "Trillium", @@ -1049,9 +1074,9 @@ registerGame(GameInfo(384, BigSpider, "Big Spider", registerGame(GameInfo(401, GroundForADivorce3Decks, "Big Ground", GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(441, York, "York", - GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(444, TripleYork, "Triple York", - GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) + GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_SKILL)) +registerGame(GameInfo(444, BigYork, "Big York", + GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0, GI.SL_SKILL)) registerGame(GameInfo(445, BigSpider1Suit, "Big Spider (1 suit)", GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL, suits=(0, 0, 0, 0), @@ -1080,4 +1105,8 @@ registerGame(GameInfo(501, WakeRobin, "Wake-Robin", GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(502, TripleWakeRobin, "Wake-Robin (3 decks)", GI.GT_SPIDER | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(511, DoubleScorpion, "Double Scorpion", + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(512, TripleScorpion, "Triple Scorpion", + GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/hint.py b/pysollib/hint.py index 4a0144f3..35d47170 100644 --- a/pysollib/hint.py +++ b/pysollib/hint.py @@ -714,6 +714,8 @@ if os.name in ('posix', 'nt'): class FreeCellSolverWrapper: + __name__ = 'FreeCellSolverWrapper' # for gameinfodialog + class FreeCellSolver_Hint(AbstractHint): def str1(self, card): return "A23456789TJQK"[card.rank] + "CSHD"[card.suit] diff --git a/pysollib/stack.py b/pysollib/stack.py index 620f9337..b5db5d43 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -320,8 +320,8 @@ class Stack: bind(group, "<3>", self.__rightclickEventHandler) bind(group, "<2>", self.__middleclickEventHandler) bind(group, "", self.__middleclickEventHandler) - bind(self.group, "", self.__shiftrightclickEventHandler) - ##bind(self.group, "", "") + ##bind(group, "", self.__shiftrightclickEventHandler) + ##bind(group, "", "") bind(group, "", self.__enterEventHandler) bind(group, "", self.__leaveEventHandler) diff --git a/pysollib/tk/gameinfodialog.py b/pysollib/tk/gameinfodialog.py index 27730254..ce6ecb55 100644 --- a/pysollib/tk/gameinfodialog.py +++ b/pysollib/tk/gameinfodialog.py @@ -50,6 +50,7 @@ class GameInfoDialog(MfxDialog): game = app.game gi = game.gameinfo + # if gi.redeals == -2: redeals = 'VARIABLE' elif gi.redeals == -1: redeals = 'UNLIMITED' diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index 056d9733..e8cec38e 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -368,19 +368,20 @@ class SelectGameDialogWithPreview(SelectGameDialog): self.info_labels = {} i = 0 for n, t, f, row in ( - ('name', _('Name:'), info_frame, 0), - ('altnames', _('Alternate names:'), info_frame, 1), - ('category', _('Category:'), info_frame, 2), - ('type', _('Type:'), info_frame, 3), - ('decks', _('Decks:'), info_frame, 4), - ('redeals', _('Redeals:'), info_frame, 5), + ('name', _('Name:'), info_frame, 0), + ('altnames', _('Alternate names:'), info_frame, 1), + ('category', _('Category:'), info_frame, 2), + ('type', _('Type:'), info_frame, 3), + ('skill_level', _('Skill level:'), info_frame, 4), + ('decks', _('Decks:'), info_frame, 5), + ('redeals', _('Redeals:'), info_frame, 6), # - ('played', _('Played:'), stats_frame, 0), - ('won', _('Won:'), stats_frame, 1), - ('lost', _('Lost:'), stats_frame, 2), - ('time', _('Playing time:'), stats_frame, 3), - ('moves', _('Moves:'), stats_frame, 4), - ('percent', _('% won:'), stats_frame, 5), + ('played', _('Played:'), stats_frame, 0), + ('won', _('Won:'), stats_frame, 1), + ('lost', _('Lost:'), stats_frame, 2), + ('time', _('Playing time:'), stats_frame, 3), + ('moves', _('Moves:'), stats_frame, 4), + ('percent', _('% won:'), stats_frame, 5), ): title_label = Tkinter.Label(f, text=t, justify='left', anchor='w') title_label.grid(row=row, column=0, sticky='nw') @@ -541,6 +542,14 @@ class SelectGameDialogWithPreview(SelectGameDialog): type = '' if GI.TYPE_NAMES.has_key(gi.si.game_type): type = gettext(GI.TYPE_NAMES[gi.si.game_type]) + sl = { + GI.SL_LUCK: _('Luck only'), + GI.SL_MOSTLY_LUCK: _('Mostly luck'), + GI.SL_BALANCED: _('Balanced'), + GI.SL_MOSTLY_SKILL: _('Mostly skill'), + GI.SL_SKILL: _('Skill only'), + } + skill_level = sl.get(gi.skill_level) if gi.redeals == -2: redeals = _('variable') elif gi.redeals == -1: redeals = _('unlimited') else: redeals = str(gi.redeals) @@ -551,18 +560,19 @@ class SelectGameDialogWithPreview(SelectGameDialog): time = format_time(time) moves = str(round(moves, 1)) for n, t in ( - ('name', name), - ('altnames', altnames), - ('category', category), - ('type', type), - ('decks', gi.decks), - ('redeals', redeals), - ('played', won+lost), - ('won', won), - ('lost', lost), - ('time', time), - ('moves', moves), - ('percent', percent), + ('name', name), + ('altnames', altnames), + ('category', category), + ('type', type), + ('skill_level', skill_level), + ('decks', gi.decks), + ('redeals', redeals), + ('played', won+lost), + ('won', won), + ('lost', lost), + ('time', time), + ('moves', moves), + ('percent', percent), ): title_label, text_label = self.info_labels[n] if t == '': From d55d4c8abfd9f7bcddb51c902a4a63e4d6138b5b Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 23 Jun 2006 21:31:40 +0000 Subject: [PATCH 012/266] + 1 new game + new layout attribute: TEXT_HEIGHT git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@13 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 26 +++++++++++--------- pysollib/games/auldlangsyne.py | 2 +- pysollib/games/beleagueredcastle.py | 10 ++++---- pysollib/games/braid.py | 2 +- pysollib/games/bristol.py | 6 ++--- pysollib/games/calculation.py | 12 ++++----- pysollib/games/canfield.py | 14 +++++------ pysollib/games/diplomat.py | 2 +- pysollib/games/fortythieves.py | 32 ++++++++++++++---------- pysollib/games/glenwood.py | 15 ++++++------ pysollib/games/golf.py | 3 ++- pysollib/games/gypsy.py | 2 +- pysollib/games/klondike.py | 37 +++++++++++++++++----------- pysollib/games/royalcotillion.py | 2 +- pysollib/games/special/tarock.py | 7 +++--- pysollib/games/sultan.py | 38 +++++++++++++++-------------- pysollib/games/tournament.py | 18 +++++++------- pysollib/games/ultra/hexadeck.py | 2 +- pysollib/layout.py | 20 +++++++++------ 19 files changed, 138 insertions(+), 112 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index 3cdc7f3e..f9bee889 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -195,7 +195,7 @@ class Options: self.splashscreen = True self.sticky_mouse = False self.negative_bottom = False - self.randomize_place = True + self.randomize_place = False self.cache_carsets = True # defaults & constants self.setDefaults() @@ -228,12 +228,12 @@ class Options: CSI.TYPE_DASHAVATARA_GANJIFA: ("Dashavatara Ganjifa", ""), CSI.TYPE_TRUMP_ONLY: ("Matrix", ""), } - self.randomize_place = True # not changeable options def setConstants(self): self.win_animation = 1 self.dragcursor = 1 + self.randomize_place = False def copy(self): opt = Options() @@ -826,8 +826,7 @@ class Application: "joker07_50_774", "joker08_50_774", "joker11_100_774", - "joker10_100", - "pysol_40",): + "joker10_100",): self.gimages.logos.append(self.dataloader.findImage(f, dir)) dir = "images" ##for f in ("noredeal", "redeal",): @@ -1143,10 +1142,7 @@ Please select a %s type %s. opt = unpickle(self.fn.opt) if opt: ##import pprint; pprint.pprint(opt.__dict__) - #cardset = self.opt.cardset - #cardset.update(opt.cardset) self.opt.__dict__.update(opt.__dict__) - #self.opt.cardset = cardset self.opt.setConstants() def loadStatistics(self): @@ -1290,13 +1286,19 @@ Please select a %s type %s. return n def getGameSaveName(self, id): - n = self.getGameTitleName(id) + if os.path.supports_unicode_filenames: # new in python 2.3 + return self.getGameTitleName(id) + gi = self.gdb.get(id) + n = gi.name if not n: return None - m = re.search(r"^(.*)([\[\(](\w+).*[\]\)])\s*$", n) - if m: - n = m.group(1) + "_" + m.group(2).lower() +## m = re.search(r"^(.*)([\[\(](\w+).*[\]\)])\s*$", n) +## if m: +## n = m.group(1) + "_" + m.group(2).lower() n = latin1_to_ascii(n) - return re.sub(r"[^\w\-]", "", n) + n = n.lower() + n = re.sub(r"[\s]", "_", n) + n = re.sub(r"[^\w]", "", n) + return n def getRandomGameId(self): return self.miscrandom.choice(self.gdb.getGamesIdSortedById()) diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index 0bb1a914..b1fa8bf3 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -293,7 +293,7 @@ class Colorado(Game): l, s = Layout(self), self.s # set window - self.setSize(l.XM+10*l.XS, 3*l.YM+4*l.YS) + self.setSize(l.XM+10*l.XS, l.YM+4*l.YS+l.TEXT_HEIGHT) # create stacks x, y, = l.XS, l.YM diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index e33c773d..3d88275d 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -372,7 +372,7 @@ class Zerline(Game): # set window # (set size so that at least 13 cards are fully playable) w = max(3*l.XS, l.XS+playcards*l.XOFFSET) - self.setSize(l.XM+2*w+decks*l.XS, 4*l.YM + (rows/2+1)*l.YS) + self.setSize(l.XM+2*w+decks*l.XS, l.YM+l.TEXT_HEIGHT+(rows/2+1)*l.YS) # create stacks y = l.YM @@ -389,7 +389,7 @@ class Zerline(Game): l.createText(stack, "ss") x = l.XM + w for j in range(decks): - y = 4*l.YM+l.YS + y = l.YM+l.TEXT_HEIGHT+l.YS for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, i, base_rank=KING, dir=1, max_move=0, mod=13)) @@ -397,15 +397,15 @@ class Zerline(Game): x += l.XS x = l.XM for j in range(2): - y = 4*l.YM+l.YS + y = l.YM+l.TEXT_HEIGHT+l.YS for i in range(rows/2): stack = RK_RowStack(x, y, self, max_move=1, max_accept=1, base_rank=QUEEN) stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 s.rows.append(stack) y += l.YS - x += l.XM + w +decks*l.XS + x += l.XM+w+decks*l.XS - l.setRegion(s.rows[:4], (-999, 4*l.YM+l.YS-l.CH/2, w-l.CW/2, 999999)) + l.setRegion(s.rows[:4], (-999, l.YM+l.YS+l.TEXT_HEIGHT-l.CH/2, w-l.CW/2, 999999)) # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py index b00a6200..d095f06b 100644 --- a/pysollib/games/braid.py +++ b/pysollib/games/braid.py @@ -313,7 +313,7 @@ class Backbone(Game): l, s = Layout(self), self.s # set window - w, h = l.XM+(rows+2)*l.XS, max(l.YM+3*l.XS+10*l.YOFFSET, l.YM+2*l.YS+11*l.YOFFSET+20) + w, h = l.XM+(rows+2)*l.XS, max(l.YM+3*l.XS+10*l.YOFFSET, l.YM+2*l.YS+11*l.YOFFSET+l.TEXT_HEIGHT) self.setSize(w, h) # create stacks diff --git a/pysollib/games/bristol.py b/pysollib/games/bristol.py index 82d17b87..01c8857e 100644 --- a/pysollib/games/bristol.py +++ b/pysollib/games/bristol.py @@ -197,7 +197,7 @@ class Dover(Bristol): # set window max_rows = max(rows, self.gameinfo.decks*4) - w, h = 2*l.XM+l.XS+max_rows*l.XS, l.YM+20+5*l.YS + w, h = 2*l.XM+l.XS+max_rows*l.XS, l.YM+l.TEXT_HEIGHT+5*l.YS self.setSize(w, h) # create stacks @@ -215,7 +215,7 @@ class Dover(Bristol): x, y = 2*l.XM+(max_rows-rows)*l.XS, l.YM+l.YS if text: - y += 20 + y += l.TEXT_HEIGHT for i in range(rows): x += l.XS stack = self.RowStack_Class(x, y, self) @@ -224,7 +224,7 @@ class Dover(Bristol): x, y, = l.XM, l.YM s.talon = self.Talon_Class(x, y, self) l.createText(s.talon, "s") - y += 20 + y += l.TEXT_HEIGHT for i in range(3): y += l.YS s.reserves.append(self.ReserveStack_Class(x, y, self)) diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index 80a5bcfa..97ec7fd7 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -114,12 +114,12 @@ class Calculation(Game): def createGame(self): # create layout - l, s = Layout(self), self.s + l, s = Layout(self, TEXT_HEIGHT=40), self.s # set window # (piles up to 20 cards are playable in default window size) h = max(2*l.YS, 20*l.YOFFSET) - self.setSize(5.5*l.XS+l.XM+200, l.YM + l.YS + 30 + h) + self.setSize(5.5*l.XS+l.XM+200, l.YM + l.YS + l.TEXT_HEIGHT + h) # create stacks x0 = l.XM + l.XS * 3 / 2 @@ -140,7 +140,7 @@ class Calculation(Game): self.texts.help = MfxCanvasText(self.canvas, x + l.XM, y + l.CH / 2, text=help, anchor="w", font=self.app.getFont("canvas_fixed")) x = x0 - y = l.YM + l.YS + 30 + y = l.YM + l.YS + l.TEXT_HEIGHT for i in range(4): s.rows.append(Calculation_RowStack(x, y, self, max_move=1, max_accept=1)) x = x + l.XS @@ -205,10 +205,10 @@ class BetsyRoss(Calculation): def createGame(self): # create layout - l, s = Layout(self), self.s + l, s = Layout(self, TEXT_HEIGHT=40), self.s # set window - self.setSize(5.5*l.XS+l.XM+200, l.YM + l.YS + 30 + 3*l.YS) + self.setSize(5.5*l.XS+l.XM+200, l.YM + l.YS + l.TEXT_HEIGHT + 3*l.YS) # create stacks x0 = l.XM + l.XS * 3 / 2 @@ -219,7 +219,7 @@ class BetsyRoss(Calculation): s.foundations.append(stack) x = x + l.XS x = x0 - y = l.YM + l.YS + 30 + y = l.YM + l.YS + l.TEXT_HEIGHT for i in range(4): stack = BetsyRoss_Foundation(x, y, self, base_rank=2*i+1, mod=13, dir=i+1, max_cards=12, max_move=0) diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 254b160e..51946733 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -119,7 +119,7 @@ class Canfield(Game): yoffset = 5 # (piles up to 20 cards are playable in default window size) h = max(3*l.YS, l.YS+self.INITIAL_RESERVE_CARDS*yoffset) - self.setSize(l.XM + (2+max(rows, 4*decks))*l.XS + l.XM, l.YM + l.YS + 20 + h) + self.setSize(l.XM + (2+max(rows, 4*decks))*l.XS + l.XM, l.YM + l.YS + l.TEXT_HEIGHT + h) # extra settings self.base_card = None @@ -145,7 +145,7 @@ class Canfield(Game): tx, ty = x + tx, y + ty + l.YM font = self.app.getFont("canvas_default") self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) - x, y = l.XM, l.YM + l.YS + 20 + x, y = l.XM, l.YM + l.YS + l.TEXT_HEIGHT s.reserves.append(self.ReserveStack_Class(x, y, self)) s.reserves[0].CARD_YOFFSET = yoffset x = l.XM + 2 * l.XS + l.XM @@ -489,7 +489,7 @@ class LittleGate(Gate): self.setSize(w, h) # create stacks - y = 4*l.YM+l.YS + y = l.YM+l.YS+l.TEXT_HEIGHT for x in (l.XM, w-l.XS): stack = OpenStack(x, y, self, max_accept=0) stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET @@ -498,14 +498,14 @@ class LittleGate(Gate): for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) x += l.XS - x, y = int(l.XM+1.5*l.XS), 4*l.YM+l.YS + x, y = int(l.XM+1.5*l.XS), l.YM+l.YS+l.TEXT_HEIGHT for i in range(4): s.rows.append(AC_RowStack(x, y, self)) x += l.XS s.talon = WasteTalonStack(l.XM, l.YM, self, max_rounds=1) - l.createText(s.talon, "s") + l.createText(s.talon, "ss") s.waste = WasteStack(l.XM+l.XS, l.YM, self) - l.createText(s.waste, "s") + l.createText(s.waste, "ss") # define stack-groups l.defaultStackGroups() @@ -630,7 +630,7 @@ class Duke(Game): for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) x += l.XS - x0, y0, w = l.XM, 3*l.YM+l.YS, l.XS+2*l.XOFFSET + x0, y0, w = l.XM, l.YM+l.YS+l.TEXT_HEIGHT, l.XS+2*l.XOFFSET for i, j in ((0,0), (0,1), (1,0), (1,1)): x, y = x0+i*w, y0+j*l.YS stack = OpenStack(x, y, self, max_accept=0) diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py index 312d0877..8a3c7922 100644 --- a/pysollib/games/diplomat.py +++ b/pysollib/games/diplomat.py @@ -67,7 +67,7 @@ class Diplomat(Game): l, s = Layout(self), self.s # set window - self.setSize(l.XM+8*l.XS, l.YM+3*l.YS+12*l.YOFFSET+20) + self.setSize(l.XM+8*l.XS, l.YM+3*l.YS+12*l.YOFFSET+l.TEXT_HEIGHT) # create stacks x, y = l.XM, l.YM diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 7f62bf2f..366e6d12 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -74,23 +74,22 @@ class FortyThieves(Game): def createGame(self, max_rounds=1, num_deal=1, rows=10, playcards=12, XCARDS=64, XOFFSET=None): # create layout if XOFFSET is None: - l, s = Layout(self, YBOTTOM=16), self.s + l, s = Layout(self), self.s else: - l, s = Layout(self, XOFFSET=XOFFSET, YBOTTOM=16), self.s + l, s = Layout(self, XOFFSET=XOFFSET), self.s # set window # (compute best XOFFSET - up to 64/72 cards can be in the Waste) decks = self.gameinfo.decks - if rows < 12: - maxrows = max(rows, 4*decks+2) - else: - maxrows = max(rows, 4*decks) + maxrows = max(rows, 4*decks) + if maxrows <= 12: + maxrows += 1 w1, w2 = maxrows*l.XS+l.XM, 2*l.XS if w2 + XCARDS * l.XOFFSET > w1: l.XOFFSET = int((w1 - w2) / XCARDS) # (piles up to 12 cards are playable without overlap in default window size) h = max(2*l.YS, l.YS+(playcards-1)*l.YOFFSET) - self.setSize(w1, l.YM + l.YS + h + l.YS + l.YBOTTOM) + self.setSize(w1, l.YM + l.YS + h + l.YS + l.TEXT_HEIGHT) # create stacks x = l.XM + (maxrows - 4*decks) * l.XS / 2 @@ -104,7 +103,7 @@ class FortyThieves(Game): s.rows.append(self.RowStack_Class(x, y, self, max_move=self.ROW_MAX_MOVE)) x = x + l.XS x = self.width - l.XS - y = self.height - l.YS - l.YBOTTOM + y = self.height - l.YS - l.TEXT_HEIGHT s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds, num_deal=num_deal) l.createText(s.talon, "s") if max_rounds > 1: @@ -245,6 +244,11 @@ class Express(Limited): FortyThieves.createGame(self, rows=14, playcards=16, XCARDS=96) +class Carnation(Limited): + def createGame(self): + FortyThieves.createGame(self, rows=16, playcards=20, XCARDS=120) + + # /*********************************************************************** # // Deuces # ************************************************************************/ @@ -588,7 +592,7 @@ class FortunesFavor(Game): l, s = Layout(self), self.s - w, h = l.XM+7*l.XS, 2*l.YM+3*l.YS + w, h = l.XM+8*l.XS, 2*l.YM+3*l.YS self.setSize(w, h) x, y = l.XM+3*l.XS, l.YM @@ -597,13 +601,13 @@ class FortunesFavor(Game): x += l.XS x, y = l.XM, l.YM s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, 's') - y += l.YS+2*l.YM + l.createText(s.talon, 'se') + y += l.YS s.waste = WasteStack(x, y, self) - l.createText(s.waste, 's') + l.createText(s.waste, 'se') y = 2*l.YM+l.YS for i in range(2): - x = l.XM+l.XS + x = l.XM+2*l.XS for j in range(6): stack = SS_RowStack(x, y, self, max_move=1) stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 @@ -826,3 +830,5 @@ registerGame(GameInfo(505, BigCourtyard, "Big Courtyard", GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 3, 0, GI.SL_BALANCED)) registerGame(GameInfo(506, Express, "Express", GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(514, Carnation, "Carnation", + GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 4, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/glenwood.py b/pysollib/games/glenwood.py index 774fd83e..f86b0a04 100644 --- a/pysollib/games/glenwood.py +++ b/pysollib/games/glenwood.py @@ -104,32 +104,33 @@ class Glenwood(Game): l, s = Layout(self), self.s # set window - self.setSize(l.XM + 8*l.XS + l.XM, 3*l.YM + 5*l.YS) + self.setSize(2*l.XM + 6*l.XS, l.YM + l.TEXT_HEIGHT + 5*l.YS) # create stacks x, y = l.XM, l.YM s.talon = Glenwood_Talon(x, y, self, max_rounds=2, num_deal=1) l.createText(s.talon, "ss") - x = x + l.XS + x += l.XS s.waste = WasteStack(x, y, self) l.createText(s.waste, "ss") + x += l.XS+l.XM for i in range(4): - x = 2*l.XM + (i+2)*l.XS s.foundations.append(self.Foundation_Class(x, y, self, i, dir=1, mod=13, base_rank=ANY_RANK, max_move=0)) + x += l.XS - tx, ty, ta, tf = l.getTextAttr(None, "se") - tx, ty = x + tx + l.XM, y + ty + tx, ty, ta, tf = l.getTextAttr(None, "ss") + tx, ty = x - l.XS + tx, y + ty font = self.app.getFont("canvas_default") self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) for i in range(4): x = 2*l.XM + (i+2)*l.XS - y = 3*l.YM + l.YS + y = l.YM+l.TEXT_HEIGHT+l.YS s.rows.append(self.RowStack_Class(x, y, self, mod=13)) for i in range(4): x = l.XM - y = 3*l.YM + (i+1)*l.YS + y = l.YM+l.TEXT_HEIGHT+(i+1)*l.YS stack = self.ReserveStack_Class(x, y, self) s.reserves.append(stack) stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 0da34ffc..cd1f3432 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -131,10 +131,11 @@ class Golf(Game): l, s = Layout(self), self.s # set window + playcards = 5 w1, w2 = 8*l.XS+l.XM, 2*l.XS if w2 + 52*l.XOFFSET > w1: l.XOFFSET = int((w1 - w2) / 52) - self.setSize(w1, 4*l.YS+l.YM) + self.setSize(w1, l.YM+3*l.YS+(playcards-1)*l.YOFFSET+l.TEXT_HEIGHT) # create stacks x, y = l.XM + l.XS / 2, l.YM diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index 40fed9c1..ea78d636 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -493,7 +493,7 @@ class Surprise(Gypsy): for i in range(8): s.foundations.append(SS_FoundationStack(x, y, self, suit=i/2)) x += l.XS - x, y = l.XM, l.YM+l.YS+20 + x, y = l.XM, l.YM+l.YS+l.TEXT_HEIGHT for i in range(11): s.rows.append(KingAC_RowStack(x, y, self)) x += l.XS diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 06a81494..f220f6ba 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -553,12 +553,29 @@ class Jane(Klondike): Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, base_rank=NO_RANK, min_cards=1) RowStack_Class = StackWrapper(AC_RowStack, mod=13, base_rank=NO_RANK) - def createGame(self, max_rounds=1, reserves=7, **layout): - kwdefault(layout, texts=0) - l = apply(Klondike.createGame, (self, max_rounds), layout) - s = self.s - h = max(self.height, l.YM+4*l.YS) - self.setSize(self.width + l.XM+2*l.XS, h) + def createGame(self, max_rounds=1, rows=7, reserves=7, playcards=16): + l, s = Layout(self), self.s + maxrows = max(rows, 7) + w = l.XM+maxrows*l.XS+l.XM+2*l.XS + h = max(l.YM+2*l.YS+playcards*l.YOFFSET+l.TEXT_HEIGHT, l.YM+4*l.YS) + self.setSize(w, h) + + x, y = l.XM, l.YM + s.talon = self.Talon_Class(x, y, self, max_rounds=max_rounds) + l.createText(s.talon, 'ss') + x += l.XS + s.waste = WasteStack(l.XM+l.XS+40, l.YM, self) + + x += 2*l.XS + for i in range(4): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) + x += l.XS + + x, y = l.XM, l.YM+l.YS+l.TEXT_HEIGHT + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self)) + x += l.XS + x0, y = self.width - 2*l.XS, l.YM for i in range(reserves): x = x0 + ((i+1) & 1) * l.XS @@ -571,11 +588,6 @@ class Jane(Klondike): ##self.setRegion(s.reserves, (x0-l.XM/2, -999, 999999, 999999), priority=1) l.defaultStackGroups() self.sg.dropstacks.append(s.talon) - x, y = l.XM, self.height - l.YM - # ??? - #self.texts.info = MfxCanvasText(self.canvas, x, y, anchor="sw", - # font=self.app.getFont("canvas_default")) - l.createText(s.talon, 'ss') def startGame(self, flip=0, reverse=1): for i in range(1, len(self.s.rows)): @@ -607,9 +619,6 @@ class AgnesBernauer(Jane): Talon_Class = AgnesBernauer_Talon Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, base_rank=NO_RANK, max_move=0) - def createGame(self): - Jane.createGame(self, max_rounds=1, waste=0, texts=0) - def startGame(self): Jane.startGame(self, flip=1) diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 5224ad76..a375db37 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -429,7 +429,7 @@ class BritishConstitution(Game): x, y = l.XM, l.YM s.talon = WasteTalonStack(x, y, self, max_rounds=1) l.createText(s.talon, "s") - y += l.YS+2*l.YM + y += l.YS+l.TEXT_HEIGHT s.waste = WasteStack(x, y, self) l.createText(s.waste, "s") diff --git a/pysollib/games/special/tarock.py b/pysollib/games/special/tarock.py index aed5f516..54bcb427 100644 --- a/pysollib/games/special/tarock.py +++ b/pysollib/games/special/tarock.py @@ -342,7 +342,7 @@ class ImperialTrumps(AbstractTarockGame): # Create rows x = l.XM - y = l.YM + int(round(l.YS * 1.25)) + y = l.YM + l.YS + l.TEXT_HEIGHT for i in range(8): s.rows.append(TrumpWild_RowStack(x, y, self)) x = x + l.XS @@ -674,7 +674,6 @@ class Grasshopper(AbstractTarockGame): def createGame(self): l, s = Layout(self), self.s - font = self.app.getFont("canvas_default") # Set window size decks = self.gameinfo.decks @@ -702,7 +701,7 @@ class Grasshopper(AbstractTarockGame): # Create reserve x = l.XM - y = l.YM * 3 + l.YS + y = l.YM + l.YS + l.TEXT_HEIGHT s.reserves.append(OpenStack(x, y, self)) s.reserves[0].CARD_YOFFSET = (l.YOFFSET, yoffset)[decks == 2] @@ -767,7 +766,7 @@ class Ponytail(Tarock_GameMethods, Braid): # set window # (piles up to 20 cards are playable - needed for Ponytail_PonytailStack) - h = max(5*l.YS + 30, l.YS+(self.BRAID_CARDS-1)*l.YOFFSET) + h = max(5*l.YS + l.TEXT_HEIGHT, l.YS+(self.BRAID_CARDS-1)*l.YOFFSET) self.setSize(10*l.XS+l.XM, l.YM + h) # extra settings diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index a2d3d4af..5614b03f 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -49,7 +49,7 @@ class Sultan(Game): l, s = Layout(self), self.s # set window - w, h = 3*l.XM+5*l.XS, 3*l.YM+4*l.YS + w, h = 3*l.XM+5*l.XS, l.YM+4*l.YS+l.TEXT_HEIGHT self.setSize(w, h) # create stacks @@ -126,36 +126,38 @@ class Boudoir(Game): l, s = Layout(self), self.s self.setSize(l.XM+5*l.XS, l.YM+4*l.YS) - x, y = l.XM+l.XS, l.YM - for i in range(4): - s.foundations.append(SS_FoundationStack(x, y, self, suit=i, max_cards=13)) - x += l.XS - - x, y = l.XM, l.YS + x, y = l.XM, l.YM+l.YS-l.TEXT_HEIGHT/2 s.talon = WasteTalonStack(x, y, self, max_rounds=3) s.talon.texts.rounds = MfxCanvasText(self.canvas, x + l.CW / 2, y - l.YM, anchor="s", font=self.app.getFont("canvas_default")) l.createText(s.talon, "s") - x += l.XS - y += l.YM + y += l.YS+l.TEXT_HEIGHT + s.waste = WasteStack(x, y, self) + l.createText(s.waste, "s") + + x, y = l.XM+l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, max_cards=13)) + x += l.XS + + x = l.XM+l.XS + y += l.YS for i in range(4): s.rows.append(AbstractFoundationStack(x, y, self, suit=i, max_cards=1, max_move=0, base_rank=QUEEN)) x += l.XS - x, y = l.XM, 2*l.YM+2*l.YS - s.waste = WasteStack(x, y, self) - l.createText(s.waste, "s") - x += l.XS - y -= l.YM + x = l.XM+l.XS + y += l.YS for i in range(4): s.rows.append(AbstractFoundationStack(x, y, self, suit=i, max_cards=1, max_move=0, base_rank=JACK)) x += l.XS - x, y = l.XM+l.XS, l.YM+3*l.YS + x = l.XM+l.XS + y += l.YS for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, mod=13, max_cards=11, base_rank=9, dir=-1)) @@ -186,16 +188,16 @@ class CaptiveQueens(Game): def createGame(self): l, s = Layout(self), self.s - self.setSize(l.XM+5*l.XS, l.YM+3*l.YS) + self.setSize(l.XM+5*l.XS, max(l.YM+3*l.YS, l.YM+2*l.YS+3*l.TEXT_HEIGHT)) - x, y = l.XM, 4*l.YM + x, y = l.XM, l.YM+l.TEXT_HEIGHT s.talon = WasteTalonStack(x, y, self, max_rounds=3) s.talon.texts.rounds = MfxCanvasText(self.canvas, x + l.CW / 2, y - l.YM, anchor="s", font=self.app.getFont("canvas_default")) l.createText(s.talon, "s") - y += 2*l.YM+l.YS + y += l.YS+l.TEXT_HEIGHT s.waste = WasteStack(x, y, self) l.createText(s.waste, "s") diff --git a/pysollib/games/tournament.py b/pysollib/games/tournament.py index 5838320e..2f067810 100644 --- a/pysollib/games/tournament.py +++ b/pysollib/games/tournament.py @@ -90,10 +90,10 @@ class Tournament(Game): l, s = Layout(self), self.s # set window - self.setSize(l.XM+10*l.XS, max(l.YM+l.YS+20*l.YOFFSET, 5*l.YM+5*l.YS)) + self.setSize(l.XM+10*l.XS, max(l.YM+l.YS+20*l.YOFFSET, 2*l.YM+5*l.YS)) # create stacks - x, y, = l.XM+l.XS, l.YM + x, y, = l.XM+2*l.XS, l.YM for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) x = x + l.XS @@ -101,7 +101,7 @@ class Tournament(Game): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, base_rank=KING, dir=-1)) x = x + l.XS - x, y = l.XM+2*l.XS, l.YM+l.YS + x, y = l.XM+2*l.XS, 2*l.YM+l.YS for i in range(6): stack = BasicRowStack(x, y, self, max_move=1, max_accept=0) s.rows.append(stack) @@ -109,23 +109,23 @@ class Tournament(Game): stack.CARD_YOFFSET = 0 x = x + l.XS - x, y = l.XM, 4*l.YM+l.YS + x, y = l.XM, 2*l.YM+l.YS for i in range(4): self.s.reserves.append(ReserveStack(x, y, self)) y += l.YS - x, y = l.XM+9*l.XS, 4*l.YM+l.YS + x, y = l.XM+9*l.XS, 2*l.YM+l.YS for i in range(4): self.s.reserves.append(ReserveStack(x, y, self)) y += l.YS s.talon = Tournament_Talon(l.XM, l.YM, self, max_rounds=3) - ##l.createText(s.talon, "ss") - tx, ty, ta, tf = l.getTextAttr(s.talon, "ss") + l.createText(s.talon, "se") + tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=self.app.getFont("canvas_default")) - # default - l.defaultAll() + # define stack-groups + l.defaultStackGroups() # # game overrides diff --git a/pysollib/games/ultra/hexadeck.py b/pysollib/games/ultra/hexadeck.py index 3fcf19cd..6a8284a2 100644 --- a/pysollib/games/ultra/hexadeck.py +++ b/pysollib/games/ultra/hexadeck.py @@ -332,7 +332,7 @@ class BitsNBytes(Game): y = l.YM s.talon = WasteTalonStack(x, y, self, num_deal=2, max_rounds=2) l.createText(s.talon, "ss") - y = y + l.YS + l.YM * 2 + y += l.YS + l.TEXT_HEIGHT s.waste = WasteStack(x, y, self) l.createText(s.waste, "ss") diff --git a/pysollib/layout.py b/pysollib/layout.py index 85009086..f14e6fb8 100644 --- a/pysollib/layout.py +++ b/pysollib/layout.py @@ -88,12 +88,13 @@ class Layout: self.YS = self.CH + YM # YSPACE self.XOFFSET = images.CARD_XOFFSET self.YOFFSET = images.CARD_YOFFSET + self.TEXT_HEIGHT = 30 self.__dict__.update(kw) -## if self.game.preview > 1: -## if kw.has_key("XOFFSET"): -## self.XOFFSET = self.XOFFSET / self.game.preview -## if kw.has_key("YOFFSET"): -## self.YOFFSET = self.YOFFSET / self.game.preview + if self.game.preview > 1: + if kw.has_key("XOFFSET"): + self.XOFFSET = self.XOFFSET / self.game.preview + if kw.has_key("YOFFSET"): + self.YOFFSET = self.YOFFSET / self.game.preview def __createStack(self, x, y, suit=None): stack = _LayoutStack(x, y, suit) @@ -370,6 +371,7 @@ class Layout: # set size so that at least 19 cards are fully playable h = YS + (playcards-1)*self.YOFFSET h = max(h, 3*YS) + if texts: h += self.TEXT_HEIGHT # top x, y = (w - (rows*XS - XM))/2, YM @@ -406,7 +408,7 @@ class Layout: # - bottom: rows # - def klondikeLayout(self, rows, waste, texts=1, playcards=16, center=1): + def klondikeLayout(self, rows, waste, texts=1, playcards=16, center=1, text_height=0): S = self.__createStack CW, CH = self.CW, self.CH XM, YM = self.XM, self.YM @@ -424,12 +426,14 @@ class Layout: h = max(h, 2 * YS) # top + ##text_height = 0 x, y = XM, YM self.s.talon = s = S(x, y) if texts: if waste or not center or maxrows - frows <= 1: # place text below stack s.setText(x + CW / 2, y + YS, anchor="n") + text_height = self.TEXT_HEIGHT else: # place text right of stack s.setText(x + XS, y, anchor="nw", format="%3d") @@ -439,6 +443,7 @@ class Layout: if texts: # place text below stack s.setText(x + CW / 2, y + YS, anchor="n") + text_height = self.TEXT_HEIGHT for row in range(foundrows): x = XM + (maxrows - frows) * XS @@ -454,7 +459,8 @@ class Layout: # bottom x = XM if rows < maxrows: x += (maxrows-rows) * XS/2 - y += YM * (3 - foundrows) + ##y += YM * (3 - foundrows) + y += text_height self.setRegion(self.s.rows, (-999, y - YM / 2, 999999, 999999)) for i in range(rows): self.s.rows.append(S(x, y)) From 67f84ccc672aa6059eab4e5189bf3d628064a828 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 24 Jun 2006 21:17:14 +0000 Subject: [PATCH 013/266] + 1 new game + update russian translation git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@14 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/games.pot | 160 ++++++- po/pysol.pot | 701 +++++++++++++++------------ po/ru_games.po | 216 ++++++++- po/ru_pysol.po | 710 ++++++++++++++++------------ pysollib/games/bakersdozen.py | 20 +- pysollib/games/beleagueredcastle.py | 4 +- pysollib/games/gypsy.py | 5 + pysollib/games/klondike.py | 6 +- pysollib/tk/gameinfodialog.py | 6 + 9 files changed, 1183 insertions(+), 645 deletions(-) diff --git a/po/games.pot b/po/games.pot index a91b4ca4..d218b330 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sun Jun 11 10:16:06 2006\n" +"POT-Creation-Date: Sat Jun 24 16:07:12 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -63,6 +63,9 @@ msgstr "" msgid "Acme" msgstr "" +msgid "Acquaintance" +msgstr "" + msgid "Agnes Bernauer" msgstr "" @@ -87,6 +90,9 @@ msgstr "" msgid "Alhambra" msgstr "" +msgid "Ali Baba" +msgstr "" + msgid "All in a Row" msgstr "" @@ -114,6 +120,9 @@ msgstr "" msgid "Aqab's" msgstr "" +msgid "Arabella" +msgstr "" + msgid "Arachnida" msgstr "" @@ -204,6 +213,15 @@ msgstr "" msgid "Betsy Ross" msgstr "" +msgid "Big Braid" +msgstr "" + +msgid "Big Cell" +msgstr "" + +msgid "Big Courtyard" +msgstr "" + msgid "Big Easy" msgstr "" @@ -213,6 +231,9 @@ msgstr "" msgid "Big Forty" msgstr "" +msgid "Big Ground" +msgstr "" + msgid "Big Harp" msgstr "" @@ -231,9 +252,15 @@ msgstr "" msgid "Big Spider (2 suits)" msgstr "" +msgid "Big Streets" +msgstr "" + msgid "Big Sumo" msgstr "" +msgid "Big York" +msgstr "" + msgid "Bim Bom" msgstr "" @@ -348,6 +375,9 @@ msgstr "" msgid "Carlton" msgstr "" +msgid "Carnation" +msgstr "" + msgid "Carpet" msgstr "" @@ -360,9 +390,15 @@ msgstr "" msgid "Casino Klondike" msgstr "" +msgid "Cassim" +msgstr "" + msgid "Castle" msgstr "" +msgid "Castle Mount" +msgstr "" + msgid "Castle of Indolence" msgstr "" @@ -462,6 +498,9 @@ msgstr "" msgid "Corkscrew" msgstr "" +msgid "Corner Suite" +msgstr "" + msgid "Corners" msgstr "" @@ -489,6 +528,9 @@ msgstr "" msgid "Curds and Whey" msgstr "" +msgid "Czarina" +msgstr "" + msgid "Danda" msgstr "" @@ -507,6 +549,9 @@ msgstr "" msgid "Deep Well" msgstr "" +msgid "Demon" +msgstr "" + msgid "Der Katzenschwanz" msgstr "" @@ -555,6 +600,9 @@ msgstr "" msgid "Die kleine Harfe" msgstr "" +msgid "Dieppe" +msgstr "" + msgid "Diplomat" msgstr "" @@ -624,9 +672,15 @@ msgstr "" msgid "Double Rail" msgstr "" +msgid "Double Russian Solitaire" +msgstr "" + msgid "Double Samuri" msgstr "" +msgid "Double Scorpion" +msgstr "" + msgid "Double Your Fun" msgstr "" @@ -696,6 +750,9 @@ msgstr "" msgid "Eight Times Eight" msgstr "" +msgid "Elba" +msgstr "" + msgid "Elevator" msgstr "" @@ -717,6 +774,9 @@ msgstr "" msgid "Excuse" msgstr "" +msgid "Express" +msgstr "" + msgid "Eye" msgstr "" @@ -906,6 +966,9 @@ msgstr "" msgid "Genesis +" msgstr "" +msgid "Geoffrey" +msgstr "" + msgid "German Patience" msgstr "" @@ -969,12 +1032,6 @@ msgstr "" msgid "Ground for a Divorce" msgstr "" -msgid "Ground for a Divorce (3 decks)" -msgstr "" - -msgid "Ground for a Divorce (4 decks)" -msgstr "" - msgid "Gypsy" msgstr "" @@ -990,6 +1047,9 @@ msgstr "" msgid "Half Mahjongg Wall" msgstr "" +msgid "Hanafuda Four Seasons" +msgstr "" + msgid "Hanoi Puzzle 4" msgstr "" @@ -1068,6 +1128,9 @@ msgstr "" msgid "IloveU" msgstr "" +msgid "Imperial Guards" +msgstr "" + msgid "Imperial Trumps" msgstr "" @@ -1086,6 +1149,9 @@ msgstr "" msgid "Inner Circle" msgstr "" +msgid "Inquisitor" +msgstr "" + msgid "Intelligence" msgstr "" @@ -1197,6 +1263,9 @@ msgstr "" msgid "Km" msgstr "" +msgid "Knotty Nines" +msgstr "" + msgid "Krebs" msgstr "" @@ -1257,6 +1326,9 @@ msgstr "" msgid "Lady Betty" msgstr "" +msgid "Lady Jane" +msgstr "" + msgid "Lady Palk" msgstr "" @@ -1293,6 +1365,9 @@ msgstr "" msgid "Lexington Harp" msgstr "" +msgid "Lightweight" +msgstr "" + msgid "Lily" msgstr "" @@ -1314,6 +1389,9 @@ msgstr "" msgid "Little Gate" msgstr "" +msgid "Little Napoleon" +msgstr "" + msgid "Long Braid" msgstr "" @@ -1329,6 +1407,9 @@ msgstr "" msgid "Lucas" msgstr "" +msgid "Madame" +msgstr "" + msgid "Mage's Game" msgstr "" @@ -1887,6 +1968,9 @@ msgstr "" msgid "Maria Luisa" msgstr "" +msgid "Marie Rose" +msgstr "" + msgid "Martha" msgstr "" @@ -1932,6 +2016,9 @@ msgstr "" msgid "Midshipman" msgstr "" +msgid "Millie" +msgstr "" + msgid "Milligan Cell" msgstr "" @@ -1989,6 +2076,9 @@ msgstr "" msgid "Mount Olympus" msgstr "" +msgid "Moving Left" +msgstr "" + msgid "Mrs. Mop" msgstr "" @@ -2007,6 +2097,9 @@ msgstr "" msgid "Musical Patience" msgstr "" +msgid "Mystique" +msgstr "" + msgid "N for Namida" msgstr "" @@ -2073,9 +2166,15 @@ msgstr "" msgid "Number Ten" msgstr "" +msgid "Number Twelve" +msgstr "" + msgid "Numerica" msgstr "" +msgid "Ocean Towers" +msgstr "" + msgid "Octagon" msgstr "" @@ -2208,6 +2307,9 @@ msgstr "" msgid "Perseverance" msgstr "" +msgid "Phantom Blockade" +msgstr "" + msgid "Phoenix" msgstr "" @@ -2454,6 +2556,9 @@ msgstr "" msgid "Sanibel" msgstr "" +msgid "Saratoga" +msgstr "" + msgid "Scarab" msgstr "" @@ -2547,6 +2652,9 @@ msgstr "" msgid "Sieben bis As" msgstr "" +msgid "Signora" +msgstr "" + msgid "Simon Jester" msgstr "" @@ -2604,6 +2712,9 @@ msgstr "" msgid "Somerset" msgstr "" +msgid "Souter" +msgstr "" + msgid "Space Bridge" msgstr "" @@ -2649,6 +2760,9 @@ msgstr "" msgid "Spidike" msgstr "" +msgid "Spike" +msgstr "" + msgid "Squadron" msgstr "" @@ -2694,6 +2808,9 @@ msgstr "" msgid "Steps" msgstr "" +msgid "Steve" +msgstr "" + msgid "Stonehenge" msgstr "" @@ -2706,6 +2823,9 @@ msgstr "" msgid "Straight Up" msgstr "" +msgid "Strategerie" +msgstr "" + msgid "Strategy" msgstr "" @@ -2754,6 +2874,9 @@ msgstr "" msgid "Surukh" msgstr "" +msgid "Sweet Sixteen" +msgstr "" + msgid "Taipei" msgstr "" @@ -2907,12 +3030,18 @@ msgstr "" msgid "Triple Line" msgstr "" -msgid "Triple York" +msgid "Triple Russian Solitaire" +msgstr "" + +msgid "Triple Scorpion" msgstr "" msgid "Triple Yukon" msgstr "" +msgid "Trusty Twelve" +msgstr "" + msgid "Twenty" msgstr "" @@ -2958,12 +3087,21 @@ msgstr "" msgid "Vertical" msgstr "" +msgid "Very Big Ground" +msgstr "" + msgid "Vi" msgstr "" msgid "Victory Arrow" msgstr "" +msgid "Wake-Robin" +msgstr "" + +msgid "Wake-Robin (3 decks)" +msgstr "" + msgid "Wall" msgstr "" @@ -3009,6 +3147,9 @@ msgstr "" msgid "Whitehead" msgstr "" +msgid "Whitehorse" +msgstr "" + msgid "Wicked" msgstr "" @@ -3051,3 +3192,6 @@ msgstr "" msgid "Zeus" msgstr "" +msgid "Zodiac" +msgstr "" + diff --git a/po/pysol.pot b/po/pysol.pot index 46e8d15f..75d594a7 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Sun Jun 11 10:16:01 2006\n" +"POT-Creation-Date: Sat Jun 24 16:07:07 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,196 +15,196 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:344 pysollib/tk/toolbar.py:183 +#: pysollib/actions.py:346 pysollib/tk/toolbar.py:183 msgid "New game" msgstr "" -#: pysollib/actions.py:357 pysollib/tk/menubar.py:665 -#: pysollib/tk/menubar.py:679 +#: pysollib/actions.py:359 pysollib/tk/menubar.py:666 +#: pysollib/tk/menubar.py:680 msgid "Select game" msgstr "" -#: pysollib/actions.py:380 +#: pysollib/actions.py:382 msgid "Invalid game number" msgstr "" -#: pysollib/actions.py:381 +#: pysollib/actions.py:383 msgid "" "Invalid game number\n" msgstr "" -#: pysollib/actions.py:398 +#: pysollib/actions.py:400 msgid "Select next game number" msgstr "" -#: pysollib/actions.py:407 pysollib/actions.py:417 +#: pysollib/actions.py:409 pysollib/actions.py:419 msgid "Select new game number" msgstr "" -#: pysollib/actions.py:408 +#: pysollib/actions.py:410 msgid "" "\n" "\n" "Enter new game number" msgstr "" -#: pysollib/actions.py:409 +#: pysollib/actions.py:411 msgid "&Next number" msgstr "" -#: pysollib/actions.py:409 pysollib/app.py:1118 pysollib/app.py:1130 -#: pysollib/game.py:830 pysollib/game.py:1644 pysollib/main.py:413 +#: pysollib/actions.py:411 pysollib/app.py:1113 pysollib/app.py:1125 +#: pysollib/game.py:837 pysollib/game.py:1651 pysollib/main.py:413 #: pysollib/main.py:421 pysollib/tk/colorsdialog.py:131 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 -#: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:133 +#: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:143 #: pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 -#: pysollib/tk/soundoptionsdialog.py:169 pysollib/tk/soundoptionsdialog.py:223 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:459 -#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:571 -#: pysollib/tk/tkstats.py:645 pysollib/tk/tkstats.py:661 -#: pysollib/tk/tkstats.py:703 pysollib/tk/tkstats.py:775 -#: pysollib/tk/tkstats.py:859 pysollib/tk/tkwidget.py:156 +#: pysollib/tk/soundoptionsdialog.py:171 pysollib/tk/soundoptionsdialog.py:225 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:474 +#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 +#: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 +#: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:777 +#: pysollib/tk/tkstats.py:861 pysollib/tk/tkwidget.py:156 #: pysollib/tk/tkwidget.py:320 msgid "&OK" msgstr "" -#: pysollib/actions.py:409 pysollib/app.py:1130 pysollib/game.py:830 -#: pysollib/game.py:1207 pysollib/game.py:1222 pysollib/game.py:1228 -#: pysollib/game.py:1233 pysollib/tk/colorsdialog.py:131 +#: pysollib/actions.py:411 pysollib/app.py:1125 pysollib/game.py:837 +#: pysollib/game.py:1214 pysollib/game.py:1229 pysollib/game.py:1235 +#: pysollib/game.py:1240 pysollib/tk/colorsdialog.py:131 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 -#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:852 -#: pysollib/tk/menubar.py:854 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:849 +#: pysollib/tk/menubar.py:851 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 -#: pysollib/tk/selectgame.py:268 pysollib/tk/selectgame.py:409 -#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:169 +#: pysollib/tk/selectgame.py:275 pysollib/tk/selectgame.py:417 +#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:171 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:320 msgid "&Cancel" msgstr "" -#: pysollib/actions.py:425 +#: pysollib/actions.py:427 msgid "Select random game" msgstr "" -#: pysollib/actions.py:461 +#: pysollib/actions.py:463 msgid "Select next game" msgstr "" -#: pysollib/actions.py:494 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:496 pysollib/tk/toolbar.py:197 msgid "Quit " msgstr "" -#: pysollib/actions.py:544 +#: pysollib/actions.py:546 msgid "Clear bookmarks" msgstr "" -#: pysollib/actions.py:545 +#: pysollib/actions.py:547 msgid "Clear all bookmarks ?" msgstr "" -#: pysollib/actions.py:555 +#: pysollib/actions.py:557 msgid "Restart game" msgstr "" -#: pysollib/actions.py:556 +#: pysollib/actions.py:558 msgid "Restart this game ?" msgstr "" -#: pysollib/actions.py:593 +#: pysollib/actions.py:595 msgid "" "Comments for %s:\n" "\n" msgstr "" -#: pysollib/actions.py:595 +#: pysollib/actions.py:597 msgid "Comments for " msgstr "" -#: pysollib/actions.py:613 pysollib/actions.py:649 +#: pysollib/actions.py:615 pysollib/actions.py:651 msgid "Error while writing to file" msgstr "" -#: pysollib/actions.py:616 pysollib/actions.py:652 +#: pysollib/actions.py:618 pysollib/actions.py:654 msgid " Info" msgstr "" -#: pysollib/actions.py:617 +#: pysollib/actions.py:619 msgid "" "Comments were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:634 +#: pysollib/actions.py:636 msgid "Demo statistics" msgstr "" -#: pysollib/actions.py:637 +#: pysollib/actions.py:639 msgid "Your statistics" msgstr "" -#: pysollib/actions.py:653 +#: pysollib/actions.py:655 msgid "" " were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:667 +#: pysollib/actions.py:669 msgid " Demo" msgstr "" -#: pysollib/actions.py:667 +#: pysollib/actions.py:669 msgid " Demo " msgstr "" -#: pysollib/actions.py:670 pysollib/actions.py:688 +#: pysollib/actions.py:672 pysollib/actions.py:690 msgid " for " msgstr "" -#: pysollib/actions.py:676 pysollib/actions.py:695 +#: pysollib/actions.py:678 pysollib/actions.py:697 msgid "Statistics for " msgstr "" -#: pysollib/actions.py:679 pysollib/tk/selectgame.py:352 +#: pysollib/actions.py:681 pysollib/tk/selectgame.py:359 #: pysollib/tk/toolbar.py:194 msgid "Statistics" msgstr "" -#: pysollib/actions.py:682 +#: pysollib/actions.py:684 msgid "Full log" msgstr "" -#: pysollib/actions.py:685 +#: pysollib/actions.py:687 msgid "Session log" msgstr "" -#: pysollib/actions.py:691 +#: pysollib/actions.py:693 msgid "Game Info" msgstr "" -#: pysollib/actions.py:700 +#: pysollib/actions.py:702 msgid "Full log for " msgstr "" -#: pysollib/actions.py:705 +#: pysollib/actions.py:707 msgid "Session log for " msgstr "" -#: pysollib/actions.py:710 +#: pysollib/actions.py:712 msgid "Reset all statistics" msgstr "" -#: pysollib/actions.py:711 +#: pysollib/actions.py:713 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" msgstr "" -#: pysollib/actions.py:717 +#: pysollib/actions.py:719 msgid "Reset game statistics" msgstr "" -#: pysollib/actions.py:718 +#: pysollib/actions.py:720 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -212,51 +212,51 @@ msgid "" "%s ?" msgstr "" -#: pysollib/actions.py:774 +#: pysollib/actions.py:776 msgid "Play demo" msgstr "" -#: pysollib/actions.py:785 +#: pysollib/actions.py:787 msgid "Set player options" msgstr "" -#: pysollib/actions.py:874 +#: pysollib/actions.py:876 msgid "Sound settings" msgstr "" -#: pysollib/actions.py:895 +#: pysollib/actions.py:897 msgid "Set colors" msgstr "" -#: pysollib/actions.py:914 +#: pysollib/actions.py:916 msgid "Set fonts" msgstr "" -#: pysollib/actions.py:923 +#: pysollib/actions.py:925 msgid "Set timeouts" msgstr "" -#: pysollib/app.py:86 +#: pysollib/app.py:85 msgid "Unknown" msgstr "" -#: pysollib/app.py:980 +#: pysollib/app.py:975 msgid "Loading %s %s..." msgstr "" -#: pysollib/app.py:1015 +#: pysollib/app.py:1010 msgid " load error" msgstr "" -#: pysollib/app.py:1016 +#: pysollib/app.py:1011 msgid "Error while loading " msgstr "" -#: pysollib/app.py:1110 +#: pysollib/app.py:1105 msgid "Incompatible " msgstr "" -#: pysollib/app.py:1112 +#: pysollib/app.py:1107 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -265,57 +265,58 @@ msgid "" "Please select a %s type %s.\n" msgstr "" -#: pysollib/app.py:1128 +#: pysollib/app.py:1123 msgid "Please select a %s type %s" msgstr "" -#: pysollib/game.py:750 pysollib/game.py:756 +#: pysollib/game.py:756 pysollib/game.py:762 msgid "" "Player\n" msgstr "" -#: pysollib/game.py:826 +#: pysollib/game.py:833 msgid "Discard current game ?" msgstr "" -#: pysollib/game.py:1161 +#: pysollib/game.py:1168 msgid "" "\n" "You have reached\n" "#%d in the %s of playing time" msgstr "" -#: pysollib/game.py:1164 +#: pysollib/game.py:1171 msgid "" "\n" "and #%d in the %s of moves" msgstr "" -#: pysollib/game.py:1166 +#: pysollib/game.py:1173 msgid "" "\n" "You have reached\n" "#%d in the %s of moves" msgstr "" -#: pysollib/game.py:1169 +#: pysollib/game.py:1176 msgid "" "\n" "and #%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1171 +#: pysollib/game.py:1178 msgid "" "\n" "You have reached\n" "#%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1198 pysollib/game.py:1214 +#: pysollib/game.py:1205 pysollib/game.py:1221 +#: pysollib/tk/soundoptionsdialog.py:102 msgid "Game won" msgstr "" -#: pysollib/game.py:1199 +#: pysollib/game.py:1206 msgid "" "\n" "Congratulations, this\n" @@ -326,12 +327,12 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1207 pysollib/game.py:1222 pysollib/game.py:1228 -#: pysollib/game.py:1233 pysollib/tk/menubar.py:250 +#: pysollib/game.py:1214 pysollib/game.py:1229 pysollib/game.py:1235 +#: pysollib/game.py:1240 pysollib/tk/menubar.py:250 msgid "&New game" msgstr "" -#: pysollib/game.py:1215 +#: pysollib/game.py:1222 msgid "" "\n" "Congratulations, you did it !\n" @@ -341,99 +342,100 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1226 pysollib/game.py:1231 +#: pysollib/game.py:1233 pysollib/game.py:1238 +#: pysollib/tk/soundoptionsdialog.py:100 msgid "Game finished" msgstr "" -#: pysollib/game.py:1227 pysollib/game.py:1645 +#: pysollib/game.py:1234 pysollib/game.py:1652 msgid "" "\n" "Game finished\n" msgstr "" -#: pysollib/game.py:1232 +#: pysollib/game.py:1239 msgid "" "\n" "Game finished, but not without my help...\n" msgstr "" -#: pysollib/game.py:1233 +#: pysollib/game.py:1240 msgid "&Restart" msgstr "" -#: pysollib/game.py:1537 +#: pysollib/game.py:1544 msgid "Score %6d" msgstr "" -#: pysollib/game.py:1636 +#: pysollib/game.py:1643 msgid "&Cool" msgstr "" -#: pysollib/game.py:1636 +#: pysollib/game.py:1643 msgid "&Great" msgstr "" -#: pysollib/game.py:1636 +#: pysollib/game.py:1643 msgid "&Wow" msgstr "" -#: pysollib/game.py:1636 +#: pysollib/game.py:1643 msgid "&Yeah" msgstr "" -#: pysollib/game.py:1637 pysollib/game.py:1648 pysollib/game.py:1660 +#: pysollib/game.py:1644 pysollib/game.py:1655 pysollib/game.py:1667 msgid " Autopilot" msgstr "" -#: pysollib/game.py:1638 +#: pysollib/game.py:1645 msgid "" "\n" "Game solved in %d moves.\n" msgstr "" -#: pysollib/game.py:1659 +#: pysollib/game.py:1666 msgid "&Hmm" msgstr "" -#: pysollib/game.py:1659 +#: pysollib/game.py:1666 msgid "&Oh well" msgstr "" -#: pysollib/game.py:1659 +#: pysollib/game.py:1666 msgid "&That's life" msgstr "" -#: pysollib/game.py:1661 +#: pysollib/game.py:1668 msgid "" "\n" "This won't come out...\n" msgstr "" -#: pysollib/game.py:2065 +#: pysollib/game.py:2072 msgid "Set bookmark" msgstr "" -#: pysollib/game.py:2066 +#: pysollib/game.py:2073 msgid "Replace existing bookmark %d ?" msgstr "" -#: pysollib/game.py:2088 +#: pysollib/game.py:2095 msgid "Goto bookmark" msgstr "" -#: pysollib/game.py:2089 +#: pysollib/game.py:2096 msgid "Goto bookmark %d ?" msgstr "" -#: pysollib/game.py:2120 +#: pysollib/game.py:2127 msgid "Open game" msgstr "" -#: pysollib/game.py:2131 pysollib/game.py:2140 pysollib/game.py:2145 +#: pysollib/game.py:2138 pysollib/game.py:2147 pysollib/game.py:2152 msgid "Load game error" msgstr "" -#: pysollib/game.py:2132 +#: pysollib/game.py:2139 msgid "" "Error while loading game.\n" "\n" @@ -441,246 +443,247 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2141 +#: pysollib/game.py:2148 msgid "Error while loading game" msgstr "" -#: pysollib/game.py:2146 +#: pysollib/game.py:2153 msgid "" "Internal error while loading game.\n" "\n" "Please report this bug." msgstr "" -#: pysollib/game.py:2171 +#: pysollib/game.py:2178 msgid "Save game error" msgstr "" -#: pysollib/game.py:2172 +#: pysollib/game.py:2179 msgid "Error while saving game" msgstr "" -#: pysollib/gamedb.py:113 +#: pysollib/gamedb.py:120 msgid "Baker's Dozen" msgstr "" -#: pysollib/gamedb.py:114 +#: pysollib/gamedb.py:121 msgid "Beleaguered Castle" msgstr "" -#: pysollib/gamedb.py:115 +#: pysollib/gamedb.py:122 msgid "Canfield" msgstr "" -#: pysollib/gamedb.py:116 +#: pysollib/gamedb.py:123 msgid "Fan" msgstr "" -#: pysollib/gamedb.py:117 +#: pysollib/gamedb.py:124 msgid "Forty Thieves" msgstr "" -#: pysollib/gamedb.py:118 +#: pysollib/gamedb.py:125 msgid "FreeCell" msgstr "" -#: pysollib/gamedb.py:119 +#: pysollib/gamedb.py:126 msgid "Golf" msgstr "" -#: pysollib/gamedb.py:120 +#: pysollib/gamedb.py:127 msgid "Gypsy" msgstr "" -#: pysollib/gamedb.py:121 +#: pysollib/gamedb.py:128 msgid "Klondike" msgstr "" -#: pysollib/gamedb.py:122 +#: pysollib/gamedb.py:129 msgid "Montana" msgstr "" -#: pysollib/gamedb.py:123 +#: pysollib/gamedb.py:130 msgid "Napoleon" msgstr "" -#: pysollib/gamedb.py:124 +#: pysollib/gamedb.py:131 msgid "Numerica" msgstr "" -#: pysollib/gamedb.py:125 +#: pysollib/gamedb.py:132 msgid "Pairing" msgstr "" -#: pysollib/gamedb.py:126 +#: pysollib/gamedb.py:133 msgid "Raglan" msgstr "" -#: pysollib/gamedb.py:127 pysollib/gamedb.py:160 +#: pysollib/gamedb.py:134 pysollib/gamedb.py:167 msgid "Simple games" msgstr "" -#: pysollib/gamedb.py:128 +#: pysollib/gamedb.py:135 msgid "Spider" msgstr "" -#: pysollib/gamedb.py:129 +#: pysollib/gamedb.py:136 msgid "Terrace" msgstr "" -#: pysollib/gamedb.py:130 +#: pysollib/gamedb.py:137 msgid "Yukon" msgstr "" -#: pysollib/gamedb.py:131 pysollib/gamedb.py:164 +#: pysollib/gamedb.py:138 pysollib/gamedb.py:171 msgid "One-Deck games" msgstr "" -#: pysollib/gamedb.py:132 pysollib/gamedb.py:165 +#: pysollib/gamedb.py:139 pysollib/gamedb.py:172 msgid "Two-Deck games" msgstr "" -#: pysollib/gamedb.py:133 pysollib/gamedb.py:166 +#: pysollib/gamedb.py:140 pysollib/gamedb.py:173 msgid "Three-Deck games" msgstr "" -#: pysollib/gamedb.py:134 pysollib/gamedb.py:167 +#: pysollib/gamedb.py:141 pysollib/gamedb.py:174 msgid "Four-Deck games" msgstr "" -#: pysollib/gamedb.py:146 +#: pysollib/gamedb.py:153 msgid "Baker's Dozen type" msgstr "" -#: pysollib/gamedb.py:147 +#: pysollib/gamedb.py:154 msgid "Beleaguered Castle type" msgstr "" -#: pysollib/gamedb.py:148 +#: pysollib/gamedb.py:155 msgid "Canfield type" msgstr "" -#: pysollib/gamedb.py:149 +#: pysollib/gamedb.py:156 msgid "Fan type" msgstr "" -#: pysollib/gamedb.py:150 +#: pysollib/gamedb.py:157 msgid "Forty Thieves type" msgstr "" -#: pysollib/gamedb.py:151 +#: pysollib/gamedb.py:158 msgid "FreeCell type" msgstr "" -#: pysollib/gamedb.py:152 +#: pysollib/gamedb.py:159 msgid "Golf type" msgstr "" -#: pysollib/gamedb.py:153 +#: pysollib/gamedb.py:160 msgid "Gypsy type" msgstr "" -#: pysollib/gamedb.py:154 +#: pysollib/gamedb.py:161 msgid "Klondike type" msgstr "" -#: pysollib/gamedb.py:155 +#: pysollib/gamedb.py:162 msgid "Montana type" msgstr "" -#: pysollib/gamedb.py:156 +#: pysollib/gamedb.py:163 msgid "Napoleon type" msgstr "" -#: pysollib/gamedb.py:157 +#: pysollib/gamedb.py:164 msgid "Numerica type" msgstr "" -#: pysollib/gamedb.py:158 +#: pysollib/gamedb.py:165 msgid "Pairing type" msgstr "" -#: pysollib/gamedb.py:159 +#: pysollib/gamedb.py:166 msgid "Raglan type" msgstr "" -#: pysollib/gamedb.py:161 +#: pysollib/gamedb.py:168 msgid "Spider type" msgstr "" -#: pysollib/gamedb.py:162 +#: pysollib/gamedb.py:169 msgid "Terrace type" msgstr "" -#: pysollib/gamedb.py:163 +#: pysollib/gamedb.py:170 msgid "Yukon type" msgstr "" -#: pysollib/gamedb.py:188 pysollib/gamedb.py:196 +#: pysollib/gamedb.py:178 pysollib/gamedb.py:186 msgid "French type" msgstr "" -#: pysollib/gamedb.py:189 pysollib/gamedb.py:197 pysollib/gamedb.py:206 +#: pysollib/gamedb.py:179 pysollib/gamedb.py:187 pysollib/gamedb.py:195 msgid "Ganjifa type" msgstr "" -#: pysollib/gamedb.py:190 pysollib/gamedb.py:198 pysollib/gamedb.py:207 +#: pysollib/gamedb.py:180 pysollib/gamedb.py:188 pysollib/gamedb.py:196 msgid "Hanafuda type" msgstr "" -#: pysollib/gamedb.py:191 pysollib/gamedb.py:199 pysollib/gamedb.py:214 +#: pysollib/gamedb.py:181 pysollib/gamedb.py:189 pysollib/gamedb.py:203 msgid "Hex A Deck type" msgstr "" -#: pysollib/gamedb.py:192 pysollib/gamedb.py:200 pysollib/gamedb.py:219 +#: pysollib/gamedb.py:182 pysollib/gamedb.py:190 pysollib/gamedb.py:208 msgid "Tarock type" msgstr "" -#: pysollib/gamedb.py:205 +#: pysollib/gamedb.py:194 msgid "Dashavatara Ganjifa type" msgstr "" -#: pysollib/gamedb.py:208 +#: pysollib/gamedb.py:197 msgid "Mughal Ganjifa type" msgstr "" -#: pysollib/gamedb.py:209 +#: pysollib/gamedb.py:198 msgid "Navagraha Ganjifa type" msgstr "" -#: pysollib/gamedb.py:213 +#: pysollib/gamedb.py:202 msgid "Shisen-Sho" msgstr "" -#: pysollib/gamedb.py:215 +#: pysollib/gamedb.py:204 msgid "Matrix type" msgstr "" -#: pysollib/gamedb.py:216 +#: pysollib/gamedb.py:205 msgid "Memory type" msgstr "" -#: pysollib/gamedb.py:217 +#: pysollib/gamedb.py:206 msgid "Poker type" msgstr "" -#: pysollib/gamedb.py:218 +#: pysollib/gamedb.py:207 msgid "Puzzle type" msgstr "" #: pysollib/games/auldlangsyne.py:142 pysollib/games/calculation.py:101 #: pysollib/games/numerica.py:90 pysollib/games/numerica.py:197 +#: pysollib/games/numerica.py:543 msgid "Row. Build regardless of rank and suit." msgstr "" -#: pysollib/games/braid.py:250 pysollib/games/napoleon.py:190 +#: pysollib/games/braid.py:251 pysollib/games/napoleon.py:190 #: pysollib/games/ultra/dashavatara.py:959 #: pysollib/games/ultra/hanafuda1.py:256 pysollib/games/ultra/hexadeck.py:1190 #: pysollib/games/ultra/mughal.py:802 msgid " Ascending" msgstr "" -#: pysollib/games/braid.py:252 pysollib/games/napoleon.py:192 +#: pysollib/games/braid.py:253 pysollib/games/napoleon.py:192 #: pysollib/games/ultra/dashavatara.py:961 #: pysollib/games/ultra/hanafuda1.py:258 pysollib/games/ultra/hexadeck.py:1192 #: pysollib/games/ultra/mughal.py:804 @@ -707,20 +710,20 @@ msgstr "" msgid "X" msgstr "" -#: pysollib/games/fortythieves.py:393 pysollib/games/klondike.py:148 +#: pysollib/games/fortythieves.py:429 pysollib/games/klondike.py:148 msgid "Row. Build down in any suit but the same." msgstr "" -#: pysollib/games/golf.py:114 pysollib/games/golf.py:413 +#: pysollib/games/golf.py:114 pysollib/games/golf.py:414 #: pysollib/stack.py:1742 msgid "Row. No building." msgstr "" -#: pysollib/games/golf.py:381 +#: pysollib/games/golf.py:382 msgid "Balance $%4d" msgstr "" -#: pysollib/games/golf.py:497 pysollib/stack.py:1675 +#: pysollib/games/golf.py:498 pysollib/stack.py:1675 msgid "Foundation. Build up regardless of suit." msgstr "" @@ -728,7 +731,7 @@ msgstr "" msgid "Balance $%d" msgstr "" -#: pysollib/games/klondike.py:391 +#: pysollib/games/klondike.py:388 msgid "Reserve. Only Kings are acceptable." msgstr "" @@ -1772,11 +1775,11 @@ msgid "Status" msgstr "" #: pysollib/stats.py:162 pysollib/tk/statusbar.py:137 -#: pysollib/tk/tkstats.py:733 +#: pysollib/tk/tkstats.py:735 msgid "Game number" msgstr "" -#: pysollib/stats.py:162 pysollib/tk/tkstats.py:736 +#: pysollib/stats.py:162 pysollib/tk/tkstats.py:738 msgid "Started at" msgstr "" @@ -1969,7 +1972,7 @@ msgstr "" msgid "&Hold and quit" msgstr "" -#: pysollib/tk/menubar.py:271 pysollib/tk/selectgame.py:409 +#: pysollib/tk/menubar.py:271 pysollib/tk/selectgame.py:417 msgid "&Select" msgstr "" @@ -2170,7 +2173,7 @@ msgid "Shade &legal moves" msgstr "" #: pysollib/tk/menubar.py:356 -msgid "&Negative card bottom" +msgid "&Negative cards bottom" msgstr "" #: pysollib/tk/menubar.py:357 @@ -2234,87 +2237,91 @@ msgid "Show &help bar" msgstr "" #: pysollib/tk/menubar.py:375 -msgid "&Demo logo" +msgid "Save games &geometry" msgstr "" #: pysollib/tk/menubar.py:376 +msgid "&Demo logo" +msgstr "" + +#: pysollib/tk/menubar.py:377 msgid "Startup splash sc&reen" msgstr "" -#: pysollib/tk/menubar.py:380 +#: pysollib/tk/menubar.py:381 msgid "&Help" msgstr "" -#: pysollib/tk/menubar.py:381 +#: pysollib/tk/menubar.py:382 msgid "&Contents" msgstr "" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:383 msgid "&How to play" msgstr "" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:384 msgid "&Rules for this game" msgstr "" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:385 msgid "&License terms" msgstr "" -#: pysollib/tk/menubar.py:387 +#: pysollib/tk/menubar.py:388 msgid "&About " msgstr "" -#: pysollib/tk/menubar.py:495 +#: pysollib/tk/menubar.py:496 msgid "All &games..." msgstr "" -#: pysollib/tk/menubar.py:496 +#: pysollib/tk/menubar.py:497 msgid "Playable pre&view..." msgstr "" -#: pysollib/tk/menubar.py:498 +#: pysollib/tk/menubar.py:499 msgid "&Popular games" msgstr "" -#: pysollib/tk/menubar.py:501 +#: pysollib/tk/menubar.py:502 msgid "&French games" msgstr "" -#: pysollib/tk/menubar.py:504 +#: pysollib/tk/menubar.py:505 msgid "&Mahjongg games" msgstr "" -#: pysollib/tk/menubar.py:507 +#: pysollib/tk/menubar.py:508 msgid "&Oriental games" msgstr "" -#: pysollib/tk/menubar.py:511 +#: pysollib/tk/menubar.py:512 msgid "&Special games" msgstr "" -#: pysollib/tk/menubar.py:515 +#: pysollib/tk/menubar.py:516 msgid "All games by name" msgstr "" -#: pysollib/tk/menubar.py:852 pysollib/tk/menubar.py:854 +#: pysollib/tk/menubar.py:849 pysollib/tk/menubar.py:851 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "" -#: pysollib/tk/menubar.py:854 +#: pysollib/tk/menubar.py:851 msgid "&Info..." msgstr "" -#: pysollib/tk/menubar.py:857 +#: pysollib/tk/menubar.py:854 msgid "Select " msgstr "" -#: pysollib/tk/menubar.py:917 +#: pysollib/tk/menubar.py:915 msgid "Select table background" msgstr "" -#: pysollib/tk/menubar.py:929 pysollib/tk/selecttile.py:177 +#: pysollib/tk/menubar.py:927 pysollib/tk/selecttile.py:177 msgid "Select table color" msgstr "" @@ -2397,7 +2404,7 @@ msgstr "" msgid "About cardset" msgstr "" -#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:367 +#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:374 msgid "Type:" msgstr "" @@ -2466,180 +2473,208 @@ msgid "Mahjongg Games" msgstr "" #: pysollib/tk/selectgame.py:178 -msgid "by Game Feature" +msgid "by Skill Level" msgstr "" -#: pysollib/tk/selectgame.py:179 -msgid "by Number of Cards" +#: pysollib/tk/selectgame.py:179 pysollib/tk/selectgame.py:546 +msgid "Luck only" msgstr "" -#: pysollib/tk/selectgame.py:180 -msgid "32 cards" +#: pysollib/tk/selectgame.py:180 pysollib/tk/selectgame.py:547 +msgid "Mostly luck" msgstr "" -#: pysollib/tk/selectgame.py:181 -msgid "48 cards" +#: pysollib/tk/selectgame.py:181 pysollib/tk/selectgame.py:548 +msgid "Balanced" msgstr "" -#: pysollib/tk/selectgame.py:182 -msgid "52 cards" +#: pysollib/tk/selectgame.py:182 pysollib/tk/selectgame.py:549 +msgid "Mostly skill" msgstr "" -#: pysollib/tk/selectgame.py:183 -msgid "64 cards" -msgstr "" - -#: pysollib/tk/selectgame.py:184 -msgid "78 cards" +#: pysollib/tk/selectgame.py:183 pysollib/tk/selectgame.py:550 +msgid "Skill only" msgstr "" #: pysollib/tk/selectgame.py:185 -msgid "104 cards" +msgid "by Game Feature" msgstr "" #: pysollib/tk/selectgame.py:186 -msgid "144 cards" +msgid "by Number of Cards" msgstr "" #: pysollib/tk/selectgame.py:187 -msgid "Other number" +msgid "32 cards" +msgstr "" + +#: pysollib/tk/selectgame.py:188 +msgid "48 cards" msgstr "" #: pysollib/tk/selectgame.py:189 -msgid "by Number of Decks" +msgid "52 cards" msgstr "" #: pysollib/tk/selectgame.py:190 -msgid "1 deck games" +msgid "64 cards" msgstr "" #: pysollib/tk/selectgame.py:191 -msgid "2 deck games" +msgid "78 cards" msgstr "" #: pysollib/tk/selectgame.py:192 -msgid "3 deck games" +msgid "104 cards" msgstr "" #: pysollib/tk/selectgame.py:193 -msgid "4 deck games" +msgid "144 cards" msgstr "" -#: pysollib/tk/selectgame.py:195 -msgid "by Number of Redeals" +#: pysollib/tk/selectgame.py:194 +msgid "Other number" msgstr "" #: pysollib/tk/selectgame.py:196 -msgid "No redeal" +msgid "by Number of Decks" msgstr "" #: pysollib/tk/selectgame.py:197 -msgid "1 redeal" +msgid "1 deck games" msgstr "" #: pysollib/tk/selectgame.py:198 -msgid "2 redeals" +msgid "2 deck games" msgstr "" #: pysollib/tk/selectgame.py:199 -msgid "3 redeals" +msgid "3 deck games" msgstr "" #: pysollib/tk/selectgame.py:200 -msgid "Unlimited redeals" +msgid "4 deck games" msgstr "" #: pysollib/tk/selectgame.py:202 -msgid "Other number of redeals" +msgid "by Number of Redeals" +msgstr "" + +#: pysollib/tk/selectgame.py:203 +msgid "No redeal" +msgstr "" + +#: pysollib/tk/selectgame.py:204 +msgid "1 redeal" +msgstr "" + +#: pysollib/tk/selectgame.py:205 +msgid "2 redeals" +msgstr "" + +#: pysollib/tk/selectgame.py:206 +msgid "3 redeals" msgstr "" #: pysollib/tk/selectgame.py:207 -msgid "Other Categories" -msgstr "" - -#: pysollib/tk/selectgame.py:208 -msgid "Games for Children (very easy)" +msgid "Unlimited redeals" msgstr "" #: pysollib/tk/selectgame.py:209 +msgid "Other number of redeals" +msgstr "" + +#: pysollib/tk/selectgame.py:214 +msgid "Other Categories" +msgstr "" + +#: pysollib/tk/selectgame.py:215 +msgid "Games for Children (very easy)" +msgstr "" + +#: pysollib/tk/selectgame.py:216 msgid "Games with Scoring" msgstr "" -#: pysollib/tk/selectgame.py:210 +#: pysollib/tk/selectgame.py:217 msgid "Games with Separate Decks" msgstr "" -#: pysollib/tk/selectgame.py:211 +#: pysollib/tk/selectgame.py:218 msgid "Open Games (all cards visible)" msgstr "" -#: pysollib/tk/selectgame.py:212 +#: pysollib/tk/selectgame.py:219 msgid "Relaxed Variants" msgstr "" -#: pysollib/tk/selectgame.py:351 +#: pysollib/tk/selectgame.py:358 msgid "About game" msgstr "" -#: pysollib/tk/selectgame.py:364 +#: pysollib/tk/selectgame.py:371 msgid "Name:" msgstr "" -#: pysollib/tk/selectgame.py:365 +#: pysollib/tk/selectgame.py:372 msgid "Alternate names:" msgstr "" -#: pysollib/tk/selectgame.py:366 +#: pysollib/tk/selectgame.py:373 msgid "Category:" msgstr "" -#: pysollib/tk/selectgame.py:368 +#: pysollib/tk/selectgame.py:375 +msgid "Skill level:" +msgstr "" + +#: pysollib/tk/selectgame.py:376 msgid "Decks:" msgstr "" -#: pysollib/tk/selectgame.py:369 +#: pysollib/tk/selectgame.py:377 msgid "Redeals:" msgstr "" -#: pysollib/tk/selectgame.py:371 +#: pysollib/tk/selectgame.py:379 msgid "Played:" msgstr "" -#: pysollib/tk/selectgame.py:372 pysollib/tk/tkstats.py:111 +#: pysollib/tk/selectgame.py:380 pysollib/tk/tkstats.py:111 #: pysollib/tk/tkstats.py:163 msgid "Won:" msgstr "" -#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:112 +#: pysollib/tk/selectgame.py:381 pysollib/tk/tkstats.py:112 #: pysollib/tk/tkstats.py:164 msgid "Lost:" msgstr "" -#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:803 +#: pysollib/tk/selectgame.py:382 pysollib/tk/tkstats.py:805 msgid "Playing time:" msgstr "" -#: pysollib/tk/selectgame.py:375 pysollib/tk/tkstats.py:810 +#: pysollib/tk/selectgame.py:383 pysollib/tk/tkstats.py:812 msgid "Moves:" msgstr "" -#: pysollib/tk/selectgame.py:376 +#: pysollib/tk/selectgame.py:384 msgid "% won:" msgstr "" -#: pysollib/tk/selectgame.py:409 +#: pysollib/tk/selectgame.py:417 msgid "&Rules" msgstr "" -#: pysollib/tk/selectgame.py:489 +#: pysollib/tk/selectgame.py:497 msgid "Playable Preview - " msgstr "" -#: pysollib/tk/selectgame.py:537 +#: pysollib/tk/selectgame.py:553 msgid "variable" msgstr "" -#: pysollib/tk/selectgame.py:538 +#: pysollib/tk/selectgame.py:554 msgid "unlimited" msgstr "" @@ -2671,39 +2706,111 @@ msgstr "" msgid "&Solid color..." msgstr "" -#: pysollib/tk/soundoptionsdialog.py:111 +#: pysollib/tk/soundoptionsdialog.py:77 +msgid "Are You Sure" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:79 +msgid "Deal" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:80 +msgid "Deal waste" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:82 +msgid "Turn waste" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:83 +msgid "Start drag" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:85 +msgid "Drop" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:86 +msgid "Drop pair" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:87 +msgid "Auto drop" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:89 +msgid "Flip" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:90 +msgid "Auto flip" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:91 +msgid "Move" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:92 +msgid "No move" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:94 pysollib/tk/toolbar.py:189 +msgid "Undo" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:95 pysollib/tk/toolbar.py:190 +msgid "Redo" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:97 +msgid "Autopilot lost" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:98 +msgid "Autopilot won" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:101 +msgid "Game lost" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:103 +msgid "Perfect game" +msgstr "" + +#: pysollib/tk/soundoptionsdialog.py:113 msgid "Sound enabled" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:117 +#: pysollib/tk/soundoptionsdialog.py:119 msgid "Use DirectX for sound playing" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:123 +#: pysollib/tk/soundoptionsdialog.py:125 msgid "Sample volume:" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:131 +#: pysollib/tk/soundoptionsdialog.py:133 msgid "Music volume:" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:144 +#: pysollib/tk/soundoptionsdialog.py:146 msgid "Enable samles" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:169 +#: pysollib/tk/soundoptionsdialog.py:171 msgid "&Apply" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:169 pysollib/tk/soundoptionsdialog.py:171 +#: pysollib/tk/soundoptionsdialog.py:171 pysollib/tk/soundoptionsdialog.py:173 msgid "&Mixer..." msgstr "" -#: pysollib/tk/soundoptionsdialog.py:220 +#: pysollib/tk/soundoptionsdialog.py:222 msgid "Sound preferences info" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:221 +#: pysollib/tk/soundoptionsdialog.py:223 msgid "" "Changing DirectX settings will take effect\n" "the next time you restart " @@ -2753,23 +2860,23 @@ msgstr "" msgid "Text only" msgstr "" -#: pysollib/tk/tkhtml.py:229 +#: pysollib/tk/tkhtml.py:230 msgid "Index" msgstr "" -#: pysollib/tk/tkhtml.py:233 +#: pysollib/tk/tkhtml.py:234 msgid "Back" msgstr "" -#: pysollib/tk/tkhtml.py:237 +#: pysollib/tk/tkhtml.py:238 msgid "Forward" msgstr "" -#: pysollib/tk/tkhtml.py:241 +#: pysollib/tk/tkhtml.py:242 msgid "Close" msgstr "" -#: pysollib/tk/tkhtml.py:347 +#: pysollib/tk/tkhtml.py:360 msgid "" " HTML limitation:\n" "The %s protocol is not supported yet.\n" @@ -2779,7 +2886,7 @@ msgid "" "%s\n" msgstr "" -#: pysollib/tk/tkhtml.py:372 pysollib/tk/tkhtml.py:376 +#: pysollib/tk/tkhtml.py:385 pysollib/tk/tkhtml.py:389 msgid "" "Unable to service request:\n" msgstr "" @@ -2808,142 +2915,142 @@ msgstr "" msgid "&Reset..." msgstr "" -#: pysollib/tk/tkstats.py:572 pysollib/tk/tkstats.py:645 -#: pysollib/tk/tkstats.py:661 +#: pysollib/tk/tkstats.py:574 pysollib/tk/tkstats.py:647 +#: pysollib/tk/tkstats.py:663 msgid "&Save to file" msgstr "" -#: pysollib/tk/tkstats.py:573 +#: pysollib/tk/tkstats.py:575 msgid "&Reset all..." msgstr "" -#: pysollib/tk/tkstats.py:623 +#: pysollib/tk/tkstats.py:625 msgid "No entries for player " msgstr "" -#: pysollib/tk/tkstats.py:640 +#: pysollib/tk/tkstats.py:642 msgid "" "No log entries for %s\n" msgstr "" -#: pysollib/tk/tkstats.py:645 +#: pysollib/tk/tkstats.py:647 msgid "Session &log..." msgstr "" -#: pysollib/tk/tkstats.py:656 +#: pysollib/tk/tkstats.py:658 msgid "" "No current session log entries for %s\n" msgstr "" -#: pysollib/tk/tkstats.py:661 +#: pysollib/tk/tkstats.py:663 msgid "&Full log..." msgstr "" -#: pysollib/tk/tkstats.py:676 +#: pysollib/tk/tkstats.py:678 msgid "Highlight piles: " msgstr "" -#: pysollib/tk/tkstats.py:677 +#: pysollib/tk/tkstats.py:679 msgid "Highlight cards: " msgstr "" -#: pysollib/tk/tkstats.py:678 +#: pysollib/tk/tkstats.py:680 msgid "Highlight same rank: " msgstr "" -#: pysollib/tk/tkstats.py:681 +#: pysollib/tk/tkstats.py:683 msgid "" "\n" "Redeals: " msgstr "" -#: pysollib/tk/tkstats.py:682 +#: pysollib/tk/tkstats.py:684 msgid "" "\n" "Cards in Talon: " msgstr "" -#: pysollib/tk/tkstats.py:684 +#: pysollib/tk/tkstats.py:686 msgid "" "\n" "Cards in Waste: " msgstr "" -#: pysollib/tk/tkstats.py:686 +#: pysollib/tk/tkstats.py:688 msgid "" "\n" "Cards in Foundations: " msgstr "" -#: pysollib/tk/tkstats.py:689 +#: pysollib/tk/tkstats.py:691 msgid "Game status" msgstr "" -#: pysollib/tk/tkstats.py:692 +#: pysollib/tk/tkstats.py:694 msgid "Playing time: " msgstr "" -#: pysollib/tk/tkstats.py:693 +#: pysollib/tk/tkstats.py:695 msgid "Started at: " msgstr "" -#: pysollib/tk/tkstats.py:694 +#: pysollib/tk/tkstats.py:696 msgid "Moves: " msgstr "" -#: pysollib/tk/tkstats.py:695 +#: pysollib/tk/tkstats.py:697 msgid "Undo moves: " msgstr "" -#: pysollib/tk/tkstats.py:696 +#: pysollib/tk/tkstats.py:698 msgid "Bookmark moves: " msgstr "" -#: pysollib/tk/tkstats.py:697 +#: pysollib/tk/tkstats.py:699 msgid "Demo moves: " msgstr "" -#: pysollib/tk/tkstats.py:698 +#: pysollib/tk/tkstats.py:700 msgid "Total player moves: " msgstr "" -#: pysollib/tk/tkstats.py:699 +#: pysollib/tk/tkstats.py:701 msgid "Total moves in this game: " msgstr "" -#: pysollib/tk/tkstats.py:700 +#: pysollib/tk/tkstats.py:702 msgid "Hints: " msgstr "" -#: pysollib/tk/tkstats.py:704 +#: pysollib/tk/tkstats.py:706 msgid "&Statistics..." msgstr "" -#: pysollib/tk/tkstats.py:730 +#: pysollib/tk/tkstats.py:732 msgid "N" msgstr "" -#: pysollib/tk/tkstats.py:739 +#: pysollib/tk/tkstats.py:741 msgid "Result" msgstr "" -#: pysollib/tk/tkstats.py:795 +#: pysollib/tk/tkstats.py:797 msgid "Minimum" msgstr "" -#: pysollib/tk/tkstats.py:796 +#: pysollib/tk/tkstats.py:798 msgid "Maximum" msgstr "" -#: pysollib/tk/tkstats.py:797 +#: pysollib/tk/tkstats.py:799 msgid "Average" msgstr "" -#: pysollib/tk/tkstats.py:817 +#: pysollib/tk/tkstats.py:819 msgid "Total moves:" msgstr "" -#: pysollib/tk/tkstats.py:848 +#: pysollib/tk/tkstats.py:850 msgid "No TOP for this game" msgstr "" @@ -2979,18 +3086,10 @@ msgstr "" msgid "Save game" msgstr "" -#: pysollib/tk/toolbar.py:189 -msgid "Undo" -msgstr "" - #: pysollib/tk/toolbar.py:189 msgid "Undo last move" msgstr "" -#: pysollib/tk/toolbar.py:190 -msgid "Redo" -msgstr "" - #: pysollib/tk/toolbar.py:190 msgid "Redo last move" msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 27c7930e..4a1a6dc5 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sun Jun 11 10:16:06 2006\n" -"PO-Revision-Date: 2006-06-18 11:28+0400\n" +"POT-Creation-Date: Sat Jun 24 16:07:12 2006\n" +"PO-Revision-Date: 2006-06-24 18:11+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -61,7 +61,10 @@ msgid "Achtmal Acht" msgstr "" msgid "Acme" -msgstr "" +msgstr "Высшая точка" + +msgid "Acquaintance" +msgstr "Знакомство" msgid "Agnes Bernauer" msgstr "Агнесса Берно" @@ -87,6 +90,9 @@ msgstr "Алжирский пасьянс (3 колоды)" msgid "Alhambra" msgstr "Алхамбра" +msgid "Ali Baba" +msgstr "Али Баба" + msgid "All in a Row" msgstr "" @@ -114,6 +120,9 @@ msgstr "" msgid "Aqab's" msgstr "" +msgid "Arabella" +msgstr "Арабелла" + msgid "Arachnida" msgstr "" @@ -145,7 +154,7 @@ msgid "Auld Lang Syne" msgstr "Старые добрые времена" msgid "Aunt Mary" -msgstr "" +msgstr "Тётя Мери" msgid "Australian Patience" msgstr "Австралийский пасьянс" @@ -206,6 +215,15 @@ msgstr "Бельведер" msgid "Betsy Ross" msgstr "Бетси Росс" +msgid "Big Braid" +msgstr "Большая коса" + +msgid "Big Cell" +msgstr "Большая Ячейка" + +msgid "Big Courtyard" +msgstr "Большой Внутренний двор" + #, fuzzy msgid "Big Easy" msgstr "Большая арфа" @@ -217,6 +235,10 @@ msgstr "Большой Летящий Дракон" msgid "Big Forty" msgstr "Форт" +#, fuzzy +msgid "Big Ground" +msgstr "Большая гора" + msgid "Big Harp" msgstr "Большая арфа" @@ -235,10 +257,16 @@ msgstr "Большой Паук (1 масть)" msgid "Big Spider (2 suits)" msgstr "Большой Паук (2 масти)" +msgid "Big Streets" +msgstr "Большие Улицы" + #, fuzzy msgid "Big Sumo" msgstr "Большая дыра" +msgid "Big York" +msgstr "Большой Йорк" + msgid "Bim Bom" msgstr "Бим-Бом" @@ -287,9 +315,8 @@ msgstr "" msgid "Braid" msgstr "Коса" -#, fuzzy msgid "Bridesmaids" -msgstr "Коса" +msgstr "Подружки невесты" msgid "Bridge" msgstr "Мост" @@ -356,6 +383,9 @@ msgstr "Пленённые королевы" msgid "Carlton" msgstr "Карлтон" +msgid "Carnation" +msgstr "Гвоздика" + msgid "Carpet" msgstr "Ковёр" @@ -368,9 +398,15 @@ msgstr "Карфаген" msgid "Casino Klondike" msgstr "Казино Клондайк" +msgid "Cassim" +msgstr "" + msgid "Castle" msgstr "Замок" +msgid "Castle Mount" +msgstr "Горный Замок" + msgid "Castle of Indolence" msgstr "Замок праздности" @@ -387,7 +423,7 @@ msgid "Cavalier" msgstr "Рыцарь" msgid "Cell 11" -msgstr "" +msgstr "Ячейка 11" msgid "Ceremonial" msgstr "Церемониал" @@ -471,6 +507,10 @@ msgstr "Виток" msgid "Corkscrew" msgstr "Штопор" +#, fuzzy +msgid "Corner Suite" +msgstr "Углы" + msgid "Corners" msgstr "Углы" @@ -498,6 +538,10 @@ msgstr "Купол" msgid "Curds and Whey" msgstr "Творог и сыворотка" +#, fuzzy +msgid "Czarina" +msgstr "Мария" + #, fuzzy msgid "Danda" msgstr "Алмаз" @@ -518,6 +562,10 @@ msgstr "Глубокий" msgid "Deep Well" msgstr "Глубокий колодец" +#, fuzzy +msgid "Demon" +msgstr "Алмаз" + msgid "Der Katzenschwanz" msgstr "" @@ -569,6 +617,9 @@ msgstr "" msgid "Die kleine Harfe" msgstr "" +msgid "Dieppe" +msgstr "" + msgid "Diplomat" msgstr "Дипломат" @@ -639,10 +690,18 @@ msgstr "Двойной Маджонг Два квадрата" msgid "Double Rail" msgstr "Двойные рельсы" +#, fuzzy +msgid "Double Russian Solitaire" +msgstr "Русский солитер" + #, fuzzy msgid "Double Samuri" msgstr "Двойные рельсы" +#, fuzzy +msgid "Double Scorpion" +msgstr "Двойные рельсы" + #, fuzzy msgid "Double Your Fun" msgstr "Двойной Юкон" @@ -713,6 +772,9 @@ msgstr "Восемь квадратов" msgid "Eight Times Eight" msgstr "Восемь раз по восемь" +msgid "Elba" +msgstr "Ельба" + msgid "Elevator" msgstr "Лифт" @@ -735,6 +797,9 @@ msgstr "Мария" msgid "Excuse" msgstr "" +msgid "Express" +msgstr "Экспресс" + msgid "Eye" msgstr "Глаз" @@ -934,6 +999,9 @@ msgstr "Происхождение" msgid "Genesis +" msgstr "Происхождение +" +msgid "Geoffrey" +msgstr "Джефри" + msgid "German Patience" msgstr "Германский пасьянс" @@ -967,9 +1035,8 @@ msgstr "Полная мера" msgid "Grampus" msgstr "Касатка" -#, fuzzy msgid "Granada" -msgstr "Алмаз" +msgstr "Гранада" msgid "Grandfather" msgstr "Дедушка" @@ -998,12 +1065,6 @@ msgstr "Грифон" msgid "Ground for a Divorce" msgstr "Повод для разрыва" -msgid "Ground for a Divorce (3 decks)" -msgstr "Повод для разрыва (3 колоды)" - -msgid "Ground for a Divorce (4 decks)" -msgstr "Повод для разрыва (4 колоды)" - msgid "Gypsy" msgstr "Цыганский" @@ -1020,6 +1081,10 @@ msgstr "Половинный Маджонг Улыбка" msgid "Half Mahjongg Wall" msgstr "Половинный Маджонг Стена" +#, fuzzy +msgid "Hanafuda Four Seasons" +msgstr "Четыре сезона" + msgid "Hanoi Puzzle 4" msgstr "Ханойская головоломка 4" @@ -1101,6 +1166,10 @@ msgstr "Пять тузов" msgid "IloveU" msgstr "" +#, fuzzy +msgid "Imperial Guards" +msgstr "Имперские козыри" + msgid "Imperial Trumps" msgstr "Имперские козыри" @@ -1120,6 +1189,9 @@ msgstr "Индийский пасьянс" msgid "Inner Circle" msgstr "Внутренний круг" +msgid "Inquisitor" +msgstr "Инквизитор" + msgid "Intelligence" msgstr "Смекалка" @@ -1234,6 +1306,9 @@ msgstr "Клондайк по три" msgid "Km" msgstr "" +msgid "Knotty Nines" +msgstr "" + msgid "Krebs" msgstr "" @@ -1307,6 +1382,10 @@ msgstr "Лабиринт" msgid "Lady Betty" msgstr "Леди Бетти" +#, fuzzy +msgid "Lady Jane" +msgstr "Леди Полк" + msgid "Lady Palk" msgstr "Леди Полк" @@ -1344,6 +1423,9 @@ msgstr "Короткая коса" msgid "Lexington Harp" msgstr "Лексингтонская арфа" +msgid "Lightweight" +msgstr "Лёгкий" + msgid "Lily" msgstr "Лили" @@ -1367,6 +1449,10 @@ msgstr "Малые ворота" msgid "Little Gate" msgstr "Малые ворота" +#, fuzzy +msgid "Little Napoleon" +msgstr "Свободный Наполеон" + msgid "Long Braid" msgstr "Долгая коса" @@ -1382,6 +1468,9 @@ msgstr "Потеря" msgid "Lucas" msgstr "Лукас" +msgid "Madame" +msgstr "Мадам" + #, fuzzy msgid "Mage's Game" msgstr "Бабушкина игра" @@ -1942,6 +2031,9 @@ msgstr "Мария" msgid "Maria Luisa" msgstr "Мария Луиза" +msgid "Marie Rose" +msgstr "Мари Роз" + msgid "Martha" msgstr "Марта" @@ -1988,6 +2080,10 @@ msgstr "" msgid "Midshipman" msgstr "Гардемарин" +#, fuzzy +msgid "Millie" +msgstr "Ячейка Миллиган" + msgid "Milligan Cell" msgstr "Ячейка Миллиган" @@ -2048,6 +2144,10 @@ msgstr "Мотылёк" msgid "Mount Olympus" msgstr "Гора Олимп" +#, fuzzy +msgid "Moving Left" +msgstr "Движение влево" + msgid "Mrs. Mop" msgstr "Миссис Моп" @@ -2068,6 +2168,9 @@ msgstr "Джунгли" msgid "Musical Patience" msgstr "Музыкальный пасьянс" +msgid "Mystique" +msgstr "Мистика" + #, fuzzy msgid "N for Namida" msgstr "Маджонг N for Namida" @@ -2137,9 +2240,17 @@ msgstr "Северо-Западные Территории" msgid "Number Ten" msgstr "Номер десять" +#, fuzzy +msgid "Number Twelve" +msgstr "Номер десять" + msgid "Numerica" msgstr "Числовой" +#, fuzzy +msgid "Ocean Towers" +msgstr "Морские башни" + msgid "Octagon" msgstr "Восьмиугольник" @@ -2274,6 +2385,10 @@ msgstr "Перпетуум-мобиле" msgid "Perseverance" msgstr "Настойчивость" +#, fuzzy +msgid "Phantom Blockade" +msgstr "Блокада" + msgid "Phoenix" msgstr "Феникс" @@ -2525,6 +2640,10 @@ msgstr "" msgid "Sanibel" msgstr "Санибел" +#, fuzzy +msgid "Saratoga" +msgstr "Звёздные врата" + msgid "Scarab" msgstr "Скарабей" @@ -2594,7 +2713,7 @@ msgid "Shield" msgstr "Щит" msgid "Shifting" -msgstr "" +msgstr "Изменчивый" msgid "Shisen-Sho (No Gra) 14x6" msgstr "" @@ -2620,6 +2739,9 @@ msgstr "Сиам" msgid "Sieben bis As" msgstr "" +msgid "Signora" +msgstr "Синьора" + msgid "Simon Jester" msgstr "Саймон Джестер" @@ -2681,6 +2803,10 @@ msgstr "Два квадрата" msgid "Somerset" msgstr "Сомерсет" +#, fuzzy +msgid "Souter" +msgstr "Петух" + msgid "Space Bridge" msgstr "Космический мост" @@ -2728,6 +2854,10 @@ msgstr "Паучок" msgid "Spidike" msgstr "Паук" +#, fuzzy +msgid "Spike" +msgstr "Паук" + msgid "Squadron" msgstr "Эскадрон" @@ -2774,9 +2904,11 @@ msgstr "Звёздные врата" msgid "Step Pyramid" msgstr "Семь пирамид" -#, fuzzy msgid "Steps" -msgstr "Улицы" +msgstr "Шаги" + +msgid "Steve" +msgstr "Стив" msgid "Stonehenge" msgstr "Стоунхендж" @@ -2790,6 +2922,10 @@ msgstr "Сокровищница" msgid "Straight Up" msgstr "" +#, fuzzy +msgid "Strategerie" +msgstr "Стратегия" + msgid "Strategy" msgstr "Стратегия" @@ -2842,6 +2978,9 @@ msgstr "Сюрприз" msgid "Surukh" msgstr "" +msgid "Sweet Sixteen" +msgstr "" + msgid "Taipei" msgstr "Тайпей" @@ -3002,12 +3141,19 @@ msgstr "Тройной Клондайк по три" msgid "Triple Line" msgstr "Тройная линия" -msgid "Triple York" -msgstr "Тройной Йорк" +msgid "Triple Russian Solitaire" +msgstr "Тройной Русский солитер" + +msgid "Triple Scorpion" +msgstr "Тройной Скорпион" msgid "Triple Yukon" msgstr "Тройной Юкон" +#, fuzzy +msgid "Trusty Twelve" +msgstr "Сорок разбойников" + msgid "Twenty" msgstr "Двенадцать" @@ -3036,7 +3182,7 @@ msgid "Union Square" msgstr "Два квадрата" msgid "Vagues" -msgstr "" +msgstr "Смутный" msgid "Vajra" msgstr "" @@ -3058,6 +3204,9 @@ msgstr "Казино Клондайк" msgid "Vertical" msgstr "Вертикаль" +msgid "Very Big Ground" +msgstr "" + msgid "Vi" msgstr "" @@ -3065,6 +3214,14 @@ msgstr "" msgid "Victory Arrow" msgstr "Маджонг Victory Arrow" +#, fuzzy +msgid "Wake-Robin" +msgstr "Робин" + +#, fuzzy +msgid "Wake-Robin (3 decks)" +msgstr "Церлин (3 колоды)" + msgid "Wall" msgstr "Стена" @@ -3112,6 +3269,10 @@ msgstr "Колесо фортуны" msgid "Whitehead" msgstr "" +#, fuzzy +msgid "Whitehorse" +msgstr "Риттенхаус" + msgid "Wicked" msgstr "Злой" @@ -3156,6 +3317,19 @@ msgstr "Церлин (3 колоды)" msgid "Zeus" msgstr "Зевс" +#, fuzzy +msgid "Zodiac" +msgstr "Скандинавский" + +#~ msgid "Ground for a Divorce (3 decks)" +#~ msgstr "Повод для разрыва (3 колоды)" + +#~ msgid "Ground for a Divorce (4 decks)" +#~ msgstr "Повод для разрыва (4 колоды)" + +#~ msgid "Triple York" +#~ msgstr "Тройной Йорк" + #, fuzzy #~ msgid "Adelaide" #~ msgstr "Аделаида" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 85412367..f5678d1b 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sun Jun 11 10:16:01 2006\n" -"PO-Revision-Date: 2006-06-20 01:10+0400\n" +"POT-Creation-Date: Sat Jun 24 16:07:07 2006\n" +"PO-Revision-Date: 2006-06-24 18:24+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -14,32 +14,32 @@ msgstr "" "Content-Transfer-Encoding: utf-8\n" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:344 pysollib/tk/toolbar.py:183 +#: pysollib/actions.py:346 pysollib/tk/toolbar.py:183 msgid "New game" msgstr "Новая игра" -#: pysollib/actions.py:357 pysollib/tk/menubar.py:665 -#: pysollib/tk/menubar.py:679 +#: pysollib/actions.py:359 pysollib/tk/menubar.py:666 +#: pysollib/tk/menubar.py:680 msgid "Select game" msgstr "Выбрать игру" -#: pysollib/actions.py:380 +#: pysollib/actions.py:382 msgid "Invalid game number" msgstr "Неправильный номер игры" -#: pysollib/actions.py:381 +#: pysollib/actions.py:383 msgid "Invalid game number\n" msgstr "Неправильный номер игры\n" -#: pysollib/actions.py:398 +#: pysollib/actions.py:400 msgid "Select next game number" msgstr "Выберите номер следующей игры" -#: pysollib/actions.py:407 pysollib/actions.py:417 +#: pysollib/actions.py:409 pysollib/actions.py:419 msgid "Select new game number" msgstr "Выберите номер новой игры" -#: pysollib/actions.py:408 +#: pysollib/actions.py:410 msgid "" "\n" "\n" @@ -49,70 +49,70 @@ msgstr "" "\n" "Введите номер новой игры" -#: pysollib/actions.py:409 +#: pysollib/actions.py:411 msgid "&Next number" msgstr "&Следующий номер" -#: pysollib/actions.py:409 pysollib/app.py:1118 pysollib/app.py:1130 -#: pysollib/game.py:830 pysollib/game.py:1644 pysollib/main.py:413 +#: pysollib/actions.py:411 pysollib/app.py:1113 pysollib/app.py:1125 +#: pysollib/game.py:837 pysollib/game.py:1651 pysollib/main.py:413 #: pysollib/main.py:421 pysollib/tk/colorsdialog.py:131 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 -#: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:133 +#: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:143 #: pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 -#: pysollib/tk/soundoptionsdialog.py:169 pysollib/tk/soundoptionsdialog.py:223 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:459 -#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:571 -#: pysollib/tk/tkstats.py:645 pysollib/tk/tkstats.py:661 -#: pysollib/tk/tkstats.py:703 pysollib/tk/tkstats.py:775 -#: pysollib/tk/tkstats.py:859 pysollib/tk/tkwidget.py:156 +#: pysollib/tk/soundoptionsdialog.py:171 pysollib/tk/soundoptionsdialog.py:225 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:474 +#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 +#: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 +#: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:777 +#: pysollib/tk/tkstats.py:861 pysollib/tk/tkwidget.py:156 #: pysollib/tk/tkwidget.py:320 msgid "&OK" msgstr "&ОК" -#: pysollib/actions.py:409 pysollib/app.py:1130 pysollib/game.py:830 -#: pysollib/game.py:1207 pysollib/game.py:1222 pysollib/game.py:1228 -#: pysollib/game.py:1233 pysollib/tk/colorsdialog.py:131 +#: pysollib/actions.py:411 pysollib/app.py:1125 pysollib/game.py:837 +#: pysollib/game.py:1214 pysollib/game.py:1229 pysollib/game.py:1235 +#: pysollib/game.py:1240 pysollib/tk/colorsdialog.py:131 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 -#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:852 -#: pysollib/tk/menubar.py:854 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:849 +#: pysollib/tk/menubar.py:851 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 -#: pysollib/tk/selectgame.py:268 pysollib/tk/selectgame.py:409 -#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:169 +#: pysollib/tk/selectgame.py:275 pysollib/tk/selectgame.py:417 +#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:171 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:320 msgid "&Cancel" msgstr "От&мена" -#: pysollib/actions.py:425 +#: pysollib/actions.py:427 msgid "Select random game" msgstr "Выбор случайной игры" -#: pysollib/actions.py:461 +#: pysollib/actions.py:463 msgid "Select next game" msgstr "Выбрать следующую игру" -#: pysollib/actions.py:494 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:496 pysollib/tk/toolbar.py:197 msgid "Quit " msgstr "Выйти из " -#: pysollib/actions.py:544 +#: pysollib/actions.py:546 msgid "Clear bookmarks" msgstr "Удалить закладки" -#: pysollib/actions.py:545 +#: pysollib/actions.py:547 msgid "Clear all bookmarks ?" msgstr "Удалить все закладки?" -#: pysollib/actions.py:555 +#: pysollib/actions.py:557 msgid "Restart game" msgstr "Начать игру с начала" -#: pysollib/actions.py:556 +#: pysollib/actions.py:558 msgid "Restart this game ?" msgstr "Начать игру с начала?" -#: pysollib/actions.py:593 +#: pysollib/actions.py:595 msgid "" "Comments for %s:\n" "\n" @@ -120,19 +120,19 @@ msgstr "" "Комментарий для %s:\n" "\n" -#: pysollib/actions.py:595 +#: pysollib/actions.py:597 msgid "Comments for " msgstr "Комментарий для " -#: pysollib/actions.py:613 pysollib/actions.py:649 +#: pysollib/actions.py:615 pysollib/actions.py:651 msgid "Error while writing to file" msgstr "Ошибка при записи в файл" -#: pysollib/actions.py:616 pysollib/actions.py:652 +#: pysollib/actions.py:618 pysollib/actions.py:654 msgid " Info" msgstr " Информация" -#: pysollib/actions.py:617 +#: pysollib/actions.py:619 msgid "" "Comments were appended to\n" "\n" @@ -140,15 +140,15 @@ msgstr "" "Комментарий добавлен в файл\n" "\n" -#: pysollib/actions.py:634 +#: pysollib/actions.py:636 msgid "Demo statistics" msgstr "Статистика демо" -#: pysollib/actions.py:637 +#: pysollib/actions.py:639 msgid "Your statistics" msgstr "Ваша статистика" -#: pysollib/actions.py:653 +#: pysollib/actions.py:655 msgid "" " were appended to\n" "\n" @@ -156,52 +156,52 @@ msgstr "" " добавлена в файл\n" "\n" -#: pysollib/actions.py:667 +#: pysollib/actions.py:669 msgid " Demo" msgstr " Демо" -#: pysollib/actions.py:667 +#: pysollib/actions.py:669 msgid " Demo " msgstr " Демо " -#: pysollib/actions.py:670 pysollib/actions.py:688 +#: pysollib/actions.py:672 pysollib/actions.py:690 msgid " for " msgstr " для " -#: pysollib/actions.py:676 pysollib/actions.py:695 +#: pysollib/actions.py:678 pysollib/actions.py:697 msgid "Statistics for " msgstr "Статистика игры " -#: pysollib/actions.py:679 pysollib/tk/selectgame.py:352 +#: pysollib/actions.py:681 pysollib/tk/selectgame.py:359 #: pysollib/tk/toolbar.py:194 msgid "Statistics" msgstr "Статистика" -#: pysollib/actions.py:682 +#: pysollib/actions.py:684 msgid "Full log" msgstr "Полный лог" -#: pysollib/actions.py:685 +#: pysollib/actions.py:687 msgid "Session log" msgstr "Лог сессии" -#: pysollib/actions.py:691 +#: pysollib/actions.py:693 msgid "Game Info" msgstr "Информация об игре" -#: pysollib/actions.py:700 +#: pysollib/actions.py:702 msgid "Full log for " msgstr "Полный лог для " -#: pysollib/actions.py:705 +#: pysollib/actions.py:707 msgid "Session log for " msgstr "Лог сессии для " -#: pysollib/actions.py:710 +#: pysollib/actions.py:712 msgid "Reset all statistics" msgstr "Очистить всю статистику" -#: pysollib/actions.py:711 +#: pysollib/actions.py:713 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" @@ -209,11 +209,11 @@ msgstr "" "Очистить всю статистику и лог для игрока\n" "%s?" -#: pysollib/actions.py:717 +#: pysollib/actions.py:719 msgid "Reset game statistics" msgstr "Очистить статистику игры" -#: pysollib/actions.py:718 +#: pysollib/actions.py:720 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -225,51 +225,51 @@ msgstr "" "и игры\n" "%s?" -#: pysollib/actions.py:774 +#: pysollib/actions.py:776 msgid "Play demo" msgstr "Показать демо" -#: pysollib/actions.py:785 +#: pysollib/actions.py:787 msgid "Set player options" msgstr "Установить настройки игрока" -#: pysollib/actions.py:874 +#: pysollib/actions.py:876 msgid "Sound settings" msgstr "Настройка звука" -#: pysollib/actions.py:895 +#: pysollib/actions.py:897 msgid "Set colors" msgstr "Настроить цвета" -#: pysollib/actions.py:914 +#: pysollib/actions.py:916 msgid "Set fonts" msgstr "Настроить шрифт" -#: pysollib/actions.py:923 +#: pysollib/actions.py:925 msgid "Set timeouts" msgstr "Настроить таймауты" -#: pysollib/app.py:86 +#: pysollib/app.py:85 msgid "Unknown" msgstr "Неизвестный" -#: pysollib/app.py:980 +#: pysollib/app.py:975 msgid "Loading %s %s..." msgstr "Загружается %s %s..." -#: pysollib/app.py:1015 +#: pysollib/app.py:1010 msgid " load error" msgstr " ошибка при загрузке" -#: pysollib/app.py:1016 +#: pysollib/app.py:1011 msgid "Error while loading " msgstr "Ошибка при загрузке" -#: pysollib/app.py:1110 +#: pysollib/app.py:1105 msgid "Incompatible " msgstr "Несовместимый " -#: pysollib/app.py:1112 +#: pysollib/app.py:1107 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -283,19 +283,19 @@ msgstr "" "\n" "Необходимо выбрать %s типа %s.\n" -#: pysollib/app.py:1128 +#: pysollib/app.py:1123 msgid "Please select a %s type %s" msgstr "Выберите %s типа %s" -#: pysollib/game.py:750 pysollib/game.py:756 +#: pysollib/game.py:756 pysollib/game.py:762 msgid "Player\n" msgstr "Игрок\n" -#: pysollib/game.py:826 +#: pysollib/game.py:833 msgid "Discard current game ?" msgstr "Завершить текущую игру?" -#: pysollib/game.py:1161 +#: pysollib/game.py:1168 msgid "" "\n" "You have reached\n" @@ -305,7 +305,7 @@ msgstr "" "Вы достигли\n" "#%d в %s игрового времени" -#: pysollib/game.py:1164 +#: pysollib/game.py:1171 msgid "" "\n" "and #%d in the %s of moves" @@ -313,7 +313,7 @@ msgstr "" "\n" "и #%d в %s количества ходов" -#: pysollib/game.py:1166 +#: pysollib/game.py:1173 msgid "" "\n" "You have reached\n" @@ -323,7 +323,7 @@ msgstr "" "Вы достигли\n" "#%d в %s количества ходов" -#: pysollib/game.py:1169 +#: pysollib/game.py:1176 msgid "" "\n" "and #%d in the %s of total moves" @@ -331,7 +331,7 @@ msgstr "" "\n" "и #%d в %s общего количества ходов" -#: pysollib/game.py:1171 +#: pysollib/game.py:1178 msgid "" "\n" "You have reached\n" @@ -341,11 +341,12 @@ msgstr "" "Вы достигли\n" "#%d в %s общего количества ходов" -#: pysollib/game.py:1198 pysollib/game.py:1214 +#: pysollib/game.py:1205 pysollib/game.py:1221 +#: pysollib/tk/soundoptionsdialog.py:102 msgid "Game won" msgstr "Игра выиграна" -#: pysollib/game.py:1199 +#: pysollib/game.py:1206 msgid "" "\n" "Congratulations, this\n" @@ -364,12 +365,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1207 pysollib/game.py:1222 pysollib/game.py:1228 -#: pysollib/game.py:1233 pysollib/tk/menubar.py:250 +#: pysollib/game.py:1214 pysollib/game.py:1229 pysollib/game.py:1235 +#: pysollib/game.py:1240 pysollib/tk/menubar.py:250 msgid "&New game" msgstr "&Новая игра" -#: pysollib/game.py:1215 +#: pysollib/game.py:1222 msgid "" "\n" "Congratulations, you did it !\n" @@ -386,11 +387,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1226 pysollib/game.py:1231 +#: pysollib/game.py:1233 pysollib/game.py:1238 +#: pysollib/tk/soundoptionsdialog.py:100 msgid "Game finished" msgstr "Игра закончена" -#: pysollib/game.py:1227 pysollib/game.py:1645 +#: pysollib/game.py:1234 pysollib/game.py:1652 msgid "" "\n" "Game finished\n" @@ -398,7 +400,7 @@ msgstr "" "\n" "Игра закончена\n" -#: pysollib/game.py:1232 +#: pysollib/game.py:1239 msgid "" "\n" "Game finished, but not without my help...\n" @@ -406,35 +408,35 @@ msgstr "" "\n" "Игра закончена, но не без моей помощи...\n" -#: pysollib/game.py:1233 +#: pysollib/game.py:1240 msgid "&Restart" msgstr "&Начало" -#: pysollib/game.py:1537 +#: pysollib/game.py:1544 msgid "Score %6d" msgstr "Счет %6d" -#: pysollib/game.py:1636 +#: pysollib/game.py:1643 msgid "&Cool" msgstr "&Отлично" -#: pysollib/game.py:1636 +#: pysollib/game.py:1643 msgid "&Great" msgstr "&Эдорово" -#: pysollib/game.py:1636 +#: pysollib/game.py:1643 msgid "&Wow" msgstr "&Ура" -#: pysollib/game.py:1636 +#: pysollib/game.py:1643 msgid "&Yeah" msgstr "&Ага" -#: pysollib/game.py:1637 pysollib/game.py:1648 pysollib/game.py:1660 +#: pysollib/game.py:1644 pysollib/game.py:1655 pysollib/game.py:1667 msgid " Autopilot" msgstr " Автопилот" -#: pysollib/game.py:1638 +#: pysollib/game.py:1645 msgid "" "\n" "Game solved in %d moves.\n" @@ -442,19 +444,19 @@ msgstr "" "\n" "Игра решена за %d ходов\n" -#: pysollib/game.py:1659 +#: pysollib/game.py:1666 msgid "&Hmm" msgstr "&Хмм" -#: pysollib/game.py:1659 +#: pysollib/game.py:1666 msgid "&Oh well" msgstr "&Ох" -#: pysollib/game.py:1659 +#: pysollib/game.py:1666 msgid "&That's life" msgstr "&Такова жизнь" -#: pysollib/game.py:1661 +#: pysollib/game.py:1668 msgid "" "\n" "This won't come out...\n" @@ -462,31 +464,31 @@ msgstr "" "\n" "Не удалось...\n" -#: pysollib/game.py:2065 +#: pysollib/game.py:2072 msgid "Set bookmark" msgstr "Установить закладку" -#: pysollib/game.py:2066 +#: pysollib/game.py:2073 msgid "Replace existing bookmark %d ?" msgstr "Заменить существующую закладку %d ?" -#: pysollib/game.py:2088 +#: pysollib/game.py:2095 msgid "Goto bookmark" msgstr "Перейти к закладке" -#: pysollib/game.py:2089 +#: pysollib/game.py:2096 msgid "Goto bookmark %d ?" msgstr "Перейти к закладке %d ?" -#: pysollib/game.py:2120 +#: pysollib/game.py:2127 msgid "Open game" msgstr "Открыть игру" -#: pysollib/game.py:2131 pysollib/game.py:2140 pysollib/game.py:2145 +#: pysollib/game.py:2138 pysollib/game.py:2147 pysollib/game.py:2152 msgid "Load game error" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2132 +#: pysollib/game.py:2139 msgid "" "Error while loading game.\n" "\n" @@ -494,11 +496,11 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2141 +#: pysollib/game.py:2148 msgid "Error while loading game" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2146 +#: pysollib/game.py:2153 msgid "" "Internal error while loading game.\n" "\n" @@ -508,235 +510,236 @@ msgstr "" "\n" "Пожалуйста сообщите об этой ошибке." -#: pysollib/game.py:2171 +#: pysollib/game.py:2178 msgid "Save game error" msgstr "Ошибка при сохранении игры" -#: pysollib/game.py:2172 +#: pysollib/game.py:2179 msgid "Error while saving game" msgstr "Ошибка при сохранении игры" -#: pysollib/gamedb.py:113 +#: pysollib/gamedb.py:120 msgid "Baker's Dozen" msgstr "" -#: pysollib/gamedb.py:114 +#: pysollib/gamedb.py:121 msgid "Beleaguered Castle" msgstr "" -#: pysollib/gamedb.py:115 +#: pysollib/gamedb.py:122 msgid "Canfield" msgstr "" -#: pysollib/gamedb.py:116 +#: pysollib/gamedb.py:123 msgid "Fan" msgstr "" -#: pysollib/gamedb.py:117 +#: pysollib/gamedb.py:124 msgid "Forty Thieves" msgstr "" -#: pysollib/gamedb.py:118 +#: pysollib/gamedb.py:125 msgid "FreeCell" msgstr "" -#: pysollib/gamedb.py:119 +#: pysollib/gamedb.py:126 msgid "Golf" msgstr "" -#: pysollib/gamedb.py:120 +#: pysollib/gamedb.py:127 msgid "Gypsy" msgstr "" -#: pysollib/gamedb.py:121 +#: pysollib/gamedb.py:128 msgid "Klondike" msgstr "" -#: pysollib/gamedb.py:122 +#: pysollib/gamedb.py:129 msgid "Montana" msgstr "" -#: pysollib/gamedb.py:123 +#: pysollib/gamedb.py:130 msgid "Napoleon" msgstr "" -#: pysollib/gamedb.py:124 +#: pysollib/gamedb.py:131 msgid "Numerica" msgstr "" -#: pysollib/gamedb.py:125 +#: pysollib/gamedb.py:132 msgid "Pairing" msgstr "" -#: pysollib/gamedb.py:126 +#: pysollib/gamedb.py:133 msgid "Raglan" msgstr "" -#: pysollib/gamedb.py:127 pysollib/gamedb.py:160 +#: pysollib/gamedb.py:134 pysollib/gamedb.py:167 msgid "Simple games" msgstr "Простые игры" -#: pysollib/gamedb.py:128 +#: pysollib/gamedb.py:135 msgid "Spider" msgstr "" -#: pysollib/gamedb.py:129 +#: pysollib/gamedb.py:136 msgid "Terrace" msgstr "" -#: pysollib/gamedb.py:130 +#: pysollib/gamedb.py:137 msgid "Yukon" msgstr "" -#: pysollib/gamedb.py:131 pysollib/gamedb.py:164 +#: pysollib/gamedb.py:138 pysollib/gamedb.py:171 msgid "One-Deck games" msgstr "Игры с одной колодой" -#: pysollib/gamedb.py:132 pysollib/gamedb.py:165 +#: pysollib/gamedb.py:139 pysollib/gamedb.py:172 msgid "Two-Deck games" msgstr "Игры с двумя колодами" -#: pysollib/gamedb.py:133 pysollib/gamedb.py:166 +#: pysollib/gamedb.py:140 pysollib/gamedb.py:173 msgid "Three-Deck games" msgstr "Игры с тремя колодами" -#: pysollib/gamedb.py:134 pysollib/gamedb.py:167 +#: pysollib/gamedb.py:141 pysollib/gamedb.py:174 msgid "Four-Deck games" msgstr "Игры с четырьмя колодами" -#: pysollib/gamedb.py:146 +#: pysollib/gamedb.py:153 msgid "Baker's Dozen type" msgstr "Игры типа Чёртова Дюжина (Baker's Dozen)" -#: pysollib/gamedb.py:147 +#: pysollib/gamedb.py:154 msgid "Beleaguered Castle type" msgstr "Игры типа Осаждённый Замок (Beleaguered Castle)" -#: pysollib/gamedb.py:148 +#: pysollib/gamedb.py:155 msgid "Canfield type" msgstr "Игры типа Кенфилд (Canfield)" -#: pysollib/gamedb.py:149 +#: pysollib/gamedb.py:156 msgid "Fan type" msgstr "Игры типа Веер (Fan)" -#: pysollib/gamedb.py:150 +#: pysollib/gamedb.py:157 msgid "Forty Thieves type" msgstr "Игры типа Сорок Воров (Forty Thieves)" -#: pysollib/gamedb.py:151 +#: pysollib/gamedb.py:158 msgid "FreeCell type" msgstr "Игры типа Свободная Ячейка (FreeCell)" -#: pysollib/gamedb.py:152 +#: pysollib/gamedb.py:159 msgid "Golf type" msgstr "Игры типа Гольф (Golf)" -#: pysollib/gamedb.py:153 +#: pysollib/gamedb.py:160 msgid "Gypsy type" msgstr "Игры типа Цыганский Пасьянс (Gypsy)" -#: pysollib/gamedb.py:154 +#: pysollib/gamedb.py:161 msgid "Klondike type" msgstr "Игры типа Клондайк (Klondike)" -#: pysollib/gamedb.py:155 +#: pysollib/gamedb.py:162 msgid "Montana type" msgstr "Игры типа Монтана (Montana)" -#: pysollib/gamedb.py:156 +#: pysollib/gamedb.py:163 msgid "Napoleon type" msgstr "Игры типа Наполеон (Napoleon)" -#: pysollib/gamedb.py:157 +#: pysollib/gamedb.py:164 msgid "Numerica type" msgstr "Игры числового типа (Numerica)" -#: pysollib/gamedb.py:158 +#: pysollib/gamedb.py:165 msgid "Pairing type" msgstr "Парные игры" -#: pysollib/gamedb.py:159 +#: pysollib/gamedb.py:166 msgid "Raglan type" msgstr "Игры типа Реглан (Raglan)" -#: pysollib/gamedb.py:161 +#: pysollib/gamedb.py:168 msgid "Spider type" msgstr "Игры типа Паук (Spider)" -#: pysollib/gamedb.py:162 +#: pysollib/gamedb.py:169 msgid "Terrace type" msgstr "Игры типа Терраса (Terrace)" -#: pysollib/gamedb.py:163 +#: pysollib/gamedb.py:170 msgid "Yukon type" msgstr "Игры типа Юкон (Yukon)" -#: pysollib/gamedb.py:188 pysollib/gamedb.py:196 +#: pysollib/gamedb.py:178 pysollib/gamedb.py:186 msgid "French type" msgstr "Классические" -#: pysollib/gamedb.py:189 pysollib/gamedb.py:197 pysollib/gamedb.py:206 +#: pysollib/gamedb.py:179 pysollib/gamedb.py:187 pysollib/gamedb.py:195 msgid "Ganjifa type" msgstr "Игры типа Ганджифа" -#: pysollib/gamedb.py:190 pysollib/gamedb.py:198 pysollib/gamedb.py:207 +#: pysollib/gamedb.py:180 pysollib/gamedb.py:188 pysollib/gamedb.py:196 msgid "Hanafuda type" msgstr "Игры типа Ханафуда" -#: pysollib/gamedb.py:191 pysollib/gamedb.py:199 pysollib/gamedb.py:214 +#: pysollib/gamedb.py:181 pysollib/gamedb.py:189 pysollib/gamedb.py:203 msgid "Hex A Deck type" msgstr "Игры типа Hex A Deck" -#: pysollib/gamedb.py:192 pysollib/gamedb.py:200 pysollib/gamedb.py:219 +#: pysollib/gamedb.py:182 pysollib/gamedb.py:190 pysollib/gamedb.py:208 msgid "Tarock type" msgstr "Таро" -#: pysollib/gamedb.py:205 +#: pysollib/gamedb.py:194 msgid "Dashavatara Ganjifa type" msgstr "Игры типа Дашаватара Ганджифа" -#: pysollib/gamedb.py:208 +#: pysollib/gamedb.py:197 msgid "Mughal Ganjifa type" msgstr "Игры типа Мугал Ганджифа" -#: pysollib/gamedb.py:209 +#: pysollib/gamedb.py:198 msgid "Navagraha Ganjifa type" msgstr "Игры типа Наваграха Ганджифа" -#: pysollib/gamedb.py:213 +#: pysollib/gamedb.py:202 msgid "Shisen-Sho" msgstr "Шисен-Сё" -#: pysollib/gamedb.py:215 +#: pysollib/gamedb.py:204 msgid "Matrix type" msgstr "Мозаика" -#: pysollib/gamedb.py:216 +#: pysollib/gamedb.py:205 msgid "Memory type" msgstr "Игры на запоминание" -#: pysollib/gamedb.py:217 +#: pysollib/gamedb.py:206 msgid "Poker type" msgstr "Покер" -#: pysollib/gamedb.py:218 +#: pysollib/gamedb.py:207 msgid "Puzzle type" msgstr "Пазлы" #: pysollib/games/auldlangsyne.py:142 pysollib/games/calculation.py:101 #: pysollib/games/numerica.py:90 pysollib/games/numerica.py:197 +#: pysollib/games/numerica.py:543 msgid "Row. Build regardless of rank and suit." msgstr "" -#: pysollib/games/braid.py:250 pysollib/games/napoleon.py:190 +#: pysollib/games/braid.py:251 pysollib/games/napoleon.py:190 #: pysollib/games/ultra/dashavatara.py:959 #: pysollib/games/ultra/hanafuda1.py:256 pysollib/games/ultra/hexadeck.py:1190 #: pysollib/games/ultra/mughal.py:802 msgid " Ascending" msgstr " вверх" -#: pysollib/games/braid.py:252 pysollib/games/napoleon.py:192 +#: pysollib/games/braid.py:253 pysollib/games/napoleon.py:192 #: pysollib/games/ultra/dashavatara.py:961 #: pysollib/games/ultra/hanafuda1.py:258 pysollib/games/ultra/hexadeck.py:1192 #: pysollib/games/ultra/mughal.py:804 @@ -767,20 +770,20 @@ msgstr "Снять" msgid "X" msgstr "Х" -#: pysollib/games/fortythieves.py:393 pysollib/games/klondike.py:148 +#: pysollib/games/fortythieves.py:429 pysollib/games/klondike.py:148 msgid "Row. Build down in any suit but the same." msgstr "" -#: pysollib/games/golf.py:114 pysollib/games/golf.py:413 +#: pysollib/games/golf.py:114 pysollib/games/golf.py:414 #: pysollib/stack.py:1742 msgid "Row. No building." msgstr "" -#: pysollib/games/golf.py:381 +#: pysollib/games/golf.py:382 msgid "Balance $%4d" msgstr "Баланс $%4d" -#: pysollib/games/golf.py:497 pysollib/stack.py:1675 +#: pysollib/games/golf.py:498 pysollib/stack.py:1675 msgid "Foundation. Build up regardless of suit." msgstr "" @@ -788,7 +791,7 @@ msgstr "" msgid "Balance $%d" msgstr "Баланс $%d" -#: pysollib/games/klondike.py:391 +#: pysollib/games/klondike.py:388 msgid "Reserve. Only Kings are acceptable." msgstr "" @@ -1154,39 +1157,36 @@ msgid "Round %d" msgstr "Раунд %d" #: pysollib/games/ultra/mughal.py:252 -#, fuzzy msgid "Crown" -msgstr "Коричневый" +msgstr "Корона" #: pysollib/games/ultra/mughal.py:252 msgid "Saber" -msgstr "" +msgstr "Сабля" #: pysollib/games/ultra/mughal.py:252 msgid "Servant" -msgstr "" +msgstr "Слуга" #: pysollib/games/ultra/mughal.py:252 msgid "Silver" -msgstr "" +msgstr "Серебро" #: pysollib/games/ultra/mughal.py:253 msgid "Document" -msgstr "" +msgstr "Документ" #: pysollib/games/ultra/mughal.py:253 msgid "Gold" -msgstr "" +msgstr "Золото" #: pysollib/games/ultra/mughal.py:253 -#, fuzzy msgid "Harp" -msgstr "Черви" +msgstr "Арфа" #: pysollib/games/ultra/mughal.py:253 -#, fuzzy msgid "Stores" -msgstr "Настроить цвета" +msgstr "Резерв" #: pysollib/games/ultra/mughal.py:257 msgid "Tan" @@ -1194,11 +1194,11 @@ msgstr "" #: pysollib/games/ultra/threepeaks.py:217 msgid "Score:\tThis hand: " -msgstr "" +msgstr "Очков: Текущая раздача: " #: pysollib/games/ultra/threepeaks.py:218 msgid "\tThis game: " -msgstr "" +msgstr " Эта игра: " #: pysollib/games/yukon.py:145 msgid "" @@ -1225,10 +1225,10 @@ msgid "" "Heart: 3 6 9 Q 2 5 8 J A 4 7 T K\n" "Diamond: 4 8 Q 3 7 J 2 6 T A 5 9 K" msgstr "" -"Треф: Т 2 3 4 5 6 7 8 9 10 В Д К\n" -"Пики: 2 4 6 8 10 Д Т 3 5 7 9 В К\n" -"Черви: 3 6 9 Д 2 5 8 В Т 4 7 10 К\n" -"Буби: 4 8 Д 3 7 В 2 6 10 Т 5 9 К" +"Треф: Т 2 3 4 5 6 7 8 9 10 В Д К\n" +"Пики: 2 4 6 8 10 Д Т 3 5 7 9 В К\n" +"Черви: 3 6 9 Д 2 5 8 В Т 4 7 10 К\n" +"Буби: 4 8 Д 3 7 В 2 6 10 Т 5 9 К" #: pysollib/help.py:64 msgid "A Python Solitaire Game Collection\n" @@ -1910,11 +1910,11 @@ msgid "Status" msgstr "Статус" #: pysollib/stats.py:162 pysollib/tk/statusbar.py:137 -#: pysollib/tk/tkstats.py:733 +#: pysollib/tk/tkstats.py:735 msgid "Game number" msgstr "Номер игры" -#: pysollib/stats.py:162 pysollib/tk/tkstats.py:736 +#: pysollib/stats.py:162 pysollib/tk/tkstats.py:738 msgid "Started at" msgstr "Игра начата" @@ -2107,7 +2107,7 @@ msgstr "Сохранить &как..." msgid "&Hold and quit" msgstr "Со&храниться и выйти" -#: pysollib/tk/menubar.py:271 pysollib/tk/selectgame.py:409 +#: pysollib/tk/menubar.py:271 pysollib/tk/selectgame.py:417 msgid "&Select" msgstr "&Выбрать" @@ -2308,7 +2308,7 @@ msgid "Shade &legal moves" msgstr "Подсвечивать &разрешенные ходы" #: pysollib/tk/menubar.py:356 -msgid "&Negative card bottom" +msgid "&Negative cards bottom" msgstr "&Негативные контуры карты" #: pysollib/tk/menubar.py:357 @@ -2372,87 +2372,91 @@ msgid "Show &help bar" msgstr "Показывать панель помощи" #: pysollib/tk/menubar.py:375 +msgid "Save games &geometry" +msgstr "Сохранение &геометрии игры" + +#: pysollib/tk/menubar.py:376 msgid "&Demo logo" msgstr "Д&емо лого" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:377 msgid "Startup splash sc&reen" msgstr "О&кно запуска" -#: pysollib/tk/menubar.py:380 +#: pysollib/tk/menubar.py:381 msgid "&Help" msgstr "&Помощь" -#: pysollib/tk/menubar.py:381 +#: pysollib/tk/menubar.py:382 msgid "&Contents" msgstr "&Содержание" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:383 msgid "&How to play" msgstr "Как &играть" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:384 msgid "&Rules for this game" msgstr "&Правила текущей игры" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:385 msgid "&License terms" msgstr "&Лицензия" -#: pysollib/tk/menubar.py:387 +#: pysollib/tk/menubar.py:388 msgid "&About " msgstr "&О программе " -#: pysollib/tk/menubar.py:495 +#: pysollib/tk/menubar.py:496 msgid "All &games..." msgstr "&Все игры..." -#: pysollib/tk/menubar.py:496 +#: pysollib/tk/menubar.py:497 msgid "Playable pre&view..." msgstr "Играемый &предпросмотр..." -#: pysollib/tk/menubar.py:498 +#: pysollib/tk/menubar.py:499 msgid "&Popular games" msgstr "&Популярные игры" -#: pysollib/tk/menubar.py:501 +#: pysollib/tk/menubar.py:502 msgid "&French games" msgstr "&Классические игры" -#: pysollib/tk/menubar.py:504 +#: pysollib/tk/menubar.py:505 msgid "&Mahjongg games" msgstr "Игры маджонг" -#: pysollib/tk/menubar.py:507 +#: pysollib/tk/menubar.py:508 msgid "&Oriental games" msgstr "&Восточные игры" -#: pysollib/tk/menubar.py:511 +#: pysollib/tk/menubar.py:512 msgid "&Special games" msgstr "&Особые игры" -#: pysollib/tk/menubar.py:515 +#: pysollib/tk/menubar.py:516 msgid "All games by name" msgstr "Все игры по имени" -#: pysollib/tk/menubar.py:852 pysollib/tk/menubar.py:854 +#: pysollib/tk/menubar.py:849 pysollib/tk/menubar.py:851 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "&Загрузить" -#: pysollib/tk/menubar.py:854 +#: pysollib/tk/menubar.py:851 msgid "&Info..." msgstr "&Информация..." -#: pysollib/tk/menubar.py:857 +#: pysollib/tk/menubar.py:854 msgid "Select " msgstr "Выбрать " -#: pysollib/tk/menubar.py:917 +#: pysollib/tk/menubar.py:915 msgid "Select table background" msgstr "Выбрать фоновое изображение" -#: pysollib/tk/menubar.py:929 pysollib/tk/selecttile.py:177 +#: pysollib/tk/menubar.py:927 pysollib/tk/selecttile.py:177 msgid "Select table color" msgstr "Выбрать цвет" @@ -2537,7 +2541,7 @@ msgstr "Очень большие колоды" msgid "About cardset" msgstr "О наборе карт" -#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:367 +#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:374 msgid "Type:" msgstr "Тип:" @@ -2606,180 +2610,208 @@ msgid "Mahjongg Games" msgstr "Игры маджонг" #: pysollib/tk/selectgame.py:178 +msgid "by Skill Level" +msgstr "По уровню мастерства" + +#: pysollib/tk/selectgame.py:179 pysollib/tk/selectgame.py:546 +msgid "Luck only" +msgstr "Только на везение" + +#: pysollib/tk/selectgame.py:180 pysollib/tk/selectgame.py:547 +msgid "Mostly luck" +msgstr "В основном на везение" + +#: pysollib/tk/selectgame.py:181 pysollib/tk/selectgame.py:548 +msgid "Balanced" +msgstr "Сбалансированные" + +#: pysollib/tk/selectgame.py:182 pysollib/tk/selectgame.py:549 +msgid "Mostly skill" +msgstr "В основном на мастерство" + +#: pysollib/tk/selectgame.py:183 pysollib/tk/selectgame.py:550 +msgid "Skill only" +msgstr "Только на мастерство" + +#: pysollib/tk/selectgame.py:185 msgid "by Game Feature" msgstr "По особенностям игры" -#: pysollib/tk/selectgame.py:179 +#: pysollib/tk/selectgame.py:186 msgid "by Number of Cards" msgstr "По количеству карт" -#: pysollib/tk/selectgame.py:180 +#: pysollib/tk/selectgame.py:187 msgid "32 cards" msgstr "32 карты" -#: pysollib/tk/selectgame.py:181 +#: pysollib/tk/selectgame.py:188 msgid "48 cards" msgstr "48 карт" -#: pysollib/tk/selectgame.py:182 +#: pysollib/tk/selectgame.py:189 msgid "52 cards" msgstr "52 карты" -#: pysollib/tk/selectgame.py:183 +#: pysollib/tk/selectgame.py:190 msgid "64 cards" msgstr "64 карты" -#: pysollib/tk/selectgame.py:184 +#: pysollib/tk/selectgame.py:191 msgid "78 cards" msgstr "78 карт" -#: pysollib/tk/selectgame.py:185 +#: pysollib/tk/selectgame.py:192 msgid "104 cards" msgstr "104 карты" -#: pysollib/tk/selectgame.py:186 +#: pysollib/tk/selectgame.py:193 msgid "144 cards" msgstr "144 карты" -#: pysollib/tk/selectgame.py:187 +#: pysollib/tk/selectgame.py:194 msgid "Other number" msgstr "Другое количество" -#: pysollib/tk/selectgame.py:189 +#: pysollib/tk/selectgame.py:196 msgid "by Number of Decks" msgstr "По количеству колод" -#: pysollib/tk/selectgame.py:190 +#: pysollib/tk/selectgame.py:197 msgid "1 deck games" msgstr "Игры с 1 колодой" -#: pysollib/tk/selectgame.py:191 +#: pysollib/tk/selectgame.py:198 msgid "2 deck games" msgstr "Игры с 2 колодами" -#: pysollib/tk/selectgame.py:192 +#: pysollib/tk/selectgame.py:199 msgid "3 deck games" msgstr "Игры с 3 колодами" -#: pysollib/tk/selectgame.py:193 +#: pysollib/tk/selectgame.py:200 msgid "4 deck games" msgstr "Игры с 4 колодами" -#: pysollib/tk/selectgame.py:195 +#: pysollib/tk/selectgame.py:202 msgid "by Number of Redeals" msgstr "По количеству пересдач" -#: pysollib/tk/selectgame.py:196 +#: pysollib/tk/selectgame.py:203 msgid "No redeal" msgstr "Без пересдачи" -#: pysollib/tk/selectgame.py:197 +#: pysollib/tk/selectgame.py:204 msgid "1 redeal" msgstr "1 пересдача" -#: pysollib/tk/selectgame.py:198 +#: pysollib/tk/selectgame.py:205 msgid "2 redeals" msgstr "2 пересдачи" -#: pysollib/tk/selectgame.py:199 +#: pysollib/tk/selectgame.py:206 msgid "3 redeals" msgstr "3 пересдачи" -#: pysollib/tk/selectgame.py:200 +#: pysollib/tk/selectgame.py:207 msgid "Unlimited redeals" msgstr "Неограниченное количество пересдач" -#: pysollib/tk/selectgame.py:202 +#: pysollib/tk/selectgame.py:209 msgid "Other number of redeals" msgstr "Другое количество пересдач" -#: pysollib/tk/selectgame.py:207 +#: pysollib/tk/selectgame.py:214 msgid "Other Categories" msgstr "Другие категории" -#: pysollib/tk/selectgame.py:208 +#: pysollib/tk/selectgame.py:215 msgid "Games for Children (very easy)" msgstr "Игры для детей (очень легкие)" -#: pysollib/tk/selectgame.py:209 +#: pysollib/tk/selectgame.py:216 msgid "Games with Scoring" msgstr "Игры со счётом" -#: pysollib/tk/selectgame.py:210 +#: pysollib/tk/selectgame.py:217 msgid "Games with Separate Decks" msgstr "Игры с раздельными колодами" -#: pysollib/tk/selectgame.py:211 +#: pysollib/tk/selectgame.py:218 msgid "Open Games (all cards visible)" msgstr "Открытые игры (все карты видны)" -#: pysollib/tk/selectgame.py:212 +#: pysollib/tk/selectgame.py:219 msgid "Relaxed Variants" msgstr "Облегченные варианты" -#: pysollib/tk/selectgame.py:351 +#: pysollib/tk/selectgame.py:358 msgid "About game" msgstr "Об игре " -#: pysollib/tk/selectgame.py:364 +#: pysollib/tk/selectgame.py:371 msgid "Name:" msgstr "Имя:" -#: pysollib/tk/selectgame.py:365 +#: pysollib/tk/selectgame.py:372 msgid "Alternate names:" msgstr "Другие имена:" -#: pysollib/tk/selectgame.py:366 +#: pysollib/tk/selectgame.py:373 msgid "Category:" msgstr "Категория:" -#: pysollib/tk/selectgame.py:368 +#: pysollib/tk/selectgame.py:375 +msgid "Skill level:" +msgstr "Уровень мастерства:" + +#: pysollib/tk/selectgame.py:376 msgid "Decks:" msgstr "Колод:" -#: pysollib/tk/selectgame.py:369 +#: pysollib/tk/selectgame.py:377 msgid "Redeals:" msgstr "Пересдач:" -#: pysollib/tk/selectgame.py:371 +#: pysollib/tk/selectgame.py:379 msgid "Played:" msgstr "Играл:" -#: pysollib/tk/selectgame.py:372 pysollib/tk/tkstats.py:111 +#: pysollib/tk/selectgame.py:380 pysollib/tk/tkstats.py:111 #: pysollib/tk/tkstats.py:163 msgid "Won:" msgstr "Выиграл:" -#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:112 +#: pysollib/tk/selectgame.py:381 pysollib/tk/tkstats.py:112 #: pysollib/tk/tkstats.py:164 msgid "Lost:" msgstr "Проиграл:" -#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:803 +#: pysollib/tk/selectgame.py:382 pysollib/tk/tkstats.py:805 msgid "Playing time:" msgstr "Игровое время:" -#: pysollib/tk/selectgame.py:375 pysollib/tk/tkstats.py:810 +#: pysollib/tk/selectgame.py:383 pysollib/tk/tkstats.py:812 msgid "Moves:" msgstr "Ходов:" -#: pysollib/tk/selectgame.py:376 +#: pysollib/tk/selectgame.py:384 msgid "% won:" msgstr "% побед:" -#: pysollib/tk/selectgame.py:409 +#: pysollib/tk/selectgame.py:417 msgid "&Rules" msgstr "&Правила" -#: pysollib/tk/selectgame.py:489 +#: pysollib/tk/selectgame.py:497 msgid "Playable Preview - " msgstr "Играемый предпросмотр - " -#: pysollib/tk/selectgame.py:537 +#: pysollib/tk/selectgame.py:553 msgid "variable" msgstr "переменное кол-во" -#: pysollib/tk/selectgame.py:538 +#: pysollib/tk/selectgame.py:554 msgid "unlimited" msgstr "неограниченное кол-во" @@ -2811,39 +2843,111 @@ msgstr "Все фоновые изображения" msgid "&Solid color..." msgstr "М&онотонный цвет..." -#: pysollib/tk/soundoptionsdialog.py:111 +#: pysollib/tk/soundoptionsdialog.py:77 +msgid "Are You Sure" +msgstr "Вы уверены" + +#: pysollib/tk/soundoptionsdialog.py:79 +msgid "Deal" +msgstr "Сдача" + +#: pysollib/tk/soundoptionsdialog.py:80 +msgid "Deal waste" +msgstr "Сдача на сброс" + +#: pysollib/tk/soundoptionsdialog.py:82 +msgid "Turn waste" +msgstr "Переворачивание сброса" + +#: pysollib/tk/soundoptionsdialog.py:83 +msgid "Start drag" +msgstr "Начало перемещения" + +#: pysollib/tk/soundoptionsdialog.py:85 +msgid "Drop" +msgstr "Сброс карты" + +#: pysollib/tk/soundoptionsdialog.py:86 +msgid "Drop pair" +msgstr "Сброс двух карт" + +#: pysollib/tk/soundoptionsdialog.py:87 +msgid "Auto drop" +msgstr "Автосброс карты" + +#: pysollib/tk/soundoptionsdialog.py:89 +msgid "Flip" +msgstr "Переворачивание" + +#: pysollib/tk/soundoptionsdialog.py:90 +msgid "Auto flip" +msgstr "Автоматическое переворачивание" + +#: pysollib/tk/soundoptionsdialog.py:91 +msgid "Move" +msgstr "Перемещение" + +#: pysollib/tk/soundoptionsdialog.py:92 +msgid "No move" +msgstr "Без пермещения" + +#: pysollib/tk/soundoptionsdialog.py:94 pysollib/tk/toolbar.py:189 +msgid "Undo" +msgstr "Отмена" + +#: pysollib/tk/soundoptionsdialog.py:95 pysollib/tk/toolbar.py:190 +msgid "Redo" +msgstr "Повтор" + +#: pysollib/tk/soundoptionsdialog.py:97 +msgid "Autopilot lost" +msgstr "Автопилот выиграл" + +#: pysollib/tk/soundoptionsdialog.py:98 +msgid "Autopilot won" +msgstr "Автопилот проиграл" + +#: pysollib/tk/soundoptionsdialog.py:101 +msgid "Game lost" +msgstr "Игра проиграна" + +#: pysollib/tk/soundoptionsdialog.py:103 +msgid "Perfect game" +msgstr "Великолепная игра" + +#: pysollib/tk/soundoptionsdialog.py:113 msgid "Sound enabled" msgstr "Звук доступен" -#: pysollib/tk/soundoptionsdialog.py:117 +#: pysollib/tk/soundoptionsdialog.py:119 msgid "Use DirectX for sound playing" msgstr "Использовать DirectX для вывода звука" -#: pysollib/tk/soundoptionsdialog.py:123 +#: pysollib/tk/soundoptionsdialog.py:125 msgid "Sample volume:" msgstr "Уровень звуков:" -#: pysollib/tk/soundoptionsdialog.py:131 +#: pysollib/tk/soundoptionsdialog.py:133 msgid "Music volume:" msgstr "Уровень музыки:" -#: pysollib/tk/soundoptionsdialog.py:144 +#: pysollib/tk/soundoptionsdialog.py:146 msgid "Enable samles" msgstr "Включить звуки" -#: pysollib/tk/soundoptionsdialog.py:169 +#: pysollib/tk/soundoptionsdialog.py:171 msgid "&Apply" msgstr "&Применить" -#: pysollib/tk/soundoptionsdialog.py:169 pysollib/tk/soundoptionsdialog.py:171 +#: pysollib/tk/soundoptionsdialog.py:171 pysollib/tk/soundoptionsdialog.py:173 msgid "&Mixer..." msgstr "Ми&ксер..." -#: pysollib/tk/soundoptionsdialog.py:220 +#: pysollib/tk/soundoptionsdialog.py:222 msgid "Sound preferences info" msgstr "Информация о настройках звука" -#: pysollib/tk/soundoptionsdialog.py:221 +#: pysollib/tk/soundoptionsdialog.py:223 msgid "" "Changing DirectX settings will take effect\n" "the next time you restart " @@ -2895,23 +2999,23 @@ msgstr "Текст рядом с пиктограммами" msgid "Text only" msgstr "Только текст" -#: pysollib/tk/tkhtml.py:229 +#: pysollib/tk/tkhtml.py:230 msgid "Index" msgstr "Индекс" -#: pysollib/tk/tkhtml.py:233 +#: pysollib/tk/tkhtml.py:234 msgid "Back" msgstr "Назад" -#: pysollib/tk/tkhtml.py:237 +#: pysollib/tk/tkhtml.py:238 msgid "Forward" msgstr "Вперед" -#: pysollib/tk/tkhtml.py:241 +#: pysollib/tk/tkhtml.py:242 msgid "Close" msgstr "Закрыть" -#: pysollib/tk/tkhtml.py:347 +#: pysollib/tk/tkhtml.py:360 msgid "" " HTML limitation:\n" "The %s protocol is not supported yet.\n" @@ -2927,7 +3031,7 @@ msgstr "" "чтобы открыть URL:\n" "%s\n" -#: pysollib/tk/tkhtml.py:372 pysollib/tk/tkhtml.py:376 +#: pysollib/tk/tkhtml.py:385 pysollib/tk/tkhtml.py:389 msgid "Unable to service request:\n" msgstr "" @@ -2955,48 +3059,48 @@ msgstr "&Все игры..." msgid "&Reset..." msgstr "О&чистить..." -#: pysollib/tk/tkstats.py:572 pysollib/tk/tkstats.py:645 -#: pysollib/tk/tkstats.py:661 +#: pysollib/tk/tkstats.py:574 pysollib/tk/tkstats.py:647 +#: pysollib/tk/tkstats.py:663 msgid "&Save to file" msgstr "&Сохранить в файл" -#: pysollib/tk/tkstats.py:573 +#: pysollib/tk/tkstats.py:575 msgid "&Reset all..." msgstr "О&чистить все..." -#: pysollib/tk/tkstats.py:623 +#: pysollib/tk/tkstats.py:625 msgid "No entries for player " msgstr "Нет записей для игрока " -#: pysollib/tk/tkstats.py:640 +#: pysollib/tk/tkstats.py:642 msgid "No log entries for %s\n" msgstr "Нет записей для %s\n" -#: pysollib/tk/tkstats.py:645 +#: pysollib/tk/tkstats.py:647 msgid "Session &log..." msgstr "&Лог сессии..." -#: pysollib/tk/tkstats.py:656 +#: pysollib/tk/tkstats.py:658 msgid "No current session log entries for %s\n" msgstr "В текущем сеансе нет записей для %s\n" -#: pysollib/tk/tkstats.py:661 +#: pysollib/tk/tkstats.py:663 msgid "&Full log..." msgstr "&Полный лог..." -#: pysollib/tk/tkstats.py:676 +#: pysollib/tk/tkstats.py:678 msgid "Highlight piles: " msgstr "Подсветка групп: " -#: pysollib/tk/tkstats.py:677 +#: pysollib/tk/tkstats.py:679 msgid "Highlight cards: " msgstr "Подсветка карт: " -#: pysollib/tk/tkstats.py:678 +#: pysollib/tk/tkstats.py:680 msgid "Highlight same rank: " msgstr "Подсветка карт одного достоинства: " -#: pysollib/tk/tkstats.py:681 +#: pysollib/tk/tkstats.py:683 msgid "" "\n" "Redeals: " @@ -3004,7 +3108,7 @@ msgstr "" "\n" "Раздач: " -#: pysollib/tk/tkstats.py:682 +#: pysollib/tk/tkstats.py:684 msgid "" "\n" "Cards in Talon: " @@ -3012,7 +3116,7 @@ msgstr "" "\n" "Карт в колоде: " -#: pysollib/tk/tkstats.py:684 +#: pysollib/tk/tkstats.py:686 msgid "" "\n" "Cards in Waste: " @@ -3020,7 +3124,7 @@ msgstr "" "\n" "Карт в сбросе: " -#: pysollib/tk/tkstats.py:686 +#: pysollib/tk/tkstats.py:688 msgid "" "\n" "Cards in Foundations: " @@ -3028,75 +3132,75 @@ msgstr "" "\n" "Карт в игре: " -#: pysollib/tk/tkstats.py:689 +#: pysollib/tk/tkstats.py:691 msgid "Game status" msgstr "Статус игры" -#: pysollib/tk/tkstats.py:692 +#: pysollib/tk/tkstats.py:694 msgid "Playing time: " msgstr "Игровое время: " -#: pysollib/tk/tkstats.py:693 +#: pysollib/tk/tkstats.py:695 msgid "Started at: " msgstr "Игра начата: " -#: pysollib/tk/tkstats.py:694 +#: pysollib/tk/tkstats.py:696 msgid "Moves: " msgstr "Ходов: " -#: pysollib/tk/tkstats.py:695 +#: pysollib/tk/tkstats.py:697 msgid "Undo moves: " msgstr "Отменено ходов: " -#: pysollib/tk/tkstats.py:696 +#: pysollib/tk/tkstats.py:698 msgid "Bookmark moves: " msgstr "Ходов по закладкам: " -#: pysollib/tk/tkstats.py:697 +#: pysollib/tk/tkstats.py:699 msgid "Demo moves: " msgstr "Демо ходов: " -#: pysollib/tk/tkstats.py:698 +#: pysollib/tk/tkstats.py:700 msgid "Total player moves: " msgstr "Всего ходов игрока:" -#: pysollib/tk/tkstats.py:699 +#: pysollib/tk/tkstats.py:701 msgid "Total moves in this game: " msgstr "Всего ходов в этой игре: " -#: pysollib/tk/tkstats.py:700 +#: pysollib/tk/tkstats.py:702 msgid "Hints: " msgstr "Подсказок: " -#: pysollib/tk/tkstats.py:704 +#: pysollib/tk/tkstats.py:706 msgid "&Statistics..." msgstr "&Статистика..." -#: pysollib/tk/tkstats.py:730 +#: pysollib/tk/tkstats.py:732 msgid "N" msgstr "N" -#: pysollib/tk/tkstats.py:739 +#: pysollib/tk/tkstats.py:741 msgid "Result" msgstr "Результат" -#: pysollib/tk/tkstats.py:795 +#: pysollib/tk/tkstats.py:797 msgid "Minimum" msgstr "Минимум" -#: pysollib/tk/tkstats.py:796 +#: pysollib/tk/tkstats.py:798 msgid "Maximum" msgstr "Максимум" -#: pysollib/tk/tkstats.py:797 +#: pysollib/tk/tkstats.py:799 msgid "Average" msgstr "Среднее" -#: pysollib/tk/tkstats.py:817 +#: pysollib/tk/tkstats.py:819 msgid "Total moves:" msgstr "Всего ходов:" -#: pysollib/tk/tkstats.py:848 +#: pysollib/tk/tkstats.py:850 msgid "No TOP for this game" msgstr "TOP для текущей игры отсутствует" @@ -3136,18 +3240,10 @@ msgstr "Сохранить" msgid "Save game" msgstr "Сохранить игру" -#: pysollib/tk/toolbar.py:189 -msgid "Undo" -msgstr "Отмена" - #: pysollib/tk/toolbar.py:189 msgid "Undo last move" msgstr "Отменить последний ход" -#: pysollib/tk/toolbar.py:190 -msgid "Redo" -msgstr "Повтор" - #: pysollib/tk/toolbar.py:190 msgid "Redo last move" msgstr "Вернуть ход" diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py index 1ceb4e8d..7a92de69 100644 --- a/pysollib/games/bakersdozen.py +++ b/pysollib/games/bakersdozen.py @@ -258,22 +258,35 @@ class Cruel(CastlesInSpain): # /*********************************************************************** # // Royal Family +# // Indefatigable # ************************************************************************/ class RoyalFamily(Cruel): - Foundation_Class = StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1) Talon_Class = StackWrapper(Cruel_Talon, max_rounds=2) RowStack_Class = UD_AC_RowStack def _shuffleHook(self, cards): # move Kings to bottom of the Talon (i.e. last cards to be dealt) - return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 12, c.suit)) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == KING, c.suit)) def shallHighlightMatch(self, stack1, card1, stack2, card2): return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 +class Indefatigable(Cruel): + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + Talon_Class = StackWrapper(Cruel_Talon, max_rounds=3) + RowStack_Class = UD_SS_RowStack + + def _shuffleHook(self, cards): + # move Kings to bottom of the Talon (i.e. last cards to be dealt) + return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == ACE, c.suit)) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + # /*********************************************************************** # // Perseverance # ************************************************************************/ @@ -341,4 +354,5 @@ registerGame(GameInfo(404, Perseverance, "Perseverance", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(369, RippleFan, "Ripple Fan", GI.GT_BAKERS_DOZEN, 1, -1, GI.SL_MOSTLY_SKILL)) - +registerGame(GameInfo(515, Indefatigable, "Indefatigable", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 3d88275d..d533ca39 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -692,9 +692,9 @@ registerGame(GameInfo(34, BeleagueredCastle, "Beleaguered Castle", registerGame(GameInfo(145, Citadel, "Citadel", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(147, Fortress, "Fortress", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(148, Chessboard, "Chessboard", - GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(300, Stronghold, "Stronghold", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(301, Fastness, "Fastness", diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index ea78d636..2bf77505 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -330,6 +330,11 @@ class Steve(Carlton): def shallHighlightMatch(self, stack1, card1, stack2, card2): return abs(card1.rank-card2.rank) == 1 + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack.cards: + return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 + return 0 + # /*********************************************************************** # // Lexington Harp diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index f220f6ba..f02d7dfa 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -1125,11 +1125,11 @@ registerGame(GameInfo(333, OpenJumbo, "Open Jumbo", registerGame(GameInfo(297, Alternation, "Alternation", GI.GT_KLONDIKE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(326, Lanes, "Lanes", - GI.GT_KLONDIKE, 1, 1, GI.SL_MOSTLY_SKILL)) + GI.GT_KLONDIKE, 1, 1, GI.SL_BALANCED)) registerGame(GameInfo(327, ThirtySix, "Thirty Six", - GI.GT_KLONDIKE, 1, 0, GI.SL_MOSTLY_SKILL)) + GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(350, Q_C_, "Q.C.", - GI.GT_KLONDIKE, 2, 1, GI.SL_MOSTLY_SKILL)) + GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(361, NorthwestTerritory, "Northwest Territory", GI.GT_RAGLAN, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(362, Morehead, "Morehead", diff --git a/pysollib/tk/gameinfodialog.py b/pysollib/tk/gameinfodialog.py index ce6ecb55..7f13117f 100644 --- a/pysollib/tk/gameinfodialog.py +++ b/pysollib/tk/gameinfodialog.py @@ -72,6 +72,11 @@ class GameInfoDialog(MfxDialog): if gi.si.game_flags & t: flags.append(attr) # + version = None + for t in GI.GAMES_BY_PYSOL_VERSION: + if gi.id in t[1]: + version = t[0] + break sl = { 1: 'SL_LUCK', 2: 'SL_MOSTLY_LUCK', @@ -85,6 +90,7 @@ class GameInfoDialog(MfxDialog): ('Short name:', gi.short_name), ('ID:', gi.id), ('Alt names:', '\n'.join(gi.altnames)), + ('PySol version:', version), ('Decks:', gi.decks), ('Cards:', gi.ncards), ('Redeals:', redeals), From 46d22dba3d9554cb5852933c0b11bec9d7970c28 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Tue, 27 Jun 2006 21:14:20 +0000 Subject: [PATCH 014/266] + 2 new game * fixed rules for `frog', `fly' and `house in the wood' + update russian translation git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@15 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/ru_games.po | 8 ++-- po/ru_pysol.po | 4 +- pysollib/games/fan.py | 87 +++++++++++++++++++++++++++++--------- pysollib/games/numerica.py | 73 ++++++++++++++++++++++++-------- pysollib/games/sultan.py | 6 ++- 5 files changed, 133 insertions(+), 45 deletions(-) diff --git a/po/ru_games.po b/po/ru_games.po index 4a1a6dc5..7e58a268 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" "POT-Creation-Date: Sat Jun 24 16:07:12 2006\n" -"PO-Revision-Date: 2006-06-24 18:11+0400\n" +"PO-Revision-Date: 2006-06-28 00:12+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -1159,16 +1159,14 @@ msgstr "Ураган" msgid "Idiot's Delight" msgstr "Дурацкое удовольствие" -#, fuzzy msgid "Idle Aces" -msgstr "Пять тузов" +msgstr "Свободные тузы" msgid "IloveU" msgstr "" -#, fuzzy msgid "Imperial Guards" -msgstr "Имперские козыри" +msgstr "Императорская гвардия" msgid "Imperial Trumps" msgstr "Имперские козыри" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index f5678d1b..6253a42b 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" "POT-Creation-Date: Sat Jun 24 16:07:07 2006\n" -"PO-Revision-Date: 2006-06-24 18:24+0400\n" +"PO-Revision-Date: 2006-06-25 23:53+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -3262,7 +3262,7 @@ msgstr "Пауза" #: pysollib/tk/toolbar.py:192 msgid "Pause game" -msgstr "Пауза в игре" +msgstr "Приостановить игру" #: pysollib/tk/toolbar.py:194 msgid "View statistics" diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index cf83fb5a..63bb0f8e 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -59,8 +59,7 @@ class Fan_Hint(CautiousDefaultHint): class Fan(Game): Talon_Class = InitialDealTalonStack - Foundation_Class = SS_FoundationStack - Foundation_Class_2 = None + Foundation_Classes = [SS_FoundationStack] ReserveStack_Class = ReserveStack RowStack_Class = KingSS_RowStack Hint_Class = Fan_Hint @@ -93,12 +92,9 @@ class Fan(Game): dx = (self.width - self.gameinfo.decks*4*l.XS)/(self.gameinfo.decks*4+1) x, y = l.XM + dx, l.YM dx += l.XS - for i in range(4): - s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) - x += dx - if self.gameinfo.decks == 2: + for fnd_cls in self.Foundation_Classes: for i in range(4): - s.foundations.append(self.Foundation_Class_2(x, y, self, suit=i)) + s.foundations.append(fnd_cls(x, y, self, suit=i)) x += dx for i in range(len(rows)): x, y = l.XM, y + l.YS @@ -138,8 +134,12 @@ class Fan(Game): # ************************************************************************/ class ScotchPatience(Fan): - Foundation_Class = AC_FoundationStack + Foundation_Classes = [AC_FoundationStack] RowStack_Class = StackWrapper(RK_RowStack, base_rank=NO_RANK) + def createGame(self): + Fan.createGame(self, playcards=8) + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 # /*********************************************************************** @@ -148,10 +148,8 @@ class ScotchPatience(Fan): class Shamrocks(Fan): RowStack_Class = StackWrapper(UD_RK_RowStack, base_rank=NO_RANK, max_cards=3) - def createGame(self): Fan.createGame(self, playcards=4) - def shallHighlightMatch(self, stack1, card1, stack2, card2): return abs(card1.rank-card2.rank) == 1 @@ -325,7 +323,7 @@ class ThreeShufflesAndADraw(LaBelleLucie): class Trefoil(LaBelleLucie): GAME_VERSION = 2 - Foundation_Class = StackWrapper(SS_FoundationStack, min_cards=1) + Foundation_Classes = [StackWrapper(SS_FoundationStack, min_cards=1)] def createGame(self): return Fan.createGame(self, rows=(5,5,5,1)) @@ -395,8 +393,7 @@ class Intelligence_ReserveStack(ReserveStack, DealRow_StackMethods): class Intelligence(Fan): - Foundation_Class = SS_FoundationStack - Foundation_Class_2 = SS_FoundationStack + Foundation_Classes = [SS_FoundationStack, SS_FoundationStack] Talon_Class = StackWrapper(Intelligence_Talon, max_rounds=3) RowStack_Class = StackWrapper(Intelligence_RowStack, base_rank=NO_RANK) @@ -432,8 +429,8 @@ class IntelligencePlus(Intelligence): # ************************************************************************/ class HouseInTheWood(Fan): - Foundation_Class = Foundation_Class_2 = SS_FoundationStack - RowStack_Class = UD_SS_RowStack + Foundation_Classes = [SS_FoundationStack, SS_FoundationStack] + RowStack_Class = StackWrapper(UD_SS_RowStack, base_rank=NO_RANK) def createGame(self): Fan.createGame(self, rows=(6,6,6,6,6,5)) @@ -445,9 +442,10 @@ class HouseInTheWood(Fan): self.s.talon.dealRow(rows=self.s.rows[:35]) assert len(self.s.talon.cards) == 0 + class HouseOnTheHill(HouseInTheWood): - Foundation_Class = SS_FoundationStack - Foundation_Class_2 = StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1) + Foundation_Classes = [SS_FoundationStack, + StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1)] # /*********************************************************************** @@ -511,10 +509,10 @@ class CloverLeaf(Game): # def startGame(self): - for i in range(3): + for i in range(2): self.s.talon.dealRow(frames=0) self.startDealSample() - #self.s.talon.dealRow() + self.s.talon.dealRow() self.s.talon.dealRow(rows=self.s.foundations) def _shuffleHook(self, cards): @@ -564,6 +562,53 @@ class BoxFan(Fan): (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) +# /*********************************************************************** +# // Troika +# ************************************************************************/ + +class Troika(Fan): + + RowStack_Class = StackWrapper(RK_RowStack, dir=0, base_rank=NO_RANK, max_cards=3) + + def createGame(self): + Fan.createGame(self, rows=(6, 6, 6), playcards=4) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank == card2.rank + + def startGame(self, ncards=3): + self.startDealSample() + for r in self.s.rows: + for i in range(ncards): + if not self.s.talon.cards: + break + c = self.s.talon.cards[-1] + t = r + if c.rank == ACE: + t = self.s.foundations[c.suit] + self.s.talon.dealRow(rows=[t], frames=4) + + + +class TroikaPlus_RowStack(RK_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + +class TroikaPlus(Troika): + RowStack_Class = StackWrapper(TroikaPlus_RowStack, dir=0, + ##base_rank=NO_RANK, + max_cards=4) + def createGame(self): + Fan.createGame(self, rows=(5, 5, 3), playcards=5) + + def startGame(self): + Troika.startGame(self, ncards=4) +## for i in range(3): +## self.s.talon.dealRow(rows=self.s.rows[:-1], frames=0) +## self.startDealSample() +## self.s.talon.dealRow(rows=self.s.rows[:-1]) + + # register the game registerGame(GameInfo(56, Fan, "Fan", GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) @@ -595,4 +640,8 @@ registerGame(GameInfo(347, FreeFan, "Free Fan", GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(385, BoxFan, "Box Fan", GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(516, Troika, "Troika", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(517, TroikaPlus, "Troika +", + GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index d8dd320c..ed8d8db8 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -168,6 +168,37 @@ class LadyBetty(Numerica): # // Puss in the Corner # ************************************************************************/ +class PussInTheCorner_Talon(OpenTalonStack): + rightclickHandler = OpenStack.rightclickHandler + + def canDealCards(self): + if self.round != self.max_rounds: + return True + return False + + def clickHandler(self, event): + if self.cards: + return OpenStack.clickHandler(self, event) + else: + return TalonStack.clickHandler(self, event) + + def dealCards(self, sound=0): + ncards = 0 + old_state = self.game.enterState(self.game.S_DEAL) + if not self.cards and self.round != self.max_rounds: + self.game.nextRoundMove(self) + self.game.startDealSample() + for r in self.game.s.rows: + while r.cards: + self.game.moveMove(1, r, self, frames=4) + self.game.flipMove(self) + ncards += 1 + self.fillStack() + self.game.stopSamples() + self.game.leaveState(old_state) + return ncards + + class PussInTheCorner_Foundation(SS_FoundationStack): def __init__(self, x, y, game, **cap): kwdefault(cap, base_suit=ANY_SUIT) @@ -219,7 +250,7 @@ class PussInTheCorner(Numerica): s.foundations.append(PussInTheCorner_Foundation(x, y, self, max_move=0)) x, y = l.XM+3*l.XS/2, l.YM - s.talon = OpenTalonStack(x, y, self) + s.waste = s.talon = PussInTheCorner_Talon(x, y, self, max_rounds=2) l.createText(s.talon, 'se') # define stack-groups @@ -237,6 +268,10 @@ class PussInTheCorner(Numerica): self.s.talon.fillStack() + def _autoDeal(self, sound=1): + return 0 + + # /*********************************************************************** # // Frog # // Fly @@ -245,7 +280,8 @@ class PussInTheCorner(Numerica): class Frog(Game): Hint_Class = Numerica_Hint - Foundation_Class = SS_FoundationStack + ##Foundation_Class = SS_FoundationStack + Foundation_Class = RK_FoundationStack def createGame(self): # create layout @@ -283,20 +319,23 @@ class Frog(Game): # define stack-groups l.defaultStackGroups() - def _shuffleHook(self, cards): - for c in cards[:]: - if c.rank == ACE: - cards.remove(c) - cards.append(c) - return cards def startGame(self): - tc = self.s.talon.cards[-1] self.startDealSample() - self.s.talon.dealRow(rows=[self.s.foundations[tc.suit*2]]) - for i in range(13): - self.s.talon.dealRow(self.s.reserves, flip=0) - self.flipMove(self.s.reserves[0]) + n = 0 + f = 0 + while True: + c = self.s.talon.cards[-1] + if c.rank == ACE: + r = self.s.foundations[f] + f += 1 + ##r = self.s.foundations[c.suit*2] + else: + r = self.s.reserves[0] + n += 1 + self.s.talon.dealRow(rows=[r]) + if n == 13: + break self.s.talon.dealCards() @@ -312,8 +351,7 @@ class Fly(Frog): self.startDealSample() self.s.talon.dealRow(rows=self.s.foundations) for i in range(13): - self.s.talon.dealRow(self.s.reserves, flip=0) - self.flipMove(self.s.reserves[0]) + self.s.talon.dealRow(self.s.reserves) self.s.talon.dealCards() @@ -588,7 +626,8 @@ registerGame(GameInfo(171, LadyBetty, "Lady Betty", registerGame(GameInfo(355, Frog, "Frog", GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(356, Fly, "Fly", - GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) + GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED, + rules_filename='frog.html')) registerGame(GameInfo(357, Gnat, "Gnat", GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(378, Gloaming, "Gloaming", @@ -598,7 +637,7 @@ registerGame(GameInfo(379, Chamberlain, "Chamberlain", registerGame(GameInfo(402, Toad, "Toad", GI.GT_NUMERICA | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(430, PussInTheCorner, "Puss in the Corner", - GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) + GI.GT_NUMERICA, 1, 1, GI.SL_BALANCED)) registerGame(GameInfo(435, Shifting, "Shifting", GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(472, Strategerie, "Strategerie", diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 5614b03f..1811f725 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -699,11 +699,13 @@ registerGame(GameInfo(354, Boudoir, "Boudoir", registerGame(GameInfo(410, CaptiveQueens, "Captive Queens", GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(418, Contradance, "Contradance", - GI.GT_2DECK_TYPE, 2, 1, GI.SL_LUCK)) + GI.GT_2DECK_TYPE, 2, 1, GI.SL_LUCK, + altnames=("Cotillion",) )) registerGame(GameInfo(419, IdleAces, "Idle Aces", GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(423, LadyOfTheManor, "Lady of the Manor", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK, + altnames=("Vassal", "La Chatelaine") )) registerGame(GameInfo(424, Matrimony, "Matrimony", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(429, Patriarchs, "Patriarchs", From 5b8b7f26e7000ea98df3b4e4a3282d63e7563567 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 3 Jul 2006 21:14:21 +0000 Subject: [PATCH 015/266] + 2 new game + added `overrelief' to toolbar buttons * fixed game `New York' git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@16 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/games/bakersdozen.py | 2 +- pysollib/games/bristol.py | 44 ++++++++++++++++++++++++++++++++++- pysollib/games/harp.py | 4 ++++ pysollib/games/klondike.py | 11 +++++++++ pysollib/games/parallels.py | 1 + pysollib/games/simplex.py | 7 ++++++ pysollib/games/spider.py | 8 +++---- pysollib/tk/toolbar.py | 1 + 8 files changed, 72 insertions(+), 6 deletions(-) diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py index 7a92de69..9aca8790 100644 --- a/pysollib/games/bakersdozen.py +++ b/pysollib/games/bakersdozen.py @@ -280,7 +280,7 @@ class Indefatigable(Cruel): RowStack_Class = UD_SS_RowStack def _shuffleHook(self, cards): - # move Kings to bottom of the Talon (i.e. last cards to be dealt) + # move Aces to bottom of the Talon (i.e. last cards to be dealt) return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == ACE, c.suit)) def shallHighlightMatch(self, stack1, card1, stack2, card2): diff --git a/pysollib/games/bristol.py b/pysollib/games/bristol.py index 01c8857e..f2f5d591 100644 --- a/pysollib/games/bristol.py +++ b/pysollib/games/bristol.py @@ -241,6 +241,24 @@ class Dover(Bristol): # // New York # ************************************************************************/ +class NewYork_Hint(CautiousDefaultHint): + def computeHints(self): + CautiousDefaultHint.computeHints(self) + if self.hints: + return + if not self.game.s.talon.cards: + return + c = self.game.s.talon.cards[-1].rank - self.game.base_card.rank + if c < 0: c += 13 + if 0 <= c <= 3: + r = self.game.s.reserves[0] + elif 4 <= c <= 7: + r = self.game.s.reserves[1] + else: + r = self.game.s.reserves[2] + self.addHint(5000, 1, self.game.s.talon, r) + + class NewYork_Talon(OpenTalonStack): rightclickHandler = OpenStack.rightclickHandler doubleclickHandler = OpenStack.doubleclickHandler @@ -265,6 +283,7 @@ class NewYork_RowStack(AC_RowStack): class NewYork(Dover): + Hint_Class = NewYork_Hint Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, max_move=0) Talon_Class = NewYork_Talon RowStack_Class = StackWrapper(NewYork_RowStack, base_rank=ANY_RANK, mod=13, max_move=1) @@ -293,7 +312,7 @@ class NewYork(Dover): self.base_card = self.s.talon.getCard() for s in self.s.foundations: s.cap.base_rank = self.base_card.rank - n = self.base_card.suit * self.gameinfo.decks + n = self.base_card.suit self.flipMove(self.s.talon) self.moveMove(1, self.s.talon, self.s.foundations[n]) ##self.updateText() @@ -342,6 +361,27 @@ class Spike(Dover): abs(card1.rank-card2.rank) == 1) +# /*********************************************************************** +# // Gotham +# ************************************************************************/ + +class Gotham_RowStack(RK_RowStack): + def acceptsCards(self, from_stack, cards): + if not RK_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return (from_stack is self.game.s.talon or + from_stack in self.game.s.reserves) + return True + +class Gotham(NewYork): + RowStack_Class = StackWrapper(Gotham_RowStack, base_rank=ANY_RANK, mod=13) + def startGame(self): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0) + NewYork.startGame(self) + + # register the game registerGame(GameInfo(42, Bristol, "Bristol", GI.GT_FAN_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) @@ -353,4 +393,6 @@ registerGame(GameInfo(425, NewYork, "New York", GI.GT_FAN_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(468, Spike, "Spike", GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(519, Gotham, "Gotham", + GI.GT_FAN_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index c86100e8..6c082ff0 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -183,6 +183,10 @@ class LadyJane(DoubleKlondike): DoubleKlondike.startGame(self, flip=1) def shallHighlightMatch(self, stack1, card1, stack2, card2): return abs(card1.rank-card2.rank) == 1 + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack.cards: + return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 + return 0 class Inquisitor(DoubleKlondike): diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index f02d7dfa..61d46dde 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -1059,6 +1059,15 @@ class Whitehorse(Klondike): self.leaveState(old_state) +# /*********************************************************************** +# // Boost +# ************************************************************************/ + +class Boost(Klondike): + def createGame(self): + Klondike.createGame(self, rows=4, max_rounds=3) + + # register the game registerGame(GameInfo(2, Klondike, "Klondike", GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) @@ -1164,4 +1173,6 @@ registerGame(GameInfo(479, Saratoga, "Saratoga", GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(491, Whitehorse, "Whitehorse", GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) +registerGame(GameInfo(518, Boost, "Boost", + GI.GT_KLONDIKE, 1, 2, GI.SL_BALANCED)) diff --git a/pysollib/games/parallels.py b/pysollib/games/parallels.py index 4eb5da93..eec12e78 100644 --- a/pysollib/games/parallels.py +++ b/pysollib/games/parallels.py @@ -82,6 +82,7 @@ class Parallels_TalonStack(DealRowTalonStack): column = [r for r in rows[i::10] if r.cards] column_ncards.append(len(column)) max_col = max(column_ncards) + max_col = max(max_col, 1) n = 0 rr = self.game.s.rows[:max_col*10] while True: diff --git a/pysollib/games/simplex.py b/pysollib/games/simplex.py index 03cd8aec..ce240ab9 100644 --- a/pysollib/games/simplex.py +++ b/pysollib/games/simplex.py @@ -54,6 +54,13 @@ class Simplex_Foundation(AbstractFoundationStack): class Simplex_RowStack(SequenceRowStack): + def canDropCards(self, stacks): + if len(self.cards) != 4: + return (None, 0) + for s in stacks: + if s is not self and s.acceptsCards(self, self.cards): + return (s, 4) + return (None, 0) def _isSequence(self, cards): return isSameRankSequence(cards) diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index cc62099d..1c8915c4 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -857,9 +857,9 @@ class Applegate(Game): # /*********************************************************************** # // Big Spider # // Spider 3x3 -# // Big Ground +# // Big Divorce # // Spider (4 decks) -# // Very Big Ground +# // Very Big Divorce # ************************************************************************/ class BigSpider(Spider): @@ -1071,7 +1071,7 @@ registerGame(GameInfo(382, Applegate, "Applegate", GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(384, BigSpider, "Big Spider", GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(401, GroundForADivorce3Decks, "Big Ground", +registerGame(GameInfo(401, GroundForADivorce3Decks, "Big Divorce", GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(441, York, "York", GI.GT_SPIDER | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_SKILL)) @@ -1091,7 +1091,7 @@ registerGame(GameInfo(449, Spider3x3, "Spider 3x3", rules_filename="bigspider.html")) registerGame(GameInfo(454, Spider4Decks, "Spider (4 decks)", GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(455, GroundForADivorce4Decks, "Very Big Ground", +registerGame(GameInfo(455, GroundForADivorce4Decks, "Very Big Divorce", GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(458, Spidike, "Spidike", GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) # GT_GYPSY ? diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index f717603a..06bbb400 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -333,6 +333,7 @@ class PysolToolbar(PysolToolbarActions): command=command, takefocus=0, text=gettext(label), relief=self.button_relief, + overrelief='raised', padx=self.button_pad, pady=self.button_pad) if image: From b81f93473aebf77f99f167057a0910dbf208ccdd Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 8 Jul 2006 21:25:35 +0000 Subject: [PATCH 016/266] + 1 new game * small improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@17 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 1 + pysollib/games/bakersdozen.py | 1 - pysollib/games/bakersgame.py | 4 --- pysollib/games/beleagueredcastle.py | 9 +++--- pysollib/games/fan.py | 2 -- pysollib/games/freecell.py | 28 ++++++++++++++--- pysollib/games/klondike.py | 1 - pysollib/games/montana.py | 2 -- pysollib/games/pileon.py | 1 - pysollib/games/siebenbisas.py | 1 - pysollib/games/sultan.py | 49 +++++++++++++++++++++++++++-- pysollib/games/tournament.py | 3 +- pysollib/games/yukon.py | 6 ---- pysollib/resource.py | 3 +- 14 files changed, 77 insertions(+), 34 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index f9bee889..f4552bfb 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -1561,6 +1561,7 @@ Please select a %s type %s. tile.text_color = "#" + m.group(2).lower() #n = re.sub("[-_]", " ", n) n = n.replace('_', ' ') + ##n = unicode(n) tile.name = n key = n.lower() if not t.has_key(key): diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py index 9aca8790..e4a373bb 100644 --- a/pysollib/games/bakersdozen.py +++ b/pysollib/games/bakersdozen.py @@ -182,7 +182,6 @@ class GoodMeasure(BakersDozen): assert c.rank == ACE self.flipMove(self.s.talon) self.moveMove(1, self.s.talon, self.s.foundations[c.suit]) - assert len(self.s.talon.cards) == 0 # /*********************************************************************** diff --git a/pysollib/games/bakersgame.py b/pysollib/games/bakersgame.py index a43789a5..3c8bb671 100644 --- a/pysollib/games/bakersgame.py +++ b/pysollib/games/bakersgame.py @@ -113,7 +113,6 @@ class BakersGame(Game): r = self.s.rows ##self.s.talon.dealRow(rows=(r[0], r[1], r[6], r[7])) self.s.talon.dealRow(rows=r[:4]) - assert len(self.s.talon.cards) == 0 def shallHighlightMatch(self, stack1, card1, stack2, card2): return (card1.suit == card2.suit and @@ -179,7 +178,6 @@ class EightOff(KingOnlyBakersGame): self.s.talon.dealRow() r = self.s.reserves self.s.talon.dealRow(rows=[r[0],r[2],r[4],r[6]]) - assert len(self.s.talon.cards) == 0 # /*********************************************************************** @@ -231,7 +229,6 @@ class SeahavenTowers(KingOnlyBakersGame): self.startDealSample() self.s.talon.dealRow() self.s.talon.dealRow(rows=(self.s.reserves[1:3])) - assert len(self.s.talon.cards) == 0 # /*********************************************************************** @@ -314,7 +311,6 @@ class Penguin(Game): self.s.talon.dealRow(frames=0) self.startDealSample() self.s.talon.dealRow() - assert len(self.s.talon.cards) == 0 def shallHighlightMatch(self, stack1, card1, stack2, card2): return (card1.suit == card2.suit and diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index d533ca39..6c1a5c0a 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -114,7 +114,6 @@ class StreetsAndAlleys(Game): self.startDealSample() for i in range(3): self.s.talon.dealRowAvail() - assert len(self.s.talon.cards) == 0 def shallHighlightMatch(self, stack1, card1, stack2, card2): return abs(card1.rank - card2.rank) == 1 @@ -136,7 +135,6 @@ class BeleagueredCastle(StreetsAndAlleys): for i in range(2): self.s.talon.dealRow() self.s.talon.dealRow(rows=self.s.foundations) - assert len(self.s.talon.cards) == 0 # /*********************************************************************** @@ -211,7 +209,6 @@ class Fortress(Game): self.startDealSample() for i in range(3): self.s.talon.dealRowAvail() - assert len(self.s.talon.cards) == 0 def shallHighlightMatch(self, stack1, card1, stack2, card2): return (card1.suit == card2.suit and @@ -502,14 +499,16 @@ class CastleOfIndolence(Game): # set window # (set size so that at least 13 cards are fully playable) w = max(3*l.XS, l.XS+13*l.XOFFSET) - self.setSize(l.XM+2*w+2*l.XS, l.YM + 5*l.YS) + self.setSize(l.XM+2*w+2*l.XS, l.YM + 5*l.YS + l.TEXT_HEIGHT) # create stacks x, y = l.XM, l.YM+4*l.YS s.talon = InitialDealTalonStack(x, y, self) x, y = l.XM+w-l.XS, l.YM+4*l.YS for i in range(4): - s.reserves.append(OpenStack(x, y, self, max_accept=0)) + stack = OpenStack(x, y, self, max_accept=0) + s.reserves.append(stack) + l.createText(stack, 's') x += l.XS x = l.XM + w diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index 63bb0f8e..72f2b2f4 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -119,7 +119,6 @@ class Fan(Game): self.s.talon.dealRow(rows=self.s.rows[:17], frames=0) self.startDealSample() self.s.talon.dealRow() - assert len(self.s.talon.cards) == 0 def shallHighlightMatch(self, stack1, card1, stack2, card2): return (card1.suit == card2.suit and @@ -440,7 +439,6 @@ class HouseInTheWood(Fan): self.s.talon.dealRow(rows=self.s.rows[:35], frames=0) self.startDealSample() self.s.talon.dealRow(rows=self.s.rows[:35]) - assert len(self.s.talon.cards) == 0 class HouseOnTheHill(HouseInTheWood): diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index 25c949e1..56b1398a 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -80,6 +80,7 @@ class FreeCell(Game): Talon_Class = InitialDealTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = FreeCell_RowStack + ReserveStack_Class = ReserveStack Hint_Class = FreeCellSolverWrapper(FreeCellType_Hint, {}) @@ -100,7 +101,7 @@ class FreeCell(Game): for r in l.s.rows: s.rows.append(self.RowStack_Class(r.x, r.y, self)) for r in l.s.reserves: - s.reserves.append(ReserveStack(r.x, r.y, self)) + s.reserves.append(self.ReserveStack_Class(r.x, r.y, self)) # default l.defaultAll() @@ -116,7 +117,6 @@ class FreeCell(Game): r = self.s.rows ##self.s.talon.dealRow(rows=(r[0], r[2], r[4], r[6])) self.s.talon.dealRow(rows=r[:4]) - assert len(self.s.talon.cards) == 0 def shallHighlightMatch(self, stack1, card1, stack2, card2): return (card1.color != card2.color and @@ -146,7 +146,6 @@ class ForeCell(FreeCell): self.startDealSample() self.s.talon.dealRow() self.s.talon.dealRow(rows=self.s.reserves) - assert len(self.s.talon.cards) == 0 # /*********************************************************************** @@ -183,7 +182,6 @@ class Stalactites(FreeCell): self.startDealSample() self.s.talon.dealRow() self.s.talon.dealRow(rows=self.s.foundations) - assert len(self.s.talon.cards) == 0 self._restoreGameHook(None) def _restoreGameHook(self, game): @@ -243,7 +241,6 @@ class DoubleFreecell(FreeCell): self.startDealSample() self.s.talon.dealRow() self.s.talon.dealRow(rows=self.s.foundations) - assert len(self.s.talon.cards) == 0 # /*********************************************************************** @@ -461,6 +458,7 @@ class Repair(FreeCell): # /*********************************************************************** # // Four Colours +# // German FreeCell # ************************************************************************/ class FourColours_RowStack(AC_RowStack): @@ -505,6 +503,24 @@ class FourColours(FreeCell): self.dealOne(frames=-1) +class GermanFreeCell_Reserve(ReserveStack): + def getBottomImage(self): + return self.game.app.images.getSuitBottom(self.cap.base_suit) + + +class GermanFreeCell(SevenByFour): + Hint_Class = FreeCellType_Hint + RowStack_Class = AC_RowStack + ReserveStack_Class = GermanFreeCell_Reserve + + def createGame(self): + FreeCell.createGame(self, rows=7) + suit = 0 + for r in self.s.reserves: + r.cap.base_suit = suit + suit += 1 + + # /*********************************************************************** # // Ocean Towers # ************************************************************************/ @@ -567,4 +583,6 @@ registerGame(GameInfo(509, BigCell, "Big Cell", GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(513, OceanTowers, "Ocean Towers", GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(520, GermanFreeCell, "German FreeCell", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 61d46dde..8ba5b78a 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -449,7 +449,6 @@ class Stonewall(Klondike): else: self.s.talon.dealRow(flip=flip, frames=frames) self.s.talon.dealRow(rows=self.s.reserves) - assert len(self.s.talon.cards) == 0 class FlowerGarden(Stonewall): diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py index a3ca410b..05327b8e 100644 --- a/pysollib/games/montana.py +++ b/pysollib/games/montana.py @@ -203,7 +203,6 @@ class Montana(Game): self.startDealSample() frames = 4 self.s.talon.dealRow(rows=(self.s.rows[i],), frames=frames) - assert len(self.s.talon.cards) == 0 def isGameWon(self): rows = self.s.rows @@ -272,7 +271,6 @@ class BlueMoon(Montana): frames = 4 self.s.talon.dealRow(rows=(self.s.rows[j],), frames=frames) j = j + 1 - assert len(self.s.talon.cards) == 0 ace_rows = filter(lambda r: r.cards and r.cards[-1].rank == ACE, self.s.rows) j = 0 for r in ace_rows: diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index f78187d0..e89202bc 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -103,7 +103,6 @@ class PileOn(Game): self.s.talon.dealRow(rows=r, frames=0) self.startDealSample() self.s.talon.dealRow(rows=r) - assert len(self.s.talon.cards) == 0 def isGameWon(self): for r in self.s.rows: diff --git a/pysollib/games/siebenbisas.py b/pysollib/games/siebenbisas.py index e1419612..088996f1 100644 --- a/pysollib/games/siebenbisas.py +++ b/pysollib/games/siebenbisas.py @@ -231,7 +231,6 @@ class Maze(Game): self.startDealSample() frames = -1 self.s.talon.dealRow(rows=(self.s.rows[i],), frames=frames) - assert len(self.s.talon.cards) == 0 def isGameWon(self): rows = filter(lambda s: s.cards, self.s.rows) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 1811f725..357854eb 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -402,6 +402,44 @@ class LadyOfTheManor(Game): # // Matrimony # ************************************************************************/ +class Matrimony_Talon(DealRowTalonStack): + + def canDealCards(self): + if self.round == self.max_rounds and not self.cards: + return False + return not self.game.isGameWon() + + def _redeal(self): + lr = len(self.game.s.rows) + num_cards = 0 + assert len(self.cards) == 0 + rows = self.game.s.rows + r = self.game.s.rows[-self.round] + for i in range(len(r.cards)): + num_cards = num_cards + 1 + self.game.moveMove(1, r, self, frames=4) + self.game.flipMove(self) + assert len(self.cards) == num_cards + self.game.nextRoundMove(self) + + def dealCards(self, sound=0): + if sound: + self.game.startDealSample() + if len(self.cards) == 0: + self._redeal() + if self.round == 1: + n = self.dealRowAvail(sound=sound) + else: + rows = [] + for r in self.game.s.rows: + if r.cards: + rows.append(r) + n = self.dealRowAvail(rows=rows, sound=sound) + if sound: + self.game.stopSamples() + return n + + class Matrimony(Game): def createGame(self): @@ -409,8 +447,13 @@ class Matrimony(Game): l, s = Layout(self), self.s self.setSize(l.XM+8*l.XS, l.YM+4*l.YS) - s.talon = DealRowTalonStack(l.XM, l.YM, self) - l.createText(s.talon, 'ss') + s.talon = Matrimony_Talon(l.XM, l.YM, self, max_rounds=17) + l.createText(s.talon, 'se') + tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, + font=self.app.getFont("canvas_default")) + x, y = l.XM+2*l.XS, l.YM for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, @@ -707,7 +750,7 @@ registerGame(GameInfo(423, LadyOfTheManor, "Lady of the Manor", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK, altnames=("Vassal", "La Chatelaine") )) registerGame(GameInfo(424, Matrimony, "Matrimony", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) + GI.GT_2DECK_TYPE, 2, 16, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(429, Patriarchs, "Patriarchs", GI.GT_2DECK_TYPE, 2, 1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(437, Simplicity, "Simplicity", diff --git a/pysollib/games/tournament.py b/pysollib/games/tournament.py index 2f067810..2e060e7c 100644 --- a/pysollib/games/tournament.py +++ b/pysollib/games/tournament.py @@ -238,8 +238,7 @@ registerGame(GameInfo(303, Tournament, "Tournament", GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(304, LaNivernaise, "La Nivernaise", GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK, - altnames = ("Napoleon's Flank", ), - rules_filename = "tournament.html")) + altnames = ("Napoleon's Flank", ),)) registerGame(GameInfo(386, KingsdownEights, "Kingsdown Eights", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index d099bb81..0d9b3ae1 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -112,7 +112,6 @@ class Yukon(Game): self.s.talon.dealRow(rows=self.s.rows[1:], flip=1, frames=0) self.startDealSample() self.s.talon.dealRow() - assert len(self.s.talon.cards) == 0 def getHighlightPilesStacks(self): return () @@ -167,7 +166,6 @@ class Odessa(RussianSolitaire): self.s.talon.dealRow(rows=self.s.rows[1:6], frames=0) self.startDealSample() self.s.talon.dealRow() - assert len(self.s.talon.cards) == 0 # /*********************************************************************** @@ -185,7 +183,6 @@ class Grandfather(RussianSolitaire): for i in (1,5,5,5,5,5,5): self.s.talon.dealRow(rows=[self.s.rows[n]]*i) n += 1 - assert len(self.s.talon.cards) == 0 # /*********************************************************************** @@ -361,7 +358,6 @@ class DoubleYukon(Yukon): self.s.talon.dealRow(flip=1, frames=0) self.startDealSample() self.s.talon.dealRow() - assert len(self.s.talon.cards) == 0 class DoubleRussianSolitaire(DoubleYukon): @@ -387,7 +383,6 @@ class TripleYukon(Yukon): self.s.talon.dealRow(rows=self.s.rows, flip=1, frames=0) self.startDealSample() self.s.talon.dealRow() - assert len(self.s.talon.cards) == 0 class TripleRussianSolitaire(TripleYukon): @@ -443,7 +438,6 @@ class TenAcross(Yukon): self.startDealSample() self.s.talon.dealRow() self.s.talon.dealRow(rows=self.s.reserves) - assert len(self.s.talon.cards) == 0 def shallHighlightMatch(self, stack1, card1, stack2, card2): return (card1.suit == card2.suit and diff --git a/pysollib/resource.py b/pysollib/resource.py index d9932001..c8c0487b 100644 --- a/pysollib/resource.py +++ b/pysollib/resource.py @@ -63,7 +63,8 @@ class Resource(Struct): apply(Struct.__init__, (self,), kw.getKw()) def getSortKey(self): - return latin1_to_ascii(self.name).lower() + return self.name.lower() + #return latin1_to_ascii(self.name).lower() class ResourceManager: From 2aa38bdda56c2463f74e9d3697b2075629270079 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 10 Jul 2006 21:20:35 +0000 Subject: [PATCH 017/266] + 3 new game * fixed game `Matrimony' * improved toolbar git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@18 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/games/canfield.py | 21 ++++++++- pysollib/games/harp.py | 4 ++ pysollib/games/katzenschwanz.py | 82 +++++++++++++++++++++++++++------ pysollib/games/klondike.py | 10 +++- pysollib/games/sultan.py | 7 ++- pysollib/tk/toolbar.py | 5 +- 6 files changed, 107 insertions(+), 22 deletions(-) diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 51946733..02efc8cb 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -92,6 +92,7 @@ class Canfield_RK_RowStack(RK_RowStack): # ************************************************************************/ class Canfield(Game): + Talon_Class = WasteTalonStack Foundation_Class = SS_FoundationStack RowStack_Class = StackWrapper(Canfield_AC_RowStack, mod=13) ReserveStack_Class = OpenStack @@ -126,7 +127,7 @@ class Canfield(Game): # create stacks x, y = l.XM, l.YM - s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds, num_deal=num_deal) + s.talon = self.Talon_Class(x, y, self, max_rounds=max_rounds, num_deal=num_deal) l.createText(s.talon, "s") x = x + l.XS s.waste = WasteStack(x, y, self) @@ -668,6 +669,22 @@ class Demon(Canfield): Canfield.createGame(self, rows=8, max_rounds=UNLIMITED_REDEALS, num_deal=1) +# /*********************************************************************** +# // Canfield Rush +# ************************************************************************/ + +class CanfieldRush_Talon(WasteTalonStack): + def dealCards(self, sound=0): + self.num_deal = 4-self.round + WasteTalonStack.dealCards(self, sound=sound) + +class CanfieldRush(Canfield): + Talon_Class = CanfieldRush_Talon + #RowStack_Class = StackWrapper(AC_RowStack, mod=13) + def createGame(self): + Canfield.createGame(self, max_rounds=3) + + # register the game registerGame(GameInfo(105, Canfield, "Canfield", # was: 262 GI.GT_CANFIELD | GI.GT_CONTRIB, 1, -1, GI.SL_BALANCED)) @@ -709,4 +726,6 @@ registerGame(GameInfo(476, Demon, "Demon", GI.GT_CANFIELD, 2, -1, GI.SL_BALANCED)) registerGame(GameInfo(494, Mystique, "Mystique", GI.GT_CANFIELD, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(521, CanfieldRush, "Canfield Rush", + GI.GT_CANFIELD, 1, 2, GI.SL_BALANCED)) diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index 6c082ff0..f0e11499 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -213,6 +213,10 @@ class Arabella(DoubleKlondike): DoubleKlondike.startGame(self, flip=1) def shallHighlightMatch(self, stack1, card1, stack2, card2): return abs(card1.rank-card2.rank) == 1 + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack.cards: + return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 + return 0 # register the game diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index 7da00236..603360ca 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -40,7 +40,7 @@ from pysollib.util import * from pysollib.stack import * from pysollib.game import Game from pysollib.layout import Layout -from pysollib.hint import DefaultHint, FreeCellType_Hint +from pysollib.hint import DefaultHint, FreeCellType_Hint, CautiousDefaultHint # /*********************************************************************** # // @@ -195,7 +195,7 @@ class Retinue(DieSchlange, Kings): # // Salic Law # ************************************************************************/ -class SalicLaw_Hint(DefaultHint): +class SalicLaw_Hint(CautiousDefaultHint): # Score for dropping ncards from stack r to stack t. def _getDropCardScore(self, score, color, r, t, ncards): @@ -213,11 +213,12 @@ class SalicLaw_Talon(OpenTalonStack): def dealCards(self, sound=0): if len(self.cards) == 0: return 0 + base_rank=self.game.ROW_BASE_RANK old_state = self.game.enterState(self.game.S_DEAL) rows = self.game.s.rows c = self.cards[-1] ri = len([r for r in rows if r.cards]) - if c.rank == KING: + if c.rank == base_rank: to_stack = rows[ri] else: to_stack = rows[ri-1] @@ -225,8 +226,8 @@ class SalicLaw_Talon(OpenTalonStack): frames = 3 if not self.game.demo: self.game.startDealSample() + self.game.flipMove(self) self.game.moveMove(1, self, to_stack, frames=frames) - self.game.flipMove(to_stack) if not self.game.demo: self.game.stopSamples() self.game.leaveState(old_state) @@ -237,6 +238,14 @@ class SalicLaw(DerKatzenschwanz): Hint_Class = SalicLaw_Hint + Foundation_Classes = [ + StackWrapper(AbstractFoundationStack, max_cards=1, base_rank=QUEEN), + StackWrapper(RK_FoundationStack, base_rank=ACE, max_cards=11), + ] + RowStack_Class = OpenStack + + ROW_BASE_RANK = KING + # # game layout # @@ -259,21 +268,19 @@ class SalicLaw(DerKatzenschwanz): yoffset.append(0) # create stacks - x, y = l.XM, l.YM - for i in range(8): - s.foundations.append(AbstractFoundationStack(x, y, self, - suit=ANY_SUIT, max_cards=1, max_move=0, base_rank=QUEEN)) - x += l.XS - x, y = l.XM, l.YM+l.YS - for i in range(8): - s.foundations.append(RK_FoundationStack(x, y, self, - suit=ANY_SUIT, base_rank=ACE, max_cards=11)) - x += l.XS + y = l.YM + for found_class in self.Foundation_Classes: + x = l.XM + for i in range(8): + s.foundations.append(found_class(x, y, self, + suit=ANY_SUIT, max_move=0)) + x += l.XS + y += l.YS x, y = l.XM, l.YM+2*l.YS self.setRegion(s.foundations[8:], (-999, -999, 999999, y - l.XM / 2)) for i in range(8): - stack = OpenStack(x, y, self, max_move=1) + stack = self.RowStack_Class(x, y, self, max_move=1) stack.CARD_XOFFSET = xoffset stack.CARD_YOFFSET = yoffset s.rows.append(stack) @@ -332,6 +339,49 @@ class Deep(DerKatzenschwanz): self.s.talon.dealRow() +# /*********************************************************************** +# // Laggard Lady +# ************************************************************************/ + +class LaggardLady_RowStack(OpenStack): + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return False + return len(self.game.s.talon.cards) == 0 and len(self.cards) == 1 + + def canMoveCards(self, cards): + if not OpenStack.canMoveCards(self, cards): + return False + return len(self.cards) > 1 + + +class LaggardLady(SalicLaw): + + Foundation_Classes = [ + StackWrapper(RK_FoundationStack, base_rank=5, max_cards=6), + StackWrapper(RK_FoundationStack, base_rank=4, max_cards=6, dir=-1, mod=13), + ] + RowStack_Class = StackWrapper(LaggardLady_RowStack, max_accept=1) + + ROW_BASE_RANK = QUEEN + + def _shuffleHook(self, cards): + for c in cards[:]: + if c.rank == QUEEN: + cards.remove(c) + break + cards.append(c) + return cards + + def isGameWon(self): + if self.s.talon.cards: + return False + for s in self.s.foundations: + if len(s.cards) != 6: + return False + return True + + # register the game registerGame(GameInfo(141, DerKatzenschwanz, "Cat's Tail", @@ -348,5 +398,7 @@ registerGame(GameInfo(299, SalicLaw, "Salic Law", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(442, Deep, "Deep", GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(523, LaggardLady, "Laggard Lady", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 8ba5b78a..0dcd9f73 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -854,18 +854,24 @@ class Q_C_(Klondike): # /*********************************************************************** # // Northwest Territory +# // Artic Garden # ************************************************************************/ class NorthwestTerritory(KingAlbert): RowStack_Class = StackWrapper(AC_RowStack, base_rank=KING) RESERVES = (4, 4, 4, 4) ROWS = 8 - def startGame(self): Klondike.startGame(self, flip=0, reverse=0) self.s.talon.dealRow(rows=self.s.reserves) +class ArticGarden(NorthwestTerritory): + def startGame(self): + Klondike.startGame(self, flip=1, reverse=0) + self.s.talon.dealRow(rows=self.s.reserves) + + # /*********************************************************************** # // Aunt Mary # ************************************************************************/ @@ -1174,4 +1180,6 @@ registerGame(GameInfo(491, Whitehorse, "Whitehorse", GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(518, Boost, "Boost", GI.GT_KLONDIKE, 1, 2, GI.SL_BALANCED)) +registerGame(GameInfo(522, ArticGarden, "Artic Garden", + GI.GT_RAGLAN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 357854eb..8fc8ca50 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -430,11 +430,10 @@ class Matrimony_Talon(DealRowTalonStack): if self.round == 1: n = self.dealRowAvail(sound=sound) else: - rows = [] - for r in self.game.s.rows: - if r.cards: - rows.append(r) + rows = self.game.s.rows[-self.round+1:] n = self.dealRowAvail(rows=rows, sound=sound) + while self.cards: + n += self.dealRowAvail(rows=self.game.s.rows, sound=sound) if sound: self.game.stopSamples() return n diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index 06bbb400..25a6f1be 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -326,12 +326,14 @@ class PysolToolbar(PysolToolbarActions): name = label.lower() image = self._loadImage(name) position = len(self._widgets) + bd = self.button_relief == 'flat' and 1 or 2 button = ToolbarButton(self.frame, position=position, toolbar=self, toolbar_name=name, command=command, takefocus=0, text=gettext(label), + bd=bd, relief=self.button_relief, overrelief='raised', padx=self.button_pad, @@ -475,7 +477,8 @@ class PysolToolbar(PysolToolbarActions): self.frame.config(relief=self.frame_relief) for w in self._widgets: if isinstance(w, ToolbarButton): - w.config(relief=self.button_relief) + bd = relief == 'flat' and 1 or 2 + w.config(relief=self.button_relief, bd=bd) elif w.__class__ is ToolbarSeparator: # not ToolbarFlatSeparator w.config(relief=self.separator_relief) return True From 3c25e97e13141602283e12c4947a15435b71f6e6 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 14 Jul 2006 21:09:12 +0000 Subject: [PATCH 018/266] + 9 new game + added command-line option `--debug' (undocumented) - removed `mixer' button in soundoptionsdialog * small improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@19 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 6 +- pysollib/games/beleagueredcastle.py | 42 ++++++++++- pysollib/games/canfield.py | 52 +++++++++++-- pysollib/games/fortythieves.py | 20 +++++ pysollib/games/gypsy.py | 4 +- pysollib/games/klondike.py | 17 +++++ pysollib/games/ultra/larasgame.py | 49 +++++++------ pysollib/games/yukon.py | 110 +++++++++++++++++++++++++++- pysollib/main.py | 19 +++-- pysollib/settings.py | 11 --- pysollib/tk/soundoptionsdialog.py | 21 +----- 11 files changed, 276 insertions(+), 75 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index f4552bfb..e5d375da 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -846,8 +846,10 @@ class Application: def loadImages3(self): MfxMessageDialog.img = {} - #dir = os.path.join('images', 'dialog', 'default') - dir = os.path.join('images', 'dialog', 'bluecurve') + if os.name == 'posix': + dir = os.path.join('images', 'dialog', 'bluecurve') + else: + dir = os.path.join('images', 'dialog', 'default') for f in ('error', 'info', 'question', 'warning'): fn = self.dataloader.findImage(f, dir) im = loadImage(fn) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 6c1a5c0a..e27f491c 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -60,11 +60,14 @@ class BeleagueredCastleType_Hint(CautiousDefaultHint): class StreetsAndAlleys(Game): Hint_Class = BeleagueredCastleType_Hint + Foundation_Class = SS_FoundationStack + RowStack_Class = RK_RowStack + # # game layout # - def createGame(self, playcards=13, reserves=0): + def createGame(self, playcards=13, reserves=0, texts=False): # create layout l, s = Layout(self), self.s @@ -75,7 +78,8 @@ class StreetsAndAlleys(Game): x1 = x0 + w + 2*l.XM x2 = x1 + l.XS + 2*l.XM x3 = x2 + w + l.XM - self.setSize(x3, l.YM + (4+int(reserves!=0))*l.YS) + h = l.YM + (4+int(reserves!=0))*l.YS + int(texts)*l.TEXT_HEIGHT + self.setSize(x3, h) # create stacks y = l.YM @@ -87,12 +91,17 @@ class StreetsAndAlleys(Game): y += l.YS x = x1 for i in range(4): - s.foundations.append(SS_FoundationStack(x, y, self, i, max_move=0)) + s.foundations.append(self.Foundation_Class(x, y, self, i, max_move=0)) y = y + l.YS + if texts: + tx, ty, ta, tf = l.getTextAttr(None, "ss") + tx, ty = x+tx, y-l.YS+ty + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) for x in (x0, x2): y = l.YM+l.YS*int(reserves!=0) for i in range(4): - stack = RK_RowStack(x, y, self, max_move=1, max_accept=1) + stack = self.RowStack_Class(x, y, self, max_move=1, max_accept=1) stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 s.rows.append(stack) y = y + l.YS @@ -682,6 +691,29 @@ class CastleMount(Lightweight): return 0 +# /*********************************************************************** +# // Selective Castle +# ************************************************************************/ + +class SelectiveCastle_RowStack(RK_RowStack): + def canDropCards(self, stacks): + if self.game.demo: + return RK_RowStack.canDropCards(self, stacks) + for s in self.game.s.foundations: + if s.cards: + return RK_RowStack.canDropCards(self, stacks) + return (None, 0) + +class SelectiveCastle(StreetsAndAlleys, Chessboard): + Foundation_Class = Chessboard_Foundation + RowStack_Class = StackWrapper(SelectiveCastle_RowStack, mod=13) + + def createGame(self): + StreetsAndAlleys.createGame(self, texts=True) + + def updateText(self): + Chessboard.updateText(self) + # register the game registerGame(GameInfo(146, StreetsAndAlleys, "Streets and Alleys", @@ -716,3 +748,5 @@ registerGame(GameInfo(507, Lightweight, "Lightweight", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(508, CastleMount, "Castle Mount", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 3, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(524, SelectiveCastle, "Selective Castle", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 02efc8cb..bcfed620 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -408,6 +408,7 @@ class EagleWing(Canfield): # /*********************************************************************** # // Gate # // Little Gate +# // Doorway # ************************************************************************/ class Gate(Game): @@ -477,31 +478,35 @@ class Gate(Game): class LittleGate(Gate): + RowStack_Class = AC_RowStack + ReserveStack_Class = StackWrapper(OpenStack, max_accept=0) + # # game layout # - def createGame(self): + def createGame(self, rows=4): # create layout l, s = Layout(self), self.s # set window - w, h = l.XM+7*l.XS, l.YM+2*l.YS+12*l.YOFFSET + max_rows = max(7, rows+3) + w, h = l.XM+max_rows*l.XS, l.YM+2*l.YS+12*l.YOFFSET self.setSize(w, h) # create stacks y = l.YM+l.YS+l.TEXT_HEIGHT for x in (l.XM, w-l.XS): - stack = OpenStack(x, y, self, max_accept=0) + stack = self.ReserveStack_Class(x, y, self) stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET s.reserves.append(stack) - x, y = l.XM+3*l.XS, l.YM + x, y = l.XM+(max_rows-4)*l.XS, l.YM for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) x += l.XS - x, y = int(l.XM+1.5*l.XS), l.YM+l.YS+l.TEXT_HEIGHT - for i in range(4): - s.rows.append(AC_RowStack(x, y, self)) + x, y = l.XM+(max_rows-rows)*l.XS/2, l.YM+l.YS+l.TEXT_HEIGHT + for i in range(rows): + s.rows.append(self.RowStack_Class(x, y, self)) x += l.XS s.talon = WasteTalonStack(l.XM, l.YM, self, max_rounds=1) l.createText(s.talon, "ss") @@ -511,6 +516,37 @@ class LittleGate(Gate): # define stack-groups l.defaultStackGroups() + return l + + +class Doorway(LittleGate): + + Hint_Class = CautiousDefaultHint + RowStack_Class = StackWrapper(RK_RowStack, max_move=1) + ReserveStack_Class = ReserveStack + + def createGame(self): + l = LittleGate.createGame(self, rows=5) + tx, ty, ta, tf = l.getTextAttr(self.s.reserves[0], "s") + font = self.app.getFont("canvas_default") + MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font, text=_('King')) + tx, ty, ta, tf = l.getTextAttr(self.s.reserves[1], "s") + font = self.app.getFont("canvas_default") + MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font, text=_('Queen')) + self.s.reserves[0].cap.base_rank = KING + self.s.reserves[1].cap.base_rank = QUEEN + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def fillStack(self, stack): + pass + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + # /*********************************************************************** # // Minerva @@ -728,4 +764,6 @@ registerGame(GameInfo(494, Mystique, "Mystique", GI.GT_CANFIELD, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(521, CanfieldRush, "Canfield Rush", GI.GT_CANFIELD, 1, 2, GI.SL_BALANCED)) +registerGame(GameInfo(527, Doorway, "Doorway", + GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 366e6d12..5c7cd7b5 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -158,6 +158,7 @@ class FortyThieves(Game): # // Josephine # // Marie Rose # // Big Courtyard +# // San Juan Hill # // rows build down by suit # ************************************************************************/ @@ -249,6 +250,12 @@ class Carnation(Limited): FortyThieves.createGame(self, rows=16, playcards=20, XCARDS=120) +class SanJuanHill(FortyThieves): + def createGame(self): + FortyThieves.createGame(self, XOFFSET=0) + + + # /*********************************************************************** # // Deuces # ************************************************************************/ @@ -457,6 +464,7 @@ class Mumbai(Indian): # // Napoleon's Exile # // Double Rail # // Single Rail (1 deck) +# // Final Battle # // rows build down by rank # ************************************************************************/ @@ -482,6 +490,12 @@ class SingleRail(DoubleRail): FortyThieves.createGame(self, rows=4, XCARDS=48) +class FinalBattle(DoubleRail): + def createGame(self): + FortyThieves.createGame(self, rows=6) + + + # /*********************************************************************** # // Octave # ************************************************************************/ @@ -832,3 +846,9 @@ registerGame(GameInfo(506, Express, "Express", GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(514, Carnation, "Carnation", GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 4, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(528, FinalBattle, "Final Battle", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(529, SanJuanHill, "San Juan Hill", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) + + diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index 2bf77505..f2a3c5f0 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -416,6 +416,8 @@ class Cone_Talon(DealRowTalonStack): def canDealCards(self): if not DealRowTalonStack.canDealCards(self): return False + if len(self.cards) == 4: + return True for r in self.game.s.rows: if not r.cards: return False @@ -425,7 +427,7 @@ class Cone_Talon(DealRowTalonStack): rows = self.game.s.rows if len(self.cards) == 4: rows = self.game.s.reserves - self.dealRowAvail(rows=rows, sound=sound) + return self.dealRowAvail(rows=rows, sound=sound) class Cone(Gypsy): diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 0dcd9f73..874e1ebf 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -839,6 +839,8 @@ class Q_C_(Klondike): self.fillAll() return # waste + if not self.s.waste.cards and self.s.talon.cards: + self.s.talon.dealCards() if self.fillOne(self.s.waste): self.fillAll() @@ -1073,6 +1075,19 @@ class Boost(Klondike): Klondike.createGame(self, rows=4, max_rounds=3) +# /*********************************************************************** +# // Gold Rush +# ************************************************************************/ + +from canfield import CanfieldRush_Talon + +class GoldRush(Klondike): + Talon_Class = CanfieldRush_Talon + def createGame(self): + Klondike.createGame(self, max_rounds=3) + + + # register the game registerGame(GameInfo(2, Klondike, "Klondike", GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) @@ -1182,4 +1197,6 @@ registerGame(GameInfo(518, Boost, "Boost", GI.GT_KLONDIKE, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(522, ArticGarden, "Artic Garden", GI.GT_RAGLAN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(532, GoldRush, "Gold Rush", + GI.GT_KLONDIKE, 1, 2, GI.SL_BALANCED)) diff --git a/pysollib/games/ultra/larasgame.py b/pysollib/games/ultra/larasgame.py index f61180ba..ae2bbfb7 100644 --- a/pysollib/games/ultra/larasgame.py +++ b/pysollib/games/ultra/larasgame.py @@ -54,17 +54,21 @@ class LarasGame_Hint(CautiousDefaultHint): class LarasGame_Talon(WasteTalonStack): # Deal a card to each of the RowStacks. Then deal # cards to the talon. Return number of cards dealt. - def dealRow(self, rows=None, flip=1, reverse=0, frames=-1): + def dealRow(self, rows=None, flip=1, reverse=0, frames=-1, sound=0): game = self.game if rows is None: rows = game.s.rows old_state = game.enterState(game.S_DEAL) cards = self.dealToStacks(rows[:game.MAX_ROW], flip, reverse, frames) + if sound and frames and self.game.app.opt.animations: + self.game.startDealSample() for i in range(game.DEAL_TO_TALON): if self.cards: game.moveMove(1, self, game.s.rows[-1], frames=frames) cards = cards + 1 game.leaveState(old_state) + if sound: + self.game.stopSamples() return cards def dealToStacks(self, stacks, flip=1, reverse=0, frames=-1): @@ -102,6 +106,8 @@ class LarasGame_Talon(WasteTalonStack): def dealCards(self, sound=0): game = self.game + if sound and self.game.app.opt.animations: + self.game.startDealSample() for r in game.s.reserves[:20]: while r.cards: game.moveMove(1, r, game.s.rows[game.active_row], frames=3, shadow=0) @@ -123,25 +129,26 @@ class LarasGame_Talon(WasteTalonStack): for i in range(ncards): game.moveMove(1, game.s.rows[game.active_row], game.s.reserves[ncards - i], frames=4, shadow=0) - return len(self.cards) or self.canDealCards() - if self.round < self.max_rounds: - num_cards = 0 - rows = list(game.s.rows)[:game.MAX_ROW] - rows.reverse() - for r in rows: - while r.cards: - num_cards = num_cards + 1 - if r.cards[-1].face_up: - game.flipMove(r) - game.moveMove(1, r, self, frames=0) - assert len(self.cards) == num_cards - if num_cards == 0: - return 0 - game.nextRoundMove(self) - game.dealToRows() + num_cards = len(self.cards) or self.canDealCards() + else: # not self.cards + if self.round < self.max_rounds: + ncards = 0 + rows = list(game.s.rows)[:game.MAX_ROW] + rows.reverse() + for r in rows: + while r.cards: + ncards += 1 + if r.cards[-1].face_up: + game.flipMove(r) + game.moveMove(1, r, self, frames=0) + assert len(self.cards) == ncards + if ncards != 0: + game.nextRoundMove(self) + game.dealToRows() + num_cards = len(self.cards) if sound: game.stopSamples() - return len(self.cards) + return num_cards def canDealCards(self): if self.game.demo and self.game.moves.index >= 400: @@ -380,7 +387,7 @@ class LarasGame(Game): assert moves.index == len(moves.history) moves.current = [] self.updateText() - self.updateStatus(moves=moves.index) + self.updateStatus(moves=(moves.index, self.stats.total_moves)) self.updateMenus() return 1 @@ -404,7 +411,7 @@ class LarasGame(Game): self.stats.total_moves = self.stats.total_moves + 1 self.hints.list = None self.updateText() - self.updateStatus(moves = self.moves.index) + self.updateStatus(moves=(self.moves.index, self.stats.total_moves)) self.updateMenus() def redo(self): @@ -425,7 +432,7 @@ class LarasGame(Game): self.stats.total_moves = self.stats.total_moves + 1 self.hints.list = None self.updateText() - self.updateStatus(moves = self.moves.index) + self.updateStatus(moves=(self.moves.index, self.stats.total_moves)) self.updateMenus() def _restoreGameHook(self, game): diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index 0d9b3ae1..ddbf544d 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -87,7 +87,6 @@ class Yukon(Game): RowStack_Class = StackWrapper(Yukon_AC_RowStack, base_rank=KING) Hint_Class = Yukon_Hint - def createGame(self, **layout): # create layout l, s = Layout(self), self.s @@ -95,7 +94,7 @@ class Yukon(Game): apply(self.Layout_Method, (l,), layout) self.setSize(l.size[0], l.size[1]) # create stacks - s.talon =self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) for r in l.s.foundations: s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit, max_move=0)) @@ -538,6 +537,104 @@ class Geoffrey(Yukon): return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 +# /*********************************************************************** +# // Queensland +# ************************************************************************/ + +class Queensland(Yukon): + Layout_Method = Layout.klondikeLayout + RowStack_Class = Yukon_SS_RowStack + + def createGame(self): + Yukon.createGame(self, waste=0) + + def startGame(self): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRowAvail() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Outback Patience +# ************************************************************************/ + +class OutbackPatience(Yukon): + + def createGame(self, max_rounds=-1, num_deal=1, **layout): + l, s = Layout(self), self.s + l.klondikeLayout(rows=7, waste=1, texts=1, playcards=20) + self.setSize(l.size[0], l.size[1]) + + s.talon = WasteTalonStack(l.s.talon.x, l.s.talon.y, self, max_rounds=1) + s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) + for r in l.s.foundations: + s.foundations.append(SS_FoundationStack(r.x, r.y, self, suit=r.suit)) + for r in l.s.rows: + s.rows.append(Yukon_SS_RowStack(r.x, r.y, self, base_rank=KING)) + + l.defaultAll() + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Russian Spider +# // Double Russian Spider +# ************************************************************************/ + +class RussianSpider_RowStack(Yukon_SS_RowStack): #Spider_SS_RowStack + def canDropCards(self, stacks): + if len(self.cards) < 13: + return (None, 0) + cards = self.cards[-13:] + for s in stacks: + if s is not self and s.acceptsCards(self, cards): + return (s, 13) + return (None, 0) + + +class RussianSpider(RussianSolitaire): + RowStack_Class = StackWrapper(RussianSpider_RowStack, base_rank=KING) + Foundation_Class = Spider_SS_Foundation + + def createGame(self, rows=7): + # create layout + l, s = Layout(self), self.s + l.yukonLayout(rows=rows, texts=0, playcards=25) + self.setSize(l.size[0], l.size[1]) + # create stacks + s.talon = self.Talon_Class(l.s.talon.x, l.s.talon.y, self) + for r in l.s.foundations: + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=ANY_SUIT, + max_move=0)) + for r in l.s.rows: + s.rows.append(self.RowStack_Class(r.x, r.y, self)) + # default + l.defaultAll() + + +class DoubleRussianSpider(RussianSpider, DoubleRussianSolitaire): + def createGame(self): + RussianSpider.createGame(self, rows=10) + + def startGame(self): + DoubleRussianSolitaire.startGame(self) + # register the game registerGame(GameInfo(19, Yukon, "Yukon", @@ -586,4 +683,11 @@ registerGame(GameInfo(488, TripleRussianSolitaire, "Triple Russian Solitaire", GI.GT_YUKON, 3, 0, GI.SL_BALANCED)) registerGame(GameInfo(492, Geoffrey, "Geoffrey", GI.GT_YUKON, 1, 0, GI.SL_MOSTLY_SKILL)) - +registerGame(GameInfo(525, Queensland, "Queensland", + GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(526, OutbackPatience, "Outback Patience", + GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(530, RussianSpider, "Russian Spider", + GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(531, DoubleRussianSpider, "Double Russian Spider", + GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/main.py b/pysollib/main.py index 1da70ab7..588f1867 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -84,27 +84,29 @@ Please check your %s installation. def parse_option(argv): prog_name = argv[0] try: - optlist, args = getopt.getopt(argv[1:], "h", + optlist, args = getopt.getopt(argv[1:], "hD:", ["fg=", "foreground=", "bg=", "background=", "fn=", "font=", "noplugins", "nosound", + "debug=", "help"]) except getopt.GetoptError, err: print _("%s: %s\ntry %s --help for more information") \ % (prog_name, err, prog_name) return None - opts = {"help": 0, + opts = {"help": False, "fg": None, "bg": None, "fn": None, - "noplugins": 0, - "nosound": 0, + "noplugins": False, + "nosound": False, + "debug": 0, } for i in optlist: if i[0] in ("-h", "--help"): - opts["help"] = 1 + opts["help"] = True elif i[0] in ("--fg", "--foreground"): opts["fg"] = i[1] elif i[0] in ("--bg", "--background"): @@ -112,9 +114,11 @@ def parse_option(argv): elif i[0] in ("--fn", "--font"): opts["fn"] = i[1] elif i[0] == "--noplugins": - opts["noplugins"] = 1 + opts["noplugins"] = True elif i[0] == "--nosound": - opts["nosound"] = 1 + opts["nosound"] = True + elif i[0] in ("-D", "--debug"): + opts["debug"] = i[1] if opts["help"]: print _("""Usage: %s [OPTIONS] [FILE] @@ -173,6 +177,7 @@ def pysol_init(app, args): wm_command = prog + " " + os.path.abspath(argv0) if filename: app.commandline.loadgame = filename + app.debug = int(opts['debug']) # init games database import games diff --git a/pysollib/settings.py b/pysollib/settings.py index 65cb17f8..05c0f078 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -43,17 +43,6 @@ if os.name == "nt": if os.name == "mac": pass -# sound mixers -MIXERS = () -if os.name == "nt": - MIXERS = (("sndvol32.exe", None),) -elif os.name == "posix": - MIXERS = ( - #("alsamixer", None), - ("kmix", None), - ("gmix", None), - ) - TOP_SIZE = 10 TOP_TITLE = n_("Top 10") diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index b4cff8cf..ebec5c7e 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -44,7 +44,6 @@ import traceback from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct, spawnvp from pysollib.settings import PACKAGE from pysollib.pysolaudio import pysolsoundserver -from pysollib.settings import MIXERS # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE @@ -55,7 +54,6 @@ from tkwidget import MfxDialog, MfxMessageDialog # ************************************************************************/ class SoundOptionsDialog(MfxDialog): - MIXER = () def __init__(self, parent, title, app, **kw): self.app = app @@ -168,17 +166,13 @@ class SoundOptionsDialog(MfxDialog): self.mainloop(focus, kw.timeout) def initKw(self, kw): - strings=[_("&OK"), _("&Apply"), _("&Mixer..."), _("&Cancel"),] - if self.MIXER is None: - strings[2] = (_("&Mixer..."), -1) -## if os.name != "nt" and not self.app.debug: -## strings[2] = None + strings=[_("&OK"), _("&Apply"), _("&Cancel"),] kw = KwStruct(kw, strings=strings, default=0, resizable=1, padx=10, pady=10, - buttonpadx=1, buttonpady=5, + buttonpadx=10, buttonpady=5, ) return MfxDialog.initKw(self, kw) @@ -191,17 +185,6 @@ class SoundOptionsDialog(MfxDialog): for n, t, v in self.samples: self.app.opt.sound_samples[n] = v.get() elif button == 2: - for name, args in MIXERS: - try: - f = spawnvp(name, args) - if f: - self.MIXER = (f, args) - return - except: - if traceback: traceback.print_exc() - pass - self.MIXER = None - elif button == 3: self.app.opt = self.saved_opt if self.app.audio: self.app.audio.updateSettings() From e97a944692bc8aa04faeb829c31a49a6c39c5e46 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 16 Jul 2006 21:05:30 +0000 Subject: [PATCH 019/266] + 6 new game * fixed game `Arachnida' + expanded debug support git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@20 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/games/beleagueredcastle.py | 9 +- pysollib/games/curdsandwhey.py | 41 +++++++- pysollib/games/dieboesesieben.py | 2 +- pysollib/games/fortythieves.py | 9 +- pysollib/games/napoleon.py | 157 +++++++++++++++++++++++----- pysollib/games/spider.py | 2 +- pysollib/games/terrace.py | 45 +++++++- pysollib/resource.py | 4 +- pysollib/stack.py | 10 +- 9 files changed, 234 insertions(+), 45 deletions(-) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index e27f491c..9bb3b2e9 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -91,7 +91,7 @@ class StreetsAndAlleys(Game): y += l.YS x = x1 for i in range(4): - s.foundations.append(self.Foundation_Class(x, y, self, i, max_move=0)) + s.foundations.append(self.Foundation_Class(x, y, self, suit=i, max_move=0)) y = y + l.YS if texts: tx, ty, ta, tf = l.getTextAttr(None, "ss") @@ -148,6 +148,7 @@ class BeleagueredCastle(StreetsAndAlleys): # /*********************************************************************** # // Citadel +# // Exiled Kings # ************************************************************************/ class Citadel(StreetsAndAlleys): @@ -174,6 +175,10 @@ class Citadel(StreetsAndAlleys): break +class ExiledKings(Citadel): + RowStack_Class = StackWrapper(RK_RowStack, base_rank=KING) + + # /*********************************************************************** # // Fortress # ************************************************************************/ @@ -750,3 +755,5 @@ registerGame(GameInfo(508, CastleMount, "Castle Mount", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(524, SelectiveCastle, "Selective Castle", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(535, ExiledKings, "Exiled Kings", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index 4f9fa7c2..7c3e09f1 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -47,9 +47,11 @@ class CurdsAndWhey_RowStack(BasicRowStack): if not self.cards: return True c1, c2 = self.cards[-1], cards[0] + if c1.rank == c2.rank: + return True if c1.suit == c2.suit: return c1.rank == c2.rank+1 - return c1.rank == c2.rank + return False def canMoveCards(self, cards): return isSameSuitSequence(cards) or isRankSequence(cards, dir=0) @@ -197,6 +199,7 @@ class Robin(Dumfries): # /*********************************************************************** # // Arachnida +# // Harvestman # ************************************************************************/ class Arachnida_RowStack(BasicRowStack): @@ -216,13 +219,14 @@ class Arachnida_RowStack(BasicRowStack): class Arachnida(CurdsAndWhey): + RowStack_Class = Arachnida_RowStack def createGame(self): # create layout l, s = Layout(self), self.s # set window - w, h = l.XM+11*l.XS, l.YM+l.YS+16*l.YOFFSET + w, h = l.XM+12*l.XS, l.YM+l.YS+16*l.YOFFSET self.setSize(w, h) # create stacks @@ -231,11 +235,14 @@ class Arachnida(CurdsAndWhey): l.createText(s.talon, "ss") x += l.XS for i in range(10): - stack = Arachnida_RowStack(x, y, self, base_rank=ANY_RANK, - max_move=UNLIMITED_MOVES, - max_accept=UNLIMITED_ACCEPTS) + stack = self.RowStack_Class(x, y, self, base_rank=ANY_RANK, + max_move=UNLIMITED_MOVES, + max_accept=UNLIMITED_ACCEPTS) s.rows.append(stack) x += l.XS + s.foundations.append(AbstractFoundationStack(x, y, self, suit=ANY_SUIT, + max_accept=0)) + l.createText(s.foundations[0], "ss") # define stack-groups l.defaultStackGroups() @@ -247,10 +254,31 @@ class Arachnida(CurdsAndWhey): self.startDealSample() self.s.talon.dealRow() + def canDealCards(self): + if not CurdsAndWhey.canDealCards(self): + return False + # no row may be empty + for r in self.s.rows: + if not r.cards: + return False + return True + + def fillStack(self, stack): + for r in self.s.rows: + if len(r.cards) >= 13 and isSameSuitSequence(r.cards[-13:]): + old_state = self.enterState(self.S_FILL) + self.playSample("drop", priority=200) + self.moveMove(13, r, self.s.foundations[0]) + self.leaveState(old_state) + def shallHighlightMatch(self, stack1, card1, stack2, card2): return card1.rank == card2.rank or abs(card1.rank-card2.rank) == 1 +class Harvestman(Arachnida): + RowStack_Class = CurdsAndWhey_RowStack + + # /*********************************************************************** # // German Patience # // Bavarian Patience @@ -412,4 +440,7 @@ registerGame(GameInfo(481, KnottyNines, "Knotty Nines", GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(482, SweetSixteen, "Sweet Sixteen", GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(534, Harvestman, "Harvestman", + GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) + diff --git a/pysollib/games/dieboesesieben.py b/pysollib/games/dieboesesieben.py index e3c7d8e4..828c5ecd 100644 --- a/pysollib/games/dieboesesieben.py +++ b/pysollib/games/dieboesesieben.py @@ -43,7 +43,7 @@ from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint -from pysollib.games.gypsy import DieKoenigsbergerin_Talon, DieRussische_Foundation +from gypsy import DieKoenigsbergerin_Talon, DieRussische_Foundation # /*********************************************************************** # // Die böse Sieben diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 5c7cd7b5..3e400d13 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -251,9 +251,14 @@ class Carnation(Limited): class SanJuanHill(FortyThieves): - def createGame(self): - FortyThieves.createGame(self, XOFFSET=0) + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, c.suit)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + FortyThieves.startGame(self) # /*********************************************************************** diff --git a/pysollib/games/napoleon.py b/pysollib/games/napoleon.py index 9b21e254..bd921e5c 100644 --- a/pysollib/games/napoleon.py +++ b/pysollib/games/napoleon.py @@ -44,20 +44,13 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.pysoltk import MfxCanvasText -from pysollib.games.braid import Braid_Foundation +from braid import Braid_Foundation # /*********************************************************************** # // stacks # ************************************************************************/ -class Napoleon_Talon(InitialDealTalonStack): - pass - - -class Napoleon_Foundation(Braid_Foundation): - pass - class Napoleon_RowStack(UD_SS_RowStack): def getBottomImage(self): @@ -96,13 +89,14 @@ class Napoleon_FreeCell(ReserveStack): class DerKleineNapoleon(Game): + Foundation_Class = Braid_Foundation RowStack_Class = StackWrapper(Napoleon_RowStack, mod=13) # # game layout # - def createGame(self, reserves=1): + def createGame(self, cells=1): # create layout l, s = Layout(self), self.s @@ -119,7 +113,7 @@ class DerKleineNapoleon(Game): s.rows.append(self.RowStack_Class(x2, y, self)) y = y + l.YS y = self.height - l.YS - if reserves == 1: + if cells == 1: s.rows.append(Napoleon_ReserveStack(x0, y, self)) s.rows.append(Napoleon_ReserveStack(x2, y, self)) s.reserves.append(Napoleon_SingleFreeCell(x1, y, self)) @@ -131,15 +125,15 @@ class DerKleineNapoleon(Game): # foundations x, y = x1, l.YM for i in range(4): - s.foundations.append(Napoleon_Foundation(x, y, self, i)) + s.foundations.append(self.Foundation_Class(x, y, self, i)) y = y + l.YS # talon - if reserves == 1: + if cells == 1: ##x, y = l.XM, self.height - l.YS y = self.height + l.YS else: y = self.height - l.YS - s.talon = Napoleon_Talon(x, y, self) + s.talon = InitialDealTalonStack(x, y, self) # update stack building direction for r in s.rows: @@ -200,12 +194,16 @@ class DerKleineNapoleon(Game): class DerFreieNapoleon(DerKleineNapoleon): + Foundation_Class = Braid_Foundation RowStack_Class = StackWrapper(Napoleon_RowStack, mod=13) + ReserveStack_Class = Napoleon_ReserveStack + FreeCell_Class = Napoleon_SingleFreeCell + # # game layout # - def createGame(self, reserves=1): + def createGame(self, cells=1, reserves=2, texts=True): # create layout l, s = Layout(self), self.s @@ -213,7 +211,8 @@ class DerFreieNapoleon(DerKleineNapoleon): # set size so that at least 2/3 of a card is visible with 15 cards h = l.CH*2/3 + (15-1)*l.YOFFSET h = l.YS + max(h, 3*l.YS) - self.setSize(l.XM + 2*l.XM + 10*l.XS, l.YM + h) + max_rows = 8+max(cells, reserves) + self.setSize(l.XM + 2*l.XM + max_rows*l.XS, l.YM + h) x1 = l.XM + 8*l.XS + 2*l.XM # create stacks @@ -221,27 +220,32 @@ class DerFreieNapoleon(DerKleineNapoleon): for j in range(8): x = l.XM + j*l.XS s.rows.append(self.RowStack_Class(x, y, self)) - for j in range(2): + for j in range(reserves): x = x1 + j*l.XS - s.rows.append(Napoleon_ReserveStack(x, y, self)) + s.rows.append(self.ReserveStack_Class(x, y, self)) self.setRegion(s.rows, (-999, y - l.YM/2, 999999, 999999)) y = l.YM - if reserves == 1: - s.reserves.append(Napoleon_SingleFreeCell(x1 + l.XS/2, y, self)) - else: - s.reserves.append(Napoleon_FreeCell(x1, y, self)) - s.reserves.append(Napoleon_FreeCell(x1 + l.XS, y, self)) + x = x1+(max(cells, reserves)-cells)*l.XS/2 + for i in range(cells): + s.reserves.append(self.FreeCell_Class(x, y, self)) + x += l.XS +## if cells == 1: +## s.reserves.append(Napoleon_SingleFreeCell(x1 + l.XS/2, y, self)) +## else: +## s.reserves.append(Napoleon_FreeCell(x1, y, self)) +## s.reserves.append(Napoleon_FreeCell(x1 + l.XS, y, self)) # foundations x = l.XM + 2*l.XS for i in range(4): - s.foundations.append(Napoleon_Foundation(x, y, self, i)) + s.foundations.append(self.Foundation_Class(x, y, self, i)) x = x + l.XS - tx, ty, ta, tf = l.getTextAttr(s.foundations[-1], "se") - font = self.app.getFont("canvas_default") - self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) + if texts: + tx, ty, ta, tf = l.getTextAttr(s.foundations[-1], "se") + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) # talon x, y = l.XM, self.height - l.YS - s.talon = Napoleon_Talon(x, y, self) + s.talon = InitialDealTalonStack(x, y, self) # define stack-groups l.defaultStackGroups() @@ -253,12 +257,101 @@ class DerFreieNapoleon(DerKleineNapoleon): class Napoleon(DerKleineNapoleon): def createGame(self): - DerKleineNapoleon.createGame(self, reserves=2) + DerKleineNapoleon.createGame(self, cells=2) class FreeNapoleon(DerFreieNapoleon): + FreeCell_Class = Napoleon_FreeCell def createGame(self): - DerFreieNapoleon.createGame(self, reserves=2) + DerFreieNapoleon.createGame(self, cells=2) + + +# /*********************************************************************** +# // Master +# ************************************************************************/ + +class Master(DerFreieNapoleon): + + Foundation_Class = SS_FoundationStack + + def createGame(self): + DerFreieNapoleon.createGame(self, cells=2, texts=False) + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToBottom(cards, + lambda c: (c.rank == ACE, c.suit)) + + +# /*********************************************************************** +# // The Little Corporal +# // Bonaparte +# ************************************************************************/ + +class TheLittleCorporal_RowStack(UD_SS_RowStack): + def acceptsCards(self, from_stack, cards): + if not UD_SS_RowStack.acceptsCards(self, from_stack, cards): + return False + if from_stack in self.game.s.reserves: + return not self.cards + return True + + +class TheLittleCorporal(DerFreieNapoleon): + + def createGame(self, rows=10): + l, s = Layout(self), self.s + # set size so that at least 2/3 of a card is visible with 15 cards + h = l.CH*2/3 + (15-1)*l.YOFFSET + h = l.YS + max(h, 3*l.YS) + self.setSize(l.XM+rows*l.XS, l.YM + h) + + x, y = l.XM+(rows-8)*l.XS, l.YM + for i in range(4): + s.foundations.append(Braid_Foundation(x, y, self, suit=i)) + x += l.XS + tx, ty, ta, tf = l.getTextAttr(s.foundations[-1], "se") + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) + x += 2*l.XS + stack = ReserveStack(x, y, self, max_cards=UNLIMITED_CARDS) + s.reserves.append(stack) + l.createText(stack, 'se') + x, y = l.XM, l.YM+l.YS + for i in range(rows): + s.rows.append(TheLittleCorporal_RowStack(x, y, self, mod=13)) + x += l.XS + + # talon + x, y = l.XM, self.height - l.YS + s.talon = InitialDealTalonStack(x, y, self) + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(rows=self.s.rows, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[1:-1]) + self.s.talon.dealBaseCards(ncards=4) + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack in self.s.reserves: + return 0 + return int(len(to_stack.cards) != 0)+1 + + +class Bonaparte(TheLittleCorporal): + + def createGame(self): + TheLittleCorporal.createGame(self, rows=8) + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(rows=self.s.rows, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealBaseCards(ncards=4) # register the game @@ -270,4 +363,10 @@ registerGame(GameInfo(169, Napoleon, "Napoleon", GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(170, FreeNapoleon, "Free Napoleon", GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(536, Master, "Master", + GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(537, TheLittleCorporal, "The Little Corporal", + GI.GT_NAPOLEON | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(538, Bonaparte, "Bonaparte", + GI.GT_NAPOLEON | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 1c8915c4..4b221fd9 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -178,7 +178,7 @@ class Spider2Suits(Spider): pass class OpenSpider(Spider): - def startGame(self, flip=0): + def startGame(self): Spider.startGame(self, flip=1) diff --git a/pysollib/games/terrace.py b/pysollib/games/terrace.py index 802882a9..94fa8cc5 100644 --- a/pysollib/games/terrace.py +++ b/pysollib/games/terrace.py @@ -121,6 +121,7 @@ class Terrace_RowStack(AC_RowStack): # ************************************************************************/ class Terrace(Game): + Talon_Class = Terrace_Talon Foundation_Class = Terrace_AC_Foundation RowStack_Class = Terrace_RowStack ReserveStack_Class = OpenStack @@ -149,7 +150,7 @@ class Terrace(Game): # create stacks x, y = l.XM + w1, l.YM - s.talon = Terrace_Talon(x, y, self, max_rounds=max_rounds, num_deal=num_deal) + s.talon = self.Talon_Class(x, y, self, max_rounds=max_rounds, num_deal=num_deal) l.createText(s.talon, "sw") x = x + l.XS s.waste = WasteStack(x, y, self) @@ -288,6 +289,46 @@ class Madame(Terrace): Terrace.startGame(self, nrows=10) +# /*********************************************************************** +# // Mamy Susan +# ************************************************************************/ + +class MamySusan_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if from_stack in self.game.s.reserves: + return False + return AC_RowStack.acceptsCards(self, from_stack, cards) + + +class MamySusan(Terrace): + + Talon_Class = WasteTalonStack + Foundation_Class = StackWrapper(SS_FoundationStack, max_move=0) + RowStack_Class = StackWrapper(MamySusan_RowStack, max_move=1) + + def createGame(self): + Terrace.createGame(self, rows=10) + + def startGame(self, nrows=4): + for i in range(6): + self.s.talon.dealRow(rows=self.s.reserves, flip=0, frames=0) + self.flipMove(self.s.reserves[0]) + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def fillStack(self, stack): + pass + def _restoreGameHook(self, game): + pass + def _loadGameHook(self, p): + pass + def _saveGameHook(self, p): + pass + + # register the game registerGame(GameInfo(135, Terrace, "Terrace", @@ -304,4 +345,6 @@ registerGame(GameInfo(499, Signora, "Signora", GI.GT_TERRACE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(500, Madame, "Madame", GI.GT_TERRACE, 3, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(533, MamySusan, "Mamy Susan", + GI.GT_TERRACE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/resource.py b/pysollib/resource.py index c8c0487b..038c67c6 100644 --- a/pysollib/resource.py +++ b/pysollib/resource.py @@ -183,7 +183,7 @@ class ResourceManager: self._addDir(result, os.path.join(dir, s)) except EnvError, ex: pass - if app.debug >= 2: + if app.debug >= 5: print "getSearchDirs", env, search, "->", result return result @@ -210,7 +210,7 @@ class ResourceManager: except: pass # - if app.debug >= 2: + if app.debug >= 5: print "getRegistryDirs", category, "->", result return result diff --git a/pysollib/stack.py b/pysollib/stack.py index b5db5d43..6e6b0047 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -1194,10 +1194,14 @@ class Stack: return s def getNumCards(self): + if self.game.app.debug >= 3: + t = repr(self)+' ' + else: + t = '' n = len(self.cards) - if n == 0 : return _('No cards') - elif n == 1 : return _('1 card') - else : return str(n)+_(' cards') + if n == 0 : return t+_('No cards') + elif n == 1 : return t+_('1 card') + else : return t+str(n)+_(' cards') # /*********************************************************************** From d71672694ad4406ef5bc56b1e85260383bbac548 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 19 Jul 2006 21:17:01 +0000 Subject: [PATCH 020/266] + 4 new games + added `close stack' (Game.closeStackMove, Stack.closeStackMove, ACloseStackMove) + option `shade_filled_stacks' + new stack RedealTalonStack and new Game method redealCards * added closeStackMove to PileOn and PictureGallery (used flipAllMove) git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@21 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/acard.py | 7 ++ pysollib/actions.py | 8 ++ pysollib/app.py | 1 + pysollib/game.py | 27 +++++- pysollib/games/auldlangsyne.py | 2 +- pysollib/games/braid.py | 2 +- pysollib/games/curdsandwhey.py | 2 +- pysollib/games/dieboesesieben.py | 2 +- pysollib/games/fortythieves.py | 32 +++++++ pysollib/games/freecell.py | 15 ++++ pysollib/games/gypsy.py | 2 +- pysollib/games/klondike.py | 28 +++++- pysollib/games/montecarlo.py | 4 +- pysollib/games/picturegallery.py | 41 +++++++-- pysollib/games/pileon.py | 16 +++- pysollib/games/royalcotillion.py | 2 +- pysollib/games/siebenbisas.py | 2 +- pysollib/games/special/pegged.py | 2 +- pysollib/games/sultan.py | 29 +++--- pysollib/games/takeaway.py | 4 + pysollib/games/yukon.py | 23 +++-- pysollib/move.py | 26 +++++- pysollib/stack.py | 146 ++++++++++++++++++++++++++----- pysollib/tk/card.py | 3 + pysollib/tk/menubar.py | 5 +- pysollib/tk/tkcanvas.py | 15 +++- 26 files changed, 366 insertions(+), 80 deletions(-) diff --git a/pysollib/acard.py b/pysollib/acard.py index e23f09c7..a1569350 100644 --- a/pysollib/acard.py +++ b/pysollib/acard.py @@ -146,3 +146,10 @@ class AbstractCard: def updateCardBackground(self, image): raise SubclassResponsibility + + def close(self): + pass + + def unclose(self): + pass + diff --git a/pysollib/actions.py b/pysollib/actions.py index 59ba57d1..65280458 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -122,6 +122,7 @@ class PysolMenubarActions: animations = IntVar(), shadow = BooleanVar(), shade = BooleanVar(), + shade_filled_stacks = BooleanVar(), toolbar = IntVar(), toolbar_style = StringVar(), toolbar_relief = StringVar(), @@ -164,6 +165,7 @@ class PysolMenubarActions: tkopt.highlight_cards.set(opt.highlight_cards) tkopt.highlight_samerank.set(opt.highlight_samerank) tkopt.highlight_not_matching.set(opt.highlight_not_matching) + tkopt.shade_filled_stacks.set(opt.shade_filled_stacks) tkopt.mahjongg_show_removed.set(opt.mahjongg_show_removed) tkopt.shisen_show_hint.set(opt.shisen_show_hint) tkopt.sound.set(opt.sound) @@ -853,6 +855,12 @@ class PysolMenubarActions: self.app.opt.highlight_not_matching = self.tkopt.highlight_not_matching.get() ##self.game.updateMenus() + def mOptShadeFilledStacks(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shade_filled_stacks = self.tkopt.shade_filled_stacks.get() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + def mOptMahjonggShowRemoved(self, *args): if self._cancelDrag(): return self.app.opt.mahjongg_show_removed = self.tkopt.mahjongg_show_removed.get() diff --git a/pysollib/app.py b/pysollib/app.py index e5d375da..3ca6b47f 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -102,6 +102,7 @@ class Options: self.animations = 2 # default to Timer based self.shadow = 1 self.shade = 1 + self.shade_filled_stacks = True self.demo_logo = 1 self.demo_score = 0 self.toolbar = 1 diff --git a/pysollib/game.py b/pysollib/game.py index c33f3812..0781aea5 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -62,6 +62,7 @@ from pysoltk import Card from move import AMoveMove, AFlipMove, ATurnStackMove from move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove from move import AUpdateStackMove, AFlipAllMove, ASaveStateMove +from move import ACloseStackMove from hint import DefaultHint from help import helpAbout @@ -177,6 +178,12 @@ class Game: if self.s.talon: assert hasattr(self.s.talon, "round") assert hasattr(self.s.talon, "max_rounds") + if self.app.debug and self.s.foundations: + ncards = 0 + for stack in self.s.foundations: + ncards += stack.cap.max_cards + if ncards != self.gameinfo.ncards: + print 'WARNING: invalid sum of foundations.max_cards:', self.__class__.__name__, ncards, self.gameinfo.ncards # optimize regions self.optimizeRegions() # create cards @@ -987,6 +994,8 @@ class Game: def getCardBackImage(self, deck, suit, rank): return self.app.images.getBack(deck, suit, rank) + def getCardShadeImage(self): + return self.app.images.getShade() # # layout support @@ -1085,6 +1094,10 @@ class Game: def fillStack(self, stack): pass + # redeal cards (used in RedealTalonStack; all cards already in talon) + def redealCards(self): + pass + # the actual hint class (or None) Hint_Class = DefaultHint @@ -1931,7 +1944,7 @@ for %d moves. # move type 8 def flipAllMove(self, stack): assert stack - am = AFlipAllMove(self, stack) + am = AFlipAllMove(stack) self.__storeMove(am) am.do(self) self.hints.list = None @@ -1943,6 +1956,13 @@ for %d moves. am.do(self) ##self.hints.list = None + # move type 10 + def closeStackMove(self, stack): + assert stack + am = ACloseStackMove(stack) + self.__storeMove(am) + am.do(self) + # Finish the current move. def finishMove(self): @@ -2244,7 +2264,10 @@ Please report this bug.""")) if not game.canLoadGame(version_tuple, game_version): destruct(game) game = None - assert game is not None, "Cannot load this game from version " + version + "\nas the game rules have changed\nin the current implementation." + assert game is not None, '''\ +Cannot load this game from version %s +as the game rules have changed +in the current implementation.''' % version game.version = version game.version_tuple = version_tuple # diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index b1fa8bf3..fb3a92b2 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -422,7 +422,7 @@ class Amazons(Game): l.createText(s.talon, "ss") x, y = l.XM+2*l.XS, l.YM for i in range(4): - s.foundations.append(Amazons_Foundation(x, y, self, suit=i)) + s.foundations.append(Amazons_Foundation(x, y, self, suit=i, max_cards=7)) x += l.XS x, y = l.XM+2*l.XS, l.YM+l.YS for i in range(4): diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py index d095f06b..98e0b19b 100644 --- a/pysollib/games/braid.py +++ b/pysollib/games/braid.py @@ -174,7 +174,7 @@ class Braid(Game): s.foundations.append(cl(x, y, self, suit=i)) x += l.XS y = y + l.YS - x = 8*l.XS+decks*l.XS/2 + x = 8*l.XS+decks*l.XS/2+l.XM/2 self.texts.info = MfxCanvasText(self.canvas, x, y, anchor="n", font=self.app.getFont("canvas_default")) diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index 7c3e09f1..2ddef268 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -241,7 +241,7 @@ class Arachnida(CurdsAndWhey): s.rows.append(stack) x += l.XS s.foundations.append(AbstractFoundationStack(x, y, self, suit=ANY_SUIT, - max_accept=0)) + max_accept=0, max_cards=104)) l.createText(s.foundations[0], "ss") # define stack-groups diff --git a/pysollib/games/dieboesesieben.py b/pysollib/games/dieboesesieben.py index 828c5ecd..1531fd22 100644 --- a/pysollib/games/dieboesesieben.py +++ b/pysollib/games/dieboesesieben.py @@ -98,7 +98,7 @@ class DieBoeseSieben(Game): # create stacks for i in range(8): x, y, = l.XM + i*l.XS, l.YM - s.foundations.append(DieRussische_Foundation(x, y, self, i/2, max_move=0)) + s.foundations.append(DieRussische_Foundation(x, y, self, i/2, max_move=0, max_cards=8)) for i in range(rows): x, y, = l.XM + (2*i+8-rows)*l.XS/2, l.YM + l.YS s.rows.append(AC_RowStack(x, y, self)) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 3e400d13..3b0c1dd4 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -768,6 +768,36 @@ class Squadron(FortyThieves): self.s.talon.dealCards() # deal first card to WasteStack +# /*********************************************************************** +# // Waterloo +# ************************************************************************/ + +class Waterloo(FortyThieves): + + RowStack_Class = Spider_SS_RowStack + + ROW_MAX_MOVE = UNLIMITED_MOVES + DEAL = (0, 1) + + def createGame(self): + FortyThieves.createGame(self, rows=6) + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, (c.deck, c.suit))) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack.cards: + return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 + return 0 + # register the game registerGame(GameInfo(13, FortyThieves, "Forty Thieves", @@ -855,5 +885,7 @@ registerGame(GameInfo(528, FinalBattle, "Final Battle", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(529, SanJuanHill, "San Juan Hill", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(540, Waterloo, "Waterloo", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index 56b1398a..ff0c81dd 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -543,6 +543,19 @@ class OceanTowers(TripleFreecell): return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 +# /*********************************************************************** +# // KingCell +# ************************************************************************/ + +class KingCell_RowStack(RK_RowStack): + def canMoveCards(self, cards): + max_move = getNumberOfFreeStacks(self.game.s.reserves) + 1 + return len(cards) <= max_move and RK_RowStack.canMoveCards(self, cards) + +class KingCell(FreeCell): + Hint_Class = FreeCellType_Hint + RowStack_Class = StackWrapper(KingCell_RowStack, base_rank=KING) + # register the game registerGame(GameInfo(5, RelaxedFreeCell, "Relaxed FreeCell", @@ -585,4 +598,6 @@ registerGame(GameInfo(513, OceanTowers, "Ocean Towers", GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(520, GermanFreeCell, "German FreeCell", GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) +registerGame(GameInfo(542, KingCell, "KingCell", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index f2a3c5f0..f27f5485 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -188,7 +188,7 @@ class DieRussische_RowStack(AC_RowStack): class DieRussische(Gypsy): Talon_Class = InitialDealTalonStack - Foundation_Class = StackWrapper(DieRussische_Foundation, min_cards=1) + Foundation_Class = StackWrapper(DieRussische_Foundation, min_cards=1, max_cards=8) RowStack_Class = DieRussische_RowStack def createGame(self): diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 874e1ebf..42496a89 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -323,6 +323,21 @@ class Canister(Klondike): self.s.talon.dealRow(rows=self.s.rows[2:6]) +class Usk(Somerset): + + Talon_Class = RedealTalonStack + RowStack_Class = StackWrapper(AC_RowStack, base_rank=KING) + + def createGame(self): + Klondike.createGame(self, max_rounds=2, rows=10, waste=0, texts=0) + + def redealCards(self): + n = 0 + while self.s.talon.cards: + self.s.talon.dealRowAvail(rows=self.s.rows[n:], frames=4) + n += 1 + + # /*********************************************************************** # // Agnes Sorel # ************************************************************************/ @@ -376,6 +391,7 @@ class AchtmalAcht(EightTimesEight): # /*********************************************************************** # // Batsford +# // Batsford Again # ************************************************************************/ class Batsford_ReserveStack(ReserveStack): @@ -389,7 +405,8 @@ class Batsford_ReserveStack(ReserveStack): class Batsford(Klondike): def createGame(self, **layout): - l = Klondike.createGame(self, rows=10, max_rounds=1, playcards=22) + kwdefault(layout, rows=10, max_rounds=1, playcards=22) + l = apply(Klondike.createGame, (self,), layout) s = self.s x, y = l.XM, self.height - l.YS s.reserves.append(Batsford_ReserveStack(x, y, self, max_cards=3)) @@ -398,6 +415,11 @@ class Batsford(Klondike): l.defaultStackGroups() +class BatsfordAgain(Batsford): + def createGame(self): + Batsford.createGame(self, max_rounds=2) + + # /*********************************************************************** # // Jumbo # ************************************************************************/ @@ -1199,4 +1221,8 @@ registerGame(GameInfo(522, ArticGarden, "Artic Garden", GI.GT_RAGLAN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(532, GoldRush, "Gold Rush", GI.GT_KLONDIKE, 1, 2, GI.SL_BALANCED)) +registerGame(GameInfo(539, Usk, "Usk", + GI.GT_KLONDIKE, 1, 1, GI.SL_BALANCED)) +registerGame(GameInfo(541, BatsfordAgain, "Batsford Again", + GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index f296c137..76588027 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -135,7 +135,7 @@ class MonteCarlo(Game): dir=0, base_rank=NO_RANK)) x, y = l.XM + 11*l.XS/2, l.YM s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, - max_move=0, max_cards=52, base_rank=ANY_RANK)) + max_move=0, max_cards=self.gameinfo.ncards, base_rank=ANY_RANK)) l.createText(s.foundations[0], "ss") y = y + 2*l.YS s.talon = self.Talon_Class(x, y, self, max_rounds=1) @@ -598,7 +598,7 @@ class TheWish(Game): x, y = self.width - l.XS, self.height - l.YS s.foundations.append(AbstractFoundationStack(x, y, self, suit=ANY_SUIT, - max_move=0, max_cards=52, max_accept=0, base_rank=ANY_RANK)) + max_move=0, max_cards=32, max_accept=0, base_rank=ANY_RANK)) l.createText(s.foundations[0], "nn") # define stack-groups diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py index d329ee9f..5766ea6d 100644 --- a/pysollib/games/picturegallery.py +++ b/pysollib/games/picturegallery.py @@ -137,10 +137,18 @@ class PictureGallery_Foundation(RK_FoundationStack): def getBottomImage(self): return self.game.app.images.getLetter(ACE) + def closeStackMove(self): + if len(self.cards) == 8: + self.game.flipAllMove(self) + + def canFlipCard(self): + return False + class PictureGallery_TableauStack(SS_RowStack): - def __init__(self, x, y, game, base_rank, yoffset, dir=3): - SS_RowStack.__init__(self, x, y, game, base_rank=base_rank, dir=dir, max_accept=1) + def __init__(self, x, y, game, base_rank, yoffset, dir=3, max_cards=4): + SS_RowStack.__init__(self, x, y, game, + base_rank=base_rank, dir=dir, max_cards=max_cards, max_accept=1) self.CARD_YOFFSET = yoffset def acceptsCards(self, from_stack, cards): @@ -154,6 +162,13 @@ class PictureGallery_TableauStack(SS_RowStack): def getBottomImage(self): return self.game.app.images.getLetter(self.cap.base_rank) + def closeStackMove(self): + if len(self.cards) == self.cap.max_cards: + self.game.flipAllMove(self) + + def canFlipCard(self): + return False + class PictureGallery_RowStack(BasicRowStack): def acceptsCards(self, from_stack, cards): @@ -176,7 +191,11 @@ class PictureGallery(Game): Hint_Class = PictureGallery_Hint Foundation_Class = PictureGallery_Foundation - TableauStack_Class = PictureGallery_TableauStack + TableauStack_Classes = [ + StackWrapper(PictureGallery_TableauStack, base_rank=3, max_cards=4, dir=3), + StackWrapper(PictureGallery_TableauStack, base_rank=2, max_cards=4, dir=3), + StackWrapper(PictureGallery_TableauStack, base_rank=1, max_cards=4, dir=3), + ] RowStack_Class = StackWrapper(PictureGallery_RowStack, max_accept=1) Talon_Class = DealRowTalonStack @@ -184,7 +203,8 @@ class PictureGallery(Game): # game layout # - def createGame(self, rows=3, waste=False, dir=3): + def createGame(self, waste=False): + rows = len(self.TableauStack_Classes) # create layout l, s = Layout(self), self.s TABLEAU_YOFFSET = min(9, max(3, l.YOFFSET / 3)) @@ -201,10 +221,10 @@ class PictureGallery(Game): y = l.YM + l.CH / 2 s.foundations.append(self.Foundation_Class(x, y, self)) y = l.YM - for i in range(rows,0,-1): #(3, 2, 1): + for cl in self.TableauStack_Classes: x = l.XM for j in range(8): - s.tableaux.append(self.TableauStack_Class(x, y, self, i, yoffset=TABLEAU_YOFFSET, dir=dir)) + s.tableaux.append(cl(x, y, self, yoffset=TABLEAU_YOFFSET)) x = x + l.XS y = y + th x, y = l.XM, y + l.YM @@ -297,7 +317,10 @@ class GreatWheel_RowStack(BasicRowStack): class GreatWheel(PictureGallery): Foundation_Class = GreatWheel_Foundation - TableauStack_Class = PictureGallery_TableauStack + TableauStack_Classes = [ + StackWrapper(PictureGallery_TableauStack, base_rank=2, max_cards=5, dir=2), + StackWrapper(PictureGallery_TableauStack, base_rank=1, max_cards=6, dir=2), + ] RowStack_Class = StackWrapper(GreatWheel_RowStack, max_accept=1) Talon_Class = StackWrapper(WasteTalonStack, max_rounds=1) @@ -373,12 +396,12 @@ class MountOlympus(Game): x, y = l.XM+l.XS, l.YM for i in range(8): s.foundations.append(MountOlympus_Foundation(x, y, self, - suit=i/2, base_rank=ACE, dir=2, max_move=0)) + suit=i/2, base_rank=ACE, dir=2, max_move=0, max_cards=7)) x += l.XS x, y = l.XM+l.XS, l.YM+l.YS for i in range(8): s.foundations.append(MountOlympus_Foundation(x, y, self, - suit=i/2, base_rank=1, dir=2, max_move=0)) + suit=i/2, base_rank=1, dir=2, max_move=0, max_cards=6)) x += l.XS x, y = l.XM, l.YM+2*l.YS for i in range(9): diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index e89202bc..4727a5ae 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -50,6 +50,13 @@ class PileOn_RowStack(RK_RowStack): def getBottomImage(self): return self.game.app.images.getReserveBottom() + def closeStackMove(self): + if len(self.cards) == 4 and isRankSequence(self.cards, dir=0): + self.game.flipAllMove(self) + + def canFlipCard(self): + return False + class PileOn(Game): Hint_Class = DefaultHint @@ -106,19 +113,20 @@ class PileOn(Game): def isGameWon(self): for r in self.s.rows: - if r.cards: - if len(r.cards) != 4 or not r._isSequence(r.cards): - return 0 - return 1 + if r.cards and not cardsFaceDown(r.cards): + return False + return True def shallHighlightMatch(self, stack1, card1, stack2, card2): return card1.rank == card2.rank + class SmallPileOn(PileOn): TWIDTH = 3 NSTACKS = 11 PLAYCARDS = 4 + class PileOn2Decks(PileOn): TWIDTH = 4 NSTACKS = 15 diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index a375db37..0f405275 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -413,7 +413,7 @@ class BritishConstitution(Game): # create stacks x, y = l.XM+l.XS, l.YM for i in range(8): - s.foundations.append(BritishConstitution_Foundation(x, y, self, suit=int(i/2))) + s.foundations.append(BritishConstitution_Foundation(x, y, self, suit=int(i/2), max_cards=11)) x += l.XS y = l.YM+l.YS diff --git a/pysollib/games/siebenbisas.py b/pysollib/games/siebenbisas.py index 088996f1..e2a7b6bb 100644 --- a/pysollib/games/siebenbisas.py +++ b/pysollib/games/siebenbisas.py @@ -136,7 +136,7 @@ class SiebenBisAs(Game): s.reserves.append(ReserveStack(x, y, self, max_accept=0)) for i in range(4): x, y, = l.XM + (i+3)*l.XS, l.YM + 4*l.YS - s.foundations.append(SiebenBisAs_Foundation(x, y, self, i, base_rank=6, mod=13, max_move=0)) + s.foundations.append(SiebenBisAs_Foundation(x, y, self, i, base_rank=6, mod=13, max_move=0, max_cards=8)) s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) # define stack-groups diff --git a/pysollib/games/special/pegged.py b/pysollib/games/special/pegged.py index 376818e4..ecc75d91 100644 --- a/pysollib/games/special/pegged.py +++ b/pysollib/games/special/pegged.py @@ -141,7 +141,7 @@ class Pegged(Game): s.rows.append(stack) self.map[stack.pos] = stack x, y = self.width - l.XS, l.YM - s.foundations.append(AbstractFoundationStack(x, y, self, ANY_SUIT, max_move=0, max_accept=0)) + s.foundations.append(AbstractFoundationStack(x, y, self, ANY_SUIT, max_move=0, max_accept=0, max_cards=self.gameinfo.ncards)) l.createText(s.foundations[0], "ss") y = self.height - l.YS s.talon = InitialDealTalonStack(x, y, self) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 8fc8ca50..72b99c59 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -53,20 +53,20 @@ class Sultan(Game): self.setSize(w, h) # create stacks - lay = ((0,0,0,1), - (2,0,0,1), - (0,1,1,1), - (2,1,1,1), - (1,1,2,0), - (1,2,2,1), - (0,2,3,1), - (2,2,3,1), - (1,0,2,1), + lay = ((0,0,0,1,13), + (2,0,0,1,13), + (0,1,1,1,13), + (2,1,1,1,13), + (1,1,2,0,1), + (1,2,2,1,13), + (0,2,3,1,13), + (2,2,3,1,13), + (1,0,2,1,12), ) - for i, j, suit, max_accept in lay: + for i, j, suit, max_accept, max_cards in lay: x, y = 2*l.XM+l.XS+i*l.XS, l.YM+j*l.YS stack = SS_FoundationStack(x, y, self, suit=suit, - max_move=0, max_accept=max_accept, mod=13) + max_move=0, max_accept=max_accept, max_cards=max_cards, mod=13) s.foundations.append(stack) x, y = l.XM, l.YM @@ -309,7 +309,7 @@ class IdleAces(Game): x, y = x0+i*l.XS, y0+j*l.YS s.foundations.append(RK_FoundationStack(x, y, self, ##suit=ANY_SUIT, - base_rank=1, max_move=0)) + base_rank=1, max_move=0, max_cards=12)) k += 1 k = 0 for i, j in((1, 0.2), (3, 0.2), (1, 2.8), (3, 2.8)): @@ -635,14 +635,15 @@ class SixesAndSevens(Game): for i in range(2): x = l.XM for j in range(4): - s.foundations.append(SS_FoundationStack(x, y, self, suit=j, base_rank=6)) + s.foundations.append(SS_FoundationStack(x, y, self, + suit=j, base_rank=6, max_cards=7)) x += l.XS y += l.YS for i in range(2): x = l.XM for j in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=j, - base_rank=5, dir=-1)) + base_rank=5, dir=-1, max_cards=6)) x += l.XS y += l.YS y = l.YM diff --git a/pysollib/games/takeaway.py b/pysollib/games/takeaway.py index 4e65dd14..a4633c1d 100644 --- a/pysollib/games/takeaway.py +++ b/pysollib/games/takeaway.py @@ -46,6 +46,10 @@ class TakeAway_Foundation(AbstractFoundationStack): return (c1.rank == (c2.rank + 1) % mod or c2.rank == (c1.rank + 1) % mod) + def closeStackMove(self): + pass + + class TakeAway(Game): RowStack_Class = BasicRowStack diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index ddbf544d..6ccb67fe 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -171,17 +171,22 @@ class Odessa(RussianSolitaire): # // Grandfather # ************************************************************************/ +class Grandfather_Talon(RedealTalonStack): + def redealCards(self, sound=0): + RedealTalonStack.redealCards(self, sound=sound, shuffle=True) + class Grandfather(RussianSolitaire): + Talon_Class = StackWrapper(Grandfather_Talon, max_rounds=3) + def startGame(self): - n = 1 - for i in (2,4,6,5,3,1): - self.s.talon.dealRow(rows=[self.s.rows[n]]*i, flip=0, frames=0) - n += 1 - n = 0 + for i, j in ((1,7),(1,6),(2,6),(2,5),(3,5),(3,4)): + self.s.talon.dealRowAvail(rows=self.s.rows[i:j], flip=0, frames=0) self.startDealSample() - for i in (1,5,5,5,5,5,5): - self.s.talon.dealRow(rows=[self.s.rows[n]]*i) - n += 1 + self.s.talon.dealRowAvail() + for i in range(4): + self.s.talon.dealRowAvail(rows=self.s.rows[1:]) + + redealCards = startGame # /*********************************************************************** @@ -644,7 +649,7 @@ registerGame(GameInfo(20, RussianSolitaire, "Russian Solitaire", registerGame(GameInfo(27, Odessa, "Odessa", GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(278, Grandfather, "Grandfather", - GI.GT_YUKON, 1, 0, GI.SL_MOSTLY_LUCK)) + GI.GT_YUKON, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(186, Alaska, "Alaska", GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(187, ChineseDiscipline, "Chinese Discipline", diff --git a/pysollib/move.py b/pysollib/move.py index 87afb8db..6144f7f7 100644 --- a/pysollib/move.py +++ b/pysollib/move.py @@ -144,7 +144,6 @@ class AFlipAllMove(AtomicMove): # do the actual move def __doMove(self, game, stack): - #card = stack.cards[-1] for card in stack.cards: if card.face_up: card.showBack() @@ -434,3 +433,28 @@ class AShuffleStackMove(AtomicMove): cmp(self.card_ids, other.card_ids) or cmp(self.state, other.state)) + +# /*********************************************************************** +# // ACloseStackMove +# ************************************************************************/ + +class ACloseStackMove(AtomicMove): + + def __init__(self, stack): + self.stack_id = stack.id + + def redo(self, game): + stack = game.allstacks[self.stack_id] + assert stack.cards + stack.is_closed = True + stack._shadeStack() + + def undo(self, game): + stack = game.allstacks[self.stack_id] + assert stack.cards + stack.is_closed = False + stack._unshadeStack() + + def cmpForRedo(self, other): + return cmp(self.stack_id, other.stack_id) + diff --git a/pysollib/stack.py b/pysollib/stack.py index 6e6b0047..00c90b04 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -45,9 +45,11 @@ __all__ = ['cardsFaceUp', 'Stack', 'DealRow_StackMethods', 'DealBaseCard_StackMethods', + 'RedealCards_StackMethods', 'TalonStack', 'DealRowTalonStack', 'InitialDealTalonStack', + 'RedealTalonStack', 'OpenStack', 'AbstractFoundationStack', 'SS_FoundationStack', @@ -276,10 +278,12 @@ class Stack: bottom = None, # canvas item redeal = None, # canvas item redeal_img = None, # the corresponding PhotoImage + shade_img = None, ) # other canvas items view.items = Struct( bottom = None, # dummy canvas item + shade_item = None, ) # text items view.texts = Struct( @@ -296,6 +300,8 @@ class Stack: view.is_open = -1 view.can_hide_cards = -1 view.max_shadow_cards = -1 + # + view.is_closed = False def destruct(self): # help breaking circular references @@ -422,6 +428,7 @@ class Stack: view._position(card) if update: view.updateText() + self.closeStackMove() return card # Remove a card from the stack. Also update display. {model -> view} @@ -449,6 +456,9 @@ class Stack: model.cards.remove(card) if update: view.updateText() + if self.is_closed: + self._unshadeStack() + self.is_closed = False return card # Get the top card {model} @@ -621,6 +631,8 @@ class Stack: def fillStack(self): self.game.fillStack(self) + def closeStackMove(self): + pass # # Playing move actions. Better not override. @@ -974,6 +986,8 @@ class Stack: i = self._findCard(event) if i < 0 or not self.canMoveCards(self.cards[i:]): return + if self.is_closed: + self.items.shade_item.config(state='hidden') x_offset, y_offset = self.cards[i].x, self.cards[i].y if sound: self.game.playSample("startdrag") @@ -1048,24 +1062,29 @@ class Stack: return () cy = c.y img0, img1 = images.getShadow(0), images.getShadow(l) - if 0: - # Dynamically compute the shadow. Doesn't work because - # PhotoImage.copy() doesn't preserve transparency. - img1 = images.getShadow(13) - if img1: - h = images.CARDH - img0.height() - h = h + (l - 1) * self.CARD_YOFFSET[0] - if h < img1.height(): - import Tkinter - dest = Tkinter.PhotoImage(width=img1.width(), height=h) - dest.blank() - img1.tk.call(dest, "copy", img1.name, "-from", 0, 0, img1.width(), h) - assert dest.height() == h and dest.width() == img1.width() - #print h, img1.height(), dest.height() - img1 = dest - self._foo = img1 # keep a reference - elif h > img1.height(): - img1 = None +## if 0: +## # Dynamically compute the shadow. Doesn't work because +## # PhotoImage.copy() doesn't preserve transparency. +## img1 = images.getShadow(13) +## if img1: +## h = images.CARDH - img0.height() +## h = h + (l - 1) * self.CARD_YOFFSET[0] +## if h < img1.height(): +## if hasattr(img1, '_pil_image'): # use PIL +## import ImageTk +## im = img1._pil_image.crop((0,0,img1.width(),h)) +## img1 = ImageTk.PhotoImage(im) +## else: +## import Tkinter +## dest = Tkinter.PhotoImage(width=img1.width(), height=h) +## dest.blank() +## img1.tk.call(dest, "copy", img1.name, "-from", 0, 0, img1.width(), h) +## assert dest.height() == h and dest.width() == img1.width() +## #print h, img1.height(), dest.height() +## img1 = dest +## self._foo = img1 # keep a reference +## elif h > img1.height(): +## img1 = None if img0 and img1: c = cards[-1] if self.CARD_YOFFSET[0] < 0: c = cards[0] @@ -1090,7 +1109,11 @@ class Stack: # optimized for speed - we use lots of local variables game = self.game images = game.app.images - img = images.getShade() + if not self.images.shade_img: + img = images.getShade() + self.images.shade_img = img + else: + img = self.images.shade_img if img is None: return CW, CH = images.CARDW, images.CARDH @@ -1139,6 +1162,31 @@ class Stack: else: img.lower(drag.cards[0].item) + # for closeStackMove + def _shadeStack(self): + if not self.game.app.opt.shade_filled_stacks: + return + if not self.images.shade_img: + img = self.game.app.images.getShade() + self.images.shade_img = img + else: + img = self.images.shade_img + if img is None: + return + if not self.items.shade_item: + self.game.canvas.update_idletasks() + card = self.cards[-1] + item = MfxCanvasImage(self.game.canvas, card.x, card.y, + image=img, anchor=ANCHOR_NW) + ##item.tkraise() + item.addtag(self.group) + self.items.shade_item = item + + def _unshadeStack(self): + if self.items.shade_item: + self.items.shade_item.delete() + self.items.shade_item = None + def _stopDrag(self): drag = self.game.drag after_cancel(drag.timer) @@ -1151,6 +1199,9 @@ class Stack: drag.shadows = [] drag.stack = None drag.cards = [] + if self.is_closed: + self.items.shade_item.config(state='normal') + self.items.shade_item.tkraise() # finish a drag operation def finishDrag(self, event=None): @@ -1173,8 +1224,7 @@ class Stack: self.moveCardsBackHandler(event, drag) def getHelp(self): - # devel - return str(self) + return str(self) # debug def getBaseCard(self): return '' @@ -1319,11 +1369,46 @@ class DealBaseCard_StackMethods: ncards = ncards - 1 +class RedealCards_StackMethods: + + def redealCards(self, sound=0, shuffle=False, reverse=False, frames=4): + if sound and self.game.app.opt.animations: + self.game.startDealSample() + lr = len(self.game.s.rows) + # move all cards to the Talon + num_cards = 0 + assert len(self.cards) == 0 + rows = list(self.game.s.rows)[:] + if reverse: + rows.reverse() + for r in rows: + for i in range(len(r.cards)): + num_cards += 1 + self.game.moveMove(1, r, self, frames=0) + if self.cards[-1].face_up: + self.game.flipMove(self) + assert len(self.cards) == num_cards + if num_cards == 0: # game already finished + return 0 + if shuffle: + # shuffle + self.game.shuffleStackMove(self) + # redeal + self.game.nextRoundMove(self) + self.game.redealCards() + if sound: + self.game.stopSamples() + return num_cards + + # /*********************************************************************** # // The Talon is a stack with support for dealing. # ************************************************************************/ -class TalonStack(Stack, DealRow_StackMethods, DealBaseCard_StackMethods): +class TalonStack(Stack, + DealRow_StackMethods, + DealBaseCard_StackMethods, + ): def __init__(self, x, y, game, max_rounds=1, num_deal=1, **cap): Stack.__init__(self, x, y, game, cap=cap) self.max_rounds = max_rounds @@ -1361,8 +1446,8 @@ class TalonStack(Stack, DealRow_StackMethods, DealBaseCard_StackMethods): def removeAllCards(self): for stack in self.game.allstacks: while stack.cards: - ##stack.removeCard(update=0) - stack.removeCard(unhide=0, update=0) + stack.removeCard(update=0) + ##stack.removeCard(unhide=0, update=0) for stack in self.game.allstacks: stack.updateText() @@ -1461,6 +1546,15 @@ class InitialDealTalonStack(TalonStack): return None +class RedealTalonStack(TalonStack, RedealCards_StackMethods): + def canDealCards(self): + if self.round == self.max_rounds: + return False + return not self.game.isGameWon() + def dealCards(self, sound=0): + RedealCards_StackMethods.redealCards(self, sound=sound) + + # /*********************************************************************** # // An OpenStack is a stack where cards can be placed and dragged # // (i.e. FoundationStack, RowStack, ReserveStack, ...) @@ -1646,6 +1740,10 @@ class AbstractFoundationStack(OpenStack): def getBaseCard(self): return self._getBaseCard() + def closeStackMove(self): + if len(self.cards) == self.cap.max_cards: + self.game.closeStackMove(self) + # A SameSuit_FoundationStack is the typical Foundation stack. # It builds up in rank and suit. diff --git a/pysollib/tk/card.py b/pysollib/tk/card.py index 3daa7339..c63a586c 100644 --- a/pysollib/tk/card.py +++ b/pysollib/tk/card.py @@ -115,8 +115,10 @@ class _OneImageCard(_HideableCard): _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y) self._face_image = game.getCardFaceImage(deck, suit, rank) self._back_image = game.getCardBackImage(deck, suit, rank) + self._shade_image = game.getCardShadeImage() self._active_image = self._back_image self.item = MfxCanvasImage(game.canvas, self.x, self.y, image=self._active_image, anchor="nw") + self.shade_item = None ##self._setImage = self.item.config def _setImage(self, image): @@ -153,6 +155,7 @@ class _OneImageCard(_HideableCard): item.canvas.tk.call(item.canvas._w, "move", item.id, dx, dy) + # /*********************************************************************** # // New idea since 3.00 # // diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 9f90173b..f2701299 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -335,8 +335,8 @@ class PysolMenubar(PysolMenubarActions): submenu.add_checkbutton(label=n_("Enable highlight same &rank"), variable=self.tkopt.highlight_samerank, command=self.mOptEnableHighlightSameRank) submenu.add_checkbutton(label=n_("Highlight &no matching"), variable=self.tkopt.highlight_not_matching, command=self.mOptEnableHighlightNotMatching) submenu.add_separator() - submenu.add_checkbutton(label=n_("Show removed tiles (in Mahjongg games)"), variable=self.tkopt.mahjongg_show_removed, command=self.mOptMahjonggShowRemoved) - submenu.add_checkbutton(label=n_("Show hint arrow (in Shisen-Sho games)"), variable=self.tkopt.shisen_show_hint, command=self.mOptShisenShowHint) + submenu.add_checkbutton(label=n_("&Show removed tiles (in Mahjongg games)"), variable=self.tkopt.mahjongg_show_removed, command=self.mOptMahjonggShowRemoved) + submenu.add_checkbutton(label=n_("Show hint &arrow (in Shisen-Sho games)"), variable=self.tkopt.shisen_show_hint, command=self.mOptShisenShowHint) menu.add_separator() label = n_("&Sound...") if self.app.audio.audiodev is None: @@ -354,6 +354,7 @@ class PysolMenubar(PysolMenubarActions): submenu.add_checkbutton(label=n_("Card shado&w"), variable=self.tkopt.shadow, command=self.mOptShadow) submenu.add_checkbutton(label=n_("Shade &legal moves"), variable=self.tkopt.shade, command=self.mOptShade) submenu.add_checkbutton(label=n_("&Negative cards bottom"), variable=self.tkopt.negative_bottom, command=self.mOptNegativeBottom) + submenu.add_checkbutton(label=n_("Shade &filled stacks"), variable=self.tkopt.shade_filled_stacks, command=self.mOptShadeFilledStacks) submenu = MfxMenu(menu, label=n_("A&nimations")) submenu.add_radiobutton(label=n_("&None"), variable=self.tkopt.animations, value=0, command=self.mOptAnimations) submenu.add_radiobutton(label=n_("&Timer based"), variable=self.tkopt.animations, value=2, command=self.mOptAnimations) diff --git a/pysollib/tk/tkcanvas.py b/pysollib/tk/tkcanvas.py index 334a4319..9a78d0e1 100644 --- a/pysollib/tk/tkcanvas.py +++ b/pysollib/tk/tkcanvas.py @@ -222,10 +222,17 @@ class MfxCanvas(Tkinter.Canvas): if stack.cards[i].item.tag in current: return i else: - current = self.find("withtag", "current") # get item ids - for i in range(len(stack.cards)): - if stack.cards[i].item.id in current: - return i +## current = self.find("withtag", "current") # get item ids +## for i in range(len(stack.cards)): +## if stack.cards[i].item.id in current: +## return i + x, y = event.x, event.y + items = list(self.find_overlapping(x,y,x,y)) + items.reverse() + for item in items: + for i in range(len(stack.cards)): + if stack.cards[i].item.id == item: + return i return -1 def setTextColor(self, color): From 2c7c72241332ac4b1b5f510a827b8023383051f9 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 20 Jul 2006 21:26:13 +0000 Subject: [PATCH 021/266] + 3 new games + new stack - ArbitraryStack, new AtomicMove - ASingleCardMove git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@22 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 10 ++- pysollib/games/harp.py | 31 ++++++++ pysollib/games/klondike.py | 15 +++- pysollib/games/spider.py | 17 ++++- pysollib/move.py | 68 ++++++++++++++++- pysollib/stack.py | 152 +++++++++++++++++++++++++++++++++---- 6 files changed, 272 insertions(+), 21 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index 0781aea5..86bc71b3 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -62,7 +62,7 @@ from pysoltk import Card from move import AMoveMove, AFlipMove, ATurnStackMove from move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove from move import AUpdateStackMove, AFlipAllMove, ASaveStateMove -from move import ACloseStackMove +from move import ACloseStackMove, ASingleCardMove from hint import DefaultHint from help import helpAbout @@ -228,6 +228,7 @@ class Game: start_y = 0, # Y coord of initial drag event stack = None, # cards = [], # + index = -1, # shadows = [], # list of canvas images shade_stack = None, # stack currently shaded shade_img = None, # canvas image @@ -1963,6 +1964,13 @@ for %d moves. self.__storeMove(am) am.do(self) + def singleCardMove(self, from_stack, to_stack, position, frames=-1, shadow=-1): + am = ASingleCardMove(from_stack, to_stack, position, frames, shadow) + self.__storeMove(am) + am.do(self) + self.hints.list = None + + # Finish the current move. def finishMove(self): diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index f0e11499..8c44b7fb 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -219,6 +219,35 @@ class Arabella(DoubleKlondike): return 0 +# /*********************************************************************** +# // Big Deal +# ************************************************************************/ + +class BigDeal(DoubleKlondike): + def createGame(self, rows=12, max_rounds=2): + l, s = Layout(self), self.s + self.setSize(l.XM+(rows+2)*l.XS, l.YM+8*l.YS) + x, y = l.XM, l.YM + for i in range(rows): + s.rows.append(AC_RowStack(x, y, self, base_rank=KING)) + x += l.XS + for i in range(2): + y = l.YM + for j in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=j%4)) + y += l.YS + x += l.XS + x, y = l.XM, self.height-l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds) + l.createText(s.talon, 'n') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'n') + self.setRegion(s.rows, (-999, -999, l.XM+rows*l.XS-l.CW/2, 999999), priority=1) + l.defaultStackGroups() + + + # register the game registerGame(GameInfo(21, DoubleKlondike, "Double Klondike", GI.GT_KLONDIKE, 2, -1, GI.SL_BALANCED)) @@ -241,4 +270,6 @@ registerGame(GameInfo(496, Inquisitor, "Inquisitor", GI.GT_KLONDIKE, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(497, Arabella, "Arabella", GI.GT_KLONDIKE, 3, 0, GI.SL_BALANCED)) +registerGame(GameInfo(545, BigDeal, "Big Deal", + GI.GT_KLONDIKE | GI.GT_ORIGINAL, 4, 1, GI.SL_BALANCED)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 42496a89..63f925fc 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -486,7 +486,7 @@ class FlowerGarden(Stonewall): # // Brigade # ************************************************************************/ -class KingAlbert(Klondike): +class KingAlbertOld(Klondike): Talon_Class = InitialDealTalonStack RowStack_Class = StackWrapper(AC_RowStack, max_move=1) Hint_Class = CautiousDefaultHint @@ -511,6 +511,19 @@ class KingAlbert(Klondike): self.s.talon.dealRow(rows=self.s.reserves) +class KingAlbert(KingAlbertOld): + + def createGame(self): + l = Klondike.createGame(self, max_rounds=1, rows=self.ROWS, waste=0, texts=0) + self.setSize(self.width+l.XM+l.XS, self.height) + self.s.reserves.append(ArbitraryStack(self.width-l.XS, l.YM, self)) + l.defaultStackGroups() + + def startGame(self): + Klondike.startGame(self, flip=1, reverse=0) + self.s.talon.dealRow(rows=self.s.reserves*7) + + class Raglan(KingAlbert): RESERVES = (2, 2, 2) diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 4b221fd9..a02a15a3 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -396,11 +396,13 @@ class Wasp(Scorpion): # /*********************************************************************** # // Three Blind Mice +# // Farmer's Wife # ************************************************************************/ class ThreeBlindMice(Scorpion): Talon_Class = InitialDealTalonStack + ReserveStack_Class = OpenStack def createGame(self): # create layout @@ -420,7 +422,7 @@ class ThreeBlindMice(Scorpion): x += l.XS x, y = l.XM, l.YM for i in range(2): - s.reserves.append(OpenStack(x, y, self, max_move=1, max_accept=0)) + s.reserves.append(self.ReserveStack_Class(x, y, self)) x += l.XS # default l.defaultAll() @@ -435,6 +437,15 @@ class ThreeBlindMice(Scorpion): self.s.talon.dealRow(rows=self.s.reserves) +class FarmersWife(ThreeBlindMice): + Foundation_Class = Spider_AC_Foundation + RowStack_Class = StackWrapper(ScorpionTail_RowStack, base_rank=KING) + + +class HowTheyRun(ThreeBlindMice): + ReserveStack_Class = ReserveStack + + # /*********************************************************************** # // Rouge et Noir # ************************************************************************/ @@ -1109,4 +1120,8 @@ registerGame(GameInfo(511, DoubleScorpion, "Double Scorpion", GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(512, TripleScorpion, "Triple Scorpion", GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(543, FarmersWife, "Farmer's Wife", + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(544, HowTheyRun, "How They Run", + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/move.py b/pysollib/move.py index 6144f7f7..c6323006 100644 --- a/pysollib/move.py +++ b/pysollib/move.py @@ -446,15 +446,79 @@ class ACloseStackMove(AtomicMove): def redo(self, game): stack = game.allstacks[self.stack_id] assert stack.cards - stack.is_closed = True + stack.is_filled = True stack._shadeStack() def undo(self, game): stack = game.allstacks[self.stack_id] assert stack.cards - stack.is_closed = False + stack.is_filled = False stack._unshadeStack() def cmpForRedo(self, other): return cmp(self.stack_id, other.stack_id) + +# /*********************************************************************** +# // ASingleCardMove - move single card from *anyone* position +# ************************************************************************/ + +class ASingleCardMove(AtomicMove): + + def __init__(self, from_stack, to_stack, from_pos, frames, shadow=-1): + self.from_stack_id = from_stack.id + self.to_stack_id = to_stack.id + self.from_pos = from_pos + self.frames = frames + self.shadow = shadow + + def redo(self, game): + from_stack = game.allstacks[self.from_stack_id] + to_stack = game.allstacks[self.to_stack_id] + from_pos = self.from_pos + if game.moves.state == game.S_PLAY: + assert to_stack.acceptsCards(from_stack, [from_stack.cards[from_pos]]) + card = from_stack.cards[from_pos] + card = from_stack.removeCard(card, update_positions=1) + if self.frames != 0: + x, y = to_stack.getPositionFor(card) + game.animatedMoveTo(from_stack, to_stack, [card], x, y, + frames=self.frames, shadow=self.shadow) + to_stack.addCard(card) + + def undo(self, game): + from_stack = game.allstacks[self.from_stack_id] + to_stack = game.allstacks[self.to_stack_id] + from_pos = self.from_pos + card = to_stack.removeCard() +## if self.frames != 0: +## x, y = to_stack.getPositionFor(card) +## game.animatedMoveTo(from_stack, to_stack, [card], x, y, +## frames=self.frames, shadow=self.shadow) + from_stack.insertCard(card, from_pos) + + def cmpForRedo(self, other): + return cmp((self.from_stack_id, self.to_stack_id, self.from_pos), + (other.from_stack_id, other.to_stack_id, other.from_pos)) + + +# /*********************************************************************** +# // AInnerMove - change position of single card in stack +# ************************************************************************/ + +class AInnerMove(AtomicMove): + + def __init__(self, stack, from_pos, to_pos): + self.stack_id = stack.id + self.from_pos, self.to_pos = from_pos, to_pos + + def redo(self, game): + pass + + def undo(self, game): + pass + + def cmpForRedo(self, other): + return cmp((self.stack_id, self.from_pos, self.to_pos), + (other.stack_id, other.from_pos, other.to_pos)) + diff --git a/pysollib/stack.py b/pysollib/stack.py index 00c90b04..9e1090ac 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -84,6 +84,7 @@ __all__ = ['cardsFaceUp', 'StackWrapper', 'WeakStackWrapper', 'FullStackWrapper', + 'ArbitraryStack', ] # imports @@ -301,7 +302,7 @@ class Stack: view.can_hide_cards = -1 view.max_shadow_cards = -1 # - view.is_closed = False + view.is_filled = False def destruct(self): # help breaking circular references @@ -431,8 +432,24 @@ class Stack: self.closeStackMove() return card + def insertCard(self, card, positon, unhide=1, update=1): + model, view = self, self + model.cards.insert(positon, card) + for c in model.cards[positon:]: + c.tkraise(unhide=unhide) + if view.can_hide_cards and len(model.cards) >= 3 and len(model.cards)-positon <= 2: + # we only need to display the 2 top cards + model.cards[-3].hide(self) + card.item.addtag(view.group) + for c in model.cards[positon:]: + view._position(c) + if update: + view.updateText() + self.closeStackMove() + return card + # Remove a card from the stack. Also update display. {model -> view} - def removeCard(self, card=None, unhide=1, update=1): + def removeCard(self, card=None, unhide=1, update=1, update_positions=0): model, view = self, self assert len(model.cards) > 0 if card is None: @@ -453,12 +470,16 @@ class Stack: if card is model.cards[-1] or model is self.cards[-2]: # Make sure that 2 top cards will be un-hidden. model.cards[-3].unhide() + card_index = model.cards.index(card) model.cards.remove(card) + if update_positions: + for c in model.cards[card_index:]: + view._position(c) if update: view.updateText() - if self.is_closed: + if self.is_filled: self._unshadeStack() - self.is_closed = False + self.is_filled = False return card # Get the top card {model} @@ -979,6 +1000,9 @@ class Stack: # Drag internals {controller -> model -> view} # + def getDragCards(self, index): + return self.cards[index:] + # begin a drag operation def startDrag(self, event, sound=1): #print event.x, event.y @@ -986,7 +1010,7 @@ class Stack: i = self._findCard(event) if i < 0 or not self.canMoveCards(self.cards[i:]): return - if self.is_closed: + if self.is_filled: self.items.shade_item.config(state='hidden') x_offset, y_offset = self.cards[i].x, self.cards[i].y if sound: @@ -999,7 +1023,8 @@ class Stack: drag.start_y = event.y drag.stack = self drag.noshade_stacks = [ self ] - drag.cards = self.cards[i:] + drag.cards = self.getDragCards(i) + drag.index = i images = game.app.images drag.shadows = self.createShadows(drag.cards) ##sx, sy = 0, 0 @@ -1199,7 +1224,7 @@ class Stack: drag.shadows = [] drag.stack = None drag.cards = [] - if self.is_closed: + if self.is_filled: self.items.shade_item.config(state='normal') self.items.shade_item.tkraise() @@ -1639,6 +1664,9 @@ class OpenStack(Stack): return self.highlightMatchingCards(event) return 0 + def dragMove(self, drag, stack, sound=1): + self.playMoveMove(len(drag.cards), stack, frames=0, sound=sound) + def releaseHandler(self, event, drag, sound=1): cards = drag.cards # check if we moved the card by at least 10 pixels @@ -1657,7 +1685,8 @@ class OpenStack(Stack): Stack.releaseHandler(self, event, drag, sound=sound) else: # this code actually moves the cards to the new stack - self.playMoveMove(len(cards), stack, frames=0, sound=sound) + ##self.playMoveMove(len(cards), stack, frames=0, sound=sound) + self.dragMove(drag, stack, sound=sound) def quickPlayHandler(self, event, from_stacks=None, to_stacks=None): ##print 'quickPlayHandler', from_stacks, to_stacks @@ -1697,12 +1726,11 @@ class OpenStack(Stack): # if moves: moves.sort() - moves.reverse() - ##from pprint import pprint - ##pprint(moves) - if moves[0][0] >= 0: + ##from pprint import pprint; pprint(moves) + score, len_moves, ncards, from_stack, to_stack = moves[-1] + if score >= 0: ##self.game.playSample("startdrag") - moves[0][3].playMoveMove(moves[0][2], moves[0][4]) + from_stack.playMoveMove(ncards, to_stack) return 1 return 0 @@ -2163,6 +2191,101 @@ class InvisibleStack(Stack): return None +# /*********************************************************************** +# // ArbitraryStack (stack with arbitrary access) +# ************************************************************************/ + +class ArbitraryStack(OpenStack): + + def __init__(self, x, y, game, **cap): + kwdefault(cap, max_accept=0) + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = game.app.images.CARD_YOFFSET + + def canMoveCards(self, cards): + return True + + def getDragCards(self, index): + return [ self.cards[index] ] + + def startDrag(self, event, sound=1): + OpenStack.startDrag(self, event, sound=sound) + + def doubleclickHandler(self, event): + # flip or drop a card + flipstacks, dropstacks, quickstacks = self.game.getAutoStacks(event) + if self in flipstacks and self.canFlipCard(): + self.playFlipMove() + return -1 # continue this event (start a drag) + if self in dropstacks: + i = self._findCard(event) + if i < 0: + return 0 + cards = [ self.cards[i] ] + for s in self.game.s.foundations: + if s is not self and s.acceptsCards(self, cards): + self.game.playSample("autodrop", priority=30) + self.playSingleCardMove(i, s, sound=0) + return 1 + return 0 + +## def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): +## i = len(self.cards)-1 +## self.singleCardMove(i, to_stack, frames=frames, shadow=shadow) + + def moveCardsBackHandler(self, event, drag): + i = self.cards.index(drag.cards[0]) + for card in self.cards[i:]: + self._position(card) + card.tkraise() + + def singleCardMove(self, index, to_stack, frames=-1, shadow=-1): + self.game.singleCardMove(self, to_stack, index, frames=frames, shadow=shadow) + self.fillStack() + + def dragMove(self, drag, to_stack, sound=1): + self.playSingleCardMove(drag.index, to_stack, frames=0, sound=sound) + + def playSingleCardMove(self, index, to_stack, frames=-1, shadow=-1, sound=1): + if sound: + if to_stack in self.game.s.foundations: + self.game.playSample("drop", priority=30) + else: + self.game.playSample("move", priority=10) + self.singleCardMove(index, to_stack, frames=frames, shadow=shadow) + if not self.game.checkForWin(): + # let the player put cards back from the foundations + if not self in self.game.s.foundations: + self.game.autoPlay() + self.game.finishMove() + + def quickPlayHandler(self, event, from_stacks=None, to_stacks=None): + if to_stacks is None: + to_stacks = self.game.s.foundations + self.game.sg.dropstacks + if not self.cards: + return 0 + # + moves = [] + i = self._findCard(event) + if i < 0: + return 0 + pile = [ self.cards[i] ] + for s in to_stacks: + if s is not self and s.acceptsCards(self, pile): + score = self.game.getQuickPlayScore(1, self, s) + moves.append((score, -len(moves), i, s)) + # + if moves: + moves.sort() + ##from pprint import pprint; pprint(moves) + score, len_moves, index, to_stack = moves[-1] + if score >= 0: + ##self.game.playSample("startdrag") + self.playSingleCardMove(index, to_stack) + return 1 + return 0 + + # /*********************************************************************** # // A StackWrapper is a functor (function object) that creates a # // new stack when called, i.e. it wraps the constructor. @@ -2199,7 +2322,4 @@ class FullStackWrapper(StackWrapper): return apply(self.stack_class, (x, y, game), self.cap) -# /*********************************************************************** -# // -# ************************************************************************/ From 9c2e477746778fd091465611140577d544ba2469 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 21 Jul 2006 21:04:39 +0000 Subject: [PATCH 022/266] * improved Layout * small bug fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@23 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 2 +- pysollib/games/braid.py | 11 +++-- pysollib/games/canfield.py | 4 +- pysollib/games/curdsandwhey.py | 2 +- pysollib/games/fan.py | 5 ++- pysollib/games/fortythieves.py | 8 ++-- pysollib/games/harp.py | 6 ++- pysollib/games/klondike.py | 20 ++++----- pysollib/games/matriarchy.py | 8 ++-- pysollib/games/montana.py | 2 +- pysollib/games/montecarlo.py | 2 +- pysollib/games/pasdedeux.py | 2 +- pysollib/games/picturegallery.py | 14 ++++-- pysollib/games/pileon.py | 2 +- pysollib/games/siebenbisas.py | 2 +- pysollib/games/special/memory.py | 2 +- pysollib/games/sultan.py | 4 +- pysollib/games/unionsquare.py | 2 +- pysollib/games/windmill.py | 6 +-- pysollib/layout.py | 73 ++++++++++++++++++++++++-------- pysollib/settings.py | 1 - pysollib/stack.py | 10 ++--- pysollib/tk/tkcanvas.py | 20 ++++++--- 23 files changed, 134 insertions(+), 74 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index 86bc71b3..e17e3660 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1964,6 +1964,7 @@ for %d moves. self.__storeMove(am) am.do(self) + # for ArbitraryStack def singleCardMove(self, from_stack, to_stack, position, frames=-1, shadow=-1): am = ASingleCardMove(from_stack, to_stack, position, frames, shadow) self.__storeMove(am) @@ -1971,7 +1972,6 @@ for %d moves. self.hints.list = None - # Finish the current move. def finishMove(self): current, moves, stats = self.moves.current, self.moves, self.stats diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py index 98e0b19b..46f86bfb 100644 --- a/pysollib/games/braid.py +++ b/pysollib/games/braid.py @@ -131,6 +131,7 @@ class Braid(Game): def createGame(self): # create layout l, s = Layout(self), self.s + font=self.app.getFont("canvas_default") # set window # (piles up to 20 cards are playable - needed for Braid_BraidStack) @@ -161,9 +162,8 @@ class Braid(Game): s.talon = WasteTalonStack(x, y, self, max_rounds=3) l.createText(s.talon, "ss") s.talon.texts.rounds = MfxCanvasText(self.canvas, - x + l.CW / 2, y - l.YM, - anchor="s", - font=self.app.getFont("canvas_default")) + x + l.CW / 2, y - l.TEXT_MARGIN, + anchor="s", font=font) x = x - l.XS s.waste = WasteStack(x, y, self) l.createText(s.waste, "ss") @@ -174,10 +174,9 @@ class Braid(Game): s.foundations.append(cl(x, y, self, suit=i)) x += l.XS y = y + l.YS - x = 8*l.XS+decks*l.XS/2+l.XM/2 + x = l.XM+8*l.XS+decks*l.XS/2 self.texts.info = MfxCanvasText(self.canvas, - x, y, anchor="n", - font=self.app.getFont("canvas_default")) + x, y, anchor="n", font=font) # define stack-groups self.sg.talonstacks = [s.talon] + [s.waste] diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index bcfed620..0f4673bb 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -142,8 +142,8 @@ class Canfield(Game): tx, ty, ta, tf = l.getTextAttr(None, "se") tx, ty = x + tx + l.XM, y + ty else: - tx, ty, ta, tf = l.getTextAttr(None, "s") - tx, ty = x + tx, y + ty + l.YM + tx, ty, ta, tf = l.getTextAttr(None, "ss") + tx, ty = x + tx, y + ty font = self.app.getFont("canvas_default") self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) x, y = l.XM, l.YM + l.YS + l.TEXT_HEIGHT diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index 2ddef268..dd26195b 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -162,7 +162,7 @@ class Dumfries(Game): # create layout l, s = Layout(self), self.s kwdefault(layout, rows=8, waste=0, texts=1, playcards=20) - apply(Layout.klondikeLayout, (l,), layout) + l.klondikeLayout(**layout) self.setSize(l.size[0], l.size[1]) # create stacks s.talon = Dumfries_TalonStack(l.s.talon.x, l.s.talon.y, self) diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index 72f2b2f4..590b845c 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -81,15 +81,16 @@ class Fan(Game): self.setSize(l.XM + max(rows)*w, l.YM + (1+len(rows))*l.YS) # create stacks + decks = self.gameinfo.decks if reserves: x, y = l.XM, l.YM for r in range(reserves): s.reserves.append(self.ReserveStack_Class(x, y, self)) x += l.XS - x = (self.width - self.gameinfo.decks*4*l.XS - 2*l.XS) / 2 + x = (self.width - decks*4*l.XS - 2*l.XS) / 2 dx = l.XS else: - dx = (self.width - self.gameinfo.decks*4*l.XS)/(self.gameinfo.decks*4+1) + dx = (self.width - decks*4*l.XS)/(decks*4+1) x, y = l.XM + dx, l.YM dx += l.XS for fnd_cls in self.Foundation_Classes: diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 3b0c1dd4..51d6c484 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -103,18 +103,18 @@ class FortyThieves(Game): s.rows.append(self.RowStack_Class(x, y, self, max_move=self.ROW_MAX_MOVE)) x = x + l.XS x = self.width - l.XS - y = self.height - l.YS - l.TEXT_HEIGHT + y = self.height - l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds, num_deal=num_deal) - l.createText(s.talon, "s") + l.createText(s.talon, "n") if max_rounds > 1: s.talon.texts.rounds = MfxCanvasText(self.canvas, - x + l.CW / 2, y - l.YM, + x + l.CW / 2, y - l.TEXT_HEIGHT, anchor="s", font=self.app.getFont("canvas_default")) x = x - l.XS s.waste = WasteStack(x, y, self) s.waste.CARD_XOFFSET = -l.XOFFSET - l.createText(s.waste, "s") + l.createText(s.waste, "n") # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index 8c44b7fb..cc4f6018 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -79,7 +79,7 @@ class DoubleKlondike(Game): assert s.talon.texts.rounds is None tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") if layout.get("texts"): - ty = ty - 2*l.YM + ty = ty - 2*l.TEXT_MARGIN s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=self.app.getFont("canvas_default")) @@ -243,6 +243,10 @@ class BigDeal(DoubleKlondike): x += l.XS s.waste = WasteStack(x, y, self) l.createText(s.waste, 'n') + if max_rounds > 1: + tx, ty, ta, tf = l.getTextAttr(s.waste, 'se') + font = self.app.getFont('canvas_default') + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) self.setRegion(s.rows, (-999, -999, l.XM+rows*l.XS-l.CW/2, 999999), priority=1) l.defaultStackGroups() diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 63f925fc..c61ff190 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -486,7 +486,7 @@ class FlowerGarden(Stonewall): # // Brigade # ************************************************************************/ -class KingAlbertOld(Klondike): +class KingAlbert(Klondike): Talon_Class = InitialDealTalonStack RowStack_Class = StackWrapper(AC_RowStack, max_move=1) Hint_Class = CautiousDefaultHint @@ -511,17 +511,17 @@ class KingAlbertOld(Klondike): self.s.talon.dealRow(rows=self.s.reserves) -class KingAlbert(KingAlbertOld): +## class KingAlbertNew(KingAlbert): - def createGame(self): - l = Klondike.createGame(self, max_rounds=1, rows=self.ROWS, waste=0, texts=0) - self.setSize(self.width+l.XM+l.XS, self.height) - self.s.reserves.append(ArbitraryStack(self.width-l.XS, l.YM, self)) - l.defaultStackGroups() +## def createGame(self): +## l = Klondike.createGame(self, max_rounds=1, rows=self.ROWS, waste=0, texts=0) +## self.setSize(self.width+l.XM+l.XS, self.height) +## self.s.reserves.append(ArbitraryStack(self.width-l.XS, l.YM, self)) +## l.defaultStackGroups() - def startGame(self): - Klondike.startGame(self, flip=1, reverse=0) - self.s.talon.dealRow(rows=self.s.reserves*7) +## def startGame(self): +## Klondike.startGame(self, flip=1, reverse=0) +## self.s.talon.dealRow(rows=self.s.reserves*7) class Raglan(KingAlbert): diff --git a/pysollib/games/matriarchy.py b/pysollib/games/matriarchy.py index 84f8d4e4..ec3732f4 100644 --- a/pysollib/games/matriarchy.py +++ b/pysollib/games/matriarchy.py @@ -174,7 +174,9 @@ class Matriarchy(Game): self.setSize(10*l.XS+l.XM, h + l.YM + h) # create stacks - center, c1, c2 = self.height / 2, h, self.height - h + ##center, c1, c2 = self.height / 2, h, self.height - h + center = self.height / 2 + c1, c2 = center-l.TEXT_HEIGHT/2, center+l.TEXT_HEIGHT/2 x, y = l.XM, c1 - l.CH for i in range(8): s.rows.append(Matriarchy_UpRowStack(x, y, self, i/2)) @@ -186,10 +188,10 @@ class Matriarchy(Game): x, y = x + l.XS / 2, c1 - l.CH / 2 - l.CH tx = x + l.CW / 2 s.waste = Matriarchy_Waste(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") y = c2 + l.CH / 2 s.talon = Matriarchy_Talon(x, y, self, max_rounds=VARIABLE_REDEALS) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, y + l.YS, anchor="n", font=self.app.getFont("canvas_default")) diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py index 05327b8e..1011b931 100644 --- a/pysollib/games/montana.py +++ b/pysollib/games/montana.py @@ -167,7 +167,7 @@ class Montana(Game): def createGame(self): # create layout - l, s = Layout(self, XM=4), self.s + l, s = Layout(self, card_x_space=4), self.s # set window self.setSize(l.XM + self.RSTEP*l.XS, l.YM + 5*l.YS) diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index 76588027..3d868218 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -702,7 +702,7 @@ class DerLetzteMonarch(Game): def createGame(self): # create layout - l, s = Layout(self, XM=4), self.s + l, s = Layout(self, card_x_space=4), self.s # set window self.setSize(l.XM + 13*l.XS, l.YM + 5*l.YS) diff --git a/pysollib/games/pasdedeux.py b/pysollib/games/pasdedeux.py index 3fc5d242..58efb2a0 100644 --- a/pysollib/games/pasdedeux.py +++ b/pysollib/games/pasdedeux.py @@ -161,7 +161,7 @@ class PasDeDeux(Game): def createGame(self): # create layout - l, s = Layout(self, XM=4), self.s + l, s = Layout(self, card_x_space=4), self.s # set window self.setSize(l.XM + 13*l.XS, l.YM + 5*l.YS) diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py index 5766ea6d..a4e0b07d 100644 --- a/pysollib/games/picturegallery.py +++ b/pysollib/games/picturegallery.py @@ -108,12 +108,16 @@ class PictureGallery_Hint(AbstractHint): if not self.hints: for r in game.s.rows: pile = r.getPile() + lp = len(pile) + lr = len(r.cards) + assert 1 <= lp <= lr + rpile = r.cards[ : (lr-lp) ] # remaining pile if not pile or len(pile) != 1 or len(pile) == len(r.cards): continue base_score = 60000 # find a stack that would accept this card for t in game.s.rows: - if t is not r and t.acceptsCards(r, pile): + if self.shallMovePile(r, t, pile, rpile): score = base_score + 100 * (self.K - pile[0].rank) self.addHint(score, 1, r, t) break @@ -289,6 +293,10 @@ class PictureGallery(Game): # // Great Wheel # ************************************************************************/ +class GreatWheel_Hint(PictureGallery_Hint): + shallMovePile = PictureGallery_Hint._cautiousShallMovePile + + class GreatWheel_Foundation(PictureGallery_Foundation): def acceptsCards(self, from_stack, cards): if not PictureGallery_Foundation.acceptsCards(self, from_stack, cards): @@ -313,9 +321,9 @@ class GreatWheel_RowStack(BasicRowStack): return self.game.app.images.getTalonBottom() - class GreatWheel(PictureGallery): + Hint_Class = GreatWheel_Hint Foundation_Class = GreatWheel_Foundation TableauStack_Classes = [ StackWrapper(PictureGallery_TableauStack, base_rank=2, max_cards=5, dir=2), @@ -325,7 +333,7 @@ class GreatWheel(PictureGallery): Talon_Class = StackWrapper(WasteTalonStack, max_rounds=1) def createGame(self): - PictureGallery.createGame(self, rows=2, waste=True, dir=2) + PictureGallery.createGame(self, waste=True) def fillStack(self, stack): if stack is self.s.waste and not stack.cards : diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index 4727a5ae..5ac50258 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -76,7 +76,7 @@ class PileOn(Game): # set window # (set size so that at least 4 cards are fully playable) #w = max(2*l.XS, l.XS+(self.PLAYCARDS-1)*l.XOFFSET+2*l.XM) - w = l.XS+(self.PLAYCARDS-1)*l.XOFFSET+3*l.XM + w = l.XS+(self.PLAYCARDS-1)*l.XOFFSET+3*l.XOFFSET twidth, theight = self.TWIDTH, int((self.NSTACKS-1)/self.TWIDTH+1) self.setSize(l.XM+twidth*w, l.YM+theight*l.YS) diff --git a/pysollib/games/siebenbisas.py b/pysollib/games/siebenbisas.py index e2a7b6bb..b644fb14 100644 --- a/pysollib/games/siebenbisas.py +++ b/pysollib/games/siebenbisas.py @@ -195,7 +195,7 @@ class Maze(Game): def createGame(self): # create layout - l, s = Layout(self, XM=4, YM=4), self.s + l, s = Layout(self, card_x_space=4, card_y_space=4), self.s # set window self.setSize(l.XM + 9*l.XS, l.YM + 6*l.YS) diff --git a/pysollib/games/special/memory.py b/pysollib/games/special/memory.py index 4bebc4ab..d7169f93 100644 --- a/pysollib/games/special/memory.py +++ b/pysollib/games/special/memory.py @@ -271,7 +271,7 @@ class Concentration(Memory24): def createGame(self): # create layout - l, s = Layout(self, XM=4), self.s + l, s = Layout(self, card_x_space=4), self.s # game extras self.other_stack = None diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 72b99c59..c295865f 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -288,7 +288,7 @@ class IdleAces(Game): def createGame(self): l, s = Layout(self), self.s - self.setSize(l.XM+8*l.XS, l.YM+4*l.YS) + self.setSize(l.XM+7*l.XS, l.YM+4*l.YS) x, y = l.XM, l.YM s.talon = WasteTalonStack(x, y, self, max_rounds=3) @@ -296,7 +296,7 @@ class IdleAces(Game): x += l.XS s.waste = WasteStack(x, y, self) l.createText(s.waste, 'ss') - x0, y0 = l.XM+l.XS, l.YM + x0, y0 = l.XM+2*l.XS, l.YM k = 0 for i, j in((2, 0), (0, 1.5), (4, 1.5), (2, 3)): x, y = x0+i*l.XS, y0+j*l.YS diff --git a/pysollib/games/unionsquare.py b/pysollib/games/unionsquare.py index f9870b89..3cf389d4 100644 --- a/pysollib/games/unionsquare.py +++ b/pysollib/games/unionsquare.py @@ -97,7 +97,7 @@ class UnionSquare(Game): def createGame(self, rows=16): # create layout - l, s = Layout(self, YM=18), self.s + l, s = Layout(self, card_y_space=20), self.s # set window self.setSize(l.XM + (5+rows/4)*l.XS, l.YM + 4*l.YS) diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py index b52e9567..1d2057c3 100644 --- a/pysollib/games/windmill.py +++ b/pysollib/games/windmill.py @@ -75,7 +75,7 @@ class Windmill(Game): def createGame(self): # create layout - l, s = Layout(self, XM=20), self.s + l, s = Layout(self, card_x_space=20), self.s # set window self.setSize(7*l.XS+l.XM, 5*l.YS+l.YM+l.YM) @@ -153,7 +153,7 @@ class NapoleonsTomb(Windmill): def createGame(self): # create layout - l, s = Layout(self, XM=20, YM=20), self.s + l, s = Layout(self, card_x_space=20, card_y_space=20), self.s # set window self.setSize(5*l.XS+l.XM, 3*l.YS+l.YM+l.YM) @@ -205,7 +205,7 @@ class Corners(Game): def createGame(self, max_rounds=3): # create layout - l, s = Layout(self, XM=20, YM=20), self.s + l, s = Layout(self, card_x_space=20, card_y_space=20), self.s # set window self.setSize(5*l.XS+l.XM, 4*l.YS+3*l.YM) diff --git a/pysollib/layout.py b/pysollib/layout.py index f14e6fb8..3b66ca15 100644 --- a/pysollib/layout.py +++ b/pysollib/layout.py @@ -40,6 +40,7 @@ import sys # PySol imports from mfxutil import destruct, Struct, SubclassResponsibility from pysoltk import MfxCanvasText +from resource import CSI # /*********************************************************************** @@ -65,7 +66,7 @@ class _LayoutStack: class Layout: - def __init__(self, game, XM=10, YM=10, **kw): + def __init__(self, game, card_x_space=None, card_y_space=None, **kw): self.game = game self.canvas = self.game.canvas self.size = None @@ -80,15 +81,51 @@ class Layout: self.regions = [] # set visual constants images = self.game.app.images + cardset_size = images.cs.si.size + if cardset_size in (CSI.SIZE_TINY, CSI.SIZE_SMALL): + layout_x_margin = 6 + layout_y_margin = 6 + layout_card_x_space = 6 + layout_card_y_space = 10 + elif cardset_size in (CSI.SIZE_MEDIUM,): + layout_x_margin = 8 + layout_y_margin = 8 + layout_card_x_space = 8 + layout_card_y_space = 12 + else: # CSI.SIZE_LARGE, CSI.SIZE_XLARGE + layout_x_margin = 10 + layout_y_margin = 10 + layout_card_x_space = 10 + layout_card_y_space = 14 + self.CW = images.CARDW self.CH = images.CARDH - self.XM = XM # XMARGIN - self.YM = YM # YMARGIN - self.XS = self.CW + XM # XSPACE - self.YS = self.CH + YM # YSPACE self.XOFFSET = images.CARD_XOFFSET self.YOFFSET = images.CARD_YOFFSET - self.TEXT_HEIGHT = 30 + + self.XM = layout_x_margin # XMARGIN + self.YM = layout_y_margin # YMARGIN + + + if card_x_space is None: + self.XS = self.CW + layout_card_x_space # XSPACE + else: + self.XS = self.CW + card_x_space + if card_y_space is None: + self.YS = self.CH + layout_card_y_space # YSPACE + else: + self.YS = self.CH + card_y_space + + ##self.CARD_X_SPACE = layout_card_x_space + ##self.CARD_Y_SPACE = layout_card_y_space + ##self.RIGHT_MARGIN = layout_x_margin-layout_card_x_space + ##self.BOTTOM_MARGIN = layout_y_margin-layout_card_y_space + + self.TEXT_MARGIN = 10 + ##self.TEXT_HEIGHT = 30 + font = game.app.getFont("canvas_default") + self.TEXT_HEIGHT = 18+font[1] + self.__dict__.update(kw) if self.game.preview > 1: if kw.has_key("XOFFSET"): @@ -116,26 +153,26 @@ class Layout: if stack is not None: x, y = stack.x, stack.y if anchor == "n": - return (x + self.CW / 2, y - self.YM, "center", "%d") + return (x+self.CW/2, y-4, "s", "%d") if anchor == "nn": - return (x + self.CW / 2, y - self.YM, "s", "%d") + return (x+self.CW/2, y-self.TEXT_MARGIN, "s", "%d") if anchor == "s": - return (x + self.CW / 2, y + self.YS, "center", "%d") + return (x+self.CW/2, y+self.CH+4, "n", "%d") if anchor == "ss": - return (x + self.CW / 2, y + self.YS, "n", "%d") + return (x+self.CW/2, y+self.CH+self.TEXT_MARGIN, "n", "%d") if anchor == "nw": - return (x - self.XM, y, "ne", "%d") + return (x-self.TEXT_MARGIN, y, "ne", "%d") if anchor == "sw": - return (x - self.XM, y + self.CH, "se", "%d") + return (x-self.TEXT_MARGIN, y+self.CH, "se", "%d") f = "%2d" if self.game.gameinfo.decks > 1: f = "%3d" if anchor == "ne": - return (x + self.XS, y, "nw", f) + return (x+self.CW+self.TEXT_MARGIN, y, "nw", f) if anchor == "se": - return (x + self.XS, y + self.CH, "sw", f) + return (x+self.CW+self.TEXT_MARGIN, y+self.CH, "sw", f) if anchor == "e": - return (x + self.XS, y + self.CH / 2, "w", f) + return (x+self.CW+self.TEXT_MARGIN, y+self.CH/2, "w", f) raise Exception, anchor def createText(self, stack, anchor, dx=0, dy=0, text_format=""): @@ -344,7 +381,7 @@ class Layout: self.s.waste = s = S(x, y) if texts: # place text left of stack - s.setText(x - XM, y + CH, anchor="se", format="%3d") + s.setText(x - self.TEXT_MARGIN, y + CH, anchor="se", format="%3d") # set window self.size = (XM + (rows+decks)*XS, h) @@ -391,12 +428,12 @@ class Layout: self.s.waste = s = S(x, y) if texts: # place text above stack - s.setText(x + CW / 2, y - YM, anchor="s") + s.setText(x + CW / 2, y - self.TEXT_MARGIN, anchor="s") x = w - XS self.s.talon = s = S(x, y) if texts: # place text above stack - s.setText(x + CW / 2, y - YM, anchor="s") + s.setText(x + CW / 2, y - self.TEXT_MARGIN, anchor="s") # set window self.size = (w, YM + h + YS) diff --git a/pysollib/settings.py b/pysollib/settings.py index 05c0f078..f1a1dc3f 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -46,4 +46,3 @@ if os.name == "mac": TOP_SIZE = 10 TOP_TITLE = n_("Top 10") - diff --git a/pysollib/stack.py b/pysollib/stack.py index 9e1090ac..fa32495c 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -1030,10 +1030,10 @@ class Stack: ##sx, sy = 0, 0 sx, sy = -images.SHADOW_XOFFSET, -images.SHADOW_YOFFSET dx, dy = 0, 0 - if self.game.app.opt.sticky_mouse: + if game.app.opt.sticky_mouse: # return cards under mouse - dx = event.x - (x_offset+images.CARDW+sx) - dy = event.y - (y_offset+images.CARDH+sy) + dx = event.x - (x_offset+images.CARDW+sx) - game.canvas.xmargin + dy = event.y - (y_offset+images.CARDH+sy) - game.canvas.ymargin if dx < 0: dx = 0 if dy < 0: dy = 0 for s in drag.shadows: @@ -1043,8 +1043,8 @@ class Stack: for card in drag.cards: card.tkraise() card.moveBy(sx+dx, sy+dy) - if self.game.app.opt.dragcursor: - self.game.canvas.config(cursor=CURSOR_DRAG) + if game.app.opt.dragcursor: + game.canvas.config(cursor=CURSOR_DRAG) # continue a drag operation def keepDrag(self, event): diff --git a/pysollib/tk/tkcanvas.py b/pysollib/tk/tkcanvas.py index 9a78d0e1..4d4df201 100644 --- a/pysollib/tk/tkcanvas.py +++ b/pysollib/tk/tkcanvas.py @@ -117,6 +117,8 @@ class MfxCanvas(Tkinter.Canvas): self._text_color = "#000000" self._stretch_bg_image = 0 self._text_items = [] + # + self.xmargin, self.ymargin = 10, 10 # resize bg image self.bind('', lambda e: self.set_bg_image()) @@ -155,8 +157,8 @@ class MfxCanvas(Tkinter.Canvas): #sh = max(self.winfo_screenheight(), 768) sw = max(self.winfo_width(), int(self.cget('width'))) sh = max(self.winfo_height(), int(self.cget('height'))) - for x in range(0, sw - 1, iw): - for y in range(0, sh - 1, ih): + for x in range(-self.xmargin, sw, iw): + for y in range(-self.ymargin, sh, ih): id = self._x_create("image", x, y, image=image, anchor="nw") self.tag_lower(id) # also see tag_lower above self.__tiles.append(id) @@ -198,8 +200,15 @@ class MfxCanvas(Tkinter.Canvas): def setInitialSize(self, width, height): ##print 'setInitialSize:', width, height - self.config(width=width, height=height) - self.config(scrollregion=(0, 0, width, height)) + if self.preview: + self.config(width=width, height=height) + self.config(scrollregion=(0, 0, width, height)) + else: + # add margins + ##dx, dy = 40, 40 + dx, dy = self.xmargin, self.ymargin + self.config(width=dx+width+dx, height=dy+height+dy) + self.config(scrollregion=(-dx, -dy, width+dx, height+dy)) # @@ -226,7 +235,8 @@ class MfxCanvas(Tkinter.Canvas): ## for i in range(len(stack.cards)): ## if stack.cards[i].item.id in current: ## return i - x, y = event.x, event.y + x, y = event.x-self.xmargin, event.y-self.ymargin + ##x, y = event.x, event.y items = list(self.find_overlapping(x,y,x,y)) items.reverse() for item in items: From 02ea6c8454ece61c84a3235112015f6c66b7dd0a Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 22 Jul 2006 21:28:30 +0000 Subject: [PATCH 023/266] + 2 new games * bug fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@24 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 9 ++- pysollib/games/canfield.py | 24 +++++-- pysollib/games/glenwood.py | 3 +- pysollib/games/harp.py | 3 +- pysollib/games/picturegallery.py | 111 +++++++++++++++++++++++++++++++ 5 files changed, 140 insertions(+), 10 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index e17e3660..52d47bd8 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1436,8 +1436,9 @@ for %d moves. # color = self.app.opt.highlight_not_matching_color width = 6 - r = MfxCanvasRectangle(self.canvas, x+width/2, y+width/2, - x+w-width/2, y+h-width/2, + x0, y0 = x+width/2-self.canvas.xmargin, y+width/2-self.canvas.ymargin + x1, y1 = x+w-width/2-self.canvas.xmargin, y+h-width/2-self.canvas.ymargin + r = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, width=width, fill=None, outline=color) self.canvas.update_idletasks() self.sleep(self.app.opt.highlight_cards_sleep) @@ -1660,16 +1661,18 @@ for %d moves. image=self.app.gimages.logos[4], strings=(s,), separatorwidth=2, timeout=timeout) status = d.status + self.finished = True else: ##s = self.app.miscrandom.choice((_("&OK"), _("&OK"))) s = _("&OK") text = _("\nGame finished\n") if self.app.debug: - text = text + "\n%d %d\n" % (self.stats.player_moves, self.stats.demo_moves) + text += "\nplayer_moves: %d\ndemo_moves: %d\n" % (self.stats.player_moves, self.stats.demo_moves) d = MfxMessageDialog(self.top, title=PACKAGE+_(" Autopilot"), text=text, bitmap=bitmap, strings=(s,), padx=30, timeout=timeout) status = d.status + self.finished = True elif finished: ##self.stopPlayTimer() if not self.top.winfo_ismapped(): diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 0f4673bb..f1f4b1f9 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -650,33 +650,47 @@ class Acme(Canfield): # ************************************************************************/ class Duke(Game): + Foundation_Class = SS_FoundationStack + ReserveStack_Class = OpenStack + RowStack_Class = AC_RowStack - def createGame(self): + def createGame(self, max_rounds=3, texts=False): l, s = Layout(self), self.s w, h = l.XM+6*l.XS+4*l.XOFFSET, l.YM+2*l.YS+12*l.YOFFSET + if texts: + h += l.TEXT_HEIGHT self.setSize(w, h) + self.base_card = None + x, y = l.XM, l.YM - s.talon = WasteTalonStack(x, y, self, max_rounds=3) + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds) l.createText(s.talon, 's') x += l.XS s.waste = WasteStack(x, y, self) l.createText(s.waste, 's') x += l.XS+4*l.XOFFSET for i in range(4): - s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) x += l.XS x0, y0, w = l.XM, l.YM+l.YS+l.TEXT_HEIGHT, l.XS+2*l.XOFFSET for i, j in ((0,0), (0,1), (1,0), (1,1)): x, y = x0+i*w, y0+j*l.YS - stack = OpenStack(x, y, self, max_accept=0) + stack = self.ReserveStack_Class(x, y, self, max_accept=0) stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 s.reserves.append(stack) x, y = l.XM+2*l.XS+4*l.XOFFSET, l.YM+l.YS + if texts: + y += l.TEXT_HEIGHT for i in range(4): - s.rows.append(AC_RowStack(x, y, self)) + s.rows.append(self.RowStack_Class(x, y, self)) x += l.XS + if texts: + tx, ty, ta, tf = l.getTextAttr(s.foundations[-1], "ss") + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) l.defaultStackGroups() diff --git a/pysollib/games/glenwood.py b/pysollib/games/glenwood.py index f86b0a04..9fad3717 100644 --- a/pysollib/games/glenwood.py +++ b/pysollib/games/glenwood.py @@ -183,5 +183,6 @@ class Glenwood(Game): # register the game registerGame(GameInfo(282, Glenwood, "Glenwood", - GI.GT_CANFIELD, 1, 1, GI.SL_BALANCED)) + GI.GT_CANFIELD, 1, 1, GI.SL_BALANCED, + altnames=("Duchess",) )) diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index cc4f6018..7562ba56 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -244,7 +244,8 @@ class BigDeal(DoubleKlondike): s.waste = WasteStack(x, y, self) l.createText(s.waste, 'n') if max_rounds > 1: - tx, ty, ta, tf = l.getTextAttr(s.waste, 'se') + tx, ty, ta, tf = l.getTextAttr(s.talon, 'nn') + ty -= 2*l.TEXT_MARGIN font = self.app.getFont('canvas_default') s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) self.setRegion(s.rows, (-999, -999, l.XM+rows*l.XS-l.CW/2, 999999), priority=1) diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py index a4e0b07d..f2bf98c6 100644 --- a/pysollib/games/picturegallery.py +++ b/pysollib/games/picturegallery.py @@ -108,6 +108,8 @@ class PictureGallery_Hint(AbstractHint): if not self.hints: for r in game.s.rows: pile = r.getPile() + if not pile: + continue lp = len(pile) lr = len(r.cards) assert 1 <= lp <= lr @@ -452,6 +454,110 @@ class Zeus(MountOlympus): self.s.talon.dealRow() +# /*********************************************************************** +# // Royal Parade +# ************************************************************************/ + + +class RoyalParade_TableauStack(PictureGallery_TableauStack): + + def _canSwapPair(self, from_stack): + if from_stack not in self.game.s.tableaux: + return False + if len(self.cards) != 1 or len(from_stack.cards) != 1: + return False + c0, c1 = from_stack.cards[0], self.cards[0] + return (c0.rank == self.cap.base_rank and + c1.rank == from_stack.cap.base_rank) + + def acceptsCards(self, from_stack, cards): + if self._canSwapPair(from_stack): + return True + return PictureGallery_TableauStack.acceptsCards(self, from_stack, cards) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + if self._canSwapPair(to_stack): + self._swapPairMove(ncards, to_stack, frames=-1, shadow=0) + else: + PictureGallery_TableauStack.moveMove(self, ncards, to_stack, + frames=frames, shadow=shadow) + + def _swapPairMove(self, n, other_stack, frames=-1, shadow=-1): + game = self.game + old_state = game.enterState(game.S_FILL) + swap = game.s.internals[0] + game.moveMove(n, self, swap, frames=0) + game.moveMove(n, other_stack, self, frames=frames, shadow=shadow) + game.moveMove(n, swap, other_stack, frames=0) + game.leaveState(old_state) + + +class RoyalParade(PictureGallery): + Talon_Class = DealRowTalonStack + TableauStack_Classes = [ + StackWrapper(RoyalParade_TableauStack, + base_rank=1, max_cards=4, dir=3), + StackWrapper(RoyalParade_TableauStack, + base_rank=2, max_cards=4, dir=3), + StackWrapper(RoyalParade_TableauStack, + base_rank=3, max_cards=4, dir=3), + ] + RowStack_Class = StackWrapper(BasicRowStack, max_accept=0) + + def createGame(self): + PictureGallery.createGame(self) + self.s.internals.append(InvisibleStack(self)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.tableaux) + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Virginia Reel +# ************************************************************************/ + +class VirginiaReel_Talon(DealRowTalonStack): + + def canDealCards(self): + if not DealRowTalonStack.canDealCards(self): + return False + for s in self.game.s.tableaux: + if not s.cards: + return False + return True + + +class VirginiaReel(RoyalParade): + Talon_Class = VirginiaReel_Talon + + def _shuffleHook(self, cards): + bottom_cards = [] + ranks = [] + for c in cards[:]: + if c.rank in (1,2,3) and c.rank not in ranks: + ranks.append(c.rank) + cards.remove(c) + bottom_cards.append(c) + if len(ranks) == 3: + break + bottom_cards.sort(lambda a, b: cmp(b.rank, a.rank)) + return cards+bottom_cards + + def startGame(self): + self.s.talon.dealRow(rows=self.s.tableaux[0::8], frames=0) + self.startDealSample() + for i in range(3): + rows = self.s.tableaux[i*8+1:i*8+8] + self.s.talon.dealRow(rows=rows) + self.s.talon.dealRow() + + def fillStack(self, stack): + pass + + + # register the game registerGame(GameInfo(7, PictureGallery, "Picture Gallery", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, @@ -464,4 +570,9 @@ registerGame(GameInfo(398, MountOlympus, "Mount Olympus", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(399, Zeus, "Zeus", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(546, RoyalParade, "Royal Parade", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(547, VirginiaReel, "Virginia Reel", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) + From 8238b1cb0b51520b66901903d80aafc8b6126949 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 23 Jul 2006 21:05:29 +0000 Subject: [PATCH 024/266] * fixed bug with flipAllMove * improved toolbar: set `pause' button as checkbutton git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@25 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 4 +- pysollib/games/bisley.py | 2 +- pysollib/games/picturegallery.py | 12 +++--- pysollib/games/ultra/larasgame.py | 4 +- pysollib/move.py | 14 +++---- pysollib/tk/menubar.py | 2 + pysollib/tk/toolbar.py | 69 ++++++++++++++++++++++--------- 7 files changed, 69 insertions(+), 38 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index 52d47bd8..5368e64f 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -934,7 +934,9 @@ class Game: return if self.app.debug and not self.top.winfo_ismapped(): return - self.top.busyUpdate() + #self.top.busyUpdate() + self.canvas.after(200) + self.canvas.update_idletasks() old_a = self.app.opt.animations if old_a == 0: self.app.opt.animations = 1 # timer based diff --git a/pysollib/games/bisley.py b/pysollib/games/bisley.py index ebb22cca..4b06c13c 100644 --- a/pysollib/games/bisley.py +++ b/pysollib/games/bisley.py @@ -107,7 +107,7 @@ class DoubleBisley(Bisley): l, s = Layout(self), self.s # set window - w, h = l.XM+(8+4)*l.XS, l.YM+max(3*(l.YS+8*l.YOFFSET), 8*l.YS) + w, h = l.XM+(8+2)*l.XS, l.YM+max(3*(l.YS+8*l.YOFFSET), 8*l.YS) self.setSize(w, h) # create stacks diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py index f2bf98c6..4cf31271 100644 --- a/pysollib/games/picturegallery.py +++ b/pysollib/games/picturegallery.py @@ -168,12 +168,12 @@ class PictureGallery_TableauStack(SS_RowStack): def getBottomImage(self): return self.game.app.images.getLetter(self.cap.base_rank) - def closeStackMove(self): - if len(self.cards) == self.cap.max_cards: - self.game.flipAllMove(self) - - def canFlipCard(self): - return False +## def closeStackMove(self): +## if len(self.cards) == self.cap.max_cards: +## self.game.closeStackMove(self) +## ##self.game.flipAllMove(self) +## def canFlipCard(self): +## return False class PictureGallery_RowStack(BasicRowStack): diff --git a/pysollib/games/ultra/larasgame.py b/pysollib/games/ultra/larasgame.py index ae2bbfb7..a421be49 100644 --- a/pysollib/games/ultra/larasgame.py +++ b/pysollib/games/ultra/larasgame.py @@ -281,9 +281,9 @@ class LarasGame(Game): s.talon = self.Talon_Class(x, y, self, max_rounds=self.MAX_ROUNDS) l.createText(s.talon, "s") if self.MAX_ROUNDS - 1: + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") s.talon.texts.rounds = MfxCanvasText(self.canvas, - x + l.XS / 2, y - l.YM, - anchor="center", + tx, ty, anchor=ta, font=self.app.getFont("canvas_default")) y = h - l.YS * 2 s.rows.append(LarasGame_RowStack(x, y, self, yoffset=0)) diff --git a/pysollib/move.py b/pysollib/move.py index c6323006..cc2e9ed7 100644 --- a/pysollib/move.py +++ b/pysollib/move.py @@ -142,19 +142,17 @@ class AFlipAllMove(AtomicMove): def __init__(self, stack): self.stack_id = stack.id - # do the actual move - def __doMove(self, game, stack): + def redo(self, game): + stack = game.allstacks[self.stack_id] for card in stack.cards: if card.face_up: card.showBack() - else: - card.showFace() - - def redo(self, game): - self.__doMove(game, game.allstacks[self.stack_id]) def undo(self, game): - self.__doMove(game, game.allstacks[self.stack_id]) + stack = game.allstacks[self.stack_id] + for card in stack.cards: + if not card.face_up: + card.showFace() def cmpForRedo(self, other): return cmp(self.stack_id, other.stack_id) diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index f2701299..74c1a2b5 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -828,6 +828,8 @@ class PysolMenubar(PysolMenubarActions): filename = self.app.getGameSaveName(self.game.id) if os.name == "posix": filename = filename + "-" + self.game.getGameNumber(format=0) + elif os.path.supports_unicode_filenames: # new in python 2.3 + filename = filename + "-" + self.game.getGameNumber(format=0) else: filename = filename + "-01" filename = filename + self.DEFAULTEXTENSION diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index 25a6f1be..77d2fbb9 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -63,18 +63,18 @@ n_ = lambda x: x # // # ************************************************************************/ -class ToolbarButton(Tkinter.Button): - def __init__(self, parent, toolbar, toolbar_name, position, **kwargs): - Tkinter.Button.__init__(self, parent, kwargs) +class AbstractToolbarButton: + def __init__(self, parent, toolbar, toolbar_name, position): self.toolbar = toolbar self.toolbar_name = toolbar_name self.position = position self.visible = False + def show(self, orient, force=False): if self.visible and not force: return self.visible = True - padx, pady= 2, 2 + padx, pady = 2, 2 if orient == Tkinter.HORIZONTAL: self.grid(row=0, column=self.position, @@ -85,11 +85,25 @@ class ToolbarButton(Tkinter.Button): column=0, ipadx=padx, ipady=pady, sticky='nsew') + def hide(self): if not self.visible: return self.visible = False self.grid_forget() + +class ToolbarCheckbutton(AbstractToolbarButton, Tkinter.Checkbutton): + def __init__(self, parent, toolbar, toolbar_name, position, **kwargs): + Tkinter.Checkbutton.__init__(self, parent, kwargs) + AbstractToolbarButton.__init__(self, parent, toolbar, toolbar_name, position) + + +class ToolbarButton(AbstractToolbarButton, Tkinter.Button): + def __init__(self, parent, toolbar, toolbar_name, position, **kwargs): + Tkinter.Button.__init__(self, parent, kwargs) + AbstractToolbarButton.__init__(self, parent, toolbar, toolbar_name, position) + + class ToolbarSeparator(Tkinter.Frame): def __init__(self, parent, toolbar, position, **kwargs): Tkinter.Frame.__init__(self, parent, kwargs) @@ -200,6 +214,8 @@ class PysolToolbar(PysolToolbarActions): sep = self._createSeparator() sep.bind("<1>", self.clickHandler) sep.bind("<3>", self.rightclickHandler) + elif l == 'Pause': + self._createButton(l, f, check=True, tooltip=t) else: self._createButton(l, f, tooltip=t) @@ -322,24 +338,33 @@ class PysolToolbar(PysolToolbarActions): self._widgets.append(sep) return sep - def _createButton(self, label, command, tooltip=None): + def _createButton(self, label, command, check=False, tooltip=None): name = label.lower() image = self._loadImage(name) position = len(self._widgets) bd = self.button_relief == 'flat' and 1 or 2 - button = ToolbarButton(self.frame, - position=position, - toolbar=self, - toolbar_name=name, - command=command, takefocus=0, - text=gettext(label), - bd=bd, - relief=self.button_relief, - overrelief='raised', - padx=self.button_pad, - pady=self.button_pad) + kw = { + 'position': position, + 'toolbar': self, + 'toolbar_name': name, + 'command': command, + 'takefocus': 0, + 'text': gettext(label), + 'bd': bd, + 'relief': self.button_relief, + 'overrelief': 'raised', + 'padx': self.button_pad, + 'pady': self.button_pad + } if image: - button.config(image=image) + kw['image'] = image + if check: + kw['offrelief'] = self.button_relief + kw['indicatoron'] = False + kw['selectcolor'] = '' + button = ToolbarCheckbutton(self.frame, **kw) + else: + button = ToolbarButton(self.frame, **kw) button.show(orient=self.orient) setattr(self, name + "_image", image) setattr(self, name + "_button", button) @@ -435,6 +460,7 @@ class PysolToolbar(PysolToolbarActions): self.popup = None if menubar: tkopt = menubar.tkopt + self.pause_button.config(variable=tkopt.pause) self.popup = MfxMenu(master=None, label=n_('Toolbar'), tearoff=0) createToolbarMenu(menubar, self.popup) @@ -453,7 +479,7 @@ class PysolToolbar(PysolToolbarActions): data = [] try: for w in self._widgets: - if not isinstance(w, ToolbarButton): + if not isinstance(w, (ToolbarButton, ToolbarCheckbutton)): continue name = w.toolbar_name image = self._loadImage(name) @@ -476,9 +502,12 @@ class PysolToolbar(PysolToolbarActions): self._setRelief(relief) self.frame.config(relief=self.frame_relief) for w in self._widgets: + bd = relief == 'flat' and 1 or 2 if isinstance(w, ToolbarButton): - bd = relief == 'flat' and 1 or 2 w.config(relief=self.button_relief, bd=bd) + elif isinstance(w, ToolbarCheckbutton): + w.config(relief=self.button_relief, + offrelief=self.button_relief, bd=bd) elif w.__class__ is ToolbarSeparator: # not ToolbarFlatSeparator w.config(relief=self.separator_relief) return True @@ -487,7 +516,7 @@ class PysolToolbar(PysolToolbarActions): if not force and self.compound == compound: return False for w in self._widgets: - if not isinstance(w, ToolbarButton): + if not isinstance(w, (ToolbarButton, ToolbarCheckbutton)): continue if compound == 'text': w.config(compound=Tkinter.NONE, image='') From 28ed1285d33b8ae8888911c812537b8a2c3b3145 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 24 Jul 2006 21:04:31 +0000 Subject: [PATCH 025/266] * improved tooltip * fixed any bugs git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@26 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/actions.py | 3 +-- pysollib/move.py | 6 +++++- pysollib/stack.py | 6 ++++-- pysollib/tk/gameinfodialog.py | 6 +++++- pysollib/tk/tkwidget.py | 23 +++++++++++++++-------- pysollib/tk/toolbar.py | 2 +- 6 files changed, 31 insertions(+), 15 deletions(-) diff --git a/pysollib/actions.py b/pysollib/actions.py index 65280458..c6c87109 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -272,7 +272,6 @@ class PysolMenubarActions: ms.autodeal = 1 if autostacks[2]: ms.quickplay = 1 - ms.highlight_piles = 0 if opt.highlight_piles and game.getHighlightPilesStacks(): ms.highlight_piles = 1 if game.app.getGameRulesFilename(game.id): # note: this may return "" @@ -321,7 +320,7 @@ class PysolMenubarActions: self.setToolbarState(ms.rules, "rules") # self.tkopt.comment.set(bool(self.game.gsaveinfo.comment)) - #self.setToolbarState(ms.pause, "pause") + self.tkopt.pause.set(self.game.pause) # update menu items and toolbar def updateMenus(self): diff --git a/pysollib/move.py b/pysollib/move.py index cc2e9ed7..d27adab4 100644 --- a/pysollib/move.py +++ b/pysollib/move.py @@ -147,11 +147,15 @@ class AFlipAllMove(AtomicMove): for card in stack.cards: if card.face_up: card.showBack() + else: + card.showFace() def undo(self, game): stack = game.allstacks[self.stack_id] for card in stack.cards: - if not card.face_up: + if card.face_up: + card.showBack() + else: card.showFace() def cmpForRedo(self, other): diff --git a/pysollib/stack.py b/pysollib/stack.py index fa32495c..f7145e42 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -429,7 +429,8 @@ class Stack: view._position(card) if update: view.updateText() - self.closeStackMove() + if not self.game.moves.state == self.game.S_REDO: + self.closeStackMove() return card def insertCard(self, card, positon, unhide=1, update=1): @@ -445,7 +446,8 @@ class Stack: view._position(c) if update: view.updateText() - self.closeStackMove() + if not self.game.moves.state == self.game.S_REDO: + self.closeStackMove() return card # Remove a card from the stack. Also update display. {model -> view} diff --git a/pysollib/tk/gameinfodialog.py b/pysollib/tk/gameinfodialog.py index 7f13117f..3e34891b 100644 --- a/pysollib/tk/gameinfodialog.py +++ b/pysollib/tk/gameinfodialog.py @@ -85,6 +85,10 @@ class GameInfoDialog(MfxDialog): 5: 'SL_SKILL', } skill_level = sl.get(gi.skill_level) + if game.Hint_Class is None: + hint = None + else: + hint = game.Hint_Class.__name__ row = 0 for n, t in (('Name:', gi.name), ('Short name:', gi.short_name), @@ -101,7 +105,7 @@ class GameInfoDialog(MfxDialog): ('Rules filename:', gi.rules_filename), ('Module:', game.__module__), ('Class:', game.__class__.__name__), - ('Hint:', game.Hint_Class.__name__), + ('Hint:', hint), ): if t: Label(frame, text=n, anchor=W).grid(row=row, column=0, sticky=N+W) diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 5d7400dd..b6fd0086 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -41,7 +41,7 @@ __all__ = ['MfxMessageDialog', ] # imports -import os, sys, types, Tkinter +import os, sys, time, types, Tkinter import traceback # PySol imports @@ -333,6 +333,8 @@ class MfxSimpleEntry(MfxDialog): # ************************************************************************/ class MfxTooltip: + last_leave_time = 0 + def __init__(self, widget): # private vars self.widget = widget @@ -346,8 +348,9 @@ class MfxTooltip: self.bindings.append(self.widget.bind("", self._leave)) self.bindings.append(self.widget.bind("", self._leave)) # user overrideable settings - self.time = 600 # milliseconds - self.cancel_time = 5000 + self.timeout = 800 # milliseconds + self.cancel_timeout = 5000 + self.leave_timeout = 400 self.relief = Tkinter.SOLID self.justify = Tkinter.LEFT self.fg = "#000000" @@ -373,7 +376,10 @@ class MfxTooltip: after_cancel(self.timer) after_cancel(self.cancel_timer) self.cancel_timer = None - self.timer = after(self.widget, self.time, self._showTip) + if time.time() - MfxTooltip.last_leave_time < self.leave_timeout/1000.: + self._showTip() + else: + self.timer = after(self.widget, self.timeout, self._showTip) def _leave(self, *event): after_cancel(self.timer) @@ -386,14 +392,15 @@ class MfxTooltip: self.tooltip.destroy() destruct(self.tooltip) self.tooltip = None + MfxTooltip.last_leave_time = time.time() def _showTip(self): self.timer = None if self.tooltip or not self.text: return - if isinstance(self.widget, Tkinter.Button): - if self.widget["state"] == Tkinter.DISABLED: - return +## if isinstance(self.widget, (Tkinter.Button, Tkinter.Checkbutton)): +## if self.widget["state"] == Tkinter.DISABLED: +## return ##x = self.widget.winfo_rootx() x = self.widget.winfo_pointerx() y = self.widget.winfo_rooty() + self.widget.winfo_height() @@ -409,7 +416,7 @@ class MfxTooltip: self.label.pack(ipadx=1, ipady=1) self.tooltip.wm_geometry("%+d%+d" % (x, y)) self.tooltip.wm_deiconify() - self.cancel_timer = after(self.widget, self.cancel_time, self._leave) + self.cancel_timer = after(self.widget, self.cancel_timeout, self._leave) ##self.tooltip.tkraise() diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index 77d2fbb9..f03dd1ef 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -214,7 +214,7 @@ class PysolToolbar(PysolToolbarActions): sep = self._createSeparator() sep.bind("<1>", self.clickHandler) sep.bind("<3>", self.rightclickHandler) - elif l == 'Pause': + elif l == 'Pause' and Tkinter.TkVersion >= 8.4: self._createButton(l, f, check=True, tooltip=t) else: self._createButton(l, f, tooltip=t) From 602ccc743fd2208d133ec109d2d11a7e051158cf Mon Sep 17 00:00:00 2001 From: skomoroh Date: Tue, 25 Jul 2006 21:13:43 +0000 Subject: [PATCH 026/266] + 6 new games + new tk util `_getHelpText' git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@27 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 8 +- pysollib/gamedb.py | 10 +- pysollib/games/acesup.py | 43 +++++++- pysollib/games/beleagueredcastle.py | 2 + pysollib/games/calculation.py | 164 +++++++++++++++++++++------- pysollib/games/diplomat.py | 38 ++++++- pysollib/games/golf.py | 62 +++++++++++ pysollib/games/sultan.py | 81 ++++++++++++-- pysollib/stack.py | 16 +-- pysollib/tk/tkutil.py | 10 ++ 10 files changed, 366 insertions(+), 68 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index 5368e64f..8f8928b0 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -197,6 +197,9 @@ class Game: # update display properties self.top.wm_geometry("") # cancel user-specified geometry self.canvas.setInitialSize(self.width, self.height) + if self.app.debug >= 2: + MfxCanvasRectangle(self.canvas, 0, 0, self.width, self.height, + width=2, fill=None, outline='green') # restore game geometry if self.app.opt.save_games_geometry: w, h = self.app.opt.games_geometry.get(self.id, (0, 0)) @@ -1025,8 +1028,9 @@ class Game: def setRegion(self, stacks, rect, priority=0): assert len(stacks) > 0 assert len(rect) == 4 and rect[0] < rect[2] and rect[1] < rect[3] - ##MfxCanvasRectangle(self.canvas, rect[0], rect[1], rect[2], rect[3], - ## width=2, fill=None, outline='red') + if self.app.debug >= 2: + MfxCanvasRectangle(self.canvas, rect[0], rect[1], rect[2], rect[3], + width=2, fill=None, outline='red') for s in stacks: assert s and s in self.allstacks # verify that the stack lies within the rectangle diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index c7ab0167..bde03651 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -244,17 +244,17 @@ class GI: ## 41, 42, 43, 58, 59, 92, 93, 94, 95, 96, ## 100, 105, 111, 112, 113, 130, 200, 201, ##)), - # Gnome AisleRiot 2.2.0 (we have 57 out of 73 games) + # Gnome AisleRiot 2.2.0 (we have 60 out of 70 games) # still missing: - # Clock, Cover, Diamond mine, Gay gordons, Helsinki - # Isabel, Labyrinth (!), Quatorze, Scuffle, Thieves, - # Treize, Valentine, Yeld, ??? + # Clock, Gay gordons, Helsinki, + # Isabel, Labyrinth, Quatorze, Thieves, + # Treize, Valentine, Yeld. ("Gnome AisleRiot", ( 1, 2, 8, 9, 11, 12, 19, 24, 27, 29, 31, 33, 34, 35, 36, 40, 41, 42, 43, 45, 48, 58, 59, 67, 89, 91, 92, 93, 94, 95, 96, 100, 105, 111, 112, 113, 130, 139, 144, 146, 147, 148, 200, 201, 206, 224, 225, 229, 230, 233, 257, 258, 280, 281, 282, - 283, 284, + 283, 284, 551, 552, 553, )), ## KDE Patience 0.7.3 from KDE 1.1.2 (we have 6 out of 9 games) diff --git a/pysollib/games/acesup.py b/pysollib/games/acesup.py index 5c64663a..57435e2f 100644 --- a/pysollib/games/acesup.py +++ b/pysollib/games/acesup.py @@ -42,6 +42,9 @@ from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from montecarlo import MonteCarlo_RowStack + + # /*********************************************************************** # // Aces Up # ************************************************************************/ @@ -69,6 +72,7 @@ class AcesUp_RowStack(BasicRowStack): class AcesUp(Game): + Foundation_Class = AcesUp_Foundation Talon_Class = DealRowTalonStack RowStack_Class = StackWrapper(AcesUp_RowStack, max_accept=1) @@ -92,8 +96,8 @@ class AcesUp(Game): s.rows.append(self.RowStack_Class(x, y, self)) x = x + l.XS x = x + l.XS/2 - stack = AcesUp_Foundation(x, y, self, ANY_SUIT, max_move=0, - dir=0, base_rank=ANY_RANK, max_cards=48) + stack = self.Foundation_Class(x, y, self, suit=ANY_SUIT, max_move=0, + dir=0, base_rank=ANY_RANK, max_cards=48) l.createText(stack, "ss") s.foundations.append(stack) @@ -250,6 +254,39 @@ class AcesUp5(AcesUp): return len(self.s.foundations[0].cards) == 48 +# /*********************************************************************** +# // Cover +# ************************************************************************/ + +class Cover_RowStack(MonteCarlo_RowStack): + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return False + return self.cards[-1].suit == cards[0].suit + + +class Cover(AcesUp): + Foundation_Class = StackWrapper(AbstractFoundationStack, max_accept=0) + Talon_Class = TalonStack + RowStack_Class = StackWrapper(Cover_RowStack, max_accept=1) + + FILL_STACKS_AFTER_DROP = 0 # for MonteCarlo_RowStack + + def fillStack(self, stack): + if not self.s.talon.cards: + return + self.startDealSample() + for r in self.s.rows: + if not r.cards: + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, r) + self.stopSamples() + + + def isGameWon(self): + return len(self.s.foundations[0].cards) == 48 + + # register the game registerGame(GameInfo(903, AcesUp, "Aces Up", # was: 52 GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK, @@ -263,3 +300,5 @@ registerGame(GameInfo(130, PerpetualMotion, "Perpetual Motion", altnames="First Law")) registerGame(GameInfo(353, AcesUp5, "Aces Up 5", GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK)) +registerGame(GameInfo(552, Cover, "Cover", + GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK)) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 9bb3b2e9..b6b19696 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -109,6 +109,8 @@ class StreetsAndAlleys(Game): s.talon = InitialDealTalonStack(x, y, self) if reserves: l.setRegion(s.rows[:4], (-999, l.YM+l.YS-l.CH/2, x1-l.CW/2, 999999)) + else: + l.setRegion(s.rows[:4], (-999, -999, x1-l.CW/2, 999999)) # default l.defaultAll() diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index 97ec7fd7..0ad14be1 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -41,7 +41,7 @@ from pysollib.stack import * from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint -from pysollib.pysoltk import MfxCanvasText +from pysollib.pysoltk import MfxCanvasText, getTextWidth # /*********************************************************************** # // @@ -68,13 +68,16 @@ class Calculation_Hint(DefaultHint): # ************************************************************************/ class BetsyRoss_Foundation(RK_FoundationStack): - def updateText(self): + def updateText(self, update_empty=True): if self.game.preview > 1: return if self.texts.misc: if len(self.cards) == 0: - rank = self.cap.base_rank - self.texts.misc.config(text=RANKS[rank]) + if update_empty: + rank = self.cap.base_rank + self.texts.misc.config(text=RANKS[rank]) + else: + self.texts.misc.config(text="") elif len(self.cards) == self.cap.max_cards: self.texts.misc.config(text="") else: @@ -107,42 +110,57 @@ class Calculation_RowStack(BasicRowStack): class Calculation(Game): Hint_Class = Calculation_Hint + Foundation_Class = Calculation_Foundation + RowStack_Class = StackWrapper(Calculation_RowStack, max_move=1, max_accept=1) # # game layout # - def createGame(self): - # create layout - l, s = Layout(self, TEXT_HEIGHT=40), self.s - - # set window - # (piles up to 20 cards are playable in default window size) - h = max(2*l.YS, 20*l.YOFFSET) - self.setSize(5.5*l.XS+l.XM+200, l.YM + l.YS + l.TEXT_HEIGHT + h) - - # create stacks - x0 = l.XM + l.XS * 3 / 2 - x, y = x0, l.YM - for i in range(4): - stack = Calculation_Foundation(x, y, self, base_rank=i, mod=13, dir=i+1) - s.foundations.append(stack) - stack.texts.misc = MfxCanvasText(self.canvas, - x + l.CW / 2, y + l.YS, - anchor="n", - font=self.app.getFont("canvas_default")) - x = x + l.XS + def _getHelpText(self): help = (_('''\ 1: 2 3 4 5 6 7 8 9 T J Q K 2: 4 6 8 T Q A 3 5 7 9 J K 3: 6 9 Q 2 5 8 J A 4 7 T K 4: 8 Q 3 7 J 2 6 T A 5 9 K''')) + # calculate text_width + lines = help.split('\n') + lines.sort(lambda a, b: cmp(len(a), len(b))) + max_line = lines[-1] + text_width = getTextWidth(max_line, + font=self.app.getFont("canvas_fixed")) + return help, text_width + + def createGame(self): + + # create layout + l, s = Layout(self, TEXT_HEIGHT=40), self.s + help, text_width = self._getHelpText() + text_width += 2*l.XM + + # set window + w = l.XM+5.5*l.XS+text_width + h = max(2*l.YS, 20*l.YOFFSET) + self.setSize(w, l.YM + l.YS + l.TEXT_HEIGHT + h) + + # create stacks + x0 = l.XM + l.XS * 3 / 2 + x, y = x0, l.YM + for i in range(4): + stack = self.Foundation_Class(x, y, self, + mod=13, dir=i+1, base_rank=i) + s.foundations.append(stack) + tx, ty, ta, tf = l.getTextAttr(stack, "s") + font = self.app.getFont("canvas_default") + stack.texts.misc = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + x = x + l.XS self.texts.help = MfxCanvasText(self.canvas, x + l.XM, y + l.CH / 2, text=help, anchor="w", font=self.app.getFont("canvas_fixed")) x = x0 y = l.YM + l.YS + l.TEXT_HEIGHT for i in range(4): - s.rows.append(Calculation_RowStack(x, y, self, max_move=1, max_accept=1)) + s.rows.append(self.RowStack_Class(x, y, self)) x = x + l.XS self.setRegion(s.rows, (-999, y, 999999, 999999)) x = l.XM @@ -205,10 +223,12 @@ class BetsyRoss(Calculation): def createGame(self): # create layout - l, s = Layout(self, TEXT_HEIGHT=40), self.s + l, s = Layout(self), self.s + help, text_width = self._getHelpText() + text_width += 2*l.XM # set window - self.setSize(5.5*l.XS+l.XM+200, l.YM + l.YS + l.TEXT_HEIGHT + 3*l.YS) + self.setSize(5.5*l.XS+l.XM+text_width, l.YM+3*l.YS+l.TEXT_HEIGHT) # create stacks x0 = l.XM + l.XS * 3 / 2 @@ -219,19 +239,17 @@ class BetsyRoss(Calculation): s.foundations.append(stack) x = x + l.XS x = x0 - y = l.YM + l.YS + l.TEXT_HEIGHT + y = l.YM + l.YS for i in range(4): - stack = BetsyRoss_Foundation(x, y, self, base_rank=2*i+1, mod=13, dir=i+1, - max_cards=12, max_move=0) - stack.texts.misc = MfxCanvasText(self.canvas, x + l.CW / 2, y - l.YM, - anchor="s", font=self.app.getFont("canvas_default")) + stack = BetsyRoss_Foundation(x, y, self, base_rank=2*i+1, + mod=13, dir=i+1, + max_cards=12, max_move=0) + tx, ty, ta, tf = l.getTextAttr(stack, "s") + font = self.app.getFont("canvas_default") + stack.texts.misc = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) s.foundations.append(stack) x = x + l.XS - help = (_('''\ -1: 2 3 4 5 6 7 8 9 T J Q K -2: 4 6 8 T Q A 3 5 7 9 J K -3: 6 9 Q 2 5 8 J A 4 7 T K -4: 8 Q 3 7 J 2 6 T A 5 9 K''')) self.texts.help = MfxCanvasText(self.canvas, x + l.XM, y + l.CH / 2, text=help, anchor="w", font=self.app.getFont("canvas_fixed")) x = l.XM @@ -265,6 +283,76 @@ class BetsyRoss(Calculation): return cards + topcards +# /*********************************************************************** +# // One234 +# ************************************************************************/ + +class One234_Foundation(BetsyRoss_Foundation): + def canMoveCards(self, cards): + if not BetsyRoss_Foundation.canMoveCards(self, cards): + return False + return len(self.cards) > 1 + def updateText(self): + BetsyRoss_Foundation.updateText(self, update_empty=False) + + +class One234_RowStack(BasicRowStack): + ##clickHandler = BasicRowStack.doubleclickHandler + pass + + +class One234(Calculation): + Foundation_Class = One234_Foundation + RowStack_Class = StackWrapper(One234_RowStack, max_move=1, max_accept=0) + + def createGame(self): + # create layout + l, s = Layout(self, TEXT_HEIGHT=40), self.s + help, text_width = self._getHelpText() + text_width += 2*l.XM + + # set window + # (piles up to 20 cards are playable in default window size) + w = l.XM+max(4*l.XS+text_width, 8*l.XS) + h = l.YM+2*l.YS+5*l.YOFFSET+l.TEXT_HEIGHT+l.YS + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + for i in range(4): + stack = self.Foundation_Class(x, y, self, + mod=13, dir=i+1, base_rank=i) + s.foundations.append(stack) + tx, ty, ta, tf = l.getTextAttr(stack, "s") + font = self.app.getFont("canvas_default") + stack.texts.misc = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + x = x + l.XS + self.texts.help = MfxCanvasText(self.canvas, x + l.XM, y + l.CH / 2, text=help, + anchor="w", font=self.app.getFont("canvas_fixed")) + x, y = l.XM, l.YM+l.YS+l.TEXT_HEIGHT + for i in range(8): + s.rows.append(self.RowStack_Class(x, y, self)) + x = x + l.XS + + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + # define stack-groups + l.defaultStackGroups() + + def _shuffleHook(self, cards): + return cards + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.foundations) + + + # register the game registerGame(GameInfo(256, Calculation, "Calculation", GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_SKILL, @@ -275,4 +363,6 @@ registerGame(GameInfo(134, BetsyRoss, "Betsy Ross", GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK, altnames=("Fairest", "Four Kings", "Musical Patience", "Quadruple Alliance", "Plus Belle") )) +registerGame(GameInfo(550, One234, "One234", + GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py index 8a3c7922..a5606425 100644 --- a/pysollib/games/diplomat.py +++ b/pysollib/games/diplomat.py @@ -125,12 +125,15 @@ class LadyPalk(Diplomat): # /*********************************************************************** # // Congress +# // Parliament # ************************************************************************/ class Congress(Diplomat): DEAL = (0, 1) FILL_EMPTY_ROWS = 1 + Foundation_Classes = [SS_FoundationStack, SS_FoundationStack] + # # game layout (just rearrange the stacks a little bit) # @@ -143,10 +146,13 @@ class Congress(Diplomat): self.setSize(l.XM + 7*l.XS, l.YM + 4*l.YS) # create stacks - for i in range(4): - for j in range(2): - x, y = l.XM + (4+j)*l.XS, l.YM + i*l.YS - s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) + x = l.XM+4*l.XS + for fnd_cls in self.Foundation_Classes: + y = l.YM + for i in range(4): + s.foundations.append(fnd_cls(x, y, self, suit=i)) + y += l.YS + x += l.XS for i in range(4): for j in range(2): x, y = l.XM + (3+3*j)*l.XS, l.YM + i*l.YS @@ -164,6 +170,26 @@ class Congress(Diplomat): l.defaultStackGroups() +class Parliament(Congress): + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, (c.deck, c.suit))) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + Congress.startGame(self) + + +class Wheatsheaf(Congress): + Foundation_Classes = [ + SS_FoundationStack, + StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1), + ] + RowStack_Class = UD_SS_RowStack + + # /*********************************************************************** # // Rows of Four # ************************************************************************/ @@ -238,4 +264,8 @@ registerGame(GameInfo(485, Dieppe, "Dieppe", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(489, LittleNapoleon, "Little Napoleon", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(548, Parliament, "Parliament", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(549, Wheatsheaf, "Wheatsheaf", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index cd1f3432..b946c836 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -611,6 +611,65 @@ class Robert(Game): self.s.talon.dealCards() +# /*********************************************************************** +# // Diamond Mine +# ************************************************************************/ + +DIAMOND = 3 + +class DiamondMine_Foundation(AbstractFoundationStack): + pass + +class DiamondMine_RowStack(RK_RowStack): + def acceptsCards(self, from_stack, cards): + if not RK_RowStack.acceptsCards(self, from_stack, cards): + return False + if cards[0].suit == DIAMOND: + return False + if self.cards: + return self.cards[-1].suit != DIAMOND + return True + + +class DiamondMine(Game): + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+13*l.XS, l.YM+2*l.YS+15*l.YOFFSET) + + x, y = l.XM+6*l.XS, l.YM + s.foundations.append(SS_FoundationStack(x, y, self, + base_rank=ANY_RANK, suit=DIAMOND, mod=13)) + x, y = l.XM, l.YM+l.YS + for i in range(13): + s.rows.append(DiamondMine_RowStack(x, y, self)) + x += l.XS + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + l.defaultAll() + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def isGameWon(self): + if len(self.s.foundations[0].cards) != 13: + return False + for s in self.s.rows: + if len(s.cards) == 0: + continue + if len(s.cards) != 13: + return False + if not isSameSuitSequence(s.cards): + return False + return True + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + # register the game registerGame(GameInfo(36, Golf, "Golf", GI.GT_GOLF, 1, 0, GI.SL_BALANCED)) @@ -633,3 +692,6 @@ registerGame(GameInfo(405, AllInARow, "All in a Row", GI.GT_GOLF | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(432, Robert, "Robert", GI.GT_GOLF, 1, 2, GI.SL_LUCK)) +registerGame(GameInfo(551, DiamondMine, "Diamond Mine", + GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) + diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index c295865f..40cdc204 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -128,10 +128,10 @@ class Boudoir(Game): x, y = l.XM, l.YM+l.YS-l.TEXT_HEIGHT/2 s.talon = WasteTalonStack(x, y, self, max_rounds=3) - s.talon.texts.rounds = MfxCanvasText(self.canvas, - x + l.CW / 2, y - l.YM, - anchor="s", - font=self.app.getFont("canvas_default")) + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") + font=self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) l.createText(s.talon, "s") y += l.YS+l.TEXT_HEIGHT s.waste = WasteStack(x, y, self) @@ -192,11 +192,11 @@ class CaptiveQueens(Game): x, y = l.XM, l.YM+l.TEXT_HEIGHT s.talon = WasteTalonStack(x, y, self, max_rounds=3) - s.talon.texts.rounds = MfxCanvasText(self.canvas, - x + l.CW / 2, y - l.YM, - anchor="s", - font=self.app.getFont("canvas_default")) l.createText(s.talon, "s") + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") + font = self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) y += l.YS+l.TEXT_HEIGHT s.waste = WasteStack(x, y, self) l.createText(s.waste, "s") @@ -449,9 +449,9 @@ class Matrimony(Game): s.talon = Matrimony_Talon(l.XM, l.YM, self, max_rounds=17) l.createText(s.talon, 'se') tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") + font = self.app.getFont("canvas_default") s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, - anchor=ta, - font=self.app.getFont("canvas_default")) + anchor=ta, font=font) x, y = l.XM+2*l.XS, l.YM for i in range(4): @@ -730,6 +730,65 @@ class CornerSuite(Game): return abs(card1.rank-card2.rank) == 1 +# /*********************************************************************** +# // Scuffle +# ************************************************************************/ + +class Scuffle_Talon(RedealTalonStack): + + def canDealCards(self): + if self.round == self.max_rounds: + return len(self.cards) != 0 + return not self.game.isGameWon() + + def dealCards(self, sound=0): + if self.cards: + return self.dealRowAvail(sound=sound) + RedealTalonStack.redealCards(self, shuffle=True, sound=sound) + return self.dealRowAvail(sound=sound) + + +class Scuffle_RowStack(BasicRowStack): + ##clickHandler = BasicRowStack.doubleclickHandler + pass + + +class Scuffle(Game): + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+6*l.XS, l.YM+2*l.YS) + + s.talon = Scuffle_Talon(l.XM, l.YM+l.YS/2, self, max_rounds=3) + l.createText(s.talon, 's') + tx, ty, ta, tf = l.getTextAttr(s.talon, 'nn') + font = self.app.getFont('canvas_default') + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + + x, y = l.XM+2*l.XS, l.YM + for i in range(4): + s.foundations.append(RK_FoundationStack(x, y, self)) + x += l.XS + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(4): + stack = Scuffle_RowStack(x, y, self, max_move=1) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + x += l.XS + + l.defaultStackGroups() + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, c.suit)) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealRow() + # register the game registerGame(GameInfo(330, Sultan, "Sultan", @@ -759,3 +818,5 @@ registerGame(GameInfo(438, SixesAndSevens, "Sixes and Sevens", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(477, CornerSuite, "Corner Suite", GI.GT_2DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(553, Scuffle, "Scuffle", + GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/stack.py b/pysollib/stack.py index f7145e42..abaf86c2 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -102,8 +102,8 @@ from pysoltk import bind, unbind_destroy from pysoltk import after, after_idle, after_cancel from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText from pysoltk import Card +from pysoltk import getTextWidth -from tkFont import Font # /*********************************************************************** # // Let's start with some test methods for cards. @@ -1398,14 +1398,16 @@ class DealBaseCard_StackMethods: class RedealCards_StackMethods: - def redealCards(self, sound=0, shuffle=False, reverse=False, frames=4): + def redealCards(self, rows=None, sound=0, shuffle=False, reverse=False, frames=4): if sound and self.game.app.opt.animations: self.game.startDealSample() lr = len(self.game.s.rows) # move all cards to the Talon num_cards = 0 assert len(self.cards) == 0 - rows = list(self.game.s.rows)[:] + if rows is None: + rows = self.game.s.rows + rows = list(rows) if reverse: rows.reverse() for r in rows: @@ -1525,7 +1527,7 @@ class TalonStack(Stack, else: ca = None font = self.game.app.getFont("canvas_default") - text_width = Font(self.game.canvas, font).measure(_('Redeal')) + text_width = getTextWidth(_('Redeal'), font=font, root=self.game.canvas) if images.CARDW >= text_width+4 and ca: # add a redeal text above the bottom image if self.max_rounds != 1: @@ -2212,6 +2214,8 @@ class ArbitraryStack(OpenStack): def startDrag(self, event, sound=1): OpenStack.startDrag(self, event, sound=sound) + for c in self.cards[self.game.drag.index+1:]: + c.moveBy(0, -self.CARD_YOFFSET[0]) def doubleclickHandler(self, event): # flip or drop a card @@ -2231,10 +2235,6 @@ class ArbitraryStack(OpenStack): return 1 return 0 -## def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): -## i = len(self.cards)-1 -## self.singleCardMove(i, to_stack, frames=frames, shadow=shadow) - def moveCardsBackHandler(self, event, drag): i = self.cards.index(drag.cards[0]) for card in self.cards[i:]: diff --git a/pysollib/tk/tkutil.py b/pysollib/tk/tkutil.py index 234b93c6..e26d8730 100644 --- a/pysollib/tk/tkutil.py +++ b/pysollib/tk/tkutil.py @@ -51,11 +51,13 @@ __all__ = ['wm_withdraw', 'loadImage', #'fillImage', 'createImage', + 'getTextWidth', ] # imports import sys, os, re import Tkinter +from tkFont import Font try: # PIL import Image @@ -398,3 +400,11 @@ def createImage(width, height, fill, outline=None): fillImage(image, fill, outline) return image + +# /*********************************************************************** +# // font utils +# ************************************************************************/ + +def getTextWidth(text, font, root=None): + return Font(root=root, font=font).measure(text) + From 06ac5b6386d6fdc86a1808b5606ec4e148a7ca59 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 26 Jul 2006 21:10:13 +0000 Subject: [PATCH 027/266] + new file pysollib/games/grandduchess.py + 7 new games * misc. improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@28 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 2 + pysollib/games/__init__.py | 1 + pysollib/games/auldlangsyne.py | 153 +++++++++++++------------------ pysollib/games/fortythieves.py | 60 +++++++++++- pysollib/games/grandduchess.py | 139 ++++++++++++++++++++++++++++ pysollib/games/klondike.py | 6 +- pysollib/games/numerica.py | 29 ++++-- pysollib/games/pileon.py | 87 ++++++++++++++++-- pysollib/games/royalcotillion.py | 23 ++++- pysollib/games/sultan.py | 77 ++++++++-------- pysollib/games/windmill.py | 55 +++++++++-- pysollib/layout.py | 20 ++-- pysollib/stack.py | 9 +- 13 files changed, 495 insertions(+), 166 deletions(-) create mode 100644 pysollib/games/grandduchess.py diff --git a/pysollib/app.py b/pysollib/app.py index 3ca6b47f..e1e49439 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -688,6 +688,8 @@ class Application: else: self.requestCompatibleCardsetType(self.nextgame.id) finally: + # hide main window + self.wm_withdraw() # update options self.opt.last_gameid = id # save options diff --git a/pysollib/games/__init__.py b/pysollib/games/__init__.py index d5b56af9..064b3243 100644 --- a/pysollib/games/__init__.py +++ b/pysollib/games/__init__.py @@ -22,6 +22,7 @@ import fortythieves import freecell import glenwood import golf +import grandduchess import grandfathersclock import gypsy import harp diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index fb3a92b2..06e905ca 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -32,7 +32,6 @@ __all__ = [] # imports -import sys # PySol imports from pysollib.gamedb import registerGame, GameInfo, GI @@ -41,6 +40,8 @@ from pysollib.stack import * from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + # /*********************************************************************** # // Tam O'Shanter @@ -48,26 +49,40 @@ from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint class TamOShanter(Game): Talon_Class = DealRowTalonStack + Foundation_Class = RK_FoundationStack RowStack_Class = StackWrapper(BasicRowStack, max_move=1, max_accept=0) - def createGame(self): + def createGame(self, rows=4, texts=False, yoffset=None): # create layout l, s = Layout(self), self.s # set window - self.setSize(l.XM + 6*l.XS, l.YM + 4*l.YS) + if yoffset is None: + yoffset = l.YOFFSET + max_rows = max(rows, 4*self.gameinfo.decks) + self.setSize(l.XM+(2+max_rows)*l.XS, l.YM+2*l.YS+12*yoffset) # create stacks - x, y, = l.XM, l.YM + if texts: + x, y, = l.XM, l.YM+l.YS/2 + else: + x, y, = l.XM, l.YM s.talon = self.Talon_Class(x, y, self) l.createText(s.talon, "ss") + if texts: + tx, ty, ta, tf = l.getTextAttr(s.talon, 'nn') + font = self.app.getFont('canvas_default') + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) x, y = l.XM+2*l.XS, l.YM - for i in range(4): - s.foundations.append(RK_FoundationStack(x, y, self)) + for i in range(4*self.gameinfo.decks): + s.foundations.append(self.Foundation_Class(x, y, self, suit=i%4)) x += l.XS x, y = l.XM+2*l.XS, l.YM+l.YS - for i in range(4): - s.rows.append(self.RowStack_Class(x, y, self)) + for i in range(rows): + stack = self.RowStack_Class(x, y, self) + s.rows.append(stack) + stack.CARD_YOFFSET = yoffset x += l.XS # define stack-groups @@ -345,25 +360,15 @@ class Colorado(Game): # // Amazons # ************************************************************************/ -class Amazons_Talon(DealRowTalonStack): +class Amazons_Talon(RedealTalonStack): + def canDealCards(self): - ## FIXME: this is to avoid loops in the demo - if self.game.demo and self.game.moves.index >= 100: - return False - if self.round == self.max_rounds: - return False return not self.game.isGameWon() def dealCards(self, sound=0): - self.game.startDealSample() if not self.cards: - self.game.nextRoundMove(self) - n = self._moveAllToTalon() - self.game.stopSamples() - return n - n = self.dealRowAvail() - self.game.stopSamples() - return n + RedealTalonStack.redealCards(self, frames=4, sound=sound) + return self.dealRowAvail(sound=sound) def dealRowAvail(self, rows=None, flip=1, reverse=0, frames=-1, sound=0): if rows is None: @@ -373,19 +378,9 @@ class Amazons_Talon(DealRowTalonStack): if len(f.cards) < 7: rows.append(self.game.s.rows[i]) i += 1 - return DealRowTalonStack.dealRowAvail(self, rows=rows, flip=flip, + return RedealTalonStack.dealRowAvail(self, rows=rows, flip=flip, reverse=reverse, frames=frames, sound=sound) - def _moveAllToTalon(self): - # move all cards to the Talon - num_cards = 0 - for r in self.game.s.rows: - for i in range(len(r.cards)): - num_cards += 1 - self.game.moveMove(1, r, self, frames=4) - self.game.flipMove(self) - return num_cards - class Amazons_Foundation(AbstractFoundationStack): def acceptsCards(self, from_stack, cards): @@ -407,80 +402,60 @@ class Amazons_Foundation(AbstractFoundationStack): return i == j -class Amazons(Game): - - def createGame(self): - # create layout - l, s = Layout(self), self.s - - # set window - self.setSize(l.XM + 6*l.XS, l.YM + 4*l.YS) - - # create stacks - x, y, = l.XM, l.YM - s.talon = Amazons_Talon(x, y, self, max_rounds=-1) - l.createText(s.talon, "ss") - x, y = l.XM+2*l.XS, l.YM - for i in range(4): - s.foundations.append(Amazons_Foundation(x, y, self, suit=i, max_cards=7)) - x += l.XS - x, y = l.XM+2*l.XS, l.YM+l.YS - for i in range(4): - s.rows.append(BasicRowStack(x, y, self, max_move=1, max_accept=0)) - x += l.XS - - # define stack-groups - l.defaultStackGroups() +class Amazons(AuldLangSyne): + Talon_Class = StackWrapper(Amazons_Talon, max_rounds=-1) + Foundation_Class = StackWrapper(Amazons_Foundation, max_cards=7) + def _shuffleHook(self, cards): + return cards def startGame(self): self.startDealSample() self.s.talon.dealRow() - def getAutoStacks(self, event=None): - return ((), (), self.sg.dropstacks) - - # /*********************************************************************** +# // Scuffle # // Acquaintance # ************************************************************************/ -class Acquaintance_Talon(TalonStack): # TalonStack +class Scuffle_Talon(RedealTalonStack): def canDealCards(self): - if self.round == self.max_rounds and not self.cards: - return False + if self.round == self.max_rounds: + return len(self.cards) != 0 return not self.game.isGameWon() - def _redeal(self): - # move all cards to the Talon - lr = len(self.game.s.rows) - num_cards = 0 - assert len(self.cards) == 0 - rows = self.game.s.rows - for r in rows: - for i in range(len(r.cards)): - num_cards = num_cards + 1 - self.game.moveMove(1, r, self, frames=4) - self.game.flipMove(self) - assert len(self.cards) == num_cards - if num_cards == 0: # game already finished - return - self.game.nextRoundMove(self) + def dealCards(self, sound=0, shuffle=True): + if self.cards: + return self.dealRowAvail(sound=sound) + RedealTalonStack.redealCards(self, frames=4, + shuffle=shuffle, sound=sound) + return self.dealRowAvail(sound=sound) + +class Scuffle(AuldLangSyne): + Talon_Class = StackWrapper(Scuffle_Talon, max_rounds=3) + def createGame(self): + AuldLangSyne.createGame(self, texts=True, yoffset=0) + + +class Acquaintance_Talon(Scuffle_Talon): def dealCards(self, sound=0): - if sound: - self.game.startDealSample() - if len(self.cards) == 0: - self._redeal() - n = self.dealRowAvail(sound=sound) - if sound: - self.game.stopSamples() - return n + Scuffle_Talon.dealCards(self, sound=sound, shuffle=False) + class Acquaintance(AuldLangSyne): Talon_Class = StackWrapper(Acquaintance_Talon, max_rounds=3) + def createGame(self, texts=False, yoffset=None): + AuldLangSyne.createGame(self, texts=True) + + +class DoubleAcquaintance(AuldLangSyne): + Talon_Class = StackWrapper(Acquaintance_Talon, max_rounds=3) + def createGame(self): + AuldLangSyne.createGame(self, rows=8, texts=True) + # register the game @@ -500,4 +475,8 @@ registerGame(GameInfo(406, Amazons, "Amazons", )) registerGame(GameInfo(490, Acquaintance, "Acquaintance", GI.GT_NUMERICA, 1, 2, GI.SL_BALANCED)) +registerGame(GameInfo(553, Scuffle, "Scuffle", + GI.GT_NUMERICA, 1, 2, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(560, DoubleAcquaintance, "Double Acquaintance", + GI.GT_NUMERICA, 2, 2, GI.SL_BALANCED)) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 51d6c484..e764b6fc 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -107,10 +107,12 @@ class FortyThieves(Game): s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds, num_deal=num_deal) l.createText(s.talon, "n") if max_rounds > 1: + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") + font = self.app.getFont("canvas_default") s.talon.texts.rounds = MfxCanvasText(self.canvas, - x + l.CW / 2, y - l.TEXT_HEIGHT, - anchor="s", - font=self.app.getFont("canvas_default")) + tx, ty-l.TEXT_MARGIN, + anchor=ta, + font=font) x = x - l.XS s.waste = WasteStack(x, y, self) s.waste.CARD_XOFFSET = -l.XOFFSET @@ -799,6 +801,55 @@ class Waterloo(FortyThieves): return 0 +# /*********************************************************************** +# // Junction +# ************************************************************************/ + +from gypsy import DieRussische_Foundation + +class Junction(Game): + + def createGame(self, rows=7): + + l, s = Layout(self), self.s + + self.setSize(l.XM+10*l.XS, l.YM+3*l.YS+12*l.YOFFSET) + + y = l.YM + for i in range(2): + x = l.XM+2*l.XS + for j in range(8): + s.foundations.append(DieRussische_Foundation(x, y, self, + suit=j%4, max_cards=8)) + x += l.XS + y += l.YS + + x, y = l.XM+(10-rows)*l.XS/2, l.YM+2*l.YS + for i in range(rows): + s.rows.append(AC_RowStack(x, y, self)) + x += l.XS + + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 'ne') + y += l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'ne') + + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + + # register the game registerGame(GameInfo(13, FortyThieves, "Forty Thieves", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL, @@ -887,5 +938,8 @@ registerGame(GameInfo(529, SanJuanHill, "San Juan Hill", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(540, Waterloo, "Waterloo", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(556, Junction, "Junction", + GI.GT_FORTY_THIEVES, 4, 0, GI.SL_MOSTLY_SKILL, + ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) diff --git a/pysollib/games/grandduchess.py b/pysollib/games/grandduchess.py new file mode 100644 index 00000000..57f92061 --- /dev/null +++ b/pysollib/games/grandduchess.py @@ -0,0 +1,139 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports +import sys + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.mfxutil import kwdefault +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // Grand Duchess +# ************************************************************************/ + +class GrandDuchess_Talon(RedealTalonStack): + + def canDealCards(self): + if self.round == self.max_rounds: + return len(self.cards) != 0 + return not self.game.isGameWon() + + def dealCards(self, sound=0): + rows = self.game.s.rows + reserves = self.game.s.reserves + if not self.cards: + RedealTalonStack.redealCards(self, rows=rows+reserves, sound=0) + if sound and not self.game.demo: + self.game.startDealSample() + num_cards = 0 + if self.round != 4: + num_cards += self.dealRowAvail(rows=[reserves[0]], flip=0) + num_cards += self.dealRowAvail() + if self.round != 4: + num_cards += self.dealRowAvail(rows=[reserves[1]], flip=0) + if not self.cards: + for s in reserves: + self.game.flipAllMove(s) + if sound and not self.game.demo: + self.game.stopSamples() + return num_cards + + +class GrandDuchess_Reserve(ArbitraryStack): + def canFlipCard(self): + return False + + +class GrandDuchess(Game): + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w, h = l.XM+9*l.XS, l.YM+2*l.YS+18*l.YOFFSET + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, + suit=i, base_rank=KING, dir=-1)) + x += l.XS + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(4): + stack = BasicRowStack(x, y, self, max_move=1, max_accept=0) + stack.CARD_YOFFSET = l.YOFFSET + s.rows.append(stack) + x += l.XS + x, y = l.XM, l.YM+l.YS + s.reserves.append(GrandDuchess_Reserve(x, y, self)) + x, y = l.XM+7*l.XS, l.YM+l.YS + s.reserves.append(GrandDuchess_Reserve(x, y, self)) + + x, y = self.width-l.XS, self.height-l.YS + s.talon = GrandDuchess_Talon(x, y, self, max_rounds=4) + l.createText(s.talon, 'n') + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") + font = self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + tx, ty-l.TEXT_MARGIN, + anchor=ta, font=font) + # define stack-groups + l.defaultStackGroups() + + + # + # game overrides + # + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=[self.s.reserves[0]], flip=0) + self.s.talon.dealRow() + self.s.talon.dealRow(rows=[self.s.reserves[1]], flip=0) + + + def getAutoStacks(self, event=None): + return ((), (), self.sg.dropstacks) + + +registerGame(GameInfo(557, GrandDuchess, "Grand Duchess", + GI.GT_2DECK_TYPE, 2, 3)) + + diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index c61ff190..22985c82 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -356,7 +356,8 @@ class AgnesSorel(Klondike): def shallHighlightMatch(self, stack1, card1, stack2, card2): return (card1.color == card2.color and - ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + ((card1.rank + 1) % 13 == card2.rank or + (card2.rank + 1) % 13 == card1.rank)) # /*********************************************************************** @@ -638,7 +639,8 @@ class Jane(Klondike): def shallHighlightMatch(self, stack1, card1, stack2, card2): return (card1.suit == card2.suit and - ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + ((card1.rank + 1) % 13 == card2.rank or + (card2.rank + 1) % 13 == card1.rank)) def _autoDeal(self, sound=1): return 0 diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index ed8d8db8..bc2f0072 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -106,29 +106,33 @@ class Numerica(Game): def createGame(self, rows=4): # create layout l, s = Layout(self), self.s + decks = self.gameinfo.decks + foundations = 4*decks # set window # (piles up to 20 cards are playable in default window size) h = max(2*l.YS, 20*l.YOFFSET) - self.setSize(l.XM+(1.5+rows)*l.XS+l.XM, l.YM + l.YS + h) + max_rows = max(rows, foundations) + self.setSize(l.XM+(1.5+max_rows)*l.XS+l.XM, l.YM + l.YS + h) # create stacks x0 = l.XM + l.XS * 3 / 2 - x, y = x0 + (rows-4)*l.XS/2, l.YM - for i in range(4): + if decks == 1: + x = x0 + (rows-4)*l.XS/2 + else: + x = x0 + y = l.YM + for i in range(foundations): s.foundations.append(self.Foundation_Class(x, y, self, suit=i)) x = x + l.XS x, y = x0, l.YM + l.YS for i in range(rows): s.rows.append(self.RowStack_Class(x, y, self)) x = x + l.XS - self.setRegion(s.rows, (x0 - l.XS / 2, y, 999999, 999999)) + self.setRegion(s.rows, (x0-l.XS/2, y-l.CH/2, 999999, 999999)) x = l.XM s.talon = WasteTalonStack(x, y, self, max_rounds=1) - s.talon.texts.ncards = MfxCanvasText(self.canvas, - x + l.CW / 2, y - l.YM, - anchor="s", - font=self.app.getFont("canvas_default")) + l.createText(s.talon, 'n') y = y + l.YS s.waste = WasteStack(x, y, self, max_cards=1) @@ -153,6 +157,11 @@ class Numerica(Game): return () +class Numerica2Decks(Numerica): + def createGame(self): + Numerica.createGame(self, rows=6) + + # /*********************************************************************** # // Lady Betty # ************************************************************************/ @@ -642,3 +651,7 @@ registerGame(GameInfo(435, Shifting, "Shifting", GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(472, Strategerie, "Strategerie", GI.GT_NUMERICA, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(558, Numerica2Decks, "Numerica (2 decks)", + GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) + + diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index 5ac50258..875019eb 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -43,7 +43,7 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint # /*********************************************************************** -# // +# // PileOn # ************************************************************************/ class PileOn_RowStack(RK_RowStack): @@ -127,10 +127,81 @@ class SmallPileOn(PileOn): PLAYCARDS = 4 -class PileOn2Decks(PileOn): - TWIDTH = 4 - NSTACKS = 15 - PLAYCARDS = 8 +## class PileOn2Decks(PileOn): +## TWIDTH = 4 +## NSTACKS = 15 +## PLAYCARDS = 8 +## registerGame(GameInfo(341, PileOn2Decks, "PileOn (2 decks)", +## GI.GT_2DECK_TYPE | GI.GT_OPEN,, 2, 0)) + + +# /*********************************************************************** +# // Foursome +# // Quartets +# ************************************************************************/ + +class Foursome(Game): + Hint_Class = CautiousDefaultHint + Talon_Class = DealRowTalonStack + + def createGame(self, rows=6, texts=True): + l, s = Layout(self), self.s + max_rows = max(6, rows) + self.setSize(l.XM+max_rows*l.XS, l.YM+3*l.YS+13*l.YOFFSET) + x, y = l.XM+(max_rows-6)*l.XS/2, l.YM + for i in range(4): + s.reserves.append(ReserveStack(x, y, self)) + x += l.XS + x = l.XM+(max_rows-1)*l.XS + s.foundations.append(AbstractFoundationStack(x, y, self, + suit=ANY_SUIT, max_cards=52, max_accept=0)) + x, y = l.XM, l.YM+l.YS + for i in range(rows): + s.rows.append(UD_AC_RowStack(x, y, self, mod=13)) + x += l.XS + s.talon = self.Talon_Class(self.width-l.XS, self.height-l.YS, self) + if texts: + l.createText(s.talon, 'n') + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow() + + def fillStack(self, stack): + if not self.s.reserves[0].cards: + return + rank = self.s.reserves[0].cards[0].rank + for r in self.s.reserves[1:]: + if not r.cards or r.cards[0].rank != rank: + return + old_state = self.enterState(self.S_FILL) + self.playSample("droppair", priority=200) + for r in self.s.reserves: + self.moveMove(1, r, self.s.foundations[0], frames=4) + self.flipMove(self.s.foundations[0]) + self.leaveState(old_state) + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + ((card1.rank + 1) % 13 == card2.rank or + (card2.rank + 1) % 13 == card1.rank)) + + +class Quartets(Foursome): + Talon_Class = InitialDealTalonStack + + def createGame(self): + Foursome.createGame(self, rows=8, texts=False) + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRowAvail() # register the game @@ -141,7 +212,9 @@ registerGame(GameInfo(289, SmallPileOn, "Small PileOn", GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL, ranks=(0, 5, 6, 7, 8, 9, 10, 11, 12), rules_filename = "pileon.html")) -## registerGame(GameInfo(341, PileOn2Decks, "PileOn (2 decks)", -## GI.GT_2DECK_TYPE | GI.GT_OPEN,, 2, 0)) +registerGame(GameInfo(554, Foursome, "Foursome", + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(555, Quartets, "Quartets", + GI.GT_1DECK_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 0f405275..b68a7c4d 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -222,11 +222,32 @@ class Kingdom(RoyalCotillion): # // Granada # ************************************************************************/ + +class Alhambra_Hint(CautiousDefaultHint): + def _getDropCardScore(self, score, color, r, t, ncards): + return 93000, color + + class Alhambra_RowStack(UD_SS_RowStack): def getBottomImage(self): return self.game.app.images.getReserveBottom() +class Alhambra_Talon__(RedealTalonStack): + + def canDealCards(self): + if self.round == self.max_rounds: + return len(self.cards) != 0 + return not self.game.isGameWon() + + def dealCards(self, sound=0): + if self.cards: + return self.dealRowAvail(sound=sound) + RedealTalonStack.redealCards(self, frames=0, + shuffle=False, sound=sound) + return self.dealRowAvail(sound=sound) + + class Alhambra_Talon(DealRowTalonStack): def canDealCards(self): r_cards = sum([len(r.cards) for r in self.game.s.rows]) @@ -259,7 +280,7 @@ class Alhambra_Talon(DealRowTalonStack): class Alhambra(Game): - Hint_Class = CautiousDefaultHint + Hint_Class = Alhambra_Hint def createGame(self, rows=1): # create layout diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 40cdc204..0b38af90 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -731,64 +731,63 @@ class CornerSuite(Game): # /*********************************************************************** -# // Scuffle +# // Marshal # ************************************************************************/ -class Scuffle_Talon(RedealTalonStack): - - def canDealCards(self): - if self.round == self.max_rounds: - return len(self.cards) != 0 - return not self.game.isGameWon() - - def dealCards(self, sound=0): - if self.cards: - return self.dealRowAvail(sound=sound) - RedealTalonStack.redealCards(self, shuffle=True, sound=sound) - return self.dealRowAvail(sound=sound) +class Marshal_Hint(CautiousDefaultHint): + def _getDropCardScore(self, score, color, r, t, ncards): + return 93000, color -class Scuffle_RowStack(BasicRowStack): - ##clickHandler = BasicRowStack.doubleclickHandler - pass +class Marshal(Game): - -class Scuffle(Game): + Hint_Class = Marshal_Hint def createGame(self): l, s = Layout(self), self.s - self.setSize(l.XM+6*l.XS, l.YM+2*l.YS) + self.setSize(l.XM+8*l.XS, l.YM+5*l.YS) - s.talon = Scuffle_Talon(l.XM, l.YM+l.YS/2, self, max_rounds=3) - l.createText(s.talon, 's') - tx, ty, ta, tf = l.getTextAttr(s.talon, 'nn') - font = self.app.getFont('canvas_default') - s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, - anchor=ta, font=font) - - x, y = l.XM+2*l.XS, l.YM + x, y = l.XM, l.YM for i in range(4): - s.foundations.append(RK_FoundationStack(x, y, self)) + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) x += l.XS - x, y = l.XM+2*l.XS, l.YM+l.YS for i in range(4): - stack = Scuffle_RowStack(x, y, self, max_move=1) - s.rows.append(stack) - stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + s.foundations.append(SS_FoundationStack(x, y, self, + suit=i, base_rank=KING, dir=-1)) x += l.XS + x, y = l.XM, l.YM+l.YS + s.talon = TalonStack(x, y, self) + l.createText(s.talon, 'se') + y = l.YM+l.YS + for i in range(4): + x = l.XM+2*l.XS + for j in range(6): + stack = UD_SS_RowStack(x, y, self, base_rank=NO_RANK) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + x += l.XS + y += l.YS l.defaultStackGroups() - def _shuffleHook(self, cards): - return self._shuffleHookMoveToTop(cards, - lambda c: (c.rank == ACE, c.suit)) - def startGame(self): self.startDealSample() - self.s.talon.dealRow(rows=self.s.foundations) self.s.talon.dealRow() + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + if self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, stack) + self.leaveState(old_state) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and + (abs(card1.rank-card2.rank) == 1)) + + # register the game registerGame(GameInfo(330, Sultan, "Sultan", @@ -818,5 +817,5 @@ registerGame(GameInfo(438, SixesAndSevens, "Sixes and Sevens", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(477, CornerSuite, "Corner Suite", GI.GT_2DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) -registerGame(GameInfo(553, Scuffle, "Scuffle", - GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(559, Marshal, "Marshal", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py index 1d2057c3..bc267c86 100644 --- a/pysollib/games/windmill.py +++ b/pysollib/games/windmill.py @@ -42,6 +42,9 @@ from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from golf import BlackHole_Foundation + + # /*********************************************************************** # // # ************************************************************************/ @@ -63,10 +66,18 @@ class Windmill_RowStack(ReserveStack): # /*********************************************************************** # // Windmill +# // Dutch Solitaire # ************************************************************************/ class Windmill(Game): + Foundation_Classes = [ + StackWrapper(Windmill_Foundation, mod=13, min_cards=1, max_cards=52), + StackWrapper(Windmill_Foundation, base_rank=KING, dir=-1), + ] + RowStack_Class = Windmill_RowStack + + ROWS_LAYOUT = ((2,0), (2,1), (0,2), (1,2), (3,2), (4,2), (2,3), (2,4)) FILL_STACK = True # @@ -89,16 +100,18 @@ class Windmill(Game): s.waste = WasteStack(x, y, self) l.createText(s.waste, "ss") x0, y0 = x + l.XS, y - for d in ((2,0), (2,1), (0,2), (1,2), (3,2), (4,2), (2,3), (2,4)): + for d in self.ROWS_LAYOUT: x, y = x0 + d[0] * l.XS, y0 + d[1] * l.YS - s.rows.append(Windmill_RowStack(x, y, self)) + stack = self.RowStack_Class(x, y, self) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 x, y = x0 + 2 * l.XS, y0 + 2 * l.YS - s.foundations.append(Windmill_Foundation(x, y, self, - mod=13, min_cards=1, max_cards=52)) + fnd_cls = self.Foundation_Classes[0] + s.foundations.append(fnd_cls(x, y, self)) + fnd_cls = self.Foundation_Classes[1] for d in ((1,0.6), (3,0.6), (1,3.4), (3,3.4)): x, y = x0 + d[0] * l.XS, y0 + d[1] * l.YS - s.foundations.append(Windmill_Foundation(x, y, self, - base_rank=KING, dir=-1)) + s.foundations.append(fnd_cls(x, y, self)) # define stack-groups l.defaultStackGroups() @@ -138,6 +151,34 @@ class Windmill(Game): return ((), (), ()) +class DutchSolitaire_RowStack(UD_RK_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class DutchSolitaire(Windmill): + Foundation_Classes = [ + StackWrapper(BlackHole_Foundation, suit=ANY_SUIT, mod=13, max_cards=UNLIMITED_CARDS), + StackWrapper(BlackHole_Foundation, suit=ANY_SUIT, mod=13, max_cards=UNLIMITED_CARDS), + ] + RowStack_Class = DutchSolitaire_RowStack + + ##ROWS_LAYOUT = ((2,0), (2,1), (0,2), (1,2), (3,2), (4,2), (2,3), (2,4)) + ROWS_LAYOUT = ((2,0), (2,1), (1,2), (3,2), (2,3), (2,4)) + FILL_STACK = False + + def _shuffleHook(self, cards): + return cards + + def startGame(self): + self.startDealSample() + #self.s.talon.dealRow(rows=(self.s.foundations[0],)) + #self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + def getAutoStacks(self, event=None): + return (self.sg.dropstacks, self.sg.dropstacks, self.sg.dropstacks) + # /*********************************************************************** # // Napoleon's Tomb @@ -330,4 +371,6 @@ registerGame(GameInfo(483, Czarina, "Czarina", GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(484, FourSeasons, "Four Seasons", GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(561, DutchSolitaire, "Dutch Solitaire", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/layout.py b/pysollib/layout.py index 3b66ca15..aa3e02ce 100644 --- a/pysollib/layout.py +++ b/pysollib/layout.py @@ -121,9 +121,10 @@ class Layout: ##self.RIGHT_MARGIN = layout_x_margin-layout_card_x_space ##self.BOTTOM_MARGIN = layout_y_margin-layout_card_y_space - self.TEXT_MARGIN = 10 - ##self.TEXT_HEIGHT = 30 font = game.app.getFont("canvas_default") + ##self.TEXT_MARGIN = 10 + self.TEXT_MARGIN = font[1] + ##self.TEXT_HEIGHT = 30 self.TEXT_HEIGHT = 18+font[1] self.__dict__.update(kw) @@ -150,29 +151,30 @@ class Layout: def getTextAttr(self, stack, anchor): x, y = 0, 0 + delta_x, delta_y = 4, 4 if stack is not None: x, y = stack.x, stack.y if anchor == "n": - return (x+self.CW/2, y-4, "s", "%d") + return (x+self.CW/2, y-delta_y, "s", "%d") if anchor == "nn": return (x+self.CW/2, y-self.TEXT_MARGIN, "s", "%d") if anchor == "s": - return (x+self.CW/2, y+self.CH+4, "n", "%d") + return (x+self.CW/2, y+self.CH+delta_y, "n", "%d") if anchor == "ss": return (x+self.CW/2, y+self.CH+self.TEXT_MARGIN, "n", "%d") if anchor == "nw": - return (x-self.TEXT_MARGIN, y, "ne", "%d") + return (x-delta_x, y, "ne", "%d") if anchor == "sw": - return (x-self.TEXT_MARGIN, y+self.CH, "se", "%d") + return (x-delta_x, y+self.CH, "se", "%d") f = "%2d" if self.game.gameinfo.decks > 1: f = "%3d" if anchor == "ne": - return (x+self.CW+self.TEXT_MARGIN, y, "nw", f) + return (x+self.CW+delta_x, y, "nw", f) if anchor == "se": - return (x+self.CW+self.TEXT_MARGIN, y+self.CH, "sw", f) + return (x+self.CW+delta_x, y+self.CH, "sw", f) if anchor == "e": - return (x+self.CW+self.TEXT_MARGIN, y+self.CH/2, "w", f) + return (x+self.CW+delta_x, y+self.CH/2, "w", f) raise Exception, anchor def createText(self, stack, anchor, dx=0, dy=0, text_format=""): diff --git a/pysollib/stack.py b/pysollib/stack.py index abaf86c2..3da4d72a 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -1398,7 +1398,8 @@ class DealBaseCard_StackMethods: class RedealCards_StackMethods: - def redealCards(self, rows=None, sound=0, shuffle=False, reverse=False, frames=4): + def redealCards(self, rows=None, sound=0, + shuffle=False, reverse=False, frames=0): if sound and self.game.app.opt.animations: self.game.startDealSample() lr = len(self.game.s.rows) @@ -1413,7 +1414,7 @@ class RedealCards_StackMethods: for r in rows: for i in range(len(r.cards)): num_cards += 1 - self.game.moveMove(1, r, self, frames=0) + self.game.moveMove(1, r, self, frames=frames) if self.cards[-1].face_up: self.game.flipMove(self) assert len(self.cards) == num_cards @@ -1798,11 +1799,11 @@ class SS_FoundationStack(AbstractFoundationStack): # A Rank_FoundationStack builds up in rank and ignores color and suit. class RK_FoundationStack(SS_FoundationStack): def __init__(self, x, y, game, suit=ANY_SUIT, **cap): - apply(SS_FoundationStack.__init__, (self, x, y, game, suit), cap) + apply(SS_FoundationStack.__init__, (self, x, y, game, ANY_SUIT), cap) def assertStack(self): SS_FoundationStack.assertStack(self) - assert self.cap.suit == ANY_SUIT + ##assert self.cap.suit == ANY_SUIT assert self.cap.color == ANY_COLOR def getHelp(self): From 3c6df76c7a1c534f376e94184f3a8ea507bd3ebf Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 27 Jul 2006 21:25:30 +0000 Subject: [PATCH 028/266] + 6 new games + new action: `show descript. of piles'; new class: StackDesc * Stack.getHelp: rename `Row' -> `Tableau' * misc. improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@29 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 2 +- pysollib/game.py | 29 +++++++++- pysollib/games/auldlangsyne.py | 2 +- pysollib/games/calculation.py | 2 +- pysollib/games/curdsandwhey.py | 2 +- pysollib/games/diplomat.py | 30 ++++++++++- pysollib/games/fortythieves.py | 93 ++++++++++++++++++++++++++++++-- pysollib/games/golf.py | 4 +- pysollib/games/gypsy.py | 64 +++++++++++++++++++++- pysollib/games/harp.py | 35 ++++++++++-- pysollib/games/klondike.py | 2 +- pysollib/games/numerica.py | 10 ++-- pysollib/games/pileon.py | 12 ++--- pysollib/games/royalcotillion.py | 15 ------ pysollib/games/sultan.py | 86 ++++++++++++++++++++++++++--- pysollib/games/windmill.py | 41 ++++++++++---- pysollib/games/yukon.py | 6 +-- pysollib/layout.py | 2 +- pysollib/stack.py | 61 +++++++++++---------- pysollib/tk/menubar.py | 19 +++++-- pysollib/tk/tkwidget.py | 41 ++++++++++++++ 21 files changed, 460 insertions(+), 98 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index e1e49439..639dec14 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -501,7 +501,6 @@ class Application: self.toolbar = None self.canvas = None self.statusbar = None - self.cardsets_cache = {} # self.game = None self.dataloader = None @@ -521,6 +520,7 @@ class Application: self.progress_images = [] self.cardset_manager = CardsetManager() self.cardset = None # current cardset + self.cardsets_cache = {} self.tabletile_manager = TileManager() self.tabletile_index = 0 # current table tile self.sample_manager = SampleManager() diff --git a/pysollib/game.py b/pysollib/game.py index 8f8928b0..a36c093f 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -116,6 +116,7 @@ class Game: self.cards = [] self.stackmap = {} # dict with (x,y) tuples as key self.allstacks = [] + self.stackdesc_list = [] self.demo_logo = None self.pause_logo = None self.s = Struct( # stacks @@ -701,6 +702,7 @@ class Game: if break_pause and self.pause: self.doPause() self.interruptSleep() + self.deleteStackDesc() if self.busy: return 1 if self.drag.stack: self.drag.stack.cancelDrag() @@ -715,12 +717,14 @@ class Game: self.app.menubar.disableMenus() + # # UI & graphics support # def clickHandler(self, *args): self.interruptSleep() + self.deleteStackDesc() if self.demo: self.stopDemo() return EVENT_PROPAGATE @@ -793,7 +797,7 @@ class Game: def _unmapHandler(self, event): # pause game if root window has been iconified if event.widget is self.top and not self.pause: - self.doPause() + self.app.menubar.mPause() # @@ -2461,6 +2465,29 @@ in the current implementation.''' % version if kw.has_key('help') and self.app.opt.helpbar: self.app.helpbar.updateText(info=kw['help']) + # + # Piles descriptions + # + + def showStackDesc(self): + from pysoltk import StackDesc + from stack import InitialDealTalonStack + sd_list = [] + for s in self.allstacks: + sd = (s.__class__.__name__, s.cap.base_rank, s.cap.dir) + if sd in sd_list: + # one of each uniq pile + continue + if isinstance(s, InitialDealTalonStack): + continue + self.stackdesc_list.append(StackDesc(self, s)) + sd_list.append(sd) + + def deleteStackDesc(self): + if self.stackdesc_list: + for sd in self.stackdesc_list: + sd.delete() + self.stackdesc_list = [] # # subclass hooks diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index 06e905ca..6e9a7164 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -154,7 +154,7 @@ class Strategy_RowStack(BasicRowStack): return self.game.app.images.getReserveBottom() def getHelp(self): - return _('Row. Build regardless of rank and suit.') + return _('Tableau. Build regardless of rank and suit.') class Strategy(Game): diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index 0ad14be1..c1cbdaae 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -101,7 +101,7 @@ class Calculation_RowStack(BasicRowStack): return self.game.app.images.getReserveBottom() def getHelp(self): - return _('Row. Build regardless of rank and suit.') + return _('Tableau. Build regardless of rank and suit.') # /*********************************************************************** diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index dd26195b..6537ceb9 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -57,7 +57,7 @@ class CurdsAndWhey_RowStack(BasicRowStack): return isSameSuitSequence(cards) or isRankSequence(cards, dir=0) def getHelp(self): - return _('Row. Build down by suit or of the same rank.') + return _('Tableau. Build down by suit or of the same rank.') class CurdsAndWhey(Game): diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py index a5606425..99469452 100644 --- a/pysollib/games/diplomat.py +++ b/pysollib/games/diplomat.py @@ -41,6 +41,7 @@ from pysollib.stack import * from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText from fortythieves import FortyThieves_Hint from spider import Spider_Hint @@ -138,7 +139,7 @@ class Congress(Diplomat): # game layout (just rearrange the stacks a little bit) # - def createGame(self): + def createGame(self, max_rounds=1): # create layout l, s = Layout(self), self.s @@ -160,11 +161,18 @@ class Congress(Diplomat): stack.CARD_YOFFSET = 0 s.rows.append(stack) x, y, = l.XM, l.YM - s.talon = WasteTalonStack(x, y, self, max_rounds=1) + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds) l.createText(s.talon, "ss") x = x + l.XS s.waste = WasteStack(x, y, self) l.createText(s.waste, "ss") + if max_rounds > 1: + tx, ty, ta, tf = l.getTextAttr(s.waste, "ne") + font = self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + tx, ty, + anchor=ta, + font=font) # define stack-groups l.defaultStackGroups() @@ -251,6 +259,22 @@ class LittleNapoleon(Diplomat): return 0 +# /*********************************************************************** +# // Twin Queens +# ************************************************************************/ + +class TwinQueens(Congress): + Foundation_Classes = [ + StackWrapper(SS_FoundationStack, base_rank=KING, mod=13), + StackWrapper(SS_FoundationStack, base_rank=KING, mod=13), + ] + RowStack_Class = StackWrapper(SS_RowStack, max_move=1) + + def createGame(self): + Congress.createGame(self, max_rounds=2) + + + # register the game registerGame(GameInfo(149, Diplomat, "Diplomat", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) @@ -268,4 +292,6 @@ registerGame(GameInfo(548, Parliament, "Parliament", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(549, Wheatsheaf, "Wheatsheaf", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(563, TwinQueens, "Twin Queens", + GI.GT_FORTY_THIEVES, 2, 1, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index e764b6fc..44e5ba4c 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -32,7 +32,6 @@ __all__ = [] # imports -import sys # PySol imports from pysollib.gamedb import registerGame, GameInfo, GI @@ -43,6 +42,9 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.pysoltk import MfxCanvasText +from gypsy import DieRussische_Foundation + + # /*********************************************************************** # // # ************************************************************************/ @@ -440,7 +442,7 @@ class Indian_RowStack(SequenceRowStack): def _isSequence(self, cards): return isAnySuitButOwnSequence(cards, self.cap.mod, self.cap.dir) def getHelp(self): - return _('Row. Build down in any suit but the same.') + return _('Tableau. Build down in any suit but the same.') class Indian(FortyThieves): @@ -805,8 +807,6 @@ class Waterloo(FortyThieves): # // Junction # ************************************************************************/ -from gypsy import DieRussische_Foundation - class Junction(Game): def createGame(self, rows=7): @@ -849,6 +849,89 @@ class Junction(Game): return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 +# /*********************************************************************** +# // The Spark +# ************************************************************************/ + +class TheSpark_Talon(TalonStack): + + def canDealCards(self): + return len(self.cards) > 0 + + def dealCards(self, sound=0): + old_state = self.game.enterState(self.game.S_DEAL) + num_cards = 0 + if self.cards: + if sound and not self.game.demo: + self.game.playSample("dealwaste") + for i in range(self.num_deal): + for r in self.game.s.reserves: + if not self.cards: + break + self.game.flipMove(self) + self.game.moveMove(1, self, r, frames=4, shadow=0) + num_cards += 1 + self.game.leaveState(old_state) + return num_cards + + +class TheSpark(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self): + + l, s = Layout(self), self.s + + w, h = l.XM+8*l.XS, l.YM+4*l.YS + self.setSize(w, h) + + x, y = l.XM, l.YM + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, + suit=i/2, base_rank=KING, mod=13)) + x += l.XS + x, y = l.XM, l.YM+l.YS + s.talon = TheSpark_Talon(x, y, self, max_rounds=1, num_deal=3) + l.createText(s.talon, 'se') + y += l.YS + for i in (0,1): + stack = WasteStack(x, y, self) + s.reserves.append(stack) + l.createText(stack, 'se') + y += l.YS + y = l.YM+l.YS*3/2 + for i in range(2): + x = l.XM+2*l.XS + for j in range(6): + stack = SS_RowStack(x, y, self, max_move=1) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + s.rows.append(stack) + x += l.XS + y += l.YS + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == KING, c.suit)) + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + + + + # register the game registerGame(GameInfo(13, FortyThieves, "Forty Thieves", @@ -941,5 +1024,7 @@ registerGame(GameInfo(540, Waterloo, "Waterloo", registerGame(GameInfo(556, Junction, "Junction", GI.GT_FORTY_THIEVES, 4, 0, GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) +registerGame(GameInfo(564, TheSpark, "The Spark", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index b946c836..fecb49fc 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -111,7 +111,7 @@ class Golf_RowStack(BasicRowStack): def clickHandler(self, event): return self.doubleclickHandler(event) def getHelp(self): - return _('Row. No building.') + return _('Tableau. No building.') # /*********************************************************************** @@ -411,7 +411,7 @@ class BlackHole_RowStack(ReserveStack): def clickHandler(self, event): return self.doubleclickHandler(event) def getHelp(self): - return _('Row. No building.') + return _('Tableau. No building.') class BlackHole(Game): diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index f27f5485..58cc2ccc 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -539,13 +539,68 @@ class Elba(Gypsy): class Millie(Gypsy): Layout_Method = Layout.klondikeLayout - RowStack_Class = AC_RowStack def startGame(self): self.startDealSample() self.s.talon.dealRow() +# /*********************************************************************** +# // Hypotenuse +# // Eternal Triangle +# // Right Triangle +# ************************************************************************/ + +class Hypotenuse(Gypsy): + Layout_Method = Layout.klondikeLayout + RowStack_Class = KingAC_RowStack + + def createGame(self): + Gypsy.createGame(self, rows=10, playcards=24) + + def startGame(self, flip=0, reverse=1): + for i in range(1, 10): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +class EternalTriangle(Hypotenuse): + + def startGame(self, flip=0, reverse=1): + for i in range(1, 10): + self.s.talon.dealRow(rows=self.s.rows[i:], frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +class RightTriangle_Talon(OpenStack, DealRowTalonStack): + def __init__(self, x, y, game, max_rounds=1, num_deal=1, **cap): + Stack.__init__(self, x, y, game, cap=cap) + self.max_rounds = max_rounds + self.num_deal = num_deal + self.round = 1 + self.base_cards = [] # for DealBaseCard_StackMethods + + def canFlipCard(self): + return False + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + def getHelp(self): + return '' + +class RightTriangle(Hypotenuse): + Talon_Class = StackWrapper(RightTriangle_Talon, max_accept=1, max_move=1) + + def createGame(self): + Gypsy.createGame(self, rows=10, playcards=24) + self.sg.dropstacks.append(self.s.talon) + self.sg.openstacks.append(self.s.talon) + self.sg.reservestacks.append(self.s.talon) + + # register the game registerGame(GameInfo(1, Gypsy, "Gypsy", GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) @@ -593,4 +648,11 @@ registerGame(GameInfo(487, Millie, "Millie", GI.GT_GYPSY, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(498, Steve, "Steve", GI.GT_GYPSY, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(566, Hypotenuse, "Hypotenuse", + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(567, EternalTriangle, "Eternal Triangle", + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL, + altnames=('Lobachevsky',) )) +registerGame(GameInfo(568, RightTriangle, "Right Triangle", + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index 7562ba56..de6bf679 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -224,12 +224,14 @@ class Arabella(DoubleKlondike): # ************************************************************************/ class BigDeal(DoubleKlondike): - def createGame(self, rows=12, max_rounds=2): + RowStack_Class = KingAC_RowStack + + def createGame(self, rows=12, max_rounds=2, XOFFSET=0): l, s = Layout(self), self.s self.setSize(l.XM+(rows+2)*l.XS, l.YM+8*l.YS) x, y = l.XM, l.YM for i in range(rows): - s.rows.append(AC_RowStack(x, y, self, base_rank=KING)) + s.rows.append(self.RowStack_Class(x, y, self)) x += l.XS for i in range(2): y = l.YM @@ -242,16 +244,39 @@ class BigDeal(DoubleKlondike): l.createText(s.talon, 'n') x += l.XS s.waste = WasteStack(x, y, self) + s.waste.CARD_XOFFSET = XOFFSET l.createText(s.waste, 'n') if max_rounds > 1: tx, ty, ta, tf = l.getTextAttr(s.talon, 'nn') - ty -= 2*l.TEXT_MARGIN + ty -= l.TEXT_MARGIN font = self.app.getFont('canvas_default') - s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) self.setRegion(s.rows, (-999, -999, l.XM+rows*l.XS-l.CW/2, 999999), priority=1) l.defaultStackGroups() +# /*********************************************************************** +# // Delivery +# ************************************************************************/ + +class Delivery(BigDeal): + RowStack_Class = StackWrapper(SS_RowStack, max_move=1) + + def createGame(self): + dx = self.app.images.CARDW/10 + BigDeal.createGame(self, rows=12, max_rounds=1, XOFFSET=dx) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + def startGame(self): + for i in range(2): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() # deal first card to WasteStack + # register the game registerGame(GameInfo(21, DoubleKlondike, "Double Klondike", @@ -277,4 +302,6 @@ registerGame(GameInfo(497, Arabella, "Arabella", GI.GT_KLONDIKE, 3, 0, GI.SL_BALANCED)) registerGame(GameInfo(545, BigDeal, "Big Deal", GI.GT_KLONDIKE | GI.GT_ORIGINAL, 4, 1, GI.SL_BALANCED)) +registerGame(GameInfo(562, Delivery, "Delivery", + GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 4, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 22985c82..518a9e8e 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -145,7 +145,7 @@ class ThumbAndPouch_RowStack(SequenceRowStack): def _isSequence(self, cards): return isAnySuitButOwnSequence(cards, self.cap.mod, self.cap.dir) def getHelp(self): - return _('Row. Build down in any suit but the same.') + return _('Tableau. Build down in any suit but the same.') class ThumbAndPouch(Klondike): diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index bc2f0072..e7ddfad6 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -86,8 +86,8 @@ class Numerica_RowStack(BasicRowStack): return self.game.app.images.getReserveBottom() def getHelp(self): - ##return _('Row. Accepts any one card from the Waste.') - return _('Row. Build regardless of rank and suit.') + ##return _('Tableau. Accepts any one card from the Waste.') + return _('Tableau. Build regardless of rank and suit.') # /*********************************************************************** @@ -233,8 +233,8 @@ class PussInTheCorner_RowStack(BasicRowStack): def getBottomImage(self): return self.game.app.images.getReserveBottom() def getHelp(self): - ##return _('Row. Accepts any one card from the Waste.') - return _('Row. Build regardless of rank and suit.') + ##return _('Tableau. Accepts any one card from the Waste.') + return _('Tableau. Build regardless of rank and suit.') class PussInTheCorner(Numerica): @@ -587,7 +587,7 @@ class Strategerie_RowStack(BasicRowStack): return self.game.app.images.getReserveBottom() def getHelp(self): - return _('Row. Build regardless of rank and suit.') + return _('Tableau. Build regardless of rank and suit.') class Strategerie_ReserveStack(ReserveStack): diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index 875019eb..4a079ead 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -146,22 +146,22 @@ class Foursome(Game): def createGame(self, rows=6, texts=True): l, s = Layout(self), self.s - max_rows = max(6, rows) - self.setSize(l.XM+max_rows*l.XS, l.YM+3*l.YS+13*l.YOFFSET) - x, y = l.XM+(max_rows-6)*l.XS/2, l.YM + max_rows = max(8, rows) + self.setSize(l.XM+max_rows*l.XS, l.YM+2*l.YS+13*l.YOFFSET) + x, y = l.XM+l.XS*(max_rows-4)/2, l.YM for i in range(4): s.reserves.append(ReserveStack(x, y, self)) x += l.XS x = l.XM+(max_rows-1)*l.XS s.foundations.append(AbstractFoundationStack(x, y, self, suit=ANY_SUIT, max_cards=52, max_accept=0)) - x, y = l.XM, l.YM+l.YS + x, y = l.XM+l.XS*(max_rows-rows)/2, l.YM+l.YS for i in range(rows): s.rows.append(UD_AC_RowStack(x, y, self, mod=13)) x += l.XS - s.talon = self.Talon_Class(self.width-l.XS, self.height-l.YS, self) + s.talon = self.Talon_Class(l.XM, l.YM, self) if texts: - l.createText(s.talon, 'n') + l.createText(s.talon, 'ne') l.defaultStackGroups() def startGame(self): diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index b68a7c4d..8261a448 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -233,21 +233,6 @@ class Alhambra_RowStack(UD_SS_RowStack): return self.game.app.images.getReserveBottom() -class Alhambra_Talon__(RedealTalonStack): - - def canDealCards(self): - if self.round == self.max_rounds: - return len(self.cards) != 0 - return not self.game.isGameWon() - - def dealCards(self, sound=0): - if self.cards: - return self.dealRowAvail(sound=sound) - RedealTalonStack.redealCards(self, frames=0, - shuffle=False, sound=sound) - return self.dealRowAvail(sound=sound) - - class Alhambra_Talon(DealRowTalonStack): def canDealCards(self): r_cards = sum([len(r.cards) for r in self.game.s.rows]) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 0b38af90..d3027ed6 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -746,22 +746,23 @@ class Marshal(Game): def createGame(self): l, s = Layout(self), self.s - self.setSize(l.XM+8*l.XS, l.YM+5*l.YS) + self.setSize(l.XM+9*l.XS, l.YM+5*l.YS) x, y = l.XM, l.YM for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) - x += l.XS + y += l.YS + x, y = self.width-l.XS, l.YM for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, base_rank=KING, dir=-1)) - x += l.XS - x, y = l.XM, l.YM+l.YS - s.talon = TalonStack(x, y, self) + y += l.YS + x, y = (self.width-l.XS)/2, self.height-l.YS + s.talon = DealRowTalonStack(x, y, self) l.createText(s.talon, 'se') - y = l.YM+l.YS + y = l.YM for i in range(4): - x = l.XM+2*l.XS + x = l.XM+l.XS*3/2 for j in range(6): stack = UD_SS_RowStack(x, y, self, base_rank=NO_RANK) s.rows.append(stack) @@ -788,6 +789,75 @@ class Marshal(Game): (abs(card1.rank-card2.rank) == 1)) +# /*********************************************************************** +# // Royal Aids +# ************************************************************************/ + +class RoyalAids_RowStack(KingAC_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class RoyalAids(Game): + + Hint_Class = CautiousDefaultHint + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+4*l.YS) + + x0 = l.XM+1.5*l.XS + for k in (0,1): + suit = 0 + for i, j in ((1,0), (0,0.5), (2,0.5), (1,1)): + x, y = x0+i*l.XS, l.YM+j*l.YS + s.foundations.append(AC_FoundationStack(x, y, self, suit=suit)) + suit += 1 + x0 += 3.5*l.XS + + x, y = l.XM, l.YM+l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=UNLIMITED_REDEALS) + l.createText(s.talon, 'se') + y += l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'se') + + x, y = l.XM+4*l.XS, l.YM+2*l.YS + for i in (0,1): + stack = RoyalAids_RowStack(x, y, self, max_move=1) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + x += l.XS + x, y = l.XM+3*l.XS, l.YM+3*l.YS + for i in range(4): + stack = BasicRowStack(x, y, self) + s.reserves.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + x += l.XS + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, (c.deck, c.suit))) + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(6): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + for i in range(4): + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealCards() + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.color != card2.color and + (abs(card1.rank-card2.rank) == 1)) + # register the game registerGame(GameInfo(330, Sultan, "Sultan", @@ -819,3 +889,5 @@ registerGame(GameInfo(477, CornerSuite, "Corner Suite", GI.GT_2DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(559, Marshal, "Marshal", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(565, RoyalAids, "Royal Aids", + GI.GT_2DECK_TYPE, 2, UNLIMITED_REDEALS, GI.SL_BALANCED)) diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py index bc267c86..1a49963a 100644 --- a/pysollib/games/windmill.py +++ b/pysollib/games/windmill.py @@ -77,6 +77,7 @@ class Windmill(Game): ] RowStack_Class = Windmill_RowStack + FOUNDATIONS_LAYOUT = ((1,0.6), (3,0.6), (1,3.4), (3,3.4)) ROWS_LAYOUT = ((2,0), (2,1), (0,2), (1,2), (3,2), (4,2), (2,3), (2,4)) FILL_STACK = True @@ -84,12 +85,14 @@ class Windmill(Game): # game layout # - def createGame(self): + def createGame(self, card_x_space=20): # create layout - l, s = Layout(self, card_x_space=20), self.s + l, s = Layout(self, card_x_space=card_x_space), self.s # set window - self.setSize(7*l.XS+l.XM, 5*l.YS+l.YM+l.YM) + max_x = max([i[0] for i in self.FOUNDATIONS_LAYOUT+self.ROWS_LAYOUT]) + max_y = max([i[1] for i in self.FOUNDATIONS_LAYOUT+self.ROWS_LAYOUT]) + self.setSize((3+max_x)*l.XS+l.XM, (1+max_y)*l.YS+l.YM+l.YM) # create stacks x = l.XM @@ -109,7 +112,7 @@ class Windmill(Game): fnd_cls = self.Foundation_Classes[0] s.foundations.append(fnd_cls(x, y, self)) fnd_cls = self.Foundation_Classes[1] - for d in ((1,0.6), (3,0.6), (1,3.4), (3,3.4)): + for d in self.FOUNDATIONS_LAYOUT: x, y = x0 + d[0] * l.XS, y0 + d[1] * l.YS s.foundations.append(fnd_cls(x, y, self)) @@ -158,22 +161,38 @@ class DutchSolitaire_RowStack(UD_RK_RowStack): class DutchSolitaire(Windmill): Foundation_Classes = [ - StackWrapper(BlackHole_Foundation, suit=ANY_SUIT, mod=13, max_cards=UNLIMITED_CARDS), - StackWrapper(BlackHole_Foundation, suit=ANY_SUIT, mod=13, max_cards=UNLIMITED_CARDS), + StackWrapper(BlackHole_Foundation, suit=ANY_SUIT, mod=13, + max_cards=UNLIMITED_CARDS, min_cards=1), + StackWrapper(BlackHole_Foundation, suit=ANY_SUIT, mod=13, + max_cards=UNLIMITED_CARDS, min_cards=1), ] RowStack_Class = DutchSolitaire_RowStack - ##ROWS_LAYOUT = ((2,0), (2,1), (0,2), (1,2), (3,2), (4,2), (2,3), (2,4)) - ROWS_LAYOUT = ((2,0), (2,1), (1,2), (3,2), (2,3), (2,4)) + FOUNDATIONS_LAYOUT = ((1,1), (3,1), (1,3), (3,3)) + ROWS_LAYOUT = ((2,0.5), (-0.5,2), (0.5,2), (3.5,2), (4.5,2), (2,3.5)) FILL_STACK = False + def createGame(self): + Windmill.createGame(self, card_x_space=10) + def _shuffleHook(self, cards): - return cards + # move 5 Aces to top of the Talon (i.e. first cards to be dealt) + def select_cards(c): + if c.rank == ACE: + if c.suit in (0, 1): + return True, c.suit + if c.suit == 3 and c.deck == 0: + return True, c.suit + return False, None + return self._shuffleHookMoveToTop(cards, select_cards) def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(8): + self.s.talon.dealRow(frames=0) self.startDealSample() - #self.s.talon.dealRow(rows=(self.s.foundations[0],)) - #self.s.talon.dealRow() + self.s.talon.dealRow() + self.s.talon.dealRow() self.s.talon.dealCards() # deal first card to WasteStack def getAutoStacks(self, event=None): diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index 6ccb67fe..a5ed6f67 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -140,7 +140,7 @@ class Moosehide_RowStack(Yukon_AC_RowStack): def _isSequence(self, c1, c2): return (c1.suit != c2.suit and c1.rank == c2.rank+1) def getHelp(self): - return _('Row. Build down in any suit but the same, can move any face-up cards regardless of sequence.') + return _('Tableau. Build down in any suit but the same, can move any face-up cards regardless of sequence.') class Moosehide(Yukon): RowStack_Class = StackWrapper(Moosehide_RowStack, base_rank=KING) @@ -199,7 +199,7 @@ class Alaska_RowStack(Yukon_SS_RowStack): ((c1.rank + self.cap.dir) % self.cap.mod == c2.rank or (c2.rank + self.cap.dir) % self.cap.mod == c1.rank)) def getHelp(self): - return _('Row. Build up or down by suit, can move any face-up cards regardless of sequence.') + return _('Tableau. Build up or down by suit, can move any face-up cards regardless of sequence.') class Alaska(RussianSolitaire): @@ -216,7 +216,7 @@ class Roslin_RowStack(Yukon_AC_RowStack): ((c1.rank + self.cap.dir) % self.cap.mod == c2.rank or (c2.rank + self.cap.dir) % self.cap.mod == c1.rank)) def getHelp(self): - return _('Row. Build up or down by alternate color, can move any face-up cards regardless of sequence.') + return _('Tableau. Build up or down by alternate color, can move any face-up cards regardless of sequence.') class Roslin(Yukon): diff --git a/pysollib/layout.py b/pysollib/layout.py index aa3e02ce..119989d4 100644 --- a/pysollib/layout.py +++ b/pysollib/layout.py @@ -500,7 +500,7 @@ class Layout: if rows < maxrows: x += (maxrows-rows) * XS/2 ##y += YM * (3 - foundrows) y += text_height - self.setRegion(self.s.rows, (-999, y - YM / 2, 999999, 999999)) + self.setRegion(self.s.rows, (-999, y-CH/2, 999999, 999999)) for i in range(rows): self.s.rows.append(S(x, y)) x = x + XS diff --git a/pysollib/stack.py b/pysollib/stack.py index 3da4d72a..6ac0ae51 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -1556,8 +1556,8 @@ class TalonStack(Stack, ##round = _('Round #%d.') % self.round return _('Talon.')+' '+nredeals ##+' '+round - def getBaseCard(self): - return self._getBaseCard() + #def getBaseCard(self): + # return self._getBaseCard() # A single click deals one card to each of the RowStacks. @@ -1777,6 +1777,9 @@ class AbstractFoundationStack(OpenStack): if len(self.cards) == self.cap.max_cards: self.game.closeStackMove(self) + def getHelp(self): + return _('Foundation.') + # A SameSuit_FoundationStack is the typical Foundation stack. # It builds up in rank and suit. @@ -1874,7 +1877,7 @@ class BasicRowStack(OpenStack): def getHelp(self): if self.cap.max_accept == 0: - return _('Row. No building.') + return _('Tableau. No building.') return '' #def getBaseCard(self): @@ -1904,9 +1907,9 @@ class AC_RowStack(SequenceRowStack): def _isSequence(self, cards): return isAlternateColorSequence(cards, self.cap.mod, self.cap.dir) def getHelp(self): - if self.cap.dir > 0: return _('Row. Build up by alternate color.') - elif self.cap.dir < 0: return _('Row. Build down by alternate color.') - else: return _('Row. Build by same rank.') + if self.cap.dir > 0: return _('Tableau. Build up by alternate color.') + elif self.cap.dir < 0: return _('Tableau. Build down by alternate color.') + else: return _('Tableau. Build by same rank.') # A SameColor_RowStack builds down by rank and same color. # e.g. Klondike @@ -1914,27 +1917,27 @@ class SC_RowStack(SequenceRowStack): def _isSequence(self, cards): return isSameColorSequence(cards, self.cap.mod, self.cap.dir) def getHelp(self): - if self.cap.dir > 0: return _('Row. Build up by color.') - elif self.cap.dir < 0: return _('Row. Build down by color.') - else: return _('Row. Build by same rank.') + if self.cap.dir > 0: return _('Tableau. Build up by color.') + elif self.cap.dir < 0: return _('Tableau. Build down by color.') + else: return _('Tableau. Build by same rank.') # A SameSuit_RowStack builds down by rank and suit. class SS_RowStack(SequenceRowStack): def _isSequence(self, cards): return isSameSuitSequence(cards, self.cap.mod, self.cap.dir) def getHelp(self): - if self.cap.dir > 0: return _('Row. Build up by suit.') - elif self.cap.dir < 0: return _('Row. Build down by suit.') - else: return _('Row. Build by same rank.') + if self.cap.dir > 0: return _('Tableau. Build up by suit.') + elif self.cap.dir < 0: return _('Tableau. Build down by suit.') + else: return _('Tableau. Build by same rank.') # A Rank_RowStack builds down by rank ignoring suit. class RK_RowStack(SequenceRowStack): def _isSequence(self, cards): return isRankSequence(cards, self.cap.mod, self.cap.dir) def getHelp(self): - if self.cap.dir > 0: return _('Row. Build up regardless of suit.') - elif self.cap.dir < 0: return _('Row. Build down regardless of suit.') - else: return _('Row. Build by same rank.') + if self.cap.dir > 0: return _('Tableau. Build up regardless of suit.') + elif self.cap.dir < 0: return _('Tableau. Build down regardless of suit.') + else: return _('Tableau. Build by same rank.') # A Freecell_AlternateColor_RowStack class FreeCell_AC_RowStack(AC_RowStack): @@ -1960,9 +1963,9 @@ class Spider_SS_RowStack(SS_RowStack): def _isAcceptableSequence(self, cards): return isRankSequence(cards, self.cap.mod, self.cap.dir) def getHelp(self): - if self.cap.dir > 0: return _('Row. Build up regardless of suit.') - elif self.cap.dir < 0: return _('Row. Build down regardless of suit.') - else: return _('Row. Build by same rank.') + if self.cap.dir > 0: return _('Tableau. Build up regardless of suit.') + elif self.cap.dir < 0: return _('Tableau. Build down regardless of suit.') + else: return _('Tableau. Build by same rank.') # A Yukon_AlternateColor_RowStack builds down by rank and alternate color, # but can move any face-up cards regardless of sequence. @@ -1983,10 +1986,12 @@ class Yukon_AC_RowStack(BasicRowStack): return 1 def getHelp(self): - if self.cap.dir > 0: return _('Row. Build up by alternate color, can move any face-up cards regardless of sequence.') - elif self.cap.dir < 0: return _('Row. Build down by alternate color, can move any face-up cards regardless of sequence.') - else: return _('Row. Build by same rank, can move any face-up cards regardless of sequence.') + if self.cap.dir > 0: return _('Tableau. Build up by alternate color, can move any face-up cards regardless of sequence.') + elif self.cap.dir < 0: return _('Tableau. Build down by alternate color, can move any face-up cards regardless of sequence.') + else: return _('Tableau. Build by same rank, can move any face-up cards regardless of sequence.') + def getBaseCard(self): + return self._getBaseCard() # A Yukon_SameSuit_RowStack builds down by rank and suit, # but can move any face-up cards regardless of sequence. @@ -1994,9 +1999,9 @@ class Yukon_SS_RowStack(Yukon_AC_RowStack): def _isSequence(self, c1, c2): return (c1.rank + self.cap.dir) % self.cap.mod == c2.rank and c1.suit == c2.suit def getHelp(self): - if self.cap.dir > 0: return _('Row. Build up by suit, can move any face-up cards regardless of sequence.') - elif self.cap.dir < 0: return _('Row. Build down by suit, can move any face-up cards regardless of sequence.') - else: return _('Row. Build by same rank, can move any face-up cards regardless of sequence.') + if self.cap.dir > 0: return _('Tableau. Build up by suit, can move any face-up cards regardless of sequence.') + elif self.cap.dir < 0: return _('Tableau. Build down by suit, can move any face-up cards regardless of sequence.') + else: return _('Tableau. Build by same rank, can move any face-up cards regardless of sequence.') # # King-versions of some of the above stacks: they accepts only Kings or @@ -2028,7 +2033,7 @@ class UD_SC_RowStack(SequenceRowStack): return (isSameColorSequence(cards, self.cap.mod, 1) or isSameColorSequence(cards, self.cap.mod, -1)) def getHelp(self): - return _('Row. Build up or down by color.') + return _('Tableau. Build up or down by color.') # up or down by alternate color class UD_AC_RowStack(SequenceRowStack): @@ -2039,7 +2044,7 @@ class UD_AC_RowStack(SequenceRowStack): return (isAlternateColorSequence(cards, self.cap.mod, 1) or isAlternateColorSequence(cards, self.cap.mod, -1)) def getHelp(self): - return _('Row. Build up or down by alternate color.') + return _('Tableau. Build up or down by alternate color.') # up or down by suit class UD_SS_RowStack(SequenceRowStack): @@ -2050,7 +2055,7 @@ class UD_SS_RowStack(SequenceRowStack): return (isSameSuitSequence(cards, self.cap.mod, 1) or isSameSuitSequence(cards, self.cap.mod, -1)) def getHelp(self): - return _('Row. Build up or down by suit.') + return _('Tableau. Build up or down by suit.') # up or down by rank ignoring suit class UD_RK_RowStack(SequenceRowStack): @@ -2061,7 +2066,7 @@ class UD_RK_RowStack(SequenceRowStack): return (isRankSequence(cards, self.cap.mod, 1) or isRankSequence(cards, self.cap.mod, -1)) def getHelp(self): - return _('Row. Build up or down regardless of suit.') + return _('Tableau. Build up or down regardless of suit.') diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 74c1a2b5..5e96ebca 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -37,7 +37,7 @@ __all__ = ['PysolMenubar'] # imports -import math, os, re, sys, types +import math, os, re, types import Tkinter, tkColorChooser, tkFileDialog # PySol imports @@ -318,6 +318,8 @@ class PysolMenubar(PysolMenubarActions): menu.add_separator() menu.add_command(label=n_("&Demo"), command=self.mDemo, accelerator=m+"D") menu.add_command(label=n_("Demo (&all games)"), command=self.mMixedDemo) + menu.add_separator() + menu.add_command(label=n_("Show descriptions od piles"), command=self.mStackDesk, accelerator="F2") menu = MfxMenu(self.__menubar, label=n_("&Options")) menu.add_command(label=n_("&Player options..."), command=self.mOptPlayerOptions) submenu = MfxMenu(menu, label=n_("&Automatic play")) @@ -425,8 +427,8 @@ class PysolMenubar(PysolMenubarActions): self._bindKey("", "Print", self.mScreenshot) self._bindKey(ctrl, "u", self.mPlayNextMusic) # undocumented self._bindKey("", "p", self.mPause) - self._bindKey("", "Pause", self.mPause) - self._bindKey("", "Escape", self.mIconify) + self._bindKey("", "Pause", self.mPause) # undocumented + self._bindKey("", "Escape", self.mIconify) # undocumented # ASD and LKJ self._bindKey("", "a", self.mDrop) self._bindKey(ctrl, "a", self.mDrop1) @@ -436,6 +438,8 @@ class PysolMenubar(PysolMenubarActions): self._bindKey(ctrl, "l", self.mDrop1) self._bindKey("", "k", self.mUndo) self._bindKey("", "j", self.mDeal) + + self._bindKey("", "F2", self.mStackDesk) # self._bindKey("", "slash", self.mGameInfo) # undocumented, devel @@ -1053,5 +1057,14 @@ class PysolMenubar(PysolMenubarActions): self.app.toolbar.config(w, v) self.top.update_idletasks() + # + # stacks descriptions + # + def mStackDesk(self, *event): + if self.game.stackdesc_list: + self.game.deleteStackDesc() + else: + if self._cancelDrag(break_pause=True): return + self.game.showStackDesc() diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index b6fd0086..5c8503e3 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -38,6 +38,7 @@ __all__ = ['MfxMessageDialog', 'MfxSimpleEntry', 'MfxTooltip', 'MfxScrolledCanvas', + 'StackDesc', ] # imports @@ -669,3 +670,43 @@ class MfxScrolledCanvas: return self._yview('moveto', 1) +# /*********************************************************************** +# // +# ************************************************************************/ + +class StackDesc: + + def __init__(self, game, stack): + self.game = game + self.stack = stack + self.canvas = game.canvas + + font = game.app.getFont('canvas_small') + ##print self.app.cardset.CARDW, self.app.images.CARDW + cardw = game.app.images.CARDW + x, y = stack.x+cardw/2, stack.y + text = stack.getHelp()+'\n'+stack.getBaseCard() + text = text.strip() + if text: + frame = Tkinter.Frame(self.canvas, highlightthickness=1, + highlightbackground='black') + label = Tkinter.Message(frame, font=font, text=text, width=cardw-8, + fg='#000000', bg='#ffffe0') + label.pack() + self.label = label + self.id = self.canvas.create_window(x, y, window=frame, anchor='n') + self.binding = label.bind('', self.buttonPressEvent) + else: + self.id = None + + def buttonPressEvent(self, *event): + self.game.deleteStackDesc() + + def delete(self): + if self.id: + self.canvas.delete(self.id) + self.label.unbind('', self.binding) + + + + From 556a82c3673de371049edb527224b420ddfea346 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 28 Jul 2006 21:12:37 +0000 Subject: [PATCH 029/266] + 11 new games * improved StackDesc * improved CautiousDefaultHint git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@30 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 2 + pysollib/games/auldlangsyne.py | 75 ++++++++++++++++-- pysollib/games/fortythieves.py | 131 ++++++++++++++++++++++++++++++- pysollib/games/gypsy.py | 18 ++++- pysollib/games/klondike.py | 27 ++++++- pysollib/games/montana.py | 12 ++- pysollib/games/royalcotillion.py | 59 ++++++++++++++ pysollib/games/spider.py | 59 ++++++++++++++ pysollib/games/sultan.py | 6 +- pysollib/games/yukon.py | 3 +- pysollib/hint.py | 6 ++ pysollib/stack.py | 8 +- pysollib/tk/tkcanvas.py | 3 +- pysollib/tk/tkwidget.py | 18 +++-- 14 files changed, 397 insertions(+), 30 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index a36c093f..677c1655 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1253,11 +1253,13 @@ for %d moves. strings=(_("&New game"), None, _("&Cancel")), image=self.app.gimages.logos[4], separatorwidth=2) elif self.gstats.updated < 0: + self.finished = True self.playSample("gamefinished", priority=1000) d = MfxMessageDialog(self.top, title=_("Game finished"), bitmap="info", text=_("\nGame finished\n"), strings=(_("&New game"), None, _("&Cancel"))) else: + self.finished = True self.playSample("gamelost", priority=1000) d = MfxMessageDialog(self.top, title=_("Game finished"), bitmap="info", text=_("\nGame finished, but not without my help...\n"), diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index 6e9a7164..c4f3a3b9 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -213,16 +213,19 @@ class Interregnum_Foundation(RK_FoundationStack): class Interregnum(Game): GAME_VERSION = 2 + Talon_Class = DealRowTalonStack + RowStack_Class = StackWrapper(BasicRowStack, max_accept=0, max_move=1) + # # game layout # - def createGame(self, rows=8): + def createGame(self, rows=8, playcards=12, texts=False): # create layout l, s = Layout(self), self.s # set window - self.setSize(l.XM + max(9,rows)*l.XS, l.YM + 5*l.YS) + self.setSize(l.XM+max(9,rows)*l.XS, l.YM+3*l.YS+playcards*l.YOFFSET) # extra settings self.base_cards = None @@ -236,9 +239,15 @@ class Interregnum(Game): s.foundations.append(Interregnum_Foundation(x, y, self, mod=13, max_move=0)) for i in range(rows): x, y, = l.XM + (2*i+8-rows)*l.XS/2, l.YM + 2*l.YS - s.rows.append(BasicRowStack(x, y, self, max_accept=0, max_move=1)) - s.talon = DealRowTalonStack(self.width-l.XS, self.height-l.YS, self) - l.createText(s.talon, "nn") + s.rows.append(self.RowStack_Class(x, y, self)) + s.talon = self.Talon_Class(self.width-l.XS, self.height-l.YS, self) + if texts: + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") + font = self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + else: + l.createText(s.talon, "nn") # define stack-groups l.defaultStackGroups() @@ -249,6 +258,7 @@ class Interregnum(Game): def startGame(self): self.startDealSample() + self.s.talon.dealRow() # deal base_cards to reserves, update foundations cap.base_rank self.base_cards = [] for i in range(8): @@ -256,8 +266,6 @@ class Interregnum(Game): self.s.foundations[i].cap.base_rank = (self.base_cards[i].rank + 1) % 13 self.flipMove(self.s.talon) self.moveMove(1, self.s.talon, self.s.reserves[i]) - # deal other cards - self.s.talon.dealRow() def getAutoStacks(self, event=None): return ((), (), self.sg.dropstacks) @@ -282,6 +290,57 @@ class Interregnum(Game): for c in self.base_cards: p.dump(c.id) + +# /*********************************************************************** +# // Primrose +# ************************************************************************/ + +class Primrose_Talon(DealRowTalonStack): + + def canDealCards(self): + if self.round == self.max_rounds and not self.cards: + return False + return not self.game.isGameWon() + + def _redeal(self): + lr = len(self.game.s.rows) + rows = self.game.s.rows + r = self.game.s.rows[self.round-1] + for i in range(len(r.cards)): + self.game.moveMove(1, r, self, frames=4) + self.game.flipMove(self) + self.game.nextRoundMove(self) + + def dealCards(self, sound=0): + if sound: + self.game.startDealSample() + if len(self.cards) == 0: + self._redeal() + if self.round == 1: + n = self.dealRowAvail(sound=0) + else: + rows = self.game.s.rows + n = self.dealRowAvail(rows=rows[self.round-2:], sound=0) + #n = 0 + while self.cards: + n += self.dealRowAvail(rows=rows, sound=0) + if sound: + self.game.stopSamples() + return n + + +class Primrose(Interregnum): + Talon_Class = StackWrapper(Primrose_Talon, max_rounds=9) + + def createGame(self): + Interregnum.createGame(self, playcards=16, texts=True) + + def startGame(self): + for i in range(11): + self.s.talon.dealRow(frames=0) + Interregnum.startGame(self) + + # /*********************************************************************** # // Colorado # ************************************************************************/ @@ -479,4 +538,6 @@ registerGame(GameInfo(553, Scuffle, "Scuffle", GI.GT_NUMERICA, 1, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(560, DoubleAcquaintance, "Double Acquaintance", GI.GT_NUMERICA, 2, 2, GI.SL_BALANCED)) +registerGame(GameInfo(569, Primrose, "Primrose", + GI.GT_NUMERICA, 2, 8, GI.SL_BALANCED)) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 44e5ba4c..98990c50 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -353,7 +353,8 @@ class Streets(FortyThieves): def shallHighlightMatch(self, stack1, card1, stack2, card2): return (card1.color != card2.color and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + (card1.rank + 1 == card2.rank or + card2.rank + 1 == card1.rank)) class Maria(Streets): @@ -929,8 +930,120 @@ class TheSpark(Game): return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 +# /*********************************************************************** +# // Double Gold Mine +# ************************************************************************/ + +class DoubleGoldMine_RowStack(AC_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + +class DoubleGoldMine(Streets): + + RowStack_Class = DoubleGoldMine_RowStack + + ROW_MAX_MOVE = UNLIMITED_MOVES + + def createGame(self): + Streets.createGame(self, rows=9, num_deal=3) + + def startGame(self): + self.startDealSample() + self.s.talon.dealCards() +# /*********************************************************************** +# // Interchange +# // Unlimited +# // Breakwater +# // Forty Nine +# ************************************************************************/ + +class Interchange(FortyThieves): + + RowStack_Class = StackWrapper(SS_RowStack, base_rank=KING) + + ROW_MAX_MOVE = UNLIMITED_MOVES + + def createGame(self): + FortyThieves.createGame(self, rows=7) + + def startGame(self): + for i in (0,1,2): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + +class Unlimited(Interchange): + def createGame(self): + FortyThieves.createGame(self, rows=7, max_rounds=UNLIMITED_REDEALS) + + +class Breakwater(Interchange): + RowStack_Class = RK_RowStack + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 1 + + +class FortyNine_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return False + if self.cards: + return len(cards) == 1 + return True + + +class FortyNine(Interchange): + RowStack_Class = FortyNine_RowStack + + def startGame(self): + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + +# /*********************************************************************** +# // Indian Patience +# ************************************************************************/ + +class IndianPatience_RowStack(Indian_RowStack): + def acceptsCards(self, from_stack, cards): + if not Indian_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.game.s.talon.cards: + return True + if self.cards: + if from_stack in self.game.s.rows and len(from_stack.cards) == 1: + return False + return len(self.cards) != 1 + return True + +class IndianPatience(Indian): + RowStack_Class = IndianPatience_RowStack + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + old_state = self.enterState(self.S_FILL) + if self.s.talon.cards: + if len(self.s.talon.cards) == 1: + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + if self.s.talon.cards: + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + if self.s.talon.cards: + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) # register the game @@ -975,8 +1088,7 @@ registerGame(GameInfo(126, RedAndBlack, "Red and Black", # was: 75 registerGame(GameInfo(113, Zebra, "Zebra", GI.GT_FORTY_THIEVES, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(69, Indian, "Indian", - GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED, - altnames=("Indian Patience",) )) + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(74, Midshipman, "Midshipman", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(198, NapoleonsExile, "Napoleon's Exile", @@ -1026,5 +1138,16 @@ registerGame(GameInfo(556, Junction, "Junction", ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) registerGame(GameInfo(564, TheSpark, "The Spark", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_LUCK)) - +registerGame(GameInfo(573, DoubleGoldMine, "Double Gold Mine", + GI.GT_NUMERICA | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(574, Interchange, "Interchange", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(575, Unlimited, "Unlimited", + GI.GT_FORTY_THIEVES, 2, -1, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(576, Breakwater, "Breakwater", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(577, FortyNine, "Forty Nine", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(578, IndianPatience, "Indian Patience", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index 58cc2ccc..ffd27a02 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -576,12 +576,25 @@ class EternalTriangle(Hypotenuse): class RightTriangle_Talon(OpenStack, DealRowTalonStack): def __init__(self, x, y, game, max_rounds=1, num_deal=1, **cap): + kwdefault(cap, max_move=1, max_accept=1, max_cards=999999) Stack.__init__(self, x, y, game, cap=cap) self.max_rounds = max_rounds self.num_deal = num_deal self.round = 1 self.base_cards = [] # for DealBaseCard_StackMethods + def clickHandler(self, event): + if self.cards and not self.cards[-1].face_up: + return self.game.dealCards(sound=1) + return OpenStack.clickHandler(self, event) + + def canDealCards(self): + if not DealRowTalonStack.canDealCards(self): + return False + if self.cards and self.cards[-1].face_up: + return False + return True + def canFlipCard(self): return False @@ -589,10 +602,11 @@ class RightTriangle_Talon(OpenStack, DealRowTalonStack): return self.game.app.images.getReserveBottom() def getHelp(self): - return '' + return DealRowTalonStack.getHelp(self) + class RightTriangle(Hypotenuse): - Talon_Class = StackWrapper(RightTriangle_Talon, max_accept=1, max_move=1) + Talon_Class = RightTriangle_Talon def createGame(self): Gypsy.createGame(self, rows=10, playcards=24) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 518a9e8e..80d30da6 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -45,6 +45,8 @@ from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.hint import KlondikeType_Hint from pysollib.pysoltk import MfxCanvasText +from canfield import CanfieldRush_Talon + # /*********************************************************************** # // Klondike @@ -1116,14 +1118,31 @@ class Boost(Klondike): # // Gold Rush # ************************************************************************/ -from canfield import CanfieldRush_Talon - class GoldRush(Klondike): Talon_Class = CanfieldRush_Talon def createGame(self): Klondike.createGame(self, max_rounds=3) +# /*********************************************************************** +# // Gold Mine +# ************************************************************************/ + +class GoldMine_RowStack(AC_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class GoldMine(Klondike): + RowStack_Class = GoldMine_RowStack + + def createGame(self): + Klondike.createGame(self, max_rounds=1, num_deal=3) + + def startGame(self): + self.startDealSample() + self.s.talon.dealCards() + # register the game registerGame(GameInfo(2, Klondike, "Klondike", @@ -1231,7 +1250,7 @@ registerGame(GameInfo(479, Saratoga, "Saratoga", registerGame(GameInfo(491, Whitehorse, "Whitehorse", GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(518, Boost, "Boost", - GI.GT_KLONDIKE, 1, 2, GI.SL_BALANCED)) + GI.GT_KLONDIKE | GI.GT_ORIGINAL, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(522, ArticGarden, "Artic Garden", GI.GT_RAGLAN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(532, GoldRush, "Gold Rush", @@ -1240,4 +1259,6 @@ registerGame(GameInfo(539, Usk, "Usk", GI.GT_KLONDIKE, 1, 1, GI.SL_BALANCED)) registerGame(GameInfo(541, BatsfordAgain, "Batsford Again", GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) +registerGame(GameInfo(572, GoldMine, "Gold Mine", + GI.GT_NUMERICA, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py index 1011b931..6f35d3be 100644 --- a/pysollib/games/montana.py +++ b/pysollib/games/montana.py @@ -305,8 +305,16 @@ class RedMoon(BlueMoon): class Galary_Hint(Montana_Hint): - # TODO - shallMovePile = DefaultHint._cautiousShallMovePile + def shallMovePile(self, from_stack, to_stack, pile, rpile): + if from_stack is to_stack or not to_stack.acceptsCards(from_stack, pile): + return 0 + # now check for loops + rr = self.ClonedStack(from_stack, stackcards=rpile) + if rr.acceptsCards(to_stack, pile): + # the pile we are going to move could be moved back - + # this is dangerous as we can create endless loops... + return 0 + return 1 class Galary_RowStack(Montana_RowStack): diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 8261a448..728ebb28 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -529,6 +529,63 @@ class Twenty(Game): self.leaveState(old_state) +# /*********************************************************************** +# // Three Pirates +# ************************************************************************/ + +class ThreePirates_Talon(DealRowTalonStack): + def dealCards(self, sound=0): + num_cards = 0 + old_state = self.game.enterState(self.game.S_DEAL) + if self.cards: + if sound and not self.game.demo: + self.game.playSample("dealwaste") + num_cards = self.dealRowAvail(rows=self.game.s.reserves, + sound=0, frames=4) + self.game.leaveState(old_state) + return num_cards + + +class ThreePirates(Game): + + def createGame(self): + l, s = Layout(self), self.s + + self.setSize(l.XM+10*l.XS, l.YM+3*l.YS+16*l.YOFFSET) + + x, y, = l.XM+l.XS, l.YM + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i/2)) + x = x + l.XS + + x, y, = l.XM, l.YM+l.YS + for i in range(10): + s.rows.append(SS_RowStack(x, y, self, max_move=1)) + x += l.XS + + x, y = l.XM, self.height-l.YS + s.talon = ThreePirates_Talon(x, y, self) + l.createText(s.talon, 'n') + x += l.XS + for i in (0,1,2): + stack = WasteStack(x, y, self) + s.reserves.append(stack) + l.createText(stack, 'n') + x += l.XS + + l.defaultStackGroups() + + def startGame(self): + for i in (0,1,2): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + # register the game registerGame(GameInfo(54, RoyalCotillion, "Royal Cotillion", @@ -553,4 +610,6 @@ registerGame(GameInfo(443, Twenty, "Twenty", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(465, Granada, "Granada", GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED)) +registerGame(GameInfo(579, ThreePirates, "Three Pirates", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index a02a15a3..0ec48a5c 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -1020,6 +1020,61 @@ class FredsSpider3Decks(FredsSpider): Spidike.createGame(self, rows=13, playcards=26) +# /*********************************************************************** +# // Long Tail +# // Short Tail +# ************************************************************************/ + +class LongTail(RelaxedSpider): + + def createGame(self, rows=5, playcards=16): + l, s = Layout(self), self.s + + decks = self.gameinfo.decks + max_rows = max(2+decks*4, 2+rows) + w, h = l.XM+max_rows*l.XS, l.YM+l.YS+playcards*l.YOFFSET + self.setSize(w, h) + + x, y = l.XM, l.YM + s.talon = DealRowTalonStack(x, y, self) + l.createText(s.talon, 'ne') + + x += (max_rows-decks*4)*l.XS + for i in range(decks*4): + s.foundations.append(Spider_SS_Foundation(x, y, self)) + x += l.XS + + x, y = l.XM, l.YM+l.YS + stack = ReserveStack(x, y, self, max_cards=UNLIMITED_CARDS) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.reserves.append(stack) + l.createText(stack, 'ne') + + x += 2*l.XS + for i in range(rows): + s.rows.append(Spider_RowStack(x, y, self)) + x += l.XS + + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves*2) + + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack in self.s.reserves: + return 0 + return 1+RelaxedSpider.getQuickPlayScore(self, ncards, from_stack, to_stack) + + +class ShortTail(LongTail): + def createGame(self): + LongTail.createGame(self, rows=8, playcards=24) + + # register the game registerGame(GameInfo(10, RelaxedSpider, "Relaxed Spider", GI.GT_SPIDER | GI.GT_RELAXED, 2, 0, GI.SL_MOSTLY_SKILL)) @@ -1124,4 +1179,8 @@ registerGame(GameInfo(543, FarmersWife, "Farmer's Wife", GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(544, HowTheyRun, "How They Run", GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(570, LongTail, "Long Tail", + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(571, ShortTail, "Short Tail", + GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index d3027ed6..19bf83dd 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -428,12 +428,12 @@ class Matrimony_Talon(DealRowTalonStack): if len(self.cards) == 0: self._redeal() if self.round == 1: - n = self.dealRowAvail(sound=sound) + n = self.dealRowAvail(sound=0) else: rows = self.game.s.rows[-self.round+1:] - n = self.dealRowAvail(rows=rows, sound=sound) + n = self.dealRowAvail(rows=rows, sound=0) while self.cards: - n += self.dealRowAvail(rows=self.game.s.rows, sound=sound) + n += self.dealRowAvail(rows=self.game.s.rows, sound=0) if sound: self.game.stopSamples() return n diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index a5ed6f67..b37dafd8 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -693,6 +693,7 @@ registerGame(GameInfo(525, Queensland, "Queensland", registerGame(GameInfo(526, OutbackPatience, "Outback Patience", GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(530, RussianSpider, "Russian Spider", - GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) + GI.GT_SPIDER, 1, 0, GI.SL_BALANCED, + altnames=('Ukrainian Solitaire',) )) registerGame(GameInfo(531, DoubleRussianSpider, "Double Russian Spider", GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/hint.py b/pysollib/hint.py index 35d47170..d24c747d 100644 --- a/pysollib/hint.py +++ b/pysollib/hint.py @@ -215,6 +215,9 @@ class AbstractHint(HintInterface): def _cautiousShallMovePile(self, from_stack, to_stack, pile, rpile): if from_stack is to_stack or not to_stack.acceptsCards(from_stack, pile): return 0 + # + if len(rpile) == 0: + return 1 # now check for loops rr = self.ClonedStack(from_stack, stackcards=rpile) if rr.acceptsCards(to_stack, pile): @@ -228,6 +231,9 @@ class AbstractHint(HintInterface): if from_stack is to_stack or not to_stack.acceptsCards(from_stack, pile): return 0 if self.level >= 2: + # + if len(rpile) == 0: + return 1 # now check for loops rr = self.ClonedStack(from_stack, stackcards=rpile) if rr.acceptsCards(to_stack, pile): diff --git a/pysollib/stack.py b/pysollib/stack.py index 6ac0ae51..ebc599d9 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -1956,6 +1956,10 @@ class FreeCell_SS_RowStack(SS_RowStack): class Spider_AC_RowStack(AC_RowStack): def _isAcceptableSequence(self, cards): return isRankSequence(cards, self.cap.mod, self.cap.dir) + def getHelp(self): + if self.cap.dir > 0: return _('Tableau. Build up regardless of suit. Sequences of cards in alternate color can be moved as a unit.') + elif self.cap.dir < 0: return _('Tableau. Build down regardless of suit. Sequences of cards in alternate color can be moved as a unit.') + else: return _('Tableau. Build by same rank.') # A Spider_SameSuit_RowStack builds down by rank and suit, # but accepts sequences that match by rank only. @@ -1963,8 +1967,8 @@ class Spider_SS_RowStack(SS_RowStack): def _isAcceptableSequence(self, cards): return isRankSequence(cards, self.cap.mod, self.cap.dir) def getHelp(self): - if self.cap.dir > 0: return _('Tableau. Build up regardless of suit.') - elif self.cap.dir < 0: return _('Tableau. Build down regardless of suit.') + if self.cap.dir > 0: return _('Tableau. Build up regardless of suit. Sequences of cards in the same suit can be moved as a unit.') + elif self.cap.dir < 0: return _('Tableau. Build down regardless of suit. Sequences of cards in the same suit can be moved as a unit.') else: return _('Tableau. Build by same rank.') # A Yukon_AlternateColor_RowStack builds down by rank and alternate color, diff --git a/pysollib/tk/tkcanvas.py b/pysollib/tk/tkcanvas.py index 4d4df201..6a9b3d3d 100644 --- a/pysollib/tk/tkcanvas.py +++ b/pysollib/tk/tkcanvas.py @@ -148,7 +148,8 @@ class MfxCanvas(Tkinter.Canvas): self.__tileimage = image if stretch: # - id = self._x_create("image", 0, 0, image=image, anchor="nw") + id = self._x_create("image", -self.xmargin, -self.ymargin, + image=image, anchor="nw") self.tag_lower(id) # also see tag_lower above self.__tiles.append(id) else: diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 5c8503e3..1b24da9c 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -680,6 +680,7 @@ class StackDesc: self.game = game self.stack = stack self.canvas = game.canvas + self.bindings = [] font = game.app.getFont('canvas_small') ##print self.app.cardset.CARDW, self.app.images.CARDW @@ -690,22 +691,29 @@ class StackDesc: if text: frame = Tkinter.Frame(self.canvas, highlightthickness=1, highlightbackground='black') + self.frame = frame label = Tkinter.Message(frame, font=font, text=text, width=cardw-8, - fg='#000000', bg='#ffffe0') + fg='#000000', bg='#ffffe0', bd=1) label.pack() self.label = label self.id = self.canvas.create_window(x, y, window=frame, anchor='n') - self.binding = label.bind('', self.buttonPressEvent) + self.bindings.append(label.bind('', self._buttonPressEvent)) + ##self.bindings.append(label.bind('', self._enterEvent)) else: self.id = None - def buttonPressEvent(self, *event): - self.game.deleteStackDesc() + def _buttonPressEvent(self, *event): + ##self.game.deleteStackDesc() + self.frame.tkraise() + + def _enterEvent(self, *event): + self.frame.tkraise() def delete(self): if self.id: self.canvas.delete(self.id) - self.label.unbind('', self.binding) + for b in self.bindings: + self.label.unbind('', b) From 7ab84b4c328efb62f1e3f6eb9a42343a8ccbfa93 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 29 Jul 2006 21:17:43 +0000 Subject: [PATCH 030/266] + 12 new games + new Layout method: createGame + new stack: BO_RowStack (ButOwn_RowStack) git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@31 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 1 - pysollib/game.py | 4 +- pysollib/games/acesup.py | 31 ++++++- pysollib/games/fortythieves.py | 38 ++++---- pysollib/games/glenwood.py | 159 +++++++++++++++++++++++++++++++- pysollib/games/gypsy.py | 104 +++++++++++++++++++++ pysollib/games/harp.py | 16 +++- pysollib/games/katzenschwanz.py | 22 +++-- pysollib/games/klondike.py | 56 ++++++----- pysollib/games/numerica.py | 51 ++++++++-- pysollib/games/pyramid.py | 72 ++++++++++++--- pysollib/games/spider.py | 3 +- pysollib/games/terrace.py | 22 ++++- pysollib/layout.py | 61 +++++++++++- pysollib/stack.py | 16 +++- pysollib/tk/menubar.py | 12 ++- 16 files changed, 574 insertions(+), 94 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index 639dec14..94fd8d07 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -104,7 +104,6 @@ class Options: self.shade = 1 self.shade_filled_stacks = True self.demo_logo = 1 - self.demo_score = 0 self.toolbar = 1 ##self.toolbar_style = 'default' self.toolbar_style = 'crystal' diff --git a/pysollib/game.py b/pysollib/game.py index 677c1655..8b050dd5 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -198,7 +198,7 @@ class Game: # update display properties self.top.wm_geometry("") # cancel user-specified geometry self.canvas.setInitialSize(self.width, self.height) - if self.app.debug >= 2: + if self.app.debug >= 4: MfxCanvasRectangle(self.canvas, 0, 0, self.width, self.height, width=2, fill=None, outline='green') # restore game geometry @@ -1566,7 +1566,7 @@ for %d moves. assert to_stack.acceptsCards(from_stack, from_stack.cards[-ncards:]) if sleep <= 0.0: return h - info = (level == 1) or (level > 1 and self.app.opt.demo_score) + info = (level == 1) or (level > 1 and self.app.debug >= 3) if info and self.app.statusbar and self.app.opt.statusbar: self.app.statusbar.configLabel("info", text=_("Score %6d") % (score), fg=text_color) else: diff --git a/pysollib/games/acesup.py b/pysollib/games/acesup.py index 57435e2f..66b3380c 100644 --- a/pysollib/games/acesup.py +++ b/pysollib/games/acesup.py @@ -80,7 +80,7 @@ class AcesUp(Game): # game layout # - def createGame(self, rows=4, **layout): + def createGame(self, rows=4, reserve=False, **layout): # create layout l, s = Layout(self), self.s @@ -90,7 +90,10 @@ class AcesUp(Game): # create stacks x, y, = l.XM, l.YM s.talon = self.Talon_Class(x, y, self) - l.createText(s.talon, "ss") + if reserve: + l.createText(s.talon, "ne") + else: + l.createText(s.talon, "ss") x = x + 3*l.XS/2 for i in range(rows): s.rows.append(self.RowStack_Class(x, y, self)) @@ -101,6 +104,10 @@ class AcesUp(Game): l.createText(stack, "ss") s.foundations.append(stack) + if reserve: + x, y = l.XM, l.YM+l.YS + s.reserves.append(self.ReserveStack_Class(x, y, self)) + # define stack-groups l.defaultStackGroups() @@ -287,6 +294,24 @@ class Cover(AcesUp): return len(self.s.foundations[0].cards) == 48 +# /*********************************************************************** +# // Firing Squad +# ************************************************************************/ + +class FiringSquad_Foundation(AcesUp_Foundation): + def acceptsCards(self, from_stack, cards): + if not AcesUp_Foundation.acceptsCards(self, from_stack, cards): + return False + return from_stack in self.game.s.rows + +class FiringSquad(AcesUp): + Foundation_Class = FiringSquad_Foundation + ReserveStack_Class = ReserveStack + def createGame(self): + AcesUp.createGame(self, reserve=True) + + + # register the game registerGame(GameInfo(903, AcesUp, "Aces Up", # was: 52 GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK, @@ -302,3 +327,5 @@ registerGame(GameInfo(353, AcesUp5, "Aces Up 5", GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK)) registerGame(GameInfo(552, Cover, "Cover", GI.GT_1DECK_TYPE, 1, 0, GI.SL_LUCK)) +registerGame(GameInfo(583, FiringSquad, "Firing Squad", + GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 98990c50..bae783a2 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -94,19 +94,25 @@ class FortyThieves(Game): self.setSize(w1, l.YM + l.YS + h + l.YS + l.TEXT_HEIGHT) # create stacks + # foundations x = l.XM + (maxrows - 4*decks) * l.XS / 2 y = l.YM for i in range(4*decks): - s.foundations.append(self.Foundation_Class(x, y, self, suit=i/decks, max_move=self.FOUNDATION_MAX_MOVE)) + s.foundations.append(self.Foundation_Class(x, y, self, + suit=i/decks, max_move=self.FOUNDATION_MAX_MOVE)) x = x + l.XS + # rows x = l.XM + (maxrows - rows) * l.XS / 2 y = l.YM + l.YS for i in range(rows): - s.rows.append(self.RowStack_Class(x, y, self, max_move=self.ROW_MAX_MOVE)) + s.rows.append(self.RowStack_Class(x, y, self, + max_move=self.ROW_MAX_MOVE)) x = x + l.XS + # talon, waste x = self.width - l.XS y = self.height - l.YS - s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds, num_deal=num_deal) + s.talon = WasteTalonStack(x, y, self, + max_rounds=max_rounds, num_deal=num_deal) l.createText(s.talon, "n") if max_rounds > 1: tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") @@ -345,6 +351,7 @@ class LittleForty(FortyThieves): # // Triple Line # // Big Streets # // Number Twelve +# // Roosevelt # // rows build down by alternate color # ************************************************************************/ @@ -352,9 +359,7 @@ class Streets(FortyThieves): RowStack_Class = AC_RowStack def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - (card1.rank + 1 == card2.rank or - card2.rank + 1 == card1.rank)) + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 class Maria(Streets): @@ -398,6 +403,12 @@ class NumberTwelve(NumberTen): FortyThieves.createGame(self, rows=12, XCARDS=96) +class Roosevelt(Streets): + DEAL = (0, 4) + def createGame(self): + Streets.createGame(self, rows=7) + + # /*********************************************************************** # // Red and Black # // Zebra @@ -439,15 +450,8 @@ class Zebra(RedAndBlack): # // rows build down by any suit but own # ************************************************************************/ -class Indian_RowStack(SequenceRowStack): - def _isSequence(self, cards): - return isAnySuitButOwnSequence(cards, self.cap.mod, self.cap.dir) - def getHelp(self): - return _('Tableau. Build down in any suit but the same.') - - class Indian(FortyThieves): - RowStack_Class = Indian_RowStack + RowStack_Class = BO_RowStack DEAL = (1, 2) def createGame(self): @@ -1015,9 +1019,9 @@ class FortyNine(Interchange): # // Indian Patience # ************************************************************************/ -class IndianPatience_RowStack(Indian_RowStack): +class IndianPatience_RowStack(BO_RowStack): def acceptsCards(self, from_stack, cards): - if not Indian_RowStack.acceptsCards(self, from_stack, cards): + if not BO_RowStack.acceptsCards(self, from_stack, cards): return False if not self.game.s.talon.cards: return True @@ -1150,4 +1154,6 @@ registerGame(GameInfo(577, FortyNine, "Forty Nine", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(578, IndianPatience, "Indian Patience", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(588, Roosevelt, "Roosevelt", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/glenwood.py b/pysollib/games/glenwood.py index 9fad3717..2564fbeb 100644 --- a/pysollib/games/glenwood.py +++ b/pysollib/games/glenwood.py @@ -48,9 +48,9 @@ class Glenwood_Talon(WasteTalonStack): class Glenwood_Foundation(AbstractFoundationStack): def acceptsCards(self, from_stack, cards): if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): - return 0 + return False if self.game.base_rank is None: - return 1 + return True if not self.cards: return cards[-1].rank == self.game.base_rank # check the rank @@ -68,7 +68,7 @@ class Glenwood_RowStack(AC_RowStack): def acceptsCards(self, from_stack, cards): if not AC_RowStack.acceptsCards(self, from_stack, cards): - return 0 + return False if not self.cards and from_stack is self.game.s.waste: for stack in self.game.s.reserves: if stack.cards: @@ -94,7 +94,7 @@ class Glenwood(Game): Foundation_Class = Glenwood_Foundation RowStack_Class = Glenwood_RowStack - ReserveStack_Class = Glenwood_ReserveStack #OpenStack + ReserveStack_Class = Glenwood_ReserveStack Hint_Class = Canfield_Hint base_rank = None @@ -181,8 +181,159 @@ class Glenwood(Game): return [self.base_rank] +# /*********************************************************************** +# // Double Fives +# ************************************************************************/ + +class DoubleFives_Talon(RedealTalonStack): + + def moveToStock(self): + stock = self.game.s.stock + for r in self.game.s.reserves[:5]: + if r.cards: + r.moveMove(1, stock) + stock.flipMove() + + def canDealCards(self): + if self.game.base_rank is None: + return False + if self.round == self.max_rounds: + return len(self.cards) != 0 + return not self.game.isGameWon() + + def dealCards(self, sound=0): + old_state = self.game.enterState(self.game.S_DEAL) + num_cards = 0 + if self.round == 1: + if sound: + self.game.startDealSample() + self.moveToStock() + if not self.cards: + num_cards += self.redealCards(rows=[self.game.s.stock], + frames=4, sound=0) + else: + num_cards += self.dealRowAvail(rows=self.game.s.reserves[:5], + sound=0) + if sound: + self.game.stopSamples() + else: + if sound and not self.game.demo: + self.game.playSample("dealwaste") + self.game.flipMove(self) + self.game.moveMove(1, self, self.game.s.reserves[0], + frames=4, shadow=0) + num_cards += 1 + self.game.leaveState(old_state) + return num_cards + + +class DoubleFives_RowStack(SS_RowStack): + def canMoveCards(self, cards): + if self.game.base_rank is None: + return False + if not SS_RowStack.canMoveCards(self, cards): + return False + return True + + +class DoubleFives_WasteStack(WasteStack): + def updateText(self): + if self.game.s.talon.round == 2: + WasteStack.updateText(self) + elif self.texts.ncards: + self.texts.ncards.config(text='') + + +class DoubleFives_Stock(WasteStack): + def canFlipCard(self): + return False + def updateText(self): + if self.cards: + WasteStack.updateText(self) + else: + self.texts.ncards.config(text='') + + +class DoubleFives(Glenwood): + Hint_Class = CautiousDefaultHint + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+11*l.XS, l.YM+3*l.YS+16*l.YOFFSET) + + # create stacks + # + x, y = l.XM, self.height-l.YS + s.talon = DoubleFives_Talon(x, y, self, max_rounds=2, num_deal=1) + l.createText(s.talon, "n") + x += l.XS + for i in range(5): + s.reserves.append(DoubleFives_WasteStack(x, y, self)) + x += l.XS + l.createText(s.reserves[0], 'n') + # + x = self.width-l.XS + s.addattr(stock=None) # register extra stack variable + s.stock = DoubleFives_Stock(x, y, self) + l.createText(s.stock, "n") + # + x, y = l.XM, l.YM + s.reserves.append(Glenwood_ReserveStack(x, y, self)) + x += l.XS + s.reserves.append(Glenwood_ReserveStack(x, y, self)) + # + x += 2*l.XS + for i in range(8): + s.foundations.append(Glenwood_Foundation(x, y, self, suit=i/2, + mod=13, base_rank=ANY_RANK, max_move=0)) + x += l.XS + tx, ty, ta, tf = l.getTextAttr(None, "ss") + tx, ty = x - l.XS + tx, y + ty + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + x, y = l.XM+l.XS/2, l.YM+l.YS+l.TEXT_HEIGHT + for i in range(10): + s.rows.append(DoubleFives_RowStack(x, y, self, mod=13, max_move=1)) + x += l.XS + + # define stack-groups + l.defaultStackGroups() + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.deck == 0, None)) + + def startGame(self): + self.base_rank = None + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves[-2:]) + + def _autoDeal(self, sound=1): + waste_cards = 0 + for r in self.s.reserves[:5]: + waste_cards += len(r.cards) + if waste_cards == 0 and self.canDealCards(): + return self.dealCards(sound=sound) + return 0 + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit + and ((card1.rank + 1) % 13 == card2.rank + or (card2.rank + 1) % 13 == card1.rank)) + + + # register the game registerGame(GameInfo(282, Glenwood, "Glenwood", GI.GT_CANFIELD, 1, 1, GI.SL_BALANCED, altnames=("Duchess",) )) +registerGame(GameInfo(587, DoubleFives, "Double Fives", + GI.GT_2DECK_TYPE, 2, 1, GI.SL_BALANCED)) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index ffd27a02..5e0bf563 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -615,6 +615,104 @@ class RightTriangle(Hypotenuse): self.sg.reservestacks.append(self.s.talon) +# /*********************************************************************** +# // Trapdoor +# ************************************************************************/ + +class Trapdoor_Talon(DealRowTalonStack): + def dealCards(self, sound=0): + if not self.cards: + return 0 + if sound: + self.game.startDealSample() + n = 0 + rows = self.game.s.rows + reserves = self.game.s.reserves + for i in range(8): + r1 = reserves[i] + r2 = rows[i] + if r1.cards: + r1.moveMove(1, r2) + n += 1 + n += self.dealRowAvail(rows=self.game.s.reserves, sound=0) + if sound: + self.game.stopSamples() + return n + + +class Trapdoor(Gypsy): + + def createGame(self): + kw = {'rows' : 8, + 'waste' : 0, + 'texts' : 1, + 'reserves' : 8,} + Layout(self).createGame(layout_method = Layout.gypsyLayout, + talon_class = Trapdoor_Talon, + foundation_class = SS_FoundationStack, + row_class = AC_RowStack, + reserve_class = OpenStack, + **kw + ) + + def startGame(self): + Gypsy.startGame(self) + self.s.talon.dealCards() + +# /*********************************************************************** +# // Flamenco +# ************************************************************************/ + +class Flamenco(Gypsy): + + def createGame(self): + kw = {'rows' : 8, + 'waste' : 0, + 'texts' : 1,} + foundation_class = ( + SS_FoundationStack, + StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1)) + Layout(self).createGame(layout_method = Layout.gypsyLayout, + talon_class = DealRowTalonStack, + foundation_class = foundation_class, + row_class = AC_RowStack, + **kw + ) + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, KING) and c.deck == 0, (c.suit,c.rank))) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(2): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Eclipse +# ************************************************************************/ + +class Eclipse(Gypsy): + Layout_Method = Layout.klondikeLayout + RowStack_Class = SS_RowStack + + def createGame(self): + Gypsy.createGame(self, rows=13) + + def startGame(self): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1) + + # register the game registerGame(GameInfo(1, Gypsy, "Gypsy", GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) @@ -669,4 +767,10 @@ registerGame(GameInfo(567, EternalTriangle, "Eternal Triangle", altnames=('Lobachevsky',) )) registerGame(GameInfo(568, RightTriangle, "Right Triangle", GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(580, Trapdoor, "Trapdoor", + GI.GT_GYPSY | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(581, Flamenco, "Flamenco", + GI.GT_GYPSY | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(584, Eclipse, "Eclipse", + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index de6bf679..e0d244db 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -152,6 +152,8 @@ class Steps(DoubleKlondike): # /*********************************************************************** # // Triple Klondike +# // Triple Klondike by Threes +# // Chinese Klondike # ************************************************************************/ class TripleKlondike(DoubleKlondike): @@ -159,15 +161,17 @@ class TripleKlondike(DoubleKlondike): DoubleKlondike.createGame(self, rows=13) -# /*********************************************************************** -# // Triple Klondike by Threes -# ************************************************************************/ - class TripleKlondikeByThrees(DoubleKlondike): def createGame(self): DoubleKlondike.createGame(self, rows=13, num_deal=3) +class ChineseKlondike(DoubleKlondike): + RowStack_Class = StackWrapper(BO_RowStack, base_rank=KING) + def createGame(self): + DoubleKlondike.createGame(self, rows=12) + + # /*********************************************************************** # // Lady Jane # // Inquisitor @@ -304,4 +308,8 @@ registerGame(GameInfo(545, BigDeal, "Big Deal", GI.GT_KLONDIKE | GI.GT_ORIGINAL, 4, 1, GI.SL_BALANCED)) registerGame(GameInfo(562, Delivery, "Delivery", GI.GT_FORTY_THIEVES | GI.GT_ORIGINAL, 4, 0, GI.SL_BALANCED)) +registerGame(GameInfo(590, ChineseKlondike, "Chinese Klondike", + GI.GT_KLONDIKE, 3, -1, GI.SL_BALANCED, + suits=(0, 1, 2) )) + diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index 603360ca..5e1227b8 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -42,13 +42,26 @@ from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import DefaultHint, FreeCellType_Hint, CautiousDefaultHint + +# /*********************************************************************** +# // +# ************************************************************************/ + +class DerKatzenschwanz_Hint(FreeCellType_Hint): + def _getMovePileScore(self, score, color, r, t, pile, rpile): + if len(rpile) == 0: + # don't create empty row + return -1, color + return FreeCellType_Hint._getMovePileScore(self, score, color, r, t, pile, rpile) + + # /*********************************************************************** # // # ************************************************************************/ class DerKatzenschwanz(Game): RowStack_Class = StackWrapper(AC_RowStack, base_rank=NO_RANK) - Hint_Class = FreeCellType_Hint + Hint_Class = DerKatzenschwanz_Hint # # game layout @@ -349,11 +362,6 @@ class LaggardLady_RowStack(OpenStack): return False return len(self.game.s.talon.cards) == 0 and len(self.cards) == 1 - def canMoveCards(self, cards): - if not OpenStack.canMoveCards(self, cards): - return False - return len(self.cards) > 1 - class LaggardLady(SalicLaw): @@ -361,7 +369,7 @@ class LaggardLady(SalicLaw): StackWrapper(RK_FoundationStack, base_rank=5, max_cards=6), StackWrapper(RK_FoundationStack, base_rank=4, max_cards=6, dir=-1, mod=13), ] - RowStack_Class = StackWrapper(LaggardLady_RowStack, max_accept=1) + RowStack_Class = StackWrapper(LaggardLady_RowStack, max_accept=1, min_cards=1) ROW_BASE_RANK = QUEEN diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 80d30da6..875520bc 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -143,15 +143,8 @@ class KlondikeByThrees(Klondike): # // Thumb and Pouch # ************************************************************************/ -class ThumbAndPouch_RowStack(SequenceRowStack): - def _isSequence(self, cards): - return isAnySuitButOwnSequence(cards, self.cap.mod, self.cap.dir) - def getHelp(self): - return _('Tableau. Build down in any suit but the same.') - - class ThumbAndPouch(Klondike): - RowStack_Class = ThumbAndPouch_RowStack + RowStack_Class = BO_RowStack def createGame(self): Klondike.createGame(self, max_rounds=1) @@ -306,7 +299,7 @@ class Somerset(Klondike): class Morehead(Somerset): - RowStack_Class = StackWrapper(ThumbAndPouch_RowStack, max_move=1) + RowStack_Class = StackWrapper(BO_RowStack, max_move=1) class Canister(Klondike): @@ -514,19 +507,6 @@ class KingAlbert(Klondike): self.s.talon.dealRow(rows=self.s.reserves) -## class KingAlbertNew(KingAlbert): - -## def createGame(self): -## l = Klondike.createGame(self, max_rounds=1, rows=self.ROWS, waste=0, texts=0) -## self.setSize(self.width+l.XM+l.XS, self.height) -## self.s.reserves.append(ArbitraryStack(self.width-l.XS, l.YM, self)) -## l.defaultStackGroups() - -## def startGame(self): -## Klondike.startGame(self, flip=1, reverse=0) -## self.s.talon.dealRow(rows=self.s.reserves*7) - - class Raglan(KingAlbert): RESERVES = (2, 2, 2) @@ -1144,6 +1124,34 @@ class GoldMine(Klondike): self.s.talon.dealCards() +# /*********************************************************************** +# // Lucky Thirteen +# // Lucky Piles +# ************************************************************************/ + +class LuckyThirteen(Klondike): + Talon_Class = InitialDealTalonStack + RowStack_Class = StackWrapper(SS_RowStack, base_rank=NO_RANK, max_move=1) + + def createGame(self): + Klondike.createGame(self, waste=False, rows=13, max_rounds=1, texts=False) + + def startGame(self): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + +class LuckyPiles(LuckyThirteen): + RowStack_Class = StackWrapper(UD_SS_RowStack, base_rank=KING) + + + # register the game registerGame(GameInfo(2, Klondike, "Klondike", GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) @@ -1261,4 +1269,8 @@ registerGame(GameInfo(541, BatsfordAgain, "Batsford Again", GI.GT_KLONDIKE, 2, 1, GI.SL_BALANCED)) registerGame(GameInfo(572, GoldMine, "Gold Mine", GI.GT_NUMERICA, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(585, LuckyThirteen, "Lucky Thirteen", + GI.GT_NUMERICA, 1, 0, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(586, LuckyPiles, "Lucky Piles", + GI.GT_NUMERICA, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index e7ddfad6..393fa323 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -103,7 +103,7 @@ class Numerica(Game): # game layout # - def createGame(self, rows=4): + def createGame(self, rows=4, reserve=False): # create layout l, s = Layout(self), self.s decks = self.gameinfo.decks @@ -130,16 +130,20 @@ class Numerica(Game): s.rows.append(self.RowStack_Class(x, y, self)) x = x + l.XS self.setRegion(s.rows, (x0-l.XS/2, y-l.CH/2, 999999, 999999)) - x = l.XM + x, y = l.XM, l.YM+l.YS+l.YS/2*int(reserve) s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, 'n') + if reserve: + l.createText(s.talon, 'ne') + else: + l.createText(s.talon, 'n') y = y + l.YS s.waste = WasteStack(x, y, self, max_cards=1) + if reserve: + s.reserves.append(self.ReserveStack_Class(l.XM, l.YM, self)) # define stack-groups - self.sg.openstacks = s.foundations + s.rows - self.sg.talonstacks = [s.talon] + [s.waste] - self.sg.dropstacks = s.rows + [s.waste] + l.defaultStackGroups() + # # game overrides @@ -164,15 +168,45 @@ class Numerica2Decks(Numerica): # /*********************************************************************** # // Lady Betty +# // Last Chance # ************************************************************************/ class LadyBetty(Numerica): Foundation_Class = SS_FoundationStack - def createGame(self): Numerica.createGame(self, rows=6) +class LastChance_RowStack(Numerica_RowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return True + return from_stack is self.game.s.waste and len(cards) == 1 + + +class LastChance_Reserve(OpenStack): + def canFlipCard(self): + return (len(self.game.s.talon.cards) == 0 and + len(self.game.s.waste.cards) == 0 and + self.cards and not self.cards[0].face_up) + + +class LastChance(LadyBetty): + RowStack_Class = StackWrapper(LastChance_RowStack, max_accept=1) + ReserveStack_Class = LastChance_Reserve + + def createGame(self): + Numerica.createGame(self, rows=7, reserve=True) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves, flip=False) + self.s.talon.dealCards() + + # /*********************************************************************** # // Puss in the Corner # ************************************************************************/ @@ -653,5 +687,6 @@ registerGame(GameInfo(472, Strategerie, "Strategerie", GI.GT_NUMERICA, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(558, Numerica2Decks, "Numerica (2 decks)", GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) - +registerGame(GameInfo(589, LastChance, "Last Chance", + GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index ee0c4a39..aad9d9af 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -168,17 +168,23 @@ class Pyramid_RowStack(Pyramid_StackMethods, OpenStack): class Pyramid(Game): Hint_Class = Pyramid_Hint + Talon_Class = StackWrapper(Pyramid_Talon, max_rounds=3, max_accept=1) # # game layout # - def createGame(self, rows=4): + def createGame(self, rows=4, reserves=0, waste=True, texts=True): # create layout l, s = Layout(self), self.s # set window - self.setSize(l.XM + 9*l.XS, l.YM + 4*l.YS) + max_rows = max(9, reserves) + w = l.XM + max_rows*l.XS + h = l.YM + 4*l.YS + if reserves: + h += l.YS+4*l.YOFFSET + self.setSize(w, h) # create stacks for i in range(7): @@ -189,24 +195,33 @@ class Pyramid(Game): x = x + l.XS x, y = l.XM, l.YM - s.talon = Pyramid_Talon(x, y, self, max_rounds=3, max_accept=1) - l.createText(s.talon, "se") - tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") - s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, - anchor=ta, - font=self.app.getFont("canvas_default")) - y = y + l.YS - s.waste = Pyramid_Waste(x, y, self, max_accept=1) - l.createText(s.waste, "se") + s.talon = self.Talon_Class(x, y, self) + if texts: + l.createText(s.talon, "se") + tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") + font=self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + if waste: + y = y + l.YS + s.waste = Pyramid_Waste(x, y, self, max_accept=1) + l.createText(s.waste, "se") x, y = self.width - l.XS, l.YM s.foundations.append(Pyramid_Foundation(x, y, self, suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, max_move=0, max_cards=52)) + if reserves: + x, y = l.XM+(max_rows-reserves)*l.XS/2, l.YM+4*l.YS + for i in range(reserves): + stack = self.Reserve_Class(x, y, self) + s.reserves.append(stack) + stack.CARD_YOFFSET = l.YOFFSET + x += l.XS # define stack-groups - self.sg.talonstacks = [s.talon] + [s.waste] - self.sg.openstacks = s.rows + self.sg.talonstacks - self.sg.dropstacks = s.rows + self.sg.talonstacks + l.defaultStackGroups() + self.sg.openstacks.append(s.talon) + self.sg.dropstacks.append(s.talon) # @@ -235,6 +250,31 @@ class RelaxedPyramid(Pyramid): return getNumberOfFreeStacks(self.s.rows) == len(self.s.rows) +# /*********************************************************************** +# // Giza +# ************************************************************************/ + +class Giza_Reserve(Pyramid_StackMethods, OpenStack): + def clickHandler(self, event): + if self._dropKingClickHandler(event): + return 1 + return OpenStack.clickHandler(self, event) + + +class Giza(Pyramid): + Talon_Class = InitialDealTalonStack + Reserve_Class = StackWrapper(Giza_Reserve, max_accept=1) + + def createGame(self): + Pyramid.createGame(self, reserves=8, waste=False, texts=False) + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + # /*********************************************************************** # // Thirteen # // FIXME: UNFINISHED @@ -298,4 +338,8 @@ registerGame(GameInfo(193, RelaxedPyramid, "Relaxed Pyramid", GI.GT_PAIRING_TYPE | GI.GT_RELAXED, 1, 2, GI.SL_MOSTLY_LUCK)) ##registerGame(GameInfo(44, Thirteen, "Thirteen", ## GI.GT_PAIRING_TYPE, 1, 0)) +registerGame(GameInfo(591, Giza, "Giza", + GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_BALANCED)) + + diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 0ec48a5c..1afc39a6 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -1166,7 +1166,8 @@ registerGame(GameInfo(459, FredsSpider, "Fred's Spider", registerGame(GameInfo(460, FredsSpider3Decks, "Fred's Spider (3 decks)", GI.GT_SPIDER, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(461, OpenSpider, "Open Spider", - GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL, + altnames=('Beetle',) )) registerGame(GameInfo(501, WakeRobin, "Wake-Robin", GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(502, TripleWakeRobin, "Wake-Robin (3 decks)", diff --git a/pysollib/games/terrace.py b/pysollib/games/terrace.py index 94fa8cc5..de2f579e 100644 --- a/pysollib/games/terrace.py +++ b/pysollib/games/terrace.py @@ -239,6 +239,8 @@ class GeneralsPatience(Terrace): # /*********************************************************************** # // Blondes and Brunettes +# // Falling Star +# // Wood # ************************************************************************/ class BlondesAndBrunettes(Terrace): @@ -260,14 +262,24 @@ class BlondesAndBrunettes(Terrace): return 1 -# /*********************************************************************** -# // Falling Star -# ************************************************************************/ - class FallingStar(BlondesAndBrunettes): INITIAL_RESERVE_CARDS = 11 +class Wood_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return from_stack is self.game.s.waste + return from_stack not in self.game.s.reserves + +class Wood(BlondesAndBrunettes): + RowStack_Class = StackWrapper(Wood_RowStack, mod=13, max_move=1) + def fillStack(self, stack): + pass + + # /*********************************************************************** # // Signora # ************************************************************************/ @@ -347,4 +359,6 @@ registerGame(GameInfo(500, Madame, "Madame", GI.GT_TERRACE, 3, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(533, MamySusan, "Mamy Susan", GI.GT_TERRACE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(582, Wood, "Wood", + GI.GT_TERRACE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/layout.py b/pysollib/layout.py index 119989d4..6e3eb23c 100644 --- a/pysollib/layout.py +++ b/pysollib/layout.py @@ -144,6 +144,50 @@ class Layout: self.stackmap[mapkey] = stack return stack + # + # + # + + def createGame(self, layout_method, + talon_class=None, + waste_class=None, + foundation_class=None, + row_class=None, + reserve_class=None, + **kw + ): + # create layout + game = self.game + s = game.s + layout_method(self, **kw) + game.setSize(self.size[0], self.size[1]) + # create stacks + if talon_class: + s.talon = talon_class(self.s.talon.x, self.s.talon.y, game) + if waste_class: + s.waste = waste_class(self.s.waste.x, self.s.waste.y, game) + if foundation_class: + if type(foundation_class) in (list, tuple): + n = len(self.s.foundations)/len(foundation_class) + i = 0 + for j in range(n): + for cls in foundation_class: + r = self.s.foundations[i] + s.foundations.append(cls(r.x, r.y, game, suit=r.suit)) + i += 1 + + else: + for r in self.s.foundations: + s.foundations.append(foundation_class(r.x, r.y, game, + suit=r.suit)) + if row_class: + for r in self.s.rows: + s.rows.append(row_class(r.x, r.y, game)) + if reserve_class: + for r in self.s.reserves: + s.reserves.append(reserve_class(r.x, r.y, game)) + # default + self.defaultAll() # # public util for use by class Game @@ -342,9 +386,10 @@ class Layout: # Gypsy layout # - left: rows # - right: foundations, talon + # - bottom: reserves # - def gypsyLayout(self, rows, waste=0, texts=1, playcards=25): + def gypsyLayout(self, rows, waste=0, reserves=0, texts=1, playcards=25): S = self.__createStack CW, CH = self.CW, self.CH XM, YM = self.XM, self.YM @@ -353,8 +398,11 @@ class Layout: decks = self.game.gameinfo.decks suits = len(self.game.gameinfo.suits) + bool(self.game.gameinfo.trumps) - # set size so that at least 2/3 of a card is visible with 25 cards - h = CH*2/3 + (playcards-1)*self.YOFFSET + if reserves: + h = YS+(playcards-1)*self.YOFFSET+YS + else: + # set size so that at least 2/3 of a card is visible with 25 cards + h = CH*2/3 + (playcards-1)*self.YOFFSET h = YM + max(h, (suits+1)*YS) # create rows @@ -384,9 +432,14 @@ class Layout: if texts: # place text left of stack s.setText(x - self.TEXT_MARGIN, y + CH, anchor="se", format="%3d") + # create reserves + x, y = XM, h-YS + for i in range(reserves): + self.s.reserves.append(S(x, y)) + x += XS # set window - self.size = (XM + (rows+decks)*XS, h) + self.size = (XM + (max(rows, reserves)+decks)*XS, h) # diff --git a/pysollib/stack.py b/pysollib/stack.py index ebc599d9..5f6a223b 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -62,6 +62,7 @@ __all__ = ['cardsFaceUp', 'SC_RowStack', 'SS_RowStack', 'RK_RowStack', + 'BO_RowStack', 'UD_AC_RowStack', 'UD_SC_RowStack', 'UD_SS_RowStack', @@ -1267,11 +1268,11 @@ class Stack: elif br == 11: s = s % _('Queen') elif br == 12: s = s % _('King') elif br == 0 : s = s % _('Ace') - else : s = s % str(br) + else : s = s % str(br+1) return s def getNumCards(self): - if self.game.app.debug >= 3: + if self.game.app.debug >= 5: t = repr(self)+' ' else: t = '' @@ -1939,6 +1940,17 @@ class RK_RowStack(SequenceRowStack): elif self.cap.dir < 0: return _('Tableau. Build down regardless of suit.') else: return _('Tableau. Build by same rank.') + +# ButOwn_RowStack +class BO_RowStack(SequenceRowStack): + def _isSequence(self, cards): + return isAnySuitButOwnSequence(cards, self.cap.mod, self.cap.dir) + def getHelp(self): + if self.cap.dir > 0: return _('Tableau. Build up in any suit but the same.') + elif self.cap.dir < 0: return _('Tableau. Build down in any suit but the same.') + else: return _('Tableau. Build by same rank.') + + # A Freecell_AlternateColor_RowStack class FreeCell_AC_RowStack(AC_RowStack): def canMoveCards(self, cards): diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 5e96ebca..34076b81 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -699,9 +699,15 @@ class PysolMenubar(PysolMenubarActions): submenu.delete(0, "last") # insert games g = [self.app.getGameInfo(id) for id in gameids] - self._addSelectGameSubSubMenu(submenu, g, - command=self.mSelectGame, - variable=self.tkopt.gameid) + if len(g) > self.__cb_max*4: + g.sort(lambda a, b: cmp(gettext(a.name), gettext(b.name))) + self._addSelectAllGameSubMenu(submenu, g, + command=self.mSelectGame, + variable=self.tkopt.gameid) + else: + self._addSelectGameSubSubMenu(submenu, g, + command=self.mSelectGame, + variable=self.tkopt.gameid) state = self._getEnabledState in_favor = self.app.game.id in gameids menu, index, submenu = self.__menupath[".menubar.file.addtofavorites"] From 3c45181990d75c99cf4b267deecea427133bfc4f Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 30 Jul 2006 21:14:39 +0000 Subject: [PATCH 031/266] + 3 new games + bind undo/redo to mouse click on background + `find card' dialog (unfinished) git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@32 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/actions.py | 15 +- pysollib/app.py | 3 + pysollib/game.py | 55 +++++-- pysollib/games/harp.py | 7 + pysollib/games/mahjongg/mahjongg.py | 6 +- pysollib/games/picturegallery.py | 12 +- pysollib/games/pyramid.py | 53 ++++++- pysollib/games/sultan.py | 1 + pysollib/pysolrandom.py | 38 ++++- pysollib/stack.py | 1 + pysollib/tk/menubar.py | 2 + pysollib/tk/tkwidget.py | 230 ++++++++++++++++++++++++++-- 12 files changed, 390 insertions(+), 33 deletions(-) diff --git a/pysollib/actions.py b/pysollib/actions.py index c6c87109..93668e6b 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -45,6 +45,7 @@ from pysolrandom import constructRandom from version import VERSION from settings import PACKAGE, PACKAGE_URL from settings import TOP_TITLE +from gamedb import GI # stats imports from stats import PysolStatsFormatter @@ -66,6 +67,7 @@ from pysoltk import ColorsDialog from pysoltk import FontsDialog from pysoltk import EditTextDialog from pysoltk import TOOLBAR_BUTTONS +from pysoltk import create_find_card_dialog, connect_game_find_card_dialog, destroy_find_card_dialog from help import helpAbout, helpHTML gettext = _ @@ -95,6 +97,7 @@ class PysolMenubarActions: quickplay = 0, demo = 0, highlight_piles = 0, + find_card = 0, rules = 0, pause = 0, ) @@ -188,9 +191,12 @@ class PysolMenubarActions: tkopt.splashscreen.set(opt.splashscreen) tkopt.sticky_mouse.set(opt.sticky_mouse) tkopt.negative_bottom.set(opt.negative_bottom) - for w in TOOLBAR_BUTTONS: tkopt.toolbar_vars[w].set(opt.toolbar_vars[w]) + if game.gameinfo.category == GI.GC_FRENCH: + connect_game_find_card_dialog(game) + else: + destroy_find_card_dialog() # will get called after connectGame() def updateRecentGamesMenu(self, gameids): @@ -274,6 +280,8 @@ class PysolMenubarActions: ms.quickplay = 1 if opt.highlight_piles and game.getHighlightPilesStacks(): ms.highlight_piles = 1 + if game.gameinfo.category == GI.GC_FRENCH: + ms.find_card = 1 if game.app.getGameRulesFilename(game.id): # note: this may return "" ms.rules = 1 if not game.finished: @@ -301,6 +309,7 @@ class PysolMenubarActions: # Assist menu self.setMenuState(ms.hint, "assist.hint") self.setMenuState(ms.highlight_piles, "assist.highlightpiles") + self.setMenuState(ms.find_card, "assist.findcard") self.setMenuState(ms.demo, "assist.demo") self.setMenuState(ms.demo, "assist.demoallgames") # Options menu @@ -589,6 +598,10 @@ class PysolMenubarActions: if self._cancelDrag(break_pause=False): return self.mPlayerStats(mode=106) + def mFindCard(self, *args): + create_find_card_dialog(self.game.top, self.game, + self.app.getFindCardImagesDir()) + def mEditGameComment(self, *args): if self._cancelDrag(break_pause=False): return game, gi = self.game, self.game.gameinfo diff --git a/pysollib/app.py b/pysollib/app.py index 94fd8d07..ca587f9e 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -892,6 +892,9 @@ class Application: return None return d + def getFindCardImagesDir(self): + return self._getImagesDir('cards') + def getToolbarImagesDir(self): if self.opt.toolbar_size: size = 'large' diff --git a/pysollib/game.py b/pysollib/game.py index 8b050dd5..e352d447 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -142,6 +142,7 @@ class Game: # data = [], # raw data ) + self.event_handled = False # if click event handled by Stack (???) self.reset() # main constructor @@ -214,9 +215,13 @@ class Game: def initBindings(self): # note: a Game is only allowed to bind self.canvas and not to self.top - bind(self.canvas, "<1>", self.clickHandler) + ##bind(self.canvas, "<1>", self.clickHandler) bind(self.canvas, "<2>", self.clickHandler) - bind(self.canvas, "<3>", self.clickHandler) + ##bind(self.canvas, "<3>", self.clickHandler) + ##bind(self.canvas, "", self.undoHandler) + ##bind(self.canvas, "", self.undoHandler) + bind(self.canvas, "<1>", self.undoHandler) + bind(self.canvas, "<3>", self.redoHandler) bind(self.top, '', self._unmapHandler) def __createCommon(self, app): @@ -721,12 +726,29 @@ class Game: # # UI & graphics support # - - def clickHandler(self, *args): + def _defaultHandler(self): self.interruptSleep() self.deleteStackDesc() if self.demo: self.stopDemo() + + def clickHandler(self, event): + self._defaultHandler() + self.event_handled = False + return EVENT_PROPAGATE + + def undoHandler(self, event): + self._defaultHandler() + if not self.event_handled: + self.app.menubar.mUndo() + self.event_handled = False + return EVENT_PROPAGATE + + def redoHandler(self, event): + self._defaultHandler() + if not self.event_handled: + self.app.menubar.mRedo() + self.event_handled = False return EVENT_PROPAGATE def updateStatus(self, **kw): @@ -1392,6 +1414,16 @@ for %d moves. return self.dealCards(sound=sound) return 0 + ## for find_card_dialog + def highlightCard(self, suit, rank): + col = self.app.opt.highlight_samerank_colors[3] + info = [] + for s in self.allstacks: + for c in s.cards: + if c.suit == suit and c.rank == rank: + if s.basicShallHighlightSameRank(c): + info.append((s, c, c, col)) + return self._highlightCards(info, 0) ### highlight all moveable piles def getHighlightPilesStacks(self): @@ -1429,12 +1461,15 @@ for %d moves. if not items: return 0 self.canvas.update_idletasks() - self.sleep(sleep) - items.reverse() - for r in items: - r.delete() - self.canvas.update_idletasks() - return EVENT_HANDLED + if sleep: + self.sleep(sleep) + items.reverse() + for r in items: + r.delete() + self.canvas.update_idletasks() + return EVENT_HANDLED + else: + return items def highlightNotMatching(self): if self.demo: diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index e0d244db..37ed6028 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -108,12 +108,17 @@ class DoubleKlondikeByThrees(DoubleKlondike): # /*********************************************************************** # // Gargantua (Double Klondike with one redeal) +# // Pantagruel # ************************************************************************/ class Gargantua(DoubleKlondike): def createGame(self): DoubleKlondike.createGame(self, max_rounds=2) +class Pantagruel(DoubleKlondike): + RowStack_Class = AC_RowStack + def createGame(self): + DoubleKlondike.createGame(self, max_rounds=1) # /*********************************************************************** # // Harp (Double Klondike with 10 non-king rows and no redeal) @@ -311,5 +316,7 @@ registerGame(GameInfo(562, Delivery, "Delivery", registerGame(GameInfo(590, ChineseKlondike, "Chinese Klondike", GI.GT_KLONDIKE, 3, -1, GI.SL_BALANCED, suits=(0, 1, 2) )) +registerGame(GameInfo(591, Pantagruel, "Pantagruel", + GI.GT_KLONDIKE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py index 3f542d74..c994ce7d 100644 --- a/pysollib/games/mahjongg/mahjongg.py +++ b/pysollib/games/mahjongg/mahjongg.py @@ -112,6 +112,9 @@ class Mahjongg_Foundation(OpenStack): fnds[n].group.tkraise() return + def getHelp(self): + return '' + # /*********************************************************************** # // @@ -211,6 +214,7 @@ class Mahjongg_RowStack(OpenStack): bind(group, "", self.__controlclickEventHandler) def __defaultClickEventHandler(self, event, handler): + self.game.event_handled = True # for Game.undoHandler if self.game.demo: self.game.stopDemo(event) if self.game.busy: @@ -527,7 +531,7 @@ class AbstractMahjonggGame(Game): # i = factorial(len(free_stacks))/2/factorial(len(free_stacks)-2) old_pairs = [] - for _ in xrange(i): + for j in xrange(i): nc = new_cards[:] while True: # create uniq pair diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py index 4cf31271..b1582fbe 100644 --- a/pysollib/games/picturegallery.py +++ b/pysollib/games/picturegallery.py @@ -394,6 +394,7 @@ class MountOlympus_RowStack(SS_RowStack): class MountOlympus(Game): + RowStack_Class = MountOlympus_RowStack def createGame(self): # create layout @@ -415,7 +416,7 @@ class MountOlympus(Game): x += l.XS x, y = l.XM, l.YM+2*l.YS for i in range(9): - s.rows.append(MountOlympus_RowStack(x, y, self, dir=-2)) + s.rows.append(self.RowStack_Class(x, y, self, dir=-2)) x += l.XS s.talon=DealRowTalonStack(l.XM, l.YM, self) l.createText(s.talon, 's') @@ -446,7 +447,16 @@ class MountOlympus(Game): (card1.rank + 2 == card2.rank or card2.rank + 2 == card1.rank)) +class Zeus_RowStack(MountOlympus_RowStack): + def acceptsCards(self, from_stack, cards): + if not MountOlympus_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return cards[0].rank in (QUEEN, KING) + return True + class Zeus(MountOlympus): + RowStack_Class = Zeus_RowStack def startGame(self): self.s.talon.dealRow(rows=self.s.foundations, frames=0) self.startDealSample() diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index aad9d9af..68908e76 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -183,7 +183,7 @@ class Pyramid(Game): w = l.XM + max_rows*l.XS h = l.YM + 4*l.YS if reserves: - h += l.YS+4*l.YOFFSET + h += l.YS+2*l.YOFFSET self.setSize(w, h) # create stacks @@ -331,6 +331,53 @@ class Thirteen(Pyramid): self.s.talon.dealCards() # deal first card to WasteStack +# /*********************************************************************** +# // Thirteens +# ************************************************************************/ + +class Thirteens(Pyramid): + + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+5*l.XS, l.YM+4*l.YS) + + # create stacks + x, y = l.XM, l.YM + for i in range(2): + x = l.XM + for j in range(5): + s.rows.append(Giza_Reserve(x, y, self, max_accept=1)) + x += l.XS + y += l.YS + x, y = l.XM, self.height-l.YS + s.talon = TalonStack(x, y, self) + l.createText(s.talon, 'n') + x, y = self.width-l.XS, self.height-l.YS + s.foundations.append(Pyramid_Foundation(x, y, self, + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_move=0, max_cards=52)) + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + def fillStack(self, stack): + if stack in self.s.rows: + if not stack.cards and self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) + + + # register the game registerGame(GameInfo(38, Pyramid, "Pyramid", GI.GT_PAIRING_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) @@ -338,8 +385,10 @@ registerGame(GameInfo(193, RelaxedPyramid, "Relaxed Pyramid", GI.GT_PAIRING_TYPE | GI.GT_RELAXED, 1, 2, GI.SL_MOSTLY_LUCK)) ##registerGame(GameInfo(44, Thirteen, "Thirteen", ## GI.GT_PAIRING_TYPE, 1, 0)) -registerGame(GameInfo(591, Giza, "Giza", +registerGame(GameInfo(592, Giza, "Giza", GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(593, Thirteens, "Thirteens", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_LUCK)) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 19bf83dd..b1c2930e 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -334,6 +334,7 @@ class IdleAces(Game): # /*********************************************************************** # // Lady of the Manor +# // Archway # ************************************************************************/ class LadyOfTheManor_RowStack(BasicRowStack): diff --git a/pysollib/pysolrandom.py b/pysollib/pysolrandom.py index ff2c793a..c3178ea4 100644 --- a/pysollib/pysolrandom.py +++ b/pysollib/pysolrandom.py @@ -38,9 +38,12 @@ import sys, os, re, time, types import random -##---------------------------------------------------------------------- -class PysolRandom(random.Random): +# /*********************************************************************** +# // system based random (need python >= 2.3) +# ************************************************************************/ + +class SysRandom(random.Random): #MAX_SEED = 0L #MAX_SEED = 0xffffffffffffffffL # 64 bits MAX_SEED = 100000000000000000000L # 20 digits @@ -91,7 +94,7 @@ class PysolRandom(random.Random): # // We use a seed of type long in the range [0, MAX_SEED]. # ************************************************************************/ -class PysolRandomMFX: +class MFXRandom: MAX_SEED = 0L ORIGIN_UNKNOWN = 0 @@ -188,12 +191,36 @@ class PysolRandomMFX: seq[n], seq[j] = seq[j], seq[n] n = n - 1 + +# /*********************************************************************** +# // Linear Congruential random generator +# // +# // Knuth, Donald.E., "The Art of Computer Programming,", Vol 2, +# // Seminumerical Algorithms, Third Edition, Addison-Wesley, 1998, +# // p. 106 (line 26) & p. 108 +# ************************************************************************/ + +class LCRandom64(MFXRandom): + MAX_SEED = 0xffffffffffffffffL # 64 bits + + def str(self, seed): + s = repr(long(seed)) + if s[-1:] == "L": + s = s[:-1] + s = "0"*(20-len(s)) + s + return s + + def random(self): + self.seed = (self.seed*6364136223846793005L + 1L) & self.MAX_SEED + return ((self.seed >> 21) & 0x7fffffffL) / 2147483648.0 + + # /*********************************************************************** # // Linear Congruential random generator # // In PySol this is only used for 0 <= seed <= 32000. # ************************************************************************/ -class LCRandom31(PysolRandomMFX): +class LCRandom31(MFXRandom): MAX_SEED = 0x7fffffffL # 31 bits def str(self, seed): @@ -207,6 +234,9 @@ class LCRandom31(PysolRandomMFX): self.seed = (self.seed*214013L + 2531011L) & self.MAX_SEED return a + (int(self.seed >> 16) % (b+1-a)) +# select +##PysolRandom = LCRandom64 +PysolRandom = SysRandom # /*********************************************************************** # // PySol support code diff --git a/pysollib/stack.py b/pysollib/stack.py index 5f6a223b..10d386aa 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -895,6 +895,7 @@ class Stack: # def __defaultClickEventHandler(self, event, handler, start_drag=0, cancel_drag=1): + self.game.event_handled = True # for Game.clickHandler if self.game.demo: self.game.stopDemo(event) self.game.interruptSleep() diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 34076b81..ea820be5 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -315,6 +315,7 @@ class PysolMenubar(PysolMenubarActions): menu = MfxMenu(self.__menubar, label=n_("&Assist")) menu.add_command(label=n_("&Hint"), command=self.mHint, accelerator="H") menu.add_command(label=n_("Highlight p&iles"), command=self.mHighlightPiles, accelerator="I") + menu.add_command(label=n_("Find card"), command=self.mFindCard, accelerator="F") menu.add_separator() menu.add_command(label=n_("&Demo"), command=self.mDemo, accelerator=m+"D") menu.add_command(label=n_("Demo (&all games)"), command=self.mMixedDemo) @@ -417,6 +418,7 @@ class PysolMenubar(PysolMenubarActions): ##self._bindKey("", "Shift_L", self.mHighlightPiles) ##self._bindKey("", "Shift_R", self.mHighlightPiles) self._bindKey("", "i", self.mHighlightPiles) + self._bindKey("", "f", self.mFindCard) self._bindKey(ctrl, "d", self.mDemo) self._bindKey(ctrl, "e", self.mSelectCardsetDialog) self._bindKey(ctrl, "b", self.mOptChangeCardback) # undocumented diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 1b24da9c..916553e0 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -39,6 +39,9 @@ __all__ = ['MfxMessageDialog', 'MfxTooltip', 'MfxScrolledCanvas', 'StackDesc', + 'create_find_card_dialog', + 'connect_game_find_card_dialog', + 'destroy_find_card_dialog', ] # imports @@ -55,7 +58,7 @@ from tkconst import EVENT_HANDLED, EVENT_PROPAGATE from tkutil import after, after_idle, after_cancel from tkutil import bind, unbind_destroy, makeImage from tkutil import makeToplevel, setTransient -from tkcanvas import MfxCanvas +from tkcanvas import MfxCanvas, MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle # /*********************************************************************** @@ -78,23 +81,24 @@ class MfxDialog: # ex. _ToplevelDialog bind(self.top, "WM_DELETE_WINDOW", self.wmDeleteWindow) # - def mainloop(self, focus=None, timeout=0): + def mainloop(self, focus=None, timeout=0, transient=True): bind(self.top, "", self.mCancel) bind(self.top, '', self.altKeyEvent) # for accelerators if focus is not None: focus.focus() - setTransient(self.top, self.parent) - try: - self.top.grab_set() - except Tkinter.TclError: - if traceback: traceback.print_exc() - pass - if timeout > 0: - self.timer = after(self.top, timeout, self.mTimeout) - try: self.top.mainloop() - except SystemExit: - pass - self.destroy() + if transient: + setTransient(self.top, self.parent) + try: + self.top.grab_set() + except Tkinter.TclError: + if traceback: traceback.print_exc() + pass + if timeout > 0: + self.timer = after(self.top, timeout, self.mTimeout) + try: self.top.mainloop() + except SystemExit: + pass + self.destroy() def destroy(self): after_cancel(self.timer) @@ -716,5 +720,203 @@ class StackDesc: self.label.unbind('', b) +# /*********************************************************************** +# // +# ************************************************************************/ + +class FindCardDialog(MfxDialog): + SUIT_IMAGES = {} # key: (suit, color) + RANK_IMAGES = {} # key: (rank, color) + + def __init__(self, parent, game, dir, title='Find card', **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + self.images_dir = dir + #self.default_color = top_frame['bg'] + #self.bg_colors = ('#f9e3d2', '#c9e3d2') + #self.highlight_color = 'white' + self.label_width, self.label_height = 36, 30 + self.top_frame = top_frame + self.canvas = MfxCanvas(top_frame, bg='white') + self.canvas.pack(expand=True, fill='both') + # + self.button = kw.default + self.labels = [] + self.tk_images = [] + self.highlight_items = None + self.last_card = None + self.connectGame(game) + # + focus = self.createButtons(bottom_frame, kw) + ##self.mainloop(focus, kw.timeout, transient=False) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&Close"),), default=0, + resizable=0, + padx=4, pady=4, + separatorwidth=0, + ) + return MfxDialog.initKw(self, kw) + + def createCardLabel(self, suit, rank, x0, y0): + dx, dy = self.label_width, self.label_height + dir = self.images_dir + images = self.tk_images + canvas = self.canvas + group = MfxCanvasGroup(canvas) + s = 'cshd'[suit] + if suit >= 2: c = 'red' + else: c = 'black' + x1, y1 = x0+dx-2, y0+dy-2 + rect = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, + width=2, fill='white', outline='white') + rect.addtag(group) + # + fn = os.path.join(dir, c+'-'+str(rank)+'.gif') + rim = FindCardDialog.RANK_IMAGES.get((rank, c)) + if not rim: + rim = Tkinter.PhotoImage(file=fn) + FindCardDialog.RANK_IMAGES[(rank, c)] = rim + fn = os.path.join(dir, 'large-'+s+'.gif') + sim = FindCardDialog.SUIT_IMAGES.get((suit, c)) + if not sim: + sim = Tkinter.PhotoImage(file=fn) + FindCardDialog.SUIT_IMAGES[(suit, c)] = sim + # + x0 = x0+(dx-rim.width()-sim.width())/2 + x, y = x0, y0+(dy-rim.height())/2 + im = MfxCanvasImage(canvas, x, y, image=rim, anchor='nw') + im.addtag(group) + x, y = x0+rim.width(), y0+(dy-sim.height())/2 + im = MfxCanvasImage(canvas, x, y, image=sim, anchor='nw') + im.addtag(group) + bind(group, '', + lambda e, suit=suit, rank=rank, rect=rect: + self.enterEvent(suit, rank, rect)) + bind(group, '', + lambda e, suit=suit, rank=rank, rect=rect: + self.leaveEvent(suit, rank, rect)) + self.labels.append(group) + def connectGame(self, game): + self.game = game + suits = game.gameinfo.suits + ranks = game.gameinfo.ranks + dx, dy = self.label_width, self.label_height + i = 0 + for suit in suits: + j = 0 + for rank in ranks: + x, y = dx*j+2, dy*i+2 + self.createCardLabel(suit=suit, rank=rank, x0=x, y0=y) + j += 1 + i += 1 + w, h = dx*j, dy*i + self.canvas.config(width=w, height=h) + + +## if self.labels: +## for l in self.labels: +## unbind_destroy(l) +## l.grid_forget() +## frame = self.top_frame +## from pysollib.util import SUITS, RANKS +## suits = game.gameinfo.suits +## ranks = game.gameinfo.ranks +## ns = 0 +## for i in suits: +## color = self.bg_colors[ns%2] +## suit = SUITS[i] +## suit_label = Tkinter.Label(frame, text=suit, bg=color) +## suit_label.grid(row=i, column=0, sticky='ew') +## self.labels.append(suit_label) +## ns += 1 +## nk = 0 +## for j in ranks: +## color = self.bg_colors[(ns+nk)%2] +## rank = RANKS[j] +## rank_label = Tkinter.Label(frame, text=rank, bg=color) +## bind(rank_label, '', lambda e, label=rank_label, suit=i, rank=j: self.enterEvent(label, suit, rank)) +## bind(rank_label, '', lambda e, label=rank_label, suit=i, rank=j: self.leaveEvent(label, suit, rank)) +## self.labels.append(rank_label) +## #rank_label.config(highlightthickness=1, +## # highlightbackground='black') +## rank_label.grid(row=i, column=j+1, sticky='ew') +## nk += 1 + +## def showCard(self, suit, rank, rect): +## print suit, rank + + def enterEvent(self, suit, rank, rect): + #print 'enterEvent', suit, rank + #if (suit, rank) == self.last_card: return + self.last_card = (suit, rank) + self.highlight_items = self.game.highlightCard(suit, rank) + if not self.highlight_items: + self.highlight_items = [] +## dx, dy = self.label_width, self.label_height +## x0, y0 = dx*rank, dy*suit +## x1, y1 = dx*(rank+1), dy*(suit+1) + rect.config(outline='red') + #item = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, + # width=2, fill=None, outline='red') + #self.highlight_items.append(item) + + def leaveEvent(self, suit, rank, rect): + #print 'leaveEvent', suit, rank + #if (suit, rank) == self.last_card: return + for i in self.highlight_items: + i.delete() + #self.game.canvas.update_idletasks() + #self.canvas.update_idletasks() + rect.config(outline='white') + self.last_card = None + + def destroy(self): + for l in self.labels: + unbind_destroy(l) + unbind_destroy(self.top) + self.top.wm_withdraw() + self.top.destroy() + + def tkraise(self): + self.top.tkraise() + + def mDone(self, button): + self.destroy() + pass + + def wmDeleteWindow(self, *event): + self.destroy() + pass + + +find_card_dialog = None + +def create_find_card_dialog(parent, game, dir): + global find_card_dialog + try: + find_card_dialog.tkraise() + except: + ##traceback.print_exc() + find_card_dialog = FindCardDialog(parent, game, dir) + +def connect_game_find_card_dialog(game): + try: + find_card_dialog.connectGame(game) + except: + pass + +def destroy_find_card_dialog(): + global find_card_dialog + try: + find_card_dialog.destroy() + except: + ##traceback.print_exc() + pass + find_card_dialog = None + From 2a9f9650428b38d739a20566f6f777139682367c Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 30 Jul 2006 22:35:33 +0000 Subject: [PATCH 032/266] * improved `find card dialog' git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@33 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/tk/tkwidget.py | 123 ++++++++++------------------------------ 1 file changed, 29 insertions(+), 94 deletions(-) diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 916553e0..d5495e90 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -724,69 +724,55 @@ class StackDesc: # // # ************************************************************************/ -class FindCardDialog(MfxDialog): +class FindCardDialog(Tkinter.Toplevel): SUIT_IMAGES = {} # key: (suit, color) RANK_IMAGES = {} # key: (rank, color) - def __init__(self, parent, game, dir, title='Find card', **kw): - kw = self.initKw(kw) - MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) - top_frame, bottom_frame = self.createFrames(kw) - self.createBitmaps(top_frame, kw) + def __init__(self, parent, game, dir, title='Find card'): + Tkinter.Toplevel.__init__(self) + self.title(title) + self.wm_resizable(0, 0) + # self.images_dir = dir - #self.default_color = top_frame['bg'] - #self.bg_colors = ('#f9e3d2', '#c9e3d2') - #self.highlight_color = 'white' - self.label_width, self.label_height = 36, 30 - self.top_frame = top_frame - self.canvas = MfxCanvas(top_frame, bg='white') + self.label_width, self.label_height = 38, 34 + self.canvas = MfxCanvas(self, bg='white') self.canvas.pack(expand=True, fill='both') # - self.button = kw.default - self.labels = [] - self.tk_images = [] + self.groups = [] self.highlight_items = None - self.last_card = None self.connectGame(game) # - focus = self.createButtons(bottom_frame, kw) - ##self.mainloop(focus, kw.timeout, transient=False) - - def initKw(self, kw): - kw = KwStruct(kw, - strings=(_("&Close"),), default=0, - resizable=0, - padx=4, pady=4, - separatorwidth=0, - ) - return MfxDialog.initKw(self, kw) + bind(self, "WM_DELETE_WINDOW", self.destroy) + bind(self, "", self.destroy) def createCardLabel(self, suit, rank, x0, y0): dx, dy = self.label_width, self.label_height dir = self.images_dir - images = self.tk_images canvas = self.canvas group = MfxCanvasGroup(canvas) s = 'cshd'[suit] if suit >= 2: c = 'red' else: c = 'black' - x1, y1 = x0+dx-2, y0+dy-2 + rect_width = 4 + x1, y1 = x0+dx-rect_width, y0+dy-rect_width rect = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, - width=2, fill='white', outline='white') + width=rect_width, + fill='white', outline='white') rect.addtag(group) # fn = os.path.join(dir, c+'-'+str(rank)+'.gif') rim = FindCardDialog.RANK_IMAGES.get((rank, c)) if not rim: - rim = Tkinter.PhotoImage(file=fn) + rim = makeImage(file=fn) FindCardDialog.RANK_IMAGES[(rank, c)] = rim - fn = os.path.join(dir, 'large-'+s+'.gif') + fn = os.path.join(dir, s+'.gif') sim = FindCardDialog.SUIT_IMAGES.get((suit, c)) if not sim: - sim = Tkinter.PhotoImage(file=fn) + sim = makeImage(file=fn) FindCardDialog.SUIT_IMAGES[(suit, c)] = sim # x0 = x0+(dx-rim.width()-sim.width())/2 + x0, y0 = x0-1, y0-2 x, y = x0, y0+(dy-rim.height())/2 im = MfxCanvasImage(canvas, x, y, image=rim, anchor='nw') im.addtag(group) @@ -799,8 +785,7 @@ class FindCardDialog(MfxDialog): bind(group, '', lambda e, suit=suit, rank=rank, rect=rect: self.leaveEvent(suit, rank, rect)) - self.labels.append(group) - + self.groups.append(group) def connectGame(self, game): self.game = game @@ -818,81 +803,31 @@ class FindCardDialog(MfxDialog): w, h = dx*j, dy*i self.canvas.config(width=w, height=h) - -## if self.labels: -## for l in self.labels: -## unbind_destroy(l) -## l.grid_forget() -## frame = self.top_frame -## from pysollib.util import SUITS, RANKS -## suits = game.gameinfo.suits -## ranks = game.gameinfo.ranks -## ns = 0 -## for i in suits: -## color = self.bg_colors[ns%2] -## suit = SUITS[i] -## suit_label = Tkinter.Label(frame, text=suit, bg=color) -## suit_label.grid(row=i, column=0, sticky='ew') -## self.labels.append(suit_label) -## ns += 1 -## nk = 0 -## for j in ranks: -## color = self.bg_colors[(ns+nk)%2] -## rank = RANKS[j] -## rank_label = Tkinter.Label(frame, text=rank, bg=color) -## bind(rank_label, '', lambda e, label=rank_label, suit=i, rank=j: self.enterEvent(label, suit, rank)) -## bind(rank_label, '', lambda e, label=rank_label, suit=i, rank=j: self.leaveEvent(label, suit, rank)) -## self.labels.append(rank_label) -## #rank_label.config(highlightthickness=1, -## # highlightbackground='black') -## rank_label.grid(row=i, column=j+1, sticky='ew') -## nk += 1 - -## def showCard(self, suit, rank, rect): -## print suit, rank - def enterEvent(self, suit, rank, rect): #print 'enterEvent', suit, rank - #if (suit, rank) == self.last_card: return self.last_card = (suit, rank) self.highlight_items = self.game.highlightCard(suit, rank) if not self.highlight_items: self.highlight_items = [] -## dx, dy = self.label_width, self.label_height -## x0, y0 = dx*rank, dy*suit -## x1, y1 = dx*(rank+1), dy*(suit+1) rect.config(outline='red') - #item = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, - # width=2, fill=None, outline='red') - #self.highlight_items.append(item) def leaveEvent(self, suit, rank, rect): #print 'leaveEvent', suit, rank - #if (suit, rank) == self.last_card: return - for i in self.highlight_items: - i.delete() + if self.highlight_items: + for i in self.highlight_items: + i.delete() + rect.config(outline='white') #self.game.canvas.update_idletasks() #self.canvas.update_idletasks() - rect.config(outline='white') self.last_card = None - def destroy(self): - for l in self.labels: + def destroy(self, *args): + for l in self.groups: unbind_destroy(l) - unbind_destroy(self.top) - self.top.wm_withdraw() - self.top.destroy() + unbind_destroy(self) + self.wm_withdraw() + Tkinter.Toplevel.destroy(self) - def tkraise(self): - self.top.tkraise() - - def mDone(self, button): - self.destroy() - pass - - def wmDeleteWindow(self, *event): - self.destroy() - pass find_card_dialog = None From 8c8bc6797076bb60190854e116b8a53a604c5b2e Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 31 Jul 2006 21:35:39 +0000 Subject: [PATCH 033/266] + 7 new games + new file: pysollib/tk/findcarddialog.py + new option: `use mouse for undo/redo' * improved Game._highlightCards * added flash to FindCardDialog git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@34 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/actions.py | 2 + pysollib/app.py | 9 +- pysollib/game.py | 146 +++++++++++++++--- pysollib/games/algerian.py | 5 +- pysollib/games/auldlangsyne.py | 6 +- pysollib/games/bakersdozen.py | 22 +-- pysollib/games/bakersgame.py | 8 +- pysollib/games/beleagueredcastle.py | 22 +-- pysollib/games/bisley.py | 9 +- pysollib/games/braid.py | 7 +- pysollib/games/bristol.py | 9 +- pysollib/games/canfield.py | 33 ++-- pysollib/games/capricieuse.py | 7 +- pysollib/games/curdsandwhey.py | 10 +- pysollib/games/diplomat.py | 3 +- pysollib/games/fan.py | 18 +-- pysollib/games/fortythieves.py | 36 ++--- pysollib/games/freecell.py | 7 +- pysollib/games/glenwood.py | 10 +- pysollib/games/golf.py | 9 +- pysollib/games/grandfathersclock.py | 3 +- pysollib/games/gypsy.py | 14 +- pysollib/games/harp.py | 16 +- pysollib/games/headsandtails.py | 3 +- pysollib/games/katzenschwanz.py | 4 +- pysollib/games/klondike.py | 33 ++-- pysollib/games/montana.py | 4 +- pysollib/games/napoleon.py | 4 +- pysollib/games/needle.py | 3 +- pysollib/games/numerica.py | 76 +++++++++- pysollib/games/pileon.py | 5 +- pysollib/games/pyramid.py | 228 +++++++++++++++++++++++++++- pysollib/games/royalcotillion.py | 3 +- pysollib/games/spider.py | 29 ++-- pysollib/games/sultan.py | 46 +++--- pysollib/games/tournament.py | 3 +- pysollib/games/unionsquare.py | 4 +- pysollib/games/wavemotion.py | 3 +- pysollib/games/windmill.py | 7 +- pysollib/games/yukon.py | 29 +--- pysollib/games/zodiac.py | 3 +- pysollib/help.py | 6 + pysollib/pysoltk.py | 1 + pysollib/stack.py | 10 +- pysollib/tk/findcarddialog.py | 203 +++++++++++++++++++++++++ pysollib/tk/menubar.py | 8 +- pysollib/tk/tkwidget.py | 147 +----------------- 47 files changed, 802 insertions(+), 471 deletions(-) create mode 100644 pysollib/tk/findcarddialog.py diff --git a/pysollib/actions.py b/pysollib/actions.py index 93668e6b..83e20763 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -138,6 +138,7 @@ class PysolMenubarActions: splashscreen = BooleanVar(), demo_logo = BooleanVar(), sticky_mouse = BooleanVar(), + mouse_undo = BooleanVar(), negative_bottom = BooleanVar(), pause = BooleanVar(), toolbar_vars = {}, @@ -190,6 +191,7 @@ class PysolMenubarActions: tkopt.demo_logo.set(opt.demo_logo) tkopt.splashscreen.set(opt.splashscreen) tkopt.sticky_mouse.set(opt.sticky_mouse) + tkopt.mouse_undo.set(opt.mouse_undo) tkopt.negative_bottom.set(opt.negative_bottom) for w in TOOLBAR_BUTTONS: tkopt.toolbar_vars[w].set(opt.toolbar_vars[w]) diff --git a/pysollib/app.py b/pysollib/app.py index ca587f9e..993eae8c 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -68,7 +68,8 @@ from pysoltk import PysolStatusbar, HelpStatusbar from pysoltk import SelectCardsetByTypeDialogWithPreview from pysoltk import SelectDialogTreeData from pysoltk import TOOLBAR_BUTTONS -from help import helpAbout +from pysoltk import destroy_find_card_dialog +from help import helpAbout, destroy_help gettext = _ @@ -171,7 +172,7 @@ class Options: self.highlight_samerank_colors = (None, "#ffc000", None, "#0000ff") self.hintarrow_color = "#303030" self.highlight_not_matching_color = '#ff0000' - self.table_text_color = 0 + self.table_text_color = False # `False' is mean use default self.table_text_color_value = '#ffffff' # delays self.hint_sleep = 1.0 @@ -194,6 +195,7 @@ class Options: # self.splashscreen = True self.sticky_mouse = False + self.mouse_undo = False # use mouse for undo/redo self.negative_bottom = False self.randomize_place = False self.cache_carsets = True @@ -689,6 +691,9 @@ class Application: finally: # hide main window self.wm_withdraw() + # + destroy_find_card_dialog() + destroy_help() # update options self.opt.last_gameid = id # save options diff --git a/pysollib/game.py b/pysollib/game.py index e352d447..027a310d 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -180,12 +180,28 @@ class Game: if self.s.talon: assert hasattr(self.s.talon, "round") assert hasattr(self.s.talon, "max_rounds") - if self.app.debug and self.s.foundations: - ncards = 0 - for stack in self.s.foundations: - ncards += stack.cap.max_cards - if ncards != self.gameinfo.ncards: - print 'WARNING: invalid sum of foundations.max_cards:', self.__class__.__name__, ncards, self.gameinfo.ncards + if self.app.debug: + class_name = self.__class__.__name__ + if self.s.foundations: + ncards = 0 + for stack in self.s.foundations: + ncards += stack.cap.max_cards + if ncards != self.gameinfo.ncards: + print 'WARNING: invalid sum of foundations.max_cards:', \ + class_name, ncards, self.gameinfo.ncards + if self.s.rows: + from stack import AC_RowStack, SS_RowStack, RK_RowStack + r = self.s.rows[0] + for c, f in ( + (AC_RowStack, (self._shallHighlightMatch_AC, + self._shallHighlightMatch_ACW)), + (SS_RowStack, (self._shallHighlightMatch_SS, + self._shallHighlightMatch_SSW)), + (RK_RowStack, (self._shallHighlightMatch_RK, + self._shallHighlightMatch_RKW)),): + if isinstance(r, c) and not self.shallHighlightMatch in f: + print 'WARNING: shallHighlightMatch is not valid:', \ + class_name, r.__class__ # optimize regions self.optimizeRegions() # create cards @@ -739,14 +755,14 @@ class Game: def undoHandler(self, event): self._defaultHandler() - if not self.event_handled: + if self.app.opt.mouse_undo and not self.event_handled: self.app.menubar.mUndo() self.event_handled = False return EVENT_PROPAGATE def redoHandler(self, event): self._defaultHandler() - if not self.event_handled: + if self.app.opt.mouse_undo and not self.event_handled: self.app.menubar.mRedo() self.event_handled = False return EVENT_PROPAGATE @@ -1416,7 +1432,9 @@ for %d moves. ## for find_card_dialog def highlightCard(self, suit, rank): - col = self.app.opt.highlight_samerank_colors[3] + if not self.app: + return None + col = self.app.opt.highlight_samerank_colors[1] info = [] for s in self.allstacks: for c in s.cards: @@ -1438,25 +1456,59 @@ for %d moves. items = [] for s, c1, c2, color in info: assert c1 in s.cards and c2 in s.cards - sy0 = s.CARD_YOFFSET[0] - if sy0 >= 0: + tkraise = False + if c1 is c2: + # highlight single card + sx0, sy0 = s.getOffsetFor(c1) + x1, y1 = s.getPositionFor(c1) + x2, y2 = x1, y1 + else: + # highlight pile + if len(s.CARD_XOFFSET) > 1: + sx0 = 0 + else: + sx0 = s.CARD_XOFFSET[0] + if len(s.CARD_YOFFSET) > 1: + sy0 = 0 + else: + sy0 = s.CARD_YOFFSET[0] x1, y1 = s.getPositionFor(c1) x2, y2 = s.getPositionFor(c2) - if c2 is not s.cards[-1] and sy0 > 0: - y2 = y2 + sy0 - else: - y2 = y2 + self.app.images.CARDH - else: - x1, y1 = s.getPositionFor(c2) - x2, y2 = s.getPositionFor(c1) + if sx0 != 0 and sy0 == 0: + # horizontal stack y2 = y2 + self.app.images.CARDH - if c2 is not s.cards[-1]: - y1 = y1 + (self.app.images.CARDH + sy0) - x2 = x2 + self.app.images.CARDW + if c2 is s.cards[-1]: # top card + x2 = x2 + self.app.images.CARDW + else: + if sx0 > 0: + # left to right + x2 = x2 + sx0 + else: + # right to left + x1 = x1 + self.app.images.CARDW + x2 = x2 + self.app.images.CARDW + sx0 + elif sx0 == 0 and sy0 != 0: + # vertical stack + x2 = x2 + self.app.images.CARDW + if c2 is s.cards[-1]: # top card + y2 = y2 + self.app.images.CARDH + else: + if sy0 > 0: + # up to down + y2 = y2 + sy0 + else: + # down to up + y1 = y1 + self.app.images.CARDH + y2 = y2 + self.app.images.CARDH + sy0 + else: + x2 = x2 + self.app.images.CARDW + y2 = y2 + self.app.images.CARDH + tkraise = True ##print c1, c2, x1, y1, x2, y2 r = MfxCanvasRectangle(self.canvas, x1-1, y1-1, x2+1, y2+1, width=4, fill=None, outline=color) - r.tkraise(c2.item) + if tkraise: + r.tkraise(c2.item) items.append(r) if not items: return 0 @@ -1469,6 +1521,7 @@ for %d moves. self.canvas.update_idletasks() return EVENT_HANDLED else: + # remove items later return items def highlightNotMatching(self): @@ -1492,9 +1545,10 @@ for %d moves. r.delete() self.canvas.update_idletasks() - def highlightPiles(self, stackinfo, sleep=1.5): + def highlightPiles(self, sleep=1.5): stackinfo = self.getHighlightPilesStacks() if not stackinfo: + self.highlightNotMatching() return 0 col = self.app.opt.highlight_piles_colors hi = [] @@ -1503,17 +1557,61 @@ for %d moves. pile = s.getPile() if pile and len(pile) >= si[1]: hi.append((s, pile[0], pile[-1], col[1])) + if not hi: + self.highlightNotMatching() + return 0 return self._highlightCards(hi, sleep) + # + # highlight matching cards + # - ### highlight matching cards def shallHighlightMatch(self, stack1, card1, stack2, card2): return 0 + def _shallHighlightMatch_AC(self, stack1, card1, stack2, card2): + # by alternate color + return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + + def _shallHighlightMatch_ACW(self, stack1, card1, stack2, card2): + # by alternate color with wrapping (only for france games) + return (card1.color != card2.color + and ((card1.rank + 1) % 13 == card2.rank + or (card2.rank + 1) % 13 == card1.rank)) + + def _shallHighlightMatch_SS(self, stack1, card1, stack2, card2): + # by same suit + return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + + def _shallHighlightMatch_SSW(self, stack1, card1, stack2, card2): + # by same suit with wrapping (only for france games) + return (card1.suit == card2.suit + and ((card1.rank + 1) % 13 == card2.rank + or (card2.rank + 1) % 13 == card1.rank)) + + def _shallHighlightMatch_RK(self, stack1, card1, stack2, card2): + # by rank + return abs(card1.rank-card2.rank) == 1 + + def _shallHighlightMatch_RKW(self, stack1, card1, stack2, card2): + # by rank with wrapping (only for france games) + return ((card1.rank + 1) % 13 == card2.rank + or (card2.rank + 1) % 13 == card1.rank) + + # + # quick-play + # + def getQuickPlayScore(self, ncards, from_stack, to_stack): # prefer non-empty piles in to_stack return (len(to_stack.cards) != 0) + def _getSpiderQuickPlayScore(self, ncards, from_stack, to_stack): + # for spider-type stacks + if to_stack.cards: + # check suit + return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 + return 0 # # Score (I really don't like scores in Patience games...) diff --git a/pysollib/games/algerian.py b/pysollib/games/algerian.py index ffab0455..17b0ae4e 100644 --- a/pysollib/games/algerian.py +++ b/pysollib/games/algerian.py @@ -114,10 +114,7 @@ class Carthage(Game): self.startDealSample() self.s.talon.dealRow(rows=self.s.reserves) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - ((card1.rank + 1) % 13 == card2.rank or - (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SSW # /*********************************************************************** diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index c4f3a3b9..bcbbec16 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -270,8 +270,7 @@ class Interregnum(Game): def getAutoStacks(self, event=None): return ((), (), self.sg.dropstacks) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RKW def _restoreGameHook(self, game): self.base_cards = [None] * 8 @@ -488,8 +487,7 @@ class Scuffle_Talon(RedealTalonStack): def dealCards(self, sound=0, shuffle=True): if self.cards: return self.dealRowAvail(sound=sound) - RedealTalonStack.redealCards(self, frames=4, - shuffle=shuffle, sound=sound) + self.redealCards(frames=4, shuffle=shuffle, sound=sound) return self.dealRowAvail(sound=sound) diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py index e4a373bb..f8c93abb 100644 --- a/pysollib/games/bakersdozen.py +++ b/pysollib/games/bakersdozen.py @@ -80,8 +80,7 @@ class CastlesInSpain(Game): self.startDealSample() self.s.talon.dealRow() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** @@ -139,8 +138,7 @@ class BakersDozen(CastlesInSpain): def startGame(self): CastlesInSpain.startGame(self, flip=(1, 1, 1)) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -150,8 +148,7 @@ class BakersDozen(CastlesInSpain): class SpanishPatience(BakersDozen): Foundation_Class = AC_FoundationStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** @@ -252,8 +249,8 @@ class Cruel(CastlesInSpain): CastlesInSpain.startGame(self, flip=(1, 1, 1)) self.s.talon.dealRow(rows=self.s.foundations) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS + # /*********************************************************************** # // Royal Family @@ -269,8 +266,7 @@ class RoyalFamily(Cruel): # move Kings to bottom of the Talon (i.e. last cards to be dealt) return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == KING, c.suit)) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC class Indefatigable(Cruel): @@ -282,8 +278,7 @@ class Indefatigable(Cruel): # move Aces to bottom of the Talon (i.e. last cards to be dealt) return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == ACE, c.suit)) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -328,8 +323,7 @@ class RippleFan(CastlesInSpain): def startGame(self): CastlesInSpain.startGame(self, flip=(1, 1, 1)) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # register the game diff --git a/pysollib/games/bakersgame.py b/pysollib/games/bakersgame.py index 3c8bb671..119d6690 100644 --- a/pysollib/games/bakersgame.py +++ b/pysollib/games/bakersgame.py @@ -114,9 +114,7 @@ class BakersGame(Game): ##self.s.talon.dealRow(rows=(r[0], r[1], r[6], r[7])) self.s.talon.dealRow(rows=r[:4]) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -312,9 +310,7 @@ class Penguin(Game): self.startDealSample() self.s.talon.dealRow() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SSW def _restoreGameHook(self, game): self.base_card = self.cards[game.loadinfo.base_card_id] diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index b6b19696..9189b08d 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -126,8 +126,7 @@ class StreetsAndAlleys(Game): for i in range(3): self.s.talon.dealRowAvail() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank - card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -226,10 +225,8 @@ class Fortress(Game): for i in range(3): self.s.talon.dealRowAvail() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - ((card1.rank + 1) % 13 == card2.rank or - (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SSW + # /*********************************************************************** # // Bastion @@ -436,8 +433,7 @@ class Zerline(Game): self.s.talon.dealRow() self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank - card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK def getQuickPlayScore(self, ncards, from_stack, to_stack): return int(to_stack in self.s.rows) @@ -559,8 +555,7 @@ class CastleOfIndolence(Game): self.s.talon.dealRow() self.s.talon.dealRowAvail() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank - card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -637,8 +632,7 @@ class Rittenhouse(Game): def fillStack(self, stack): self.fillAll() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank - card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -688,9 +682,7 @@ class CastleMount(Lightweight): DEAL = (11, 1) RowStack_Class = Spider_SS_RowStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return ((card1.rank + 1) % stack1.cap.mod == card2.rank or - (card2.rank + 1) % stack1.cap.mod == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RK def getQuickPlayScore(self, ncards, from_stack, to_stack): if to_stack.cards: diff --git a/pysollib/games/bisley.py b/pysollib/games/bisley.py index 4b06c13c..3317a297 100644 --- a/pysollib/games/bisley.py +++ b/pysollib/games/bisley.py @@ -90,8 +90,7 @@ class Bisley(Game): # move Aces to bottom of the Talon (i.e. last cards to be dealt) return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == ACE, c.suit)) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -232,15 +231,13 @@ class Realm(Game): self.s.talon.dealRow() self.s.talon.dealRowAvail() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC class Mancunian(Realm): RowStack_Class = StackWrapper(UD_RK_RowStack, base_rank=NO_RANK) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK # register the game diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py index 46f86bfb..850457ea 100644 --- a/pysollib/games/braid.py +++ b/pysollib/games/braid.py @@ -214,9 +214,7 @@ class Braid(Game): # deal first card to WasteStack self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SSW def getHighlightPilesStacks(self): return () @@ -358,8 +356,7 @@ class Backbone(Game): self.s.talon.dealRow() self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS class BackbonePlus(Backbone): diff --git a/pysollib/games/bristol.py b/pysollib/games/bristol.py index f2f5d591..4fcd44d5 100644 --- a/pysollib/games/bristol.py +++ b/pysollib/games/bristol.py @@ -319,10 +319,7 @@ class NewYork(Dover): self.s.talon.dealRow() self.s.talon.fillStack() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - ((card1.rank + 1) % 13 == card2.rank or - (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_ACW def _restoreGameHook(self, game): self.base_card = self.cards[game.loadinfo.base_card_id] @@ -356,9 +353,7 @@ class Spike(Dover): self.s.talon.dealRow() self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - abs(card1.rank-card2.rank) == 1) + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index f1f4b1f9..9dfea82e 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -212,9 +212,7 @@ class Canfield(Game): if stack.canFlipCard(): stack.flipMove() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_ACW def _restoreGameHook(self, game): self.base_card = self.cards[game.loadinfo.base_card_id] @@ -277,9 +275,7 @@ class Storehouse(Canfield): self.s.talon.dealRow(rows=self.s.foundations[:3]) Canfield.startGame(self) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SSW def updateText(self): pass @@ -297,8 +293,7 @@ class Chameleon(Canfield): def createGame(self): Canfield.createGame(self, rows=3, max_rounds=1, num_deal=1) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RKW # /*********************************************************************** @@ -345,9 +340,7 @@ class VariegatedCanfield(Canfield): self.s.talon.dealRow(rows=self.s.foundations[:7]) Canfield.startGame(self) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - ((card1.rank + 1) == card2.rank or (card2.rank + 1) == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_AC def updateText(self): pass @@ -471,9 +464,7 @@ class Gate(Game): if from_stack: from_stack.moveMove(1, stack) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - abs(card1.rank-card2.rank) == 1) + shallHighlightMatch = Game._shallHighlightMatch_AC class LittleGate(Gate): @@ -544,8 +535,7 @@ class Doorway(LittleGate): def fillStack(self, stack): pass - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -574,8 +564,7 @@ class Minerva(Canfield): self.flipMove(self.s.reserves[0]) self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC def _restoreGameHook(self, game): pass @@ -631,9 +620,7 @@ class Acme(Canfield): self.s.talon.dealRow(reverse=1) self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - abs(card1.rank-card2.rank) == 1) + shallHighlightMatch = Game._shallHighlightMatch_SS def updateText(self): pass @@ -703,9 +690,7 @@ class Duke(Game): self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - abs(card1.rank-card2.rank) == 1) + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py index e7beec99..c36f43bd 100644 --- a/pysollib/games/capricieuse.py +++ b/pysollib/games/capricieuse.py @@ -122,10 +122,7 @@ class Capricieuse(Game): def _shuffleHook(self, cards): return self._shuffleHookMoveToBottom(cards, lambda c: (c.deck == 0 and c.rank in (0, 12), (c.rank, c.suit)), 8) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - ((card1.rank + 1) % stack1.cap.mod == card2.rank or - (card2.rank + 1) % stack1.cap.mod == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -136,6 +133,8 @@ class Nationale(Capricieuse): Talon_Class = InitialDealTalonStack RowStack_Class = StackWrapper(UD_SS_RowStack, mod=13) + shallHighlightMatch = Game._shallHighlightMatch_SSW + # register the game registerGame(GameInfo(292, Capricieuse, "Capricieuse", diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index 6537ceb9..dc0825f2 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -323,9 +323,7 @@ class GermanPatience(Game): return True - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return ((card1.rank + 1) % 13 == card2.rank or - (card2.rank + 1) % 13 == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RKW class BavarianPatience(GermanPatience): @@ -384,8 +382,7 @@ class TrustyTwelve(Game): def isGameWon(self): return len(self.s.talon.cards) == 0 - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK class KnottyNines(TrustyTwelve): @@ -410,8 +407,7 @@ class SweetSixteen(TrustyTwelve): y += l.YS+10*l.YOFFSET l.defaultStackGroups() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py index 99469452..05e1fa8a 100644 --- a/pysollib/games/diplomat.py +++ b/pysollib/games/diplomat.py @@ -112,8 +112,7 @@ class Diplomat(Game): self.s.waste.moveMove(1, stack) self.leaveState(old_state) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index 590b845c..26d81a67 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -121,9 +121,7 @@ class Fan(Game): self.startDealSample() self.s.talon.dealRow() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS def getHighlightPilesStacks(self): return () @@ -138,8 +136,7 @@ class ScotchPatience(Fan): RowStack_Class = StackWrapper(RK_RowStack, base_rank=NO_RANK) def createGame(self): Fan.createGame(self, playcards=8) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -150,8 +147,7 @@ class Shamrocks(Fan): RowStack_Class = StackWrapper(UD_RK_RowStack, base_rank=NO_RANK, max_cards=3) def createGame(self): Fan.createGame(self, playcards=4) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -520,9 +516,7 @@ class CloverLeaf(Game): (c.rank == KING and c.suit in (2,3)), c.suit)) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - abs(card1.rank-card2.rank) == 1) + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -556,9 +550,7 @@ class BoxFan(Fan): # move Aces to bottom of the Talon (i.e. last cards to be dealt) return self._shuffleHookMoveToBottom(cards, lambda c: (c.rank == 0, c.suit)) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index bae783a2..fc15acc6 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -152,9 +152,7 @@ class FortyThieves(Game): self.s.waste.moveMove(1, stack) self.leaveState(old_state) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -358,8 +356,7 @@ class LittleForty(FortyThieves): class Streets(FortyThieves): RowStack_Class = AC_RowStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC class Maria(Streets): @@ -458,8 +455,9 @@ class Indian(FortyThieves): FortyThieves.createGame(self, XCARDS=74) def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit != card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + return (card1.suit != card2.suit + and (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank)) class Midshipman(Indian): @@ -487,8 +485,7 @@ class NapoleonsExile(FortyThieves): DEAL = (0, 4) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank + shallHighlightMatch = Game._shallHighlightMatch_RK class DoubleRail(NapoleonsExile): @@ -600,8 +597,7 @@ class Octave(Game): return False return not self.s.waste.cards - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC def _autoDeal(self, sound=1): ncards = len(self.s.waste.cards) + sum([len(i.cards) for i in self.s.reserves]) @@ -667,8 +663,7 @@ class FortunesFavor(Game): self.s.waste.moveMove(1, stack) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -731,8 +726,7 @@ class Octagon(Game): if self.s.waste.cards: self.s.waste.moveMove(1, stack) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -850,8 +844,7 @@ class Junction(Game): self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** @@ -930,8 +923,7 @@ class TheSpark(Game): self.s.talon.dealCards() # deal first card to WasteStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -988,8 +980,7 @@ class Unlimited(Interchange): class Breakwater(Interchange): RowStack_Class = RK_RowStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK class FortyNine_RowStack(AC_RowStack): @@ -1011,8 +1002,7 @@ class FortyNine(Interchange): self.s.talon.dealRow() self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index ff0c81dd..edc1d8d6 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -118,9 +118,7 @@ class FreeCell(Game): ##self.s.talon.dealRow(rows=(r[0], r[2], r[4], r[6])) self.s.talon.dealRow(rows=r[:4]) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** @@ -539,8 +537,7 @@ class OceanTowers(TripleFreecell): self.s.talon.dealRow() self.s.talon.dealRow(rows=self.s.reserves[1:-1]) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** diff --git a/pysollib/games/glenwood.py b/pysollib/games/glenwood.py index 2564fbeb..f11c9d69 100644 --- a/pysollib/games/glenwood.py +++ b/pysollib/games/glenwood.py @@ -158,10 +158,7 @@ class Glenwood(Game): t = RANKS[self.base_rank] self.texts.info.config(text=t) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color - and ((card1.rank + 1) % 13 == card2.rank - or (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_ACW def _restoreGameHook(self, game): self.base_rank = game.loadinfo.base_rank @@ -323,10 +320,7 @@ class DoubleFives(Glenwood): return self.dealCards(sound=sound) return 0 - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit - and ((card1.rank + 1) % 13 == card2.rank - or (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SSW diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index fecb49fc..40c00933 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -174,8 +174,7 @@ class Golf(Game): return 0 return 1 - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RK def getHighlightPilesStacks(self): return () @@ -206,8 +205,7 @@ class DeadKingGolf(Golf): class RelaxedGolf(Golf): Waste_Class = StackWrapper(Golf_Waste, mod=13) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RKW # /*********************************************************************** @@ -666,8 +664,7 @@ class DiamondMine(Game): return False return True - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK # register the game diff --git a/pysollib/games/grandfathersclock.py b/pysollib/games/grandfathersclock.py index db9be246..cf4acbf8 100644 --- a/pysollib/games/grandfathersclock.py +++ b/pysollib/games/grandfathersclock.py @@ -125,8 +125,7 @@ class GrandfathersClock(Game): self.s.talon.dealRow() self.s.talon.dealRow(rows=self.s.foundations) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank + shallHighlightMatch = Game._shallHighlightMatch_RK def getHighlightPilesStacks(self): return () diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index 5e0bf563..e56d1b95 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -82,9 +82,7 @@ class Gypsy(Game): self.startDealSample() self.s.talon.dealRow() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** @@ -327,8 +325,7 @@ class Steve(Carlton): Hint_Class = Spider_Hint RowStack_Class = Spider_SS_RowStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK def getQuickPlayScore(self, ncards, from_stack, to_stack): if to_stack.cards: @@ -389,9 +386,7 @@ class Blockade(Gypsy): self.s.talon.moveMove(1, stack) self.leaveState(old_state) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - abs(card1.rank-card2.rank) == 1) + shallHighlightMatch = Game._shallHighlightMatch_SS class PhantomBlockade(Gypsy): @@ -709,8 +704,7 @@ class Eclipse(Gypsy): self.startDealSample() self.s.talon.dealRow() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1) + shallHighlightMatch = Game._shallHighlightMatch_SS # register the game diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index 37ed6028..a859eece 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -92,9 +92,7 @@ class DoubleKlondike(Game): self.s.talon.dealRow() self.s.talon.dealCards() # deal first card to WasteStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** @@ -190,8 +188,7 @@ class LadyJane(DoubleKlondike): DoubleKlondike.createGame(self, rows=10, max_rounds=2, num_deal=3) def startGame(self): DoubleKlondike.startGame(self, flip=1) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK def getQuickPlayScore(self, ncards, from_stack, to_stack): if to_stack.cards: return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 @@ -205,8 +202,7 @@ class Inquisitor(DoubleKlondike): DoubleKlondike.createGame(self, rows=10, max_rounds=3, num_deal=3) def startGame(self): DoubleKlondike.startGame(self, flip=1) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -220,8 +216,7 @@ class Arabella(DoubleKlondike): DoubleKlondike.createGame(self, rows=13, max_rounds=1, playcards=24) def startGame(self): DoubleKlondike.startGame(self, flip=1) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK def getQuickPlayScore(self, ncards, from_stack, to_stack): if to_stack.cards: return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 @@ -276,8 +271,7 @@ class Delivery(BigDeal): dx = self.app.images.CARDW/10 BigDeal.createGame(self, rows=12, max_rounds=1, XOFFSET=dx) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS def startGame(self): for i in range(2): diff --git a/pysollib/games/headsandtails.py b/pysollib/games/headsandtails.py index cae00cde..8829c075 100644 --- a/pysollib/games/headsandtails.py +++ b/pysollib/games/headsandtails.py @@ -129,8 +129,7 @@ class HeadsAndTails(Game): #stack.flipMove() self.leaveState(old_state) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank - card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # register the game diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index 5e1227b8..e67bb150 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -122,9 +122,7 @@ class DerKatzenschwanz(Game): i = i + 1 self.s.talon.dealRow(rows=[self.s.rows[i]], frames=4) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_AC # must look at cards def _getClosestStack(self, cx, cy, stacks, dragstack): diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 875520bc..16c94b74 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -86,9 +86,7 @@ class Klondike(Game): if self.s.waste: self.s.talon.dealCards() # deal first card to WasteStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** @@ -150,8 +148,9 @@ class ThumbAndPouch(Klondike): Klondike.createGame(self, max_rounds=1) def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit != card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + return (card1.suit != card2.suit + and (card1.rank + 1 == card2.rank + or card2.rank + 1 == card1.rank)) # /*********************************************************************** @@ -172,9 +171,7 @@ class Whitehead(Klondike): def startGame(self): Klondike.startGame(self, flip=1) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -537,8 +534,7 @@ class Brigade(Raglan): self.s.talon.dealRow(rows=self.s.reserves) self.s.talon.dealRow(rows=self.s.foundations) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -619,10 +615,7 @@ class Jane(Klondike): s.cap.update(cap.__dict__) self.saveinfo.stack_caps.append((s.id, cap)) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - ((card1.rank + 1) % 13 == card2.rank or - (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SSW def _autoDeal(self, sound=1): return 0 @@ -817,8 +810,7 @@ class ThirtySix(Klondike): break self.s.talon.dealCards() # deal first card to WasteStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -869,8 +861,7 @@ class Q_C_(Klondike): self.s.waste.moveMove(1, stack) self.fillAll() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -1030,8 +1021,7 @@ class BigForty(Klondike): self.s.talon.dealRow() self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS class AliBaba(BigForty): @@ -1143,8 +1133,7 @@ class LuckyThirteen(Klondike): self.startDealSample() self.s.talon.dealRow() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS class LuckyPiles(LuckyThirteen): diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py index 6f35d3be..39a468c2 100644 --- a/pysollib/games/montana.py +++ b/pysollib/games/montana.py @@ -222,9 +222,7 @@ class Montana(Game): def getAutoStacks(self, event=None): return (self.sg.dropstacks, (), self.sg.dropstacks) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS def getQuickPlayScore(self, ncards, from_stack, to_stack): if from_stack.cards: diff --git a/pysollib/games/napoleon.py b/pysollib/games/napoleon.py index bd921e5c..efcc59de 100644 --- a/pysollib/games/napoleon.py +++ b/pysollib/games/napoleon.py @@ -164,9 +164,7 @@ class DerKleineNapoleon(Game): self.s.talon.dealRow(rows=self.s.rows[8:]) self.s.talon.dealBaseCards(ncards=4) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SSW # # game extras diff --git a/pysollib/games/needle.py b/pysollib/games/needle.py index be541857..71f5129b 100644 --- a/pysollib/games/needle.py +++ b/pysollib/games/needle.py @@ -94,8 +94,7 @@ class Needle(Game): self.s.talon.dealRow(rows=self.s.rows[:i]) self.s.talon.dealRow(rows=self.s.rows[-i:]) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC def getQuickPlayScore(self, ncards, from_stack, to_stack): if to_stack in self.s.reserves: diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index 393fa323..cb00e699 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -33,7 +33,7 @@ __all__ = [] # imports -import sys +import sys, time # PySol imports from pysollib.gamedb import registerGame, GameInfo, GI @@ -103,7 +103,7 @@ class Numerica(Game): # game layout # - def createGame(self, rows=4, reserve=False): + def createGame(self, rows=4, reserve=False, max_rounds=1, waste_max_cards=1): # create layout l, s = Layout(self), self.s decks = self.gameinfo.decks @@ -131,13 +131,15 @@ class Numerica(Game): x = x + l.XS self.setRegion(s.rows, (x0-l.XS/2, y-l.CH/2, 999999, 999999)) x, y = l.XM, l.YM+l.YS+l.YS/2*int(reserve) - s.talon = WasteTalonStack(x, y, self, max_rounds=1) - if reserve: + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds) + if reserve or waste_max_cards > 1: l.createText(s.talon, 'ne') else: l.createText(s.talon, 'n') y = y + l.YS - s.waste = WasteStack(x, y, self, max_cards=1) + s.waste = WasteStack(x, y, self, max_cards=waste_max_cards) + if waste_max_cards > 1: + l.createText(s.waste, 'ne') if reserve: s.reserves.append(self.ReserveStack_Class(l.XM, l.YM, self)) @@ -153,9 +155,7 @@ class Numerica(Game): self.startDealSample() self.s.talon.dealCards() # deal first card to WasteStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS def getHighlightPilesStacks(self): return () @@ -659,6 +659,62 @@ class Strategerie(Game): self.s.talon.fillStack() +# /*********************************************************************** +# // Assembly +# // Anno Domini +# ************************************************************************/ + +class Assembly(Numerica): + Hint_Class = DefaultHint + + Foundation_Class = StackWrapper(RK_FoundationStack, suit=ANY_SUIT) + RowStack_Class = StackWrapper(RK_RowStack, max_move=1) + + def createGame(self): + Numerica.createGame(self, waste_max_cards=UNLIMITED_CARDS) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + shallHighlightMatch = Game._shallHighlightMatch_RK + + +class AnnoDomini_Hint(DefaultHint): + def step030(self, foundations, rows, dropstacks): + pass + + +class AnnoDomini(Numerica): + Hint_Class = AnnoDomini_Hint + + Foundation_Class = StackWrapper(SS_FoundationStack, suit=ANY_SUIT, mod=13) + RowStack_Class = AC_RowStack + + def createGame(self): + Numerica.createGame(self, max_rounds=3, waste_max_cards=UNLIMITED_CARDS) + year = str(time.localtime()[0]) + i = 0 + for s in self.s.foundations: + # setup base_rank & base_suit + s.cap.suit = i + s.cap.base_suit = i + d = int(year[i]) + if d == 0: + d = JACK + s.cap.base_rank = d + i += 1 + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + shallHighlightMatch = Game._shallHighlightMatch_AC + + + # register the game registerGame(GameInfo(257, Numerica, "Numerica", @@ -689,4 +745,8 @@ registerGame(GameInfo(558, Numerica2Decks, "Numerica (2 decks)", GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(589, LastChance, "Last Chance", GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(599, Assembly, "Assembly", + GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(600, AnnoDomini, "Anno Domini", + GI.GT_NUMERICA, 1, 2, GI.SL_BALANCED)) diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index 4a079ead..636eef91 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -184,10 +184,7 @@ class Foursome(Game): self.leaveState(old_state) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - ((card1.rank + 1) % 13 == card2.rank or - (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_ACW class Quartets(Foursome): diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index 68908e76..ba7ee49e 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -337,7 +337,6 @@ class Thirteen(Pyramid): class Thirteens(Pyramid): - def createGame(self): # create layout l, s = Layout(self), self.s @@ -376,6 +375,225 @@ class Thirteens(Pyramid): self.s.talon.moveMove(1, stack) self.leaveState(old_state) +# /*********************************************************************** +# // Elevens +# // Suit Elevens +# ************************************************************************/ + +class Elevens_RowStack(Giza_Reserve): + ACCEPTED_SUM = 9 + + def acceptsCards(self, from_stack, cards): + #if self.basicIsBlocked(): + # return 0 + if from_stack is self or not self.cards or len(cards) != 1: + return False + c = self.cards[-1] + return (c.face_up and cards[0].face_up + and cards[0].rank + c.rank == self.ACCEPTED_SUM) + + def clickHandler(self, event): + return OpenStack.clickHandler(self, event) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + if to_stack in self.game.s.rows: + self._dropPairMove(ncards, to_stack, frames=-1, shadow=shadow) + else: + self.game.moveMove(ncards, self, to_stack, + frames=frames, shadow=shadow) + self.fillStack() + + +class Elevens_Reserve(ReserveStack): + ACCEPTED_CARDS = (JACK, QUEEN, KING) + + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return False + c = cards[0] + if not c.rank in self.ACCEPTED_CARDS: + return False + for s in self.game.s.reserves: + if s.cards and s.cards[0].rank == c.rank: + return False + return True + + +class Elevens(Pyramid): + + RowStack_Class = Elevens_RowStack + Reserve_Class = Elevens_Reserve + + def createGame(self, rows=3, cols=3, reserves=3, texts=False): + + l, s = Layout(self), self.s + + self.setSize(l.XM+(cols+2)*l.XS, l.YM+(rows+1.5)*l.YS) + + x, y = self.width-l.XS, l.YM + s.talon = TalonStack(x, y, self) + l.createText(s.talon, 's') + x, y = self.width-l.XS, self.height-l.YS + s.foundations.append(AbstractFoundationStack(x, y, self, + suit=ANY_SUIT, max_accept=0, + max_move=0, max_cards=52)) + y = l.YM + for i in range(rows): + x = l.XM + for j in range(cols): + s.rows.append(self.RowStack_Class(x, y, self, max_accept=1)) + x += l.XS + y += l.YS + x, y = l.XM, self.height-l.YS + for i in range(reserves): + stack = self.Reserve_Class(x, y, self) + s.reserves.append(stack) + stack.CARD_XOFFSET = l.XOFFSET # for fifteens + x += l.XS + + if texts: + stack = s.reserves[0] + tx, ty, ta, tf = l.getTextAttr(stack, "n") + font = self.app.getFont("canvas_default") + stack.texts.misc = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + + def fillStack(self, stack): + old_state = self.enterState(self.S_FILL) + if stack in self.s.rows: + if not stack.cards and self.s.talon.cards: + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + reserves_ncards = 0 + for s in self.s.reserves: + if s.cards: + reserves_ncards += 1 + if reserves_ncards == len(self.s.reserves): + if not self.demo: + self.playSample("droppair", priority=200) + for s in self.s.reserves: + s.moveMove(1, self.s.foundations[0], frames=4) + self.leaveState(old_state) + + +class ElevensToo(Elevens): + + def fillStack(self, stack): + old_state = self.enterState(self.S_FILL) + reserves_ncards = 0 + for s in self.s.reserves: + if s.cards: + reserves_ncards += 1 + if reserves_ncards == 0: + for r in self.s.rows: + if not r.cards and self.s.talon.cards: + self.s.talon.flipMove() + self.s.talon.moveMove(1, r) + elif reserves_ncards == len(self.s.reserves): + if not self.demo: + self.playSample("droppair", priority=200) + for s in self.s.reserves: + s.moveMove(1, self.s.foundations[0], frames=4) + self.fillStack(stack) + self.leaveState(old_state) + + +class SuitElevens_RowStack(Elevens_RowStack): + def acceptsCards(self, from_stack, cards): + if not Elevens_RowStack.acceptsCards(self, from_stack, cards): + return False + return cards[0].suit == self.cards[0].suit + +class SuitElevens_Reserve(Elevens_Reserve): + def acceptsCards(self, from_stack, cards): + if not Elevens_Reserve.acceptsCards(self, from_stack, cards): + return False + for r in self.game.s.reserves: + if r.cards and r.cards[0].suit != cards[0].suit: + return False + return True + +class SuitElevens(Elevens): + RowStack_Class = SuitElevens_RowStack + Reserve_Class = SuitElevens_Reserve + def createGame(self): + Elevens.createGame(self, rows=3, cols=5) + + +# /*********************************************************************** +# // Fifteens +# ************************************************************************/ + +class Fifteens_RowStack(Elevens_RowStack): + ACCEPTED_SUM = 13 + def acceptsCards(self, from_stack, cards): + if not Elevens_RowStack.acceptsCards(self, from_stack, cards): + return False + return cards[0].rank < 9 and self.cards[0] < 9 + + +class Fifteens_Reserve(ReserveStack): + def updateText(self): + if self.game.preview > 1 or self.texts.misc is None: + return + t = '' + if self.cards: + ranks = [c.rank for c in self.cards] + for r in (9, JACK, QUEEN, KING): + if r in ranks: + break + else: + n = sum([i+1 for i in ranks]) + t = str(n) + self.texts.misc.config(text=t) + + +class Fifteens(Elevens): + Hint_Class = None + + RowStack_Class = Fifteens_RowStack + Reserve_Class = StackWrapper(Fifteens_Reserve, max_cards=UNLIMITED_CARDS) + + def createGame(self): + Elevens.createGame(self, rows=4, cols=4, reserves=1, texts=True) + + def _dropReserve(self): + reserve = self.s.reserves[0] + if not self.demo: + self.playSample("droppair", priority=200) + while reserve.cards: + reserve.moveMove(1, self.s.foundations[0], frames=4) + self.fillStack() + + def fillStack(self, stack=None): + old_state = self.enterState(self.S_FILL) + reserve = self.s.reserves[0] + if len(reserve.cards) == 0: + for r in self.s.rows: + if not r.cards and self.s.talon.cards: + self.s.talon.flipMove() + self.s.talon.moveMove(1, r) + else: + reserve_ranks = [c.rank for c in reserve.cards] + reserve_ranks.sort() + if (9 in reserve_ranks or JACK in reserve_ranks + or QUEEN in reserve_ranks or KING in reserve_ranks): + if reserve_ranks == [9, JACK, QUEEN, KING]: + self._dropReserve() + else: + reserve_sum = sum([c.rank+1 for c in reserve.cards]) + if reserve_sum == 15: + self._dropReserve() + self.leaveState(old_state) + # register the game @@ -389,6 +607,14 @@ registerGame(GameInfo(592, Giza, "Giza", GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(593, Thirteens, "Thirteens", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_LUCK)) +registerGame(GameInfo(594, Elevens, "Elevens", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_LUCK)) +registerGame(GameInfo(595, ElevensToo, "Elevens Too", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_LUCK)) +registerGame(GameInfo(596, SuitElevens, "Suit Elevens", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_LUCK)) +registerGame(GameInfo(597, Fifteens, "Fifteens", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 728ebb28..7312d08e 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -582,8 +582,7 @@ class ThreePirates(Game): self.s.talon.dealRow() self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 1afc39a6..db3f23c4 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -149,9 +149,7 @@ class RelaxedSpider(Game): self.startDealSample() self.s.talon.dealRow() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return ((card1.rank + 1) % stack1.cap.mod == card2.rank or - (card2.rank + 1) % stack1.cap.mod == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RK def getQuickPlayScore(self, ncards, from_stack, to_stack): if to_stack.cards: @@ -226,6 +224,8 @@ class GroundForADivorce(RelaxedSpider): self.startDealSample() self.s.talon.dealRow() + shallHighlightMatch = Game._shallHighlightMatch_RKW + # /*********************************************************************** # // Grandmother's Game @@ -336,8 +336,7 @@ class Scorpion(RelaxedSpider): self.startDealSample() self.s.talon.dealRow() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS def getHighlightPilesStacks(self): return () @@ -350,8 +349,7 @@ class ScorpionTail(Scorpion): Foundation_Class = Spider_AC_Foundation RowStack_Class = StackWrapper(ScorpionTail_RowStack, base_rank=KING) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC class DoubleScorpion(Scorpion): @@ -613,8 +611,7 @@ class Trillium(Game): self.startDealSample() self.s.talon.dealRow() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC def isGameWon(self): for s in self.s.rows: @@ -641,9 +638,7 @@ class WakeRobin(Trillium): return False return True - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 - + shallHighlightMatch = Game._shallHighlightMatch_RK class TripleWakeRobin(WakeRobin): @@ -703,8 +698,7 @@ class Chelicera(Game): def getHighlightPilesStacks(self): return () - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS def isGameWon(self): for s in self.s.rows: @@ -859,10 +853,7 @@ class Applegate(Game): def getHighlightPilesStacks(self): return () - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - ((card1.rank + 1) % stack1.cap.mod == card2.rank or - (card2.rank + 1) % stack1.cap.mod == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_RKW # /*********************************************************************** @@ -903,6 +894,7 @@ class GroundForADivorce3Decks(BigSpider): RowStack_Class = StackWrapper(Spider_RowStack, mod=13) def canDealCards(self): return Game.canDealCards(self) + shallHighlightMatch = Game._shallHighlightMatch_RKW class Spider4Decks(BigSpider): @@ -942,6 +934,7 @@ class GroundForADivorce4Decks(Spider4Decks): Spider4Decks.createGame(self, rows=12) def canDealCards(self): return Game.canDealCards(self) + shallHighlightMatch = Game._shallHighlightMatch_RKW # /*********************************************************************** diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index b1c2930e..b3363a1c 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -491,12 +491,13 @@ class Matrimony(Game): # /*********************************************************************** +# // Picture Patience # // Patriarchs # ************************************************************************/ -class Patriarchs(Game): +class PicturePatience(Game): - def createGame(self, max_rounds=2): + def createGame(self, max_rounds=1): l, s = Layout(self), self.s self.setSize(3*l.XM+5*l.XS, l.YM+4*l.YS) @@ -528,14 +529,7 @@ class Patriarchs(Game): l.defaultStackGroups() - def _shuffleHook(self, cards): - return self._shuffleHookMoveToTop(cards, - lambda c: (c.rank in (ACE, KING) and c.deck == 0, - (c.rank, c.suit))) - - def startGame(self): - self.s.talon.dealRow(rows=self.s.foundations, frames=0) self.startDealSample() self.s.talon.dealRow() self.s.talon.dealCards() @@ -549,6 +543,22 @@ class Patriarchs(Game): self.s.waste.moveMove(1, stack) +class Patriarchs(PicturePatience): + def createGame(self): + PicturePatience.createGame(self, max_rounds=2) + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, KING) and c.deck == 0, + (c.rank, c.suit))) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + # /*********************************************************************** # // Simplicity # ************************************************************************/ @@ -602,10 +612,7 @@ class Simplicity(Game): self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - ((card1.rank + 1) % 13 == card2.rank or - (card2.rank + 1) % 13 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_ACW def _restoreGameHook(self, game): @@ -727,8 +734,7 @@ class CornerSuite(Game): self.startDealSample() self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -785,9 +791,7 @@ class Marshal(Game): self.moveMove(1, self.s.talon, stack) self.leaveState(old_state) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (abs(card1.rank-card2.rank) == 1)) + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -855,9 +859,7 @@ class RoyalAids(Game): self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - (abs(card1.rank-card2.rank) == 1)) + shallHighlightMatch = Game._shallHighlightMatch_AC # register the game @@ -892,3 +894,5 @@ registerGame(GameInfo(559, Marshal, "Marshal", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(565, RoyalAids, "Royal Aids", GI.GT_2DECK_TYPE, 2, UNLIMITED_REDEALS, GI.SL_BALANCED)) +registerGame(GameInfo(598, PicturePatience, "Picture Patience", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/tournament.py b/pysollib/games/tournament.py index 2e060e7c..dd22babd 100644 --- a/pysollib/games/tournament.py +++ b/pysollib/games/tournament.py @@ -229,8 +229,7 @@ class KingsdownEights(Game): self.s.talon.dealRow() self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_AC # register the game diff --git a/pysollib/games/unionsquare.py b/pysollib/games/unionsquare.py index 3cf389d4..4b912a66 100644 --- a/pysollib/games/unionsquare.py +++ b/pysollib/games/unionsquare.py @@ -138,9 +138,7 @@ class UnionSquare(Game): self.s.talon.dealRow() self.s.talon.dealCards() # deal first card to WasteStack - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS def getHighlightPilesStacks(self): return () diff --git a/pysollib/games/wavemotion.py b/pysollib/games/wavemotion.py index 72ba5442..75e82b1a 100644 --- a/pysollib/games/wavemotion.py +++ b/pysollib/games/wavemotion.py @@ -91,8 +91,7 @@ class WaveMotion(Game): return False return True - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # register the game diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py index 1a49963a..fb8025d5 100644 --- a/pysollib/games/windmill.py +++ b/pysollib/games/windmill.py @@ -143,8 +143,7 @@ class Windmill(Game): elif stack in self.s.rows and self.s.waste.cards: self.s.waste.moveMove(1, stack) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RK def getHighlightPilesStacks(self): return () @@ -357,9 +356,7 @@ class Czarina(Corners): def _shuffleHook(self, cards): return cards - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return ((card1.rank + 1) % 13 == card2.rank or - (card2.rank + 1) % 13 == card1.rank) + shallHighlightMatch = Game._shallHighlightMatch_RKW def _restoreGameHook(self, game): self.base_card = self.cards[game.loadinfo.base_card_id] diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index b37dafd8..41417bc8 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -115,9 +115,7 @@ class Yukon(Game): def getHighlightPilesStacks(self): return () - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.color != card2.color and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_AC # /*********************************************************************** @@ -127,9 +125,7 @@ class Yukon(Game): class RussianSolitaire(Yukon): RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -367,9 +363,7 @@ class DoubleYukon(Yukon): class DoubleRussianSolitaire(DoubleYukon): RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -392,9 +386,7 @@ class TripleYukon(Yukon): class TripleRussianSolitaire(TripleYukon): RowStack_Class = StackWrapper(Yukon_SS_RowStack, base_rank=KING) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -443,9 +435,7 @@ class TenAcross(Yukon): self.s.talon.dealRow() self.s.talon.dealRow(rows=self.s.reserves) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return (card1.suit == card2.suit and - (card1.rank + 1 == card2.rank or card2.rank + 1 == card1.rank)) + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -538,8 +528,7 @@ class Geoffrey(Yukon): self.s.talon.dealRow() self.s.talon.dealRow(rows=self.s.rows[:4]) - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -562,8 +551,7 @@ class Queensland(Yukon): self.s.talon.dealRow() self.s.talon.dealRowAvail() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** @@ -593,8 +581,7 @@ class OutbackPatience(Yukon): self.s.talon.dealRow() self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # /*********************************************************************** diff --git a/pysollib/games/zodiac.py b/pysollib/games/zodiac.py index b6cea283..c32ffe08 100644 --- a/pysollib/games/zodiac.py +++ b/pysollib/games/zodiac.py @@ -117,8 +117,7 @@ class Zodiac(Game): self.s.talon.dealCards() - def shallHighlightMatch(self, stack1, card1, stack2, card2): - return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 + shallHighlightMatch = Game._shallHighlightMatch_SS # register the game diff --git a/pysollib/help.py b/pysollib/help.py index 45ede3ea..c42f6403 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -169,3 +169,9 @@ def helpHTML(app, document, dir_, top=None): help_html_viewer = viewer return viewer +def destroy_help(): + try: + help_html_viewer.destroy() + except: + pass + diff --git a/pysollib/pysoltk.py b/pysollib/pysoltk.py index 28b38121..d94fca66 100644 --- a/pysollib/pysoltk.py +++ b/pysollib/pysoltk.py @@ -32,6 +32,7 @@ from tk.soundoptionsdialog import * from tk.timeoutsdialog import * from tk.colorsdialog import * from tk.fontsdialog import * +from tk.findcarddialog import * from tk.gameinfodialog import * from tk.toolbar import * from tk.statusbar import * diff --git a/pysollib/stack.py b/pysollib/stack.py index 10d386aa..8c03ad71 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -706,6 +706,14 @@ class Stack: iy = (iy + 1) % ly return (x, y) + def getOffsetFor(self, card): + model, view = self, self + if view.can_hide_cards: + return 0, 0 + lx, ly = len(view.CARD_XOFFSET), len(view.CARD_YOFFSET) + i = list(model.cards).index(card) + return view.CARD_XOFFSET[i%lx], view.CARD_YOFFSET[i%ly] + # Fully update the view of a stack - updates # hiding, card positions and stacking order. # Avoid calling this as it is rather slow. @@ -895,7 +903,7 @@ class Stack: # def __defaultClickEventHandler(self, event, handler, start_drag=0, cancel_drag=1): - self.game.event_handled = True # for Game.clickHandler + self.game.event_handled = True # for Game.undoHandler if self.game.demo: self.game.stopDemo(event) self.game.interruptSleep() diff --git a/pysollib/tk/findcarddialog.py b/pysollib/tk/findcarddialog.py new file mode 100644 index 00000000..3bd9ac14 --- /dev/null +++ b/pysollib/tk/findcarddialog.py @@ -0,0 +1,203 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['create_find_card_dialog', + 'connect_game_find_card_dialog', + 'destroy_find_card_dialog', + ] + +# imports +import os +import Tkinter +import traceback + +# PySol imports + +# Toolkit imports +from tkutil import after, after_cancel +from tkutil import bind, unbind_destroy, makeImage +from tkcanvas import MfxCanvas, MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class FindCardDialog(Tkinter.Toplevel): + SUIT_IMAGES = {} # key: (suit, color) + RANK_IMAGES = {} # key: (rank, color) + + def __init__(self, parent, game, dir): + Tkinter.Toplevel.__init__(self) + self.title(_('Find card')) + self.wm_resizable(0, 0) + # + self.images_dir = dir + self.label_width, self.label_height = 38, 34 + self.canvas = MfxCanvas(self, bg='white') + self.canvas.pack(expand=True, fill='both') + # + self.groups = [] + self.highlight_items = None + self.connectGame(game) + # + bind(self, "WM_DELETE_WINDOW", self.destroy) + bind(self, "", self.destroy) + # + ##self.normal_timeout = 400 # in milliseconds + self.normal_timeout = int(1000*game.app.opt.highlight_samerank_sleep) + self.hidden_timeout = 200 + self.timer = None + + def createCardLabel(self, suit, rank, x0, y0): + dx, dy = self.label_width, self.label_height + dir = self.images_dir + canvas = self.canvas + group = MfxCanvasGroup(canvas) + s = 'cshd'[suit] + if suit >= 2: c = 'red' + else: c = 'black' + rect_width = 4 + x1, y1 = x0+dx-rect_width, y0+dy-rect_width + rect = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, + width=rect_width, + fill='white', outline='white') + rect.addtag(group) + # + fn = os.path.join(dir, c+'-'+str(rank)+'.gif') + rim = FindCardDialog.RANK_IMAGES.get((rank, c)) + if not rim: + rim = makeImage(file=fn) + FindCardDialog.RANK_IMAGES[(rank, c)] = rim + fn = os.path.join(dir, s+'.gif') + sim = FindCardDialog.SUIT_IMAGES.get((suit, c)) + if not sim: + sim = makeImage(file=fn) + FindCardDialog.SUIT_IMAGES[(suit, c)] = sim + # + x0 = x0+(dx-rim.width()-sim.width())/2 + x0, y0 = x0-1, y0-2 + x, y = x0, y0+(dy-rim.height())/2 + im = MfxCanvasImage(canvas, x, y, image=rim, anchor='nw') + im.addtag(group) + x, y = x0+rim.width(), y0+(dy-sim.height())/2 + im = MfxCanvasImage(canvas, x, y, image=sim, anchor='nw') + im.addtag(group) + bind(group, '', + lambda e, suit=suit, rank=rank, rect=rect: + self.enterEvent(suit, rank, rect)) + bind(group, '', + lambda e, suit=suit, rank=rank, rect=rect: + self.leaveEvent(suit, rank, rect)) + self.groups.append(group) + + def connectGame(self, game): + self.game = game + suits = game.gameinfo.suits + ranks = game.gameinfo.ranks + dx, dy = self.label_width, self.label_height + uniq_suits = [] + i = 0 + for suit in suits: + if suit in uniq_suits: + continue + uniq_suits.append(suit) + j = 0 + for rank in ranks: + x, y = dx*j+2, dy*i+2 + self.createCardLabel(suit=suit, rank=rank, x0=x, y0=y) + j += 1 + i += 1 + w, h = dx*j, dy*i + self.canvas.config(width=w, height=h) + + def enterEvent(self, suit, rank, rect): + #print 'enterEvent', suit, rank + self.highlight_items = self.game.highlightCard(suit, rank) + if not self.highlight_items: + self.highlight_items = [] + rect.config(outline='red') + if self.highlight_items: + self.timer = after(self, self.normal_timeout, self.timeoutEvent) + + def leaveEvent(self, suit, rank, rect): + #print 'leaveEvent', suit, rank + if self.highlight_items: + for i in self.highlight_items: + i.delete() + rect.config(outline='white') + #self.game.canvas.update_idletasks() + #self.canvas.update_idletasks() + if self.timer: + after_cancel(self.timer) + self.timer = None + + def timeoutEvent(self, *event): + if self.highlight_items: + state = self.highlight_items[0].cget('state') + if state in ('', 'normal'): + state = 'hidden' + self.timer = after(self, self.hidden_timeout, + self.timeoutEvent) + else: + state = 'normal' + self.timer = after(self, self.normal_timeout, + self.timeoutEvent) + for item in self.highlight_items: + item.config(state=state) + + def destroy(self, *args): + for l in self.groups: + unbind_destroy(l) + unbind_destroy(self) + if self.timer: + after_cancel(self.timer) + self.timer = None + self.wm_withdraw() + Tkinter.Toplevel.destroy(self) + + + +find_card_dialog = None + +def create_find_card_dialog(parent, game, dir): + global find_card_dialog + try: + find_card_dialog.tkraise() + except: + ##traceback.print_exc() + find_card_dialog = FindCardDialog(parent, game, dir) + +def connect_game_find_card_dialog(game): + try: + find_card_dialog.connectGame(game) + except: + pass + +def destroy_find_card_dialog(): + global find_card_dialog + try: + find_card_dialog.destroy() + except: + ##traceback.print_exc() + pass + find_card_dialog = None + diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index ea820be5..5d1bfa10 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -320,7 +320,7 @@ class PysolMenubar(PysolMenubarActions): menu.add_command(label=n_("&Demo"), command=self.mDemo, accelerator=m+"D") menu.add_command(label=n_("Demo (&all games)"), command=self.mMixedDemo) menu.add_separator() - menu.add_command(label=n_("Show descriptions od piles"), command=self.mStackDesk, accelerator="F2") + menu.add_command(label=n_("Piles description"), command=self.mStackDesk, accelerator="F2") menu = MfxMenu(self.__menubar, label=n_("&Options")) menu.add_command(label=n_("&Player options..."), command=self.mOptPlayerOptions) submenu = MfxMenu(menu, label=n_("&Automatic play")) @@ -365,6 +365,7 @@ class PysolMenubar(PysolMenubarActions): submenu.add_radiobutton(label=n_("&Slow"), variable=self.tkopt.animations, value=3, command=self.mOptAnimations) submenu.add_radiobutton(label=n_("&Very slow"), variable=self.tkopt.animations, value=4, command=self.mOptAnimations) menu.add_checkbutton(label=n_("Stick&y mouse"), variable=self.tkopt.sticky_mouse, command=self.mOptStickyMouse) + menu.add_checkbutton(label=n_("Use mouse for undo/redo"), variable=self.tkopt.mouse_undo, command=self.mOptMouseUndo) menu.add_separator() menu.add_command(label=n_("&Fonts..."), command=self.mOptFontsOptions) menu.add_command(label=n_("&Colors..."), command=self.mOptColorsOptions) @@ -408,6 +409,7 @@ class PysolMenubar(PysolMenubarActions): self._bindKey(ctrl, "q", self.mQuit) self._bindKey("", "z", self.mUndo) self._bindKey("", "BackSpace", self.mUndo) # undocumented + self._bindKey("", "KP_Enter", self.mUndo) # undocumented self._bindKey("", "r", self.mRedo) self._bindKey(ctrl, "g", self.mRestart) self._bindKey("", "space", self.mDeal) # undocumented @@ -1004,6 +1006,10 @@ class PysolMenubar(PysolMenubarActions): if self._cancelDrag(break_pause=False): return self.app.opt.sticky_mouse = self.tkopt.sticky_mouse.get() + def mOptMouseUndo(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.mouse_undo = self.tkopt.mouse_undo.get() + def mOptNegativeBottom(self, *event): if self._cancelDrag(): return n = self.tkopt.negative_bottom.get() diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index d5495e90..9fec16f4 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -39,13 +39,11 @@ __all__ = ['MfxMessageDialog', 'MfxTooltip', 'MfxScrolledCanvas', 'StackDesc', - 'create_find_card_dialog', - 'connect_game_find_card_dialog', - 'destroy_find_card_dialog', ] # imports -import os, sys, time, types, Tkinter +import os, sys, time, types +import Tkinter import traceback # PySol imports @@ -53,12 +51,11 @@ from pysollib.mfxutil import destruct, kwdefault, KwStruct from pysollib.mfxutil import win32api # Toolkit imports -from tkconst import tkversion from tkconst import EVENT_HANDLED, EVENT_PROPAGATE from tkutil import after, after_idle, after_cancel -from tkutil import bind, unbind_destroy, makeImage +from tkutil import bind, unbind_destroy from tkutil import makeToplevel, setTransient -from tkcanvas import MfxCanvas, MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle +from tkcanvas import MfxCanvas # /*********************************************************************** @@ -719,139 +716,3 @@ class StackDesc: for b in self.bindings: self.label.unbind('', b) - -# /*********************************************************************** -# // -# ************************************************************************/ - -class FindCardDialog(Tkinter.Toplevel): - SUIT_IMAGES = {} # key: (suit, color) - RANK_IMAGES = {} # key: (rank, color) - - def __init__(self, parent, game, dir, title='Find card'): - Tkinter.Toplevel.__init__(self) - self.title(title) - self.wm_resizable(0, 0) - # - self.images_dir = dir - self.label_width, self.label_height = 38, 34 - self.canvas = MfxCanvas(self, bg='white') - self.canvas.pack(expand=True, fill='both') - # - self.groups = [] - self.highlight_items = None - self.connectGame(game) - # - bind(self, "WM_DELETE_WINDOW", self.destroy) - bind(self, "", self.destroy) - - def createCardLabel(self, suit, rank, x0, y0): - dx, dy = self.label_width, self.label_height - dir = self.images_dir - canvas = self.canvas - group = MfxCanvasGroup(canvas) - s = 'cshd'[suit] - if suit >= 2: c = 'red' - else: c = 'black' - rect_width = 4 - x1, y1 = x0+dx-rect_width, y0+dy-rect_width - rect = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, - width=rect_width, - fill='white', outline='white') - rect.addtag(group) - # - fn = os.path.join(dir, c+'-'+str(rank)+'.gif') - rim = FindCardDialog.RANK_IMAGES.get((rank, c)) - if not rim: - rim = makeImage(file=fn) - FindCardDialog.RANK_IMAGES[(rank, c)] = rim - fn = os.path.join(dir, s+'.gif') - sim = FindCardDialog.SUIT_IMAGES.get((suit, c)) - if not sim: - sim = makeImage(file=fn) - FindCardDialog.SUIT_IMAGES[(suit, c)] = sim - # - x0 = x0+(dx-rim.width()-sim.width())/2 - x0, y0 = x0-1, y0-2 - x, y = x0, y0+(dy-rim.height())/2 - im = MfxCanvasImage(canvas, x, y, image=rim, anchor='nw') - im.addtag(group) - x, y = x0+rim.width(), y0+(dy-sim.height())/2 - im = MfxCanvasImage(canvas, x, y, image=sim, anchor='nw') - im.addtag(group) - bind(group, '', - lambda e, suit=suit, rank=rank, rect=rect: - self.enterEvent(suit, rank, rect)) - bind(group, '', - lambda e, suit=suit, rank=rank, rect=rect: - self.leaveEvent(suit, rank, rect)) - self.groups.append(group) - - def connectGame(self, game): - self.game = game - suits = game.gameinfo.suits - ranks = game.gameinfo.ranks - dx, dy = self.label_width, self.label_height - i = 0 - for suit in suits: - j = 0 - for rank in ranks: - x, y = dx*j+2, dy*i+2 - self.createCardLabel(suit=suit, rank=rank, x0=x, y0=y) - j += 1 - i += 1 - w, h = dx*j, dy*i - self.canvas.config(width=w, height=h) - - def enterEvent(self, suit, rank, rect): - #print 'enterEvent', suit, rank - self.last_card = (suit, rank) - self.highlight_items = self.game.highlightCard(suit, rank) - if not self.highlight_items: - self.highlight_items = [] - rect.config(outline='red') - - def leaveEvent(self, suit, rank, rect): - #print 'leaveEvent', suit, rank - if self.highlight_items: - for i in self.highlight_items: - i.delete() - rect.config(outline='white') - #self.game.canvas.update_idletasks() - #self.canvas.update_idletasks() - self.last_card = None - - def destroy(self, *args): - for l in self.groups: - unbind_destroy(l) - unbind_destroy(self) - self.wm_withdraw() - Tkinter.Toplevel.destroy(self) - - - -find_card_dialog = None - -def create_find_card_dialog(parent, game, dir): - global find_card_dialog - try: - find_card_dialog.tkraise() - except: - ##traceback.print_exc() - find_card_dialog = FindCardDialog(parent, game, dir) - -def connect_game_find_card_dialog(game): - try: - find_card_dialog.connectGame(game) - except: - pass - -def destroy_find_card_dialog(): - global find_card_dialog - try: - find_card_dialog.destroy() - except: - ##traceback.print_exc() - pass - find_card_dialog = None - From 88081dd989ec97b472b8353d5070148f3afa20b8 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Tue, 1 Aug 2006 21:14:27 +0000 Subject: [PATCH 034/266] + 6 new games * misc.improvments git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@35 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 34 +++++--- pysollib/games/bakersdozen.py | 2 - pysollib/games/beleagueredcastle.py | 11 +-- pysollib/games/bristol.py | 122 ++++++++++++++++++++++++++++ pysollib/games/canfield.py | 93 ++++++++++++++++++++- pysollib/games/capricieuse.py | 93 ++++++++++++--------- pysollib/games/curdsandwhey.py | 1 + pysollib/games/dieboesesieben.py | 2 + pysollib/games/diplomat.py | 9 +- pysollib/games/fan.py | 6 +- pysollib/games/fortythieves.py | 16 ++-- pysollib/games/freecell.py | 3 + pysollib/games/glenwood.py | 14 ++-- pysollib/games/golf.py | 2 + pysollib/games/gypsy.py | 10 +-- pysollib/games/harp.py | 13 ++- pysollib/games/klondike.py | 120 +++++++++++++++++++++------ pysollib/games/numerica.py | 6 +- pysollib/games/royalcotillion.py | 4 + pysollib/games/royaleast.py | 2 + pysollib/games/siebenbisas.py | 2 + pysollib/games/spider.py | 10 ++- pysollib/games/sthelena.py | 4 + pysollib/games/takeaway.py | 3 + pysollib/games/terrace.py | 2 + pysollib/games/unionsquare.py | 3 + pysollib/games/yukon.py | 32 ++++++++ pysollib/stack.py | 14 +++- 28 files changed, 506 insertions(+), 127 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index 027a310d..055e2054 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -190,18 +190,32 @@ class Game: print 'WARNING: invalid sum of foundations.max_cards:', \ class_name, ncards, self.gameinfo.ncards if self.s.rows: - from stack import AC_RowStack, SS_RowStack, RK_RowStack + from stack import AC_RowStack, UD_AC_RowStack, \ + SS_RowStack, UD_SS_RowStack, \ + RK_RowStack, UD_RK_RowStack, \ + Spider_AC_RowStack, Spider_SS_RowStack r = self.s.rows[0] for c, f in ( - (AC_RowStack, (self._shallHighlightMatch_AC, - self._shallHighlightMatch_ACW)), - (SS_RowStack, (self._shallHighlightMatch_SS, - self._shallHighlightMatch_SSW)), - (RK_RowStack, (self._shallHighlightMatch_RK, - self._shallHighlightMatch_RKW)),): - if isinstance(r, c) and not self.shallHighlightMatch in f: - print 'WARNING: shallHighlightMatch is not valid:', \ - class_name, r.__class__ + ((Spider_AC_RowStack, Spider_SS_RowStack), + (self._shallHighlightMatch_RK, + self._shallHighlightMatch_RKW)), + ((AC_RowStack, UD_AC_RowStack), + (self._shallHighlightMatch_AC, + self._shallHighlightMatch_ACW)), + ((SS_RowStack, UD_SS_RowStack), + (self._shallHighlightMatch_SS, + self._shallHighlightMatch_SSW)), + ((RK_RowStack, UD_RK_RowStack), + (self._shallHighlightMatch_RK, + self._shallHighlightMatch_RKW)),): + if isinstance(r, c): + if not self.shallHighlightMatch in f: + print 'WARNING: shallHighlightMatch is not valid:', \ + class_name, r.__class__ + if r.cap.mod == 13 and self.shallHighlightMatch != f[1]: + print 'WARNING: shallHighlightMatch is not valid (wrap):', \ + class_name, r.__class__ + break # optimize regions self.optimizeRegions() # create cards diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py index f8c93abb..3f8142f7 100644 --- a/pysollib/games/bakersdozen.py +++ b/pysollib/games/bakersdozen.py @@ -148,8 +148,6 @@ class BakersDozen(CastlesInSpain): class SpanishPatience(BakersDozen): Foundation_Class = AC_FoundationStack - shallHighlightMatch = Game._shallHighlightMatch_AC - # /*********************************************************************** # // Portuguese Solitaire diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 9189b08d..e846d580 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -277,6 +277,9 @@ class Bastion(Game): self.s.talon.dealRow(rows=self.s.reserves) + shallHighlightMatch = Game._shallHighlightMatch_SS + + class TenByOne(Bastion): def createGame(self): Bastion.createGame(self, reserves=1) @@ -683,11 +686,7 @@ class CastleMount(Lightweight): RowStack_Class = Spider_SS_RowStack shallHighlightMatch = Game._shallHighlightMatch_RK - - def getQuickPlayScore(self, ncards, from_stack, to_stack): - if to_stack.cards: - return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 - return 0 + getQuickPlayScore = Game._getSpiderQuickPlayScore # /*********************************************************************** @@ -713,6 +712,8 @@ class SelectiveCastle(StreetsAndAlleys, Chessboard): def updateText(self): Chessboard.updateText(self) + shallHighlightMatch = Game._shallHighlightMatch_RKW + # register the game registerGame(GameInfo(146, StreetsAndAlleys, "Streets and Alleys", diff --git a/pysollib/games/bristol.py b/pysollib/games/bristol.py index 4fcd44d5..d298f834 100644 --- a/pysollib/games/bristol.py +++ b/pysollib/games/bristol.py @@ -144,6 +144,8 @@ class Bristol(Game): self.s.talon.dealRow(rows=r) self.s.talon.dealCards() # deal first cards to Reserves + shallHighlightMatch = Game._shallHighlightMatch_RK + # /*********************************************************************** # // Belvedere @@ -376,6 +378,124 @@ class Gotham(NewYork): self.s.talon.dealRow(frames=0) NewYork.startGame(self) + shallHighlightMatch = Game._shallHighlightMatch_RKW + + +# /*********************************************************************** +# // Interment +# ************************************************************************/ + +class Interment_Hint(CautiousDefaultHint): + def computeHints(self): + CautiousDefaultHint.computeHints(self) + if self.hints: + return + if not self.game.s.talon.cards: + return + c = self.game.s.talon.cards[-1].rank + if 0 <= c <= 3: + r = self.game.s.xwastes[0] + elif 4 <= c <= 7: + r = self.game.s.xwastes[1] + else: + r = self.game.s.xwastes[2] + self.addHint(5000, 1, self.game.s.talon, r) + + +class Interment_Talon(OpenTalonStack): + rightclickHandler = OpenStack.rightclickHandler + doubleclickHandler = OpenStack.doubleclickHandler + + +class Interment_Reserve(OpenStack): + def canFlipCard(self): + return False + + +class Interment_Waste(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return False + return from_stack is self.game.s.talon + + +class Interment(Game): + Hint_Class = Interment_Hint + + def createGame(self): + # create layout + l, s = Layout(self), self.s + s.addattr(xwastes=[]) # register extra stack variable + + # set window + w, h = l.XM+11*l.XS, l.YM+6*l.YS + self.setSize(w, h) + + # create stacks + x, y, = l.XM, l.YM + s.talon = Interment_Talon(x, y, self) + l.createText(s.talon, 'ne') + x += 1.5*l.XS + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i/2)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(3): + s.xwastes.append(Interment_Waste(x, y, self, + max_cards=UNLIMITED_CARDS)) + y += l.YS + x, y = l.XM+1.5*l.XS, l.YM+l.YS + for i in range(8): + s.rows.append(SS_RowStack(x, y, self, max_move=1)) + x += l.XS + x, y = self.width-l.XS, l.YM + stack = Interment_Reserve(x, y, self) + s.reserves.append(stack) + l.createText(stack, 'nw') + y += l.YS + for i in range(5): + s.reserves.append(OpenStack(x, y, self)) + y += l.YS + + # define stack-groups + l.defaultStackGroups() + self.sg.dropstacks += s.xwastes + self.sg.openstacks += s.xwastes + self.sg.dropstacks.append(s.talon) + + + def startGame(self): + for i in range(13): + self.s.talon.dealRow(rows=[self.s.reserves[0]], flip=0, frames=0) + self.s.talon.dealRow(rows=self.s.reserves[1:], frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.fillStack() + + + def fillStack(self, stack): + if not stack.cards: + old_state = self.enterState(self.S_FILL) + if stack in self.s.rows: + if self.s.talon.cards: + self.s.talon.moveMove(1, stack) + if stack in self.s.reserves[1:]: + from_stack = self.s.reserves[0] + if from_stack.cards: + from_stack.flipMove() + from_stack.moveMove(1, stack) + self.leaveState(old_state) + + + shallHighlightMatch = Game._shallHighlightMatch_SS + + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + if to_stack in self.s.xwastes: + return 0 + return 1+Game.getQuickPlayScore(self, ncards, from_stack, to_stack) + + # register the game registerGame(GameInfo(42, Bristol, "Bristol", @@ -390,4 +510,6 @@ registerGame(GameInfo(468, Spike, "Spike", GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(519, Gotham, "Gotham", GI.GT_FAN_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(604, Interment, "Interment", + GI.GT_FAN_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 9dfea82e..9be4bf61 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -255,6 +255,7 @@ class Rainbow(Canfield): def createGame(self): Canfield.createGame(self, max_rounds=1, num_deal=1) + shallHighlightMatch = Game._shallHighlightMatch_RKW # /*********************************************************************** # // Storehouse (aka Straight Up) @@ -318,6 +319,8 @@ class AmericanToad(Canfield): def createGame(self): Canfield.createGame(self, rows=8, max_rounds=2, num_deal=1) + shallHighlightMatch = Game._shallHighlightMatch_SSW + # /*********************************************************************** # // Variegated Canfield @@ -397,6 +400,8 @@ class EagleWing(Canfield): # define stack-groups l.defaultStackGroups() + shallHighlightMatch = Game._shallHighlightMatch_SSW + # /*********************************************************************** # // Gate @@ -720,6 +725,89 @@ class CanfieldRush(Canfield): Canfield.createGame(self, max_rounds=3) +# /*********************************************************************** +# // Skippy +# ************************************************************************/ + +class Skippy(Canfield): + FILL_EMPTY_ROWS = 0 + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + playcards = 8 + w0 = l.XS+playcards*l.XOFFSET + w = l.XM+l.XS/2+max(10*l.XS, l.XS+4*w0) + h = l.YM+5*l.YS+l.TEXT_HEIGHT + self.setSize(w, h) + + # extra settings + self.base_card = None + + # create stacks + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 's') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 's') + x = self.width - 8*l.XS + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, + suit=i%4, mod=13)) + x += l.XS + tx, ty, ta, tf = l.getTextAttr(None, "ss") + tx, ty = x-l.XS+tx, y+ty + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + x, y = l.XM, l.YM+l.YS+l.TEXT_HEIGHT + for i in range(4): + s.reserves.append(ReserveStack(x, y, self)) + y += l.YS + y = l.YM+l.YS+l.TEXT_HEIGHT + for i in range(4): + x = l.XM+l.XS+l.XS/2 + for j in range(4): + stack = RK_RowStack(x, y, self, max_move=1, mod=13) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + x += w0 + y += l.YS + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self): + self.base_card = None + self.updateText() + # deal base_card to Foundations, update foundations cap.base_rank + self.base_card = self.s.talon.getCard() + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + n = self.base_card.suit + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, self.s.foundations[n], frames=0) + self.updateText() + # update rows cap.base_rank + row_base_rank = (self.base_card.rank-1)%13 + for s in self.s.rows: + s.cap.base_rank = row_base_rank + # + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + shallHighlightMatch = Game._shallHighlightMatch_RKW + + + # register the game registerGame(GameInfo(105, Canfield, "Canfield", # was: 262 GI.GT_CANFIELD | GI.GT_CONTRIB, 1, -1, GI.SL_BALANCED)) @@ -764,5 +852,8 @@ registerGame(GameInfo(494, Mystique, "Mystique", registerGame(GameInfo(521, CanfieldRush, "Canfield Rush", GI.GT_CANFIELD, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(527, Doorway, "Doorway", - GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) + GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED, + altnames=('Solstice',) )) +registerGame(GameInfo(605, Skippy, "Skippy", + GI.GT_FAN_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py index c36f43bd..62d6c96c 100644 --- a/pysollib/games/capricieuse.py +++ b/pysollib/games/capricieuse.py @@ -22,7 +22,6 @@ __all__ = [] # imports -import sys # PySol imports from pysollib.gamedb import registerGame, GameInfo, GI @@ -33,48 +32,16 @@ from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from gypsy import DieRussische_Foundation + # /*********************************************************************** # // Capricieuse # ************************************************************************/ -class Capricieuse_Talon(TalonStack): - - def canDealCards(self): - if self.round == self.max_rounds: - return False - return not self.game.isGameWon() - - def dealCards(self, sound=0): - # move all cards to the Talon, shuffle and redeal - lr = len(self.game.s.rows) - num_cards = 0 - assert len(self.cards) == 0 - for r in self.game.s.rows[::-1]: - for i in range(len(r.cards)): - num_cards = num_cards + 1 - self.game.moveMove(1, r, self, frames=0) - assert len(self.cards) == num_cards - if num_cards == 0: # game already finished - return 0 - # shuffle - self.game.shuffleStackMove(self) - # redeal - self.game.nextRoundMove(self) - self.game.startDealSample() - for i in range(lr): - k = min(lr, len(self.cards)) - for j in range(k): - self.game.moveMove(1, self, self.game.s.rows[j], frames=4) - # done - self.game.stopSamples() - assert len(self.cards) == 0 - return num_cards - - class Capricieuse(Game): - Talon_Class = StackWrapper(Capricieuse_Talon, max_rounds=3) + Talon_Class = StackWrapper(RedealTalonStack, max_rounds=3) RowStack_Class = UD_SS_RowStack # @@ -87,7 +54,7 @@ class Capricieuse(Game): l, s = Layout(self), self.s # set window - self.setSize(l.XM+12*l.XS, l.YM+l.YS+20*l.YOFFSET) + self.setSize(l.XM+12*l.XS, l.YM+2*l.YS+15*l.YOFFSET) # create stacks x, y, = l.XM+2*l.XS, l.YM @@ -120,7 +87,12 @@ class Capricieuse(Game): self.s.talon.dealRow(self.s.foundations) def _shuffleHook(self, cards): - return self._shuffleHookMoveToBottom(cards, lambda c: (c.deck == 0 and c.rank in (0, 12), (c.rank, c.suit)), 8) + return self._shuffleHookMoveToBottom(cards, + lambda c: (c.deck == 0 and c.rank in (0, 12), (c.rank, c.suit)), 8) + + def redealCards(self): + while self.s.talon.cards: + self.s.talon.dealRowAvail(frames=4) shallHighlightMatch = Game._shallHighlightMatch_SS @@ -136,9 +108,54 @@ class Nationale(Capricieuse): shallHighlightMatch = Game._shallHighlightMatch_SSW +# /*********************************************************************** +# // Strata +# ************************************************************************/ + +class Strata(Game): + + def createGame(self, **layout): + + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+9*l.XS, l.YM+2*l.YS+12*l.YOFFSET) + + # create stacks + x, y, = l.XM+l.XS, l.YM + for i in range(8): + s.foundations.append(DieRussische_Foundation(x, y, self, + suit=i%4, max_cards=8)) + x = x + l.XS + x, y, = l.XM+l.XS, l.YM+l.YS + for i in range(8): + s.rows.append(AC_RowStack(x, y, self, max_move=1, max_accept=1)) + x = x + l.XS + s.talon = RedealTalonStack(l.XM, l.YM, self, max_rounds=2) + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + for i in range(7): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def redealCards(self): + while self.s.talon.cards: + self.s.talon.dealRowAvail(frames=4) + + shallHighlightMatch = Game._shallHighlightMatch_AC + + # register the game registerGame(GameInfo(292, Capricieuse, "Capricieuse", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 2, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(293, Nationale, "Nationale", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(606, Strata, "Strata", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 1, GI.SL_MOSTLY_SKILL, + ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index dc0825f2..3a32eed7 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -138,6 +138,7 @@ class Nordic(MissMuffet): class Dumfries_TalonStack(OpenTalonStack): rightclickHandler = OpenStack.rightclickHandler + doubleclickHandler = OpenStack.doubleclickHandler class Dumfries_RowStack(BasicRowStack): diff --git a/pysollib/games/dieboesesieben.py b/pysollib/games/dieboesesieben.py index 1531fd22..847d7445 100644 --- a/pysollib/games/dieboesesieben.py +++ b/pysollib/games/dieboesesieben.py @@ -117,6 +117,8 @@ class DieBoeseSieben(Game): for flip in (1, 0, 1, 0, 1, 0, 1): self.s.talon.dealRow(flip=flip) + shallHighlightMatch = Game._shallHighlightMatch_AC + # register the game registerGame(GameInfo(120, DieBoeseSieben, "Bad Seven", diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py index 05e1fa8a..93b8de48 100644 --- a/pysollib/games/diplomat.py +++ b/pysollib/games/diplomat.py @@ -196,6 +196,8 @@ class Wheatsheaf(Congress): ] RowStack_Class = UD_SS_RowStack + shallHighlightMatch = Game._shallHighlightMatch_SS + # /*********************************************************************** # // Rows of Four @@ -252,10 +254,7 @@ class LittleNapoleon(Diplomat): self.s.talon.dealRow() self.s.talon.dealCards() # deal first card to WasteStack - def getQuickPlayScore(self, ncards, from_stack, to_stack): - if to_stack.cards: - return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 - return 0 + getQuickPlayScore = Game._getSpiderQuickPlayScore # /*********************************************************************** @@ -272,6 +271,8 @@ class TwinQueens(Congress): def createGame(self): Congress.createGame(self, max_rounds=2) + shallHighlightMatch = Game._shallHighlightMatch_SS + # register the game diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index 26d81a67..c0d339bd 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -213,6 +213,7 @@ class LaBelleLucie(Fan): class SuperFlowerGarden(LaBelleLucie): RowStack_Class = StackWrapper(RK_RowStack, base_rank=NO_RANK) + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** @@ -559,7 +560,8 @@ class BoxFan(Fan): class Troika(Fan): - RowStack_Class = StackWrapper(RK_RowStack, dir=0, base_rank=NO_RANK, max_cards=3) + RowStack_Class = StackWrapper(RK_RowStack, dir=0, + base_rank=NO_RANK, max_cards=3) def createGame(self): Fan.createGame(self, rows=(6, 6, 6), playcards=4) @@ -580,7 +582,6 @@ class Troika(Fan): self.s.talon.dealRow(rows=[t], frames=4) - class TroikaPlus_RowStack(RK_RowStack): def getBottomImage(self): return self.game.app.images.getReserveBottom() @@ -600,6 +601,7 @@ class TroikaPlus(Troika): ## self.s.talon.dealRow(rows=self.s.rows[:-1]) + # register the game registerGame(GameInfo(56, Fan, "Fan", GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index fc15acc6..b329ecc2 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -288,6 +288,8 @@ class Deuces(FortyThieves): self.s.talon.dealRow(rows=self.s.foundations) FortyThieves.startGame(self) + shallHighlightMatch = Game._shallHighlightMatch_SSW + # /*********************************************************************** # // Corona @@ -311,6 +313,8 @@ class Quadrangle(Corona): FortyThieves.startGame(self) self.s.talon.dealSingleBaseCard() + shallHighlightMatch = Game._shallHighlightMatch_SSW + # /*********************************************************************** # // Forty and Eight @@ -334,10 +338,8 @@ class LittleForty(FortyThieves): def createGame(self): FortyThieves.createGame(self, max_rounds=4, num_deal=3, XOFFSET=0) - def getQuickPlayScore(self, ncards, from_stack, to_stack): - if to_stack.cards: - return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 - return 0 + shallHighlightMatch = Game._shallHighlightMatch_RK + getQuickPlayScore = Game._getSpiderQuickPlayScore # /*********************************************************************** @@ -796,10 +798,8 @@ class Waterloo(FortyThieves): self.s.talon.dealRow() self.s.talon.dealCards() # deal first card to WasteStack - def getQuickPlayScore(self, ncards, from_stack, to_stack): - if to_stack.cards: - return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 - return 0 + getQuickPlayScore = Game._getSpiderQuickPlayScore + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index edc1d8d6..1f3dfdf2 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -553,6 +553,9 @@ class KingCell(FreeCell): Hint_Class = FreeCellType_Hint RowStack_Class = StackWrapper(KingCell_RowStack, base_rank=KING) + shallHighlightMatch = Game._shallHighlightMatch_RK + + # register the game registerGame(GameInfo(5, RelaxedFreeCell, "Relaxed FreeCell", diff --git a/pysollib/games/glenwood.py b/pysollib/games/glenwood.py index f11c9d69..ce739d81 100644 --- a/pysollib/games/glenwood.py +++ b/pysollib/games/glenwood.py @@ -225,12 +225,14 @@ class DoubleFives_Talon(RedealTalonStack): class DoubleFives_RowStack(SS_RowStack): - def canMoveCards(self, cards): - if self.game.base_rank is None: - return False - if not SS_RowStack.canMoveCards(self, cards): - return False - return True + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + SS_RowStack.moveMove(self, ncards, to_stack, frames, shadow) + if self.game.base_rank is None and to_stack in self.game.s.foundations: + old_state = self.game.enterState(self.game.S_FILL) + self.game.saveStateMove(2|16) # for undo + self.game.base_rank = to_stack.cards[-1].rank + self.game.saveStateMove(1|16) # for redo + self.game.leaveState(old_state) class DoubleFives_WasteStack(WasteStack): diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 40c00933..da1690f6 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -534,6 +534,8 @@ class FourLeafClovers(Game): self.startDealSample() self.s.talon.dealRow() + shallHighlightMatch = Game._shallHighlightMatch_RKW + # /*********************************************************************** # // All in a Row diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index e56d1b95..9435b043 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -326,11 +326,7 @@ class Steve(Carlton): RowStack_Class = Spider_SS_RowStack shallHighlightMatch = Game._shallHighlightMatch_RK - - def getQuickPlayScore(self, ncards, from_stack, to_stack): - if to_stack.cards: - return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 - return 0 + getQuickPlayScore = Game._getSpiderQuickPlayScore # /*********************************************************************** @@ -446,7 +442,6 @@ class Cone(Gypsy): for i in range(7): s.rows.append(AC_RowStack(x, y, self, mod=13)) x += l.XS - #y += l.YS for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, mod=13, max_cards=26)) @@ -455,13 +450,14 @@ class Cone(Gypsy): # define stack-groups l.defaultStackGroups() - def startGame(self): self.startDealSample() self.s.talon.dealRow() for i in (1, 2, 3): self.s.talon.dealRow(rows=self.s.rows[i:-i]) + shallHighlightMatch = Game._shallHighlightMatch_ACW + # /*********************************************************************** # // Surprise diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index a859eece..8a9d5d49 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -188,11 +188,9 @@ class LadyJane(DoubleKlondike): DoubleKlondike.createGame(self, rows=10, max_rounds=2, num_deal=3) def startGame(self): DoubleKlondike.startGame(self, flip=1) + shallHighlightMatch = Game._shallHighlightMatch_RK - def getQuickPlayScore(self, ncards, from_stack, to_stack): - if to_stack.cards: - return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 - return 0 + getQuickPlayScore = Game._getSpiderQuickPlayScore class Inquisitor(DoubleKlondike): @@ -212,15 +210,14 @@ class Inquisitor(DoubleKlondike): class Arabella(DoubleKlondike): Hint_Class = Spider_Hint RowStack_Class = StackWrapper(Spider_SS_RowStack, base_rank=KING) + def createGame(self): DoubleKlondike.createGame(self, rows=13, max_rounds=1, playcards=24) def startGame(self): DoubleKlondike.startGame(self, flip=1) + shallHighlightMatch = Game._shallHighlightMatch_RK - def getQuickPlayScore(self, ncards, from_stack, to_stack): - if to_stack.cards: - return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 - return 0 + getQuickPlayScore = Game._getSpiderQuickPlayScore # /*********************************************************************** diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 16c94b74..fa295af8 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -277,6 +277,8 @@ class BlindAlleys(Eastcliff): # // Somerset # // Morehead # // Canister +# // American Canister +# // British Canister # ************************************************************************/ class Somerset(Klondike): @@ -299,22 +301,6 @@ class Morehead(Somerset): RowStack_Class = StackWrapper(BO_RowStack, max_move=1) -class Canister(Klondike): - Talon_Class = InitialDealTalonStack - RowStack_Class = RK_RowStack - ###Hint_Class = CautiousDefaultHint - - def createGame(self): - Klondike.createGame(self, max_rounds=1, rows=8, waste=0, texts=0) - - def startGame(self): - for i in range(5): - self.s.talon.dealRow(frames=0) - self.startDealSample() - self.s.talon.dealRow() - self.s.talon.dealRow(rows=self.s.rows[2:6]) - - class Usk(Somerset): Talon_Class = RedealTalonStack @@ -329,6 +315,34 @@ class Usk(Somerset): self.s.talon.dealRowAvail(rows=self.s.rows[n:], frames=4) n += 1 +# /*********************************************************************** +# // Canister +# // American Canister +# // British Canister +# ************************************************************************/ + +class AmericanCanister(Klondike): + Talon_Class = InitialDealTalonStack + + def createGame(self): + Klondike.createGame(self, max_rounds=1, rows=8, waste=0, texts=0) + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.rows[2:6]) + + +class Canister(AmericanCanister): + RowStack_Class = RK_RowStack + shallHighlightMatch = Game._shallHighlightMatch_RK + + +class BritishCanister(AmericanCanister): + RowStack_Class = StackWrapper(KingAC_RowStack, max_move=1) + # /*********************************************************************** # // Agnes Sorel @@ -472,6 +486,8 @@ class FlowerGarden(Stonewall): DEAL = (1, 1, 1, 1, -1, 1, 1) + shallHighlightMatch = Game._shallHighlightMatch_RK + # /*********************************************************************** # // King Albert @@ -543,6 +559,9 @@ class Brigade(Raglan): # ************************************************************************/ class Jane_Talon(OpenTalonStack): + rightclickHandler = OpenStack.rightclickHandler + doubleclickHandler = OpenStack.doubleclickHandler + def canFlipCard(self): return 0 @@ -561,6 +580,7 @@ class Jane_Talon(OpenTalonStack): return c + class Jane(Klondike): Talon_Class = Jane_Talon Foundation_Class = StackWrapper(SS_FoundationStack, mod=13, base_rank=NO_RANK, min_cards=1) @@ -577,7 +597,7 @@ class Jane(Klondike): s.talon = self.Talon_Class(x, y, self, max_rounds=max_rounds) l.createText(s.talon, 'ss') x += l.XS - s.waste = WasteStack(l.XM+l.XS+40, l.YM, self) + s.waste = WasteStack(l.XM+l.XS, l.YM, self) x += 2*l.XS for i in range(4): @@ -615,7 +635,7 @@ class Jane(Klondike): s.cap.update(cap.__dict__) self.saveinfo.stack_caps.append((s.id, cap)) - shallHighlightMatch = Game._shallHighlightMatch_SSW + shallHighlightMatch = Game._shallHighlightMatch_ACW def _autoDeal(self, sound=1): return 0 @@ -672,19 +692,20 @@ class Senate(Jane): l.defaultStackGroups() - def startGame(self): self.s.talon.dealRow(rows=self.s.foundations, frames=0) self.startDealSample() self.s.talon.dealRow(rows=self.s.reserves) self.s.talon.dealRow() - def _shuffleHook(self, cards): # move Aces to top of the Talon (i.e. first cards to be dealt) return self._shuffleHookMoveToTop(cards, lambda c: (c.rank == ACE, (c.deck, c.suit))) + shallHighlightMatch = Game._shallHighlightMatch_SS + + class SenatePlus(Senate): def createGame(self): Senate.createGame(self, rows=5) @@ -732,6 +753,8 @@ class Phoenix(Klondike): class Arizona(Phoenix): RowStack_Class = RK_RowStack + shallHighlightMatch = Game._shallHighlightMatch_RK + # /*********************************************************************** # // Alternation @@ -923,6 +946,9 @@ class DoubleDot(Klondike): self.startDealSample() self.s.talon.dealRow() + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) == 2 + # /*********************************************************************** # // Seven Devils @@ -1119,12 +1145,45 @@ class GoldMine(Klondike): # // Lucky Piles # ************************************************************************/ -class LuckyThirteen(Klondike): - Talon_Class = InitialDealTalonStack - RowStack_Class = StackWrapper(SS_RowStack, base_rank=NO_RANK, max_move=1) +class LuckyThirteen(Game): + RowStack_Class = StackWrapper(RK_RowStack, base_rank=NO_RANK) - def createGame(self): - Klondike.createGame(self, waste=False, rows=13, max_rounds=1, texts=False) + def createGame(self, xoffset=0, playcards=0): + l, s = Layout(self), self.s + if xoffset: + xoffset = l.XOFFSET + w0 = l.XS+playcards*l.XOFFSET + self.setSize(l.XM + 5*w0+2*l.XS, l.YM+4*l.YS) + + x, y = l.XM, l.YM + for i in range(5): + stack = self.RowStack_Class(x, y, self, max_move=1) + s.rows.append(stack) + stack.CARD_XOFFSET = xoffset + stack.CARD_YOFFSET = 0 + x += w0 + x, y = l.XM+w0, l.YM+l.YS + for i in range(3): + stack = self.RowStack_Class(x, y, self, max_move=1) + s.rows.append(stack) + stack.CARD_XOFFSET = xoffset + stack.CARD_YOFFSET = 0 + x += w0 + x, y = l.XM, l.YM+2*l.YS + for i in range(5): + stack = self.RowStack_Class(x, y, self, max_move=1) + s.rows.append(stack) + stack.CARD_XOFFSET = xoffset + stack.CARD_YOFFSET = 0 + x += w0 + x, y = self.width-l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + y += l.YS + x, y = l.XM, self.height-l.YS + s.talon = InitialDealTalonStack(x, y, self, max_rounds=1) + + l.defaultStackGroups() def startGame(self): self.s.talon.dealRow(frames=0) @@ -1133,12 +1192,17 @@ class LuckyThirteen(Klondike): self.startDealSample() self.s.talon.dealRow() - shallHighlightMatch = Game._shallHighlightMatch_SS + shallHighlightMatch = Game._shallHighlightMatch_RK class LuckyPiles(LuckyThirteen): RowStack_Class = StackWrapper(UD_SS_RowStack, base_rank=KING) + def createGame(self): + LuckyThirteen.createGame(self, xoffset=1, playcards=5) + + shallHighlightMatch = Game._shallHighlightMatch_SS + # register the game @@ -1262,4 +1326,8 @@ registerGame(GameInfo(585, LuckyThirteen, "Lucky Thirteen", GI.GT_NUMERICA, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(586, LuckyPiles, "Lucky Piles", GI.GT_NUMERICA, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(601, AmericanCanister, "American Canister", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(602, BritishCanister, "British Canister", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index cb00e699..f59a515e 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -213,6 +213,7 @@ class LastChance(LadyBetty): class PussInTheCorner_Talon(OpenTalonStack): rightclickHandler = OpenStack.rightclickHandler + doubleclickHandler = OpenStack.doubleclickHandler def canDealCards(self): if self.round != self.max_rounds: @@ -606,6 +607,7 @@ class Shifting(Numerica): class Strategerie_Talon(OpenTalonStack): rightclickHandler = OpenStack.rightclickHandler + doubleclickHandler = OpenStack.doubleclickHandler class Strategerie_RowStack(BasicRowStack): @@ -690,7 +692,7 @@ class AnnoDomini(Numerica): Hint_Class = AnnoDomini_Hint Foundation_Class = StackWrapper(SS_FoundationStack, suit=ANY_SUIT, mod=13) - RowStack_Class = AC_RowStack + RowStack_Class = StackWrapper(AC_RowStack, mod=13) def createGame(self): Numerica.createGame(self, max_rounds=3, waste_max_cards=UNLIMITED_CARDS) @@ -711,7 +713,7 @@ class AnnoDomini(Numerica): self.s.talon.dealRow() self.s.talon.dealCards() - shallHighlightMatch = Game._shallHighlightMatch_AC + shallHighlightMatch = Game._shallHighlightMatch_ACW diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 7312d08e..ffb2e5f1 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -320,6 +320,8 @@ class Alhambra(Game): self.s.talon.dealRow(rows=self.s.reserves) self.s.talon.dealCards() + shallHighlightMatch = Game._shallHighlightMatch_SSW + class Granada(Alhambra): def createGame(self): @@ -463,6 +465,8 @@ class BritishConstitution(Game): self.s.waste.moveMove(1, stack) self.leaveState(old_state) + shallHighlightMatch = Game._shallHighlightMatch_AC + class NewBritishConstitution(BritishConstitution): RowStack_Class = StackWrapper(BritishConstitution_RowStack, base_rank=JACK) diff --git a/pysollib/games/royaleast.py b/pysollib/games/royaleast.py index 64f680af..9f7f34f0 100644 --- a/pysollib/games/royaleast.py +++ b/pysollib/games/royaleast.py @@ -116,6 +116,8 @@ class RoyalEast(Game): def _saveGameHook(self, p): p.dump(self.base_card.id) + shallHighlightMatch = Game._shallHighlightMatch_RKW + # register the game registerGame(GameInfo(93, RoyalEast, "Royal East", diff --git a/pysollib/games/siebenbisas.py b/pysollib/games/siebenbisas.py index b644fb14..bf85694c 100644 --- a/pysollib/games/siebenbisas.py +++ b/pysollib/games/siebenbisas.py @@ -154,6 +154,8 @@ class SiebenBisAs(Game): for r in stacks: self.moveMove(1, r, self.s.foundations[r.cards[-1].suit]) + shallHighlightMatch = Game._shallHighlightMatch_SSW + # /*********************************************************************** # // Maze diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index db3f23c4..cfbe4405 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -150,11 +150,8 @@ class RelaxedSpider(Game): self.s.talon.dealRow() shallHighlightMatch = Game._shallHighlightMatch_RK + getQuickPlayScore = Game._getSpiderQuickPlayScore - def getQuickPlayScore(self, ncards, from_stack, to_stack): - if to_stack.cards: - return int(from_stack.cards[-1].suit == to_stack.cards[-1].suit)+1 - return 0 # /*********************************************************************** # // Spider @@ -492,6 +489,8 @@ class RougeEtNoir(Game): self.startDealSample() self.s.talon.dealRow(rows=self.s.rows[:-1], reverse=reverse) + shallHighlightMatch = Game._shallHighlightMatch_AC + # /*********************************************************************** # // Mrs. Mop @@ -573,6 +572,9 @@ class Cicely(Game): self.s.talon.dealRow() + shallHighlightMatch = Game._shallHighlightMatch_SS + + # /*********************************************************************** # // Trillium # // Lily diff --git a/pysollib/games/sthelena.py b/pysollib/games/sthelena.py index 1a28b85a..1fb75243 100644 --- a/pysollib/games/sthelena.py +++ b/pysollib/games/sthelena.py @@ -154,6 +154,7 @@ class StHelena(Game): self.s.talon.dealRow() self.s.talon.dealRow(self.s.foundations) + shallHighlightMatch = Game._shallHighlightMatch_RK # /*********************************************************************** # // Box Kite @@ -164,6 +165,9 @@ class BoxKite(StHelena): Foundation_Class = SS_FoundationStack RowStack_Class = StackWrapper(UD_RK_RowStack, base_rank=NO_RANK, mod=13) + shallHighlightMatch = Game._shallHighlightMatch_RKW + + # register the game registerGame(GameInfo(302, StHelena, "St. Helena", diff --git a/pysollib/games/takeaway.py b/pysollib/games/takeaway.py index a4633c1d..1acdc3fc 100644 --- a/pysollib/games/takeaway.py +++ b/pysollib/games/takeaway.py @@ -105,6 +105,9 @@ class FourStacks(TakeAway): RowStack_Class = StackWrapper(AC_RowStack, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS) Foundation_Class = StackWrapper(AC_FoundationStack, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS, dir=-1) + shallHighlightMatch = Game._shallHighlightMatch_AC + + # register the game registerGame(GameInfo(334, TakeAway, "Take Away", diff --git a/pysollib/games/terrace.py b/pysollib/games/terrace.py index de2f579e..b24bdfaa 100644 --- a/pysollib/games/terrace.py +++ b/pysollib/games/terrace.py @@ -217,6 +217,8 @@ class Terrace(Game): break p.dump(base_rank) + shallHighlightMatch = Game._shallHighlightMatch_ACW + # /*********************************************************************** # // Queen of Italy diff --git a/pysollib/games/unionsquare.py b/pysollib/games/unionsquare.py index 4b912a66..eb8cefdf 100644 --- a/pysollib/games/unionsquare.py +++ b/pysollib/games/unionsquare.py @@ -171,6 +171,9 @@ class SolidSquare(UnionSquare): self.s.waste.moveMove(1, stack) self.leaveState(old_state) + shallHighlightMatch = Game._shallHighlightMatch_SSW + + # register the game registerGame(GameInfo(35, UnionSquare, "Union Square", diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index 41417bc8..ddeb02a7 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -628,6 +628,36 @@ class DoubleRussianSpider(RussianSpider, DoubleRussianSolitaire): DoubleRussianSolitaire.startGame(self) +# /*********************************************************************** +# // Brisbane +# ************************************************************************/ + +class Brisbane_RowStack(Yukon_AC_RowStack): + def _isSequence(self, c1, c2): + return (c1.rank + self.cap.dir) % self.cap.mod == c2.rank + def getHelp(self): + return _('Tableau. Build down regardless of suit, can move any face-up cards regardless of sequence.') + + +class Brisbane(Yukon): + RowStack_Class = Brisbane_RowStack + + def startGame(self): + for i in range(1, len(self.s.rows)): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + for i in range(3): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRowAvail() + + def getHighlightPilesStacks(self): + return () + + shallHighlightMatch = Game._shallHighlightMatch_RK + + + # register the game registerGame(GameInfo(19, Yukon, "Yukon", GI.GT_YUKON, 1, 0, GI.SL_BALANCED)) @@ -684,3 +714,5 @@ registerGame(GameInfo(530, RussianSpider, "Russian Spider", altnames=('Ukrainian Solitaire',) )) registerGame(GameInfo(531, DoubleRussianSpider, "Double Russian Spider", GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(603, Brisbane, "Brisbane", + GI.GT_SPIDER, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/stack.py b/pysollib/stack.py index 8c03ad71..21cc6fc1 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -776,10 +776,17 @@ class Stack: # by default all open stacks are available for highlighting assert card in self.cards if not self.is_visible or not card.face_up: - return 0 + return False if card is self.cards[-1]: - return 1 - return self.is_open + return True + if not self.is_open: + return False + dx, dy = self.getOffsetFor(card) + if dx == 0 and dy <= 4: + return False + if dx <= 4 and dy == 0: + return False + return True def basicShallHighlightMatch(self, card): # by default all open stacks are available for highlighting @@ -1704,7 +1711,6 @@ class OpenStack(Stack): self.dragMove(drag, stack, sound=sound) def quickPlayHandler(self, event, from_stacks=None, to_stacks=None): - ##print 'quickPlayHandler', from_stacks, to_stacks # from_stacks and to_stacks are meant for possible # use in a subclasses if from_stacks is None: From 2c578eb8cf21349dbaa765096e35a3f768caf42a Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 2 Aug 2006 21:13:23 +0000 Subject: [PATCH 035/266] + 7 new games * improved progressbar * misc.improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@36 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 4 +- pysollib/games/camelot.py | 126 +++++++++++++++++++++++++- pysollib/games/katzenschwanz.py | 70 ++++++++++++++- pysollib/games/klondike.py | 20 +++++ pysollib/games/numerica.py | 15 ++++ pysollib/games/royalcotillion.py | 149 +++++++++++++++++++++++++++++-- pysollib/main.py | 2 +- pysollib/tk/menubar.py | 21 ++++- pysollib/tk/progressbar.py | 9 +- 9 files changed, 399 insertions(+), 17 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index 993eae8c..a1022d71 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -633,7 +633,9 @@ class Application: # widgets # # create the menubar - self.menubar = PysolMenubar(self, self.top) + if self.intro.progress: self.intro.progress.update(step=1) + self.menubar = PysolMenubar(self, self.top, + progress=self.intro.progress) # create the statusbar(s) self.statusbar = PysolStatusbar(self.top) self.statusbar.show(self.opt.statusbar) diff --git a/pysollib/games/camelot.py b/pysollib/games/camelot.py index 8ddb419e..0e1ea5b8 100644 --- a/pysollib/games/camelot.py +++ b/pysollib/games/camelot.py @@ -22,7 +22,6 @@ __all__ = [] # imports -import sys # PySol imports from pysollib.gamedb import registerGame, GameInfo, GI @@ -31,6 +30,9 @@ from pysollib.stack import * from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + +from numerica import Numerica_Hint # /*********************************************************************** @@ -174,7 +176,6 @@ class Camelot(Game): def startGame(self): self.is_fill = False - self.nnn = 0 self.s.talon.fillStack() @@ -212,8 +213,129 @@ class Camelot(Game): return [self.is_fill] +# /*********************************************************************** +# // Sly Fox +# ************************************************************************/ + +class SlyFox_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return False + if from_stack in self.game.s.rows: + return self.game.num_dealled <= 0 + return True + + +class SlyFox_Talon(OpenTalonStack): + rightclickHandler = OpenStack.rightclickHandler + doubleclickHandler = OpenStack.doubleclickHandler + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + old_state = self.game.enterState(self.game.S_FILL) + self.game.saveStateMove(2|16) # for undo + if old_state == self.game.S_PLAY and to_stack in self.game.s.rows: + n = self.game.num_dealled + if n < 0: n = 0 + self.game.num_dealled = (n+1)%20 + self.game.saveStateMove(1|16) # for redo + self.game.leaveState(old_state) + OpenTalonStack.moveMove(self, ncards, to_stack, frames, shadow) + + +class SlyFox_RowStack(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return False + return from_stack is self.game.s.talon + + +class SlyFox(Game): + Hint_Class = Numerica_Hint + + num_dealled = -1 + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+9*l.XS, l.YM+4*l.YS) + + x, y = l.XM, l.YM + s.talon = SlyFox_Talon(x, y, self) + s.waste = s.talon + l.createText(s.talon, 'ne') + tx, ty, ta, tf = l.getTextAttr(s.talon, "ss") + font = self.app.getFont("canvas_default") + self.texts.misc = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + + y = l.YM + for i in range(4): + x = l.XM+1.5*l.XS + for j in range(5): + stack = SlyFox_RowStack(x, y, self, max_cards=UNLIMITED_CARDS) + stack.CARD_YOFFSET = 0 + s.rows.append(stack) + x += l.XS + y += l.YS + + x, y = self.width-2*l.XS, l.YM + for i in range(4): + s.foundations.append(SlyFox_Foundation(x, y, self, suit=i)) + s.foundations.append(SlyFox_Foundation(x+l.XS, y, self, suit=i, + base_rank=KING, dir=-1)) + y += l.YS + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, KING) and c.deck == 0, (c.suit, c.rank))) + + def startGame(self): + self.num_dealled = -1 + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.fillStack() + + def _restoreGameHook(self, game): + self.num_dealled = game.loadinfo.num_dealled + + def _loadGameHook(self, p): + self.loadinfo.addattr(num_dealled=p.load()) + + def _saveGameHook(self, p): + p.dump(self.num_dealled) + + def setState(self, state): + # restore saved vars (from undo/redo) + self.num_dealled = state[0] + + def getState(self): + # save vars (for undo/redo) + return [self.num_dealled] + + + def fillStack(self, stack): + if self.num_dealled == -1 and stack in self.s.rows and not stack.cards: + old_state = self.enterState(self.S_FILL) + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) + + + def updateText(self): + if self.preview > 1: + return + n = self.num_dealled + if n < 0: n = 0 + text=str(n)+'/20' + self.texts.misc.config(text=text) + + # register the game registerGame(GameInfo(280, Camelot, "Camelot", GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(610, SlyFox, "Sly Fox", + GI.GT_NUMERICA, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index e67bb150..2c737756 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -266,7 +266,7 @@ class SalicLaw(DerKatzenschwanz): l, s = Layout(self), self.s # set size - self.setSize(l.XM + 10*l.XS, l.YM + 7*l.YS) + self.setSize(l.XM+10*l.XS, l.YM+(5+len(self.Foundation_Classes))*l.YS) # playcards = 4*l.YS / l.YOFFSET @@ -288,8 +288,8 @@ class SalicLaw(DerKatzenschwanz): x += l.XS y += l.YS - x, y = l.XM, l.YM+2*l.YS - self.setRegion(s.foundations[8:], (-999, -999, 999999, y - l.XM / 2)) + x, y = l.XM, l.YM+l.YS*len(self.Foundation_Classes) + self.setRegion(s.foundations[-8:], (-999, -999, 999999, y - l.XM / 2)) for i in range(8): stack = self.RowStack_Class(x, y, self, max_move=1) stack.CARD_XOFFSET = xoffset @@ -388,6 +388,66 @@ class LaggardLady(SalicLaw): return True +# /*********************************************************************** +# // Faerie Queen +# ************************************************************************/ + +class FaerieQueen_RowStack(RK_RowStack): + def acceptsCards(self, from_stack, cards): + if self.game.s.talon.cards: + return False + if len(self.cards) == 1: + return True + return RK_RowStack.acceptsCards(self, from_stack, cards) + + +class FaerieQueen(SalicLaw): + + Foundation_Classes = [ + StackWrapper(RK_FoundationStack, max_move=0, max_cards=12) + ] + RowStack_Class = StackWrapper(FaerieQueen_RowStack, min_cards=1, max_move=1) + + def isGameWon(self): + if self.s.talon.cards: + return False + for s in self.s.foundations: + if len(s.cards) != 12: + return False + return True + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + return int(len(to_stack.cards) > 1) + + shallHighlightMatch = Game._shallHighlightMatch_RK + + +# /*********************************************************************** +# // Glencoe +# ************************************************************************/ + +class Glencoe_Foundation(RK_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not RK_FoundationStack.acceptsCards(self, from_stack, cards): + return False + c = cards[0] + if c.rank in (4, 5): + i = list(self.game.s.foundations).index(self) % 8 + r = self.game.s.rows[i] + if not r.cards: + return False + return c.suit == r.cards[0].suit + return True + + +class Glencoe(LaggardLady): + + Foundation_Classes = [ + StackWrapper(Glencoe_Foundation, base_rank=5, max_cards=6), + StackWrapper(Glencoe_Foundation, base_rank=4, max_cards=6, dir=-1, mod=13), + ] + + # register the game registerGame(GameInfo(141, DerKatzenschwanz, "Cat's Tail", @@ -406,5 +466,9 @@ registerGame(GameInfo(442, Deep, "Deep", GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(523, LaggardLady, "Laggard Lady", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(611, FaerieQueen, "Faerie Queen", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(612, Glencoe, "Glencoe", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index fa295af8..6018d548 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -1204,6 +1204,24 @@ class LuckyPiles(LuckyThirteen): shallHighlightMatch = Game._shallHighlightMatch_SS +# /*********************************************************************** +# // Legion +# ************************************************************************/ + +class Legion(Klondike): + + def createGame(self): + Klondike.createGame(self, max_rounds=1, rows=8) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + for i in (1,2,3): + self.s.talon.dealRow(rows=self.s.rows[i:-i], flip=0) + self.s.talon.dealRow(rows=self.s.rows[i:-i]) + self.s.talon.dealCards() + + # register the game registerGame(GameInfo(2, Klondike, "Klondike", @@ -1330,4 +1348,6 @@ registerGame(GameInfo(601, AmericanCanister, "American Canister", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(602, BritishCanister, "British Canister", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(607, Legion, "Legion", + GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index f59a515e..a53121af 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -319,6 +319,7 @@ class PussInTheCorner(Numerica): # /*********************************************************************** # // Frog # // Fly +# // Fanny # ************************************************************************/ class Frog(Game): @@ -399,6 +400,18 @@ class Fly(Frog): self.s.talon.dealCards() +class Fanny(Frog): + + Foundation_Class = RK_FoundationStack + + def startGame(self): + self.startDealSample() + for i in range(11): + self.s.talon.dealRow(self.s.reserves, flip=0) + self.s.talon.dealRow(self.s.reserves) + self.s.talon.dealCards() + + # /*********************************************************************** # // Gnat # ************************************************************************/ @@ -751,4 +764,6 @@ registerGame(GameInfo(599, Assembly, "Assembly", GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(600, AnnoDomini, "Anno Domini", GI.GT_NUMERICA, 1, 2, GI.SL_BALANCED)) +registerGame(GameInfo(613, Fanny, "Fanny", + GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index ffb2e5f1..606802a3 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -42,6 +42,9 @@ from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from unionsquare import UnionSquare_Foundation + + # /*********************************************************************** # // Royal Cotillion # ************************************************************************/ @@ -220,6 +223,7 @@ class Kingdom(RoyalCotillion): # /*********************************************************************** # // Alhambra # // Granada +# // Grant's Reinforcement # ************************************************************************/ @@ -267,12 +271,14 @@ class Alhambra_Talon(DealRowTalonStack): class Alhambra(Game): Hint_Class = Alhambra_Hint - def createGame(self, rows=1): + RowStack_Class = StackWrapper(Alhambra_RowStack, base_rank=ANY_RANK) + + def createGame(self, rows=1, reserves=8, playcards=3): # create layout l, s = Layout(self), self.s # set window - self.setSize(l.XM + 8*l.XS, l.YM + 4*l.YS) + self.setSize(l.XM+8*l.XS, l.YM+3.5*l.YS+playcards*l.YOFFSET) # create stacks x, y, = l.XM, l.YM @@ -284,22 +290,23 @@ class Alhambra(Game): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, max_move=0, base_rank=KING, dir=-1)) x = x + l.XS - x, y, = l.XM, y + l.YS - for i in range(8): + x, y, = l.XM+(8-reserves)*l.XS/2, y+l.YS + for i in range(reserves): stack = OpenStack(x, y, self, max_accept=0) stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET s.reserves.append(stack) x = x + l.XS - x, y = l.XM+(8-1-rows)*l.XS/2, y+l.YS+5*l.YOFFSET + x, y = l.XM+(8-1-rows)*l.XS/2, self.height-l.YS s.talon = Alhambra_Talon(x, y, self, max_rounds=3) l.createText(s.talon, "sw") x += l.XS for i in range(rows): - stack = Alhambra_RowStack(x, y, self, mod=13, - max_accept=1, base_rank=ANY_RANK) + stack = self.RowStack_Class(x, y, self, mod=13, max_accept=1) stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 s.rows.append(stack) x += l.XS + if rows == 1: + l.createText(stack, 'se') # define stack-groups (non default) l.defaultStackGroups() @@ -328,6 +335,31 @@ class Granada(Alhambra): Alhambra.createGame(self, rows=4) +class GrantsReinforcement(Alhambra): + RowStack_Class = StackWrapper(Alhambra_RowStack, base_rank=NO_RANK) + + def createGame(self): + Alhambra.createGame(self, reserves=4, playcards=11) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(11): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealCards() + + def fillStack(self, stack): + for r in self.s.reserves: + if r.cards: + continue + if self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.s.talon.flipMove() + self.s.talon.moveMove(1, r) + self.leaveState(old_state) + + # /*********************************************************************** # // Carpet # ************************************************************************/ @@ -589,6 +621,105 @@ class ThreePirates(Game): shallHighlightMatch = Game._shallHighlightMatch_SS +# /*********************************************************************** +# // Frames +# ************************************************************************/ + +class Frames_Foundation(UnionSquare_Foundation): + def acceptsCards(self, from_stack, cards): + if not UnionSquare_Foundation.acceptsCards(self, from_stack, cards): + return False + return from_stack in self.game.s.rows + + +class Frames_RowStack(UD_SS_RowStack): + def acceptsCards(self, from_stack, cards): + if not UD_SS_RowStack.acceptsCards(self, from_stack, cards): + return False + if not (from_stack in self.game.s.reserves or + from_stack in self.game.s.rows): + return False + if len(self.cards) > 1: + cs = self.cards+cards + if not (isSameSuitSequence(cs, dir=1) or + isSameSuitSequence(cs, dir=-1)): + return False + if from_stack in self.game.s.reserves: + if (hasattr(self.cap, 'column') and + self.cap.column != from_stack.cap.column): + return False + if (hasattr(self.cap, 'row') and + self.cap.row != from_stack.cap.row): + return False + return True + + +class Frames(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self): + l, s = Layout(self), self.s + + self.setSize(l.XM+8*l.XS, l.YM+5*l.YS) + + x0, y0 = l.XM+2*l.XS, l.YM + # foundations (corners) + suit = 0 + for i, j in ((0,0),(5,0),(0,4),(5,4)): + x, y = x0+i*l.XS, y0+j*l.YS + s.foundations.append(Frames_Foundation(x, y, self, + suit=suit, dir=0, max_cards=26)) + suit += 1 + # rows (frame) + for i in (1,2,3,4): + for j in (0,4): + x, y = x0+i*l.XS, y0+j*l.YS + stack = Frames_RowStack(x, y, self) + s.rows.append(stack) + stack.cap.addattr(column=i) + stack.CARD_YOFFSET = 0 + for i in (0,5): + for j in (1,2,3): + x, y = x0+i*l.XS, y0+j*l.YS + stack = Frames_RowStack(x, y, self) + s.rows.append(stack) + stack.cap.addattr(row=j) + stack.CARD_YOFFSET = 0 + # reserves (picture) + for j in (1,2,3): + for i in (1,2,3,4): + x, y = x0+i*l.XS, y0+j*l.YS + stack = OpenStack(x, y, self) + s.reserves.append(stack) + stack.cap.addattr(column=i) + stack.cap.addattr(row=j) + # talon & waste + x, y, = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 'ne') + y += l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'ne') + + l.defaultStackGroups() + + def startGame(self): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealCards() + + def fillStack(self, stack): + if not stack.cards and stack in self.s.reserves: + if not self.s.waste.cards: + self.s.talon.dealCards() + if self.s.waste.cards: + old_state = self.enterState(self.S_FILL) + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + shallHighlightMatch = Game._shallHighlightMatch_SS + # register the game registerGame(GameInfo(54, RoyalCotillion, "Royal Cotillion", @@ -615,4 +746,8 @@ registerGame(GameInfo(465, Granada, "Granada", GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(579, ThreePirates, "Three Pirates", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(608, Frames, "Frames", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(609, GrantsReinforcement, "Grant's Reinforcement", + GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/main.py b/pysollib/main.py index 588f1867..04e9e9dc 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -431,7 +431,7 @@ Sounds and background music will be disabled.'''), if app.tabletile_index > 0: color = "#008200" app.intro.progress = PysolProgressBar(app, top, title=title, color=color, - images=app.progress_images) + images=app.progress_images, norm=1.32) # prepare other images app.loadImages2() diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 5d1bfa10..7364dfec 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -196,7 +196,7 @@ class MfxMenu(MfxMenubar): # ************************************************************************/ class PysolMenubar(PysolMenubarActions): - def __init__(self, app, top): + def __init__(self, app, top, progress=None): PysolMenubarActions.__init__(self, app, top) # init columnbreak self.__cb_max = int(self.top.winfo_screenheight()/23) @@ -205,11 +205,15 @@ class PysolMenubar(PysolMenubarActions): ## if sh >= 600: self.__cb_max = 27 ## if sh >= 768: self.__cb_max = 32 ## if sh >= 1024: self.__cb_max = 40 + self.progress = progress # create menus self.__menubar = None self.__menupath = {} self.__keybindings = {} self._createMenubar() + + if self.progress: self.progress.update(step=1) + # set the menubar self.updateBackgroundImagesMenu() self.top.config(menu=self.__menubar) @@ -225,6 +229,9 @@ class PysolMenubar(PysolMenubarActions): return "normal" return "disabled" + def updateProgress(self): + if self.progress: self.progress.update(step=1) + # # create the menubar @@ -268,9 +275,13 @@ class PysolMenubar(PysolMenubarActions): menu.add_command(label=n_("&Hold and quit"), command=self.mHoldAndQuit) menu.add_command(label=n_("&Quit"), command=self.mQuit, accelerator=m+"Q") + if self.progress: self.progress.update(step=1) + menu = MfxMenu(self.__menubar, label=n_("&Select")) self._addSelectGameMenu(menu) + if self.progress: self.progress.update(step=1) + menu = MfxMenu(self.__menubar, label=n_("&Edit")) menu.add_command(label=n_("&Undo"), command=self.mUndo, accelerator="Z") menu.add_command(label=n_("&Redo"), command=self.mRedo, accelerator="R") @@ -321,6 +332,9 @@ class PysolMenubar(PysolMenubarActions): menu.add_command(label=n_("Demo (&all games)"), command=self.mMixedDemo) menu.add_separator() menu.add_command(label=n_("Piles description"), command=self.mStackDesk, accelerator="F2") + + if self.progress: self.progress.update(step=1) + menu = MfxMenu(self.__menubar, label=n_("&Options")) menu.add_command(label=n_("&Player options..."), command=self.mOptPlayerOptions) submenu = MfxMenu(menu, label=n_("&Automatic play")) @@ -383,6 +397,8 @@ class PysolMenubar(PysolMenubarActions): ### menu.add_separator() ### menu.add_command(label="Save options", command=self.mOptSave) + if self.progress: self.progress.update(step=1) + menu = MfxMenu(self.__menubar, label=n_("&Help")) menu.add_command(label=n_("&Contents"), command=self.mHelp, accelerator=m+"F1") menu.add_command(label=n_("&How to play"), command=self.mHelpHowToPlay) @@ -511,6 +527,7 @@ class PysolMenubar(PysolMenubarActions): submenu = MfxMenu(menu, label=n_("&French games")) self._addSelectGameSubMenu(submenu, games, GI.SELECT_GAME_BY_TYPE, self.mSelectGame, self.tkopt.gameid) + if self.progress: self.progress.update(step=1) submenu = MfxMenu(menu, label=n_("&Mahjongg games")) self._addSelectMahjonggGameSubMenu(submenu, self.mSelectGame, self.tkopt.gameid) @@ -522,6 +539,7 @@ class PysolMenubar(PysolMenubarActions): self._addSelectGameSubMenu(submenu, games, GI.SELECT_SPECIAL_GAME_BY_TYPE, self.mSelectGame, self.tkopt.gameid) menu.add_separator() + if self.progress: self.progress.update(step=1) submenu = MfxMenu(menu, label=n_("All games by name")) self._addSelectAllGameSubMenu(submenu, games, self.mSelectGame, self.tkopt.gameid) @@ -620,6 +638,7 @@ class PysolMenubar(PysolMenubarActions): n, d = 0, self.__cb_max i = 0 while True: + if self.progress: self.progress.update(step=1) columnbreak = i > 0 and (i % d) == 0 i += 1 if not g[n:n+d]: diff --git a/pysollib/tk/progressbar.py b/pysollib/tk/progressbar.py index fc8df506..cbbc3b62 100644 --- a/pysollib/tk/progressbar.py +++ b/pysollib/tk/progressbar.py @@ -48,8 +48,8 @@ from tkutil import makeToplevel, setTransient, wm_set_icon # ************************************************************************/ class PysolProgressBar: - def __init__(self, app, parent, title=None, images=None, - color="blue", width=300, height=25, show_text=1): + def __init__(self, app, parent, title=None, images=None, color="blue", + width=300, height=25, show_text=1, norm=1): self.parent = parent self.percent = 0 self.top = makeToplevel(parent, title=title) @@ -84,6 +84,8 @@ class PysolProgressBar: setTransient(self.top, None, relx=0.5, rely=0.5) else: self.update(percent=0) + self.norm = norm + self.steps_sum = 0 def wmDeleteWindow(self): return EVENT_HANDLED @@ -104,6 +106,9 @@ class PysolProgressBar: self.percent = percent def update(self, percent=None, step=1): + self.steps_sum += step + ##print self.steps_sum + step = step/self.norm if self.top is None: # already destroyed return if percent is None: From 3a7f0238dd99c055d1ffb7b25e5c8ef34c91466f Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 3 Aug 2006 21:23:05 +0000 Subject: [PATCH 036/266] + 6 new games * improved findcarddialog + new command-line options: `--game' & `--gameid' git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@37 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 32 +++++---- pysollib/gamedb.py | 7 ++ pysollib/games/camelot.py | 41 +++++++++++- pysollib/games/grandduchess.py | 59 ++++++++++++----- pysollib/games/katzenschwanz.py | 111 +++++++++++++++++++------------- pysollib/games/parallels.py | 14 ++++ pysollib/games/pyramid.py | 83 +++++++++++++++++++++++- pysollib/games/sultan.py | 14 ++-- pysollib/main.py | 18 +++++- pysollib/tk/findcarddialog.py | 78 +++++++++++----------- 10 files changed, 337 insertions(+), 120 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index a1022d71..7da29e8a 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -150,15 +150,14 @@ class Options: # fonts self.fonts = {"default" : None, #"default" : ("helvetica", 12), - "sans" : ("times", 14), # for html - "fixed" : ("courier", 14), # for html & log + "sans" : ("times", 12), # for html + "fixed" : ("courier", 12), # for html & log "small" : ("helvetica", 12), "canvas_default" : ("helvetica", 12), #"canvas_card" : ("helvetica", 12), "canvas_fixed" : ("courier", 12), - "canvas_large" : ("helvetica", 18), - "canvas_small" : ("helvetica", 12), # not used? - #"tree_small" : ("helvetica", 12), + "canvas_large" : ("helvetica", 16), + "canvas_small" : ("helvetica", 10), } if os.name == 'posix': self.fonts["sans"] = ("helvetica", 12) @@ -579,6 +578,8 @@ class Application: ) self.commandline = Struct( loadgame = None, # load a game ? + game = None, + gameid = None, ) self.demo_counter = 0 @@ -619,12 +620,21 @@ class Application: game.destruct() destruct(game) game = None - if self.commandline.loadgame and not self.nextgame.loadedgame: - try: - self.nextgame.loadedgame = tmpgame._loadGame(self.commandline.loadgame, self) - self.nextgame.loadedgame.gstats.holded = 0 - except: - self.nextgame.loadedgame = None + if not self.nextgame.loadedgame: + if self.commandline.loadgame: + try: + self.nextgame.loadedgame = tmpgame._loadGame(self.commandline.loadgame, self) + self.nextgame.loadedgame.gstats.holded = 0 + except: + self.nextgame.loadedgame = None + elif not self.commandline.game is None: + gameid = self.gdb.getGameByName(self.commandline.game) + if gameid is None: + print >> sys.stderr, "WARNING: can't find game:", self.commandline.game + else: + self.nextgame.id, self.nextgame.random = gameid, None + elif not self.commandline.gameid is None: + self.nextgame.id, self.nextgame.random = self.commandline.gameid, None self.opt.game_holded = 0 tmpgame.destruct() destruct(tmpgame) diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index bde03651..e1e124f6 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -572,6 +572,13 @@ class GameManager: self.getGamesIdSortedByName() return self.__games_by_altname + # find game by name + def getGameByName(self, name): + gi = self.__all_gamenames.get(name) + if gi: + return gi.id + return None + # /*********************************************************************** # // diff --git a/pysollib/games/camelot.py b/pysollib/games/camelot.py index 0e1ea5b8..0231c7e5 100644 --- a/pysollib/games/camelot.py +++ b/pysollib/games/camelot.py @@ -222,6 +222,8 @@ class SlyFox_Foundation(SS_FoundationStack): if not SS_FoundationStack.acceptsCards(self, from_stack, cards): return False if from_stack in self.game.s.rows: + if len(self.game.s.talon.cards) == 0: + return True return self.game.num_dealled <= 0 return True @@ -332,10 +334,47 @@ class SlyFox(Game): self.texts.misc.config(text=text) +class OpenSlyFox(SlyFox): + + def createGame(self): + playcards = 6 + + l, s = Layout(self), self.s + self.setSize(l.XM+10*l.XS, l.YM+3*l.YS+2*playcards*l.YOFFSET+l.TEXT_HEIGHT) + + x, y = l.XM, l.YM + s.talon = SlyFox_Talon(x, y, self) + s.waste = s.talon + l.createText(s.talon, 'ne') + tx, ty, ta, tf = l.getTextAttr(s.talon, "ss") + font = self.app.getFont("canvas_default") + self.texts.misc = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + + x += 2*l.XS + for i in range(4): + s.foundations.append(SlyFox_Foundation(x, y, self, suit=i)) + s.foundations.append(SlyFox_Foundation(x+4*l.XS, y, self, suit=i, + base_rank=KING, dir=-1)) + x += l.XS + y = l.YM+l.YS+l.TEXT_HEIGHT + for i in range(2): + x = l.XM + for j in range(10): + stack = SlyFox_RowStack(x, y, self, max_cards=UNLIMITED_CARDS) + s.rows.append(stack) + stack.CARD_YOFFSET = l.YOFFSET + x += l.XS + y += l.YS+playcards*l.YOFFSET + + l.defaultStackGroups() + # register the game registerGame(GameInfo(280, Camelot, "Camelot", GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(610, SlyFox, "Sly Fox", - GI.GT_NUMERICA, 2, 0, GI.SL_MOSTLY_SKILL)) + GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(614, OpenSlyFox, "Open Sly Fox", + GI.GT_NUMERICA | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/grandduchess.py b/pysollib/games/grandduchess.py index 57f92061..72027fc5 100644 --- a/pysollib/games/grandduchess.py +++ b/pysollib/games/grandduchess.py @@ -78,16 +78,25 @@ class GrandDuchess(Game): # game layout # - def createGame(self): + def createGame(self, rows=4): # create layout + max_rows = max(10, 4+rows) l, s = Layout(self), self.s # set window - w, h = l.XM+9*l.XS, l.YM+2*l.YS+18*l.YOFFSET + w, h = l.XM+max_rows*l.XS, l.YM+2*l.YS+18*l.YOFFSET self.setSize(w, h) # create stacks x, y = l.XM, l.YM + s.talon = GrandDuchess_Talon(x, y, self, max_rounds=4) + l.createText(s.talon, 'se') + tx, ty, ta, tf = l.getTextAttr(s.talon, 'ne') + font = self.app.getFont('canvas_default') + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + + x += 2*l.XS for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) x += l.XS @@ -95,25 +104,18 @@ class GrandDuchess(Game): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, base_rank=KING, dir=-1)) x += l.XS - x, y = l.XM+2*l.XS, l.YM+l.YS - for i in range(4): + x, y = l.XM+(max_rows-rows)*l.XS/2, l.YM+l.YS + for i in range(rows): stack = BasicRowStack(x, y, self, max_move=1, max_accept=0) stack.CARD_YOFFSET = l.YOFFSET s.rows.append(stack) x += l.XS - x, y = l.XM, l.YM+l.YS + dx = (max_rows-rows)*l.XS/4-l.XS/2 + x, y = l.XM+dx, l.YM+l.YS s.reserves.append(GrandDuchess_Reserve(x, y, self)) - x, y = l.XM+7*l.XS, l.YM+l.YS + x, y = self.width-dx-l.XS, l.YM+l.YS s.reserves.append(GrandDuchess_Reserve(x, y, self)) - x, y = self.width-l.XS, self.height-l.YS - s.talon = GrandDuchess_Talon(x, y, self, max_rounds=4) - l.createText(s.talon, 'n') - tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") - font = self.app.getFont("canvas_default") - s.talon.texts.rounds = MfxCanvasText(self.canvas, - tx, ty-l.TEXT_MARGIN, - anchor=ta, font=font) # define stack-groups l.defaultStackGroups() @@ -133,7 +135,34 @@ class GrandDuchess(Game): return ((), (), self.sg.dropstacks) +# /*********************************************************************** +# // Parisienne +# ************************************************************************/ + +class Parisienne(GrandDuchess): + def _shuffleHook(self, cards): + # move one Ace and one King of each suit to top of the Talon + # (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, KING) and c.deck == 0, (c.rank, c.suit))) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + GrandDuchess.startGame(self) + + +class GrandDuchessPlus(GrandDuchess): + def createGame(self): + GrandDuchess.createGame(self, rows=6) + + + registerGame(GameInfo(557, GrandDuchess, "Grand Duchess", GI.GT_2DECK_TYPE, 2, 3)) - +registerGame(GameInfo(617, Parisienne, "Parisienne", + GI.GT_2DECK_TYPE, 2, 3, + rules_filename='grandduchess.html', + altnames=('La Parisienne', 'Parisian') )) +registerGame(GameInfo(618, GrandDuchessPlus, "Grand Duchess +", + GI.GT_2DECK_TYPE, 2, 3)) diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index 2c737756..970a1a02 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -178,7 +178,7 @@ class Kings(DerKatzenschwanz): def _shuffleHook(self, cards): for c in cards[:]: - if c.rank == 12: + if c.rank == KING: cards.remove(c) break cards.append(c) @@ -289,7 +289,7 @@ class SalicLaw(DerKatzenschwanz): y += l.YS x, y = l.XM, l.YM+l.YS*len(self.Foundation_Classes) - self.setRegion(s.foundations[-8:], (-999, -999, 999999, y - l.XM / 2)) + self.setRegion(s.foundations, (-999, -999, 999999, y - l.XM / 2)) for i in range(8): stack = self.RowStack_Class(x, y, self, max_move=1) stack.CARD_XOFFSET = xoffset @@ -350,44 +350,6 @@ class Deep(DerKatzenschwanz): self.s.talon.dealRow() -# /*********************************************************************** -# // Laggard Lady -# ************************************************************************/ - -class LaggardLady_RowStack(OpenStack): - def acceptsCards(self, from_stack, cards): - if not OpenStack.acceptsCards(self, from_stack, cards): - return False - return len(self.game.s.talon.cards) == 0 and len(self.cards) == 1 - - -class LaggardLady(SalicLaw): - - Foundation_Classes = [ - StackWrapper(RK_FoundationStack, base_rank=5, max_cards=6), - StackWrapper(RK_FoundationStack, base_rank=4, max_cards=6, dir=-1, mod=13), - ] - RowStack_Class = StackWrapper(LaggardLady_RowStack, max_accept=1, min_cards=1) - - ROW_BASE_RANK = QUEEN - - def _shuffleHook(self, cards): - for c in cards[:]: - if c.rank == QUEEN: - cards.remove(c) - break - cards.append(c) - return cards - - def isGameWon(self): - if self.s.talon.cards: - return False - for s in self.s.foundations: - if len(s.cards) != 6: - return False - return True - - # /*********************************************************************** # // Faerie Queen # ************************************************************************/ @@ -423,9 +385,64 @@ class FaerieQueen(SalicLaw): # /*********************************************************************** +# // Intrigue +# // Laggard Lady # // Glencoe # ************************************************************************/ +class Intrigue_RowStack(OpenStack): + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return False + return len(self.game.s.talon.cards) == 0 and len(self.cards) == 1 + + +class Intrigue(SalicLaw): + + Foundation_Classes = [ + StackWrapper(RK_FoundationStack, base_rank=5, max_cards=6), + StackWrapper(RK_FoundationStack, base_rank=4, max_cards=6, dir=-1, mod=13), + ] + RowStack_Class = StackWrapper(Intrigue_RowStack, max_accept=1, min_cards=1) + + ROW_BASE_RANK = QUEEN + + def _shuffleHook(self, cards): + for c in cards[:]: + if c.rank == QUEEN: + cards.remove(c) + break + cards.append(c) + return cards + + def isGameWon(self): + if self.s.talon.cards: + return False + for s in self.s.foundations: + if len(s.cards) != 6: + return False + return True + + +class LaggardLady_Foundation(RK_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not RK_FoundationStack.acceptsCards(self, from_stack, cards): + return False + c = cards[0] + if c.rank in (4, 5): + i = list(self.game.s.foundations).index(self) % 8 + r = self.game.s.rows[i] + if not r.cards: + return False + return True + +class LaggardLady(Intrigue): + Foundation_Classes = [ + StackWrapper(LaggardLady_Foundation, base_rank=5, max_cards=6), + StackWrapper(LaggardLady_Foundation, base_rank=4, max_cards=6, dir=-1, mod=13), + ] + + class Glencoe_Foundation(RK_FoundationStack): def acceptsCards(self, from_stack, cards): if not RK_FoundationStack.acceptsCards(self, from_stack, cards): @@ -439,16 +456,13 @@ class Glencoe_Foundation(RK_FoundationStack): return c.suit == r.cards[0].suit return True - -class Glencoe(LaggardLady): - +class Glencoe(Intrigue): Foundation_Classes = [ StackWrapper(Glencoe_Foundation, base_rank=5, max_cards=6), StackWrapper(Glencoe_Foundation, base_rank=4, max_cards=6, dir=-1, mod=13), ] - # register the game registerGame(GameInfo(141, DerKatzenschwanz, "Cat's Tail", GI.GT_FREECELL | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, @@ -464,11 +478,16 @@ registerGame(GameInfo(299, SalicLaw, "Salic Law", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(442, Deep, "Deep", GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(523, LaggardLady, "Laggard Lady", +registerGame(GameInfo(523, Intrigue, "Intrigue", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(611, FaerieQueen, "Faerie Queen", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(612, Glencoe, "Glencoe", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, + rules_filename="intrigue.html")) +registerGame(GameInfo(616, LaggardLady, "Laggard Lady", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, + rules_filename="intrigue.html")) + diff --git a/pysollib/games/parallels.py b/pysollib/games/parallels.py index eec12e78..ce5f4cb2 100644 --- a/pysollib/games/parallels.py +++ b/pysollib/games/parallels.py @@ -35,6 +35,7 @@ from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint # /*********************************************************************** # // Parallels +# // British Blockade # ************************************************************************/ class Parallels_RowStack(BasicRowStack): @@ -167,9 +168,22 @@ class Parallels(Game): self.s.talon.dealRow(rows=self.s.rows[:10]) +class BritishBlockade(Parallels): + + def fillStack(self, stack): + if not stack.cards and stack in self.s.rows: + if self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) + + # register the game registerGame(GameInfo(428, Parallels, "Parallels", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(615, BritishBlockade, "British Blockade", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index ba7ee49e..5a23824c 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -595,6 +595,86 @@ class Fifteens(Elevens): self.leaveState(old_state) +# /*********************************************************************** +# // Triple Alliance +# ************************************************************************/ + +class TripleAlliance_Reserve(ReserveStack): + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return False + r_ranks = [] + for r in self.game.s.reserves: + if r.cards: + r_ranks.append(r.cards[0].rank) + if not r_ranks: + return True + r_ranks.append(cards[0].rank) + r_ranks.sort() + if len(r_ranks) == 2: + return r_ranks[1]-r_ranks[0] in (1, 12) + for i in range(3): + j, k = (i+1)%3, (i+2)%3 + if ((r_ranks[i]+1) % 13 == r_ranks[j] and + (r_ranks[j]+1) % 13 == r_ranks[k]): + return True + return False + + +class TripleAlliance(Game): + + def createGame(self): + + l, s = Layout(self), self.s + w0 = l.XS+5*l.XOFFSET + self.setSize(l.XM+5*w0, l.YM+5*l.YS) + + x, y = l.XM, l.YM + for i in range(3): + s.reserves.append(TripleAlliance_Reserve(x, y, self)) + x += l.XS + x, y = self.width-l.XS, l.YM + s.foundations.append(AbstractFoundationStack(x, y, self, suit=ANY_SUIT, + max_move=0, max_accept=0, max_cards=52)) + y = l.YM+l.YS + nstacks = 0 + for i in range(4): + x = l.XM + for j in range(5): + stack = BasicRowStack(x, y, self, max_accept=0) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + x += w0 + nstacks += 1 + if nstacks >= 18: + break + y += l.YS + + x, y = self.width-l.XS, self.height-l.YS + s.talon = InitialDealTalonStack(x, y, self) + + l.defaultStackGroups() + + def startGame(self): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRowAvail() + + def fillStack(self, stack): + for r in self.s.reserves: + if not r.cards: + return + if not self.demo: + self.playSample("droppair", priority=200) + old_state = self.enterState(self.S_FILL) + for r in self.s.reserves: + r.moveMove(1, self.s.foundations[0]) + self.leaveState(old_state) + + def isGameWon(self): + return len(self.s.foundations[0].cards) == 51 + # register the game registerGame(GameInfo(38, Pyramid, "Pyramid", @@ -615,6 +695,7 @@ registerGame(GameInfo(596, SuitElevens, "Suit Elevens", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_LUCK)) registerGame(GameInfo(597, Fifteens, "Fifteens", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) - +registerGame(GameInfo(619, TripleAlliance, "Triple Alliance", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index b3363a1c..d358bf25 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -417,27 +417,29 @@ class Matrimony_Talon(DealRowTalonStack): rows = self.game.s.rows r = self.game.s.rows[-self.round] for i in range(len(r.cards)): - num_cards = num_cards + 1 + num_cards += 1 self.game.moveMove(1, r, self, frames=4) self.game.flipMove(self) assert len(self.cards) == num_cards self.game.nextRoundMove(self) + return num_cards def dealCards(self, sound=0): if sound: self.game.startDealSample() + num_cards = 0 if len(self.cards) == 0: - self._redeal() + num_cards += self._redeal() if self.round == 1: - n = self.dealRowAvail(sound=0) + num_cards += self.dealRowAvail(sound=0) else: rows = self.game.s.rows[-self.round+1:] - n = self.dealRowAvail(rows=rows, sound=0) + num_cards += self.dealRowAvail(rows=rows, sound=0) while self.cards: - n += self.dealRowAvail(rows=self.game.s.rows, sound=0) + num_cards += self.dealRowAvail(rows=self.game.s.rows, sound=0) if sound: self.game.stopSamples() - return n + return num_cards class Matrimony(Game): diff --git a/pysollib/main.py b/pysollib/main.py index 04e9e9dc..4c0629a1 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -84,8 +84,9 @@ Please check your %s installation. def parse_option(argv): prog_name = argv[0] try: - optlist, args = getopt.getopt(argv[1:], "hD:", - ["fg=", "foreground=", + optlist, args = getopt.getopt(argv[1:], "g:i:hD:", + ["game=", "gameid=", + "fg=", "foreground=", "bg=", "background=", "fn=", "font=", "noplugins", @@ -97,6 +98,8 @@ def parse_option(argv): % (prog_name, err, prog_name) return None opts = {"help": False, + "game": None, + "gameid": None, "fg": None, "bg": None, "fn": None, @@ -107,6 +110,10 @@ def parse_option(argv): for i in optlist: if i[0] in ("-h", "--help"): opts["help"] = True + elif i[0] in ("-g", "--game"): + opts["game"] = i[1] + elif i[0] in ("-i", "--gameid"): + opts["gameid"] = i[1] elif i[0] in ("--fg", "--foreground"): opts["fg"] = i[1] elif i[0] in ("--bg", "--background"): @@ -122,6 +129,7 @@ def parse_option(argv): if opts["help"]: print _("""Usage: %s [OPTIONS] [FILE] + -g --game=GAMENAME start game GAMENAME --fg --foreground=COLOR foreground color --bg --background=COLOR background color --fn --font=FONT default font @@ -177,6 +185,12 @@ def pysol_init(app, args): wm_command = prog + " " + os.path.abspath(argv0) if filename: app.commandline.loadgame = filename + app.commandline.game = opts['game'] + if not opts['gameid'] is None: + try: + app.commandline.gameid = int(opts['gameid']) + except: + print >> sys.stderr, 'WARNING: invalide game id:', opts['gameid'] app.debug = int(opts['debug']) # init games database diff --git a/pysollib/tk/findcarddialog.py b/pysollib/tk/findcarddialog.py index 3bd9ac14..cd2115d8 100644 --- a/pysollib/tk/findcarddialog.py +++ b/pysollib/tk/findcarddialog.py @@ -41,17 +41,24 @@ from tkcanvas import MfxCanvas, MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectang # // # ************************************************************************/ -class FindCardDialog(Tkinter.Toplevel): - SUIT_IMAGES = {} # key: (suit, color) - RANK_IMAGES = {} # key: (rank, color) +LARGE_EMBLEMS_SIZE = (38, 34) +SMALL_EMBLEMS_SIZE = (31, 21) - def __init__(self, parent, game, dir): +class FindCardDialog(Tkinter.Toplevel): + CARD_IMAGES = {} # key: (rank, suit) + + def __init__(self, parent, game, dir, size='large'): Tkinter.Toplevel.__init__(self) self.title(_('Find card')) self.wm_resizable(0, 0) # - self.images_dir = dir - self.label_width, self.label_height = 38, 34 + ##self.images_dir = dir + if size == 'large': + self.images_dir = os.path.join(dir, 'large-emblems') + self.label_width, self.label_height = LARGE_EMBLEMS_SIZE + else: + self.images_dir = os.path.join(dir, 'small-emblems') + self.label_width, self.label_height = SMALL_EMBLEMS_SIZE self.canvas = MfxCanvas(self, bg='white') self.canvas.pack(expand=True, fill='both') # @@ -72,35 +79,28 @@ class FindCardDialog(Tkinter.Toplevel): dir = self.images_dir canvas = self.canvas group = MfxCanvasGroup(canvas) - s = 'cshd'[suit] - if suit >= 2: c = 'red' - else: c = 'black' - rect_width = 4 - x1, y1 = x0+dx-rect_width, y0+dy-rect_width - rect = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, - width=rect_width, - fill='white', outline='white') - rect.addtag(group) # - fn = os.path.join(dir, c+'-'+str(rank)+'.gif') - rim = FindCardDialog.RANK_IMAGES.get((rank, c)) - if not rim: - rim = makeImage(file=fn) - FindCardDialog.RANK_IMAGES[(rank, c)] = rim - fn = os.path.join(dir, s+'.gif') - sim = FindCardDialog.SUIT_IMAGES.get((suit, c)) - if not sim: - sim = makeImage(file=fn) - FindCardDialog.SUIT_IMAGES[(suit, c)] = sim + im = FindCardDialog.CARD_IMAGES.get((rank, suit)) + if im is None: + r = '%02d' % (rank+1) + s = 'csdh'[suit] + fn = os.path.join(dir, r+s+'.gif') + im = makeImage(file=fn) + FindCardDialog.CARD_IMAGES[(rank, suit)] = im + cim = MfxCanvasImage(canvas, x0, y0, image=im, anchor='nw') + cim.addtag(group) + cim.lower() + # +## rect_width = 4 +## x1, y1 = x0+dx, y0+dy +## rect = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, +## width=rect_width, +## fill=None, +## outline='red', +## state='hidden') +## rect.addtag(group) + rect = None # - x0 = x0+(dx-rim.width()-sim.width())/2 - x0, y0 = x0-1, y0-2 - x, y = x0, y0+(dy-rim.height())/2 - im = MfxCanvasImage(canvas, x, y, image=rim, anchor='nw') - im.addtag(group) - x, y = x0+rim.width(), y0+(dy-sim.height())/2 - im = MfxCanvasImage(canvas, x, y, image=sim, anchor='nw') - im.addtag(group) bind(group, '', lambda e, suit=suit, rank=rank, rect=rect: self.enterEvent(suit, rank, rect)) @@ -126,29 +126,31 @@ class FindCardDialog(Tkinter.Toplevel): self.createCardLabel(suit=suit, rank=rank, x0=x, y0=y) j += 1 i += 1 - w, h = dx*j, dy*i + w, h = dx*j+2, dy*i+2 self.canvas.config(width=w, height=h) def enterEvent(self, suit, rank, rect): - #print 'enterEvent', suit, rank + ##print 'enterEvent', suit, rank self.highlight_items = self.game.highlightCard(suit, rank) if not self.highlight_items: self.highlight_items = [] - rect.config(outline='red') if self.highlight_items: self.timer = after(self, self.normal_timeout, self.timeoutEvent) + return + rect.config(state='normal') def leaveEvent(self, suit, rank, rect): - #print 'leaveEvent', suit, rank + ##print 'leaveEvent', suit, rank if self.highlight_items: for i in self.highlight_items: i.delete() - rect.config(outline='white') #self.game.canvas.update_idletasks() #self.canvas.update_idletasks() if self.timer: after_cancel(self.timer) self.timer = None + return + rect.config(state='hidden') def timeoutEvent(self, *event): if self.highlight_items: From f1b52481e173b156c8a89ad33d971e78ebce04a8 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 4 Aug 2006 21:15:30 +0000 Subject: [PATCH 037/266] + 6 new games * improved findcarddialog git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@38 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 4 +- pysollib/games/camelot.py | 208 ++++++++++++++++++++++++++++++++ pysollib/games/fan.py | 44 ++++++- pysollib/games/katzenschwanz.py | 110 +++++++++++++++++ pysollib/games/numerica.py | 1 - pysollib/games/sthelena.py | 159 ++++++++++++++++++++++++ pysollib/tk/findcarddialog.py | 54 ++++++--- 7 files changed, 557 insertions(+), 23 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index 055e2054..77fb3c5e 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1159,7 +1159,7 @@ class Game: # redeal cards (used in RedealTalonStack; all cards already in talon) def redealCards(self): - pass + raise SubclassResponsibility # the actual hint class (or None) Hint_Class = DefaultHint @@ -1467,6 +1467,8 @@ for %d moves. def _highlightCards(self, info, sleep=1.5): if not info: return 0 + if self.pause: + return 0 items = [] for s, c1, c2, color in info: assert c1 in s.cards and c2 in s.cards diff --git a/pysollib/games/camelot.py b/pysollib/games/camelot.py index 0231c7e5..02378c6b 100644 --- a/pysollib/games/camelot.py +++ b/pysollib/games/camelot.py @@ -370,6 +370,209 @@ class OpenSlyFox(SlyFox): l.defaultStackGroups() +# /*********************************************************************** +# // Princess Patience +# ************************************************************************/ + +class PrincessPatience_RowStack(SS_RowStack): + + def canMoveCards(self, cards): + if not SS_RowStack.canMoveCards(self, cards): + return False + index = list(self.game.s.rows).index(self) + col = index % 4 + row = index / 4 + if index < 16: # left + for i in range(col+1, 4): + r = self.game.s.rows[row*4+i] + if r.cards: + return False + else: # right + for i in range(0, col): + r = self.game.s.rows[row*4+i] + if r.cards: + return False + return True + + def acceptsCards(self, from_stack, cards): + if not SS_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return from_stack is self.game.s.waste + return True + + +class PrincessPatience(Game): + RowStack_Class = PrincessPatience_RowStack + + def createGame(self, max_rounds=1): + + l, s = Layout(self), self.s + self.setSize(l.XM+11*l.XS, l.YM+5*l.YS) + + y = l.YM + for i in range(4): + x = l.XM + for j in range(4): + stack = self.RowStack_Class(x, y, self, max_move=1) + s.rows.append(stack) + stack.CARD_YOFFSET = 0 + x += l.XS + y += l.YS + y = l.YM + for i in range(4): + x = l.XM+7*l.XS + for j in range(4): + stack = self.RowStack_Class(x, y, self, max_move=1) + s.rows.append(stack) + stack.CARD_YOFFSET = 0 + x += l.XS + y += l.YS + + x, y = l.XM+4.5*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + s.foundations.append(SS_FoundationStack(x+l.XS, y, self, suit=i)) + y += l.YS + + x, y = l.XM+4.5*l.XS, self.height-l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds) + l.createText(s.talon, 'sw') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'se') + + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + shallHighlightMatch = Game._shallHighlightMatch_SS + + +# /*********************************************************************** +# // Grandmamma's Patience +# ************************************************************************/ + +class GrandmammasPatience_Talon(OpenTalonStack): + rightclickHandler = OpenStack.rightclickHandler + doubleclickHandler = OpenStack.doubleclickHandler + + +class GrandmammasPatience_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return False + return from_stack not in self.game.s.rows + + +class GrandmammasPatience(Game): + + def createGame(self): + + l, s = Layout(self), self.s + h0 = l.YS+4*l.YOFFSET + self.setSize(l.XM+11*l.XS, l.YM+2*l.YS+2*h0) + self.base_rank = ANY_RANK + + x, y = l.XM, l.YM + s.talon = GrandmammasPatience_Talon(x, y, self) + l.createText(s.talon, 'ne') + + x, y = self.width-4*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + dir=-1, mod=13, max_move=0, base_rank=ANY_RANK)) + x += l.XS + stack = s.foundations[0] + tx, ty, ta, tf = l.getTextAttr(stack, "sw") + font = self.app.getFont("canvas_default") + stack.texts.misc = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + x, y = self.width-4*l.XS, self.height-l.YS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + mod=13, max_move=0, base_rank=ANY_RANK)) + x += l.XS + stack = s.foundations[4] + tx, ty, ta, tf = l.getTextAttr(stack, "sw") + font = self.app.getFont("canvas_default") + stack.texts.misc = MfxCanvasText(self.canvas, + tx, ty, anchor=ta, font=font) + + y = l.YM+l.YS + for i in range(2): + x = l.XM + for j in range(11): + s.rows.append(GrandmammasPatience_RowStack(x, y, self, + max_accept=1, max_cards=2)) + x += l.XS + y += h0 + + x, y = l.XM, self.height-l.YS + for i in range(4): + s.reserves.append(ReserveStack(x, y, self)) + x += l.XS + + l.defaultStackGroups() + self.sg.dropstacks.append(s.talon) + + + def startGame(self): + c = self.s.talon.cards[-1] + self.base_rank = c.rank + to_stack = self.s.foundations[c.suit] + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, to_stack, frames=0) + for s in self.s.foundations[:4]: + s.cap.base_rank = c.rank + for s in self.s.foundations[4:]: + s.cap.base_rank = (c.rank+1)%13 + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.fillStack() + + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + if self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) + + def updateText(self): + if self.preview > 1: + return + base_rank = self.base_rank + if base_rank == ANY_RANK: + t1 = t2 = '' + else: + t1 = RANKS[base_rank]+_(" Descending") + t2 = RANKS[(base_rank+1)%13]+_(" Ascending") + self.s.foundations[0].texts.misc.config(text=t1) + self.s.foundations[4].texts.misc.config(text=t2) + + + def _restoreGameHook(self, game): + self.base_rank = game.loadinfo.base_rank + for s in self.s.foundations[:4]: + s.cap.base_rank = self.base_rank + for s in self.s.foundations[4:]: + s.cap.base_rank = (self.base_rank+1)%13 + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_rank=None) # register extra load var. + self.loadinfo.base_rank = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_rank) + + + # register the game registerGame(GameInfo(280, Camelot, "Camelot", GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) @@ -377,4 +580,9 @@ registerGame(GameInfo(610, SlyFox, "Sly Fox", GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(614, OpenSlyFox, "Open Sly Fox", GI.GT_NUMERICA | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(623, PrincessPatience, "Princess Patience", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(622, GrandmammasPatience, "Grandmamma's Patience", + GI.GT_NUMERICA, 2, 0, GI.SL_MOSTLY_SKILL)) + diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index c0d339bd..169f8c3c 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -68,7 +68,7 @@ class Fan(Game): # game layout # - def createGame(self, rows=(5,5,5,3), playcards=9, reserves=0): + def createGame(self, rows=(5,5,5,3), playcards=9, reserves=0, texts=False): # create layout l, s = Layout(self), self.s @@ -106,6 +106,12 @@ class Fan(Game): x += w x, y = self.width - l.XS, self.height - l.YS s.talon = self.Talon_Class(x, y, self) + if texts: + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") + font = self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + # define stack-groups l.defaultStackGroups() @@ -601,6 +607,40 @@ class TroikaPlus(Troika): ## self.s.talon.dealRow(rows=self.s.rows[:-1]) +# /*********************************************************************** +# // Fascination Fan +# ************************************************************************/ + +class FascinationFan_Talon(RedealTalonStack): + def dealCards(self, sound=0): + RedealTalonStack.redealCards(self, shuffle=True, sound=sound) + +class FascinationFan(Fan): + Talon_Class = StackWrapper(FascinationFan_Talon, max_rounds=7) + #Talon_Class = StackWrapper(LaBelleLucie_Talon, max_rounds=7) + RowStack_Class = StackWrapper(AC_RowStack, base_rank=NO_RANK) + + def createGame(self): + Fan.createGame(self, texts=True) + + def startGame(self): + for i in range(2): + self.s.talon.dealRow(rows=self.s.rows[:17], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def redealCards(self): + nrows = len(self.s.talon.cards)/3 + if len(self.s.talon.cards)%3: nrows += 1 + self.s.talon.dealRowAvail(rows=self.s.rows[:nrows], flip=0, frames=4) + self.s.talon.dealRowAvail(rows=self.s.rows[:nrows], flip=0, frames=4) + self.s.talon.dealRowAvail(frames=4) + for r in self.s.rows[nrows-2:nrows]: + if r.canFlipCard(): r.flipMove() + + shallHighlightMatch = Game._shallHighlightMatch_AC + + # register the game registerGame(GameInfo(56, Fan, "Fan", @@ -637,4 +677,6 @@ registerGame(GameInfo(516, Troika, "Troika", GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(517, TroikaPlus, "Troika +", GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(625, FascinationFan, "Fascination Fan", + GI.GT_FAN_TYPE, 1, 6, GI.SL_BALANCED)) diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index 970a1a02..25ce1f77 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -41,6 +41,7 @@ from pysollib.stack import * from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import DefaultHint, FreeCellType_Hint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText # /*********************************************************************** @@ -463,6 +464,113 @@ class Glencoe(Intrigue): ] +# /*********************************************************************** +# // Step-Up +# ************************************************************************/ + +class StepUp_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return False + if from_stack in self.game.s.reserves: + return True + for r in self.game.s.reserves: + if not r.cards: + return True + return False + +class StepUp_Talon(WasteTalonStack): + def canDealCards(self): + if not WasteTalonStack.canDealCards(self): + return False + for r in self.game.s.reserves: + if not r.cards: + return False + return True + +class StepUp_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return False + if (from_stack in self.game.s.reserves or + from_stack in self.game.s.foundations): + return False + return True + + +class StepUp(Game): + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+13*l.XS, l.YM+7*l.YS) + self.base_rank = ANY_RANK + + x, y = l.XM+2.5*l.XS, l.YM + for i in range(8): + s.foundations.append(StepUp_Foundation(x, y, self, + suit=i%4, mod=13, base_rank=ANY_RANK)) + x += l.XS + tx, ty, ta, tf = l.getTextAttr(s.foundations[0], "sw") + font = self.app.getFont("canvas_default") + self.texts.info = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + + x, y = l.XM, l.YM+l.YS + for i in range(13): + s.reserves.append(ReserveStack(x, y, self)) + x += l.XS + x, y = l.XM+2*l.XS, l.YM+2*l.YS + for i in range(9): + s.rows.append(StepUp_RowStack(x, y, self, max_move=1, mod=13)) + x += l.XS + + x, y = l.XM, l.YM+2.5*l.YS + s.talon = StepUp_Talon(x, y, self, max_rounds=1) + l.createText(s.talon, 'se') + y += l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'se') + + l.defaultStackGroups() + + + def startGame(self): + c = self.s.talon.cards[-1] + self.base_rank = c.rank + self.s.talon.flipMove() + self.s.talon.moveMove(1, self.s.foundations[c.suit], frames=0) + for s in self.s.foundations: + s.cap.base_rank = c.rank + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def updateText(self): + if self.preview > 1: + return + base_rank = self.base_rank + if base_rank == ANY_RANK: + t = '' + else: + t = RANKS[base_rank] + self.texts.info.config(text=t) + + def _restoreGameHook(self, game): + self.base_rank = game.loadinfo.base_rank + for s in self.s.foundations: + s.cap.base_rank = self.base_rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_rank=None) # register extra load var. + self.loadinfo.base_rank = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_rank) + + shallHighlightMatch = Game._shallHighlightMatch_ACW + + # register the game registerGame(GameInfo(141, DerKatzenschwanz, "Cat's Tail", GI.GT_FREECELL | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, @@ -488,6 +596,8 @@ registerGame(GameInfo(612, Glencoe, "Glencoe", registerGame(GameInfo(616, LaggardLady, "Laggard Lady", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, rules_filename="intrigue.html")) +registerGame(GameInfo(624, StepUp, "Step-Up", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index a53121af..14fe6608 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -730,7 +730,6 @@ class AnnoDomini(Numerica): - # register the game registerGame(GameInfo(257, Numerica, "Numerica", GI.GT_NUMERICA | GI.GT_CONTRIB, 1, 0, GI.SL_BALANCED, diff --git a/pysollib/games/sthelena.py b/pysollib/games/sthelena.py index 1fb75243..d7f679b6 100644 --- a/pysollib/games/sthelena.py +++ b/pysollib/games/sthelena.py @@ -169,6 +169,161 @@ class BoxKite(StHelena): +# /*********************************************************************** +# // Les Quatre Coins +# ************************************************************************/ + +class LesQuatreCoins_RowStack(UD_RK_RowStack): + def acceptsCards(self, from_stack, cards): + if not UD_RK_RowStack.acceptsCards(self, from_stack, cards): + return False + return len(self.game.s.talon.cards) == 0 + + +class LesQuatreCoins_Talon(RedealTalonStack): + + def canDealCards(self): + if self.round == self.max_rounds: + return len(self.cards) != 0 + return not self.game.isGameWon() + + def dealCards(self, sound=0): + if not self.cards: + RedealTalonStack.redealCards(self, sound=0) + if sound and not self.game.demo: + self.game.startDealSample() + rows = self.game.s.rows + rows = rows[:1]+rows[4:8]+(rows[2],rows[1])+rows[8:]+rows[3:4] + num_cards = self.dealRowAvail(rows=rows) + if sound and not self.game.demo: + self.game.stopSamples() + return num_cards + + +class LesQuatreCoins_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return True + if self.game.s.talon.cards: + if from_stack in self.game.s.rows[4:]: + i = list(self.game.s.foundations).index(self) + j = list(self.game.s.rows).index(from_stack) + return i == j-4 + return True + + +class LesQuatreCoins(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+7*l.XS, l.YM+5*l.YS) + + for i, j in ((0,0),(5,0),(0,4),(5,4)): + x, y = l.XM+l.XS+i*l.XS, l.YM+j*l.YS + stack = LesQuatreCoins_RowStack(x, y, self, + max_move=1, base_rank=NO_RANK) + s.rows.append(stack) + stack.CARD_YOFFSET = 0 + for x in (l.XM+2*l.XS, l.XM+5*l.XS): + y = l.YM+l.YS/2 + for j in range(4): + stack = LesQuatreCoins_RowStack(x, y, self, + max_move=1, base_rank=NO_RANK) + s.rows.append(stack) + stack.CARD_YOFFSET = 0 + y += l.YS + x, y = l.XM+3*l.XS, l.YM+l.YS/2 + for i in range(4): + s.foundations.append(LesQuatreCoins_Foundation(x, y, self, suit=i)) + y += l.YS + x, y = l.XM+4*l.XS, l.YM+l.YS/2 + for i in range(4): + s.foundations.append(LesQuatreCoins_Foundation(x, y, self, suit=i, + base_rank=KING, dir=-1)) + y += l.YS + + x, y = l.XM, l.YM+2*l.YS + s.talon = LesQuatreCoins_Talon(x, y, self, max_rounds=3) + l.createText(s.talon, 's') + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") + font = self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealCards() + + shallHighlightMatch = Game._shallHighlightMatch_RK + + +# /*********************************************************************** +# // Regal Family +# ************************************************************************/ + +class RegalFamily_RowStack(UD_SS_RowStack): + def acceptsCards(self, from_stack, cards): + if not UD_SS_RowStack.acceptsCards(self, from_stack, cards): + return False + return len(self.game.s.talon.cards) == 0 + + +class RegalFamily(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+5*l.YS) + + for i, j in ((0,0),(1,0),(2,0),(3,0),(4,0),(5,0),(6,0), + (6,1),(6,2),(6,3), + (6,4),(5,4),(4,4),(3,4),(2,4),(1,4),(0,4), + (0,3),(0,2),(0,1) + ): + x, y = l.XM+l.XS+i*l.XS, l.YM+j*l.YS + stack = RegalFamily_RowStack(x, y, self, + max_move=1, base_rank=NO_RANK) + s.rows.append(stack) + stack.CARD_YOFFSET = 0 + + x, y = l.XM+3*l.XS, l.YM+l.YS + for i in range(3): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=9, mod=13, dir=-1)) + s.foundations.append(SS_FoundationStack(x, y+2*l.YS, self, suit=i, + base_rank=9, mod=13, dir=-1)) + x += l.XS + x, y = l.XM+3*l.XS, l.YM+2*l.YS + s.foundations.append(SS_FoundationStack(x, y, self, suit=3, + base_rank=ACE, mod=13)) + x += 2*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, suit=3, + base_rank=JACK, mod=13, dir=-1)) + + x, y = l.XM, l.YM+2*l.YS + s.talon = DealRowTalonStack(x, y, self) + l.createText(s.talon, 's') + + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + + shallHighlightMatch = Game._shallHighlightMatch_SS + + + # register the game registerGame(GameInfo(302, StHelena, "St. Helena", GI.GT_2DECK_TYPE, 2, 2, GI.SL_BALANCED, @@ -177,4 +332,8 @@ registerGame(GameInfo(302, StHelena, "St. Helena", )) registerGame(GameInfo(408, BoxKite, "Box Kite", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(620, LesQuatreCoins, "Les Quatre Coins", + GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(621, RegalFamily, "Regal Family", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/tk/findcarddialog.py b/pysollib/tk/findcarddialog.py index cd2115d8..f42c370f 100644 --- a/pysollib/tk/findcarddialog.py +++ b/pysollib/tk/findcarddialog.py @@ -60,10 +60,12 @@ class FindCardDialog(Tkinter.Toplevel): self.images_dir = os.path.join(dir, 'small-emblems') self.label_width, self.label_height = SMALL_EMBLEMS_SIZE self.canvas = MfxCanvas(self, bg='white') + ##self.canvas = MfxCanvas(self, bg='black') self.canvas.pack(expand=True, fill='both') # self.groups = [] self.highlight_items = None + self.busy = False self.connectGame(game) # bind(self, "WM_DELETE_WINDOW", self.destroy) @@ -83,7 +85,7 @@ class FindCardDialog(Tkinter.Toplevel): im = FindCardDialog.CARD_IMAGES.get((rank, suit)) if im is None: r = '%02d' % (rank+1) - s = 'csdh'[suit] + s = 'cshd'[suit] fn = os.path.join(dir, r+s+'.gif') im = makeImage(file=fn) FindCardDialog.CARD_IMAGES[(rank, suit)] = im @@ -91,22 +93,22 @@ class FindCardDialog(Tkinter.Toplevel): cim.addtag(group) cim.lower() # -## rect_width = 4 -## x1, y1 = x0+dx, y0+dy -## rect = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, -## width=rect_width, -## fill=None, -## outline='red', -## state='hidden') -## rect.addtag(group) - rect = None + rect_width = 4 + x1, y1 = x0+dx, y0+dy + rect = MfxCanvasRectangle(self.canvas, x0+1, y0+1, x1-1, y1-1, + width=rect_width, + fill=None, + outline='red', + state='hidden' + ) + rect.addtag(group) # bind(group, '', lambda e, suit=suit, rank=rank, rect=rect: - self.enterEvent(suit, rank, rect)) + self.enterEvent(suit, rank, rect, group)) bind(group, '', lambda e, suit=suit, rank=rank, rect=rect: - self.leaveEvent(suit, rank, rect)) + self.leaveEvent(suit, rank, rect, group)) self.groups.append(group) def connectGame(self, game): @@ -129,28 +131,36 @@ class FindCardDialog(Tkinter.Toplevel): w, h = dx*j+2, dy*i+2 self.canvas.config(width=w, height=h) - def enterEvent(self, suit, rank, rect): - ##print 'enterEvent', suit, rank + def enterEvent(self, suit, rank, rect, group): + ##print 'enterEvent', suit, rank, self.busy + if self.busy: return + self.busy = True self.highlight_items = self.game.highlightCard(suit, rank) if not self.highlight_items: self.highlight_items = [] if self.highlight_items: self.timer = after(self, self.normal_timeout, self.timeoutEvent) - return rect.config(state='normal') + self.canvas.update_idletasks() + self.busy = False - def leaveEvent(self, suit, rank, rect): - ##print 'leaveEvent', suit, rank + def leaveEvent(self, suit, rank, rect, group): + ##print 'leaveEvent', suit, rank, self.busy + if self.busy: return + self.busy = True if self.highlight_items: for i in self.highlight_items: i.delete() - #self.game.canvas.update_idletasks() - #self.canvas.update_idletasks() + self.highlight_items = [] if self.timer: after_cancel(self.timer) self.timer = None - return rect.config(state='hidden') + if self.game.canvas: + self.game.canvas.update_idletasks() + self.canvas.update_idletasks() + self.busy = False + def timeoutEvent(self, *event): if self.highlight_items: @@ -174,6 +184,9 @@ class FindCardDialog(Tkinter.Toplevel): after_cancel(self.timer) self.timer = None self.wm_withdraw() + if self.highlight_items: + for i in self.highlight_items: + i.delete() Tkinter.Toplevel.destroy(self) @@ -203,3 +216,4 @@ def destroy_find_card_dialog(): pass find_card_dialog = None + From 660def3751f4a2e7987f327b786ceea17e7c70a6 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 5 Aug 2006 21:29:10 +0000 Subject: [PATCH 038/266] + 5 new games * improved tkhtml git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@39 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/games/bakersgame.py | 49 +++++++++++++------------ pysollib/games/beleagueredcastle.py | 53 +++++++++++++++++++++++++++ pysollib/games/fan.py | 11 +++--- pysollib/games/fortythieves.py | 20 +++++++++-- pysollib/games/klondike.py | 55 +++++++++++++++++++++++++++++ pysollib/tk/tkhtml.py | 13 ++++--- scripts/all_games.py | 7 ++-- 7 files changed, 170 insertions(+), 38 deletions(-) diff --git a/pysollib/games/bakersgame.py b/pysollib/games/bakersgame.py index 119d6690..feea47ed 100644 --- a/pysollib/games/bakersgame.py +++ b/pysollib/games/bakersgame.py @@ -241,18 +241,14 @@ class RelaxedSeahavenTowers(SeahavenTowers): # /*********************************************************************** # // Penguin # // Opus +# // Tuxedo # ************************************************************************/ -class Penguin(Game): - GAME_VERSION = 2 +class Tuxedo(Game): RowStack_Class = SS_RowStack Hint_Class = FreeCellType_Hint - # - # game layout - # - def createGame(self, rows=7, reserves=7): # create layout l, s = Layout(self), self.s @@ -286,13 +282,29 @@ class Penguin(Game): # define stack-groups l.defaultStackGroups() - # - # game overrides - # + def startGame(self): + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.rows[::3]) + + shallHighlightMatch = Game._shallHighlightMatch_SSW + + +class Penguin(Tuxedo): + GAME_VERSION = 2 def _shuffleHook(self, cards): # move base cards to top of the Talon (i.e. first cards to be dealt) - return self._shuffleHookMoveToTop(cards, lambda c, rank=cards[-1].rank: (c.rank == rank, 0)) + return self._shuffleHookMoveToTop(cards, + lambda c, rank=cards[-1].rank: (c.rank == rank, 0)) + + def _updateStacks(self): + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + for s in self.s.rows: + s.cap.base_rank = (self.base_card.rank - 1) % 13 def startGame(self): self.base_card = self.s.talon.cards[-4] @@ -310,8 +322,6 @@ class Penguin(Game): self.startDealSample() self.s.talon.dealRow() - shallHighlightMatch = Game._shallHighlightMatch_SSW - def _restoreGameHook(self, game): self.base_card = self.cards[game.loadinfo.base_card_id] self._updateStacks() @@ -323,20 +333,11 @@ class Penguin(Game): def _saveGameHook(self, p): p.dump(self.base_card.id) - # - # game extras - # - - def _updateStacks(self): - for s in self.s.foundations: - s.cap.base_rank = self.base_card.rank - for s in self.s.rows: - s.cap.base_rank = (self.base_card.rank - 1) % 13 - class Opus(Penguin): def createGame(self): - Penguin.createGame(self, reserves=5) + Tuxedo.createGame(self, reserves=5) + # register the game @@ -356,3 +357,5 @@ registerGame(GameInfo(64, Penguin, "Penguin", altnames=("Beak and Flipper",) )) registerGame(GameInfo(427, Opus, "Opus", GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(629, Tuxedo, "Tuxedo", + GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index e846d580..5e95333b 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -715,6 +715,57 @@ class SelectiveCastle(StreetsAndAlleys, Chessboard): shallHighlightMatch = Game._shallHighlightMatch_RKW +# /*********************************************************************** +# // Soother +# ************************************************************************/ + +class Soother(Game): + + def createGame(self, rows=9): + l, s = Layout(self), self.s + self.setSize(l.XM+11*l.XS, l.YM+4*l.YS+12*l.YOFFSET) + + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 's') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 's') + + y = l.YM + for i in range(2): + x = l.XM+2.5*l.XS + for j in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=j%4, max_move=1)) + x += l.XS + y += l.YS + x, y = l.XM, l.YM+2*l.YS + stack = ReserveStack(x, y, self, max_cards=8) + s.reserves.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + l.createText(stack, 'n') + + x, y = l.XM+2*l.XS, l.YM+2*l.YS + for i in range(rows): + s.rows.append(RK_RowStack(x, y, self, max_move=1, base_rank=KING)) + x += l.XS + + l.defaultStackGroups() + + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + shallHighlightMatch = Game._shallHighlightMatch_RK + + def getQuickPlayScore(self, ncards, from_stack, to_stack): + return int(to_stack in self.s.rows) + + # register the game registerGame(GameInfo(146, StreetsAndAlleys, "Streets and Alleys", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) @@ -752,3 +803,5 @@ registerGame(GameInfo(524, SelectiveCastle, "Selective Castle", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(535, ExiledKings, "Exiled Kings", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(626, Soother, "Soother", + GI.GT_4DECK_TYPE | GI.GT_ORIGINAL, 4, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index 169f8c3c..b3a2ebf3 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -630,13 +630,12 @@ class FascinationFan(Fan): self.s.talon.dealRow() def redealCards(self): - nrows = len(self.s.talon.cards)/3 - if len(self.s.talon.cards)%3: nrows += 1 - self.s.talon.dealRowAvail(rows=self.s.rows[:nrows], flip=0, frames=4) - self.s.talon.dealRowAvail(rows=self.s.rows[:nrows], flip=0, frames=4) + r0 = r1 = len(self.s.talon.cards)/3 + m = len(self.s.talon.cards)%3 + if m >= 1: r2 += 1 + self.s.talon.dealRow(rows=self.s.rows[:r0], flip=0, frames=4) + self.s.talon.dealRow(rows=self.s.rows[:r1], flip=0, frames=4) self.s.talon.dealRowAvail(frames=4) - for r in self.s.rows[nrows-2:nrows]: - if r.canFlipCard(): r.flipMove() shallHighlightMatch = Game._shallHighlightMatch_AC diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index b329ecc2..8a8d5ba7 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -804,9 +804,11 @@ class Waterloo(FortyThieves): # /*********************************************************************** # // Junction +# // Crossroads # ************************************************************************/ class Junction(Game): + Foundation_Class = StackWrapper(DieRussische_Foundation, max_cards=8) def createGame(self, rows=7): @@ -818,8 +820,8 @@ class Junction(Game): for i in range(2): x = l.XM+2*l.XS for j in range(8): - s.foundations.append(DieRussische_Foundation(x, y, self, - suit=j%4, max_cards=8)) + s.foundations.append(self.Foundation_Class(x, y, self, + suit=j%4)) x += l.XS y += l.YS @@ -847,6 +849,18 @@ class Junction(Game): shallHighlightMatch = Game._shallHighlightMatch_AC +class Crossroads(Junction): + Foundation_Class = StackWrapper(SS_FoundationStack, max_cards=13) + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + # /*********************************************************************** # // The Spark # ************************************************************************/ @@ -1146,4 +1160,6 @@ registerGame(GameInfo(578, IndianPatience, "Indian Patience", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(588, Roosevelt, "Roosevelt", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(628, Crossroads, "Crossroads", + GI.GT_FORTY_THIEVES, 4, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 6018d548..191236fc 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -493,6 +493,7 @@ class FlowerGarden(Stonewall): # // King Albert # // Raglan # // Brigade +# // Queen Victoria # ************************************************************************/ class KingAlbert(Klondike): @@ -553,6 +554,10 @@ class Brigade(Raglan): shallHighlightMatch = Game._shallHighlightMatch_RK +class QueenVictoria(KingAlbert): + RowStack_Class = AC_RowStack + + # /*********************************************************************** # // Jane # // Agnes Bernauer @@ -1222,6 +1227,51 @@ class Legion(Klondike): self.s.talon.dealCards() +# /*********************************************************************** +# // Big Bertha +# ************************************************************************/ + +class BigBertha(Game): + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+15*l.XS, l.YM+3*l.YS+15*l.YOFFSET) + + x, y = l.XM, l.YM + s.talon = InitialDealTalonStack(x, y, self) + + x, y = l.XM+3.5*l.XS, l.YM + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, + suit=i%4, max_cards=12)) + x += l.XS + + x, y = l.XM, l.YM+l.YS + for i in range(15): + s.rows.append(AC_RowStack(x, y, self)) + x += l.XS + + x, y = l.XM, self.height-l.YS + for i in range(14): + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + x += l.XS + + s.foundations.append(RK_FoundationStack(x, y, self, suit=ANY_SUIT, + base_rank=KING, dir=0, max_cards=8)) + + l.defaultStackGroups() + + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRow(rows=self.s.reserves) + + shallHighlightMatch = Game._shallHighlightMatch_AC + + # register the game registerGame(GameInfo(2, Klondike, "Klondike", @@ -1350,4 +1400,9 @@ registerGame(GameInfo(602, BritishCanister, "British Canister", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(607, Legion, "Legion", GI.GT_KLONDIKE, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(627, QueenVictoria, "Queen Victoria", + GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(630, BigBertha, "Big Bertha", + GI.GT_RAGLAN | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) + diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index b7466b2e..2ce7d6e0 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -205,6 +205,10 @@ class tkHTMLParser(htmllib.HTMLParser): def handle_image(self, src, alt, ismap, align, width, height): self.formatter.writer.viewer.showImage(src, alt, ismap, align, width, height) + def do_br(self, attrs): + #self.formatter.add_line_break() + self.formatter.add_literal_data('\n') + # /*********************************************************************** # // @@ -486,10 +490,11 @@ to open the following URL: self.images[url] = img ##print url, img if img: - padx, pady = 10, 10 - padx, pady = 0, 20 - if align.lower() == "left": - padx = 0 + ##padx, pady = 10, 10 + ##padx, pady = 0, 20 + ##if align.lower() == "left": + ## padx = 0 + padx, pady = 0, 0 self.text.image_create(index="insert", image=img, padx=padx, pady=pady) diff --git a/scripts/all_games.py b/scripts/all_games.py index 59f7e447..7112f18e 100755 --- a/scripts/all_games.py +++ b/scripts/all_games.py @@ -219,9 +219,10 @@ def plain_text(): for id in get_games_func(): gi = GAME_DB.get(id) if gi.category == GI.GC_FRENCH: - name = gi.name.lower() - name = re.sub('\W', '', name) - print id, name #, gi.si.game_type, gi.si.game_type == GI.GC_FRENCH + print gi.name.encode('utf-8') + ##name = gi.name.lower() + ##name = re.sub('\W', '', name) + ##print id, name #, gi.si.game_type, gi.si.game_type == GI.GC_FRENCH ## From 91fae82cddbd8e61e051f8a08c5ea369e61f3134 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 6 Aug 2006 21:34:57 +0000 Subject: [PATCH 039/266] + 12 new games * improved tkhtml git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@40 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 5 + pysollib/games/auldlangsyne.py | 38 ++++++- pysollib/games/canfield.py | 55 +++++++++ pysollib/games/fortythieves.py | 55 +++++++++ pysollib/games/gypsy.py | 21 ++++ pysollib/games/klondike.py | 26 +++++ pysollib/games/numerica.py | 68 ++++++++++++ pysollib/games/royalcotillion.py | 185 +++++++++++++++++++++++++++++++ pysollib/games/sultan.py | 47 ++++++++ pysollib/games/terrace.py | 98 ++++++++++++++++ pysollib/main.py | 2 +- pysollib/stack.py | 2 + pysollib/tk/selecttree.py | 2 +- pysollib/tk/tkhtml.py | 48 +++++--- 14 files changed, 627 insertions(+), 25 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index 7da29e8a..32faa22f 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -67,6 +67,7 @@ from pysoltk import PysolToolbar from pysoltk import PysolStatusbar, HelpStatusbar from pysoltk import SelectCardsetByTypeDialogWithPreview from pysoltk import SelectDialogTreeData +from pysoltk import tkHTMLViewer from pysoltk import TOOLBAR_BUTTONS from pysoltk import destroy_find_card_dialog from help import helpAbout, destroy_help @@ -888,6 +889,10 @@ class Application: fn = self.dataloader.findImage(f, dir) im = loadImage(fn) SelectDialogTreeData.img.append(im) + dir = os.path.join('images', 'htmlviewer') + # + fn = self.dataloader.findImage('disk', dir) + tkHTMLViewer.symbols_fn['disk'] = fn def loadImages4(self): # load all remaining images diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index bcbbec16..d69286dc 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -116,6 +116,7 @@ class AuldLangSyne(TamOShanter): # /*********************************************************************** # // Strategy +# // Strategy + # ************************************************************************/ class Strategy_Foundation(SS_FoundationStack): @@ -158,12 +159,12 @@ class Strategy_RowStack(BasicRowStack): class Strategy(Game): - def createGame(self): + def createGame(self, rows=8): # create layout l, s = Layout(self), self.s # set window - self.setSize(l.XM + 8*l.XS, l.YM + 4*l.YS) + self.setSize(l.XM + rows*l.XS, l.YM + 4*l.YS) # create stacks x, y, = l.XM, l.YM @@ -172,10 +173,11 @@ class Strategy(Game): for i in range(4): x, y = l.XM + (i+2)*l.XS, l.YM s.foundations.append(Strategy_Foundation(x, y, self, suit=i, max_move=0)) - for i in range(8): - x, y = l.XM + i*l.XS, l.YM + l.YS - s.rows.append(Strategy_RowStack(x, y, self, max_move=1, max_accept=1)) - x = x + l.XS + x, y = l.XM, l.YM+l.YS + for i in range(rows): + s.rows.append(Strategy_RowStack(x, y, + self, max_move=1, max_accept=1)) + x += l.XS # define stack-groups l.defaultStackGroups() @@ -194,6 +196,28 @@ class Strategy(Game): self.s.talon.fillStack() +class StrategyPlus(Strategy): + + def createGame(self): + Strategy.createGame(self, rows=6) + + def _shuffleHook(self, cards): + return cards + + def startGame(self): + self.s.talon.fillStack() + + def fillStack(self, stack): + if stack is self.s.talon and stack.cards: + c = stack.cards[-1] + if c.rank == ACE: + old_state = self.enterState(self.S_FILL) + self.moveMove(1, stack, self.s.foundations[c.suit]) + if stack.canFlipCard(): + stack.flipMove() + self.leaveState(old_state) + + # /*********************************************************************** # // Interregnum # ************************************************************************/ @@ -538,4 +562,6 @@ registerGame(GameInfo(560, DoubleAcquaintance, "Double Acquaintance", GI.GT_NUMERICA, 2, 2, GI.SL_BALANCED)) registerGame(GameInfo(569, Primrose, "Primrose", GI.GT_NUMERICA, 2, 8, GI.SL_BALANCED)) +registerGame(GameInfo(636, StrategyPlus, "Strategy +", + GI.GT_NUMERICA, 1, 0, GI.SL_SKILL)) diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 9be4bf61..4549b951 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -807,6 +807,59 @@ class Skippy(Canfield): shallHighlightMatch = Game._shallHighlightMatch_RKW +# /*********************************************************************** +# // Lafayette +# ************************************************************************/ + +class Lafayette(Game): + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+2*l.YS+12*l.YOFFSET) + + x, y = l.XM, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + s.foundations.append(SS_FoundationStack(x+4*l.XS, y, self, suit=i, + base_rank=KING, dir=-1)) + x += l.XS + x, y = l.XM, l.YM+l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=UNLIMITED_REDEALS, + num_deal=3) + l.createText(s.talon, 'ne') + y += l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'ne') + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(4): + s.rows.append(AC_RowStack(x, y, self, base_rank=6)) + x += l.XS + x += l.XS + stack = OpenStack(x, y, self) + s.reserves.append(stack) + stack.CARD_YOFFSET = l.YOFFSET + + l.defaultStackGroups() + + + def startGame(self): + for i in range(13): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + if self.s.reserves[0].cards: + old_state = self.enterState(self.S_FILL) + self.s.reserves[0].moveMove(1, stack) + self.leaveState(old_state) + + + shallHighlightMatch = Game._shallHighlightMatch_AC + + # register the game registerGame(GameInfo(105, Canfield, "Canfield", # was: 262 @@ -856,4 +909,6 @@ registerGame(GameInfo(527, Doorway, "Doorway", altnames=('Solstice',) )) registerGame(GameInfo(605, Skippy, "Skippy", GI.GT_FAN_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(642, Lafayette, "Lafayette", + GI.GT_CANFIELD, 1, -1, GI.SL_BALANCED)) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 8a8d5ba7..9115b21d 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -967,6 +967,7 @@ class DoubleGoldMine(Streets): # // Unlimited # // Breakwater # // Forty Nine +# // Alternations # ************************************************************************/ class Interchange(FortyThieves): @@ -1019,6 +1020,11 @@ class FortyNine(Interchange): shallHighlightMatch = Game._shallHighlightMatch_AC +class Alternations(Interchange): + RowStack_Class = AC_RowStack + shallHighlightMatch = Game._shallHighlightMatch_AC + + # /*********************************************************************** # // Indian Patience # ************************************************************************/ @@ -1054,6 +1060,51 @@ class IndianPatience(Indian): self.leaveState(old_state) +# /*********************************************************************** +# // Floradora +# ************************************************************************/ + +class Floradora(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self): + + l, s = Layout(self), self.s + + self.setSize(l.XM+10*l.XS, l.YM+2*l.YS+12*l.YOFFSET+l.TEXT_HEIGHT) + + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 's') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 's') + x += l.XS + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i%4, + max_cards=12)) + x += l.XS + x, y = l.XM, l.YM+l.YS+l.TEXT_HEIGHT + s.foundations.append(RK_FoundationStack(x, y, self, suit=ANY_SUIT, + base_rank=KING, dir=0, max_cards=8)) + x += 3*l.XS + for i in range(6): + s.rows.append(RK_RowStack(x, y, self, max_move=1)) + x += l.XS + + l.defaultStackGroups() + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + shallHighlightMatch = Game._shallHighlightMatch_RK + + + # register the game registerGame(GameInfo(13, FortyThieves, "Forty Thieves", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL, @@ -1162,4 +1213,8 @@ registerGame(GameInfo(588, Roosevelt, "Roosevelt", GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(628, Crossroads, "Crossroads", GI.GT_FORTY_THIEVES, 4, 0, GI.SL_BALANCED)) +registerGame(GameInfo(631, Alternations, "Alternations", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(632, Floradora, "Floradora", + GI.GT_FORTY_THIEVES, 2, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index 9435b043..3b84e649 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -703,6 +703,25 @@ class Eclipse(Gypsy): shallHighlightMatch = Game._shallHighlightMatch_SS +# /*********************************************************************** +# // Brazilian Patience +# ************************************************************************/ + +class BrazilianPatience(Gypsy): + Layout_Method = Layout.klondikeLayout + RowStack_Class = KingAC_RowStack + + def createGame(self): + Gypsy.createGame(self, rows=10, playcards=22) + + def startGame(self, flip=0, reverse=1): + for i in range(1, 10): + self.s.talon.dealRow(rows=self.s.rows[i:], flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + + # register the game registerGame(GameInfo(1, Gypsy, "Gypsy", GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) @@ -763,4 +782,6 @@ registerGame(GameInfo(581, Flamenco, "Flamenco", GI.GT_GYPSY | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(584, Eclipse, "Eclipse", GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(640, BrazilianPatience, "Brazilian Patience", + GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 191236fc..a7bf7d45 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -139,6 +139,7 @@ class KlondikeByThrees(Klondike): # /*********************************************************************** # // Thumb and Pouch +# // Chinaman # ************************************************************************/ class ThumbAndPouch(Klondike): @@ -153,6 +154,13 @@ class ThumbAndPouch(Klondike): or card2.rank + 1 == card1.rank)) +class Chinaman(ThumbAndPouch): + RowStack_Class = StackWrapper(BO_RowStack, base_rank=KING) + + def createGame(self): + Klondike.createGame(self, num_deal=3, max_rounds=2) + + # /*********************************************************************** # // Whitehead # ************************************************************************/ @@ -1272,6 +1280,20 @@ class BigBertha(Game): shallHighlightMatch = Game._shallHighlightMatch_AC +# /*********************************************************************** +# // Athena +# ************************************************************************/ + +class Athena(Klondike): + + def startGame(self): + self.s.talon.dealRow(frames=0, flip=0) + self.s.talon.dealRow(frames=0) + self.s.talon.dealRow(frames=0, flip=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + # register the game registerGame(GameInfo(2, Klondike, "Klondike", @@ -1404,5 +1426,9 @@ registerGame(GameInfo(627, QueenVictoria, "Queen Victoria", GI.GT_RAGLAN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(630, BigBertha, "Big Bertha", GI.GT_RAGLAN | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(633, Athena, "Athena", + GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) +registerGame(GameInfo(634, Chinaman, "Chinaman", + GI.GT_KLONDIKE, 1, 1, GI.SL_BALANCED)) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index 14fe6608..ea0d6df0 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -729,6 +729,72 @@ class AnnoDomini(Numerica): shallHighlightMatch = Game._shallHighlightMatch_ACW +# /*********************************************************************** +# // Circle Nine +# ************************************************************************/ + +class CircleNine_RowStack(BasicRowStack): + def acceptsCards(self, from_stack, cards): + if not BasicRowStack.acceptsCards(self, from_stack, cards): + return False + return from_stack is self.game.s.talon + + def getHelp(self): + return _('Tableau. Build regardless of rank and suit.') + + +class CircleNine(Game): + Hint_Class = Numerica_Hint + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+7*l.XS, l.YM+3*l.YS) + + for i, j in ((1,0), + (2,0), + (3,0), + (4,0), + (5,1), + (3.5,2), + (2.5,2), + (1.5,2), + (0,1), + ): + x, y = l.XM+(1+i)*l.XS, l.YM+j*l.YS + stack = CircleNine_RowStack(x, y, self, max_accept=1, + max_move=1, base_rank=NO_RANK) + s.rows.append(stack) + stack.CARD_YOFFSET = 0 + + x, y = l.XM+3.5*l.XS, l.YM+l.YS + stack = RK_FoundationStack(x, y, self, suit=ANY_SUIT, + max_cards=52, max_move=0, mod=13) + s.foundations.append(stack) + l.createText(stack, 'ne') + x, y = l.XM, l.YM + s.talon = Strategerie_Talon(x, y, self) + l.createText(s.talon, 'ne') + + l.defaultStackGroups() + self.sg.dropstacks.append(s.talon) + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.foundations) + self.s.talon.dealRow() + self.s.talon.fillStack() + + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + if self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) + + + # register the game registerGame(GameInfo(257, Numerica, "Numerica", @@ -765,4 +831,6 @@ registerGame(GameInfo(600, AnnoDomini, "Anno Domini", GI.GT_NUMERICA, 1, 2, GI.SL_BALANCED)) registerGame(GameInfo(613, Fanny, "Fanny", GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(641, CircleNine, "Circle Nine", + GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 606802a3..44d6491f 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -721,6 +721,187 @@ class Frames(Game): shallHighlightMatch = Game._shallHighlightMatch_SS +# /*********************************************************************** +# // Royal Rendezvous +# ************************************************************************/ + +class RoyalRendezvous(Game): + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+9.5*l.XS, l.YM+4.5*l.YS) + + y = l.YM + # kings + suit = 0 + for i in (0,1,6,7): + x = l.XM+(1.5+i)*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, suit=suit, + base_rank=KING, max_cards=1)) + suit += 1 + # aces + suit = 0 + for i in (2,3,4,5): + x = l.XM+(1.5+i)*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, suit=suit)) + suit += 1 + y += l.YS + # twos + suit = 0 + for i in (0,1,6,7): + x = l.XM+(1.5+i)*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, suit=suit, + base_rank=1, dir=2, max_cards=6)) + suit += 1 + # aces + suit = 0 + for i in (2,3,4,5): + x = l.XM+(1.5+i)*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, suit=suit, + dir=2, max_cards=6)) + suit += 1 + + y += 1.5*l.YS + for i in (0,1): + x = l.XM+1.5*l.XS + for j in range(8): + s.rows.append(OpenStack(x, y, self, max_accept=0)) + x += l.XS + y += l.YS + + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 'ne') + y += l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'ne') + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + # move twos to top + cards = self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == 1 and c.deck == 0, c.suit)) + # move aces to top + cards = self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, (c.deck, c.suit))) + return cards + + + def startGame(self): + # deal aces + self.s.talon.dealRow(rows=self.s.foundations[4:8], frames=0) + self.s.talon.dealRow(rows=self.s.foundations[12:16], frames=0) + # deal twos + self.s.talon.dealRow(rows=self.s.foundations[8:12], frames=0) + # + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + + def fillStack(self, stack): + if not stack.cards and stack in self.s.rows: + if not self.s.waste.cards: + self.s.talon.dealCards() + if self.s.waste.cards: + old_state = self.enterState(self.S_FILL) + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + +# /*********************************************************************** +# // Shady Lanes +# ************************************************************************/ + +class ShadyLanes_Hint(CautiousDefaultHint): + def computeHints(self): + CautiousDefaultHint.computeHints(self) + if self.hints: + return + for r in self.game.s.rows: + if not r.cards: + for s in self.game.s.reserves: + if s.cards: + self.addHint(5000-s.cards[0].rank, 1, s, r) + + +class ShadyLanes_Foundation(AbstractFoundationStack): + def acceptsCards(self, from_stack, cards): + if not AbstractFoundationStack.acceptsCards(self, from_stack, cards): + return False + if self.cards: + # check the rank + if self.cards[-1].rank+1 != cards[0].rank: + return False + return True + + def getHelp(self): + return _('Foundation. Build up by color.') + + +class ShadyLanes_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return from_stack in self.game.s.reserves + return True + + +class ShadyLanes(Game): + Hint_Class = ShadyLanes_Hint + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+5*l.YS) + + x, y = l.XM, l.YM + for i in range(8): + suit = i/2 + color = suit/2 + s.foundations.append(ShadyLanes_Foundation(x, y, self, + base_suit=suit, suit=ANY_SUIT, color=color)) + x += l.XS + x, y = l.XM, l.YM+l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 'ne') + y += l.YS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'ne') + x, y = l.XM+2*l.XS, l.YM+l.YS + for i in range(4): + s.rows.append(ShadyLanes_RowStack(x, y, self, max_move=1)) + x += l.XS + + x, y = self.width-l.XS, l.YM+l.YS + for i in range(4): + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + y += l.YS + + l.defaultStackGroups() + + + def fillStack(self, stack): + if not stack.cards and stack in self.s.reserves: + if not self.s.waste.cards: + self.s.talon.dealCards() + if self.s.waste.cards: + old_state = self.enterState(self.S_FILL) + self.s.waste.moveMove(1, stack) + self.leaveState(old_state) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.reserves) + self.s.talon.dealRow() + self.s.talon.dealCards() + + shallHighlightMatch = Game._shallHighlightMatch_AC + + + # register the game registerGame(GameInfo(54, RoyalCotillion, "Royal Cotillion", GI.GT_2DECK_TYPE, 2, 0, GI.SL_LUCK)) @@ -750,4 +931,8 @@ registerGame(GameInfo(608, Frames, "Frames", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(609, GrantsReinforcement, "Grant's Reinforcement", GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(638, RoyalRendezvous, "Royal Rendezvous", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(639, ShadyLanes, "Shady Lanes", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index d358bf25..0e95f691 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -864,6 +864,51 @@ class RoyalAids(Game): shallHighlightMatch = Game._shallHighlightMatch_AC +# /*********************************************************************** +# // Circle Eight +# ************************************************************************/ + +class CircleEight(Game): + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+5*l.XS, l.YM+3*l.YS) + + for i, j in ((1,0), + (2,0), + (3,0), + (4,1), + (3,2), + (2,2), + (1,2), + (0,1), + ): + x, y = l.XM+i*l.XS, l.YM+j*l.YS + stack = RK_RowStack(x, y, self, dir=1, mod=13, max_move=0) + s.rows.append(stack) + stack.CARD_YOFFSET = 0 + + x, y = l.XM+1.5*l.XS, l.YM+l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=2) + l.createText(s.talon, 'nw') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'ne') + + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def isGameWon(self): + return len(self.s.talon.cards) == 0 and len(self.s.waste.cards) == 0 + + shallHighlightMatch = Game._shallHighlightMatch_RKW + + # register the game registerGame(GameInfo(330, Sultan, "Sultan", GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK, @@ -898,3 +943,5 @@ registerGame(GameInfo(565, RoyalAids, "Royal Aids", GI.GT_2DECK_TYPE, 2, UNLIMITED_REDEALS, GI.SL_BALANCED)) registerGame(GameInfo(598, PicturePatience, "Picture Patience", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(635, CircleEight, "Circle Eight", + GI.GT_1DECK_TYPE, 1, 1, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/terrace.py b/pysollib/games/terrace.py index b24bdfaa..14f953cb 100644 --- a/pysollib/games/terrace.py +++ b/pysollib/games/terrace.py @@ -343,6 +343,102 @@ class MamySusan(Terrace): pass +# /*********************************************************************** +# // Bastille Day +# ************************************************************************/ + +class BastilleDay_BastilleStack(Stack): + def clickHandler(self, event): + return self.dealCards(sound=1) + + def rightclickHandler(self, event): + return self.clickHandler(event) + + def canDealCards(self): + if self.game.s.reserves[-1].cards: + return 0 < len(self.cards) < 12 + return len(self.cards) > 0 + + def dealCards(self, sound=0): + if not self.canDealCards(): + return 0 + old_state = self.game.enterState(self.game.S_DEAL) + if sound and not self.game.demo: + self.game.playSample("dealwaste") + self.flipMove() + self.moveMove(1, self.game.s.reserves[-1], frames=4, shadow=0) + self.game.leaveState(old_state) + return 1 + + def getHelp(self): + return '' # FIXME + + +class BastilleDay(Game): + + def createGame(self, rows=9, max_rounds=1, num_deal=1, playcards=16): + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+3*l.YS+12*l.YOFFSET+l.TEXT_HEIGHT) + + x, y = l.XM, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 's') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 's') + x += 2*l.XS + stack = BastilleDay_BastilleStack(x, y, self) + s.reserves.append(stack) + l.createText(stack, 's') + x += l.XS + stack = OpenStack(x, y, self) + stack.CARD_XOFFSET = l.XOFFSET + l.createText(stack, 's') + s.reserves.append(stack) + + x, y = l.XM, l.YM+l.YS+l.TEXT_HEIGHT + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i%4)) + x = x + l.XS + x, y = l.XM, l.YM+2*l.YS+l.TEXT_HEIGHT + for i in range(8): + s.rows.append(AC_RowStack(x, y, self)) + x = x + l.XS + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + # move Kings to top + cards = self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == KING, None)) + # move any 4 cards to top + cards = cards[4:]+cards[:4] + return cards + + def startGame(self, nrows=4): + for i in range(12): # deal to Bastille + self.s.talon.dealRow(flip=0, rows=[self.s.reserves[0]], frames=0) + for i in range(9): + self.s.talon.dealRow(rows=[self.s.reserves[-1]], frames=0) + for i in range(3): + self.s.talon.dealRow(flip=0, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def dealCards(self, sound=1): + # for demo-mode + if self.demo: + r = self.s.reserves[0] + if r.canDealCards(): + self.demo.last_deal = [] # don't check last deal + return r.dealCards(sound=sound) + return Game.dealCards(self, sound=sound) + + shallHighlightMatch = Game._shallHighlightMatch_AC + + # register the game registerGame(GameInfo(135, Terrace, "Terrace", @@ -363,4 +459,6 @@ registerGame(GameInfo(533, MamySusan, "Mamy Susan", GI.GT_TERRACE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(582, Wood, "Wood", GI.GT_TERRACE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(637, BastilleDay, "Bastille Day", + GI.GT_TERRACE, 2, 0, GI.SL_BALANCED)) diff --git a/pysollib/main.py b/pysollib/main.py index 4c0629a1..e9f14010 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -445,7 +445,7 @@ Sounds and background music will be disabled.'''), if app.tabletile_index > 0: color = "#008200" app.intro.progress = PysolProgressBar(app, top, title=title, color=color, - images=app.progress_images, norm=1.32) + images=app.progress_images, norm=1.4) # prepare other images app.loadImages2() diff --git a/pysollib/stack.py b/pysollib/stack.py index 21cc6fc1..082c0749 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -2163,6 +2163,7 @@ class FaceUpWasteTalonStack(WasteTalonStack): def fillStack(self): if self.canFlipCard(): self.game.flipMove(self) + self.game.fillStack(self) class OpenTalonStack(TalonStack, OpenStack): @@ -2183,6 +2184,7 @@ class OpenTalonStack(TalonStack, OpenStack): def fillStack(self): if self.canFlipCard(): self.game.flipMove(self) + self.game.fillStack(self) def clickHandler(self, event): if self.canDealCards(): diff --git a/pysollib/tk/selecttree.py b/pysollib/tk/selecttree.py index db299b57..5486c387 100644 --- a/pysollib/tk/selecttree.py +++ b/pysollib/tk/selecttree.py @@ -91,7 +91,7 @@ class SelectDialogTreeNode(MfxTreeNode): # ************************************************************************/ class SelectDialogTreeData: - img = None + img = [] # loaded in Application.loadImages3 def __init__(self): self.tree_xview = (0.0, 1.0) self.tree_yview = (0.0, 1.0) diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 2ce7d6e0..8c735d90 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -166,7 +166,18 @@ class tkHTMLWriter(formatter.DumbWriter): self.indent = " " * level def send_label_data(self, data): - self.__write(self.indent + data + " ") + ##self.__write(self.indent + data + " ") + self.__write(self.indent) + if data == '*': #
  • + img = self.viewer.symbols_img.get('disk') + if img: + self.text.image_create(index='insert', image=img, + padx=0, pady=0) + else: + self.__write('*') + else: + self.__write(data) + self.__write(' ') def send_paragraph(self, blankline): if self.col > 0: @@ -215,6 +226,9 @@ class tkHTMLParser(htmllib.HTMLParser): # ************************************************************************/ class tkHTMLViewer: + symbols_fn = {} # filenames, loaded in Application.loadImages3 + symbols_img = {} + def __init__(self, parent): self.parent = parent self.home = None @@ -268,6 +282,10 @@ class tkHTMLViewer: parent.columnconfigure(2, weight=1) parent.rowconfigure(1, weight=1) + # load images + for name, fn in self.symbols_fn.items(): + self.symbols_img[name] = self.getImage(fn) + self.initBindings() def initBindings(self): @@ -477,25 +495,21 @@ to open the following URL: text=msg, bitmap="warning", strings=(_("&OK"),), default=0) + def getImage(self, fn): + if self.images.has_key(fn): + return self.images[fn] + try: + img = Tkinter.PhotoImage(master=self.parent, file=fn) + except: + img = None + self.images[fn] = img + return img + def showImage(self, src, alt, ismap, align, width, height): url = self.basejoin(src) - ##print url, ":", src, alt, ismap, align, width, height - if self.images.has_key(url): - img = self.images[url] - else: - try: - img = Tkinter.PhotoImage(master=self.parent, file=url) - except: - img = None - self.images[url] = img - ##print url, img + img = self.getImage(url) if img: - ##padx, pady = 10, 10 - ##padx, pady = 0, 20 - ##if align.lower() == "left": - ## padx = 0 - padx, pady = 0, 0 - self.text.image_create(index="insert", image=img, padx=padx, pady=pady) + self.text.image_create(index="insert", image=img, padx=0, pady=0) From a19c507d5e13571facf04369f34e1309a1c30615 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 7 Aug 2006 21:35:48 +0000 Subject: [PATCH 040/266] + 3 new games * little reorganisation: move all french games to pysollib/games + new command-line option: `--french-only' (undocumented) * misc. improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@41 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/actions.py | 4 +- pysollib/app.py | 10 +- pysollib/game.py | 10 +- pysollib/gamedb.py | 14 +- pysollib/games/__init__.py | 3 + pysollib/games/capricieuse.py | 2 +- pysollib/games/contrib/__init__.py | 1 - pysollib/games/golf.py | 114 ------ pysollib/games/larasgame.py | 449 ++++++++++++++++++++++ pysollib/games/numerica.py | 46 ++- pysollib/games/{contrib => }/sanibel.py | 0 pysollib/games/{ultra => }/threepeaks.py | 26 +- pysollib/games/tournament.py | 60 ++- pysollib/games/ultra/__init__.py | 1 - pysollib/games/ultra/larasgame.py | 460 +---------------------- pysollib/games/ultra/tarock.py | 13 +- pysollib/main.py | 27 +- pysollib/tk/colorsdialog.py | 51 +-- pysollib/tk/fontsdialog.py | 97 ++--- pysollib/tk/gameinfodialog.py | 20 +- pysollib/tk/menubar.py | 14 +- pysollib/tk/selectgame.py | 54 ++- pysollib/tk/soundoptionsdialog.py | 91 ++--- pysollib/tk/statusbar.py | 26 +- pysollib/tk/timeoutsdialog.py | 30 +- pysollib/tk/tkhtml.py | 36 +- pysollib/tk/tkwidget.py | 2 + scripts/all_games.py | 13 +- 28 files changed, 858 insertions(+), 816 deletions(-) delete mode 100644 pysollib/games/contrib/__init__.py create mode 100644 pysollib/games/larasgame.py rename pysollib/games/{contrib => }/sanibel.py (100%) rename pysollib/games/{ultra => }/threepeaks.py (92%) diff --git a/pysollib/actions.py b/pysollib/actions.py index 83e20763..25561a40 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -195,7 +195,7 @@ class PysolMenubarActions: tkopt.negative_bottom.set(opt.negative_bottom) for w in TOOLBAR_BUTTONS: tkopt.toolbar_vars[w].set(opt.toolbar_vars[w]) - if game.gameinfo.category == GI.GC_FRENCH: + if game.canFindCard(): connect_game_find_card_dialog(game) else: destroy_find_card_dialog() @@ -282,7 +282,7 @@ class PysolMenubarActions: ms.quickplay = 1 if opt.highlight_piles and game.getHighlightPilesStacks(): ms.highlight_piles = 1 - if game.gameinfo.category == GI.GC_FRENCH: + if game.canFindCard(): ms.find_card = 1 if game.app.getGameRulesFilename(game.id): # note: this may return "" ms.rules = 1 diff --git a/pysollib/app.py b/pysollib/app.py index 32faa22f..fe0c8615 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -1380,7 +1380,7 @@ Please select a %s type %s. return None config = CardsetConfig() if not self._parseCardsetConfig(config, lines): - ##print filename, 'invalide config' + ##print filename, 'invalid config' return None if config.CARDD > self.top.winfo_screendepth(): return None @@ -1444,7 +1444,7 @@ Please select a %s type %s. return 0 cs.year = int(m.group(1)) if len(cs.ext) < 2 or cs.ext[0] != ".": - if _debug: print_err(1, msg='invalide extention') + if _debug: print_err(1, msg='invalid extention') return 0 # line[1]: identifier/name if not line[1]: @@ -1453,19 +1453,19 @@ Please select a %s type %s. cs.ident = line[1] m = re.search(r"^(.*;)?([^;]+)$", cs.ident) if not m: - if _debug: print_err(2, msg='invalide format') + if _debug: print_err(2, msg='invalid format') return 0 cs.name = m.group(2).strip() # line[2]: CARDW, CARDH, CARDD m = re.search(r"^(\d+)\s+(\d+)\s+(\d+)", line[2]) if not m: - if _debug: print_err(3, msg='invalide format') + if _debug: print_err(3, msg='invalid format') return 0 cs.CARDW, cs.CARDH, cs.CARDD = int(m.group(1)), int(m.group(2)), int(m.group(3)) # line[3]: CARD_UP_YOFFSET, CARD_DOWN_YOFFSET, SHADOW_XOFFSET, SHADOW_YOFFSET m = re.search(r"^(\d+)\s+(\d+)\s+(\d+)\s+(\d+)", line[3]) if not m: - if _debug: print_err(4, msg='invalide format') + if _debug: print_err(4, msg='invalid format') return 0 cs.CARD_XOFFSET = int(m.group(1)) cs.CARD_YOFFSET = int(m.group(2)) diff --git a/pysollib/game.py b/pysollib/game.py index 77fb3c5e..e084847e 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1590,7 +1590,7 @@ for %d moves. return card1.color != card2.color and abs(card1.rank-card2.rank) == 1 def _shallHighlightMatch_ACW(self, stack1, card1, stack2, card2): - # by alternate color with wrapping (only for france games) + # by alternate color with wrapping (only for french games) return (card1.color != card2.color and ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) @@ -1600,7 +1600,7 @@ for %d moves. return card1.suit == card2.suit and abs(card1.rank-card2.rank) == 1 def _shallHighlightMatch_SSW(self, stack1, card1, stack2, card2): - # by same suit with wrapping (only for france games) + # by same suit with wrapping (only for french games) return (card1.suit == card2.suit and ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank)) @@ -1610,7 +1610,7 @@ for %d moves. return abs(card1.rank-card2.rank) == 1 def _shallHighlightMatch_RKW(self, stack1, card1, stack2, card2): - # by rank with wrapping (only for france games) + # by rank with wrapping (only for french games) return ((card1.rank + 1) % 13 == card2.rank or (card2.rank + 1) % 13 == card1.rank) @@ -2640,6 +2640,10 @@ in the current implementation.''' % version sd.delete() self.stackdesc_list = [] + ## for find_card_dialog + def canFindCard(self): + return self.gameinfo.category == GI.GC_FRENCH + # # subclass hooks # diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index e1e124f6..bbbb2138 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -490,16 +490,22 @@ class GameManager: raise GameInfoException, "wrong GameInfo class" gi.plugin = self.loading_plugin if self.__all_games.has_key(gi.id): - raise GameInfoException, "duplicate game ID " + str(gi.id) + raise GameInfoException, "duplicate game ID %s: %s and %s" % \ + (gi.id, str(gi.gameclass), + str(self.__all_games[gi.id].gameclass)) if self.__all_gamenames.has_key(gi.name): - raise GameInfoException, "duplicate game name " + str(gi.id) + ": " + gi.name + raise GameInfoException, "duplicate game name %s: %s and %s" % \ + (gi.id, gi.name, str(self.__all_games[gi.id].gameclass)) if 1: for id, game in self.__all_games.items(): if gi.gameclass is game.gameclass: - raise GameInfoException, "duplicate game class " + str(gi.id) + raise GameInfoException, \ + "duplicate game class %s: %s and %s" % \ + (gi.id, str(gi.gameclass), str(game.gameclass)) for n in gi.altnames: if self.__all_gamenames.has_key(n): - raise GameInfoException, "duplicate altgame name " + str(gi.id) + ": " + n + raise GameInfoException, "duplicate game altname %s: %s" % \ + (gi.id, n) ##if 0 and gi.si.game_flags & GI.GT_XORIGINAL: ## return ##print gi.id, gi.name diff --git a/pysollib/games/__init__.py b/pysollib/games/__init__.py index 064b3243..8c6dee31 100644 --- a/pysollib/games/__init__.py +++ b/pysollib/games/__init__.py @@ -30,6 +30,7 @@ import headsandtails import katzenschwanz import klondike import labyrinth +import larasgame import matriarchy import montana import montecarlo @@ -46,6 +47,7 @@ import pushpin import pyramid import royalcotillion import royaleast +import sanibel import siebenbisas import simplex import spider @@ -53,6 +55,7 @@ import sthelena import sultan import takeaway import terrace +import threepeaks import tournament import unionsquare import wavemotion diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py index 62d6c96c..d6ffc19c 100644 --- a/pysollib/games/capricieuse.py +++ b/pysollib/games/capricieuse.py @@ -128,7 +128,7 @@ class Strata(Game): s.foundations.append(DieRussische_Foundation(x, y, self, suit=i%4, max_cards=8)) x = x + l.XS - x, y, = l.XM+l.XS, l.YM+l.YS + x, y, = l.XM+l.XS/2, l.YM+l.YS for i in range(8): s.rows.append(AC_RowStack(x, y, self, max_move=1, max_accept=1)) x = x + l.XS diff --git a/pysollib/games/contrib/__init__.py b/pysollib/games/contrib/__init__.py deleted file mode 100644 index bec3b914..00000000 --- a/pysollib/games/contrib/__init__.py +++ /dev/null @@ -1 +0,0 @@ -import sanibel diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index da1690f6..13a916f3 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -277,118 +277,6 @@ class Escalator(Elevator): self.s.talon.dealRow() self.s.talon.dealCards() # deal first card to WasteStack -# /*********************************************************************** -# // Tri Peaks - Relaxed Golf in a Pyramid layout -# ************************************************************************/ - -class TriPeaks_RowStack(Elevator_RowStack): - STEP = (1, 2, 2, 3+12, 3+12, 3+12, - 1, 2, 2, 3+ 9, 3+ 9, 3+ 9, - 1, 2, 2, 3+ 6, 3+ 6, 3+ 6) - - -class TriPeaks(RelaxedGolf): - - # - # game layout - # - - def createGame(self): - # create layout - l, s = Layout(self), self.s - - # set window - l.XOFFSET = int(l.XS * 9 / self.gameinfo.ncards) - self.setSize(10*l.XS+l.XM, 4*l.YS+l.YM) - - # extra settings - self.talon_card_ids = {} - - # create stacks - for i in range(3): - for d in ((2, 0), (1, 1), (3, 1), (0, 2), (2, 2), (4, 2)): - x = l.XM + (6*i+1+d[0]) * l.XS / 2 - y = l.YM + d[1] * l.YS / 2 - s.rows.append(TriPeaks_RowStack(x, y, self)) - x, y = l.XM, 3*l.YS/2 - for i in range(10): - s.rows.append(Golf_RowStack(x, y, self)) - x = x + l.XS - x, y = l.XM, self.height - l.YS - s.talon = Golf_Talon(x, y, self, max_rounds=1) - l.createText(s.talon, "nn") - x = x + l.XS - s.waste = self.Waste_Class(x, y, self) - s.waste.CARD_XOFFSET = l.XOFFSET - l.createText(s.waste, "nn") - # the Waste is also our only Foundation in this game - s.foundations.append(s.waste) - - self.texts.score = MfxCanvasText(self.canvas, - self.width - 8, self.height - 8, - anchor="se", - font=self.app.getFont("canvas_large")) - - # define stack-groups (non default) - self.sg.openstacks = [s.waste] - self.sg.talonstacks = [s.talon] - self.sg.dropstacks = s.rows - - # - # game overrides - # - - def startGame(self): - self.startDealSample() - self.s.talon.dealRow(rows=self.s.rows[:18], flip=0) - self.s.talon.dealRow(rows=self.s.rows[18:]) - # extra settings: remember cards from the talon - self.talon_card_ids = {} - for c in self.s.talon.cards: - self.talon_card_ids[c.id] = 1 - self.s.talon.dealCards() # deal first card to WasteStack - - def getGameScore(self): - v = -24 * 5 - if not self.s.waste.cards: - return v - # compute streaks for cards on the waste - streak = 0 - for c in self.s.waste.cards: - if self.talon_card_ids.get(c.id): - streak = 0 - else: - streak = streak + 1 - v = v + streak - # each cleared peak gains $15 bonus, and all 3 gain extra $30 - extra = 30 - for i in (0, 6, 12): - if not self.s.rows[i].cards: - v = v + 15 - else: - extra = 0 - return v + extra - - getGameBalance = getGameScore - - def updateText(self): - if self.preview > 1: - return - b1, b2 = self.app.stats.gameid_balance, 0 - if self.shallUpdateBalance(): - b2 = self.getGameBalance() - t = _("Balance $%4d") % (b1 + b2) - self.texts.score.config(text=t) - - def _restoreGameHook(self, game): - self.talon_card_ids = game.loadinfo.talon_card_ids - - def _loadGameHook(self, p): - self.loadinfo.addattr(talon_card_ids=p.load(types.DictType)) - - def _saveGameHook(self, p): - p.dump(self.talon_card_ids) - # /*********************************************************************** # // Black Hole @@ -679,8 +567,6 @@ registerGame(GameInfo(260, RelaxedGolf, "Relaxed Golf", registerGame(GameInfo(40, Elevator, "Elevator", GI.GT_GOLF, 1, 0, GI.SL_BALANCED, altnames=("Egyptian Solitaire", "Pyramid Golf") )) -registerGame(GameInfo(237, TriPeaks, "Tri Peaks", - GI.GT_GOLF | GI.GT_SCORE, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(98, BlackHole, "Black Hole", GI.GT_GOLF | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(267, FourLeafClovers, "Four Leaf Clovers", diff --git a/pysollib/games/larasgame.py b/pysollib/games/larasgame.py new file mode 100644 index 00000000..be32a224 --- /dev/null +++ b/pysollib/games/larasgame.py @@ -0,0 +1,449 @@ +##---------------------------------------------------------------------------## +## +## Ultrasol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Matthew Hohlfeld +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = [] + +# imports + +# PySol imports +from pysollib.gamedb import registerGame, GameInfo, GI +from pysollib.util import * +from pysollib.stack import * +from pysollib.game import Game +from pysollib.layout import Layout +from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint +from pysollib.pysoltk import MfxCanvasText + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class LarasGame_Hint(CautiousDefaultHint): + pass + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class LarasGame_Talon(WasteTalonStack): + # Deal a card to each of the RowStacks. Then deal + # cards to the talon. Return number of cards dealt. + def dealRow(self, rows=None, flip=1, reverse=0, frames=-1, sound=0): + game = self.game + if rows is None: + rows = game.s.rows + old_state = game.enterState(game.S_DEAL) + cards = self.dealToStacks(rows[:game.MAX_ROW], flip, reverse, frames) + if sound and frames and self.game.app.opt.animations: + self.game.startDealSample() + for i in range(game.DEAL_TO_TALON): + if self.cards: + game.moveMove(1, self, game.s.rows[-1], frames=frames) + cards = cards + 1 + game.leaveState(old_state) + if sound: + self.game.stopSamples() + return cards + + def dealToStacks(self, stacks, flip=1, reverse=0, frames=-1): + game = self.game + i, move = 0, game.moveMove + for r in stacks: + if not self.cards: + return 0 + assert not self.getCard().face_up + assert r is not self + if flip: + game.flipMove(self) + move(1, self, r, frames=frames) + # Dealing has extra rules in this game type: + # If card rank == card location then add one card to talon + # If card rank == ACE then add two cards to talon + # If card rank == JACK, or higher then add one card to talon + # After all the rows have been dealt, deal cards to talon in self.dealRow + rank = r.getCard().rank + if rank == i: # Is the rank == position? + if not self.cards: + return 0 + move(1, self, game.s.rows[-1], frames=frames) + i = i + 1 + if rank == 0: # Is this an Ace? + for j in range(2): + if not self.cards: + return 0 + move(1, self, game.s.rows[-1], frames=frames) + if rank >= 10: # Is it a Jack or better? + if not self.cards: + return 0 + move(1, self, game.s.rows[-1], frames=frames) + return len(stacks) + + def dealCards(self, sound=0): + game = self.game + if sound and self.game.app.opt.animations: + self.game.startDealSample() + for r in game.s.reserves[:20]: + while r.cards: + game.moveMove(1, r, game.s.rows[game.active_row], frames=3, shadow=0) + if self.cards: + game.active_row = self.getActiveRow() + game.flipMove(self) + game.moveMove(1, self, game.s.reserves[0], frames=4, shadow=0) + ncards = len(game.s.rows[game.active_row].cards) + if ncards >= 20: + # We have encountered an extreme situation. + # In some game type variations it's possible + # to have up to 28 cards on a row stack. + # We'll have to double up on some of the reserves. + for i in range(ncards - 19): + game.moveMove(1, game.s.rows[game.active_row], + game.s.reserves[19 - i], frames=4, shadow=0) + ncards = len(game.s.rows[game.active_row].cards) + assert ncards <= 19 + for i in range(ncards): + game.moveMove(1, game.s.rows[game.active_row], + game.s.reserves[ncards - i], frames=4, shadow=0) + num_cards = len(self.cards) or self.canDealCards() + else: # not self.cards + if self.round < self.max_rounds: + ncards = 0 + rows = list(game.s.rows)[:game.MAX_ROW] + rows.reverse() + for r in rows: + while r.cards: + ncards += 1 + if r.cards[-1].face_up: + game.flipMove(r) + game.moveMove(1, r, self, frames=0) + assert len(self.cards) == ncards + if ncards != 0: + game.nextRoundMove(self) + game.dealToRows() + num_cards = len(self.cards) + if sound: + game.stopSamples() + return num_cards + + def canDealCards(self): + if self.game.demo and self.game.moves.index >= 400: + return 0 + return (self.cards or (self.round < self.max_rounds and not self.game.isGameWon())) + + def updateText(self): + if self.game.preview > 1: + return + WasteTalonStack.updateText(self, update_rounds=0) + if not self.max_rounds - 1: + return + t = _("Round %d") % self.round + self.texts.rounds.config(text=t) + + def getActiveRow(self): + return self.getCard().rank + + +class LarasGame_RowStack(OpenStack): + def __init__(self, x, y, game, yoffset = 1, **cap): + apply(OpenStack.__init__, (self, x, y, game), cap) + self.CARD_YOFFSET = yoffset + + +class LarasGame_ReserveStack(OpenStack): + pass + + +class LarasGame_Reserve(OpenStack): + + def acceptsCards(self, from_stack, cards): + if not OpenStack.acceptsCards(self, from_stack, cards): + return 0 + return from_stack in self.game.s.rows + + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +# /*********************************************************************** +# // Lara's Game +# ************************************************************************/ + +class LarasGame(Game): + Hint_Class = LarasGame_Hint + Talon_Class = LarasGame_Talon + Reserve_Class = None + DEAL_TO_TALON = 2 + MAX_ROUNDS = 1 + ROW_LENGTH = 4 + MAX_ROW = 13 + DIR = (-1, 1) + + # + # game layout + # + + def createGame(self): + # create layout + l, s = Layout(self), self.s + ROW_LENGTH = self.ROW_LENGTH + + # set window + w, h = l.XM + l.XS * (ROW_LENGTH + 5), l.YM + l.YS * (ROW_LENGTH + (ROW_LENGTH != 6)) + self.setSize(w, h) + + # extra settings + self.active_row = None + + # Create foundations + x, y = l.XM, l.YM + for j in range(2): + for i in range(ROW_LENGTH): + s.foundations.append(SS_FoundationStack(x, y, self, self.Base_Suit(i, j), + max_cards = self.Max_Cards(i), mod = self.Mod(i), + dir = self.DIR[j], base_rank = self.Base_Rank(i, j))) + y = y + l.YS * (not j) + x = x + l.XS * j + x, y = x + l.XS * 2, l.YM + + # Create rows + x, y = l.XM + l.XS, y + l.YS + for i in range(self.MAX_ROW): + s.rows.append(LarasGame_RowStack(x, y, self)) + x = x + l.XS + if i == ROW_LENGTH or i == ROW_LENGTH * 2 + 1 or i == ROW_LENGTH * 3 + 2: + x, y = l.XM + l.XS, y + l.YS + + # Create reserves + x, y = l.XM + l.XS * (ROW_LENGTH == 6), l.YM + l.YS * (ROW_LENGTH - (ROW_LENGTH == 6)) + for i in range(20): + s.reserves.append(LarasGame_ReserveStack(x, y, self, max_cards=2)) + x = x + l.XS * (i < (ROW_LENGTH + 4)) - l.XS * (i == (ROW_LENGTH + 9)) + y = y - l.YS * (i > (ROW_LENGTH + 3) and i < (ROW_LENGTH + 9)) + l.YS * (i > (ROW_LENGTH + 9)) + + # Create talon + x, y = l.XM + l.XS * (ROW_LENGTH + 2), h - l.YM - l.YS * 3 + s.talon = self.Talon_Class(x, y, self, max_rounds=self.MAX_ROUNDS) + l.createText(s.talon, "s") + if self.MAX_ROUNDS - 1: + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") + s.talon.texts.rounds = MfxCanvasText(self.canvas, + tx, ty, anchor=ta, + font=self.app.getFont("canvas_default")) + y = h - l.YS * 2 + s.rows.append(LarasGame_RowStack(x, y, self, yoffset=0)) + + # Define stack-groups (not default) + self.sg.openstacks = s.foundations + s.rows[:self.MAX_ROW] + self.sg.talonstacks = [s.talon] + s.rows[-1:] + self.sg.dropstacks = s.rows[:self.MAX_ROW] + s.reserves + + # Create relaxed reserve + if self.Reserve_Class != None: + x, y = l.XM + l.XS * (ROW_LENGTH + 2), l.YM + l.YS * .5 + s.reserves.append(self.Reserve_Class(x, y, self, + max_accept=1, max_cards=self.Reserve_Cards)) + self.sg.openstacks = self.sg.openstacks + s.reserves[19:] + self.sg.dropstacks = self.sg.dropstacks + s.reserves[19:] + self.setRegion(s.reserves[19:], (x - l.XM / 2, 0, 99999, 99999)) + + # + # Game extras + # + + def Max_Cards(self, i): + return 13 + + def Mod(self, i): + return 13 + + def Base_Rank(self, i, j): + return 12 * (not j) + + def Deal_Rows(self, i): + return 13 + + def Base_Suit(self, i, j): + return i + + # + # game overrides + # + + def startGame(self): + assert len(self.s.talon.cards) == self.gameinfo.ncards + self.dealToRows() + + def dealToRows(self): + frames, ncards = 0, len(self.s.talon.cards) + for i in range(8): + if not self.s.talon.cards: + break + if i == 4 or len(self.s.talon.cards) <= ncards / 2: + self.startDealSample() + frames = 4 + self.s.talon.dealRow(rows=self.s.rows[:self.Deal_Rows(i)], frames=frames) + self.moveMove(len(self.s.rows[-1].cards), self.s.rows[-1], self.s.talon, frames=0) + self.active_row = None + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + i, j = (stack1 in self.s.foundations), (stack2 in self.s.foundations) + if not (i or j): return 0 + if i: stack = stack1 + else: stack = stack2 + i = 0 + for f in self.s.foundations: + if f == stack: break + i = i + 1 % self.ROW_LENGTH + return (card1.suit == card2.suit and + ((card1.rank + 1) % self.Mod(i) == card2.rank + or (card1.rank - 1) % self.Mod(i) == card2.rank)) + + def getHighlightPilesStacks(self): + return () + + # Finish the current move. + # Append current active_row to moves.current. + # Append moves.current to moves.history. + def finishMove(self): + moves, stats = self.moves, self.stats + if not moves.current: + return 0 + # invalidate hints + self.hints.list = None + # resize (i.e. possibly shorten list from previous undos) + if not moves.index == 0: + m = moves.history[len(moves.history) - 1] + del moves.history[moves.index : ] + # update stats + if self.demo: + stats.demo_moves = stats.demo_moves + 1 + if moves.index == 0: + stats.player_moves = 0 # clear all player moves + else: + stats.player_moves = stats.player_moves + 1 + if moves.index == 0: + stats.demo_moves = 0 # clear all demo moves + stats.total_moves = stats.total_moves + 1 + # add current move to history (which is a list of lists) + moves.current.append(self.active_row) + moves.history.append(moves.current) + moves.index = moves.index + 1 + assert moves.index == len(moves.history) + moves.current = [] + self.updateText() + self.updateStatus(moves=(moves.index, self.stats.total_moves)) + self.updateMenus() + return 1 + + def undo(self): + assert self.canUndo() + assert self.moves.state == self.S_PLAY and self.moves.current == [] + assert 0 <= self.moves.index <= len(self.moves.history) + if self.moves.index == 0: + return + self.moves.index = self.moves.index - 1 + m = self.moves.history[self.moves.index] + m = m[:len(m) - 1] + m.reverse() + self.moves.state = self.S_UNDO + for atomic_move in m: + atomic_move.undo(self) + self.moves.state = self.S_PLAY + m = self.moves.history[max(0, self.moves.index - 1)] + self.active_row = m[len(m) - 1] + self.stats.undo_moves = self.stats.undo_moves + 1 + self.stats.total_moves = self.stats.total_moves + 1 + self.hints.list = None + self.updateText() + self.updateStatus(moves=(self.moves.index, self.stats.total_moves)) + self.updateMenus() + + def redo(self): + assert self.canRedo() + assert self.moves.state == self.S_PLAY and self.moves.current == [] + assert 0 <= self.moves.index <= len(self.moves.history) + if self.moves.index == len(self.moves.history): + return + m = self.moves.history[self.moves.index] + self.moves.index = self.moves.index + 1 + self.active_row = m[len(m) - 1] + m = m[:len(m) - 1] + self.moves.state = self.S_REDO + for atomic_move in m: + atomic_move.redo(self) + self.moves.state = self.S_PLAY + self.stats.redo_moves = self.stats.redo_moves + 1 + self.stats.total_moves = self.stats.total_moves + 1 + self.hints.list = None + self.updateText() + self.updateStatus(moves=(self.moves.index, self.stats.total_moves)) + self.updateMenus() + + def _restoreGameHook(self, game): + self.active_row = game.loadinfo.active_row + + def _loadGameHook(self, p): + self.loadinfo.addattr(active_row=0) # register extra load var. + self.loadinfo.active_row = p.load() + + def _saveGameHook(self, p): + p.dump(self.active_row) + + + +# /*********************************************************************** +# // Relaxed Lara's Game +# ************************************************************************/ + +class RelaxedLarasGame(LarasGame): + Reserve_Class = LarasGame_Reserve + Reserve_Cards = 1 + DEAL_TO_TALON = 3 + MAX_ROUNDS = 2 + + +# /*********************************************************************** +# // Double Lara's Game +# ************************************************************************/ + +class DoubleLarasGame(RelaxedLarasGame): + Reserve_Cards = 2 + MAX_ROUNDS = 3 + def Max_Cards(self, i): + return 26 + + +# register the game + +registerGame(GameInfo(37, LarasGame, "Lara's Game", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(13006, RelaxedLarasGame, "Lara's Game Relaxed", + GI.GT_2DECK_TYPE, 2, 1, GI.SL_BALANCED)) +registerGame(GameInfo(13007, DoubleLarasGame, "Lara's Game Doubled", + GI.GT_2DECK_TYPE, 4, 2, GI.SL_BALANCED)) + + diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index ea0d6df0..bd36c947 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -767,8 +767,8 @@ class CircleNine(Game): stack.CARD_YOFFSET = 0 x, y = l.XM+3.5*l.XS, l.YM+l.YS - stack = RK_FoundationStack(x, y, self, suit=ANY_SUIT, - max_cards=52, max_move=0, mod=13) + stack = RK_FoundationStack(x, y, self, suit=ANY_SUIT, max_cards=52, + max_move=0, mod=13, base_rank=ANY_RANK) s.foundations.append(stack) l.createText(stack, 'ne') x, y = l.XM, l.YM @@ -794,6 +794,44 @@ class CircleNine(Game): self.leaveState(old_state) +class Measure(CircleNine): + + Foundation_Class = StackWrapper(RK_FoundationStack, max_cards=52) + + def createGame(self, rows=8): + l, s = Layout(self), self.s + self.setSize(l.XM+rows*l.XS, l.YM+2*l.YS+10*l.YOFFSET) + + x, y = l.XM, l.YM + s.talon = Strategerie_Talon(x, y, self) + l.createText(s.talon, 'ne') + x = self.width-l.XS + stack = self.Foundation_Class(x, y, self, suit=ANY_SUIT, max_cards=52, + max_move=0, mod=13, base_rank=ANY_RANK) + s.foundations.append(stack) + l.createText(stack, 'nw') + + x, y = l.XM, l.YM+l.YS + for i in range(rows): + s.rows.append(CircleNine_RowStack(x, y, self, max_accept=1, + max_move=1, base_rank=NO_RANK)) + x += l.XS + + l.defaultStackGroups() + self.sg.dropstacks.append(s.talon) + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.fillStack() + + +class DoubleMeasure(Measure): + Foundation_Class = StackWrapper(RK_FoundationStack, max_cards=104) + + def createGame(self, rows=8): + Measure.createGame(self, rows=10) + # register the game @@ -833,4 +871,8 @@ registerGame(GameInfo(613, Fanny, "Fanny", GI.GT_NUMERICA, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(641, CircleNine, "Circle Nine", GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(643, Measure, "Measure", + GI.GT_NUMERICA | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(644, DoubleMeasure, "Double Measure", + GI.GT_NUMERICA | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/contrib/sanibel.py b/pysollib/games/sanibel.py similarity index 100% rename from pysollib/games/contrib/sanibel.py rename to pysollib/games/sanibel.py diff --git a/pysollib/games/ultra/threepeaks.py b/pysollib/games/threepeaks.py similarity index 92% rename from pysollib/games/ultra/threepeaks.py rename to pysollib/games/threepeaks.py index 1de25809..5e562a93 100644 --- a/pysollib/games/ultra/threepeaks.py +++ b/pysollib/games/threepeaks.py @@ -28,7 +28,6 @@ __all__ = [] # Imports -import sys, math # PySol imports from pysollib.gamedb import registerGame, GameInfo, GI @@ -40,7 +39,7 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.pysoltk import MfxCanvasText, MfxCanvasImage, bind, ANCHOR_NW -from pysollib.games.golf import Golf_Waste, Golf_Hint +from golf import Golf_Waste, Golf_Hint # /*********************************************************************** @@ -77,7 +76,7 @@ class ThreePeaks_TalonStack(WasteTalonStack): class ThreePeaks_RowStack(OpenStack): def __init__(self, x, y, game, **cap): - kwdefault(cap, max_move=0, max_accept=0, max_cards=1, + kwdefault(cap, max_move=1, max_accept=0, max_cards=1, base_rank=ANY_RANK) apply(OpenStack.__init__, (self, x, y, game), cap) @@ -134,9 +133,11 @@ class ThreePeaks(Game): l, s = Layout(self), self.s # set window - # (compute best XOFFSET - up to 64/72 cards can be in the Waste) decks = self.gameinfo.decks - l.XOFFSET = int(l.XS * 9 / self.gameinfo.ncards) + # compute best XOFFSET + xoffset = int(l.XS * 8 / self.gameinfo.ncards) + if xoffset < l.XOFFSET: + l.XOFFSET = xoffset # Set window size w, h = l.XM + l.XS * 10, l.YM + l.YS * 4 @@ -170,12 +171,12 @@ class ThreePeaks(Game): # Create talon x, y = l.XM, y + l.YM + l.YS s.talon = ThreePeaks_TalonStack(x, y, self, num_deal=1, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = self.Waste_Class(x, y, self) s.waste.CARD_XOFFSET = l.XOFFSET s.foundations.append(s.waste) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # Create text for scores if self.preview <= 1: @@ -279,21 +280,10 @@ class ThreePeaksNoScore(ThreePeaks): return 1 -# /*********************************************************************** -# // Le Grande Teton -# ************************************************************************/ - -class LeGrandeTeton(ThreePeaksNoScore): - pass - - registerGame(GameInfo(22216, ThreePeaks, "Three Peaks", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(22231, ThreePeaksNoScore, "Three Peaks Non-scoring", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_BALANCED)) -registerGame(GameInfo(22232, LeGrandeTeton, "Le Grande Teton", - GI.GT_TAROCK, 1, 0, GI.SL_BALANCED, - ranks=range(14), trumps=range(22))) diff --git a/pysollib/games/tournament.py b/pysollib/games/tournament.py index dd22babd..f3b187fe 100644 --- a/pysollib/games/tournament.py +++ b/pysollib/games/tournament.py @@ -84,7 +84,7 @@ class Tournament(Game): # game layout # - def createGame(self, **layout): + def createGame(self): # create layout l, s = Layout(self), self.s @@ -121,8 +121,9 @@ class Tournament(Game): s.talon = Tournament_Talon(l.XM, l.YM, self, max_rounds=3) l.createText(s.talon, "se") tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") - s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, anchor=ta, - font=self.app.getFont("canvas_default")) + font = self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) # define stack-groups l.defaultStackGroups() @@ -130,6 +131,7 @@ class Tournament(Game): # # game overrides # + def _shuffleHook(self, cards): for c in cards[-8:]: if c.rank in (ACE, KING): @@ -189,7 +191,7 @@ class KingsdownEights(Game): Hint_Class = CautiousDefaultHint - def createGame(self, **layout): + def createGame(self): # create layout l, s = Layout(self), self.s @@ -232,6 +234,54 @@ class KingsdownEights(Game): shallHighlightMatch = Game._shallHighlightMatch_AC +# /*********************************************************************** +# // Saxony +# ************************************************************************/ + +class Saxony_Reserve(SS_RowStack): + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + def getHelp(self): + return _('Reserve. Build down by suit.') + + +class Saxony(Game): + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+11*l.XS, 2*l.YM+max(2*l.YS+12*l.YOFFSET, 5*l.YS)) + + x, y, = l.XM+1.5*l.XS, l.YM + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i%4)) + x = x + l.XS + x, y = l.XM+1.5*l.XS, 2*l.YM+l.YS + for i in range(8): + s.rows.append(BasicRowStack(x, y, self, max_move=1, max_accept=0)) + x = x + l.XS + x, y = l.XM, 2*l.YM+l.YS + for i in range(4): + stack = Saxony_Reserve(x, y, self, max_move=1) + self.s.reserves.append(stack) + stack.CARD_YOFFSET = 0 + y += l.YS + x, y = self.width-l.XS, 2*l.YM+l.YS + for i in range(4): + self.s.reserves.append(ReserveStack(x, y, self)) + y += l.YS + s.talon = DealRowTalonStack(l.XM, l.YM, self) + l.createText(s.talon, "ne") + + l.defaultStackGroups() + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + + # register the game registerGame(GameInfo(303, Tournament, "Tournament", GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK)) @@ -240,6 +290,8 @@ registerGame(GameInfo(304, LaNivernaise, "La Nivernaise", altnames = ("Napoleon's Flank", ),)) registerGame(GameInfo(386, KingsdownEights, "Kingsdown Eights", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(645, Saxony, "Saxony", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/ultra/__init__.py b/pysollib/games/ultra/__init__.py index a1e0b46b..ee1f0273 100644 --- a/pysollib/games/ultra/__init__.py +++ b/pysollib/games/ultra/__init__.py @@ -6,4 +6,3 @@ import larasgame import matrix import mughal import tarock -import threepeaks diff --git a/pysollib/games/ultra/larasgame.py b/pysollib/games/ultra/larasgame.py index a421be49..7d058f7a 100644 --- a/pysollib/games/ultra/larasgame.py +++ b/pysollib/games/ultra/larasgame.py @@ -27,7 +27,6 @@ __all__ = [] # imports -import sys, types # PySol imports from pysollib.gamedb import registerGame, GameInfo, GI @@ -38,165 +37,25 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.pysoltk import MfxCanvasText - -# /*********************************************************************** -# // -# ************************************************************************/ - -class LarasGame_Hint(CautiousDefaultHint): - pass +from pysollib.games.larasgame import LarasGame_Talon, LarasGame, LarasGame_Reserve # /*********************************************************************** # // # ************************************************************************/ -class LarasGame_Talon(WasteTalonStack): - # Deal a card to each of the RowStacks. Then deal - # cards to the talon. Return number of cards dealt. - def dealRow(self, rows=None, flip=1, reverse=0, frames=-1, sound=0): - game = self.game - if rows is None: - rows = game.s.rows - old_state = game.enterState(game.S_DEAL) - cards = self.dealToStacks(rows[:game.MAX_ROW], flip, reverse, frames) - if sound and frames and self.game.app.opt.animations: - self.game.startDealSample() - for i in range(game.DEAL_TO_TALON): - if self.cards: - game.moveMove(1, self, game.s.rows[-1], frames=frames) - cards = cards + 1 - game.leaveState(old_state) - if sound: - self.game.stopSamples() - return cards - - def dealToStacks(self, stacks, flip=1, reverse=0, frames=-1): - game = self.game - i, move = 0, game.moveMove - for r in stacks: - if not self.cards: - return 0 - assert not self.getCard().face_up - assert r is not self - if flip: - game.flipMove(self) - move(1, self, r, frames=frames) - # Dealing has extra rules in this game type: - # If card rank == card location then add one card to talon - # If card rank == ACE then add two cards to talon - # If card rank == JACK, or higher then add one card to talon - # After all the rows have been dealt, deal cards to talon in self.dealRow - rank = r.getCard().rank - if rank == i: # Is the rank == position? - if not self.cards: - return 0 - move(1, self, game.s.rows[-1], frames=frames) - i = i + 1 - if rank == 0: # Is this an Ace? - for j in range(2): - if not self.cards: - return 0 - move(1, self, game.s.rows[-1], frames=frames) - if rank >= 10: # Is it a Jack or better? - if not self.cards: - return 0 - move(1, self, game.s.rows[-1], frames=frames) - return len(stacks) - - def dealCards(self, sound=0): - game = self.game - if sound and self.game.app.opt.animations: - self.game.startDealSample() - for r in game.s.reserves[:20]: - while r.cards: - game.moveMove(1, r, game.s.rows[game.active_row], frames=3, shadow=0) - if self.cards: - game.active_row = self.getActiveRow() - game.flipMove(self) - game.moveMove(1, self, game.s.reserves[0], frames=4, shadow=0) - ncards = len(game.s.rows[game.active_row].cards) - if ncards >= 20: - # We have encountered an extreme situation. - # In some game type variations it's possible - # to have up to 28 cards on a row stack. - # We'll have to double up on some of the reserves. - for i in range(ncards - 19): - game.moveMove(1, game.s.rows[game.active_row], - game.s.reserves[19 - i], frames=4, shadow=0) - ncards = len(game.s.rows[game.active_row].cards) - assert ncards <= 19 - for i in range(ncards): - game.moveMove(1, game.s.rows[game.active_row], - game.s.reserves[ncards - i], frames=4, shadow=0) - num_cards = len(self.cards) or self.canDealCards() - else: # not self.cards - if self.round < self.max_rounds: - ncards = 0 - rows = list(game.s.rows)[:game.MAX_ROW] - rows.reverse() - for r in rows: - while r.cards: - ncards += 1 - if r.cards[-1].face_up: - game.flipMove(r) - game.moveMove(1, r, self, frames=0) - assert len(self.cards) == ncards - if ncards != 0: - game.nextRoundMove(self) - game.dealToRows() - num_cards = len(self.cards) - if sound: - game.stopSamples() - return num_cards - - def canDealCards(self): - if self.game.demo and self.game.moves.index >= 400: - return 0 - return (self.cards or (self.round < self.max_rounds and not self.game.isGameWon())) - - def updateText(self): - if self.game.preview > 1: - return - WasteTalonStack.updateText(self, update_rounds=0) - if not self.max_rounds - 1: - return - t = _("Round %d") % self.round - self.texts.rounds.config(text=t) - - def getActiveRow(self): - return self.getCard().rank - - - class DojoujisGame_Talon(LarasGame_Talon): - def getActiveRow(self): card = self.getCard() return card.rank + card.deck * 4 - class DoubleKalisGame_Talon(LarasGame_Talon): - def getActiveRow(self): card = self.getCard() return card.rank + card.deck * 12 - -class LarasGame_RowStack(OpenStack): - def __init__(self, x, y, game, yoffset = 1, **cap): - apply(OpenStack.__init__, (self, x, y, game), cap) - self.CARD_YOFFSET = yoffset - - - -class LarasGame_ReserveStack(OpenStack): - pass - - - class BridgetsGame_Reserve(OpenStack): def acceptsCards(self, from_stack, cards): @@ -210,270 +69,6 @@ class BridgetsGame_Reserve(OpenStack): return self.game.app.images.getReserveBottom() - -class LarasGame_Reserve(BridgetsGame_Reserve): - - def acceptsCards(self, from_stack, cards): - if not OpenStack.acceptsCards(self, from_stack, cards): - return 0 - return from_stack in self.game.s.rows - - - -# /*********************************************************************** -# // Lara's Game -# ************************************************************************/ - -class LarasGame(Game): - Hint_Class = LarasGame_Hint - Talon_Class = LarasGame_Talon - Reserve_Class = None - DEAL_TO_TALON = 2 - MAX_ROUNDS = 1 - ROW_LENGTH = 4 - MAX_ROW = 13 - DIR = (-1, 1) - - # - # game layout - # - - def createGame(self): - # create layout - l, s = Layout(self), self.s - ROW_LENGTH = self.ROW_LENGTH - - # set window - w, h = l.XM + l.XS * (ROW_LENGTH + 5), l.YM + l.YS * (ROW_LENGTH + (ROW_LENGTH != 6)) - self.setSize(w, h) - - # extra settings - self.active_row = None - - # Create foundations - x, y = l.XM, l.YM - for j in range(2): - for i in range(ROW_LENGTH): - s.foundations.append(SS_FoundationStack(x, y, self, self.Base_Suit(i, j), - max_cards = self.Max_Cards(i), mod = self.Mod(i), - dir = self.DIR[j], base_rank = self.Base_Rank(i, j))) - y = y + l.YS * (not j) - x = x + l.XS * j - x, y = x + l.XS * 2, l.YM - - # Create rows - x, y = l.XM + l.XS, y + l.YS - for i in range(self.MAX_ROW): - s.rows.append(LarasGame_RowStack(x, y, self)) - x = x + l.XS - if i == ROW_LENGTH or i == ROW_LENGTH * 2 + 1 or i == ROW_LENGTH * 3 + 2: - x, y = l.XM + l.XS, y + l.YS - - # Create reserves - x, y = l.XM + l.XS * (ROW_LENGTH == 6), l.YM + l.YS * (ROW_LENGTH - (ROW_LENGTH == 6)) - for i in range(20): - s.reserves.append(LarasGame_ReserveStack(x, y, self, max_cards=2)) - x = x + l.XS * (i < (ROW_LENGTH + 4)) - l.XS * (i == (ROW_LENGTH + 9)) - y = y - l.YS * (i > (ROW_LENGTH + 3) and i < (ROW_LENGTH + 9)) + l.YS * (i > (ROW_LENGTH + 9)) - - # Create talon - x, y = l.XM + l.XS * (ROW_LENGTH + 2), h - l.YM - l.YS * 3 - s.talon = self.Talon_Class(x, y, self, max_rounds=self.MAX_ROUNDS) - l.createText(s.talon, "s") - if self.MAX_ROUNDS - 1: - tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") - s.talon.texts.rounds = MfxCanvasText(self.canvas, - tx, ty, anchor=ta, - font=self.app.getFont("canvas_default")) - y = h - l.YS * 2 - s.rows.append(LarasGame_RowStack(x, y, self, yoffset=0)) - - # Define stack-groups (not default) - self.sg.openstacks = s.foundations + s.rows[:self.MAX_ROW] - self.sg.talonstacks = [s.talon] + s.rows[-1:] - self.sg.dropstacks = s.rows[:self.MAX_ROW] + s.reserves - - # Create relaxed reserve - if self.Reserve_Class != None: - x, y = l.XM + l.XS * (ROW_LENGTH + 2), l.YM + l.YS * .5 - s.reserves.append(self.Reserve_Class(x, y, self, - max_accept=1, max_cards=self.Reserve_Cards)) - self.sg.openstacks = self.sg.openstacks + s.reserves[19:] - self.sg.dropstacks = self.sg.dropstacks + s.reserves[19:] - self.setRegion(s.reserves[19:], (x - l.XM / 2, 0, 99999, 99999)) - - # - # Game extras - # - - def Max_Cards(self, i): - return 13 - - def Mod(self, i): - return 13 - - def Base_Rank(self, i, j): - return 12 * (not j) - - def Deal_Rows(self, i): - return 13 - - def Base_Suit(self, i, j): - return i - - # - # game overrides - # - - def startGame(self): - assert len(self.s.talon.cards) == self.gameinfo.ncards - self.dealToRows() - - def dealToRows(self): - frames, ncards = 0, len(self.s.talon.cards) - for i in range(8): - if not self.s.talon.cards: - break - if i == 4 or len(self.s.talon.cards) <= ncards / 2: - self.startDealSample() - frames = 4 - self.s.talon.dealRow(rows=self.s.rows[:self.Deal_Rows(i)], frames=frames) - self.moveMove(len(self.s.rows[-1].cards), self.s.rows[-1], self.s.talon, frames=0) - self.active_row = None - - def shallHighlightMatch(self, stack1, card1, stack2, card2): - i, j = (stack1 in self.s.foundations), (stack2 in self.s.foundations) - if not (i or j): return 0 - if i: stack = stack1 - else: stack = stack2 - i = 0 - for f in self.s.foundations: - if f == stack: break - i = i + 1 % self.ROW_LENGTH - return (card1.suit == card2.suit and - ((card1.rank + 1) % self.Mod(i) == card2.rank - or (card1.rank - 1) % self.Mod(i) == card2.rank)) - - def getHighlightPilesStacks(self): - return () - - # Finish the current move. - # Append current active_row to moves.current. - # Append moves.current to moves.history. - def finishMove(self): - moves, stats = self.moves, self.stats - if not moves.current: - return 0 - # invalidate hints - self.hints.list = None - # resize (i.e. possibly shorten list from previous undos) - if not moves.index == 0: - m = moves.history[len(moves.history) - 1] - del moves.history[moves.index : ] - # update stats - if self.demo: - stats.demo_moves = stats.demo_moves + 1 - if moves.index == 0: - stats.player_moves = 0 # clear all player moves - else: - stats.player_moves = stats.player_moves + 1 - if moves.index == 0: - stats.demo_moves = 0 # clear all demo moves - stats.total_moves = stats.total_moves + 1 - # add current move to history (which is a list of lists) - moves.current.append(self.active_row) - moves.history.append(moves.current) - moves.index = moves.index + 1 - assert moves.index == len(moves.history) - moves.current = [] - self.updateText() - self.updateStatus(moves=(moves.index, self.stats.total_moves)) - self.updateMenus() - return 1 - - def undo(self): - assert self.canUndo() - assert self.moves.state == self.S_PLAY and self.moves.current == [] - assert 0 <= self.moves.index <= len(self.moves.history) - if self.moves.index == 0: - return - self.moves.index = self.moves.index - 1 - m = self.moves.history[self.moves.index] - m = m[:len(m) - 1] - m.reverse() - self.moves.state = self.S_UNDO - for atomic_move in m: - atomic_move.undo(self) - self.moves.state = self.S_PLAY - m = self.moves.history[max(0, self.moves.index - 1)] - self.active_row = m[len(m) - 1] - self.stats.undo_moves = self.stats.undo_moves + 1 - self.stats.total_moves = self.stats.total_moves + 1 - self.hints.list = None - self.updateText() - self.updateStatus(moves=(self.moves.index, self.stats.total_moves)) - self.updateMenus() - - def redo(self): - assert self.canRedo() - assert self.moves.state == self.S_PLAY and self.moves.current == [] - assert 0 <= self.moves.index <= len(self.moves.history) - if self.moves.index == len(self.moves.history): - return - m = self.moves.history[self.moves.index] - self.moves.index = self.moves.index + 1 - self.active_row = m[len(m) - 1] - m = m[:len(m) - 1] - self.moves.state = self.S_REDO - for atomic_move in m: - atomic_move.redo(self) - self.moves.state = self.S_PLAY - self.stats.redo_moves = self.stats.redo_moves + 1 - self.stats.total_moves = self.stats.total_moves + 1 - self.hints.list = None - self.updateText() - self.updateStatus(moves=(self.moves.index, self.stats.total_moves)) - self.updateMenus() - - def _restoreGameHook(self, game): - self.active_row = game.loadinfo.active_row - - def _loadGameHook(self, p): - self.loadinfo.addattr(active_row=0) # register extra load var. - self.loadinfo.active_row = p.load() - - def _saveGameHook(self, p): - p.dump(self.active_row) - - - -# /*********************************************************************** -# // Relaxed Lara's Game -# ************************************************************************/ - -class RelaxedLarasGame(LarasGame): - Reserve_Class = LarasGame_Reserve - Reserve_Cards = 1 - DEAL_TO_TALON = 3 - MAX_ROUNDS = 2 - - -# /*********************************************************************** -# // Double Lara's Game -# ************************************************************************/ - -class DoubleLarasGame(RelaxedLarasGame): - Reserve_Cards = 2 - MAX_ROUNDS = 3 - - # - # Game extras - # - - def Max_Cards(self, i): - return 26 - - # /*********************************************************************** # // Katrina's Game # ************************************************************************/ @@ -528,10 +123,6 @@ class DoubleKatrinasGame(RelaxedKatrinasGame): Reserve_Cards = 3 MAX_ROUNDS = 3 - # - # Game extras - # - def Max_Cards(self, i): return 28 + 16 * (i == 4) @@ -552,10 +143,6 @@ class BridgetsGame(LarasGame): ROW_LENGTH = 5 MAX_ROW = 16 - # - # Game extras - # - def Max_Cards(self, i): return 16 - 12 * (i == 4) @@ -580,10 +167,6 @@ class DoubleBridgetsGame(BridgetsGame): Reserve_Cards = 3 MAX_ROUNDS = 3 - # - # Game extras - # - def Max_Cards(self, i): return 32 - 24 * (i == 4) @@ -598,10 +181,6 @@ class FatimehsGame(LarasGame): MAX_ROW = 12 DIR = (1, 1) - # - # Game extras - # - def Max_Cards(self, i): return 12 @@ -635,10 +214,6 @@ class KalisGame(FatimehsGame): DEAL_TO_TALON = 6 ROW_LENGTH = 5 - # - # Game extras - # - def Base_Suit(self, i, j): return i + j * 5 @@ -662,10 +237,6 @@ class DoubleKalisGame(RelaxedKalisGame): MAX_ROUNDS = 4 MAX_ROW = 24 - # - # Game extras - # - def Max_Cards(self, i): return 24 @@ -683,10 +254,6 @@ class DojoujisGame(LarasGame): MAX_ROW = 8 DIR = (-1, -1) - # - # Game extras - # - def Max_Cards(self, i): return 8 @@ -703,7 +270,6 @@ class DojoujisGame(LarasGame): return i + j * 6 - # /*********************************************************************** # // Double Dojouji's Game # ************************************************************************/ @@ -711,10 +277,6 @@ class DojoujisGame(LarasGame): class DoubleDojoujisGame(DojoujisGame): MAX_ROW = 16 - # - # Game extras - # - def Max_Cards(self, i): return 16 @@ -724,59 +286,39 @@ class DoubleDojoujisGame(DojoujisGame): # register the game -registerGame(GameInfo(37, LarasGame, "Lara's Game", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) - registerGame(GameInfo(13001, KatrinasGame, "Katrina's Game", GI.GT_TAROCK, 2, 1, GI.SL_BALANCED, ranks = range(14), trumps = range(22))) - registerGame(GameInfo(13002, BridgetsGame, "Bridget's Game", GI.GT_HEXADECK, 2, 1, GI.SL_BALANCED, ranks = range(16), trumps = range(4))) - registerGame(GameInfo(13003, FatimehsGame, "Fatimeh's Game", GI.GT_MUGHAL_GANJIFA, 1, 2, GI.SL_BALANCED, suits = range(8), ranks = range(12))) - registerGame(GameInfo(13004, KalisGame, "Kali's Game", GI.GT_DASHAVATARA_GANJIFA, 1, 2, GI.SL_BALANCED, suits = range(10), ranks = range(12))) - registerGame(GameInfo(13005, DojoujisGame, "Dojouji's Game", GI.GT_HANAFUDA, 2, 0, GI.SL_BALANCED, suits = range(12), ranks = range(4))) - -registerGame(GameInfo(13006, RelaxedLarasGame, "Lara's Game Relaxed", - GI.GT_2DECK_TYPE, 2, 1, GI.SL_BALANCED)) - -registerGame(GameInfo(13007, DoubleLarasGame, "Lara's Game Doubled", - GI.GT_2DECK_TYPE, 4, 2, GI.SL_BALANCED)) - registerGame(GameInfo(13008, RelaxedKatrinasGame, "Katrina's Game Relaxed", GI.GT_TAROCK, 2, 1, GI.SL_BALANCED, ranks = range(14), trumps = range(22))) - registerGame(GameInfo(13009, DoubleKatrinasGame, "Katrina's Game Doubled", GI.GT_TAROCK, 4, 2, GI.SL_BALANCED, ranks = range(14), trumps = range(22))) - registerGame(GameInfo(13010, DoubleBridgetsGame, "Bridget's Game Doubled", GI.GT_HEXADECK, 4, 2, GI.SL_BALANCED, ranks = range(16), trumps = range(4))) - registerGame(GameInfo(13011, RelaxedKalisGame, "Kali's Game Relaxed", GI.GT_DASHAVATARA_GANJIFA, 1, 2, GI.SL_BALANCED, suits = range(10), ranks = range(12))) - registerGame(GameInfo(13012, DoubleKalisGame, "Kali's Game Doubled", GI.GT_DASHAVATARA_GANJIFA, 2, 3, GI.SL_BALANCED, suits = range(10), ranks = range(12))) - registerGame(GameInfo(13013, RelaxedFatimehsGame, "Fatimeh's Game Relaxed", GI.GT_MUGHAL_GANJIFA, 1, 2, GI.SL_BALANCED, suits = range(8), ranks = range(12))) - registerGame(GameInfo(13014, DoubleDojoujisGame, "Dojouji's Game Doubled", GI.GT_HANAFUDA, 4, 0, GI.SL_BALANCED, suits = range(12), ranks = range(4))) diff --git a/pysollib/games/ultra/tarock.py b/pysollib/games/ultra/tarock.py index 9e49ce1a..17d65c12 100644 --- a/pysollib/games/ultra/tarock.py +++ b/pysollib/games/ultra/tarock.py @@ -39,6 +39,7 @@ from pysollib.layout import Layout #from pysollib.pysoltk import MfxCanvasText from pysollib.games.special.tarock import AbstractTarockGame, Grasshopper +from pysollib.games.threepeaks import ThreePeaksNoScore # /*********************************************************************** @@ -254,6 +255,15 @@ class Rambling(Corkscrew): sequence = row.isSuitSequence return (sequence([card1, card2]) or sequence([card2, card1])) +# /*********************************************************************** +# // Le Grande Teton +# ************************************************************************/ + +class LeGrandeTeton(ThreePeaksNoScore): + pass + + + # /*********************************************************************** # // register the games # ************************************************************************/ @@ -270,5 +280,6 @@ r(13164, DoubleCockroach, 'Double Cockroach', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_S r(13165, Corkscrew, 'Corkscrew', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) r(13166, Serpent, 'Serpent', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) r(13167, Rambling, 'Rambling', GI.GT_TAROCK, 2, 0, GI.SL_MOSTLY_SKILL) +r(22232, LeGrandeTeton, 'Le Grande Teton', GI.GT_TAROCK, 1, 0, GI.SL_BALANCED) + -del r diff --git a/pysollib/main.py b/pysollib/main.py index e9f14010..f223e9aa 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -89,6 +89,7 @@ def parse_option(argv): "fg=", "foreground=", "bg=", "background=", "fn=", "font=", + "french-only", "noplugins", "nosound", "debug=", @@ -103,6 +104,7 @@ def parse_option(argv): "fg": None, "bg": None, "fn": None, + "french-only": False, "noplugins": False, "nosound": False, "debug": 0, @@ -120,6 +122,8 @@ def parse_option(argv): opts["bg"] = i[1] elif i[0] in ("--fn", "--font"): opts["fn"] = i[1] + elif i[0] == "--french-only": + opts["french-only"] = True elif i[0] == "--noplugins": opts["noplugins"] = True elif i[0] == "--nosound": @@ -146,7 +150,7 @@ def parse_option(argv): return None filename = args and args[0] or None if filename and not os.path.isfile(filename): - print _("%s: invalide file name\ntry %s --help for more information") % (prog_name, prog_name) + print _("%s: invalid file name\ntry %s --help for more information") % (prog_name, prog_name) return None return opts, filename @@ -190,15 +194,19 @@ def pysol_init(app, args): try: app.commandline.gameid = int(opts['gameid']) except: - print >> sys.stderr, 'WARNING: invalide game id:', opts['gameid'] - app.debug = int(opts['debug']) + print >> sys.stderr, 'WARNING: invalid game id:', opts['gameid'] + try: + app.debug = int(opts['debug']) + except: + print >> sys.stderr, 'invalid argument for debug' # init games database import games - import games.contrib - import games.special - import games.ultra - import games.mahjongg + if not opts['french-only']: + #import games.contrib + import games.ultra + import games.mahjongg + import games.special # init DataLoader f = os.path.join("html", "license.html") @@ -322,7 +330,7 @@ def pysol_init(app, args): try: f = Font(top, font) except: - print >> sys.stderr, "invalide font name:", font + print >> sys.stderr, "invalid font name:", font pass else: if font: @@ -345,8 +353,7 @@ Main data directory is: %s Please check your %s installation. -''') % (app.dataloader.dir, PACKAGE), - bitmap="error", strings=(_("&Quit"),)) +''') % (app.dataloader.dir, PACKAGE), bitmap="error", strings=(_("&Quit"),)) return 1 # init cardsets diff --git a/pysollib/tk/colorsdialog.py b/pysollib/tk/colorsdialog.py index a9fe39a3..9810c02c 100644 --- a/pysollib/tk/colorsdialog.py +++ b/pysollib/tk/colorsdialog.py @@ -23,7 +23,7 @@ __all__ = ['ColorsDialog'] # imports import os, sys -from Tkinter import * +import Tkinter from tkColorChooser import askcolor # PySol imports @@ -44,40 +44,40 @@ class ColorsDialog(MfxDialog): top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) - frame = Frame(top_frame) - frame.pack(expand=YES, fill=BOTH, padx=5, pady=10) + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=10) frame.columnconfigure(0, weight=1) - self.table_text_color_var = BooleanVar() + self.table_text_color_var = Tkinter.BooleanVar() self.table_text_color_var.set(app.opt.table_text_color) - self.table_text_color_value_var = StringVar() + self.table_text_color_value_var = Tkinter.StringVar() self.table_text_color_value_var.set(app.opt.table_text_color_value) ##self.table_color_var = StringVar() ##self.table_color_var.set(app.opt.table_color) - self.highlight_piles_colors_var = StringVar() + self.highlight_piles_colors_var = Tkinter.StringVar() self.highlight_piles_colors_var.set(app.opt.highlight_piles_colors[1]) - self.highlight_cards_colors_1_var = StringVar() + self.highlight_cards_colors_1_var = Tkinter.StringVar() self.highlight_cards_colors_1_var.set(app.opt.highlight_cards_colors[1]) - self.highlight_cards_colors_2_var = StringVar() + self.highlight_cards_colors_2_var = Tkinter.StringVar() self.highlight_cards_colors_2_var.set(app.opt.highlight_cards_colors[3]) - self.highlight_samerank_colors_1_var = StringVar() + self.highlight_samerank_colors_1_var = Tkinter.StringVar() self.highlight_samerank_colors_1_var.set(app.opt.highlight_samerank_colors[1]) - self.highlight_samerank_colors_2_var = StringVar() + self.highlight_samerank_colors_2_var = Tkinter.StringVar() self.highlight_samerank_colors_2_var.set(app.opt.highlight_samerank_colors[3]) - self.hintarrow_color_var = StringVar() + self.hintarrow_color_var = Tkinter.StringVar() self.hintarrow_color_var.set(app.opt.hintarrow_color) - self.highlight_not_matching_color_var = StringVar() + self.highlight_not_matching_color_var = Tkinter.StringVar() self.highlight_not_matching_color_var.set(app.opt.highlight_not_matching_color) # - c = Checkbutton(frame, variable=self.table_text_color_var, - text=_("Text foreground:"), anchor=W) - c.grid(row=0, column=0, sticky=W+E) - l = Label(frame, width=10, height=2, - bg=self.table_text_color_value_var.get(), - textvariable=self.table_text_color_value_var) + c = Tkinter.Checkbutton(frame, variable=self.table_text_color_var, + text=_("Text foreground:"), anchor='w') + c.grid(row=0, column=0, sticky='we') + l = Tkinter.Label(frame, width=10, height=2, + bg=self.table_text_color_value_var.get(), + textvariable=self.table_text_color_value_var) l.grid(row=0, column=1, padx=5) - b = Button(frame, text=_('Change...'), width=10, - command=lambda l=l: self.selectColor(l)) + b = Tkinter.Button(frame, text=_('Change...'), width=10, + command=lambda l=l: self.selectColor(l)) b.grid(row=0, column=2) row = 1 for title, var in ( @@ -90,12 +90,13 @@ class ColorsDialog(MfxDialog): (_('Hint arrow:'), self.hintarrow_color_var), (_('Highlight not matching:'), self.highlight_not_matching_color_var), ): - Label(frame, text=title, anchor=W).grid(row=row, column=0, sticky=W+E) - l = Label(frame, width=10, height=2, - bg=var.get(), textvariable=var) + Tkinter.Label(frame, text=title, anchor='w' + ).grid(row=row, column=0, sticky='we') + l = Tkinter.Label(frame, width=10, height=2, + bg=var.get(), textvariable=var) l.grid(row=row, column=1, padx=5) - b = Button(frame, text=_('Change...'), width=10, - command=lambda l=l: self.selectColor(l)) + b = Tkinter.Button(frame, text=_('Change...'), width=10, + command=lambda l=l: self.selectColor(l)) b.grid(row=row, column=2) row += 1 # diff --git a/pysollib/tk/fontsdialog.py b/pysollib/tk/fontsdialog.py index 6ea9da64..3c5d3940 100644 --- a/pysollib/tk/fontsdialog.py +++ b/pysollib/tk/fontsdialog.py @@ -24,7 +24,7 @@ __all__ = ['FontsDialog'] # imports import os, sys import types -from Tkinter import * +import Tkinter import tkFont # PySol imports @@ -71,38 +71,40 @@ class FontChooserDialog(MfxDialog): else: raise TypeError, 'invalid font style: '+ init_font[3] - #self.family_var = StringVar() - self.weight_var = BooleanVar() - self.slant_var = BooleanVar() - self.size_var = IntVar() + #self.family_var = Tkinter.StringVar() + self.weight_var = Tkinter.BooleanVar() + self.slant_var = Tkinter.BooleanVar() + self.size_var = Tkinter.IntVar() - frame = Frame(top_frame) - frame.pack(expand=YES, fill=BOTH, padx=5, pady=10) + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=10) frame.columnconfigure(0, weight=1) #frame.rowconfigure(1, weight=1) - self.entry = Entry(frame, bg='white') - self.entry.grid(row=0, column=0, columnspan=2, sticky=W+E+N+S) - self.entry.insert(END, _('abcdefghABCDEFGH')) - self.list_box = Listbox(frame, width=36, exportselection=False) - sb = Scrollbar(frame) + self.entry = Tkinter.Entry(frame, bg='white') + self.entry.grid(row=0, column=0, columnspan=2, sticky='news') + self.entry.insert('end', _('abcdefghABCDEFGH')) + self.list_box = Tkinter.Listbox(frame, width=36, exportselection=False) + sb = Tkinter.Scrollbar(frame) self.list_box.configure(yscrollcommand=sb.set) sb.configure(command=self.list_box.yview) - self.list_box.grid(row=1, column=0, sticky=W+E+N+S) # rowspan=4 - sb.grid(row=1, column=1, sticky=N+S) + self.list_box.grid(row=1, column=0, sticky='news') # rowspan=4 + sb.grid(row=1, column=1, sticky='ns') bind(self.list_box, '<>', self.fontupdate) ##self.list_box.focus() - cb1 = Checkbutton(frame, anchor=W, text=_('Bold'), - command=self.fontupdate, variable=self.weight_var) - cb1.grid(row=2, column=0, columnspan=2, sticky=W+E) - cb2 = Checkbutton(frame, anchor=W, text=_('Italic'), - command=self.fontupdate, variable=self.slant_var) - cb2.grid(row=3, column=0, columnspan=2, sticky=W+E) + cb1 = Tkinter.Checkbutton(frame, anchor='w', text=_('Bold'), + command=self.fontupdate, + variable=self.weight_var) + cb1.grid(row=2, column=0, columnspan=2, sticky='we') + cb2 = Tkinter.Checkbutton(frame, anchor='w', text=_('Italic'), + command=self.fontupdate, + variable=self.slant_var) + cb2.grid(row=3, column=0, columnspan=2, sticky='we') - sc = Scale(frame, from_=6, to=40, resolution=1, - #label='Size', - orient=HORIZONTAL, - command=self.fontupdate, variable=self.size_var) - sc.grid(row=4, column=0, columnspan=2, sticky=W+E+N+S) + sc = Tkinter.Scale(frame, from_=6, to=40, resolution=1, + #label='Size', + orient='horizontal', + command=self.fontupdate, variable=self.size_var) + sc.grid(row=4, column=0, columnspan=2, sticky='news') # self.size_var.set(self.font_size) self.weight_var.set(self.font_weight == 'bold') @@ -111,10 +113,11 @@ class FontChooserDialog(MfxDialog): font_families.sort() selected = -1 n = 0 + self.list_box.insert('end', *font_families) for font in font_families: - self.list_box.insert(END, font) if font.lower() == self.font_family.lower(): selected = n + break n += 1 if selected >= 0: self.list_box.select_set(selected) @@ -155,35 +158,33 @@ class FontsDialog(MfxDialog): top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) - frame = Frame(top_frame) - frame.pack(expand=YES, fill=BOTH, padx=5, pady=10) + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=10) frame.columnconfigure(0, weight=1) self.fonts = {} row = 0 - for fn in (#"default", - "sans", - "small", - "fixed", - "canvas_default", - #"canvas_card", - "canvas_fixed", - "canvas_large", - "canvas_small", - #"tree_small", - ): + for fn, title in (##('default', _('Default')), + ('sans', _('HTML: ')), + ('small', _('Small: ')), + ('fixed', _('Fixed: ')), + ('canvas_default', _('Tableau default: ')), + ('canvas_fixed', _('Tableau fixed: ')), + ('canvas_large', _('Tableau large: ')), + ('canvas_small', _('Tableau small: ')), + ): font = app.opt.fonts[fn] self.fonts[fn] = font - title = fn.replace("_", " ").capitalize()+": " - Label(frame, text=title, anchor=W).grid(row=row, column=0, sticky=W+E) + Tkinter.Label(frame, text=title, anchor='w' + ).grid(row=row, column=0, sticky='we') if font: - title = " ".join([str(i) for i in font if not i in ('roman', 'normal')]) + title = ' '.join([str(i) for i in font if not i in ('roman', 'normal')]) elif font is None: title = 'Default' - l = Label(frame, font=font, text=title) + l = Tkinter.Label(frame, font=font, text=title) l.grid(row=row, column=1) - b = Button(frame, text=_('Change...'), width=10, - command=lambda l=l, fn=fn: self.selectFont(l, fn)) + b = Tkinter.Button(frame, text=_('Change...'), width=10, + command=lambda l=l, fn=fn: self.selectFont(l, fn)) b.grid(row=row, column=2) row += 1 # @@ -192,16 +193,16 @@ class FontsDialog(MfxDialog): def selectFont(self, label, fn): - d = FontChooserDialog(self.top, _("Select font"), self.fonts[fn]) + d = FontChooserDialog(self.top, _('Select font'), self.fonts[fn]) if d.status == 0 and d.button == 0: self.fonts[fn] = d.font - title = " ".join([str(i) for i in d.font if not i in ('roman', 'normal')]) + title = ' '.join([str(i) for i in d.font if not i in ('roman', 'normal')]) label.configure(font=d.font, text=title) def initKw(self, kw): kw = KwStruct(kw, - strings=(_("&OK"), _("&Cancel")), + strings=(_('&OK'), _('&Cancel')), default=0, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tk/gameinfodialog.py b/pysollib/tk/gameinfodialog.py index 3e34891b..6718b0ea 100644 --- a/pysollib/tk/gameinfodialog.py +++ b/pysollib/tk/gameinfodialog.py @@ -24,7 +24,7 @@ __all__ = ['GameInfoDialog'] # imports import os, sys -from Tkinter import * +import Tkinter # PySol imports from pysollib.mfxutil import KwStruct @@ -44,8 +44,8 @@ class GameInfoDialog(MfxDialog): top_frame, bottom_frame = self.createFrames(kw) self.createBitmaps(top_frame, kw) - frame = Frame(top_frame) - frame.pack(expand=YES, fill=BOTH, padx=5, pady=10) + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=10) frame.columnconfigure(0, weight=1) game = app.game @@ -108,8 +108,10 @@ class GameInfoDialog(MfxDialog): ('Hint:', hint), ): if t: - Label(frame, text=n, anchor=W).grid(row=row, column=0, sticky=N+W) - Label(frame, text=t, anchor=W, justify=LEFT).grid(row=row, column=1, sticky=N+W) + Tkinter.Label(frame, text=n, anchor='w' + ).grid(row=row, column=0, sticky='nw') + Tkinter.Label(frame, text=t, anchor='w', justify='left' + ).grid(row=row, column=1, sticky='nw') row += 1 if game.s.talon: @@ -131,9 +133,9 @@ class GameInfoDialog(MfxDialog): focus = self.createButtons(bottom_frame, kw) self.mainloop(focus, kw.timeout) - def showStacks(self, frame, row, title, stacks): - Label(frame, text=title, anchor=W).grid(row=row, column=0, sticky=N+W) + Tkinter.Label(frame, text=title, anchor='w' + ).grid(row=row, column=0, sticky='nw') if isinstance(stacks, (list, tuple)): fs = {} for f in stacks: @@ -145,8 +147,8 @@ class GameInfoDialog(MfxDialog): t = '\n'.join(['%s (%d)' % (i[0], i[1]) for i in fs.items()]) else: t = stacks.__class__.__name__ - Label(frame, text=t, anchor=W, justify=LEFT).grid(row=row, column=1, sticky=N+W) - + Tkinter.Label(frame, text=t, anchor='w', justify='left' + ).grid(row=row, column=1, sticky='nw') def initKw(self, kw): kw = KwStruct(kw, diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 7364dfec..a84fc103 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -721,14 +721,18 @@ class PysolMenubar(PysolMenubarActions): submenu = self.__menupath[".menubar.file.favoritegames"][2] submenu.delete(0, "last") # insert games - g = [self.app.getGameInfo(id) for id in gameids] - if len(g) > self.__cb_max*4: - g.sort(lambda a, b: cmp(gettext(a.name), gettext(b.name))) - self._addSelectAllGameSubMenu(submenu, g, + games = [] + for id in gameids: + gi = self.app.getGameInfo(id) + if gi: + games.append(gi) + if len(games) > self.__cb_max*4: + games.sort(lambda a, b: cmp(gettext(a.name), gettext(b.name))) + self._addSelectAllGameSubMenu(submenu, games, command=self.mSelectGame, variable=self.tkopt.gameid) else: - self._addSelectGameSubSubMenu(submenu, g, + self._addSelectGameSubSubMenu(submenu, games, command=self.mSelectGame, variable=self.tkopt.gameid) state = self._getEnabledState diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index e8cec38e..6baa6853 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -99,13 +99,14 @@ class SelectGameData(SelectDialogTreeData): self.all_games_gi = map(app.gdb.get, app.gdb.getGamesIdSortedByName()) self.no_games = [ SelectGameLeaf(None, None, _("(no games)"), None), ] # - s_by_type = s_oriental = s_special = s_original = s_contrib = None + s_by_type = s_oriental = s_special = s_original = s_contrib = s_mahjongg = None g = [] for data in (GI.SELECT_GAME_BY_TYPE, GI.SELECT_ORIENTAL_GAME_BY_TYPE, GI.SELECT_SPECIAL_GAME_BY_TYPE, GI.SELECT_ORIGINAL_GAME_BY_TYPE, - GI.SELECT_CONTRIB_GAME_BY_TYPE): + GI.SELECT_CONTRIB_GAME_BY_TYPE, + ): gg = [] for name, select_func in data: if name is None or not filter(select_func, self.all_games_gi): @@ -114,21 +115,23 @@ class SelectGameData(SelectDialogTreeData): name = name.replace("&", "") gg.append(SelectGameNode(None, name, select_func)) g.append(gg) - if 1 and g[0]: + select_mahjongg_game = lambda gi: gi.si.game_type == GI.GT_MAHJONGG + gg = None + if filter(select_mahjongg_game, self.all_games_gi): + gg = SelectGameNode(None, _("Mahjongg Games"), select_mahjongg_game) + g.append(gg) + if g[0]: s_by_type = SelectGameNode(None, _("French games"), tuple(g[0]), expanded=1) - pass - if 1 and g[1]: + if g[1]: s_oriental = SelectGameNode(None, _("Oriental Games"), tuple(g[1])) - pass - if 1 and g[2]: + if g[2]: s_special = SelectGameNode(None, _("Special Games"), tuple(g[2])) - pass - if 1 and g[3]: + if g[3]: s_original = SelectGameNode(None, _("Original Games"), tuple(g[3])) - pass - if 1 and g[4]: - ##s_contrib = SelectGameNode(None, "Contributed Games", tuple(g[4])) - pass +## if g[4]: +## s_contrib = SelectGameNode(None, "Contributed Games", tuple(g[4])) + if g[5]: + s_mahjongg = g[5] # s_by_compatibility, gg = None, [] for name, games in GI.GAMES_BY_COMPATIBILITY: @@ -140,16 +143,6 @@ class SelectGameData(SelectDialogTreeData): if 1 and gg: s_by_compatibility = SelectGameNode(None, _("by Compatibility"), tuple(gg)) pass -## # -## s_mahjongg, gg = None, [] -## for name, games in GI.GAMES_BY_COMPATIBILITY: -## select_func = lambda gi, games=games: gi.id in games -## if name is None or not filter(select_func, self.all_games_gi): -## continue -## gg.append(SelectGameNode(None, name, select_func)) -## if 1 and gg: -## s_by_compatibility = SelectGameNode(None, "by Compatibility", tuple(gg)) -## pass # s_by_pysol_version, gg = None, [] for name, games in GI.GAMES_BY_PYSOL_VERSION: @@ -169,9 +162,7 @@ class SelectGameData(SelectDialogTreeData): SelectGameNode(None, _("All Games"), None, expanded=0), SelectGameNode(None, _("Alternate Names"), ul_alternate_names), SelectGameNode(None, _("Popular Games"), lambda gi: gi.si.game_flags & GI.GT_POPULAR, expanded=0), - SelectGameNode(None, _("Mahjongg Games"), - lambda gi: gi.si.game_type == GI.GT_MAHJONGG, - expanded=0), + s_mahjongg, s_oriental, s_special, s_by_type, @@ -398,7 +389,8 @@ class SelectGameDialogWithPreview(SelectGameDialog): padx=padx, pady=pady, sticky='nsew') right_frame.columnconfigure(1, weight=1) right_frame.rowconfigure(1, weight=1) - + # + focus = self.createButtons(bottom_frame, kw) # set the scale factor self.preview.canvas.preview = 2 # create a preview of the current game @@ -406,8 +398,6 @@ class SelectGameDialogWithPreview(SelectGameDialog): self.preview_game = None self.preview_app = None self.updatePreview(gameid, animations=0) - # - focus = self.createButtons(bottom_frame, kw) ##focus = self.tree.frame SelectGameTreeWithPreview.html_viewer = None self.mainloop(focus, kw.timeout) @@ -532,6 +522,12 @@ class SelectGameDialogWithPreview(SelectGameDialog): self.preview_key = gameid # self.updateInfo(gameid) + # + rules_button = self.buttons[1] + if self.app.getGameRulesFilename(gameid): + rules_button.config(state="normal") + else: + rules_button.config(state="disabled") def updateInfo(self, gameid): gi = self.app.gdb.get(gameid) diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index ebec5c7e..1b577346 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -37,7 +37,7 @@ __all__ = ['SoundOptionsDialog'] # imports import os, sys, string -from Tkinter import * +import Tkinter import traceback # PySol imports @@ -63,87 +63,88 @@ class SoundOptionsDialog(MfxDialog): self.createBitmaps(top_frame, kw) # self.saved_opt = app.opt.copy() - self.sound = BooleanVar() + self.sound = Tkinter.BooleanVar() self.sound.set(app.opt.sound != 0) - self.sound_mode = BooleanVar() + self.sound_mode = Tkinter.BooleanVar() self.sound_mode.set(app.opt.sound_mode != 0) - self.sample_volume = IntVar() + self.sample_volume = Tkinter.IntVar() self.sample_volume.set(app.opt.sound_sample_volume) - self.music_volume = IntVar() + self.music_volume = Tkinter.IntVar() self.music_volume.set(app.opt.sound_music_volume) self.samples = [ - ('areyousure', _('Are You Sure'), BooleanVar()), + ('areyousure', _('Are You Sure'), Tkinter.BooleanVar()), - ('deal', _('Deal'), BooleanVar()), - ('dealwaste', _('Deal waste'), BooleanVar()), + ('deal', _('Deal'), Tkinter.BooleanVar()), + ('dealwaste', _('Deal waste'), Tkinter.BooleanVar()), - ('turnwaste', _('Turn waste'), BooleanVar()), - ('startdrag', _('Start drag'), BooleanVar()), + ('turnwaste', _('Turn waste'), Tkinter.BooleanVar()), + ('startdrag', _('Start drag'), Tkinter.BooleanVar()), - ('drop', _('Drop'), BooleanVar()), - ('droppair', _('Drop pair'), BooleanVar()), - ('autodrop', _('Auto drop'), BooleanVar()), + ('drop', _('Drop'), Tkinter.BooleanVar()), + ('droppair', _('Drop pair'), Tkinter.BooleanVar()), + ('autodrop', _('Auto drop'), Tkinter.BooleanVar()), - ('flip', _('Flip'), BooleanVar()), - ('autoflip', _('Auto flip'), BooleanVar()), - ('move', _('Move'), BooleanVar()), - ('nomove', _('No move'), BooleanVar()), + ('flip', _('Flip'), Tkinter.BooleanVar()), + ('autoflip', _('Auto flip'), Tkinter.BooleanVar()), + ('move', _('Move'), Tkinter.BooleanVar()), + ('nomove', _('No move'), Tkinter.BooleanVar()), - ('undo', _('Undo'), BooleanVar()), - ('redo', _('Redo'), BooleanVar()), + ('undo', _('Undo'), Tkinter.BooleanVar()), + ('redo', _('Redo'), Tkinter.BooleanVar()), - ('autopilotlost', _('Autopilot lost'), BooleanVar()), - ('autopilotwon', _('Autopilot won'), BooleanVar()), + ('autopilotlost', _('Autopilot lost'), Tkinter.BooleanVar()), + ('autopilotwon', _('Autopilot won'), Tkinter.BooleanVar()), - ('gamefinished', _('Game finished'), BooleanVar()), - ('gamelost', _('Game lost'), BooleanVar()), - ('gamewon', _('Game won'), BooleanVar()), - ('gameperfect', _('Perfect game'), BooleanVar()), + ('gamefinished', _('Game finished'), Tkinter.BooleanVar()), + ('gamelost', _('Game lost'), Tkinter.BooleanVar()), + ('gamewon', _('Game won'), Tkinter.BooleanVar()), + ('gameperfect', _('Perfect game'), Tkinter.BooleanVar()), ] # - frame = Frame(top_frame) - frame.pack(expand=1, fill='both', padx=5, pady=5) + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=5) frame.columnconfigure(1, weight=1) # row = 0 - w = Checkbutton(frame, variable=self.sound, + w = Tkinter.Checkbutton(frame, variable=self.sound, text=_("Sound enabled"), anchor='w') w.grid(row=row, column=0, columnspan=2, sticky='ew') # if os.name == "nt" and pysolsoundserver: row += 1 - w = Checkbutton(frame, variable=self.sound_mode, + w = Tkinter.Checkbutton(frame, variable=self.sound_mode, text=_("Use DirectX for sound playing"), command=self.mOptSoundDirectX, anchor='w') w.grid(row=row, column=0, columnspan=2, sticky='ew') # if pysolsoundserver and app.startup_opt.sound_mode > 0: row += 1 - w = Label(frame, text=_('Sample volume:')) + w = Tkinter.Label(frame, text=_('Sample volume:')) w.grid(row=row, column=0, sticky='w') - w = Scale(frame, from_=0, to=128, resolution=1, - orient='horizontal', takefocus=0, - length="3i", #label=_('Sample volume'), - variable=self.sample_volume) + w = Tkinter.Scale(frame, from_=0, to=128, resolution=1, + orient='horizontal', takefocus=0, + length="3i", #label=_('Sample volume'), + variable=self.sample_volume) w.grid(row=row, column=1, sticky='w', padx=5) row += 1 - w = Label(frame, text=_('Music volume:')) + w = Tkinter.Label(frame, text=_('Music volume:')) w.grid(row=row, column=0, sticky='w', padx=5) - w = Scale(frame, from_=0, to=128, resolution=1, - orient='horizontal', takefocus=0, - length="3i", #label=_('Music volume'), - variable=self.music_volume) + w = Tkinter.Scale(frame, from_=0, to=128, resolution=1, + orient='horizontal', takefocus=0, + length="3i", #label=_('Music volume'), + variable=self.music_volume) w.grid(row=row, column=1, sticky='w', padx=5) else: # remove "Apply" button kw.strings[1] = None # - if TkVersion >= 8.4: - frame = LabelFrame(top_frame, text=_('Enable samles'), padx=5, pady=5) + if Tkinter.TkVersion >= 8.4: + frame = Tkinter.LabelFrame(top_frame, text=_('Enable samles'), + padx=5, pady=5) else: - frame = Frame(top_frame) + frame = Tkinter.Frame(top_frame) frame.pack(expand=1, fill='both', padx=5, pady=5) frame.columnconfigure(0, weight=1) frame.columnconfigure(1, weight=1) @@ -152,7 +153,7 @@ class SoundOptionsDialog(MfxDialog): col = 0 for n, t, v in self.samples: v.set(app.opt.sound_samples[n]) - w = Checkbutton(frame, text=t, anchor='w', variable=v) + w = Tkinter.Checkbutton(frame, text=t, anchor='w', variable=v) w.grid(row=row, column=col, sticky='ew') if col == 1: col = 0 @@ -203,7 +204,9 @@ class SoundOptionsDialog(MfxDialog): def mOptSoundDirectX(self, *event): ##print self.sound_mode.get() d = MfxMessageDialog(self.top, title=_("Sound preferences info"), - text=_("Changing DirectX settings will take effect\nthe next time you restart ")+PACKAGE, + text=_("""\ +Changing DirectX settings will take effect +the next time you restart """)+PACKAGE, bitmap="warning", default=0, strings=(_("&OK"),)) diff --git a/pysollib/tk/statusbar.py b/pysollib/tk/statusbar.py index 7f0664cf..e69f3e3e 100644 --- a/pysollib/tk/statusbar.py +++ b/pysollib/tk/statusbar.py @@ -39,6 +39,12 @@ __all__ = ['PysolStatusbar', # imports import os, sys, Tkinter +if __name__ == '__main__': + d = os.path.abspath(os.path.join(sys.path[0], '..', '..')) + sys.path.append(d) + import gettext + gettext.install('pysol', d, unicode=True) + # PySol imports from pysollib.mfxutil import destruct @@ -61,6 +67,7 @@ class MfxStatusbar: self._columnspan = columnspan # self.padx = 1 + self.label_relief = 'sunken' self.frame = Tkinter.Frame(self.top, bd=1) self.frame.grid(row=self._row, column=self._column, columnspan=self._columnspan, sticky='ew', @@ -70,13 +77,28 @@ class MfxStatusbar: if os.name == 'nt': self.frame.config(relief='raised') self.padx = 0 + if 0: + self.frame.config(bd=0) + self.label_relief = 'flat' + self.padx = 0 # util def _createLabel(self, name, side='left', fill='none', expand=0, width=0, tooltip=None): - label = Tkinter.Label(self.frame, width=width, relief='sunken', bd=1) - label.pack(side=side, fill=fill, padx=self.padx, expand=expand) + if 0: + frame = Tkinter.Frame(self.frame, bd=1, relief=self.label_relief, + highlightbackground='#9e9a9e', + highlightthickness=1) + frame.pack(side=side, fill=fill, padx=self.padx, expand=expand) + label = Tkinter.Label(frame, width=width, bd=0) + label.pack(expand=True, fill='both') + else: + label = Tkinter.Label(self.frame, width=width, + relief=self.label_relief, bd=1, + highlightbackground='black' + ) + label.pack(side=side, fill=fill, padx=self.padx, expand=expand) setattr(self, name + "_label", label) self._widgets.append(label) if tooltip: diff --git a/pysollib/tk/timeoutsdialog.py b/pysollib/tk/timeoutsdialog.py index 1ec23785..a2294147 100644 --- a/pysollib/tk/timeoutsdialog.py +++ b/pysollib/tk/timeoutsdialog.py @@ -23,7 +23,7 @@ __all__ = ['TimeoutsDialog'] # imports import os, sys -from Tkinter import * +import Tkinter # PySol imports from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct @@ -43,24 +43,24 @@ class TimeoutsDialog(MfxDialog): top_frame, bottom_frame = self.createFrames(kw) #self.createBitmaps(top_frame, kw) - frame = Frame(top_frame) - frame.pack(expand=YES, fill=BOTH, padx=5, pady=10) + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=10) frame.columnconfigure(0, weight=1) - self.demo_sleep_var = DoubleVar() + self.demo_sleep_var = Tkinter.DoubleVar() self.demo_sleep_var.set(app.opt.demo_sleep) - self.hint_sleep_var = DoubleVar() + self.hint_sleep_var = Tkinter.DoubleVar() self.hint_sleep_var.set(app.opt.hint_sleep) - self.raise_card_sleep_var = DoubleVar() + self.raise_card_sleep_var = Tkinter.DoubleVar() self.raise_card_sleep_var.set(app.opt.raise_card_sleep) - self.highlight_piles_sleep_var = DoubleVar() + self.highlight_piles_sleep_var = Tkinter.DoubleVar() self.highlight_piles_sleep_var.set(app.opt.highlight_piles_sleep) - self.highlight_cards_sleep_var = DoubleVar() + self.highlight_cards_sleep_var = Tkinter.DoubleVar() self.highlight_cards_sleep_var.set(app.opt.highlight_cards_sleep) - self.highlight_samerank_sleep_var = DoubleVar() + self.highlight_samerank_sleep_var = Tkinter.DoubleVar() self.highlight_samerank_sleep_var.set(app.opt.highlight_samerank_sleep) # - #Label(frame, text='Set delays in seconds').grid(row=0, column=0, columnspan=2) + #Tkinter.Label(frame, text='Set delays in seconds').grid(row=0, column=0, columnspan=2) row = 0 for title, var in ((_('Demo:'), self.demo_sleep_var), (_('Hint:'), self.hint_sleep_var), @@ -69,11 +69,11 @@ class TimeoutsDialog(MfxDialog): (_('Highlight cards:'), self.highlight_cards_sleep_var), (_('Highlight same rank:'), self.highlight_samerank_sleep_var), ): - Label(frame, text=title, anchor=W).grid(row=row, column=0, sticky=W+E) - widget = Scale(frame, from_=0.2, to=9.9, - resolution=0.1, orient=HORIZONTAL, - length="3i", - variable=var, takefocus=0) + Tkinter.Label(frame, text=title, anchor='w' + ).grid(row=row, column=0, sticky='we') + widget = Tkinter.Scale(frame, from_=0.2, to=9.9, + resolution=0.1, orient='horizontal', + length="3i", variable=var, takefocus=0) widget.grid(row=row, column=1) row += 1 # diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 8c735d90..099ab5f2 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -40,13 +40,19 @@ import os, sys, re, types import htmllib, formatter import Tkinter +if __name__ == '__main__': + d = os.path.abspath(os.path.join(sys.path[0], '..', '..')) + sys.path.append(d) + import gettext + gettext.install('pysol', d, unicode=True) + # PySol imports from pysollib.mfxutil import Struct, openURL from pysollib.settings import PACKAGE # Toolkit imports from tkutil import bind, unbind_destroy, loadImage -from tkwidget import MfxDialog +from tkwidget import MfxMessageDialog from statusbar import HtmlStatusbar @@ -65,9 +71,13 @@ class tkHTMLWriter(formatter.DumbWriter): self.viewer = viewer ## - font = app.getFont("sans") + if app: + font = app.getFont("sans") + fixed = app.getFont("fixed") + else: + font = ('helvetica', 12) + fixed = ('courier', 12) size = font[1] - fixed = app.getFont("fixed") sign = 1 if size < 0: sign = -1 self.fontmap = { @@ -121,14 +131,21 @@ class tkHTMLWriter(formatter.DumbWriter): if self.anchor: url = self.anchor[0] tag = "href_" + url - self.text.tag_add(tag, self.anchor_mark, "insert") + anchor_mark = self.anchor_mark + if self.text.get(anchor_mark) == ' ': # FIXME + try: + y, x = anchor_mark.split('.') + anchor_mark = y+'.'+str(int(x)+1) + except: + pass + self.text.tag_add(tag, anchor_mark, "insert") self.text.tag_bind(tag, "<1>", self.createCallback(url)) self.text.tag_bind(tag, "", lambda e: self.anchor_enter(url)) self.text.tag_bind(tag, "", self.anchor_leave) fg = 'blue' u = self.viewer.normurl(url, with_protocol=False) if u in self.viewer.visited_urls: - fg = '#303080' + fg = '#660099' self.text.tag_config(tag, foreground=fg, underline=1) self.anchor = None @@ -379,7 +396,7 @@ class tkHTMLViewer: for p in REMOTE_PROTOCOLS: if url.startswith(p): if not openURL(url): - self.errorDialog(PACKAGE + _(''' HTML limitation: + self.errorDialog(PACKAGE + _('''HTML limitation: The %s protocol is not supported yet. Please use your standard web browser @@ -491,9 +508,9 @@ to open the following URL: self.display(self.home, relpath=0) def errorDialog(self, msg): - d = MfxDialog(self.parent, title=PACKAGE+" HTML Problem", - text=msg, bitmap="warning", - strings=(_("&OK"),), default=0) + d = MfxMessageDialog(self.parent, title=PACKAGE+" HTML Problem", + text=msg, bitmap="warning", + strings=(_("&OK"),), default=0) def getImage(self, fn): if self.images.has_key(fn): @@ -526,6 +543,7 @@ def tkhtml_main(args): top = Tkinter.Tk() top.wm_minsize(400, 200) viewer = tkHTMLViewer(top) + viewer.app = None viewer.display(url) top.mainloop() return 0 diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 9fec16f4..9ac6b9e4 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -70,6 +70,7 @@ class MfxDialog: # ex. _ToplevelDialog self.status = 0 self.button = default self.timer = None + self.buttons = [] self.accel_keys = {} self.top = makeToplevel(parent, title=title) self.top.wm_resizable(resizable, resizable) @@ -231,6 +232,7 @@ class MfxDialog: # ex. _ToplevelDialog if button == kw.default: focus = b focus.config(default="active") + self.buttons.append(b) # b.config(width=button_width) if accel_indx >= 0: diff --git a/scripts/all_games.py b/scripts/all_games.py index 7112f18e..07464c34 100755 --- a/scripts/all_games.py +++ b/scripts/all_games.py @@ -5,6 +5,7 @@ import sys, os, re, time from pprint import pprint +os.environ['LANG'] = 'C' import gettext gettext.install('pysol', 'locale', unicode=True) @@ -15,7 +16,6 @@ rules_dir = os.path.normpath(os.path.join(pysollib_path, 'data/html/rules')) #print rules_dir import pysollib.games -import pysollib.games.contrib import pysollib.games.special import pysollib.games.ultra import pysollib.games.mahjongg @@ -138,17 +138,17 @@ def all_games(sort_by='id'): gt = CSI.TYPE_NAME[gi.category] if gt == 'French': gt = 'French (%s)' % GAME_BY_TYPE[gi.si.game_type] + name = gi.name.encode('utf-8') + altnames = '
    '.join(gi.altnames).encode('utf-8') if 1 and os.path.exists(os.path.join(rules_dir, rules_fn)): fn = '../data/html/rules/'+rules_fn print '''%s %s %s%s -''' % (id, fn, - gi.name.encode('utf-8'), '
    '.join(gi.altnames).encode('utf-8'), gt) +''' % (id, fn, name, altnames, gt) else: print '''%s%s%s%s -''' % (id, gi.name.encode('utf-8'), - '
    '.join(gi.altnames).encode('utf-8'), gt) +''' % (id, name, altnames, gt) print '' def create_html(sort_by): @@ -219,6 +219,7 @@ def plain_text(): for id in get_games_func(): gi = GAME_DB.get(id) if gi.category == GI.GC_FRENCH: + ##print str(gi.gameclass) print gi.name.encode('utf-8') ##name = gi.name.lower() ##name = re.sub('\W', '', name) @@ -235,6 +236,8 @@ elif sys.argv[1] == 'gettext': get_text() elif sys.argv[1] == 'text': plain_text() +else: + sys.exit('invalid argument') From ebee1a26ee76b76332d7d09e1f4bff2cf2231413 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 9 Aug 2006 22:03:46 +0000 Subject: [PATCH 041/266] + 3 new games * move poker.py to pysollib/games/special * improved menubar * updated translation git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@42 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- Makefile | 3 +- po/games.pot | 445 +++++++- po/pysol.pot | 1444 +++++++++++++------------ po/ru_games.po | 732 ++++++++++--- po/ru_pysol.po | 1417 ++++++++++++------------ pysollib/gamedb.py | 4 +- pysollib/games/__init__.py | 1 - pysollib/games/doublets.py | 3 +- pysollib/games/fan.py | 90 +- pysollib/games/freecell.py | 52 + pysollib/games/mahjongg/mahjongg2.py | 2 +- pysollib/games/special/__init__.py | 1 + pysollib/games/{ => special}/poker.py | 0 pysollib/games/sultan.py | 67 ++ pysollib/move.py | 6 +- pysollib/stack.py | 10 +- pysollib/tk/findcarddialog.py | 4 +- pysollib/tk/menubar.py | 204 ++-- pysollib/tk/tkhtml.py | 52 +- pysollib/version.py | 2 +- 20 files changed, 2866 insertions(+), 1673 deletions(-) rename pysollib/games/{ => special}/poker.py (100%) diff --git a/Makefile b/Makefile index 44afc81e..6c2531cb 100644 --- a/Makefile +++ b/Makefile @@ -4,8 +4,7 @@ override LANG=C PYSOLLIB_FILES=pysollib/tk/*.py pysollib/*.py \ pysollib/games/*.py pysollib/games/special/*.py \ - pysollib/games/contrib/*.py pysollib/games/ultra/*.py \ - pysollib/games/mahjongg/*.py + pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py .PHONY : install dist all_games_html rules pot mo diff --git a/po/games.pot b/po/games.pot index d218b330..fb51027c 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sat Jun 24 16:07:12 2006\n" +"POT-Creation-Date: Wed Aug 9 19:09:14 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,6 +66,9 @@ msgstr "" msgid "Acquaintance" msgstr "" +msgid "Adela" +msgstr "" + msgid "Agnes Bernauer" msgstr "" @@ -102,12 +105,21 @@ msgstr "" msgid "Alternation" msgstr "" +msgid "Alternations" +msgstr "" + msgid "Amazons" msgstr "" +msgid "American Canister" +msgstr "" + msgid "American Toad" msgstr "" +msgid "Anno Domini" +msgstr "" + msgid "Another Round" msgstr "" @@ -141,6 +153,9 @@ msgstr "" msgid "Art Moderne" msgstr "" +msgid "Artic Garden" +msgstr "" + msgid "Ashrafi" msgstr "" @@ -150,6 +165,12 @@ msgstr "" msgid "Ashwapati" msgstr "" +msgid "Assembly" +msgstr "" + +msgid "Athena" +msgstr "" + msgid "Auld Lang Syne" msgstr "" @@ -183,6 +204,9 @@ msgstr "" msgid "Balarama" msgstr "" +msgid "Bastille Day" +msgstr "" + msgid "Bastion" msgstr "" @@ -195,6 +219,9 @@ msgstr "" msgid "Batsford" msgstr "" +msgid "Batsford Again" +msgstr "" + msgid "Bavarian Patience" msgstr "" @@ -204,6 +231,9 @@ msgstr "" msgid "Beatle" msgstr "" +msgid "Beetle" +msgstr "" + msgid "Beleaguered Castle" msgstr "" @@ -213,6 +243,9 @@ msgstr "" msgid "Betsy Ross" msgstr "" +msgid "Big Bertha" +msgstr "" + msgid "Big Braid" msgstr "" @@ -222,6 +255,12 @@ msgstr "" msgid "Big Courtyard" msgstr "" +msgid "Big Deal" +msgstr "" + +msgid "Big Divorce" +msgstr "" + msgid "Big Easy" msgstr "" @@ -231,9 +270,6 @@ msgstr "" msgid "Big Forty" msgstr "" -msgid "Big Ground" -msgstr "" - msgid "Big Harp" msgstr "" @@ -297,6 +333,12 @@ msgstr "" msgid "Boat" msgstr "" +msgid "Bonaparte" +msgstr "" + +msgid "Boost" +msgstr "" + msgid "Boudoir" msgstr "" @@ -309,6 +351,12 @@ msgstr "" msgid "Braid" msgstr "" +msgid "Brazilian Patience" +msgstr "" + +msgid "Breakwater" +msgstr "" + msgid "Bridesmaids" msgstr "" @@ -327,9 +375,18 @@ msgstr "" msgid "Brigade" msgstr "" +msgid "Brisbane" +msgstr "" + msgid "Bristol" msgstr "" +msgid "British Blockade" +msgstr "" + +msgid "British Canister" +msgstr "" + msgid "British Constitution" msgstr "" @@ -363,6 +420,9 @@ msgstr "" msgid "Canfield" msgstr "" +msgid "Canfield Rush" +msgstr "" + msgid "Canister" msgstr "" @@ -447,9 +507,15 @@ msgstr "" msgid "Chessboard" msgstr "" +msgid "Chinaman" +msgstr "" + msgid "Chinese Discipline" msgstr "" +msgid "Chinese Klondike" +msgstr "" + msgid "Chinese Solitaire" msgstr "" @@ -459,6 +525,12 @@ msgstr "" msgid "Cicely" msgstr "" +msgid "Circle Eight" +msgstr "" + +msgid "Circle Nine" +msgstr "" + msgid "Citadel" msgstr "" @@ -507,12 +579,24 @@ msgstr "" msgid "Corona" msgstr "" +msgid "Cotillion" +msgstr "" + msgid "Courtyard" msgstr "" +msgid "Cover" +msgstr "" + +msgid "Crescent" +msgstr "" + msgid "Cross" msgstr "" +msgid "Crossroads" +msgstr "" + msgid "Crown" msgstr "" @@ -549,6 +633,9 @@ msgstr "" msgid "Deep Well" msgstr "" +msgid "Delivery" +msgstr "" + msgid "Demon" msgstr "" @@ -579,6 +666,9 @@ msgstr "" msgid "Diamond" msgstr "" +msgid "Diamond Mine" +msgstr "" + msgid "Die Bildgallerie" msgstr "" @@ -615,6 +705,12 @@ msgstr "" msgid "Dojouji's Game Doubled" msgstr "" +msgid "Doorway" +msgstr "" + +msgid "Double Acquaintance" +msgstr "" + msgid "Double Bisley" msgstr "" @@ -633,9 +729,15 @@ msgstr "" msgid "Double Easthaven" msgstr "" +msgid "Double Fives" +msgstr "" + msgid "Double FreeCell" msgstr "" +msgid "Double Gold Mine" +msgstr "" + msgid "Double Grasshopper" msgstr "" @@ -669,12 +771,18 @@ msgstr "" msgid "Double Mahjongg Two Squares" msgstr "" +msgid "Double Measure" +msgstr "" + msgid "Double Rail" msgstr "" msgid "Double Russian Solitaire" msgstr "" +msgid "Double Russian Spider" +msgstr "" + msgid "Double Samuri" msgstr "" @@ -687,6 +795,9 @@ msgstr "" msgid "Double Yukon" msgstr "" +msgid "Double or Quits" +msgstr "" + msgid "Doublets" msgstr "" @@ -708,6 +819,9 @@ msgstr "" msgid "Drivel" msgstr "" +msgid "Duchess" +msgstr "" + msgid "Dude" msgstr "" @@ -717,6 +831,9 @@ msgstr "" msgid "Dumfries" msgstr "" +msgid "Dutch Solitaire" +msgstr "" + msgid "Eagle Wing" msgstr "" @@ -732,6 +849,9 @@ msgstr "" msgid "Easy x One" msgstr "" +msgid "Eclipse" +msgstr "" + msgid "Egyptian Solitaire" msgstr "" @@ -756,6 +876,12 @@ msgstr "" msgid "Elevator" msgstr "" +msgid "Elevens" +msgstr "" + +msgid "Elevens Too" +msgstr "" + msgid "Emperor" msgstr "" @@ -768,12 +894,18 @@ msgstr "" msgid "Escalator" msgstr "" +msgid "Eternal Triangle" +msgstr "" + msgid "Eularia" msgstr "" msgid "Excuse" msgstr "" +msgid "Exiled Kings" +msgstr "" + msgid "Express" msgstr "" @@ -783,6 +915,9 @@ msgstr "" msgid "F-15 Eagle" msgstr "" +msgid "Faerie Queen" +msgstr "" + msgid "Fair Lucy" msgstr "" @@ -795,12 +930,21 @@ msgstr "" msgid "Fan" msgstr "" +msgid "Fanny" +msgstr "" + msgid "Farandole" msgstr "" +msgid "Farmer's Wife" +msgstr "" + msgid "Faro" msgstr "" +msgid "Fascination Fan" +msgstr "" + msgid "Fastness" msgstr "" @@ -816,9 +960,18 @@ msgstr "" msgid "Fifteen plus" msgstr "" +msgid "Fifteens" +msgstr "" + +msgid "Final Battle" +msgstr "" + msgid "Firecracker" msgstr "" +msgid "Firing Squad" +msgstr "" + msgid "First Law" msgstr "" @@ -834,9 +987,15 @@ msgstr "" msgid "Five Pyramids" msgstr "" +msgid "Flamenco" +msgstr "" + msgid "Floating City" msgstr "" +msgid "Floradora" +msgstr "" + msgid "Flower Arrangement" msgstr "" @@ -873,6 +1032,9 @@ msgstr "" msgid "Fortunes" msgstr "" +msgid "Forty Nine" +msgstr "" + msgid "Forty Thieves" msgstr "" @@ -897,9 +1059,15 @@ msgstr "" msgid "Four Winds" msgstr "" +msgid "Foursome" +msgstr "" + msgid "Fourteen" msgstr "" +msgid "Frames" +msgstr "" + msgid "Fred's Spider" msgstr "" @@ -969,6 +1137,9 @@ msgstr "" msgid "Geoffrey" msgstr "" +msgid "German FreeCell" +msgstr "" + msgid "German Patience" msgstr "" @@ -978,9 +1149,15 @@ msgstr "" msgid "Giant" msgstr "" +msgid "Giza" +msgstr "" + msgid "Glade" msgstr "" +msgid "Glencoe" +msgstr "" + msgid "Glenwood" msgstr "" @@ -993,27 +1170,48 @@ msgstr "" msgid "Gnat" msgstr "" +msgid "Gold Mine" +msgstr "" + +msgid "Gold Rush" +msgstr "" + msgid "Golf" msgstr "" msgid "Good Measure" msgstr "" +msgid "Gotham" +msgstr "" + msgid "Grampus" msgstr "" msgid "Granada" msgstr "" +msgid "Grand Duchess" +msgstr "" + +msgid "Grand Duchess +" +msgstr "" + msgid "Grandfather" msgstr "" msgid "Grandfather's Clock" msgstr "" +msgid "Grandmamma's Patience" +msgstr "" + msgid "Grandmother's Game" msgstr "" +msgid "Grant's Reinforcement" +msgstr "" + msgid "Grasshopper" msgstr "" @@ -1065,12 +1263,18 @@ msgstr "" msgid "Hare" msgstr "" +msgid "Harvestman" +msgstr "" + msgid "Hayagriva" msgstr "" msgid "Haystack" msgstr "" +msgid "Headquarters" +msgstr "" + msgid "Heads and Tails" msgstr "" @@ -1113,12 +1317,18 @@ msgstr "" msgid "Hovercraft" msgstr "" +msgid "How They Run" +msgstr "" + msgid "Hurdles" msgstr "" msgid "Hurricane" msgstr "" +msgid "Hypotenuse" +msgstr "" + msgid "Idiot's Delight" msgstr "" @@ -1140,6 +1350,9 @@ msgstr "" msgid "Inca" msgstr "" +msgid "Indefatigable" +msgstr "" + msgid "Indian" msgstr "" @@ -1158,9 +1371,18 @@ msgstr "" msgid "Intelligence +" msgstr "" +msgid "Interchange" +msgstr "" + +msgid "Interment" +msgstr "" + msgid "Interregnum" msgstr "" +msgid "Intrigue" +msgstr "" + msgid "Iris" msgstr "" @@ -1200,6 +1422,9 @@ msgstr "" msgid "Jumbo" msgstr "" +msgid "Junction" +msgstr "" + msgid "Jungle" msgstr "" @@ -1242,6 +1467,9 @@ msgstr "" msgid "King Only Hex A Klon" msgstr "" +msgid "KingCell" +msgstr "" + msgid "Kingdom" msgstr "" @@ -1317,9 +1545,15 @@ msgstr "" msgid "La Belle Lucie" msgstr "" +msgid "La Chatelaine" +msgstr "" + msgid "La Nivernaise" msgstr "" +msgid "La Parisienne" +msgstr "" + msgid "Labyrinth" msgstr "" @@ -1335,6 +1569,12 @@ msgstr "" msgid "Lady of the Manor" msgstr "" +msgid "Lafayette" +msgstr "" + +msgid "Laggard Lady" +msgstr "" + msgid "Lanes" msgstr "" @@ -1347,6 +1587,9 @@ msgstr "" msgid "Lara's Game Relaxed" msgstr "" +msgid "Last Chance" +msgstr "" + msgid "Lattice" msgstr "" @@ -1356,9 +1599,15 @@ msgstr "" msgid "Le Grande Teton" msgstr "" +msgid "Legion" +msgstr "" + msgid "Leo" msgstr "" +msgid "Les Quatre Coins" +msgstr "" + msgid "Lesser Queue" msgstr "" @@ -1392,12 +1641,18 @@ msgstr "" msgid "Little Napoleon" msgstr "" +msgid "Lobachevsky" +msgstr "" + msgid "Long Braid" msgstr "" msgid "Long Journey to Cuddapah" msgstr "" +msgid "Long Tail" +msgstr "" + msgid "Loose Ends" msgstr "" @@ -1407,6 +1662,12 @@ msgstr "" msgid "Lucas" msgstr "" +msgid "Lucky Piles" +msgstr "" + +msgid "Lucky Thirteen" +msgstr "" + msgid "Madame" msgstr "" @@ -1959,6 +2220,9 @@ msgstr "" msgid "Makara" msgstr "" +msgid "Mamy Susan" +msgstr "" + msgid "Mancunian" msgstr "" @@ -1971,9 +2235,15 @@ msgstr "" msgid "Marie Rose" msgstr "" +msgid "Marshal" +msgstr "" + msgid "Martha" msgstr "" +msgid "Master" +msgstr "" + msgid "Matriarchy" msgstr "" @@ -1995,6 +2265,9 @@ msgstr "" msgid "Maze" msgstr "" +msgid "Measure" +msgstr "" + msgid "Memory 24" msgstr "" @@ -2172,6 +2445,9 @@ msgstr "" msgid "Numerica" msgstr "" +msgid "Numerica (2 decks)" +msgstr "" + msgid "Ocean Towers" msgstr "" @@ -2193,6 +2469,9 @@ msgstr "" msgid "Old Mole" msgstr "" +msgid "One234" +msgstr "" + msgid "Oonsoo" msgstr "" @@ -2214,6 +2493,9 @@ msgstr "" msgid "Open Peek" msgstr "" +msgid "Open Sly Fox" +msgstr "" + msgid "Open Spider" msgstr "" @@ -2229,6 +2511,9 @@ msgstr "" msgid "Osmosis" msgstr "" +msgid "Outback Patience" +msgstr "" + msgid "Owl" msgstr "" @@ -2244,6 +2529,9 @@ msgstr "" msgid "Panopticon" msgstr "" +msgid "Pantagruel" +msgstr "" + msgid "Pantheon" msgstr "" @@ -2256,6 +2544,15 @@ msgstr "" msgid "Parashurama" msgstr "" +msgid "Parisian" +msgstr "" + +msgid "Parisienne" +msgstr "" + +msgid "Parliament" +msgstr "" + msgid "Pas Seul" msgstr "" @@ -2316,6 +2613,9 @@ msgstr "" msgid "Picture Gallery" msgstr "" +msgid "Picture Patience" +msgstr "" + msgid "Pigtail" msgstr "" @@ -2349,6 +2649,12 @@ msgstr "" msgid "Portuguese Solitaire" msgstr "" +msgid "Primrose" +msgstr "" + +msgid "Princess Patience" +msgstr "" + msgid "Progression" msgstr "" @@ -2385,12 +2691,21 @@ msgstr "" msgid "Quadruple Alliance" msgstr "" +msgid "Quartets" +msgstr "" + +msgid "Queen Victoria" +msgstr "" + msgid "Queen of Italy" msgstr "" msgid "Queenie" msgstr "" +msgid "Queensland" +msgstr "" + msgid "Quilt" msgstr "" @@ -2436,6 +2751,9 @@ msgstr "" msgid "Red and Black" msgstr "" +msgid "Regal Family" +msgstr "" + msgid "Reindeer" msgstr "" @@ -2463,6 +2781,9 @@ msgstr "" msgid "Retinue" msgstr "" +msgid "Right Triangle" +msgstr "" + msgid "Rings" msgstr "" @@ -2502,6 +2823,9 @@ msgstr "" msgid "Roman Arena" msgstr "" +msgid "Roosevelt" +msgstr "" + msgid "Roost" msgstr "" @@ -2517,6 +2841,9 @@ msgstr "" msgid "Rows of Four" msgstr "" +msgid "Royal Aids" +msgstr "" + msgid "Royal Cotillion" msgstr "" @@ -2529,6 +2856,12 @@ msgstr "" msgid "Royal Marriage" msgstr "" +msgid "Royal Parade" +msgstr "" + +msgid "Royal Rendezvous" +msgstr "" + msgid "Rugby" msgstr "" @@ -2547,18 +2880,27 @@ msgstr "" msgid "Russian Solitaire" msgstr "" +msgid "Russian Spider" +msgstr "" + msgid "Salic Law" msgstr "" msgid "Samuri" msgstr "" +msgid "San Juan Hill" +msgstr "" + msgid "Sanibel" msgstr "" msgid "Saratoga" msgstr "" +msgid "Saxony" +msgstr "" + msgid "Scarab" msgstr "" @@ -2580,12 +2922,18 @@ msgstr "" msgid "Screw Up" msgstr "" +msgid "Scuffle" +msgstr "" + msgid "Sea Towers" msgstr "" msgid "Seahaven Towers" msgstr "" +msgid "Selective Castle" +msgstr "" + msgid "Senate" msgstr "" @@ -2610,6 +2958,9 @@ msgstr "" msgid "Seven by Four" msgstr "" +msgid "Shady Lanes" +msgstr "" + msgid "Shamrocks" msgstr "" @@ -2646,6 +2997,9 @@ msgstr "" msgid "Shisen-Sho 24x12" msgstr "" +msgid "Short Tail" +msgstr "" + msgid "Siam" msgstr "" @@ -2688,9 +3042,15 @@ msgstr "" msgid "Sixes and Sevens" msgstr "" +msgid "Skippy" +msgstr "" + msgid "Skiz" msgstr "" +msgid "Sly Fox" +msgstr "" + msgid "Small Harp" msgstr "" @@ -2709,9 +3069,15 @@ msgstr "" msgid "Solid Square" msgstr "" +msgid "Solstice" +msgstr "" + msgid "Somerset" msgstr "" +msgid "Soother" +msgstr "" + msgid "Souter" msgstr "" @@ -2805,6 +3171,9 @@ msgstr "" msgid "Step Pyramid" msgstr "" +msgid "Step-Up" +msgstr "" + msgid "Steps" msgstr "" @@ -2823,12 +3192,18 @@ msgstr "" msgid "Straight Up" msgstr "" +msgid "Strata" +msgstr "" + msgid "Strategerie" msgstr "" msgid "Strategy" msgstr "" +msgid "Strategy +" +msgstr "" + msgid "Streets" msgstr "" @@ -2838,6 +3213,9 @@ msgstr "" msgid "Stronghold" msgstr "" +msgid "Suit Elevens" +msgstr "" + msgid "Sukis" msgstr "" @@ -2925,6 +3303,12 @@ msgstr "" msgid "The Great Wall" msgstr "" +msgid "The Little Corporal" +msgstr "" + +msgid "The Spark" +msgstr "" + msgid "The Wish" msgstr "" @@ -2940,6 +3324,9 @@ msgstr "" msgid "Thirteen Up" msgstr "" +msgid "Thirteens" +msgstr "" + msgid "Thirty Six" msgstr "" @@ -2952,6 +3339,9 @@ msgstr "" msgid "Three Peaks Non-scoring" msgstr "" +msgid "Three Pirates" +msgstr "" + msgid "Three Shuffles and a Draw" msgstr "" @@ -2994,6 +3384,9 @@ msgstr "" msgid "Traditional Reviewed" msgstr "" +msgid "Trapdoor" +msgstr "" + msgid "Treasure Trove" msgstr "" @@ -3003,15 +3396,15 @@ msgstr "" msgid "Trefoil" msgstr "" -msgid "Tri Peaks" -msgstr "" - msgid "Trika" msgstr "" msgid "Trillium" msgstr "" +msgid "Triple Alliance" +msgstr "" + msgid "Triple Canfield" msgstr "" @@ -3039,9 +3432,18 @@ msgstr "" msgid "Triple Yukon" msgstr "" +msgid "Troika" +msgstr "" + +msgid "Troika +" +msgstr "" + msgid "Trusty Twelve" msgstr "" +msgid "Tuxedo" +msgstr "" + msgid "Twenty" msgstr "" @@ -3051,6 +3453,9 @@ msgstr "" msgid "Twin Picks" msgstr "" +msgid "Twin Queens" +msgstr "" + msgid "Twin Temples" msgstr "" @@ -3063,9 +3468,18 @@ msgstr "" msgid "Two Squares" msgstr "" +msgid "Ukrainian Solitaire" +msgstr "" + msgid "Union Square" msgstr "" +msgid "Unlimited" +msgstr "" + +msgid "Usk" +msgstr "" + msgid "Vagues" msgstr "" @@ -3081,13 +3495,16 @@ msgstr "" msgid "Variegated Canfield" msgstr "" +msgid "Vassal" +msgstr "" + msgid "Vegas Klondike" msgstr "" msgid "Vertical" msgstr "" -msgid "Very Big Ground" +msgid "Very Big Divorce" msgstr "" msgid "Vi" @@ -3096,6 +3513,9 @@ msgstr "" msgid "Victory Arrow" msgstr "" +msgid "Virginia Reel" +msgstr "" + msgid "Wake-Robin" msgstr "" @@ -3114,6 +3534,9 @@ msgstr "" msgid "Wasp" msgstr "" +msgid "Waterloo" +msgstr "" + msgid "Wave Motion" msgstr "" @@ -3141,6 +3564,9 @@ msgstr "" msgid "Whatever" msgstr "" +msgid "Wheatsheaf" +msgstr "" + msgid "Wheel of Fortune" msgstr "" @@ -3165,6 +3591,9 @@ msgstr "" msgid "Wisteria" msgstr "" +msgid "Wood" +msgstr "" + msgid "X-Files" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index 75d594a7..a61a78e6 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Sat Jun 24 16:07:07 2006\n" +"POT-Creation-Date: Wed Aug 9 19:09:09 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,196 +15,196 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:346 pysollib/tk/toolbar.py:183 +#: pysollib/actions.py:358 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "" -#: pysollib/actions.py:359 pysollib/tk/menubar.py:666 -#: pysollib/tk/menubar.py:680 +#: pysollib/actions.py:371 pysollib/tk/menubar.py:698 +#: pysollib/tk/menubar.py:712 msgid "Select game" msgstr "" -#: pysollib/actions.py:382 +#: pysollib/actions.py:394 msgid "Invalid game number" msgstr "" -#: pysollib/actions.py:383 +#: pysollib/actions.py:395 msgid "" "Invalid game number\n" msgstr "" -#: pysollib/actions.py:400 +#: pysollib/actions.py:412 msgid "Select next game number" msgstr "" -#: pysollib/actions.py:409 pysollib/actions.py:419 +#: pysollib/actions.py:421 pysollib/actions.py:431 msgid "Select new game number" msgstr "" -#: pysollib/actions.py:410 +#: pysollib/actions.py:422 msgid "" "\n" "\n" "Enter new game number" msgstr "" -#: pysollib/actions.py:411 +#: pysollib/actions.py:423 msgid "&Next number" msgstr "" -#: pysollib/actions.py:411 pysollib/app.py:1113 pysollib/app.py:1125 -#: pysollib/game.py:837 pysollib/game.py:1651 pysollib/main.py:413 -#: pysollib/main.py:421 pysollib/tk/colorsdialog.py:131 -#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 -#: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:143 +#: pysollib/actions.py:423 pysollib/app.py:1142 pysollib/app.py:1154 +#: pysollib/game.py:904 pysollib/game.py:1828 pysollib/main.py:439 +#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:132 +#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 -#: pysollib/tk/soundoptionsdialog.py:171 pysollib/tk/soundoptionsdialog.py:225 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:474 +#: pysollib/tk/soundoptionsdialog.py:170 pysollib/tk/soundoptionsdialog.py:211 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:503 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 #: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 #: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:777 -#: pysollib/tk/tkstats.py:861 pysollib/tk/tkwidget.py:156 -#: pysollib/tk/tkwidget.py:320 +#: pysollib/tk/tkstats.py:861 pysollib/tk/tkwidget.py:159 +#: pysollib/tk/tkwidget.py:324 msgid "&OK" msgstr "" -#: pysollib/actions.py:411 pysollib/app.py:1125 pysollib/game.py:837 -#: pysollib/game.py:1214 pysollib/game.py:1229 pysollib/game.py:1235 -#: pysollib/game.py:1240 pysollib/tk/colorsdialog.py:131 -#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 -#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:849 -#: pysollib/tk/menubar.py:851 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/actions.py:423 pysollib/app.py:1154 pysollib/game.py:904 +#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 +#: pysollib/game.py:1318 pysollib/tk/colorsdialog.py:132 +#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:893 +#: pysollib/tk/menubar.py:895 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 -#: pysollib/tk/selectgame.py:275 pysollib/tk/selectgame.py:417 -#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:171 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:320 +#: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 +#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:170 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:324 msgid "&Cancel" msgstr "" -#: pysollib/actions.py:427 +#: pysollib/actions.py:439 msgid "Select random game" msgstr "" -#: pysollib/actions.py:463 +#: pysollib/actions.py:475 msgid "Select next game" msgstr "" -#: pysollib/actions.py:496 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:508 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "" -#: pysollib/actions.py:546 +#: pysollib/actions.py:558 msgid "Clear bookmarks" msgstr "" -#: pysollib/actions.py:547 +#: pysollib/actions.py:559 msgid "Clear all bookmarks ?" msgstr "" -#: pysollib/actions.py:557 +#: pysollib/actions.py:569 msgid "Restart game" msgstr "" -#: pysollib/actions.py:558 +#: pysollib/actions.py:570 msgid "Restart this game ?" msgstr "" -#: pysollib/actions.py:595 +#: pysollib/actions.py:611 msgid "" "Comments for %s:\n" "\n" msgstr "" -#: pysollib/actions.py:597 +#: pysollib/actions.py:613 msgid "Comments for " msgstr "" -#: pysollib/actions.py:615 pysollib/actions.py:651 +#: pysollib/actions.py:631 pysollib/actions.py:667 msgid "Error while writing to file" msgstr "" -#: pysollib/actions.py:618 pysollib/actions.py:654 +#: pysollib/actions.py:634 pysollib/actions.py:670 msgid " Info" msgstr "" -#: pysollib/actions.py:619 +#: pysollib/actions.py:635 msgid "" "Comments were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:636 +#: pysollib/actions.py:652 msgid "Demo statistics" msgstr "" -#: pysollib/actions.py:639 +#: pysollib/actions.py:655 msgid "Your statistics" msgstr "" -#: pysollib/actions.py:655 +#: pysollib/actions.py:671 msgid "" " were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:669 +#: pysollib/actions.py:685 msgid " Demo" msgstr "" -#: pysollib/actions.py:669 +#: pysollib/actions.py:685 msgid " Demo " msgstr "" -#: pysollib/actions.py:672 pysollib/actions.py:690 +#: pysollib/actions.py:688 pysollib/actions.py:706 msgid " for " msgstr "" -#: pysollib/actions.py:678 pysollib/actions.py:697 +#: pysollib/actions.py:694 pysollib/actions.py:713 msgid "Statistics for " msgstr "" -#: pysollib/actions.py:681 pysollib/tk/selectgame.py:359 -#: pysollib/tk/toolbar.py:194 +#: pysollib/actions.py:697 pysollib/tk/selectgame.py:350 +#: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "" -#: pysollib/actions.py:684 +#: pysollib/actions.py:700 msgid "Full log" msgstr "" -#: pysollib/actions.py:687 +#: pysollib/actions.py:703 msgid "Session log" msgstr "" -#: pysollib/actions.py:693 +#: pysollib/actions.py:709 msgid "Game Info" msgstr "" -#: pysollib/actions.py:702 +#: pysollib/actions.py:718 msgid "Full log for " msgstr "" -#: pysollib/actions.py:707 +#: pysollib/actions.py:723 msgid "Session log for " msgstr "" -#: pysollib/actions.py:712 +#: pysollib/actions.py:728 msgid "Reset all statistics" msgstr "" -#: pysollib/actions.py:713 +#: pysollib/actions.py:729 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" msgstr "" -#: pysollib/actions.py:719 +#: pysollib/actions.py:735 msgid "Reset game statistics" msgstr "" -#: pysollib/actions.py:720 +#: pysollib/actions.py:736 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -212,51 +212,51 @@ msgid "" "%s ?" msgstr "" -#: pysollib/actions.py:776 +#: pysollib/actions.py:792 msgid "Play demo" msgstr "" -#: pysollib/actions.py:787 +#: pysollib/actions.py:803 msgid "Set player options" msgstr "" -#: pysollib/actions.py:876 +#: pysollib/actions.py:898 msgid "Sound settings" msgstr "" -#: pysollib/actions.py:897 +#: pysollib/actions.py:919 msgid "Set colors" msgstr "" -#: pysollib/actions.py:916 +#: pysollib/actions.py:938 msgid "Set fonts" msgstr "" -#: pysollib/actions.py:925 +#: pysollib/actions.py:947 msgid "Set timeouts" msgstr "" -#: pysollib/app.py:85 +#: pysollib/app.py:87 msgid "Unknown" msgstr "" -#: pysollib/app.py:975 +#: pysollib/app.py:1004 msgid "Loading %s %s..." msgstr "" -#: pysollib/app.py:1010 +#: pysollib/app.py:1039 msgid " load error" msgstr "" -#: pysollib/app.py:1011 +#: pysollib/app.py:1040 msgid "Error while loading " msgstr "" -#: pysollib/app.py:1105 +#: pysollib/app.py:1134 msgid "Incompatible " msgstr "" -#: pysollib/app.py:1107 +#: pysollib/app.py:1136 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -265,58 +265,58 @@ msgid "" "Please select a %s type %s.\n" msgstr "" -#: pysollib/app.py:1123 +#: pysollib/app.py:1152 msgid "Please select a %s type %s" msgstr "" -#: pysollib/game.py:756 pysollib/game.py:762 +#: pysollib/game.py:823 pysollib/game.py:829 msgid "" "Player\n" msgstr "" -#: pysollib/game.py:833 +#: pysollib/game.py:900 msgid "Discard current game ?" msgstr "" -#: pysollib/game.py:1168 +#: pysollib/game.py:1244 msgid "" "\n" "You have reached\n" "#%d in the %s of playing time" msgstr "" -#: pysollib/game.py:1171 +#: pysollib/game.py:1247 msgid "" "\n" "and #%d in the %s of moves" msgstr "" -#: pysollib/game.py:1173 +#: pysollib/game.py:1249 msgid "" "\n" "You have reached\n" "#%d in the %s of moves" msgstr "" -#: pysollib/game.py:1176 +#: pysollib/game.py:1252 msgid "" "\n" "and #%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1178 +#: pysollib/game.py:1254 msgid "" "\n" "You have reached\n" "#%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1205 pysollib/game.py:1221 -#: pysollib/tk/soundoptionsdialog.py:102 +#: pysollib/game.py:1281 pysollib/game.py:1297 +#: pysollib/tk/soundoptionsdialog.py:100 msgid "Game won" msgstr "" -#: pysollib/game.py:1206 +#: pysollib/game.py:1282 msgid "" "\n" "Congratulations, this\n" @@ -327,12 +327,12 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1214 pysollib/game.py:1229 pysollib/game.py:1235 -#: pysollib/game.py:1240 pysollib/tk/menubar.py:250 +#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 +#: pysollib/game.py:1318 pysollib/tk/menubar.py:257 msgid "&New game" msgstr "" -#: pysollib/game.py:1222 +#: pysollib/game.py:1298 msgid "" "\n" "Congratulations, you did it !\n" @@ -342,100 +342,100 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1233 pysollib/game.py:1238 -#: pysollib/tk/soundoptionsdialog.py:100 +#: pysollib/game.py:1310 pysollib/game.py:1316 +#: pysollib/tk/soundoptionsdialog.py:98 msgid "Game finished" msgstr "" -#: pysollib/game.py:1234 pysollib/game.py:1652 +#: pysollib/game.py:1311 pysollib/game.py:1829 msgid "" "\n" "Game finished\n" msgstr "" -#: pysollib/game.py:1239 +#: pysollib/game.py:1317 msgid "" "\n" "Game finished, but not without my help...\n" msgstr "" -#: pysollib/game.py:1240 +#: pysollib/game.py:1318 msgid "&Restart" msgstr "" -#: pysollib/game.py:1544 +#: pysollib/game.py:1720 msgid "Score %6d" msgstr "" -#: pysollib/game.py:1643 +#: pysollib/game.py:1819 msgid "&Cool" msgstr "" -#: pysollib/game.py:1643 +#: pysollib/game.py:1819 msgid "&Great" msgstr "" -#: pysollib/game.py:1643 +#: pysollib/game.py:1819 msgid "&Wow" msgstr "" -#: pysollib/game.py:1643 +#: pysollib/game.py:1819 msgid "&Yeah" msgstr "" -#: pysollib/game.py:1644 pysollib/game.py:1655 pysollib/game.py:1667 +#: pysollib/game.py:1820 pysollib/game.py:1832 pysollib/game.py:1845 msgid " Autopilot" msgstr "" -#: pysollib/game.py:1645 +#: pysollib/game.py:1821 msgid "" "\n" "Game solved in %d moves.\n" msgstr "" -#: pysollib/game.py:1666 +#: pysollib/game.py:1844 msgid "&Hmm" msgstr "" -#: pysollib/game.py:1666 +#: pysollib/game.py:1844 msgid "&Oh well" msgstr "" -#: pysollib/game.py:1666 +#: pysollib/game.py:1844 msgid "&That's life" msgstr "" -#: pysollib/game.py:1668 +#: pysollib/game.py:1846 msgid "" "\n" "This won't come out...\n" msgstr "" -#: pysollib/game.py:2072 +#: pysollib/game.py:2264 msgid "Set bookmark" msgstr "" -#: pysollib/game.py:2073 +#: pysollib/game.py:2265 msgid "Replace existing bookmark %d ?" msgstr "" -#: pysollib/game.py:2095 +#: pysollib/game.py:2287 msgid "Goto bookmark" msgstr "" -#: pysollib/game.py:2096 +#: pysollib/game.py:2288 msgid "Goto bookmark %d ?" msgstr "" -#: pysollib/game.py:2127 +#: pysollib/game.py:2319 msgid "Open game" msgstr "" -#: pysollib/game.py:2138 pysollib/game.py:2147 pysollib/game.py:2152 +#: pysollib/game.py:2330 pysollib/game.py:2339 pysollib/game.py:2344 msgid "Load game error" msgstr "" -#: pysollib/game.py:2139 +#: pysollib/game.py:2331 msgid "" "Error while loading game.\n" "\n" @@ -443,22 +443,22 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2148 +#: pysollib/game.py:2340 msgid "Error while loading game" msgstr "" -#: pysollib/game.py:2153 +#: pysollib/game.py:2345 msgid "" "Internal error while loading game.\n" "\n" "Please report this bug." msgstr "" -#: pysollib/game.py:2178 +#: pysollib/game.py:2370 msgid "Save game error" msgstr "" -#: pysollib/game.py:2179 +#: pysollib/game.py:2371 msgid "Error while saving game" msgstr "" @@ -670,27 +670,27 @@ msgstr "" msgid "Puzzle type" msgstr "" -#: pysollib/games/auldlangsyne.py:142 pysollib/games/calculation.py:101 -#: pysollib/games/numerica.py:90 pysollib/games/numerica.py:197 -#: pysollib/games/numerica.py:543 -msgid "Row. Build regardless of rank and suit." +#: pysollib/games/auldlangsyne.py:158 pysollib/games/calculation.py:104 +#: pysollib/games/numerica.py:90 pysollib/games/numerica.py:272 +#: pysollib/games/numerica.py:639 pysollib/games/numerica.py:743 +msgid "Tableau. Build regardless of rank and suit." msgstr "" -#: pysollib/games/braid.py:251 pysollib/games/napoleon.py:190 -#: pysollib/games/ultra/dashavatara.py:959 +#: pysollib/games/braid.py:248 pysollib/games/camelot.py:555 +#: pysollib/games/napoleon.py:182 pysollib/games/ultra/dashavatara.py:959 #: pysollib/games/ultra/hanafuda1.py:256 pysollib/games/ultra/hexadeck.py:1190 #: pysollib/games/ultra/mughal.py:802 msgid " Ascending" msgstr "" -#: pysollib/games/braid.py:253 pysollib/games/napoleon.py:192 -#: pysollib/games/ultra/dashavatara.py:961 +#: pysollib/games/braid.py:250 pysollib/games/camelot.py:554 +#: pysollib/games/napoleon.py:184 pysollib/games/ultra/dashavatara.py:961 #: pysollib/games/ultra/hanafuda1.py:258 pysollib/games/ultra/hexadeck.py:1192 #: pysollib/games/ultra/mughal.py:804 msgid " Descending" msgstr "" -#: pysollib/games/calculation.py:135 pysollib/games/calculation.py:230 +#: pysollib/games/calculation.py:121 msgid "" "1: 2 3 4 5 6 7 8 9 T J Q K\n" "2: 4 6 8 T Q A 3 5 7 9 J K\n" @@ -698,32 +698,34 @@ msgid "" "4: 8 Q 3 7 J 2 6 T A 5 9 K" msgstr "" -#: pysollib/games/curdsandwhey.py:58 -msgid "Row. Build down by suit or of the same rank." +#: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 +#: pysollib/stack.py:1287 pysollib/util.py:81 +msgid "King" msgstr "" -#: pysollib/games/fan.py:279 +#: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 +#: pysollib/stack.py:1286 pysollib/util.py:81 +msgid "Queen" +msgstr "" + +#: pysollib/games/curdsandwhey.py:60 +msgid "Tableau. Build down by suit or of the same rank." +msgstr "" + +#: pysollib/games/fan.py:280 msgid "Draw" msgstr "" -#: pysollib/games/fan.py:279 +#: pysollib/games/fan.py:280 msgid "X" msgstr "" -#: pysollib/games/fortythieves.py:429 pysollib/games/klondike.py:148 -msgid "Row. Build down in any suit but the same." +#: pysollib/games/golf.py:114 pysollib/games/golf.py:300 +#: pysollib/stack.py:1898 +msgid "Tableau. No building." msgstr "" -#: pysollib/games/golf.py:114 pysollib/games/golf.py:414 -#: pysollib/stack.py:1742 -msgid "Row. No building." -msgstr "" - -#: pysollib/games/golf.py:382 -msgid "Balance $%4d" -msgstr "" - -#: pysollib/games/golf.py:498 pysollib/stack.py:1675 +#: pysollib/games/golf.py:384 pysollib/stack.py:1831 msgid "Foundation. Build up regardless of suit." msgstr "" @@ -731,32 +733,36 @@ msgstr "" msgid "Balance $%d" msgstr "" -#: pysollib/games/klondike.py:388 +#: pysollib/games/klondike.py:419 msgid "Reserve. Only Kings are acceptable." msgstr "" -#: pysollib/games/mahjongg/mahjongg.py:294 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1508 +msgid "Round %d" +msgstr "" + +#: pysollib/games/mahjongg/mahjongg.py:298 msgid "" "No Free\n" "Matching\n" "Pairs" msgstr "" -#: pysollib/games/mahjongg/mahjongg.py:295 +#: pysollib/games/mahjongg/mahjongg.py:299 msgid "" "1 Free\n" "Matching\n" "Pair" msgstr "" -#: pysollib/games/mahjongg/mahjongg.py:296 +#: pysollib/games/mahjongg/mahjongg.py:300 msgid "" " Free\n" "Matching\n" "Pairs" msgstr "" -#: pysollib/games/mahjongg/mahjongg.py:297 +#: pysollib/games/mahjongg/mahjongg.py:301 msgid "" "\n" "Tiles\n" @@ -764,7 +770,7 @@ msgid "" "\n" msgstr "" -#: pysollib/games/mahjongg/mahjongg.py:298 +#: pysollib/games/mahjongg/mahjongg.py:302 msgid "" "\n" "Tiles\n" @@ -780,11 +786,25 @@ msgstr "" msgid "Deal %d" msgstr "" -#: pysollib/games/numerica.py:184 +#: pysollib/games/numerica.py:259 pysollib/games/royalcotillion.py:841 msgid "Foundation. Build up by color." msgstr "" -#: pysollib/games/poker.py:82 +#: pysollib/games/special/memory.py:178 pysollib/games/special/poker.py:191 +msgid "Points: %d" +msgstr "" + +#: pysollib/games/special/memory.py:181 pysollib/games/special/poker.py:189 +msgid "" +"WON\n" +"\n" +msgstr "" + +#: pysollib/games/special/memory.py:182 pysollib/games/special/poker.py:193 +msgid "Total: %d" +msgstr "" + +#: pysollib/games/special/poker.py:82 msgid "" "Royal Flush\n" "Straight Flush\n" @@ -797,20 +817,6 @@ msgid "" "One Pair" msgstr "" -#: pysollib/games/poker.py:189 pysollib/games/special/memory.py:181 -msgid "" -"WON\n" -"\n" -msgstr "" - -#: pysollib/games/poker.py:191 pysollib/games/special/memory.py:178 -msgid "Points: %d" -msgstr "" - -#: pysollib/games/poker.py:193 pysollib/games/special/memory.py:182 -msgid "Total: %d" -msgstr "" - #: pysollib/games/special/tarock.py:222 msgid "Coin" msgstr "" @@ -834,7 +840,7 @@ msgstr "" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1192 pysollib/util.py:80 +#: pysollib/stack.py:1288 pysollib/util.py:80 msgid "Ace" msgstr "" @@ -846,14 +852,16 @@ msgstr "" msgid "Valet" msgstr "" -#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1190 -#: pysollib/util.py:81 -msgid "Queen" +#: pysollib/games/threepeaks.py:218 +msgid "Score:\tThis hand: " msgstr "" -#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1191 -#: pysollib/util.py:81 -msgid "King" +#: pysollib/games/threepeaks.py:219 +msgid "\tThis game: " +msgstr "" + +#: pysollib/games/tournament.py:245 +msgid "Reserve. Build down by suit." msgstr "" #: pysollib/games/ultra/dashavatara.py:349 @@ -1066,10 +1074,6 @@ msgstr "" msgid "Willow" msgstr "" -#: pysollib/games/ultra/larasgame.py:157 pysollib/stack.py:1370 -msgid "Round %d" -msgstr "" - #: pysollib/games/ultra/mughal.py:252 msgid "Crown" msgstr "" @@ -1106,27 +1110,19 @@ msgstr "" msgid "Tan" msgstr "" -#: pysollib/games/ultra/threepeaks.py:217 -msgid "Score:\tThis hand: " +#: pysollib/games/yukon.py:139 +msgid "Tableau. Build down in any suit but the same, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/games/ultra/threepeaks.py:218 -msgid "\tThis game: " +#: pysollib/games/yukon.py:198 +msgid "Tableau. Build up or down by suit, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/games/yukon.py:145 -msgid "Row. Build down in any suit but the same, can move any face-up cards regardless of sequence." +#: pysollib/games/yukon.py:215 +msgid "Tableau. Build up or down by alternate color, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/games/yukon.py:201 -msgid "Row. Build up or down by suit, can move any face-up cards regardless of sequence." -msgstr "" - -#: pysollib/games/yukon.py:218 -msgid "Row. Build up or down by alternate color, can move any face-up cards regardless of sequence." -msgstr "" - -#: pysollib/games/yukon.py:320 +#: pysollib/games/yukon.py:317 msgid "" "Club: A 2 3 4 5 6 7 8 9 T J Q K\n" "Spade: 2 4 6 8 T Q A 3 5 7 9 J K\n" @@ -1134,6 +1130,10 @@ msgid "" "Diamond: 4 8 Q 3 7 J 2 6 T A 5 9 K" msgstr "" +#: pysollib/games/yukon.py:639 +msgid "Tableau. Build down regardless of suit, can move any face-up cards regardless of sequence." +msgstr "" + #: pysollib/help.py:64 msgid "" "A Python Solitaire Game Collection\n" @@ -1215,7 +1215,7 @@ msgstr "" msgid " Help" msgstr "" -#: pysollib/main.py:68 pysollib/main.py:321 +#: pysollib/main.py:68 pysollib/main.py:348 msgid " installation error" msgstr "" @@ -1229,19 +1229,20 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:76 pysollib/main.py:330 pysollib/tk/menubar.py:269 +#: pysollib/main.py:76 pysollib/main.py:356 pysollib/tk/menubar.py:276 msgid "&Quit" msgstr "" -#: pysollib/main.py:95 +#: pysollib/main.py:98 msgid "" "%s: %s\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:120 +#: pysollib/main.py:135 msgid "" "Usage: %s [OPTIONS] [FILE]\n" +" -g --game=GAMENAME start game GAMENAME\n" " --fg --foreground=COLOR foreground color\n" " --bg --background=COLOR background color\n" " --fn --font=FONT default font\n" @@ -1252,19 +1253,19 @@ msgid "" " FILE - file name of a saved game\n" msgstr "" -#: pysollib/main.py:133 +#: pysollib/main.py:149 msgid "" "%s: too many files\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:137 +#: pysollib/main.py:153 msgid "" -"%s: invalide file name\n" +"%s: invalid file name\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:322 +#: pysollib/main.py:349 msgid "" "\n" "No games were found !!!\n" @@ -1275,462 +1276,491 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:408 pysollib/main.py:416 +#: pysollib/main.py:434 pysollib/main.py:442 msgid " installation problem" msgstr "" -#: pysollib/main.py:409 +#: pysollib/main.py:435 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:417 +#: pysollib/main.py:443 msgid "" "The pysolsoundserver module was not found.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:424 +#: pysollib/main.py:450 msgid "Welcome to " msgstr "" -#: pysollib/resource.py:242 +#: pysollib/resource.py:243 msgid "French type (52 cards)" msgstr "" -#: pysollib/resource.py:243 +#: pysollib/resource.py:244 msgid "Hanafuda type (48 cards)" msgstr "" -#: pysollib/resource.py:244 +#: pysollib/resource.py:245 msgid "Tarock type (78 cards)" msgstr "" -#: pysollib/resource.py:245 +#: pysollib/resource.py:246 msgid "Mahjongg type (42 tiles)" msgstr "" -#: pysollib/resource.py:246 +#: pysollib/resource.py:247 msgid "Hex A Deck type (68 cards)" msgstr "" -#: pysollib/resource.py:247 +#: pysollib/resource.py:248 msgid "Mughal Ganjifa type (96 cards)" msgstr "" -#: pysollib/resource.py:248 +#: pysollib/resource.py:249 msgid "Navagraha Ganjifa type (108 cards)" msgstr "" -#: pysollib/resource.py:249 +#: pysollib/resource.py:250 msgid "Dashavatara Ganjifa type (120 cards)" msgstr "" -#: pysollib/resource.py:250 +#: pysollib/resource.py:251 msgid "Trumps only type (variable cards)" msgstr "" -#: pysollib/resource.py:254 +#: pysollib/resource.py:255 msgid "French" msgstr "" -#: pysollib/resource.py:255 pysollib/resource.py:279 +#: pysollib/resource.py:256 pysollib/resource.py:280 msgid "Hanafuda" msgstr "" -#: pysollib/resource.py:256 pysollib/resource.py:295 +#: pysollib/resource.py:257 pysollib/resource.py:296 msgid "Tarock" msgstr "" -#: pysollib/resource.py:257 pysollib/resource.py:282 +#: pysollib/resource.py:258 pysollib/resource.py:283 msgid "Mahjongg" msgstr "" -#: pysollib/resource.py:258 pysollib/resource.py:280 +#: pysollib/resource.py:259 pysollib/resource.py:281 msgid "Hex A Deck" msgstr "" -#: pysollib/resource.py:259 +#: pysollib/resource.py:260 msgid "Mughal Ganjifa" msgstr "" -#: pysollib/resource.py:260 +#: pysollib/resource.py:261 msgid "Navagraha Ganjifa" msgstr "" -#: pysollib/resource.py:261 +#: pysollib/resource.py:262 msgid "Dashavatara Ganjifa" msgstr "" -#: pysollib/resource.py:262 +#: pysollib/resource.py:263 msgid "Trumps only" msgstr "" -#: pysollib/resource.py:267 +#: pysollib/resource.py:268 msgid "Adult" msgstr "" -#: pysollib/resource.py:268 +#: pysollib/resource.py:269 msgid "Animals" msgstr "" -#: pysollib/resource.py:269 +#: pysollib/resource.py:270 msgid "Anime" msgstr "" -#: pysollib/resource.py:270 +#: pysollib/resource.py:271 msgid "Art" msgstr "" -#: pysollib/resource.py:271 +#: pysollib/resource.py:272 msgid "Cartoons" msgstr "" -#: pysollib/resource.py:272 +#: pysollib/resource.py:273 msgid "Children" msgstr "" -#: pysollib/resource.py:273 +#: pysollib/resource.py:274 msgid "Classic look" msgstr "" -#: pysollib/resource.py:274 +#: pysollib/resource.py:275 msgid "Collectors" msgstr "" -#: pysollib/resource.py:275 +#: pysollib/resource.py:276 msgid "Computers" msgstr "" -#: pysollib/resource.py:276 +#: pysollib/resource.py:277 msgid "Engines" msgstr "" -#: pysollib/resource.py:277 +#: pysollib/resource.py:278 msgid "Fantasy" msgstr "" -#: pysollib/resource.py:278 +#: pysollib/resource.py:279 msgid "Ganjifa" msgstr "" -#: pysollib/resource.py:281 +#: pysollib/resource.py:282 msgid "Holiday" msgstr "" -#: pysollib/resource.py:283 +#: pysollib/resource.py:284 msgid "Movies" msgstr "" -#: pysollib/resource.py:284 +#: pysollib/resource.py:285 msgid "Matrix" msgstr "" -#: pysollib/resource.py:285 +#: pysollib/resource.py:286 msgid "Music" msgstr "" -#: pysollib/resource.py:286 +#: pysollib/resource.py:287 msgid "Nature" msgstr "" -#: pysollib/resource.py:287 +#: pysollib/resource.py:288 msgid "Operating Systems" msgstr "" -#: pysollib/resource.py:288 +#: pysollib/resource.py:289 msgid "People" msgstr "" -#: pysollib/resource.py:289 +#: pysollib/resource.py:290 msgid "Places" msgstr "" -#: pysollib/resource.py:290 +#: pysollib/resource.py:291 msgid "Plain" msgstr "" -#: pysollib/resource.py:291 +#: pysollib/resource.py:292 msgid "Products" msgstr "" -#: pysollib/resource.py:292 +#: pysollib/resource.py:293 msgid "Round cardsets" msgstr "" -#: pysollib/resource.py:293 +#: pysollib/resource.py:294 msgid "Science Fiction" msgstr "" -#: pysollib/resource.py:294 +#: pysollib/resource.py:295 msgid "Sports" msgstr "" -#: pysollib/resource.py:296 +#: pysollib/resource.py:297 msgid "Vehicels" msgstr "" -#: pysollib/resource.py:297 +#: pysollib/resource.py:298 msgid "Video Games" msgstr "" -#: pysollib/resource.py:302 +#: pysollib/resource.py:303 msgid "Australia" msgstr "" -#: pysollib/resource.py:303 +#: pysollib/resource.py:304 msgid "Austria" msgstr "" -#: pysollib/resource.py:304 +#: pysollib/resource.py:305 msgid "Belgium" msgstr "" -#: pysollib/resource.py:305 +#: pysollib/resource.py:306 msgid "Canada" msgstr "" -#: pysollib/resource.py:306 +#: pysollib/resource.py:307 msgid "China" msgstr "" -#: pysollib/resource.py:307 +#: pysollib/resource.py:308 msgid "Czech Republic" msgstr "" -#: pysollib/resource.py:308 +#: pysollib/resource.py:309 msgid "Denmark" msgstr "" -#: pysollib/resource.py:309 +#: pysollib/resource.py:310 msgid "England" msgstr "" -#: pysollib/resource.py:310 +#: pysollib/resource.py:311 msgid "France" msgstr "" -#: pysollib/resource.py:311 +#: pysollib/resource.py:312 msgid "Germany" msgstr "" -#: pysollib/resource.py:312 +#: pysollib/resource.py:313 msgid "Great Britain" msgstr "" -#: pysollib/resource.py:313 +#: pysollib/resource.py:314 msgid "Hungary" msgstr "" -#: pysollib/resource.py:314 +#: pysollib/resource.py:315 msgid "India" msgstr "" -#: pysollib/resource.py:315 +#: pysollib/resource.py:316 msgid "Italy" msgstr "" -#: pysollib/resource.py:316 +#: pysollib/resource.py:317 msgid "Japan" msgstr "" -#: pysollib/resource.py:317 +#: pysollib/resource.py:318 msgid "Netherlands" msgstr "" -#: pysollib/resource.py:318 +#: pysollib/resource.py:319 msgid "Russia" msgstr "" -#: pysollib/resource.py:319 +#: pysollib/resource.py:320 msgid "Spain" msgstr "" -#: pysollib/resource.py:320 +#: pysollib/resource.py:321 msgid "Sweden" msgstr "" -#: pysollib/resource.py:321 +#: pysollib/resource.py:322 msgid "Switzerland" msgstr "" -#: pysollib/resource.py:322 +#: pysollib/resource.py:323 msgid "USA" msgstr "" -#: pysollib/settings.py:58 +#: pysollib/settings.py:47 msgid "Top 10" msgstr "" -#: pysollib/stack.py:1186 +#: pysollib/stack.py:1282 msgid "Base card - %s." msgstr "" -#: pysollib/stack.py:1187 +#: pysollib/stack.py:1283 msgid "Empty row cannot be filled." msgstr "" -#: pysollib/stack.py:1188 +#: pysollib/stack.py:1284 msgid "any card" msgstr "" -#: pysollib/stack.py:1189 pysollib/util.py:81 +#: pysollib/stack.py:1285 pysollib/util.py:81 msgid "Jack" msgstr "" -#: pysollib/stack.py:1198 +#: pysollib/stack.py:1298 msgid "No cards" msgstr "" -#: pysollib/stack.py:1199 +#: pysollib/stack.py:1299 msgid "1 card" msgstr "" -#: pysollib/stack.py:1200 +#: pysollib/stack.py:1300 msgid " cards" msgstr "" -#: pysollib/stack.py:1379 pysollib/stack.py:1381 pysollib/stack.py:1412 +#: pysollib/stack.py:1517 pysollib/stack.py:1519 pysollib/stack.py:1550 msgid "Redeal" msgstr "" -#: pysollib/stack.py:1381 +#: pysollib/stack.py:1519 msgid "Stop" msgstr "" -#: pysollib/stack.py:1432 +#: pysollib/stack.py:1570 msgid "Variable redeals." msgstr "" -#: pysollib/stack.py:1433 +#: pysollib/stack.py:1571 msgid "Unlimited redeals." msgstr "" -#: pysollib/stack.py:1434 +#: pysollib/stack.py:1572 msgid "No redeals." msgstr "" -#: pysollib/stack.py:1435 +#: pysollib/stack.py:1573 msgid "One redeal." msgstr "" -#: pysollib/stack.py:1436 +#: pysollib/stack.py:1574 msgid " redeals." msgstr "" -#: pysollib/stack.py:1438 +#: pysollib/stack.py:1576 msgid "Talon." msgstr "" -#: pysollib/stack.py:1613 pysollib/stack.py:2037 +#: pysollib/stack.py:1762 pysollib/stack.py:2212 msgid "Reserve. No building." msgstr "" -#: pysollib/stack.py:1659 +#: pysollib/stack.py:1799 +msgid "Foundation." +msgstr "" + +#: pysollib/stack.py:1815 msgid "Foundation. Build up by suit." msgstr "" -#: pysollib/stack.py:1660 +#: pysollib/stack.py:1816 msgid "Foundation. Build down by suit." msgstr "" -#: pysollib/stack.py:1661 pysollib/stack.py:1677 pysollib/stack.py:1699 +#: pysollib/stack.py:1817 pysollib/stack.py:1833 pysollib/stack.py:1855 msgid "Foundation. Build by same rank." msgstr "" -#: pysollib/stack.py:1676 +#: pysollib/stack.py:1832 msgid "Foundation. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1697 +#: pysollib/stack.py:1853 msgid "Foundation. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1698 +#: pysollib/stack.py:1854 msgid "Foundation. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1772 -msgid "Row. Build up by alternate color." -msgstr "" - -#: pysollib/stack.py:1773 -msgid "Row. Build down by alternate color." -msgstr "" - -#: pysollib/stack.py:1774 pysollib/stack.py:1784 pysollib/stack.py:1793 -#: pysollib/stack.py:1802 pysollib/stack.py:1830 -msgid "Row. Build by same rank." -msgstr "" - -#: pysollib/stack.py:1782 -msgid "Row. Build up by color." -msgstr "" - -#: pysollib/stack.py:1783 -msgid "Row. Build down by color." -msgstr "" - -#: pysollib/stack.py:1791 -msgid "Row. Build up by suit." -msgstr "" - -#: pysollib/stack.py:1792 -msgid "Row. Build down by suit." -msgstr "" - -#: pysollib/stack.py:1800 pysollib/stack.py:1828 -msgid "Row. Build up regardless of suit." -msgstr "" - -#: pysollib/stack.py:1801 pysollib/stack.py:1829 -msgid "Row. Build down regardless of suit." -msgstr "" - -#: pysollib/stack.py:1851 -msgid "Row. Build up by alternate color, can move any face-up cards regardless of sequence." -msgstr "" - -#: pysollib/stack.py:1852 -msgid "Row. Build down by alternate color, can move any face-up cards regardless of sequence." -msgstr "" - -#: pysollib/stack.py:1853 pysollib/stack.py:1864 -msgid "Row. Build by same rank, can move any face-up cards regardless of sequence." -msgstr "" - -#: pysollib/stack.py:1862 -msgid "Row. Build up by suit, can move any face-up cards regardless of sequence." -msgstr "" - -#: pysollib/stack.py:1863 -msgid "Row. Build down by suit, can move any face-up cards regardless of sequence." -msgstr "" - -#: pysollib/stack.py:1896 -msgid "Row. Build up or down by color." -msgstr "" - -#: pysollib/stack.py:1907 -msgid "Row. Build up or down by alternate color." -msgstr "" - -#: pysollib/stack.py:1918 -msgid "Row. Build up or down by suit." +#: pysollib/stack.py:1928 +msgid "Tableau. Build up by alternate color." msgstr "" #: pysollib/stack.py:1929 -msgid "Row. Build up or down regardless of suit." +msgid "Tableau. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1940 +#: pysollib/stack.py:1930 pysollib/stack.py:1940 pysollib/stack.py:1949 +#: pysollib/stack.py:1958 pysollib/stack.py:1968 pysollib/stack.py:1991 +#: pysollib/stack.py:2001 +msgid "Tableau. Build by same rank." +msgstr "" + +#: pysollib/stack.py:1938 +msgid "Tableau. Build up by color." +msgstr "" + +#: pysollib/stack.py:1939 +msgid "Tableau. Build down by color." +msgstr "" + +#: pysollib/stack.py:1947 +msgid "Tableau. Build up by suit." +msgstr "" + +#: pysollib/stack.py:1948 +msgid "Tableau. Build down by suit." +msgstr "" + +#: pysollib/stack.py:1956 +msgid "Tableau. Build up regardless of suit." +msgstr "" + +#: pysollib/stack.py:1957 +msgid "Tableau. Build down regardless of suit." +msgstr "" + +#: pysollib/stack.py:1966 +msgid "Tableau. Build up in any suit but the same." +msgstr "" + +#: pysollib/stack.py:1967 +msgid "Tableau. Build down in any suit but the same." +msgstr "" + +#: pysollib/stack.py:1989 +msgid "Tableau. Build up regardless of suit. Sequences of cards in alternate color can be moved as a unit." +msgstr "" + +#: pysollib/stack.py:1990 +msgid "Tableau. Build down regardless of suit. Sequences of cards in alternate color can be moved as a unit." +msgstr "" + +#: pysollib/stack.py:1999 +msgid "Tableau. Build up regardless of suit. Sequences of cards in the same suit can be moved as a unit." +msgstr "" + +#: pysollib/stack.py:2000 +msgid "Tableau. Build down regardless of suit. Sequences of cards in the same suit can be moved as a unit." +msgstr "" + +#: pysollib/stack.py:2022 +msgid "Tableau. Build up by alternate color, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:2023 +msgid "Tableau. Build down by alternate color, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:2024 pysollib/stack.py:2037 +msgid "Tableau. Build by same rank, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:2035 +msgid "Tableau. Build up by suit, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:2036 +msgid "Tableau. Build down by suit, can move any face-up cards regardless of sequence." +msgstr "" + +#: pysollib/stack.py:2069 +msgid "Tableau. Build up or down by color." +msgstr "" + +#: pysollib/stack.py:2080 +msgid "Tableau. Build up or down by alternate color." +msgstr "" + +#: pysollib/stack.py:2091 +msgid "Tableau. Build up or down by suit." +msgstr "" + +#: pysollib/stack.py:2102 +msgid "Tableau. Build up or down regardless of suit." +msgstr "" + +#: pysollib/stack.py:2113 msgid "Waste." msgstr "" -#: pysollib/stack.py:2038 +#: pysollib/stack.py:2213 msgid "Free cell." msgstr "" @@ -1750,7 +1780,7 @@ msgstr "" msgid "Lost" msgstr "" -#: pysollib/stats.py:122 pysollib/tk/statusbar.py:135 +#: pysollib/stats.py:122 pysollib/tk/statusbar.py:157 msgid "Playing time" msgstr "" @@ -1774,7 +1804,7 @@ msgstr "" msgid "Status" msgstr "" -#: pysollib/stats.py:162 pysollib/tk/statusbar.py:137 +#: pysollib/stats.py:162 pysollib/tk/statusbar.py:159 #: pysollib/tk/tkstats.py:735 msgid "Game number" msgstr "" @@ -1807,8 +1837,8 @@ msgstr "" msgid "Text foreground:" msgstr "" -#: pysollib/tk/colorsdialog.py:79 pysollib/tk/colorsdialog.py:97 -#: pysollib/tk/fontsdialog.py:185 +#: pysollib/tk/colorsdialog.py:79 pysollib/tk/colorsdialog.py:98 +#: pysollib/tk/fontsdialog.py:186 msgid "Change..." msgstr "" @@ -1840,10 +1870,14 @@ msgstr "" msgid "Highlight not matching:" msgstr "" -#: pysollib/tk/colorsdialog.py:123 +#: pysollib/tk/colorsdialog.py:124 msgid "Select color" msgstr "" +#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:329 +msgid "Find card" +msgstr "" + #: pysollib/tk/fontsdialog.py:85 msgid "abcdefghABCDEFGH" msgstr "" @@ -1852,11 +1886,39 @@ msgstr "" msgid "Bold" msgstr "" -#: pysollib/tk/fontsdialog.py:97 +#: pysollib/tk/fontsdialog.py:98 msgid "Italic" msgstr "" -#: pysollib/tk/fontsdialog.py:195 +#: pysollib/tk/fontsdialog.py:168 +msgid "HTML: " +msgstr "" + +#: pysollib/tk/fontsdialog.py:169 +msgid "Small: " +msgstr "" + +#: pysollib/tk/fontsdialog.py:170 +msgid "Fixed: " +msgstr "" + +#: pysollib/tk/fontsdialog.py:171 +msgid "Tableau default: " +msgstr "" + +#: pysollib/tk/fontsdialog.py:172 +msgid "Tableau fixed: " +msgstr "" + +#: pysollib/tk/fontsdialog.py:173 +msgid "Tableau large: " +msgstr "" + +#: pysollib/tk/fontsdialog.py:174 +msgid "Tableau small: " +msgstr "" + +#: pysollib/tk/fontsdialog.py:196 msgid "Select font" msgstr "" @@ -1912,416 +1974,428 @@ msgstr "" msgid "Customize toolbar" msgstr "" -#: pysollib/tk/menubar.py:249 +#: pysollib/tk/menubar.py:256 msgid "&File" msgstr "" -#: pysollib/tk/menubar.py:251 +#: pysollib/tk/menubar.py:258 msgid "R&ecent games" msgstr "" -#: pysollib/tk/menubar.py:253 +#: pysollib/tk/menubar.py:260 msgid "Select &random game" msgstr "" -#: pysollib/tk/menubar.py:254 +#: pysollib/tk/menubar.py:261 msgid "&All games" msgstr "" -#: pysollib/tk/menubar.py:255 +#: pysollib/tk/menubar.py:262 msgid "Games played and &won" msgstr "" -#: pysollib/tk/menubar.py:256 +#: pysollib/tk/menubar.py:263 msgid "Games played and ¬ won" msgstr "" -#: pysollib/tk/menubar.py:257 +#: pysollib/tk/menubar.py:264 msgid "Games not &played" msgstr "" -#: pysollib/tk/menubar.py:258 +#: pysollib/tk/menubar.py:265 msgid "Select game by nu&mber..." msgstr "" -#: pysollib/tk/menubar.py:260 +#: pysollib/tk/menubar.py:267 msgid "Fa&vorite games" msgstr "" -#: pysollib/tk/menubar.py:261 +#: pysollib/tk/menubar.py:268 msgid "A&dd to favorites" msgstr "" -#: pysollib/tk/menubar.py:262 +#: pysollib/tk/menubar.py:269 msgid "R&emove from favorites" msgstr "" -#: pysollib/tk/menubar.py:264 +#: pysollib/tk/menubar.py:271 msgid "&Open..." msgstr "" -#: pysollib/tk/menubar.py:265 +#: pysollib/tk/menubar.py:272 msgid "&Save" msgstr "" -#: pysollib/tk/menubar.py:266 +#: pysollib/tk/menubar.py:273 msgid "Save &as..." msgstr "" -#: pysollib/tk/menubar.py:268 +#: pysollib/tk/menubar.py:275 msgid "&Hold and quit" msgstr "" -#: pysollib/tk/menubar.py:271 pysollib/tk/selectgame.py:417 +#: pysollib/tk/menubar.py:280 pysollib/tk/selectgame.py:407 msgid "&Select" msgstr "" -#: pysollib/tk/menubar.py:274 +#: pysollib/tk/menubar.py:285 msgid "&Edit" msgstr "" -#: pysollib/tk/menubar.py:275 +#: pysollib/tk/menubar.py:286 msgid "&Undo" msgstr "" -#: pysollib/tk/menubar.py:276 +#: pysollib/tk/menubar.py:287 msgid "&Redo" msgstr "" -#: pysollib/tk/menubar.py:277 +#: pysollib/tk/menubar.py:288 msgid "Redo &all" msgstr "" -#: pysollib/tk/menubar.py:280 +#: pysollib/tk/menubar.py:291 msgid "&Set bookmark" msgstr "" -#: pysollib/tk/menubar.py:282 pysollib/tk/menubar.py:286 +#: pysollib/tk/menubar.py:293 pysollib/tk/menubar.py:297 msgid "Bookmark %d" msgstr "" -#: pysollib/tk/menubar.py:284 +#: pysollib/tk/menubar.py:295 msgid "Go&to bookmark" msgstr "" -#: pysollib/tk/menubar.py:289 +#: pysollib/tk/menubar.py:300 msgid "&Clear bookmarks" msgstr "" -#: pysollib/tk/menubar.py:292 +#: pysollib/tk/menubar.py:303 msgid "Restart &game" msgstr "" -#: pysollib/tk/menubar.py:294 +#: pysollib/tk/menubar.py:305 msgid "&Game" msgstr "" -#: pysollib/tk/menubar.py:295 +#: pysollib/tk/menubar.py:306 msgid "&Deal cards" msgstr "" -#: pysollib/tk/menubar.py:296 pysollib/tk/menubar.py:325 +#: pysollib/tk/menubar.py:307 pysollib/tk/menubar.py:342 msgid "&Auto drop" msgstr "" -#: pysollib/tk/menubar.py:297 +#: pysollib/tk/menubar.py:308 msgid "&Pause" msgstr "" -#: pysollib/tk/menubar.py:300 +#: pysollib/tk/menubar.py:311 msgid "S&tatus..." msgstr "" -#: pysollib/tk/menubar.py:301 +#: pysollib/tk/menubar.py:312 msgid "&Comments..." msgstr "" -#: pysollib/tk/menubar.py:303 +#: pysollib/tk/menubar.py:314 msgid "&Statistics" msgstr "" -#: pysollib/tk/menubar.py:304 pysollib/tk/menubar.py:312 +#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 msgid "Current game..." msgstr "" -#: pysollib/tk/menubar.py:305 pysollib/tk/menubar.py:313 +#: pysollib/tk/menubar.py:316 pysollib/tk/menubar.py:324 msgid "All games..." msgstr "" -#: pysollib/tk/menubar.py:307 +#: pysollib/tk/menubar.py:318 msgid "Session log..." msgstr "" -#: pysollib/tk/menubar.py:308 +#: pysollib/tk/menubar.py:319 msgid "Full log..." msgstr "" -#: pysollib/tk/menubar.py:311 +#: pysollib/tk/menubar.py:322 msgid "D&emo statistics" msgstr "" -#: pysollib/tk/menubar.py:315 +#: pysollib/tk/menubar.py:326 msgid "&Assist" msgstr "" -#: pysollib/tk/menubar.py:316 +#: pysollib/tk/menubar.py:327 msgid "&Hint" msgstr "" -#: pysollib/tk/menubar.py:317 +#: pysollib/tk/menubar.py:328 msgid "Highlight p&iles" msgstr "" -#: pysollib/tk/menubar.py:319 +#: pysollib/tk/menubar.py:331 msgid "&Demo" msgstr "" -#: pysollib/tk/menubar.py:320 +#: pysollib/tk/menubar.py:332 msgid "Demo (&all games)" msgstr "" -#: pysollib/tk/menubar.py:321 -msgid "&Options" -msgstr "" - -#: pysollib/tk/menubar.py:322 -msgid "&Player options..." -msgstr "" - -#: pysollib/tk/menubar.py:323 -msgid "&Automatic play" -msgstr "" - -#: pysollib/tk/menubar.py:324 -msgid "Auto &face up" -msgstr "" - -#: pysollib/tk/menubar.py:326 -msgid "Auto &deal" -msgstr "" - -#: pysollib/tk/menubar.py:328 -msgid "&Quick play" -msgstr "" - -#: pysollib/tk/menubar.py:329 -msgid "Assist &level" -msgstr "" - -#: pysollib/tk/menubar.py:330 -msgid "Enable &undo" -msgstr "" - -#: pysollib/tk/menubar.py:331 -msgid "Enable &bookmarks" -msgstr "" - -#: pysollib/tk/menubar.py:332 -msgid "Enable &hint" -msgstr "" - -#: pysollib/tk/menubar.py:333 -msgid "Enable highlight p&iles" -msgstr "" - #: pysollib/tk/menubar.py:334 -msgid "Enable highlight &cards" -msgstr "" - -#: pysollib/tk/menubar.py:335 -msgid "Enable highlight same &rank" -msgstr "" - -#: pysollib/tk/menubar.py:336 -msgid "Highlight &no matching" +msgid "Piles description" msgstr "" #: pysollib/tk/menubar.py:338 -msgid "Show removed tiles (in Mahjongg games)" +msgid "&Options" msgstr "" #: pysollib/tk/menubar.py:339 -msgid "Show hint arrow (in Shisen-Sho games)" +msgid "&Player options..." +msgstr "" + +#: pysollib/tk/menubar.py:340 +msgid "&Automatic play" msgstr "" #: pysollib/tk/menubar.py:341 -msgid "&Sound..." +msgid "Auto &face up" +msgstr "" + +#: pysollib/tk/menubar.py:343 +msgid "Auto &deal" +msgstr "" + +#: pysollib/tk/menubar.py:345 +msgid "&Quick play" +msgstr "" + +#: pysollib/tk/menubar.py:346 +msgid "Assist &level" +msgstr "" + +#: pysollib/tk/menubar.py:347 +msgid "Enable &undo" +msgstr "" + +#: pysollib/tk/menubar.py:348 +msgid "Enable &bookmarks" msgstr "" #: pysollib/tk/menubar.py:349 -msgid "Cards&et..." +msgid "Enable &hint" msgstr "" #: pysollib/tk/menubar.py:350 -msgid "Table t&ile..." +msgid "Enable highlight p&iles" +msgstr "" + +#: pysollib/tk/menubar.py:351 +msgid "Enable highlight &cards" msgstr "" #: pysollib/tk/menubar.py:352 -msgid "Card &background" +msgid "Enable highlight same &rank" msgstr "" #: pysollib/tk/menubar.py:353 -msgid "Card &view" -msgstr "" - -#: pysollib/tk/menubar.py:354 -msgid "Card shado&w" +msgid "Highlight &no matching" msgstr "" #: pysollib/tk/menubar.py:355 -msgid "Shade &legal moves" +msgid "&Show removed tiles (in Mahjongg games)" msgstr "" #: pysollib/tk/menubar.py:356 -msgid "&Negative cards bottom" -msgstr "" - -#: pysollib/tk/menubar.py:357 -msgid "A&nimations" +msgid "Show hint &arrow (in Shisen-Sho games)" msgstr "" #: pysollib/tk/menubar.py:358 -msgid "&None" -msgstr "" - -#: pysollib/tk/menubar.py:359 -msgid "&Timer based" -msgstr "" - -#: pysollib/tk/menubar.py:360 -msgid "&Fast" -msgstr "" - -#: pysollib/tk/menubar.py:361 -msgid "&Slow" -msgstr "" - -#: pysollib/tk/menubar.py:362 -msgid "&Very slow" -msgstr "" - -#: pysollib/tk/menubar.py:363 -msgid "Stick&y mouse" -msgstr "" - -#: pysollib/tk/menubar.py:365 -msgid "&Fonts..." +msgid "&Sound..." msgstr "" #: pysollib/tk/menubar.py:366 -msgid "&Colors..." +msgid "Cards&et..." msgstr "" #: pysollib/tk/menubar.py:367 -msgid "Time&outs..." +msgid "Table t&ile..." msgstr "" #: pysollib/tk/menubar.py:369 -msgid "&Toolbar" +msgid "Card &background" +msgstr "" + +#: pysollib/tk/menubar.py:370 +msgid "Card &view" msgstr "" #: pysollib/tk/menubar.py:371 -msgid "Stat&usbar" +msgid "Card shado&w" msgstr "" #: pysollib/tk/menubar.py:372 -msgid "Show &statusbar" +msgid "Shade &legal moves" msgstr "" #: pysollib/tk/menubar.py:373 -msgid "Show &number of cards" +msgid "&Negative cards bottom" msgstr "" #: pysollib/tk/menubar.py:374 -msgid "Show &help bar" +msgid "Shade &filled stacks" msgstr "" #: pysollib/tk/menubar.py:375 -msgid "Save games &geometry" +msgid "A&nimations" msgstr "" #: pysollib/tk/menubar.py:376 -msgid "&Demo logo" +msgid "&None" msgstr "" #: pysollib/tk/menubar.py:377 -msgid "Startup splash sc&reen" +msgid "&Timer based" +msgstr "" + +#: pysollib/tk/menubar.py:378 +msgid "&Fast" +msgstr "" + +#: pysollib/tk/menubar.py:379 +msgid "&Slow" +msgstr "" + +#: pysollib/tk/menubar.py:380 +msgid "&Very slow" msgstr "" #: pysollib/tk/menubar.py:381 -msgid "&Help" +msgid "Stick&y mouse" msgstr "" #: pysollib/tk/menubar.py:382 -msgid "&Contents" -msgstr "" - -#: pysollib/tk/menubar.py:383 -msgid "&How to play" +msgid "Use mouse for undo/redo" msgstr "" #: pysollib/tk/menubar.py:384 -msgid "&Rules for this game" +msgid "&Fonts..." msgstr "" #: pysollib/tk/menubar.py:385 -msgid "&License terms" +msgid "&Colors..." +msgstr "" + +#: pysollib/tk/menubar.py:386 +msgid "Time&outs..." msgstr "" #: pysollib/tk/menubar.py:388 +msgid "&Toolbar" +msgstr "" + +#: pysollib/tk/menubar.py:390 +msgid "Stat&usbar" +msgstr "" + +#: pysollib/tk/menubar.py:391 +msgid "Show &statusbar" +msgstr "" + +#: pysollib/tk/menubar.py:392 +msgid "Show &number of cards" +msgstr "" + +#: pysollib/tk/menubar.py:393 +msgid "Show &help bar" +msgstr "" + +#: pysollib/tk/menubar.py:394 +msgid "Save games &geometry" +msgstr "" + +#: pysollib/tk/menubar.py:395 +msgid "&Demo logo" +msgstr "" + +#: pysollib/tk/menubar.py:396 +msgid "Startup splash sc&reen" +msgstr "" + +#: pysollib/tk/menubar.py:402 +msgid "&Help" +msgstr "" + +#: pysollib/tk/menubar.py:403 +msgid "&Contents" +msgstr "" + +#: pysollib/tk/menubar.py:404 +msgid "&How to play" +msgstr "" + +#: pysollib/tk/menubar.py:405 +msgid "&Rules for this game" +msgstr "" + +#: pysollib/tk/menubar.py:406 +msgid "&License terms" +msgstr "" + +#: pysollib/tk/menubar.py:409 msgid "&About " msgstr "" -#: pysollib/tk/menubar.py:496 +#: pysollib/tk/menubar.py:521 msgid "All &games..." msgstr "" -#: pysollib/tk/menubar.py:497 +#: pysollib/tk/menubar.py:523 msgid "Playable pre&view..." msgstr "" -#: pysollib/tk/menubar.py:499 -msgid "&Popular games" -msgstr "" - -#: pysollib/tk/menubar.py:502 -msgid "&French games" -msgstr "" - -#: pysollib/tk/menubar.py:505 +#: pysollib/tk/menubar.py:572 msgid "&Mahjongg games" msgstr "" -#: pysollib/tk/menubar.py:508 +#: pysollib/tk/menubar.py:610 +msgid "&Popular games" +msgstr "" + +#: pysollib/tk/menubar.py:618 +msgid "&French games" +msgstr "" + +#: pysollib/tk/menubar.py:625 msgid "&Oriental games" msgstr "" -#: pysollib/tk/menubar.py:512 +#: pysollib/tk/menubar.py:633 msgid "&Special games" msgstr "" -#: pysollib/tk/menubar.py:516 +#: pysollib/tk/menubar.py:639 msgid "All games by name" msgstr "" -#: pysollib/tk/menubar.py:849 pysollib/tk/menubar.py:851 +#: pysollib/tk/menubar.py:893 pysollib/tk/menubar.py:895 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "" -#: pysollib/tk/menubar.py:851 +#: pysollib/tk/menubar.py:895 msgid "&Info..." msgstr "" -#: pysollib/tk/menubar.py:854 +#: pysollib/tk/menubar.py:898 msgid "Select " msgstr "" -#: pysollib/tk/menubar.py:915 +#: pysollib/tk/menubar.py:959 msgid "Select table background" msgstr "" -#: pysollib/tk/menubar.py:927 pysollib/tk/selecttile.py:177 +#: pysollib/tk/menubar.py:971 pysollib/tk/selecttile.py:177 msgid "Select table color" msgstr "" @@ -2404,7 +2478,7 @@ msgstr "" msgid "About cardset" msgstr "" -#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:374 +#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:365 msgid "Type:" msgstr "" @@ -2428,253 +2502,253 @@ msgstr "" msgid "(no games)" msgstr "" -#: pysollib/tk/selectgame.py:118 -msgid "French games" -msgstr "" - #: pysollib/tk/selectgame.py:121 -msgid "Oriental Games" -msgstr "" - -#: pysollib/tk/selectgame.py:124 -msgid "Special Games" -msgstr "" - -#: pysollib/tk/selectgame.py:127 -msgid "Original Games" -msgstr "" - -#: pysollib/tk/selectgame.py:141 -msgid "by Compatibility" -msgstr "" - -#: pysollib/tk/selectgame.py:159 -msgid "New games in v." -msgstr "" - -#: pysollib/tk/selectgame.py:162 -msgid "by PySol version" -msgstr "" - -#: pysollib/tk/selectgame.py:169 -msgid "All Games" -msgstr "" - -#: pysollib/tk/selectgame.py:170 -msgid "Alternate Names" -msgstr "" - -#: pysollib/tk/selectgame.py:171 -msgid "Popular Games" -msgstr "" - -#: pysollib/tk/selectgame.py:172 msgid "Mahjongg Games" msgstr "" -#: pysollib/tk/selectgame.py:178 +#: pysollib/tk/selectgame.py:124 +msgid "French games" +msgstr "" + +#: pysollib/tk/selectgame.py:126 +msgid "Oriental Games" +msgstr "" + +#: pysollib/tk/selectgame.py:128 +msgid "Special Games" +msgstr "" + +#: pysollib/tk/selectgame.py:130 +msgid "Original Games" +msgstr "" + +#: pysollib/tk/selectgame.py:144 +msgid "by Compatibility" +msgstr "" + +#: pysollib/tk/selectgame.py:152 +msgid "New games in v." +msgstr "" + +#: pysollib/tk/selectgame.py:155 +msgid "by PySol version" +msgstr "" + +#: pysollib/tk/selectgame.py:162 +msgid "All Games" +msgstr "" + +#: pysollib/tk/selectgame.py:163 +msgid "Alternate Names" +msgstr "" + +#: pysollib/tk/selectgame.py:164 +msgid "Popular Games" +msgstr "" + +#: pysollib/tk/selectgame.py:169 msgid "by Skill Level" msgstr "" -#: pysollib/tk/selectgame.py:179 pysollib/tk/selectgame.py:546 +#: pysollib/tk/selectgame.py:170 pysollib/tk/selectgame.py:542 msgid "Luck only" msgstr "" -#: pysollib/tk/selectgame.py:180 pysollib/tk/selectgame.py:547 +#: pysollib/tk/selectgame.py:171 pysollib/tk/selectgame.py:543 msgid "Mostly luck" msgstr "" -#: pysollib/tk/selectgame.py:181 pysollib/tk/selectgame.py:548 +#: pysollib/tk/selectgame.py:172 pysollib/tk/selectgame.py:544 msgid "Balanced" msgstr "" -#: pysollib/tk/selectgame.py:182 pysollib/tk/selectgame.py:549 +#: pysollib/tk/selectgame.py:173 pysollib/tk/selectgame.py:545 msgid "Mostly skill" msgstr "" -#: pysollib/tk/selectgame.py:183 pysollib/tk/selectgame.py:550 +#: pysollib/tk/selectgame.py:174 pysollib/tk/selectgame.py:546 msgid "Skill only" msgstr "" -#: pysollib/tk/selectgame.py:185 +#: pysollib/tk/selectgame.py:176 msgid "by Game Feature" msgstr "" -#: pysollib/tk/selectgame.py:186 +#: pysollib/tk/selectgame.py:177 msgid "by Number of Cards" msgstr "" -#: pysollib/tk/selectgame.py:187 +#: pysollib/tk/selectgame.py:178 msgid "32 cards" msgstr "" -#: pysollib/tk/selectgame.py:188 +#: pysollib/tk/selectgame.py:179 msgid "48 cards" msgstr "" -#: pysollib/tk/selectgame.py:189 +#: pysollib/tk/selectgame.py:180 msgid "52 cards" msgstr "" -#: pysollib/tk/selectgame.py:190 +#: pysollib/tk/selectgame.py:181 msgid "64 cards" msgstr "" -#: pysollib/tk/selectgame.py:191 +#: pysollib/tk/selectgame.py:182 msgid "78 cards" msgstr "" -#: pysollib/tk/selectgame.py:192 +#: pysollib/tk/selectgame.py:183 msgid "104 cards" msgstr "" -#: pysollib/tk/selectgame.py:193 +#: pysollib/tk/selectgame.py:184 msgid "144 cards" msgstr "" -#: pysollib/tk/selectgame.py:194 +#: pysollib/tk/selectgame.py:185 msgid "Other number" msgstr "" -#: pysollib/tk/selectgame.py:196 +#: pysollib/tk/selectgame.py:187 msgid "by Number of Decks" msgstr "" -#: pysollib/tk/selectgame.py:197 +#: pysollib/tk/selectgame.py:188 msgid "1 deck games" msgstr "" -#: pysollib/tk/selectgame.py:198 +#: pysollib/tk/selectgame.py:189 msgid "2 deck games" msgstr "" -#: pysollib/tk/selectgame.py:199 +#: pysollib/tk/selectgame.py:190 msgid "3 deck games" msgstr "" -#: pysollib/tk/selectgame.py:200 +#: pysollib/tk/selectgame.py:191 msgid "4 deck games" msgstr "" -#: pysollib/tk/selectgame.py:202 +#: pysollib/tk/selectgame.py:193 msgid "by Number of Redeals" msgstr "" -#: pysollib/tk/selectgame.py:203 +#: pysollib/tk/selectgame.py:194 msgid "No redeal" msgstr "" -#: pysollib/tk/selectgame.py:204 +#: pysollib/tk/selectgame.py:195 msgid "1 redeal" msgstr "" -#: pysollib/tk/selectgame.py:205 +#: pysollib/tk/selectgame.py:196 msgid "2 redeals" msgstr "" -#: pysollib/tk/selectgame.py:206 +#: pysollib/tk/selectgame.py:197 msgid "3 redeals" msgstr "" -#: pysollib/tk/selectgame.py:207 +#: pysollib/tk/selectgame.py:198 msgid "Unlimited redeals" msgstr "" -#: pysollib/tk/selectgame.py:209 +#: pysollib/tk/selectgame.py:200 msgid "Other number of redeals" msgstr "" -#: pysollib/tk/selectgame.py:214 +#: pysollib/tk/selectgame.py:205 msgid "Other Categories" msgstr "" -#: pysollib/tk/selectgame.py:215 +#: pysollib/tk/selectgame.py:206 msgid "Games for Children (very easy)" msgstr "" -#: pysollib/tk/selectgame.py:216 +#: pysollib/tk/selectgame.py:207 msgid "Games with Scoring" msgstr "" -#: pysollib/tk/selectgame.py:217 +#: pysollib/tk/selectgame.py:208 msgid "Games with Separate Decks" msgstr "" -#: pysollib/tk/selectgame.py:218 +#: pysollib/tk/selectgame.py:209 msgid "Open Games (all cards visible)" msgstr "" -#: pysollib/tk/selectgame.py:219 +#: pysollib/tk/selectgame.py:210 msgid "Relaxed Variants" msgstr "" -#: pysollib/tk/selectgame.py:358 +#: pysollib/tk/selectgame.py:349 msgid "About game" msgstr "" -#: pysollib/tk/selectgame.py:371 +#: pysollib/tk/selectgame.py:362 msgid "Name:" msgstr "" -#: pysollib/tk/selectgame.py:372 +#: pysollib/tk/selectgame.py:363 msgid "Alternate names:" msgstr "" -#: pysollib/tk/selectgame.py:373 +#: pysollib/tk/selectgame.py:364 msgid "Category:" msgstr "" -#: pysollib/tk/selectgame.py:375 +#: pysollib/tk/selectgame.py:366 msgid "Skill level:" msgstr "" -#: pysollib/tk/selectgame.py:376 +#: pysollib/tk/selectgame.py:367 msgid "Decks:" msgstr "" -#: pysollib/tk/selectgame.py:377 +#: pysollib/tk/selectgame.py:368 msgid "Redeals:" msgstr "" -#: pysollib/tk/selectgame.py:379 +#: pysollib/tk/selectgame.py:370 msgid "Played:" msgstr "" -#: pysollib/tk/selectgame.py:380 pysollib/tk/tkstats.py:111 +#: pysollib/tk/selectgame.py:371 pysollib/tk/tkstats.py:111 #: pysollib/tk/tkstats.py:163 msgid "Won:" msgstr "" -#: pysollib/tk/selectgame.py:381 pysollib/tk/tkstats.py:112 +#: pysollib/tk/selectgame.py:372 pysollib/tk/tkstats.py:112 #: pysollib/tk/tkstats.py:164 msgid "Lost:" msgstr "" -#: pysollib/tk/selectgame.py:382 pysollib/tk/tkstats.py:805 +#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:805 msgid "Playing time:" msgstr "" -#: pysollib/tk/selectgame.py:383 pysollib/tk/tkstats.py:812 +#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:812 msgid "Moves:" msgstr "" -#: pysollib/tk/selectgame.py:384 +#: pysollib/tk/selectgame.py:375 msgid "% won:" msgstr "" -#: pysollib/tk/selectgame.py:417 +#: pysollib/tk/selectgame.py:407 msgid "&Rules" msgstr "" -#: pysollib/tk/selectgame.py:497 +#: pysollib/tk/selectgame.py:487 msgid "Playable Preview - " msgstr "" -#: pysollib/tk/selectgame.py:553 +#: pysollib/tk/selectgame.py:549 msgid "variable" msgstr "" -#: pysollib/tk/selectgame.py:554 +#: pysollib/tk/selectgame.py:550 msgid "unlimited" msgstr "" @@ -2706,121 +2780,117 @@ msgstr "" msgid "&Solid color..." msgstr "" -#: pysollib/tk/soundoptionsdialog.py:77 +#: pysollib/tk/soundoptionsdialog.py:75 msgid "Are You Sure" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:79 +#: pysollib/tk/soundoptionsdialog.py:77 msgid "Deal" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:80 +#: pysollib/tk/soundoptionsdialog.py:78 msgid "Deal waste" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:82 +#: pysollib/tk/soundoptionsdialog.py:80 msgid "Turn waste" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:83 +#: pysollib/tk/soundoptionsdialog.py:81 msgid "Start drag" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:85 +#: pysollib/tk/soundoptionsdialog.py:83 msgid "Drop" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:86 +#: pysollib/tk/soundoptionsdialog.py:84 msgid "Drop pair" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:87 +#: pysollib/tk/soundoptionsdialog.py:85 msgid "Auto drop" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:89 +#: pysollib/tk/soundoptionsdialog.py:87 msgid "Flip" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:90 +#: pysollib/tk/soundoptionsdialog.py:88 msgid "Auto flip" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:91 +#: pysollib/tk/soundoptionsdialog.py:89 msgid "Move" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:92 +#: pysollib/tk/soundoptionsdialog.py:90 msgid "No move" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:94 pysollib/tk/toolbar.py:189 +#: pysollib/tk/soundoptionsdialog.py:92 pysollib/tk/toolbar.py:203 msgid "Undo" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:95 pysollib/tk/toolbar.py:190 +#: pysollib/tk/soundoptionsdialog.py:93 pysollib/tk/toolbar.py:204 msgid "Redo" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:97 +#: pysollib/tk/soundoptionsdialog.py:95 msgid "Autopilot lost" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:98 +#: pysollib/tk/soundoptionsdialog.py:96 msgid "Autopilot won" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:101 +#: pysollib/tk/soundoptionsdialog.py:99 msgid "Game lost" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:103 +#: pysollib/tk/soundoptionsdialog.py:101 msgid "Perfect game" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:113 +#: pysollib/tk/soundoptionsdialog.py:111 msgid "Sound enabled" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:119 +#: pysollib/tk/soundoptionsdialog.py:117 msgid "Use DirectX for sound playing" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:125 +#: pysollib/tk/soundoptionsdialog.py:123 msgid "Sample volume:" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:133 +#: pysollib/tk/soundoptionsdialog.py:131 msgid "Music volume:" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:146 +#: pysollib/tk/soundoptionsdialog.py:144 msgid "Enable samles" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:171 +#: pysollib/tk/soundoptionsdialog.py:170 msgid "&Apply" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:171 pysollib/tk/soundoptionsdialog.py:173 -msgid "&Mixer..." -msgstr "" - -#: pysollib/tk/soundoptionsdialog.py:222 +#: pysollib/tk/soundoptionsdialog.py:206 msgid "Sound preferences info" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:223 +#: pysollib/tk/soundoptionsdialog.py:207 msgid "" "Changing DirectX settings will take effect\n" "the next time you restart " msgstr "" -#: pysollib/tk/statusbar.py:136 +#: pysollib/tk/statusbar.py:158 msgid "Moves/Total moves" msgstr "" -#: pysollib/tk/statusbar.py:138 +#: pysollib/tk/statusbar.py:160 msgid "Games played: won/lost" msgstr "" @@ -2860,25 +2930,25 @@ msgstr "" msgid "Text only" msgstr "" -#: pysollib/tk/tkhtml.py:230 +#: pysollib/tk/tkhtml.py:255 msgid "Index" msgstr "" -#: pysollib/tk/tkhtml.py:234 +#: pysollib/tk/tkhtml.py:259 msgid "Back" msgstr "" -#: pysollib/tk/tkhtml.py:238 +#: pysollib/tk/tkhtml.py:263 msgid "Forward" msgstr "" -#: pysollib/tk/tkhtml.py:242 +#: pysollib/tk/tkhtml.py:267 msgid "Close" msgstr "" -#: pysollib/tk/tkhtml.py:360 +#: pysollib/tk/tkhtml.py:389 msgid "" -" HTML limitation:\n" +"HTML limitation:\n" "The %s protocol is not supported yet.\n" "\n" "Please use your standard web browser\n" @@ -2886,7 +2956,7 @@ msgid "" "%s\n" msgstr "" -#: pysollib/tk/tkhtml.py:385 pysollib/tk/tkhtml.py:389 +#: pysollib/tk/tkhtml.py:414 pysollib/tk/tkhtml.py:418 msgid "" "Unable to service request:\n" msgstr "" @@ -3054,87 +3124,87 @@ msgstr "" msgid "No TOP for this game" msgstr "" -#: pysollib/tk/toolbar.py:183 +#: pysollib/tk/toolbar.py:197 msgid "New" msgstr "" -#: pysollib/tk/toolbar.py:184 +#: pysollib/tk/toolbar.py:198 msgid "Restart" msgstr "" -#: pysollib/tk/toolbar.py:184 +#: pysollib/tk/toolbar.py:198 msgid "" "Restart the\n" "current game" msgstr "" -#: pysollib/tk/toolbar.py:186 +#: pysollib/tk/toolbar.py:200 msgid "Open" msgstr "" -#: pysollib/tk/toolbar.py:186 +#: pysollib/tk/toolbar.py:200 msgid "" "Open a\n" "saved game" msgstr "" -#: pysollib/tk/toolbar.py:187 +#: pysollib/tk/toolbar.py:201 msgid "Save" msgstr "" -#: pysollib/tk/toolbar.py:187 +#: pysollib/tk/toolbar.py:201 msgid "Save game" msgstr "" -#: pysollib/tk/toolbar.py:189 +#: pysollib/tk/toolbar.py:203 msgid "Undo last move" msgstr "" -#: pysollib/tk/toolbar.py:190 +#: pysollib/tk/toolbar.py:204 msgid "Redo last move" msgstr "" -#: pysollib/tk/toolbar.py:191 +#: pysollib/tk/toolbar.py:205 msgid "Auto drop cards" msgstr "" -#: pysollib/tk/toolbar.py:191 +#: pysollib/tk/toolbar.py:205 msgid "Autodrop" msgstr "" -#: pysollib/tk/toolbar.py:192 +#: pysollib/tk/toolbar.py:206 msgid "Pause" msgstr "" -#: pysollib/tk/toolbar.py:192 +#: pysollib/tk/toolbar.py:206 msgid "Pause game" msgstr "" -#: pysollib/tk/toolbar.py:194 +#: pysollib/tk/toolbar.py:208 msgid "View statistics" msgstr "" -#: pysollib/tk/toolbar.py:195 +#: pysollib/tk/toolbar.py:209 msgid "Rules" msgstr "" -#: pysollib/tk/toolbar.py:195 +#: pysollib/tk/toolbar.py:209 msgid "Rules for this game" msgstr "" -#: pysollib/tk/toolbar.py:197 +#: pysollib/tk/toolbar.py:211 msgid "Quit" msgstr "" -#: pysollib/tk/toolbar.py:209 +#: pysollib/tk/toolbar.py:225 msgid "Player" msgstr "" -#: pysollib/tk/toolbar.py:210 +#: pysollib/tk/toolbar.py:226 msgid "Player options" msgstr "" -#: pysollib/tk/toolbar.py:435 +#: pysollib/tk/toolbar.py:464 msgid "Toolbar" msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 7e58a268..49ddfe07 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sat Jun 24 16:07:12 2006\n" -"PO-Revision-Date: 2006-06-28 00:12+0400\n" +"POT-Creation-Date: Wed Aug 9 19:09:14 2006\n" +"PO-Revision-Date: 2006-08-09 23:52+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -58,7 +58,7 @@ msgid "Aces Up 5" msgstr "Тузы вверх 5" msgid "Achtmal Acht" -msgstr "" +msgstr "Achtmal Acht" msgid "Acme" msgstr "Высшая точка" @@ -66,6 +66,9 @@ msgstr "Высшая точка" msgid "Acquaintance" msgstr "Знакомство" +msgid "Adela" +msgstr "Адела" + msgid "Agnes Bernauer" msgstr "Агнесса Берно" @@ -94,7 +97,7 @@ msgid "Ali Baba" msgstr "Али Баба" msgid "All in a Row" -msgstr "" +msgstr "Всё в ряд" msgid "Altar" msgstr "Алтарь" @@ -102,12 +105,21 @@ msgstr "Алтарь" msgid "Alternation" msgstr "Чередование" +msgid "Alternations" +msgstr "Чередования" + msgid "Amazons" msgstr "Амазонки" +msgid "American Canister" +msgstr "Американская коробочка" + msgid "American Toad" msgstr "Американская жаба" +msgid "Anno Domini" +msgstr "Anno Domini" + msgid "Another Round" msgstr "Другой Раунд" @@ -124,7 +136,7 @@ msgid "Arabella" msgstr "Арабелла" msgid "Arachnida" -msgstr "" +msgstr "Арахнида" msgid "Arena" msgstr "Арена" @@ -141,8 +153,12 @@ msgstr "Стрела" msgid "Art Moderne" msgstr "Современное искусство" +#, fuzzy +msgid "Artic Garden" +msgstr "Сад" + msgid "Ashrafi" -msgstr "" +msgstr "Ashrafi" msgid "Ashta Dikapala" msgstr "" @@ -150,6 +166,12 @@ msgstr "" msgid "Ashwapati" msgstr "" +msgid "Assembly" +msgstr "Ассамблея" + +msgid "Athena" +msgstr "Афины" + msgid "Auld Lang Syne" msgstr "Старые добрые времена" @@ -184,19 +206,24 @@ msgstr "Баланс" msgid "Balarama" msgstr "" +msgid "Bastille Day" +msgstr "День Бастилии" + msgid "Bastion" msgstr "Бастион" msgid "Bat" msgstr "Летучая мышь" -#, fuzzy msgid "Bath" -msgstr "Летучая мышь" +msgstr "Ванна" msgid "Batsford" msgstr "Бетсфорд" +msgid "Batsford Again" +msgstr "Бетсфорд снова" + msgid "Bavarian Patience" msgstr "Баварский пасьянс" @@ -206,6 +233,10 @@ msgstr "Клюв и ласты" msgid "Beatle" msgstr "Жук" +#, fuzzy +msgid "Beetle" +msgstr "Жук" + msgid "Beleaguered Castle" msgstr "Осаждённый замок" @@ -215,6 +246,9 @@ msgstr "Бельведер" msgid "Betsy Ross" msgstr "Бетси Росс" +msgid "Big Bertha" +msgstr "Большая Берта" + msgid "Big Braid" msgstr "Большая коса" @@ -224,6 +258,13 @@ msgstr "Большая Ячейка" msgid "Big Courtyard" msgstr "Большой Внутренний двор" +msgid "Big Deal" +msgstr "Большая Расдача" + +#, fuzzy +msgid "Big Divorce" +msgstr "Большая дыра" + #, fuzzy msgid "Big Easy" msgstr "Большая арфа" @@ -235,10 +276,6 @@ msgstr "Большой Летящий Дракон" msgid "Big Forty" msgstr "Форт" -#, fuzzy -msgid "Big Ground" -msgstr "Большая гора" - msgid "Big Harp" msgstr "Большая арфа" @@ -249,7 +286,7 @@ msgid "Big Mountain" msgstr "Большая гора" msgid "Big Spider" -msgstr "Большой паук" +msgstr "Большой Паук" msgid "Big Spider (1 suit)" msgstr "Большой Паук (1 масть)" @@ -260,9 +297,8 @@ msgstr "Большой Паук (2 масти)" msgid "Big Streets" msgstr "Большие Улицы" -#, fuzzy msgid "Big Sumo" -msgstr "Большая дыра" +msgstr "Большое Сумо" msgid "Big York" msgstr "Большой Йорк" @@ -303,6 +339,12 @@ msgstr "Боров" msgid "Boat" msgstr "Лодка" +msgid "Bonaparte" +msgstr "Бонапарт" + +msgid "Boost" +msgstr "Повышение" + msgid "Boudoir" msgstr "Будуар" @@ -310,11 +352,17 @@ msgid "Box Fan" msgstr "Коробка для веера" msgid "Box Kite" -msgstr "" +msgstr "Воздушный змей" msgid "Braid" msgstr "Коса" +msgid "Brazilian Patience" +msgstr "Бразильский пасьянс" + +msgid "Breakwater" +msgstr "Волнолом" + msgid "Bridesmaids" msgstr "Подружки невесты" @@ -334,9 +382,18 @@ msgstr "" msgid "Brigade" msgstr "Бригада" +msgid "Brisbane" +msgstr "Брисбен" + msgid "Bristol" msgstr "Бристоль" +msgid "British Blockade" +msgstr "Британская блокада" + +msgid "British Canister" +msgstr "Британская коробочка" + msgid "British Constitution" msgstr "Британская конституция" @@ -352,9 +409,8 @@ msgstr "Буффало Билл" msgid "Bug" msgstr "Клоп" -#, fuzzy msgid "Busy Aces" -msgstr "Русские тузы" +msgstr "Занятые тузы" msgid "Butterfly" msgstr "Бабочка" @@ -371,6 +427,9 @@ msgstr "Камелот" msgid "Canfield" msgstr "Кенфилд" +msgid "Canfield Rush" +msgstr "Пустяковый Кенфилд" + msgid "Canister" msgstr "Коробочка" @@ -456,9 +515,15 @@ msgstr "Маджонг ChessMania" msgid "Chessboard" msgstr "Шахматная доска" +msgid "Chinaman" +msgstr "Китаец" + msgid "Chinese Discipline" msgstr "Китайский порядок" +msgid "Chinese Klondike" +msgstr "Китайский Клондайк" + msgid "Chinese Solitaire" msgstr "Китайский пасьянс" @@ -468,6 +533,12 @@ msgstr "Щепка" msgid "Cicely" msgstr "Кервель" +msgid "Circle Eight" +msgstr "Восемь в круг" + +msgid "Circle Nine" +msgstr "Девять в круг" + msgid "Citadel" msgstr "Цитадель" @@ -507,9 +578,8 @@ msgstr "Виток" msgid "Corkscrew" msgstr "Штопор" -#, fuzzy msgid "Corner Suite" -msgstr "Углы" +msgstr "Угловые масти" msgid "Corners" msgstr "Углы" @@ -517,14 +587,26 @@ msgstr "Углы" msgid "Corona" msgstr "Корона" +msgid "Cotillion" +msgstr "Котильон" + msgid "Courtyard" msgstr "Внутренний двор" +msgid "Cover" +msgstr "Конверт" + +msgid "Crescent" +msgstr "Полумесяц" + msgid "Cross" msgstr "Крест" +msgid "Crossroads" +msgstr "Перекрестки" + msgid "Crown" -msgstr "Венец" +msgstr "Корона" msgid "Cruel" msgstr "Изнурительный" @@ -538,9 +620,8 @@ msgstr "Купол" msgid "Curds and Whey" msgstr "Творог и сыворотка" -#, fuzzy msgid "Czarina" -msgstr "Мария" +msgstr "Царевна" #, fuzzy msgid "Danda" @@ -549,9 +630,8 @@ msgstr "Алмаз" msgid "Dashavatara" msgstr "Дашаватара" -#, fuzzy msgid "Dashavatara Circles" -msgstr "Дашаватара" +msgstr "Дашаватара Круги" msgid "Dead King Golf" msgstr "Гольф Смертельный Король" @@ -562,63 +642,65 @@ msgstr "Глубокий" msgid "Deep Well" msgstr "Глубокий колодец" -#, fuzzy +msgid "Delivery" +msgstr "Доставка" + msgid "Demon" -msgstr "Алмаз" +msgstr "Демон" msgid "Der Katzenschwanz" -msgstr "" +msgstr "Der Katzenschwanz" msgid "Der Zopf" -msgstr "" +msgstr "Der Zopf" -#, fuzzy msgid "Der freie Napoleon" -msgstr "Свободный Наполеон" +msgstr "Der freie Napoleon" -#, fuzzy msgid "Der kleine Napoleon" -msgstr "Свободный Наполеон" +msgstr "Der kleine Napoleon" msgid "Der lange Zopf" -msgstr "" +msgstr "Der lange Zopf" -#, fuzzy msgid "Der letzte Monarch" -msgstr "Последний ,Монарх" +msgstr "Der letzte Monarch" msgid "Deuces" msgstr "Двойки" msgid "Dhanpati" -msgstr "" +msgstr "Dhanpati" msgid "Diamond" -msgstr "Алмаз" +msgstr "Буби" + +msgid "Diamond Mine" +msgstr "Алмазный рудник" msgid "Die Bildgallerie" -msgstr "" +msgstr "Die Bildgallerie" msgid "Die Königsbergerin" -msgstr "" +msgstr "Die Königsbergerin" msgid "Die Russische" -msgstr "" +msgstr "Die Russische" msgid "Die Schlange" -msgstr "" +msgstr "Die Schlange" msgid "Die böse Sieben" -msgstr "" +msgstr "Die böse Sieben" msgid "Die große Harfe" -msgstr "" +msgstr "Die große Harfe" msgid "Die kleine Harfe" -msgstr "" +msgstr "Die kleine Harfe" msgid "Dieppe" -msgstr "" +msgstr "Dieppe" msgid "Diplomat" msgstr "Дипломат" @@ -632,6 +714,12 @@ msgstr "" msgid "Dojouji's Game Doubled" msgstr "" +msgid "Doorway" +msgstr "Вход" + +msgid "Double Acquaintance" +msgstr "Двойное Знакомство" + msgid "Double Bisley" msgstr "Двойной Бисли" @@ -651,9 +739,15 @@ msgstr "Двойной разводной мост" msgid "Double Easthaven" msgstr "Двойной кузнечик" +msgid "Double Fives" +msgstr "Двойные пятёрки" + msgid "Double FreeCell" msgstr "Двойная свободная ячейка" +msgid "Double Gold Mine" +msgstr "Двойной Золотой рудник" + msgid "Double Grasshopper" msgstr "Двойной кузнечик" @@ -687,20 +781,24 @@ msgstr "Двойной Маджонг Двойная вершина" msgid "Double Mahjongg Two Squares" msgstr "Двойной Маджонг Два квадрата" +msgid "Double Measure" +msgstr "Двойная Мера" + msgid "Double Rail" msgstr "Двойные рельсы" -#, fuzzy msgid "Double Russian Solitaire" -msgstr "Русский солитер" +msgstr "Двойной Русский солитер" + +msgid "Double Russian Spider" +msgstr "Двойной Русский Паук" #, fuzzy msgid "Double Samuri" msgstr "Двойные рельсы" -#, fuzzy msgid "Double Scorpion" -msgstr "Двойные рельсы" +msgstr "Двойной Скорпион" #, fuzzy msgid "Double Your Fun" @@ -709,6 +807,9 @@ msgstr "Двойной Юкон" msgid "Double Yukon" msgstr "Двойной Юкон" +msgid "Double or Quits" +msgstr "Двойная и расчёт" + msgid "Doublets" msgstr "Дубликаты" @@ -730,6 +831,9 @@ msgstr "Показ мод" msgid "Drivel" msgstr "Бессмыслица" +msgid "Duchess" +msgstr "Герцогиня" + msgid "Dude" msgstr "Пижон" @@ -739,6 +843,9 @@ msgstr "Герцог" msgid "Dumfries" msgstr "" +msgid "Dutch Solitaire" +msgstr "Голландский пасьянс" + msgid "Eagle Wing" msgstr "Крыло орла" @@ -754,6 +861,9 @@ msgstr "" msgid "Easy x One" msgstr "" +msgid "Eclipse" +msgstr "Затмение" + msgid "Egyptian Solitaire" msgstr "Египетский пасьянс" @@ -778,6 +888,12 @@ msgstr "Ельба" msgid "Elevator" msgstr "Лифт" +msgid "Elevens" +msgstr "Одиннадцать" + +msgid "Elevens Too" +msgstr "Тоже Одиннадцать" + msgid "Emperor" msgstr "Император" @@ -790,12 +906,17 @@ msgstr "Предприятие" msgid "Escalator" msgstr "Эскалатор" -#, fuzzy +msgid "Eternal Triangle" +msgstr "Вечный треугольник" + msgid "Eularia" -msgstr "Мария" +msgstr "Евлария" msgid "Excuse" -msgstr "" +msgstr "Оправдание" + +msgid "Exiled Kings" +msgstr "Изгнанные короли" msgid "Express" msgstr "Экспресс" @@ -807,8 +928,11 @@ msgstr "Глаз" msgid "F-15 Eagle" msgstr "Маджонг F-15 Eagle" +msgid "Faerie Queen" +msgstr "Королева фей" + msgid "Fair Lucy" -msgstr "" +msgstr "Честная Люси" #, fuzzy msgid "Fairest" @@ -820,14 +944,23 @@ msgstr "Падающая звезда" msgid "Fan" msgstr "Веер" +msgid "Fanny" +msgstr "Корма" + msgid "Farandole" msgstr "Фарандола" +msgid "Farmer's Wife" +msgstr "Фермерская жена" + msgid "Faro" msgstr "Фараон" +msgid "Fascination Fan" +msgstr "Очаровательный веер" + msgid "Fastness" -msgstr "Цитадель" +msgstr "Крепость" #, fuzzy msgid "Fatimeh's Game" @@ -843,9 +976,18 @@ msgstr "Пятнашки" msgid "Fifteen plus" msgstr "Пятнадцать плюс" +msgid "Fifteens" +msgstr "Пятнадцать" + +msgid "Final Battle" +msgstr "Последняя битва" + msgid "Firecracker" msgstr "Хлопушка" +msgid "Firing Squad" +msgstr "Салютная команда" + msgid "First Law" msgstr "Фундаментальный закон" @@ -862,9 +1004,16 @@ msgstr "Пять тузов" msgid "Five Pyramids" msgstr "Пять пирамид" +msgid "Flamenco" +msgstr "Фламенко" + msgid "Floating City" msgstr "Плавающий город" +#, fuzzy +msgid "Floradora" +msgstr "Колорадо" + msgid "Flower Arrangement" msgstr "Аранжировка цветов" @@ -896,13 +1045,15 @@ msgstr "Крепость" msgid "Fortress Towers" msgstr "Крепостные башни" -#, fuzzy msgid "Fortune's Favor" -msgstr "Благосклонность фортуны" +msgstr "Любимец фортуны" msgid "Fortunes" msgstr "Судьба" +msgid "Forty Nine" +msgstr "Сорок девять" + msgid "Forty Thieves" msgstr "Сорок разбойников" @@ -927,9 +1078,15 @@ msgstr "Четыре кучи" msgid "Four Winds" msgstr "Четыре ветра" +msgid "Foursome" +msgstr "Квартеты" + msgid "Fourteen" msgstr "Четырнадцать" +msgid "Frames" +msgstr "Рамки" + msgid "Fred's Spider" msgstr "Паук Фреда" @@ -960,10 +1117,10 @@ msgid "Future" msgstr "Будущее" msgid "Gajapati" -msgstr "" +msgstr "Gajapati" msgid "Gaji" -msgstr "" +msgstr "Gaji" msgid "Galary" msgstr "Галерея" @@ -981,7 +1138,7 @@ msgid "Gargantua" msgstr "Гаргантюа" msgid "Garhpati" -msgstr "" +msgstr "Garhpati" msgid "Gate" msgstr "Ворота" @@ -1002,18 +1159,28 @@ msgstr "Происхождение +" msgid "Geoffrey" msgstr "Джефри" +msgid "German FreeCell" +msgstr "Немецкая Свободная ячейка" + msgid "German Patience" -msgstr "Германский пасьянс" +msgstr "Немецкая пасьянс" msgid "Ghulam" -msgstr "" +msgstr "Ghulam" msgid "Giant" msgstr "Великан" +msgid "Giza" +msgstr "Гиза" + msgid "Glade" msgstr "Поляна" +#, fuzzy +msgid "Glencoe" +msgstr "Гленвуд" + msgid "Glenwood" msgstr "Гленвуд" @@ -1026,27 +1193,48 @@ msgstr "Глория" msgid "Gnat" msgstr "Комар" +msgid "Gold Mine" +msgstr "Золотой рудник" + +msgid "Gold Rush" +msgstr "Золотой пустяк" + msgid "Golf" msgstr "Гольф" msgid "Good Measure" msgstr "Полная мера" +msgid "Gotham" +msgstr "Простак" + msgid "Grampus" msgstr "Касатка" msgid "Granada" msgstr "Гранада" +msgid "Grand Duchess" +msgstr "Великая Герцогиня" + +msgid "Grand Duchess +" +msgstr "Великая Герцогиня +" + msgid "Grandfather" msgstr "Дедушка" msgid "Grandfather's Clock" msgstr "Дедушкины часы" +msgid "Grandmamma's Patience" +msgstr "Бабушкин пасьянс" + msgid "Grandmother's Game" msgstr "Бабушкина игра" +msgid "Grant's Reinforcement" +msgstr "Подкрепление Гранта" + msgid "Grasshopper" msgstr "Кузнечик" @@ -1081,9 +1269,8 @@ msgstr "Половинный Маджонг Улыбка" msgid "Half Mahjongg Wall" msgstr "Половинный Маджонг Стена" -#, fuzzy msgid "Hanafuda Four Seasons" -msgstr "Четыре сезона" +msgstr "Ханафуда Четыре сезона" msgid "Hanoi Puzzle 4" msgstr "Ханойская головоломка 4" @@ -1100,12 +1287,18 @@ msgstr "С Новым Годом" msgid "Hare" msgstr "Заяц" +msgid "Harvestman" +msgstr "Сенокосец" + msgid "Hayagriva" msgstr "" msgid "Haystack" msgstr "Стог сена" +msgid "Headquarters" +msgstr "Штаб" + msgid "Heads and Tails" msgstr "Головы и хвосты" @@ -1113,11 +1306,10 @@ msgid "Helios" msgstr "Гелиос" msgid "Hex A Klon" -msgstr "" +msgstr "Шестнадцатиричный Клондайк" -#, fuzzy msgid "Hex A Klon by Threes" -msgstr "Клондайк по три" +msgstr "Шестнадцатиричный Клондайк по три" msgid "Hex Labyrinth" msgstr "Шестнадцатеричный лабиринт" @@ -1128,18 +1320,17 @@ msgstr "Тайные ходы" msgid "Hidden Words" msgstr "Спрятанные слова" -#, fuzzy msgid "High and Low" -msgstr "Маджонг High and Low" +msgstr "Верхний и нижний" msgid "Hiranyaksha" -msgstr "" +msgstr "Hiranyaksha" msgid "Hopscotch" msgstr "Классы" msgid "Horse" -msgstr "Лошадь" +msgstr "Конь" msgid "House in the Wood" msgstr "Дом в лесу" @@ -1150,12 +1341,18 @@ msgstr "Дом на холме" msgid "Hovercraft" msgstr "Ховеркрафт" +msgid "How They Run" +msgstr "Как оно работает" + msgid "Hurdles" msgstr "Барьеры" msgid "Hurricane" msgstr "Ураган" +msgid "Hypotenuse" +msgstr "Гипотенуза" + msgid "Idiot's Delight" msgstr "Дурацкое удовольствие" @@ -1163,7 +1360,7 @@ msgid "Idle Aces" msgstr "Свободные тузы" msgid "IloveU" -msgstr "" +msgstr "IloveU" msgid "Imperial Guards" msgstr "Императорская гвардия" @@ -1176,7 +1373,10 @@ msgid "Inazuma" msgstr "Маджонг Inazuma" msgid "Inca" -msgstr "" +msgstr "Инка" + +msgid "Indefatigable" +msgstr "Неутомимый" msgid "Indian" msgstr "Индийский" @@ -1196,9 +1396,18 @@ msgstr "Смекалка" msgid "Intelligence +" msgstr "Смекалка +" +msgid "Interchange" +msgstr "Чередование" + +msgid "Interment" +msgstr "Погребение" + msgid "Interregnum" msgstr "Междуцарствие" +msgid "Intrigue" +msgstr "Интрига" + msgid "Iris" msgstr "Ирис" @@ -1238,6 +1447,9 @@ msgstr "Путешествие в Куддапах" msgid "Jumbo" msgstr "Гигант" +msgid "Junction" +msgstr "Соединение" + msgid "Jungle" msgstr "Джунгли" @@ -1271,7 +1483,7 @@ msgid "Katrina's Game Relaxed" msgstr "" msgid "Khadga" -msgstr "" +msgstr "Khadga" msgid "King Albert" msgstr "Король Альберт" @@ -1280,7 +1492,10 @@ msgid "King Only Baker's Game" msgstr "" msgid "King Only Hex A Klon" -msgstr "" +msgstr "Королевский Шестнадцатиричный Клондайк" + +msgid "KingCell" +msgstr "Королевская Ячейка" msgid "Kingdom" msgstr "Королевство" @@ -1305,10 +1520,10 @@ msgid "Km" msgstr "" msgid "Knotty Nines" -msgstr "" +msgstr "Сложная Девятка" msgid "Krebs" -msgstr "" +msgstr "Кребс" msgid "Kujaku" msgstr "" @@ -1371,8 +1586,14 @@ msgstr "Маджонг Kyodai 42" msgid "La Belle Lucie" msgstr "Прекрасная Люси" +msgid "La Chatelaine" +msgstr "La Chatelaine" + msgid "La Nivernaise" -msgstr "" +msgstr "La Nivernaise" + +msgid "La Parisienne" +msgstr "La Parisienne" msgid "Labyrinth" msgstr "Лабиринт" @@ -1380,15 +1601,20 @@ msgstr "Лабиринт" msgid "Lady Betty" msgstr "Леди Бетти" -#, fuzzy msgid "Lady Jane" -msgstr "Леди Полк" +msgstr "Леди Джейн" msgid "Lady Palk" msgstr "Леди Полк" msgid "Lady of the Manor" -msgstr "" +msgstr "Госпожа поместья" + +msgid "Lafayette" +msgstr "Лафайет" + +msgid "Laggard Lady" +msgstr "Ленивая леди" msgid "Lanes" msgstr "Тропинки" @@ -1403,18 +1629,27 @@ msgstr "" msgid "Lara's Game Relaxed" msgstr "" +msgid "Last Chance" +msgstr "Последний шанс" + msgid "Lattice" msgstr "Решётка" msgid "Le Cadran" -msgstr "" +msgstr "Le Cadran" msgid "Le Grande Teton" -msgstr "" +msgstr "Le Grande Teton" + +msgid "Legion" +msgstr "Легион" msgid "Leo" msgstr "Лев" +msgid "Les Quatre Coins" +msgstr "Les Quatre Coins" + msgid "Lesser Queue" msgstr "Короткая коса" @@ -1431,7 +1666,7 @@ msgid "Limited" msgstr "Ограниченный" msgid "Lion" -msgstr "Лион" +msgstr "Лев" msgid "Little Billie" msgstr "Малыш Билли" @@ -1447,9 +1682,11 @@ msgstr "Малые ворота" msgid "Little Gate" msgstr "Малые ворота" -#, fuzzy msgid "Little Napoleon" -msgstr "Свободный Наполеон" +msgstr "Маленький Наполеон" + +msgid "Lobachevsky" +msgstr "Лобачевский" msgid "Long Braid" msgstr "Долгая коса" @@ -1457,6 +1694,10 @@ msgstr "Долгая коса" msgid "Long Journey to Cuddapah" msgstr "Долгое путешествие в Куддапах" +#, fuzzy +msgid "Long Tail" +msgstr "Долгая коса" + msgid "Loose Ends" msgstr "Свободные концы" @@ -1466,6 +1707,12 @@ msgstr "Потеря" msgid "Lucas" msgstr "Лукас" +msgid "Lucky Piles" +msgstr "Счастливая ячейка" + +msgid "Lucky Thirteen" +msgstr "Счастливые Тринадцать" + msgid "Madame" msgstr "Мадам" @@ -1651,7 +1898,7 @@ msgid "Mahjongg Hidden Words" msgstr "Маджонг Спрятанные слова" msgid "Mahjongg High and Low" -msgstr "Маджонг High and Low" +msgstr "Маджонг Верхний и нижний" msgid "Mahjongg Horse" msgstr "Маджонг Лошадь" @@ -1672,7 +1919,7 @@ msgid "Mahjongg Inazuma" msgstr "Маджонг Inazuma" msgid "Mahjongg Inca" -msgstr "Маджонг Inca" +msgstr "Маджонг Инка" msgid "Mahjongg Inner Circle" msgstr "Маджонг Внутренний круг" @@ -1693,7 +1940,7 @@ msgid "Mahjongg Km" msgstr "Маджонг Km" msgid "Mahjongg Krebs" -msgstr "Маджонг Krebs" +msgstr "Маджонг Кребс" msgid "Mahjongg Kujaku" msgstr "Маджонг Kujaku" @@ -1975,7 +2222,7 @@ msgid "Mahjongg Twin" msgstr "Маджонг Twin" msgid "Mahjongg Twin Temples" -msgstr "Маджонг Twin Temples" +msgstr "Маджонг Двойной храм" msgid "Mahjongg Two Domes" msgstr "Маджонг Two Domes" @@ -2020,6 +2267,9 @@ msgstr "Маджонг Приятный" msgid "Makara" msgstr "Мария" +msgid "Mamy Susan" +msgstr "Мамочка Сюзи" + msgid "Mancunian" msgstr "Манчестерский" @@ -2032,9 +2282,15 @@ msgstr "Мария Луиза" msgid "Marie Rose" msgstr "Мари Роз" +msgid "Marshal" +msgstr "Маршал" + msgid "Martha" msgstr "Марта" +msgid "Master" +msgstr "Мастер" + msgid "Matriarchy" msgstr "Матриархат" @@ -2042,14 +2298,13 @@ msgid "Matrimony" msgstr "Супружество" msgid "MatsuKiri" -msgstr "" +msgstr "MatsuKiri" msgid "MatsuKiri Strict" -msgstr "" +msgstr "Строгий MatsuKiri" -#, fuzzy msgid "Matsya" -msgstr "Майя" +msgstr "Матся" msgid "Maya" msgstr "Майя" @@ -2057,14 +2312,17 @@ msgstr "Майя" msgid "Maze" msgstr "Путаница" +msgid "Measure" +msgstr "Мера" + msgid "Memory 24" -msgstr "" +msgstr "Запоминание 24" msgid "Memory 30" -msgstr "" +msgstr "Запоминание 30" msgid "Memory 40" -msgstr "" +msgstr "Запоминание 40" msgid "Merlin's Meander" msgstr "Орнамент Мерлина" @@ -2078,9 +2336,8 @@ msgstr "" msgid "Midshipman" msgstr "Гардемарин" -#, fuzzy msgid "Millie" -msgstr "Ячейка Миллиган" +msgstr "Милли" msgid "Milligan Cell" msgstr "Ячейка Миллиган" @@ -2112,7 +2369,7 @@ msgid "Mississippi" msgstr "Миссисипи" msgid "Mod-3" -msgstr "" +msgstr "Mod-3" msgid "Monaco" msgstr "Монако" @@ -2142,7 +2399,6 @@ msgstr "Мотылёк" msgid "Mount Olympus" msgstr "Гора Олимп" -#, fuzzy msgid "Moving Left" msgstr "Движение влево" @@ -2150,7 +2406,7 @@ msgid "Mrs. Mop" msgstr "Миссис Моп" msgid "Mughal Circles" -msgstr "" +msgstr "Мугал Круги" #, fuzzy msgid "Multi X" @@ -2195,7 +2451,7 @@ msgid "Napoleon's Tomb" msgstr "Гробница Наполеона" msgid "Narasimha" -msgstr "" +msgstr "Нарасимха" #, fuzzy msgid "Narpati" @@ -2238,16 +2494,17 @@ msgstr "Северо-Западные Территории" msgid "Number Ten" msgstr "Номер десять" -#, fuzzy msgid "Number Twelve" -msgstr "Номер десять" +msgstr "Номер двенадцать" msgid "Numerica" msgstr "Числовой" -#, fuzzy +msgid "Numerica (2 decks)" +msgstr "Числовой (2 колоды)" + msgid "Ocean Towers" -msgstr "Морские башни" +msgstr "Океанские башни" msgid "Octagon" msgstr "Восьмиугольник" @@ -2268,6 +2525,9 @@ msgstr "Маджонг Okie's Nitemare" msgid "Old Mole" msgstr "Старая дамба" +msgid "One234" +msgstr "Раз234" + msgid "Oonsoo" msgstr "" @@ -2289,6 +2549,9 @@ msgstr "Открытый гигант" msgid "Open Peek" msgstr "" +msgid "Open Sly Fox" +msgstr "Открытая Хитрая лиса" + msgid "Open Spider" msgstr "Открытый паук" @@ -2304,6 +2567,9 @@ msgstr "Порядок" msgid "Osmosis" msgstr "Осмос" +msgid "Outback Patience" +msgstr "Необжитой пасьянс" + msgid "Owl" msgstr "Сова" @@ -2320,6 +2586,9 @@ msgstr "Пагода" msgid "Panopticon" msgstr "Паноптикум" +msgid "Pantagruel" +msgstr "Пантагрюель" + msgid "Pantheon" msgstr "Пантеон" @@ -2332,6 +2601,15 @@ msgstr "Параллели" msgid "Parashurama" msgstr "" +msgid "Parisian" +msgstr "Парижский" + +msgid "Parisienne" +msgstr "" + +msgid "Parliament" +msgstr "Парламент" + msgid "Pas Seul" msgstr "Сольный танец" @@ -2383,9 +2661,8 @@ msgstr "Перпетуум-мобиле" msgid "Perseverance" msgstr "Настойчивость" -#, fuzzy msgid "Phantom Blockade" -msgstr "Блокада" +msgstr "Призрачная блокада" msgid "Phoenix" msgstr "Феникс" @@ -2393,6 +2670,9 @@ msgstr "Феникс" msgid "Picture Gallery" msgstr "Картинная галерея" +msgid "Picture Patience" +msgstr "Картинный пасьянс" + #, fuzzy msgid "Pigtail" msgstr "Косичка" @@ -2413,11 +2693,10 @@ msgid "Plus Belle" msgstr "" msgid "Poker Shuffle" -msgstr "" +msgstr "Покер с тасованием" -#, fuzzy msgid "Poker Square" -msgstr "Два квадрата" +msgstr "Покер-квадрат" msgid "Ponytail" msgstr "Конский хвост" @@ -2428,6 +2707,12 @@ msgstr "Портал" msgid "Portuguese Solitaire" msgstr "Португальский пасьянс" +msgid "Primrose" +msgstr "Первоцвет" + +msgid "Princess Patience" +msgstr "Княжеский пасьянс" + msgid "Progression" msgstr "Движение" @@ -2449,21 +2734,26 @@ msgstr "Пирамида 1" msgid "Pyramid 2" msgstr "Пирамида 2" -#, fuzzy msgid "Pyramid Golf" -msgstr "Пирамида 1" +msgstr "Пирамидальный Голф" msgid "Q.C." msgstr "" msgid "Quad" -msgstr "" +msgstr "Четвёрка" msgid "Quadrangle" msgstr "Четырёхугольник" msgid "Quadruple Alliance" -msgstr "" +msgstr "Четырёхсторонний альянс" + +msgid "Quartets" +msgstr "Квартеты" + +msgid "Queen Victoria" +msgstr "Королева Виктория" msgid "Queen of Italy" msgstr "Королева Италии" @@ -2471,6 +2761,9 @@ msgstr "Королева Италии" msgid "Queenie" msgstr "" +msgid "Queensland" +msgstr "" + msgid "Quilt" msgstr "Одеяло" @@ -2516,11 +2809,14 @@ msgstr "Красная Луна" msgid "Red and Black" msgstr "Красное и Чёрное" +msgid "Regal Family" +msgstr "Царская семья" + msgid "Reindeer" msgstr "Северный олень" msgid "Relax" -msgstr "" +msgstr "Смягчённый" msgid "Relaxed FreeCell" msgstr "Смягчённая Свободная ячейка" @@ -2543,6 +2839,9 @@ msgstr "Ремонт" msgid "Retinue" msgstr "Свита" +msgid "Right Triangle" +msgstr "Правый Треугольник" + msgid "Rings" msgstr "Круги" @@ -2582,6 +2881,9 @@ msgstr "Ракета" msgid "Roman Arena" msgstr "Римская арена" +msgid "Roosevelt" +msgstr "Рузвельт" + msgid "Roost" msgstr "Насест" @@ -2593,10 +2895,13 @@ msgid "Roslin" msgstr "Робин" msgid "Rouge et Noir" -msgstr "" +msgstr "Rouge et Noir" msgid "Rows of Four" -msgstr "" +msgstr "Четыре в ряд" + +msgid "Royal Aids" +msgstr "Королевская помощь" msgid "Royal Cotillion" msgstr "Королевский котильон" @@ -2611,6 +2916,12 @@ msgstr "Королевская семья" msgid "Royal Marriage" msgstr "Королевская свадьба" +msgid "Royal Parade" +msgstr "Королевский парад" + +msgid "Royal Rendezvous" +msgstr "Королевское рандеву" + msgid "Rugby" msgstr "Регби" @@ -2629,24 +2940,32 @@ msgstr "Русский пункт" msgid "Russian Solitaire" msgstr "Русский солитер" +msgid "Russian Spider" +msgstr "Русский паук" + msgid "Salic Law" msgstr "Салический закон" msgid "Samuri" msgstr "" +msgid "San Juan Hill" +msgstr "Гора Сан-Хуан" + msgid "Sanibel" msgstr "Санибел" -#, fuzzy msgid "Saratoga" -msgstr "Звёздные врата" +msgstr "Дорожный сундук" + +msgid "Saxony" +msgstr "Саксония" msgid "Scarab" msgstr "Скарабей" msgid "Scheidungsgrund" -msgstr "" +msgstr "Scheidungsgrund" msgid "Scorpion" msgstr "Скорпион" @@ -2660,9 +2979,11 @@ msgstr "Хвост скорпиона" msgid "Scotch Patience" msgstr "Шотландский пасьянс" -#, fuzzy msgid "Screw Up" -msgstr "Тузы вверх" +msgstr "Завинчивание" + +msgid "Scuffle" +msgstr "Потасовка" msgid "Sea Towers" msgstr "Морские башни" @@ -2670,6 +2991,9 @@ msgstr "Морские башни" msgid "Seahaven Towers" msgstr "" +msgid "Selective Castle" +msgstr "Избирательный Замок" + msgid "Senate" msgstr "Сенат" @@ -2694,6 +3018,9 @@ msgstr "Семь по пять" msgid "Seven by Four" msgstr "Семь по четыре" +msgid "Shady Lanes" +msgstr "Тенистые аллеи" + msgid "Shamrocks" msgstr "Трилистник" @@ -2731,11 +3058,14 @@ msgstr "" msgid "Shisen-Sho 24x12" msgstr "" +msgid "Short Tail" +msgstr "Короткий хвост" + msgid "Siam" msgstr "Сиам" msgid "Sieben bis As" -msgstr "" +msgstr "Sieben bis As" msgid "Signora" msgstr "Синьора" @@ -2752,9 +3082,8 @@ msgstr "Простые пары" msgid "Simple Simon" msgstr "Симон-простофиля" -#, fuzzy msgid "Simplex" -msgstr "Улыбка" +msgstr "Симплекс" msgid "Simplicity" msgstr "Простота" @@ -2775,9 +3104,15 @@ msgstr "Шесть мудрецов" msgid "Sixes and Sevens" msgstr "Шестёрки и семёрки" +msgid "Skippy" +msgstr "" + msgid "Skiz" msgstr "" +msgid "Sly Fox" +msgstr "Хитрая лиса" + msgid "Small Harp" msgstr "Малая арфа" @@ -2794,13 +3129,18 @@ msgstr "Хвост" msgid "Snakestone" msgstr "Хвост" -#, fuzzy msgid "Solid Square" -msgstr "Два квадрата" +msgstr "Сплошное каре" + +msgid "Solstice" +msgstr "Солнцестояние" msgid "Somerset" msgstr "Сомерсет" +msgid "Soother" +msgstr "Пустышка" + #, fuzzy msgid "Souter" msgstr "Петух" @@ -2841,20 +3181,17 @@ msgstr "Паук 3x3" msgid "Spider Web" msgstr "Паутина" -#, fuzzy msgid "Spidercells" -msgstr "Паук" +msgstr "Паутинные ячейки" msgid "Spiderette" -msgstr "Паучок" +msgstr "Паучиха" -#, fuzzy msgid "Spidike" -msgstr "Паук" +msgstr "Пауклонд" -#, fuzzy msgid "Spike" -msgstr "Паук" +msgstr "Шип" msgid "Squadron" msgstr "Эскадрон" @@ -2902,6 +3239,10 @@ msgstr "Звёздные врата" msgid "Step Pyramid" msgstr "Семь пирамид" +#, fuzzy +msgid "Step-Up" +msgstr "Шаги" + msgid "Steps" msgstr "Шаги" @@ -2920,6 +3261,9 @@ msgstr "Сокровищница" msgid "Straight Up" msgstr "" +msgid "Strata" +msgstr "Пласт" + #, fuzzy msgid "Strategerie" msgstr "Стратегия" @@ -2927,6 +3271,9 @@ msgstr "Стратегия" msgid "Strategy" msgstr "Стратегия" +msgid "Strategy +" +msgstr "Стратегия +" + msgid "Streets" msgstr "Улицы" @@ -2934,7 +3281,10 @@ msgid "Streets and Alleys" msgstr "Улицы и аллеи" msgid "Stronghold" -msgstr "Цитадель" +msgstr "Твердыня" + +msgid "Suit Elevens" +msgstr "Одиннадцать в масть" msgid "Sukis" msgstr "" @@ -2948,9 +3298,8 @@ msgstr "Султан +" msgid "Sultan of Turkey" msgstr "Турецкий султан" -#, fuzzy msgid "Sumo" -msgstr "Гигант" +msgstr "Сумо" #, fuzzy msgid "SunMoon" @@ -2959,16 +3308,14 @@ msgstr "Голубая луна" msgid "Super Challenge FreeCell" msgstr "Очень Сложная Свободная ячейка" -#, fuzzy msgid "Super Flower Garden" -msgstr "Цветочный сад" +msgstr "Превосходный Цветочный сад" msgid "Super Samuri" msgstr "" -#, fuzzy msgid "Superior Canfield" -msgstr "Двойной Кенфилд" +msgstr "Больший Кенфилд" msgid "Surprise" msgstr "Сюрприз" @@ -2977,7 +3324,7 @@ msgid "Surukh" msgstr "" msgid "Sweet Sixteen" -msgstr "" +msgstr "Приятные шестнадцать" msgid "Taipei" msgstr "Тайпей" @@ -2986,7 +3333,7 @@ msgid "Take Away" msgstr "Удаление" msgid "Tam O'Shanter" -msgstr "" +msgstr "Там О'Шантер" msgid "Tarantula" msgstr "Тарантул" @@ -3027,6 +3374,12 @@ msgstr "Сад" msgid "The Great Wall" msgstr "Великая Стена" +msgid "The Little Corporal" +msgstr "Маленький Капрал" + +msgid "The Spark" +msgstr "Вспышка" + msgid "The Wish" msgstr "Желание" @@ -3042,6 +3395,9 @@ msgstr "Театр" msgid "Thirteen Up" msgstr "Тринадцать вверх" +msgid "Thirteens" +msgstr "Тринадцать" + msgid "Thirty Six" msgstr "Тридцать шесть" @@ -3054,6 +3410,9 @@ msgstr "Три вершины" msgid "Three Peaks Non-scoring" msgstr "Три вершины без подсчёта очков" +msgid "Three Pirates" +msgstr "Три пирата" + msgid "Three Shuffles and a Draw" msgstr "" @@ -3102,6 +3461,9 @@ msgstr "Башни" msgid "Traditional Reviewed" msgstr "Маджонг Traditional Reviewed" +msgid "Trapdoor" +msgstr "Люк" + msgid "Treasure Trove" msgstr "Клад" @@ -3111,15 +3473,14 @@ msgstr "Древо жизни" msgid "Trefoil" msgstr "Клевер" -#, fuzzy -msgid "Tri Peaks" -msgstr "Три вершины" - msgid "Trika" msgstr "" msgid "Trillium" -msgstr "" +msgstr "Триллиум" + +msgid "Triple Alliance" +msgstr "Тройной альянс" msgid "Triple Canfield" msgstr "Тройной Кенфилд" @@ -3148,36 +3509,54 @@ msgstr "Тройной Скорпион" msgid "Triple Yukon" msgstr "Тройной Юкон" -#, fuzzy +msgid "Troika" +msgstr "Тройка" + +msgid "Troika +" +msgstr "Тройка +" + msgid "Trusty Twelve" -msgstr "Сорок разбойников" +msgstr "Верные двенадцать" + +msgid "Tuxedo" +msgstr "Смокинг" msgid "Twenty" msgstr "Двенадцать" msgid "Twin" -msgstr "" +msgstr "Двоня" msgid "Twin Picks" -msgstr "" +msgstr "Двойная вершина" + +msgid "Twin Queens" +msgstr "Двойные королевы" -#, fuzzy msgid "Twin Temples" -msgstr "Маджонг Twin Temples" +msgstr "Двойной храм" #, fuzzy msgid "Two Domes" msgstr "Маджонг Two Domes" msgid "Two Familiars" -msgstr "" +msgstr "Два знакомца" msgid "Two Squares" msgstr "Два квадрата" -#, fuzzy +msgid "Ukrainian Solitaire" +msgstr "Украинский пасьянс" + msgid "Union Square" -msgstr "Два квадрата" +msgstr "Объединённый квадрата" + +msgid "Unlimited" +msgstr "Неограниченный" + +msgid "Usk" +msgstr "" msgid "Vagues" msgstr "Смутный" @@ -3195,14 +3574,16 @@ msgstr "Марта" msgid "Variegated Canfield" msgstr "Пёстрый Кенфилд" -#, fuzzy +msgid "Vassal" +msgstr "Вассал" + msgid "Vegas Klondike" -msgstr "Казино Клондайк" +msgstr "Вегас Клондайк" msgid "Vertical" msgstr "Вертикаль" -msgid "Very Big Ground" +msgid "Very Big Divorce" msgstr "" msgid "Vi" @@ -3212,6 +3593,9 @@ msgstr "" msgid "Victory Arrow" msgstr "Маджонг Victory Arrow" +msgid "Virginia Reel" +msgstr "" + #, fuzzy msgid "Wake-Robin" msgstr "Робин" @@ -3232,6 +3616,9 @@ msgstr "Фаворит Вашингтона" msgid "Wasp" msgstr "Оса" +msgid "Waterloo" +msgstr "Ватерлоо" + msgid "Wave Motion" msgstr "Волновое движение" @@ -3261,6 +3648,9 @@ msgstr "" msgid "Whatever" msgstr "Нечто" +msgid "Wheatsheaf" +msgstr "" + msgid "Wheel of Fortune" msgstr "Колесо фортуны" @@ -3286,6 +3676,9 @@ msgstr "Ветряная мельница" msgid "Wisteria" msgstr "Глициния" +msgid "Wood" +msgstr "Дерево" + #, fuzzy msgid "X-Files" msgstr "Маджонг X-Files" @@ -3315,9 +3708,16 @@ msgstr "Церлин (3 колоды)" msgid "Zeus" msgstr "Зевс" -#, fuzzy msgid "Zodiac" -msgstr "Скандинавский" +msgstr "Зодиак" + +#, fuzzy +#~ msgid "Big Ground" +#~ msgstr "Большая гора" + +#, fuzzy +#~ msgid "Tri Peaks" +#~ msgstr "Три вершины" #~ msgid "Ground for a Divorce (3 decks)" #~ msgstr "Повод для разрыва (3 колоды)" @@ -3327,7 +3727,3 @@ msgstr "Скандинавский" #~ msgid "Triple York" #~ msgstr "Тройной Йорк" - -#, fuzzy -#~ msgid "Adelaide" -#~ msgstr "Аделаида" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 6253a42b..8690c272 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sat Jun 24 16:07:07 2006\n" -"PO-Revision-Date: 2006-06-25 23:53+0400\n" +"POT-Creation-Date: Wed Aug 9 19:09:09 2006\n" +"PO-Revision-Date: 2006-08-10 00:30+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -14,32 +14,32 @@ msgstr "" "Content-Transfer-Encoding: utf-8\n" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:346 pysollib/tk/toolbar.py:183 +#: pysollib/actions.py:358 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "Новая игра" -#: pysollib/actions.py:359 pysollib/tk/menubar.py:666 -#: pysollib/tk/menubar.py:680 +#: pysollib/actions.py:371 pysollib/tk/menubar.py:698 +#: pysollib/tk/menubar.py:712 msgid "Select game" msgstr "Выбрать игру" -#: pysollib/actions.py:382 +#: pysollib/actions.py:394 msgid "Invalid game number" msgstr "Неправильный номер игры" -#: pysollib/actions.py:383 +#: pysollib/actions.py:395 msgid "Invalid game number\n" msgstr "Неправильный номер игры\n" -#: pysollib/actions.py:400 +#: pysollib/actions.py:412 msgid "Select next game number" msgstr "Выберите номер следующей игры" -#: pysollib/actions.py:409 pysollib/actions.py:419 +#: pysollib/actions.py:421 pysollib/actions.py:431 msgid "Select new game number" msgstr "Выберите номер новой игры" -#: pysollib/actions.py:410 +#: pysollib/actions.py:422 msgid "" "\n" "\n" @@ -49,70 +49,70 @@ msgstr "" "\n" "Введите номер новой игры" -#: pysollib/actions.py:411 +#: pysollib/actions.py:423 msgid "&Next number" msgstr "&Следующий номер" -#: pysollib/actions.py:411 pysollib/app.py:1113 pysollib/app.py:1125 -#: pysollib/game.py:837 pysollib/game.py:1651 pysollib/main.py:413 -#: pysollib/main.py:421 pysollib/tk/colorsdialog.py:131 -#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 -#: pysollib/tk/fontsdialog.py:204 pysollib/tk/gameinfodialog.py:143 +#: pysollib/actions.py:423 pysollib/app.py:1142 pysollib/app.py:1154 +#: pysollib/game.py:904 pysollib/game.py:1828 pysollib/main.py:439 +#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:132 +#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 -#: pysollib/tk/soundoptionsdialog.py:171 pysollib/tk/soundoptionsdialog.py:225 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:474 +#: pysollib/tk/soundoptionsdialog.py:170 pysollib/tk/soundoptionsdialog.py:211 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:503 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 #: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 #: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:777 -#: pysollib/tk/tkstats.py:861 pysollib/tk/tkwidget.py:156 -#: pysollib/tk/tkwidget.py:320 +#: pysollib/tk/tkstats.py:861 pysollib/tk/tkwidget.py:159 +#: pysollib/tk/tkwidget.py:324 msgid "&OK" msgstr "&ОК" -#: pysollib/actions.py:411 pysollib/app.py:1125 pysollib/game.py:837 -#: pysollib/game.py:1214 pysollib/game.py:1229 pysollib/game.py:1235 -#: pysollib/game.py:1240 pysollib/tk/colorsdialog.py:131 -#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:140 -#: pysollib/tk/fontsdialog.py:204 pysollib/tk/menubar.py:849 -#: pysollib/tk/menubar.py:851 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/actions.py:423 pysollib/app.py:1154 pysollib/game.py:904 +#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 +#: pysollib/game.py:1318 pysollib/tk/colorsdialog.py:132 +#: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:893 +#: pysollib/tk/menubar.py:895 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 -#: pysollib/tk/selectgame.py:275 pysollib/tk/selectgame.py:417 -#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:171 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:320 +#: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 +#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:170 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:324 msgid "&Cancel" msgstr "От&мена" -#: pysollib/actions.py:427 +#: pysollib/actions.py:439 msgid "Select random game" msgstr "Выбор случайной игры" -#: pysollib/actions.py:463 +#: pysollib/actions.py:475 msgid "Select next game" msgstr "Выбрать следующую игру" -#: pysollib/actions.py:496 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:508 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "Выйти из " -#: pysollib/actions.py:546 +#: pysollib/actions.py:558 msgid "Clear bookmarks" msgstr "Удалить закладки" -#: pysollib/actions.py:547 +#: pysollib/actions.py:559 msgid "Clear all bookmarks ?" msgstr "Удалить все закладки?" -#: pysollib/actions.py:557 +#: pysollib/actions.py:569 msgid "Restart game" msgstr "Начать игру с начала" -#: pysollib/actions.py:558 +#: pysollib/actions.py:570 msgid "Restart this game ?" msgstr "Начать игру с начала?" -#: pysollib/actions.py:595 +#: pysollib/actions.py:611 msgid "" "Comments for %s:\n" "\n" @@ -120,19 +120,19 @@ msgstr "" "Комментарий для %s:\n" "\n" -#: pysollib/actions.py:597 +#: pysollib/actions.py:613 msgid "Comments for " msgstr "Комментарий для " -#: pysollib/actions.py:615 pysollib/actions.py:651 +#: pysollib/actions.py:631 pysollib/actions.py:667 msgid "Error while writing to file" msgstr "Ошибка при записи в файл" -#: pysollib/actions.py:618 pysollib/actions.py:654 +#: pysollib/actions.py:634 pysollib/actions.py:670 msgid " Info" msgstr " Информация" -#: pysollib/actions.py:619 +#: pysollib/actions.py:635 msgid "" "Comments were appended to\n" "\n" @@ -140,15 +140,15 @@ msgstr "" "Комментарий добавлен в файл\n" "\n" -#: pysollib/actions.py:636 +#: pysollib/actions.py:652 msgid "Demo statistics" msgstr "Статистика демо" -#: pysollib/actions.py:639 +#: pysollib/actions.py:655 msgid "Your statistics" msgstr "Ваша статистика" -#: pysollib/actions.py:655 +#: pysollib/actions.py:671 msgid "" " were appended to\n" "\n" @@ -156,52 +156,52 @@ msgstr "" " добавлена в файл\n" "\n" -#: pysollib/actions.py:669 +#: pysollib/actions.py:685 msgid " Demo" msgstr " Демо" -#: pysollib/actions.py:669 +#: pysollib/actions.py:685 msgid " Demo " msgstr " Демо " -#: pysollib/actions.py:672 pysollib/actions.py:690 +#: pysollib/actions.py:688 pysollib/actions.py:706 msgid " for " msgstr " для " -#: pysollib/actions.py:678 pysollib/actions.py:697 +#: pysollib/actions.py:694 pysollib/actions.py:713 msgid "Statistics for " msgstr "Статистика игры " -#: pysollib/actions.py:681 pysollib/tk/selectgame.py:359 -#: pysollib/tk/toolbar.py:194 +#: pysollib/actions.py:697 pysollib/tk/selectgame.py:350 +#: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "Статистика" -#: pysollib/actions.py:684 +#: pysollib/actions.py:700 msgid "Full log" msgstr "Полный лог" -#: pysollib/actions.py:687 +#: pysollib/actions.py:703 msgid "Session log" msgstr "Лог сессии" -#: pysollib/actions.py:693 +#: pysollib/actions.py:709 msgid "Game Info" msgstr "Информация об игре" -#: pysollib/actions.py:702 +#: pysollib/actions.py:718 msgid "Full log for " msgstr "Полный лог для " -#: pysollib/actions.py:707 +#: pysollib/actions.py:723 msgid "Session log for " msgstr "Лог сессии для " -#: pysollib/actions.py:712 +#: pysollib/actions.py:728 msgid "Reset all statistics" msgstr "Очистить всю статистику" -#: pysollib/actions.py:713 +#: pysollib/actions.py:729 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" @@ -209,11 +209,11 @@ msgstr "" "Очистить всю статистику и лог для игрока\n" "%s?" -#: pysollib/actions.py:719 +#: pysollib/actions.py:735 msgid "Reset game statistics" msgstr "Очистить статистику игры" -#: pysollib/actions.py:720 +#: pysollib/actions.py:736 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -225,51 +225,51 @@ msgstr "" "и игры\n" "%s?" -#: pysollib/actions.py:776 +#: pysollib/actions.py:792 msgid "Play demo" msgstr "Показать демо" -#: pysollib/actions.py:787 +#: pysollib/actions.py:803 msgid "Set player options" msgstr "Установить настройки игрока" -#: pysollib/actions.py:876 +#: pysollib/actions.py:898 msgid "Sound settings" msgstr "Настройка звука" -#: pysollib/actions.py:897 +#: pysollib/actions.py:919 msgid "Set colors" msgstr "Настроить цвета" -#: pysollib/actions.py:916 +#: pysollib/actions.py:938 msgid "Set fonts" msgstr "Настроить шрифт" -#: pysollib/actions.py:925 +#: pysollib/actions.py:947 msgid "Set timeouts" msgstr "Настроить таймауты" -#: pysollib/app.py:85 +#: pysollib/app.py:87 msgid "Unknown" msgstr "Неизвестный" -#: pysollib/app.py:975 +#: pysollib/app.py:1004 msgid "Loading %s %s..." msgstr "Загружается %s %s..." -#: pysollib/app.py:1010 +#: pysollib/app.py:1039 msgid " load error" msgstr " ошибка при загрузке" -#: pysollib/app.py:1011 +#: pysollib/app.py:1040 msgid "Error while loading " msgstr "Ошибка при загрузке" -#: pysollib/app.py:1105 +#: pysollib/app.py:1134 msgid "Incompatible " msgstr "Несовместимый " -#: pysollib/app.py:1107 +#: pysollib/app.py:1136 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -283,19 +283,19 @@ msgstr "" "\n" "Необходимо выбрать %s типа %s.\n" -#: pysollib/app.py:1123 +#: pysollib/app.py:1152 msgid "Please select a %s type %s" msgstr "Выберите %s типа %s" -#: pysollib/game.py:756 pysollib/game.py:762 +#: pysollib/game.py:823 pysollib/game.py:829 msgid "Player\n" msgstr "Игрок\n" -#: pysollib/game.py:833 +#: pysollib/game.py:900 msgid "Discard current game ?" msgstr "Завершить текущую игру?" -#: pysollib/game.py:1168 +#: pysollib/game.py:1244 msgid "" "\n" "You have reached\n" @@ -305,7 +305,7 @@ msgstr "" "Вы достигли\n" "#%d в %s игрового времени" -#: pysollib/game.py:1171 +#: pysollib/game.py:1247 msgid "" "\n" "and #%d in the %s of moves" @@ -313,7 +313,7 @@ msgstr "" "\n" "и #%d в %s количества ходов" -#: pysollib/game.py:1173 +#: pysollib/game.py:1249 msgid "" "\n" "You have reached\n" @@ -323,7 +323,7 @@ msgstr "" "Вы достигли\n" "#%d в %s количества ходов" -#: pysollib/game.py:1176 +#: pysollib/game.py:1252 msgid "" "\n" "and #%d in the %s of total moves" @@ -331,7 +331,7 @@ msgstr "" "\n" "и #%d в %s общего количества ходов" -#: pysollib/game.py:1178 +#: pysollib/game.py:1254 msgid "" "\n" "You have reached\n" @@ -341,12 +341,12 @@ msgstr "" "Вы достигли\n" "#%d в %s общего количества ходов" -#: pysollib/game.py:1205 pysollib/game.py:1221 -#: pysollib/tk/soundoptionsdialog.py:102 +#: pysollib/game.py:1281 pysollib/game.py:1297 +#: pysollib/tk/soundoptionsdialog.py:100 msgid "Game won" msgstr "Игра выиграна" -#: pysollib/game.py:1206 +#: pysollib/game.py:1282 msgid "" "\n" "Congratulations, this\n" @@ -365,12 +365,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1214 pysollib/game.py:1229 pysollib/game.py:1235 -#: pysollib/game.py:1240 pysollib/tk/menubar.py:250 +#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 +#: pysollib/game.py:1318 pysollib/tk/menubar.py:257 msgid "&New game" msgstr "&Новая игра" -#: pysollib/game.py:1222 +#: pysollib/game.py:1298 msgid "" "\n" "Congratulations, you did it !\n" @@ -387,12 +387,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1233 pysollib/game.py:1238 -#: pysollib/tk/soundoptionsdialog.py:100 +#: pysollib/game.py:1310 pysollib/game.py:1316 +#: pysollib/tk/soundoptionsdialog.py:98 msgid "Game finished" msgstr "Игра закончена" -#: pysollib/game.py:1234 pysollib/game.py:1652 +#: pysollib/game.py:1311 pysollib/game.py:1829 msgid "" "\n" "Game finished\n" @@ -400,7 +400,7 @@ msgstr "" "\n" "Игра закончена\n" -#: pysollib/game.py:1239 +#: pysollib/game.py:1317 msgid "" "\n" "Game finished, but not without my help...\n" @@ -408,35 +408,35 @@ msgstr "" "\n" "Игра закончена, но не без моей помощи...\n" -#: pysollib/game.py:1240 +#: pysollib/game.py:1318 msgid "&Restart" msgstr "&Начало" -#: pysollib/game.py:1544 +#: pysollib/game.py:1720 msgid "Score %6d" msgstr "Счет %6d" -#: pysollib/game.py:1643 +#: pysollib/game.py:1819 msgid "&Cool" msgstr "&Отлично" -#: pysollib/game.py:1643 +#: pysollib/game.py:1819 msgid "&Great" msgstr "&Эдорово" -#: pysollib/game.py:1643 +#: pysollib/game.py:1819 msgid "&Wow" msgstr "&Ура" -#: pysollib/game.py:1643 +#: pysollib/game.py:1819 msgid "&Yeah" msgstr "&Ага" -#: pysollib/game.py:1644 pysollib/game.py:1655 pysollib/game.py:1667 +#: pysollib/game.py:1820 pysollib/game.py:1832 pysollib/game.py:1845 msgid " Autopilot" msgstr " Автопилот" -#: pysollib/game.py:1645 +#: pysollib/game.py:1821 msgid "" "\n" "Game solved in %d moves.\n" @@ -444,19 +444,19 @@ msgstr "" "\n" "Игра решена за %d ходов\n" -#: pysollib/game.py:1666 +#: pysollib/game.py:1844 msgid "&Hmm" msgstr "&Хмм" -#: pysollib/game.py:1666 +#: pysollib/game.py:1844 msgid "&Oh well" msgstr "&Ох" -#: pysollib/game.py:1666 +#: pysollib/game.py:1844 msgid "&That's life" msgstr "&Такова жизнь" -#: pysollib/game.py:1668 +#: pysollib/game.py:1846 msgid "" "\n" "This won't come out...\n" @@ -464,43 +464,47 @@ msgstr "" "\n" "Не удалось...\n" -#: pysollib/game.py:2072 +#: pysollib/game.py:2264 msgid "Set bookmark" msgstr "Установить закладку" -#: pysollib/game.py:2073 +#: pysollib/game.py:2265 msgid "Replace existing bookmark %d ?" msgstr "Заменить существующую закладку %d ?" -#: pysollib/game.py:2095 +#: pysollib/game.py:2287 msgid "Goto bookmark" msgstr "Перейти к закладке" -#: pysollib/game.py:2096 +#: pysollib/game.py:2288 msgid "Goto bookmark %d ?" msgstr "Перейти к закладке %d ?" -#: pysollib/game.py:2127 +#: pysollib/game.py:2319 msgid "Open game" msgstr "Открыть игру" -#: pysollib/game.py:2138 pysollib/game.py:2147 pysollib/game.py:2152 +#: pysollib/game.py:2330 pysollib/game.py:2339 pysollib/game.py:2344 msgid "Load game error" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2139 +#: pysollib/game.py:2331 msgid "" "Error while loading game.\n" "\n" "Probably the game file is damaged,\n" "but this could also be a bug you might want to report." msgstr "" +"Ошибка при загрузке игры.\n" +"\n" +"Возможно повреждён файл,\n" +"или ошибка в программе." -#: pysollib/game.py:2148 +#: pysollib/game.py:2340 msgid "Error while loading game" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2153 +#: pysollib/game.py:2345 msgid "" "Internal error while loading game.\n" "\n" @@ -510,11 +514,11 @@ msgstr "" "\n" "Пожалуйста сообщите об этой ошибке." -#: pysollib/game.py:2178 +#: pysollib/game.py:2370 msgid "Save game error" msgstr "Ошибка при сохранении игры" -#: pysollib/game.py:2179 +#: pysollib/game.py:2371 msgid "Error while saving game" msgstr "Ошибка при сохранении игры" @@ -726,27 +730,27 @@ msgstr "Покер" msgid "Puzzle type" msgstr "Пазлы" -#: pysollib/games/auldlangsyne.py:142 pysollib/games/calculation.py:101 -#: pysollib/games/numerica.py:90 pysollib/games/numerica.py:197 -#: pysollib/games/numerica.py:543 -msgid "Row. Build regardless of rank and suit." -msgstr "" +#: pysollib/games/auldlangsyne.py:158 pysollib/games/calculation.py:104 +#: pysollib/games/numerica.py:90 pysollib/games/numerica.py:272 +#: pysollib/games/numerica.py:639 pysollib/games/numerica.py:743 +msgid "Tableau. Build regardless of rank and suit." +msgstr "Игровой стол. Складывать не считаясь с мастью и достоинством." -#: pysollib/games/braid.py:251 pysollib/games/napoleon.py:190 -#: pysollib/games/ultra/dashavatara.py:959 +#: pysollib/games/braid.py:248 pysollib/games/camelot.py:555 +#: pysollib/games/napoleon.py:182 pysollib/games/ultra/dashavatara.py:959 #: pysollib/games/ultra/hanafuda1.py:256 pysollib/games/ultra/hexadeck.py:1190 #: pysollib/games/ultra/mughal.py:802 msgid " Ascending" msgstr " вверх" -#: pysollib/games/braid.py:253 pysollib/games/napoleon.py:192 -#: pysollib/games/ultra/dashavatara.py:961 +#: pysollib/games/braid.py:250 pysollib/games/camelot.py:554 +#: pysollib/games/napoleon.py:184 pysollib/games/ultra/dashavatara.py:961 #: pysollib/games/ultra/hanafuda1.py:258 pysollib/games/ultra/hexadeck.py:1192 #: pysollib/games/ultra/mughal.py:804 msgid " Descending" msgstr " вниз" -#: pysollib/games/calculation.py:135 pysollib/games/calculation.py:230 +#: pysollib/games/calculation.py:121 msgid "" "1: 2 3 4 5 6 7 8 9 T J Q K\n" "2: 4 6 8 T Q A 3 5 7 9 J K\n" @@ -758,44 +762,50 @@ msgstr "" "3: 6 9 Д 2 5 8 В Т 4 7 10 К\n" "4: 8 Д 3 7 В 2 6 10 Т 5 9 К" -#: pysollib/games/curdsandwhey.py:58 -msgid "Row. Build down by suit or of the same rank." -msgstr "" +#: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 +#: pysollib/stack.py:1287 pysollib/util.py:81 +msgid "King" +msgstr "Король" -#: pysollib/games/fan.py:279 +#: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 +#: pysollib/stack.py:1286 pysollib/util.py:81 +msgid "Queen" +msgstr "Королева" + +#: pysollib/games/curdsandwhey.py:60 +msgid "Tableau. Build down by suit or of the same rank." +msgstr "Игровой стол. Складывать в масть по убыванию или с таким же достоинством." + +#: pysollib/games/fan.py:280 msgid "Draw" msgstr "Снять" -#: pysollib/games/fan.py:279 +#: pysollib/games/fan.py:280 msgid "X" msgstr "Х" -#: pysollib/games/fortythieves.py:429 pysollib/games/klondike.py:148 -msgid "Row. Build down in any suit but the same." -msgstr "" +#: pysollib/games/golf.py:114 pysollib/games/golf.py:300 +#: pysollib/stack.py:1898 +msgid "Tableau. No building." +msgstr "Игровой стол. Без выкладывания." -#: pysollib/games/golf.py:114 pysollib/games/golf.py:414 -#: pysollib/stack.py:1742 -msgid "Row. No building." -msgstr "" - -#: pysollib/games/golf.py:382 -msgid "Balance $%4d" -msgstr "Баланс $%4d" - -#: pysollib/games/golf.py:498 pysollib/stack.py:1675 +#: pysollib/games/golf.py:384 pysollib/stack.py:1831 msgid "Foundation. Build up regardless of suit." -msgstr "" +msgstr "Базовая ячейка. Складывать по возрастанию не считаясь с мастью." #: pysollib/games/klondike.py:115 msgid "Balance $%d" msgstr "Баланс $%d" -#: pysollib/games/klondike.py:388 +#: pysollib/games/klondike.py:419 msgid "Reserve. Only Kings are acceptable." -msgstr "" +msgstr "Резерв. Только для королей." -#: pysollib/games/mahjongg/mahjongg.py:294 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1508 +msgid "Round %d" +msgstr "Раунд %d" + +#: pysollib/games/mahjongg/mahjongg.py:298 msgid "" "No Free\n" "Matching\n" @@ -805,7 +815,7 @@ msgstr "" "свободных\n" "пар" -#: pysollib/games/mahjongg/mahjongg.py:295 +#: pysollib/games/mahjongg/mahjongg.py:299 msgid "" "1 Free\n" "Matching\n" @@ -815,7 +825,7 @@ msgstr "" "свободная\n" "пара" -#: pysollib/games/mahjongg/mahjongg.py:296 +#: pysollib/games/mahjongg/mahjongg.py:300 msgid "" " Free\n" "Matching\n" @@ -825,7 +835,7 @@ msgstr "" "свободных\n" "пар" -#: pysollib/games/mahjongg/mahjongg.py:297 +#: pysollib/games/mahjongg/mahjongg.py:301 msgid "" "\n" "Tiles\n" @@ -836,7 +846,7 @@ msgstr "" "удалено\n" "\n" -#: pysollib/games/mahjongg/mahjongg.py:298 +#: pysollib/games/mahjongg/mahjongg.py:302 msgid "" "\n" "Tiles\n" @@ -855,11 +865,27 @@ msgstr "Раунд %d/%d" msgid "Deal %d" msgstr "Сдача %d" -#: pysollib/games/numerica.py:184 +#: pysollib/games/numerica.py:259 pysollib/games/royalcotillion.py:841 msgid "Foundation. Build up by color." -msgstr "" +msgstr "Базовая ячейка. Складывать по возрастанию в соответствии с цветом." -#: pysollib/games/poker.py:82 +#: pysollib/games/special/memory.py:178 pysollib/games/special/poker.py:191 +msgid "Points: %d" +msgstr "Очков: %d" + +#: pysollib/games/special/memory.py:181 pysollib/games/special/poker.py:189 +msgid "" +"WON\n" +"\n" +msgstr "" +"Выигрыш\n" +"\n" + +#: pysollib/games/special/memory.py:182 pysollib/games/special/poker.py:193 +msgid "Total: %d" +msgstr "Всего: %d" + +#: pysollib/games/special/poker.py:82 msgid "" "Royal Flush\n" "Straight Flush\n" @@ -881,22 +907,6 @@ msgstr "" "Две пары\n" "Пара" -#: pysollib/games/poker.py:189 pysollib/games/special/memory.py:181 -msgid "" -"WON\n" -"\n" -msgstr "" -"Выигрыш\n" -"\n" - -#: pysollib/games/poker.py:191 pysollib/games/special/memory.py:178 -msgid "Points: %d" -msgstr "Очков: %d" - -#: pysollib/games/poker.py:193 pysollib/games/special/memory.py:182 -msgid "Total: %d" -msgstr "Всего: %d" - #: pysollib/games/special/tarock.py:222 msgid "Coin" msgstr "Монеты" @@ -920,7 +930,7 @@ msgstr "Жезлы" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1192 pysollib/util.py:80 +#: pysollib/stack.py:1288 pysollib/util.py:80 msgid "Ace" msgstr "Туз" @@ -932,15 +942,17 @@ msgstr "Паж" msgid "Valet" msgstr "Валет" -#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1190 -#: pysollib/util.py:81 -msgid "Queen" -msgstr "Королева" +#: pysollib/games/threepeaks.py:218 +msgid "Score:\tThis hand: " +msgstr "Очков: Текущая раздача: " -#: pysollib/games/special/tarock.py:224 pysollib/stack.py:1191 -#: pysollib/util.py:81 -msgid "King" -msgstr "Король" +#: pysollib/games/threepeaks.py:219 +msgid "\tThis game: " +msgstr " Эта игра: " + +#: pysollib/games/tournament.py:245 +msgid "Reserve. Build down by suit." +msgstr "Резерв. Складывать по убыванию в соответствии с мастью." #: pysollib/games/ultra/dashavatara.py:349 msgid "Boar" @@ -1134,7 +1146,7 @@ msgstr "Ирис" #: pysollib/games/ultra/hanafuda_common.py:68 msgid "Peony" -msgstr "Пеон" +msgstr "Пион" #: pysollib/games/ultra/hanafuda_common.py:69 msgid "Chrysanthemum" @@ -1152,10 +1164,6 @@ msgstr "Павловния" msgid "Willow" msgstr "Ива" -#: pysollib/games/ultra/larasgame.py:157 pysollib/stack.py:1370 -msgid "Round %d" -msgstr "Раунд %d" - #: pysollib/games/ultra/mughal.py:252 msgid "Crown" msgstr "Корона" @@ -1192,33 +1200,25 @@ msgstr "Резерв" msgid "Tan" msgstr "" -#: pysollib/games/ultra/threepeaks.py:217 -msgid "Score:\tThis hand: " -msgstr "Очков: Текущая раздача: " - -#: pysollib/games/ultra/threepeaks.py:218 -msgid "\tThis game: " -msgstr " Эта игра: " - -#: pysollib/games/yukon.py:145 +#: pysollib/games/yukon.py:139 msgid "" -"Row. Build down in any suit but the same, can move any face-up cards " +"Tableau. Build down in any suit but the same, can move any face-up cards " "regardless of sequence." -msgstr "" +msgstr "Игровой стол. Складывать по убыванию в любую масть кроме такой же, можно перемещать любую серию открытых карт." -#: pysollib/games/yukon.py:201 +#: pysollib/games/yukon.py:198 msgid "" -"Row. Build up or down by suit, can move any face-up cards regardless of " +"Tableau. Build up or down by suit, can move any face-up cards regardless of " "sequence." -msgstr "" +msgstr "Игровой стол. Складывать по возрастанию или убыванию в соответствии с мастью, можно перемещать любую серию открытых карт." -#: pysollib/games/yukon.py:218 +#: pysollib/games/yukon.py:215 msgid "" -"Row. Build up or down by alternate color, can move any face-up cards " +"Tableau. Build up or down by alternate color, can move any face-up cards " "regardless of sequence." -msgstr "" +msgstr "Игровой стол. Складывать по возрастанию или убыванию чередуя цвет, можно перемещать любую серию открытых карт." -#: pysollib/games/yukon.py:320 +#: pysollib/games/yukon.py:317 msgid "" "Club: A 2 3 4 5 6 7 8 9 T J Q K\n" "Spade: 2 4 6 8 T Q A 3 5 7 9 J K\n" @@ -1230,6 +1230,12 @@ msgstr "" "Черви: 3 6 9 Д 2 5 8 В Т 4 7 10 К\n" "Буби: 4 8 Д 3 7 В 2 6 10 Т 5 9 К" +#: pysollib/games/yukon.py:639 +msgid "" +"Tableau. Build down regardless of suit, can move any face-up cards " +"regardless of sequence." +msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью, можно перемещать любую серию открытых карт." + #: pysollib/help.py:64 msgid "A Python Solitaire Game Collection\n" msgstr "Коллекция питоновских пасьянсев\n" @@ -1324,7 +1330,7 @@ msgstr "Не найден файл помощи\n" msgid " Help" msgstr " Помощь" -#: pysollib/main.py:68 pysollib/main.py:321 +#: pysollib/main.py:68 pysollib/main.py:348 msgid " installation error" msgstr " проблема с установкой" @@ -1338,11 +1344,11 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:76 pysollib/main.py:330 pysollib/tk/menubar.py:269 +#: pysollib/main.py:76 pysollib/main.py:356 pysollib/tk/menubar.py:276 msgid "&Quit" msgstr "В&ыход" -#: pysollib/main.py:95 +#: pysollib/main.py:98 msgid "" "%s: %s\n" "try %s --help for more information" @@ -1350,9 +1356,10 @@ msgstr "" "%s: %s\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:120 +#: pysollib/main.py:135 msgid "" "Usage: %s [OPTIONS] [FILE]\n" +" -g --game=GAMENAME start game GAMENAME\n" " --fg --foreground=COLOR foreground color\n" " --bg --background=COLOR background color\n" " --fn --font=FONT default font\n" @@ -1363,6 +1370,7 @@ msgid "" " FILE - file name of a saved game\n" msgstr "" "Испльзование: %s [OPTIONS] [FILE]\n" +" -g --game=GAMENAME начинать с игры GAMENAME\n" " --fg --foreground=COLOR цвет текста\n" " --bg --background=COLOR цвет фона\n" " --fn --font=FONT шрифт по умолчанию\n" @@ -1372,7 +1380,7 @@ msgstr "" "\n" " FILE - имя файла сохраненной игры\n" -#: pysollib/main.py:133 +#: pysollib/main.py:149 msgid "" "%s: too many files\n" "try %s --help for more information" @@ -1380,15 +1388,15 @@ msgstr "" "\"%s: слишком много файлов\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:137 +#: pysollib/main.py:153 msgid "" -"%s: invalide file name\n" +"%s: invalid file name\n" "try %s --help for more information" msgstr "" "%s: неправильное имя файла\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:322 +#: pysollib/main.py:349 msgid "" "\n" "No games were found !!!\n" @@ -1399,18 +1407,18 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:408 pysollib/main.py:416 +#: pysollib/main.py:434 pysollib/main.py:442 msgid " installation problem" msgstr "" -#: pysollib/main.py:409 +#: pysollib/main.py:435 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:417 +#: pysollib/main.py:443 msgid "" "The pysolsoundserver module was not found.\n" "\n" @@ -1420,452 +1428,491 @@ msgstr "" "\n" "Звук и фоновая музыка будут недоступны" -#: pysollib/main.py:424 +#: pysollib/main.py:450 msgid "Welcome to " msgstr "Добро пожаловать в " -#: pysollib/resource.py:242 +#: pysollib/resource.py:243 msgid "French type (52 cards)" msgstr "Классические (52 карты)" -#: pysollib/resource.py:243 +#: pysollib/resource.py:244 msgid "Hanafuda type (48 cards)" msgstr "Ханафуда (48 карт)" -#: pysollib/resource.py:244 +#: pysollib/resource.py:245 msgid "Tarock type (78 cards)" msgstr "Таро (78 карт)" -#: pysollib/resource.py:245 +#: pysollib/resource.py:246 msgid "Mahjongg type (42 tiles)" msgstr "Маджонг (42 фишки)" -#: pysollib/resource.py:246 +#: pysollib/resource.py:247 msgid "Hex A Deck type (68 cards)" msgstr "Hex A Deck (68 карт)" -#: pysollib/resource.py:247 +#: pysollib/resource.py:248 msgid "Mughal Ganjifa type (96 cards)" msgstr "Мугал Ганджифа (96 карт)" -#: pysollib/resource.py:248 +#: pysollib/resource.py:249 msgid "Navagraha Ganjifa type (108 cards)" msgstr "Наваграха Ганджифа (108 карт)" -#: pysollib/resource.py:249 +#: pysollib/resource.py:250 msgid "Dashavatara Ganjifa type (120 cards)" msgstr "Дашаватара Ганджифа (120 карт)" -#: pysollib/resource.py:250 +#: pysollib/resource.py:251 msgid "Trumps only type (variable cards)" -msgstr "" +msgstr "Без мастей (переменное количество карт)" -#: pysollib/resource.py:254 +#: pysollib/resource.py:255 msgid "French" msgstr "Классические" -#: pysollib/resource.py:255 pysollib/resource.py:279 +#: pysollib/resource.py:256 pysollib/resource.py:280 msgid "Hanafuda" msgstr "Ханафуда" -#: pysollib/resource.py:256 pysollib/resource.py:295 +#: pysollib/resource.py:257 pysollib/resource.py:296 msgid "Tarock" msgstr "Таро" -#: pysollib/resource.py:257 pysollib/resource.py:282 +#: pysollib/resource.py:258 pysollib/resource.py:283 msgid "Mahjongg" msgstr "Маджонг" -#: pysollib/resource.py:258 pysollib/resource.py:280 +#: pysollib/resource.py:259 pysollib/resource.py:281 msgid "Hex A Deck" msgstr "Hex A Deck" -#: pysollib/resource.py:259 +#: pysollib/resource.py:260 msgid "Mughal Ganjifa" msgstr "Мугал Ганджифа" -#: pysollib/resource.py:260 +#: pysollib/resource.py:261 msgid "Navagraha Ganjifa" msgstr "Наваграха Ганджифа" -#: pysollib/resource.py:261 +#: pysollib/resource.py:262 msgid "Dashavatara Ganjifa" msgstr "Дашаватара Ганджифа" -#: pysollib/resource.py:262 +#: pysollib/resource.py:263 #, fuzzy msgid "Trumps only" msgstr "Козырь" -#: pysollib/resource.py:267 +#: pysollib/resource.py:268 msgid "Adult" msgstr "Для взрослых" -#: pysollib/resource.py:268 +#: pysollib/resource.py:269 msgid "Animals" msgstr "Животные" -#: pysollib/resource.py:269 +#: pysollib/resource.py:270 msgid "Anime" msgstr "Мультфильмы" -#: pysollib/resource.py:270 +#: pysollib/resource.py:271 msgid "Art" msgstr "Искусство" -#: pysollib/resource.py:271 +#: pysollib/resource.py:272 msgid "Cartoons" msgstr "Комиксы" -#: pysollib/resource.py:272 +#: pysollib/resource.py:273 msgid "Children" msgstr "Дети" -#: pysollib/resource.py:273 +#: pysollib/resource.py:274 msgid "Classic look" msgstr "Классический вид" -#: pysollib/resource.py:274 +#: pysollib/resource.py:275 msgid "Collectors" msgstr "Коллекционные" -#: pysollib/resource.py:275 +#: pysollib/resource.py:276 msgid "Computers" msgstr "Компьютеры" -#: pysollib/resource.py:276 +#: pysollib/resource.py:277 msgid "Engines" msgstr "Машины" -#: pysollib/resource.py:277 +#: pysollib/resource.py:278 msgid "Fantasy" msgstr "Фентези" -#: pysollib/resource.py:278 +#: pysollib/resource.py:279 msgid "Ganjifa" msgstr "Ганджифа" -#: pysollib/resource.py:281 +#: pysollib/resource.py:282 msgid "Holiday" msgstr "Праздники" -#: pysollib/resource.py:283 +#: pysollib/resource.py:284 msgid "Movies" msgstr "Фильмы" -#: pysollib/resource.py:284 +#: pysollib/resource.py:285 msgid "Matrix" msgstr "Мозаика" -#: pysollib/resource.py:285 +#: pysollib/resource.py:286 msgid "Music" msgstr "Музыка" -#: pysollib/resource.py:286 +#: pysollib/resource.py:287 msgid "Nature" msgstr "Природа" -#: pysollib/resource.py:287 +#: pysollib/resource.py:288 msgid "Operating Systems" msgstr "Операционные системы" -#: pysollib/resource.py:288 +#: pysollib/resource.py:289 msgid "People" msgstr "Люди" -#: pysollib/resource.py:289 +#: pysollib/resource.py:290 msgid "Places" msgstr "Дома" -#: pysollib/resource.py:290 +#: pysollib/resource.py:291 msgid "Plain" msgstr "Простые" -#: pysollib/resource.py:291 +#: pysollib/resource.py:292 msgid "Products" msgstr "Продукты" -#: pysollib/resource.py:292 +#: pysollib/resource.py:293 msgid "Round cardsets" msgstr "Закруглённые" -#: pysollib/resource.py:293 +#: pysollib/resource.py:294 msgid "Science Fiction" msgstr "Научная фантастика" -#: pysollib/resource.py:294 +#: pysollib/resource.py:295 msgid "Sports" msgstr "Спорт" -#: pysollib/resource.py:296 +#: pysollib/resource.py:297 msgid "Vehicels" msgstr "Транспортные средства" -#: pysollib/resource.py:297 +#: pysollib/resource.py:298 msgid "Video Games" msgstr "Видеоигры" -#: pysollib/resource.py:302 +#: pysollib/resource.py:303 msgid "Australia" msgstr "Австралия" -#: pysollib/resource.py:303 +#: pysollib/resource.py:304 msgid "Austria" msgstr "Австрия" -#: pysollib/resource.py:304 +#: pysollib/resource.py:305 msgid "Belgium" msgstr "Бельгия" -#: pysollib/resource.py:305 +#: pysollib/resource.py:306 msgid "Canada" msgstr "Канада" -#: pysollib/resource.py:306 +#: pysollib/resource.py:307 msgid "China" msgstr "Китай" -#: pysollib/resource.py:307 +#: pysollib/resource.py:308 msgid "Czech Republic" msgstr "Чехия" -#: pysollib/resource.py:308 +#: pysollib/resource.py:309 msgid "Denmark" msgstr "Дания" -#: pysollib/resource.py:309 +#: pysollib/resource.py:310 msgid "England" msgstr "Англия" -#: pysollib/resource.py:310 +#: pysollib/resource.py:311 msgid "France" msgstr "Франция" -#: pysollib/resource.py:311 +#: pysollib/resource.py:312 msgid "Germany" msgstr "Германия" -#: pysollib/resource.py:312 +#: pysollib/resource.py:313 msgid "Great Britain" msgstr "Великобритания" -#: pysollib/resource.py:313 +#: pysollib/resource.py:314 msgid "Hungary" msgstr "Венгрия" -#: pysollib/resource.py:314 +#: pysollib/resource.py:315 msgid "India" msgstr "Индия" -#: pysollib/resource.py:315 +#: pysollib/resource.py:316 msgid "Italy" msgstr "Италия" -#: pysollib/resource.py:316 +#: pysollib/resource.py:317 msgid "Japan" msgstr "Япония" -#: pysollib/resource.py:317 +#: pysollib/resource.py:318 msgid "Netherlands" msgstr "Голландия" -#: pysollib/resource.py:318 +#: pysollib/resource.py:319 msgid "Russia" msgstr "Россия" -#: pysollib/resource.py:319 +#: pysollib/resource.py:320 msgid "Spain" msgstr "Испания" -#: pysollib/resource.py:320 +#: pysollib/resource.py:321 msgid "Sweden" msgstr "Швеция" -#: pysollib/resource.py:321 +#: pysollib/resource.py:322 msgid "Switzerland" msgstr "Швейцария" -#: pysollib/resource.py:322 +#: pysollib/resource.py:323 msgid "USA" msgstr "США" -#: pysollib/settings.py:58 +#: pysollib/settings.py:47 msgid "Top 10" msgstr "Top 10" -#: pysollib/stack.py:1186 +#: pysollib/stack.py:1282 msgid "Base card - %s." -msgstr "" +msgstr "Базовая карта - %s." -#: pysollib/stack.py:1187 +#: pysollib/stack.py:1283 msgid "Empty row cannot be filled." -msgstr "" +msgstr "Пустой ряд не заполняется." -#: pysollib/stack.py:1188 +#: pysollib/stack.py:1284 msgid "any card" -msgstr "" +msgstr "любая сарта" -#: pysollib/stack.py:1189 pysollib/util.py:81 +#: pysollib/stack.py:1285 pysollib/util.py:81 msgid "Jack" msgstr "Валет" -#: pysollib/stack.py:1198 +#: pysollib/stack.py:1298 msgid "No cards" msgstr "Нет карт" -#: pysollib/stack.py:1199 +#: pysollib/stack.py:1299 msgid "1 card" msgstr "1 карта" -#: pysollib/stack.py:1200 +#: pysollib/stack.py:1300 msgid " cards" msgstr " карт" -#: pysollib/stack.py:1379 pysollib/stack.py:1381 pysollib/stack.py:1412 +#: pysollib/stack.py:1517 pysollib/stack.py:1519 pysollib/stack.py:1550 msgid "Redeal" msgstr "Сдать" -#: pysollib/stack.py:1381 +#: pysollib/stack.py:1519 msgid "Stop" msgstr "Стоп" -#: pysollib/stack.py:1432 +#: pysollib/stack.py:1570 msgid "Variable redeals." msgstr "Переменное количество пересдач." -#: pysollib/stack.py:1433 +#: pysollib/stack.py:1571 msgid "Unlimited redeals." msgstr "Неограниченное количество пересдач." -#: pysollib/stack.py:1434 +#: pysollib/stack.py:1572 msgid "No redeals." msgstr "Без пересдачи." -#: pysollib/stack.py:1435 +#: pysollib/stack.py:1573 msgid "One redeal." msgstr "1 пересдача." -#: pysollib/stack.py:1436 +#: pysollib/stack.py:1574 msgid " redeals." msgstr " пересдачи." -#: pysollib/stack.py:1438 +#: pysollib/stack.py:1576 msgid "Talon." -msgstr "" +msgstr "Колода." -#: pysollib/stack.py:1613 pysollib/stack.py:2037 +#: pysollib/stack.py:1762 pysollib/stack.py:2212 msgid "Reserve. No building." -msgstr "" +msgstr "Резерв. Без выкладывания." -#: pysollib/stack.py:1659 +#: pysollib/stack.py:1799 +msgid "Foundation." +msgstr "Базовая ячейка" + +#: pysollib/stack.py:1815 msgid "Foundation. Build up by suit." -msgstr "" +msgstr "Базовая ячейка. Складывать по возрастанию в соответствии с мастью." -#: pysollib/stack.py:1660 +#: pysollib/stack.py:1816 msgid "Foundation. Build down by suit." -msgstr "" +msgstr "Базовая ячейка. Складывать по убыванию в соответствии с мастью." -#: pysollib/stack.py:1661 pysollib/stack.py:1677 pysollib/stack.py:1699 +#: pysollib/stack.py:1817 pysollib/stack.py:1833 pysollib/stack.py:1855 msgid "Foundation. Build by same rank." -msgstr "" +msgstr "Базовая ячейка. Складывать в соответствии с достоинством." -#: pysollib/stack.py:1676 +#: pysollib/stack.py:1832 msgid "Foundation. Build down regardless of suit." -msgstr "" +msgstr "Базовая ячейка. Складывать не считаясь с мастью." -#: pysollib/stack.py:1697 +#: pysollib/stack.py:1853 msgid "Foundation. Build up by alternate color." -msgstr "" +msgstr "Базовая ячейка. Складывать по возрастанию чередуя цвет." -#: pysollib/stack.py:1698 +#: pysollib/stack.py:1854 msgid "Foundation. Build down by alternate color." -msgstr "" +msgstr "Базовая ячейка. Складывать по убыванию чередуя цвет." -#: pysollib/stack.py:1772 -msgid "Row. Build up by alternate color." -msgstr "" - -#: pysollib/stack.py:1773 -msgid "Row. Build down by alternate color." -msgstr "" - -#: pysollib/stack.py:1774 pysollib/stack.py:1784 pysollib/stack.py:1793 -#: pysollib/stack.py:1802 pysollib/stack.py:1830 -msgid "Row. Build by same rank." -msgstr "" - -#: pysollib/stack.py:1782 -msgid "Row. Build up by color." -msgstr "" - -#: pysollib/stack.py:1783 -msgid "Row. Build down by color." -msgstr "" - -#: pysollib/stack.py:1791 -msgid "Row. Build up by suit." -msgstr "" - -#: pysollib/stack.py:1792 -msgid "Row. Build down by suit." -msgstr "" - -#: pysollib/stack.py:1800 pysollib/stack.py:1828 -msgid "Row. Build up regardless of suit." -msgstr "" - -#: pysollib/stack.py:1801 pysollib/stack.py:1829 -msgid "Row. Build down regardless of suit." -msgstr "" - -#: pysollib/stack.py:1851 -msgid "" -"Row. Build up by alternate color, can move any face-up cards regardless of " -"sequence." -msgstr "" - -#: pysollib/stack.py:1852 -msgid "" -"Row. Build down by alternate color, can move any face-up cards regardless of " -"sequence." -msgstr "" - -#: pysollib/stack.py:1853 pysollib/stack.py:1864 -msgid "" -"Row. Build by same rank, can move any face-up cards regardless of sequence." -msgstr "" - -#: pysollib/stack.py:1862 -msgid "" -"Row. Build up by suit, can move any face-up cards regardless of sequence." -msgstr "" - -#: pysollib/stack.py:1863 -msgid "" -"Row. Build down by suit, can move any face-up cards regardless of sequence." -msgstr "" - -#: pysollib/stack.py:1896 -msgid "Row. Build up or down by color." -msgstr "" - -#: pysollib/stack.py:1907 -msgid "Row. Build up or down by alternate color." -msgstr "" - -#: pysollib/stack.py:1918 -msgid "Row. Build up or down by suit." -msgstr "" +#: pysollib/stack.py:1928 +msgid "Tableau. Build up by alternate color." +msgstr "Игровой стол. Складывать по возрастанию чередуя цвет." #: pysollib/stack.py:1929 -msgid "Row. Build up or down regardless of suit." -msgstr "" +msgid "Tableau. Build down by alternate color." +msgstr "Игровой стол. Складывать по убыванию чередуя цвет." -#: pysollib/stack.py:1940 +#: pysollib/stack.py:1930 pysollib/stack.py:1940 pysollib/stack.py:1949 +#: pysollib/stack.py:1958 pysollib/stack.py:1968 pysollib/stack.py:1991 +#: pysollib/stack.py:2001 +msgid "Tableau. Build by same rank." +msgstr "Игровой стол. Складывать в соответствии с достоинством." + +#: pysollib/stack.py:1938 +msgid "Tableau. Build up by color." +msgstr "Игровой стол. Складывать по возрастанию в соответствии с цветом." + +#: pysollib/stack.py:1939 +msgid "Tableau. Build down by color." +msgstr "Игровой стол. Складывать по убыванию в соответствии с цветом." + +#: pysollib/stack.py:1947 +msgid "Tableau. Build up by suit." +msgstr "Игровой стол. Складывать по возрастанию в соответствии с мастью." + +#: pysollib/stack.py:1948 +msgid "Tableau. Build down by suit." +msgstr "Игровой стол. Складывать по убыванию в соответствии с мастью." + +#: pysollib/stack.py:1956 +msgid "Tableau. Build up regardless of suit." +msgstr "Игровой стол. Складывать по возрастанию не считаясь с мастью." + +#: pysollib/stack.py:1957 +msgid "Tableau. Build down regardless of suit." +msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью." + +#: pysollib/stack.py:1966 +msgid "Tableau. Build up in any suit but the same." +msgstr "Игровой стол. Складывать по возрастанию в любую масть кроме такой же." + +#: pysollib/stack.py:1967 +msgid "Tableau. Build down in any suit but the same." +msgstr "Игровой стол. Складывать по убыванию в любую масть кроме такой же." + +#: pysollib/stack.py:1989 +msgid "" +"Tableau. Build up regardless of suit. Sequences of cards in alternate color " +"can be moved as a unit." +msgstr "Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно перемещать серии карт чередующихся цветом." + +#: pysollib/stack.py:1990 +msgid "" +"Tableau. Build down regardless of suit. Sequences of cards in alternate " +"color can be moved as a unit." +msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать серии карт чередующихся цветом." + +#: pysollib/stack.py:1999 +msgid "" +"Tableau. Build up regardless of suit. Sequences of cards in the same suit " +"can be moved as a unit." +msgstr "Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно перемещать серии карт одинаковой масти." + +#: pysollib/stack.py:2000 +msgid "" +"Tableau. Build down regardless of suit. Sequences of cards in the same suit " +"can be moved as a unit." +msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать серии карт одинаковой масти." + +#: pysollib/stack.py:2022 +msgid "" +"Tableau. Build up by alternate color, can move any face-up cards regardless " +"of sequence." +msgstr "Игровой стол. Складывать по возрастанию чередуя цвет, можно перемещать любую серию открытых карт." + +#: pysollib/stack.py:2023 +msgid "" +"Tableau. Build down by alternate color, can move any face-up cards " +"regardless of sequence." +msgstr "Игровой стол. Складывать по убыванию чередуя цвет, можно перемещать любую серию открытых карт." + +#: pysollib/stack.py:2024 pysollib/stack.py:2037 +msgid "" +"Tableau. Build by same rank, can move any face-up cards regardless of " +"sequence." +msgstr "Игровой стол. Складывать в соответствии с достоинством, можно перемещать любую серию открытых карт." + +#: pysollib/stack.py:2035 +msgid "" +"Tableau. Build up by suit, can move any face-up cards regardless of sequence." +msgstr "Игровой стол. Складывать по возрастанию в соответствии с мастью, можно перемещать любую серию открытых карт." + +#: pysollib/stack.py:2036 +msgid "" +"Tableau. Build down by suit, can move any face-up cards regardless of " +"sequence." +msgstr "Игровой стол. Складывать по убыванию в соответствии с мастью, можно перемещать любую серию открытых карт." + +#: pysollib/stack.py:2069 +msgid "Tableau. Build up or down by color." +msgstr "Игровой стол. Складывать по возрастанию или убыванию в соответствии с цветом." + +#: pysollib/stack.py:2080 +msgid "Tableau. Build up or down by alternate color." +msgstr "Игровой стол. Складывать по возрастанию или убыванию чередуя цвет." + +#: pysollib/stack.py:2091 +msgid "Tableau. Build up or down by suit." +msgstr "Игровой стол. Складывать по возрастанию или убыванию в соответствии с мастью." + +#: pysollib/stack.py:2102 +msgid "Tableau. Build up or down regardless of suit." +msgstr "Игровой стол. Складывать по возрастанию или убыванию не считаясь с мастью." + +#: pysollib/stack.py:2113 msgid "Waste." -msgstr "" +msgstr "Сброс." -#: pysollib/stack.py:2038 +#: pysollib/stack.py:2213 msgid "Free cell." msgstr "Свободная ячейка." @@ -1885,7 +1932,7 @@ msgstr "Выиграл" msgid "Lost" msgstr "Проиграл" -#: pysollib/stats.py:122 pysollib/tk/statusbar.py:135 +#: pysollib/stats.py:122 pysollib/tk/statusbar.py:157 msgid "Playing time" msgstr "Время игры" @@ -1909,7 +1956,7 @@ msgstr "Игра" msgid "Status" msgstr "Статус" -#: pysollib/stats.py:162 pysollib/tk/statusbar.py:137 +#: pysollib/stats.py:162 pysollib/tk/statusbar.py:159 #: pysollib/tk/tkstats.py:735 msgid "Game number" msgstr "Номер игры" @@ -1942,8 +1989,8 @@ msgstr "Великолепная" msgid "Text foreground:" msgstr "Цвет текста:" -#: pysollib/tk/colorsdialog.py:79 pysollib/tk/colorsdialog.py:97 -#: pysollib/tk/fontsdialog.py:185 +#: pysollib/tk/colorsdialog.py:79 pysollib/tk/colorsdialog.py:98 +#: pysollib/tk/fontsdialog.py:186 msgid "Change..." msgstr "Изменить..." @@ -1975,10 +2022,14 @@ msgstr "Стрелка подсказки:" msgid "Highlight not matching:" msgstr "Подсветка отсутствия совпадения:" -#: pysollib/tk/colorsdialog.py:123 +#: pysollib/tk/colorsdialog.py:124 msgid "Select color" msgstr "Выбрать цвет" +#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:329 +msgid "Find card" +msgstr "Найти карту" + #: pysollib/tk/fontsdialog.py:85 msgid "abcdefghABCDEFGH" msgstr "abcdeABCDE абвгдАБВГД" @@ -1987,11 +2038,39 @@ msgstr "abcdeABCDE абвгдАБВГД" msgid "Bold" msgstr "Жирный" -#: pysollib/tk/fontsdialog.py:97 +#: pysollib/tk/fontsdialog.py:98 msgid "Italic" msgstr "Наклонный" -#: pysollib/tk/fontsdialog.py:195 +#: pysollib/tk/fontsdialog.py:168 +msgid "HTML: " +msgstr "HTML: " + +#: pysollib/tk/fontsdialog.py:169 +msgid "Small: " +msgstr "Маленький: " + +#: pysollib/tk/fontsdialog.py:170 +msgid "Fixed: " +msgstr "Моноширинный: " + +#: pysollib/tk/fontsdialog.py:171 +msgid "Tableau default: " +msgstr "Игровой стол по умолчанию: " + +#: pysollib/tk/fontsdialog.py:172 +msgid "Tableau fixed: " +msgstr "Игровой стол моноширинный: " + +#: pysollib/tk/fontsdialog.py:173 +msgid "Tableau large: " +msgstr "Игровой стол большой: " + +#: pysollib/tk/fontsdialog.py:174 +msgid "Tableau small: " +msgstr "Игровой стол маленький: " + +#: pysollib/tk/fontsdialog.py:196 msgid "Select font" msgstr "Выбрать шрифт" @@ -2047,416 +2126,428 @@ msgstr "Большие пиктограммы" msgid "Customize toolbar" msgstr "Настроить панель инструментов" -#: pysollib/tk/menubar.py:249 +#: pysollib/tk/menubar.py:256 msgid "&File" msgstr "&Файл" -#: pysollib/tk/menubar.py:251 +#: pysollib/tk/menubar.py:258 msgid "R&ecent games" msgstr "Выбрать н&едавнюю игру" -#: pysollib/tk/menubar.py:253 +#: pysollib/tk/menubar.py:260 msgid "Select &random game" msgstr "С&лучайная игра" -#: pysollib/tk/menubar.py:254 +#: pysollib/tk/menubar.py:261 msgid "&All games" msgstr "&Все игры" -#: pysollib/tk/menubar.py:255 +#: pysollib/tk/menubar.py:262 msgid "Games played and &won" msgstr "&Выигранные игры" -#: pysollib/tk/menubar.py:256 +#: pysollib/tk/menubar.py:263 msgid "Games played and ¬ won" msgstr "&Невыигранные игры" -#: pysollib/tk/menubar.py:257 +#: pysollib/tk/menubar.py:264 msgid "Games not &played" msgstr "Не&сыгранные игры" -#: pysollib/tk/menubar.py:258 +#: pysollib/tk/menubar.py:265 msgid "Select game by nu&mber..." msgstr "Выбрать игру по &номеру..." -#: pysollib/tk/menubar.py:260 +#: pysollib/tk/menubar.py:267 msgid "Fa&vorite games" msgstr "&Избранные игры" -#: pysollib/tk/menubar.py:261 +#: pysollib/tk/menubar.py:268 msgid "A&dd to favorites" msgstr "&Добавить в избранное" -#: pysollib/tk/menubar.py:262 +#: pysollib/tk/menubar.py:269 msgid "R&emove from favorites" msgstr "&Удалить из избранных" -#: pysollib/tk/menubar.py:264 +#: pysollib/tk/menubar.py:271 msgid "&Open..." msgstr "&Открыть..." -#: pysollib/tk/menubar.py:265 +#: pysollib/tk/menubar.py:272 msgid "&Save" msgstr "&Сохранить" -#: pysollib/tk/menubar.py:266 +#: pysollib/tk/menubar.py:273 msgid "Save &as..." msgstr "Сохранить &как..." -#: pysollib/tk/menubar.py:268 +#: pysollib/tk/menubar.py:275 msgid "&Hold and quit" msgstr "Со&храниться и выйти" -#: pysollib/tk/menubar.py:271 pysollib/tk/selectgame.py:417 +#: pysollib/tk/menubar.py:280 pysollib/tk/selectgame.py:407 msgid "&Select" msgstr "&Выбрать" -#: pysollib/tk/menubar.py:274 +#: pysollib/tk/menubar.py:285 msgid "&Edit" msgstr "Р&едактировать" -#: pysollib/tk/menubar.py:275 +#: pysollib/tk/menubar.py:286 msgid "&Undo" msgstr "&Отмена" -#: pysollib/tk/menubar.py:276 +#: pysollib/tk/menubar.py:287 msgid "&Redo" msgstr "&Повтор" -#: pysollib/tk/menubar.py:277 +#: pysollib/tk/menubar.py:288 msgid "Redo &all" msgstr "Вернуть все" -#: pysollib/tk/menubar.py:280 +#: pysollib/tk/menubar.py:291 msgid "&Set bookmark" msgstr "Установить &закладку" -#: pysollib/tk/menubar.py:282 pysollib/tk/menubar.py:286 +#: pysollib/tk/menubar.py:293 pysollib/tk/menubar.py:297 msgid "Bookmark %d" msgstr "Закладка %d" -#: pysollib/tk/menubar.py:284 +#: pysollib/tk/menubar.py:295 msgid "Go&to bookmark" msgstr "&Перейти к закладке" -#: pysollib/tk/menubar.py:289 +#: pysollib/tk/menubar.py:300 msgid "&Clear bookmarks" msgstr "О&чистить закладки" -#: pysollib/tk/menubar.py:292 +#: pysollib/tk/menubar.py:303 msgid "Restart &game" msgstr "&Начать с начала" -#: pysollib/tk/menubar.py:294 +#: pysollib/tk/menubar.py:305 msgid "&Game" msgstr "&Игра" -#: pysollib/tk/menubar.py:295 +#: pysollib/tk/menubar.py:306 msgid "&Deal cards" msgstr "&Сдать карты" -#: pysollib/tk/menubar.py:296 pysollib/tk/menubar.py:325 +#: pysollib/tk/menubar.py:307 pysollib/tk/menubar.py:342 msgid "&Auto drop" msgstr "С&бросить карты" -#: pysollib/tk/menubar.py:297 +#: pysollib/tk/menubar.py:308 msgid "&Pause" msgstr "&Пауза" -#: pysollib/tk/menubar.py:300 +#: pysollib/tk/menubar.py:311 msgid "S&tatus..." msgstr "С&татус" -#: pysollib/tk/menubar.py:301 +#: pysollib/tk/menubar.py:312 msgid "&Comments..." msgstr "&Комментарии..." -#: pysollib/tk/menubar.py:303 +#: pysollib/tk/menubar.py:314 msgid "&Statistics" msgstr "Ст&атистика" -#: pysollib/tk/menubar.py:304 pysollib/tk/menubar.py:312 +#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 msgid "Current game..." msgstr "Текущая игра..." -#: pysollib/tk/menubar.py:305 pysollib/tk/menubar.py:313 +#: pysollib/tk/menubar.py:316 pysollib/tk/menubar.py:324 msgid "All games..." msgstr "Все игры..." -#: pysollib/tk/menubar.py:307 +#: pysollib/tk/menubar.py:318 msgid "Session log..." msgstr "Лог сессии..." -#: pysollib/tk/menubar.py:308 +#: pysollib/tk/menubar.py:319 msgid "Full log..." msgstr "Полный лог..." -#: pysollib/tk/menubar.py:311 +#: pysollib/tk/menubar.py:322 msgid "D&emo statistics" msgstr "Статистика демо" -#: pysollib/tk/menubar.py:315 +#: pysollib/tk/menubar.py:326 msgid "&Assist" msgstr "&Подсказка" -#: pysollib/tk/menubar.py:316 +#: pysollib/tk/menubar.py:327 msgid "&Hint" msgstr "Подсказать &ход" -#: pysollib/tk/menubar.py:317 +#: pysollib/tk/menubar.py:328 msgid "Highlight p&iles" msgstr "П&оказать группы" -#: pysollib/tk/menubar.py:319 +#: pysollib/tk/menubar.py:331 msgid "&Demo" msgstr "&Демо" -#: pysollib/tk/menubar.py:320 +#: pysollib/tk/menubar.py:332 msgid "Demo (&all games)" msgstr "Демо (&все игры)" -#: pysollib/tk/menubar.py:321 +#: pysollib/tk/menubar.py:334 +msgid "Piles description" +msgstr "Описания ячеек" + +#: pysollib/tk/menubar.py:338 msgid "&Options" msgstr "&Настройка" -#: pysollib/tk/menubar.py:322 +#: pysollib/tk/menubar.py:339 msgid "&Player options..." msgstr "Настройки &игрока..." -#: pysollib/tk/menubar.py:323 +#: pysollib/tk/menubar.py:340 msgid "&Automatic play" msgstr "Настройки &автоматической игры" -#: pysollib/tk/menubar.py:324 +#: pysollib/tk/menubar.py:341 msgid "Auto &face up" msgstr "Автоматически переворачивать" -#: pysollib/tk/menubar.py:326 +#: pysollib/tk/menubar.py:343 msgid "Auto &deal" msgstr "Автоматически &сдавать карты" -#: pysollib/tk/menubar.py:328 +#: pysollib/tk/menubar.py:345 msgid "&Quick play" msgstr "&Быстрая игра" -#: pysollib/tk/menubar.py:329 +#: pysollib/tk/menubar.py:346 msgid "Assist &level" msgstr "&Уровень подсказки" -#: pysollib/tk/menubar.py:330 +#: pysollib/tk/menubar.py:347 msgid "Enable &undo" msgstr "Разрешить &возврат хода" -#: pysollib/tk/menubar.py:331 +#: pysollib/tk/menubar.py:348 msgid "Enable &bookmarks" msgstr "Разрешить &закладки" -#: pysollib/tk/menubar.py:332 +#: pysollib/tk/menubar.py:349 msgid "Enable &hint" msgstr "Разрешить &подсказки" -#: pysollib/tk/menubar.py:333 +#: pysollib/tk/menubar.py:350 msgid "Enable highlight p&iles" msgstr "Разрешить показывать к&учи" -#: pysollib/tk/menubar.py:334 +#: pysollib/tk/menubar.py:351 msgid "Enable highlight &cards" msgstr "Разрешить показывать &карты" -#: pysollib/tk/menubar.py:335 +#: pysollib/tk/menubar.py:352 msgid "Enable highlight same &rank" msgstr "Разрешить показывать карты &одного достоинства" -#: pysollib/tk/menubar.py:336 +#: pysollib/tk/menubar.py:353 msgid "Highlight &no matching" msgstr "Подсветка отсутствия &совпадения:" -#: pysollib/tk/menubar.py:338 -msgid "Show removed tiles (in Mahjongg games)" +#: pysollib/tk/menubar.py:355 +msgid "&Show removed tiles (in Mahjongg games)" msgstr "Показывать удаленные (в Маджонг)" -#: pysollib/tk/menubar.py:339 -msgid "Show hint arrow (in Shisen-Sho games)" +#: pysollib/tk/menubar.py:356 +msgid "Show hint &arrow (in Shisen-Sho games)" msgstr "Показывать стрелку (в Шисен-Сё)" -#: pysollib/tk/menubar.py:341 +#: pysollib/tk/menubar.py:358 msgid "&Sound..." msgstr "&Звук..." -#: pysollib/tk/menubar.py:349 +#: pysollib/tk/menubar.py:366 msgid "Cards&et..." msgstr "Коло&да..." -#: pysollib/tk/menubar.py:350 +#: pysollib/tk/menubar.py:367 msgid "Table t&ile..." msgstr "Игровой &стол..." -#: pysollib/tk/menubar.py:352 +#: pysollib/tk/menubar.py:369 msgid "Card &background" msgstr "&Рубашка карты" -#: pysollib/tk/menubar.py:353 +#: pysollib/tk/menubar.py:370 msgid "Card &view" msgstr "&Вид карты" -#: pysollib/tk/menubar.py:354 +#: pysollib/tk/menubar.py:371 msgid "Card shado&w" msgstr "Тень карты" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:372 msgid "Shade &legal moves" msgstr "Подсвечивать &разрешенные ходы" -#: pysollib/tk/menubar.py:356 +#: pysollib/tk/menubar.py:373 msgid "&Negative cards bottom" msgstr "&Негативные контуры карты" -#: pysollib/tk/menubar.py:357 +#: pysollib/tk/menubar.py:374 +msgid "Shade &filled stacks" +msgstr "Затемнять заполненные ячейки" + +#: pysollib/tk/menubar.py:375 msgid "A&nimations" msgstr "Анимаци&я" -#: pysollib/tk/menubar.py:358 +#: pysollib/tk/menubar.py:376 msgid "&None" msgstr "&Нет" -#: pysollib/tk/menubar.py:359 +#: pysollib/tk/menubar.py:377 msgid "&Timer based" msgstr "Базирующаяся на &таймере" -#: pysollib/tk/menubar.py:360 +#: pysollib/tk/menubar.py:378 msgid "&Fast" msgstr "&Быстрая" -#: pysollib/tk/menubar.py:361 +#: pysollib/tk/menubar.py:379 msgid "&Slow" msgstr "&Медленная" -#: pysollib/tk/menubar.py:362 +#: pysollib/tk/menubar.py:380 msgid "&Very slow" msgstr "&Очень медленная" -#: pysollib/tk/menubar.py:363 +#: pysollib/tk/menubar.py:381 msgid "Stick&y mouse" msgstr "&Липкая мышь" -#: pysollib/tk/menubar.py:365 +#: pysollib/tk/menubar.py:382 +msgid "Use mouse for undo/redo" +msgstr "Использовать мышь для вперед/назад" + +#: pysollib/tk/menubar.py:384 msgid "&Fonts..." msgstr "&Шрифты..." -#: pysollib/tk/menubar.py:366 +#: pysollib/tk/menubar.py:385 msgid "&Colors..." msgstr "&Цвета..." -#: pysollib/tk/menubar.py:367 +#: pysollib/tk/menubar.py:386 msgid "Time&outs..." msgstr "Тайма&уты..." -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:388 msgid "&Toolbar" msgstr "Панель и&нструментов" -#: pysollib/tk/menubar.py:371 +#: pysollib/tk/menubar.py:390 msgid "Stat&usbar" msgstr "Панель с&остояния" -#: pysollib/tk/menubar.py:372 +#: pysollib/tk/menubar.py:391 msgid "Show &statusbar" msgstr "Показывать панель состояния" -#: pysollib/tk/menubar.py:373 +#: pysollib/tk/menubar.py:392 msgid "Show &number of cards" msgstr "Показывать количество карт" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:393 msgid "Show &help bar" msgstr "Показывать панель помощи" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:394 msgid "Save games &geometry" msgstr "Сохранение &геометрии игры" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:395 msgid "&Demo logo" msgstr "Д&емо лого" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:396 msgid "Startup splash sc&reen" msgstr "О&кно запуска" -#: pysollib/tk/menubar.py:381 +#: pysollib/tk/menubar.py:402 msgid "&Help" msgstr "&Помощь" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:403 msgid "&Contents" msgstr "&Содержание" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:404 msgid "&How to play" msgstr "Как &играть" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:405 msgid "&Rules for this game" msgstr "&Правила текущей игры" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:406 msgid "&License terms" msgstr "&Лицензия" -#: pysollib/tk/menubar.py:388 +#: pysollib/tk/menubar.py:409 msgid "&About " msgstr "&О программе " -#: pysollib/tk/menubar.py:496 +#: pysollib/tk/menubar.py:521 msgid "All &games..." msgstr "&Все игры..." -#: pysollib/tk/menubar.py:497 +#: pysollib/tk/menubar.py:523 msgid "Playable pre&view..." msgstr "Играемый &предпросмотр..." -#: pysollib/tk/menubar.py:499 -msgid "&Popular games" -msgstr "&Популярные игры" - -#: pysollib/tk/menubar.py:502 -msgid "&French games" -msgstr "&Классические игры" - -#: pysollib/tk/menubar.py:505 +#: pysollib/tk/menubar.py:572 msgid "&Mahjongg games" msgstr "Игры маджонг" -#: pysollib/tk/menubar.py:508 +#: pysollib/tk/menubar.py:610 +msgid "&Popular games" +msgstr "&Популярные игры" + +#: pysollib/tk/menubar.py:618 +msgid "&French games" +msgstr "&Классические игры" + +#: pysollib/tk/menubar.py:625 msgid "&Oriental games" msgstr "&Восточные игры" -#: pysollib/tk/menubar.py:512 +#: pysollib/tk/menubar.py:633 msgid "&Special games" msgstr "&Особые игры" -#: pysollib/tk/menubar.py:516 +#: pysollib/tk/menubar.py:639 msgid "All games by name" msgstr "Все игры по имени" -#: pysollib/tk/menubar.py:849 pysollib/tk/menubar.py:851 +#: pysollib/tk/menubar.py:893 pysollib/tk/menubar.py:895 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "&Загрузить" -#: pysollib/tk/menubar.py:851 +#: pysollib/tk/menubar.py:895 msgid "&Info..." msgstr "&Информация..." -#: pysollib/tk/menubar.py:854 +#: pysollib/tk/menubar.py:898 msgid "Select " msgstr "Выбрать " -#: pysollib/tk/menubar.py:915 +#: pysollib/tk/menubar.py:959 msgid "Select table background" msgstr "Выбрать фоновое изображение" -#: pysollib/tk/menubar.py:927 pysollib/tk/selecttile.py:177 +#: pysollib/tk/menubar.py:971 pysollib/tk/selecttile.py:177 msgid "Select table color" msgstr "Выбрать цвет" @@ -2541,7 +2632,7 @@ msgstr "Очень большие колоды" msgid "About cardset" msgstr "О наборе карт" -#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:374 +#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:365 msgid "Type:" msgstr "Тип:" @@ -2565,253 +2656,253 @@ msgstr "Размер:" msgid "(no games)" msgstr "(нет игр)" -#: pysollib/tk/selectgame.py:118 -msgid "French games" -msgstr "Классические игры" - #: pysollib/tk/selectgame.py:121 -msgid "Oriental Games" -msgstr "Восточные игры" - -#: pysollib/tk/selectgame.py:124 -msgid "Special Games" -msgstr "Особые игры" - -#: pysollib/tk/selectgame.py:127 -msgid "Original Games" -msgstr "Оригинальные игры" - -#: pysollib/tk/selectgame.py:141 -msgid "by Compatibility" -msgstr "По совместимости с другими программами" - -#: pysollib/tk/selectgame.py:159 -msgid "New games in v." -msgstr "Новые игры в версии " - -#: pysollib/tk/selectgame.py:162 -msgid "by PySol version" -msgstr "По версии PySol" - -#: pysollib/tk/selectgame.py:169 -msgid "All Games" -msgstr "Все игры" - -#: pysollib/tk/selectgame.py:170 -msgid "Alternate Names" -msgstr "Другие имена" - -#: pysollib/tk/selectgame.py:171 -msgid "Popular Games" -msgstr "Популярные игры" - -#: pysollib/tk/selectgame.py:172 msgid "Mahjongg Games" msgstr "Игры маджонг" -#: pysollib/tk/selectgame.py:178 +#: pysollib/tk/selectgame.py:124 +msgid "French games" +msgstr "Классические игры" + +#: pysollib/tk/selectgame.py:126 +msgid "Oriental Games" +msgstr "Восточные игры" + +#: pysollib/tk/selectgame.py:128 +msgid "Special Games" +msgstr "Особые игры" + +#: pysollib/tk/selectgame.py:130 +msgid "Original Games" +msgstr "Оригинальные игры" + +#: pysollib/tk/selectgame.py:144 +msgid "by Compatibility" +msgstr "По совместимости с другими программами" + +#: pysollib/tk/selectgame.py:152 +msgid "New games in v." +msgstr "Новые игры в версии " + +#: pysollib/tk/selectgame.py:155 +msgid "by PySol version" +msgstr "По версии PySol" + +#: pysollib/tk/selectgame.py:162 +msgid "All Games" +msgstr "Все игры" + +#: pysollib/tk/selectgame.py:163 +msgid "Alternate Names" +msgstr "Другие имена" + +#: pysollib/tk/selectgame.py:164 +msgid "Popular Games" +msgstr "Популярные игры" + +#: pysollib/tk/selectgame.py:169 msgid "by Skill Level" msgstr "По уровню мастерства" -#: pysollib/tk/selectgame.py:179 pysollib/tk/selectgame.py:546 +#: pysollib/tk/selectgame.py:170 pysollib/tk/selectgame.py:542 msgid "Luck only" msgstr "Только на везение" -#: pysollib/tk/selectgame.py:180 pysollib/tk/selectgame.py:547 +#: pysollib/tk/selectgame.py:171 pysollib/tk/selectgame.py:543 msgid "Mostly luck" msgstr "В основном на везение" -#: pysollib/tk/selectgame.py:181 pysollib/tk/selectgame.py:548 +#: pysollib/tk/selectgame.py:172 pysollib/tk/selectgame.py:544 msgid "Balanced" msgstr "Сбалансированные" -#: pysollib/tk/selectgame.py:182 pysollib/tk/selectgame.py:549 +#: pysollib/tk/selectgame.py:173 pysollib/tk/selectgame.py:545 msgid "Mostly skill" msgstr "В основном на мастерство" -#: pysollib/tk/selectgame.py:183 pysollib/tk/selectgame.py:550 +#: pysollib/tk/selectgame.py:174 pysollib/tk/selectgame.py:546 msgid "Skill only" msgstr "Только на мастерство" -#: pysollib/tk/selectgame.py:185 +#: pysollib/tk/selectgame.py:176 msgid "by Game Feature" msgstr "По особенностям игры" -#: pysollib/tk/selectgame.py:186 +#: pysollib/tk/selectgame.py:177 msgid "by Number of Cards" msgstr "По количеству карт" -#: pysollib/tk/selectgame.py:187 +#: pysollib/tk/selectgame.py:178 msgid "32 cards" msgstr "32 карты" -#: pysollib/tk/selectgame.py:188 +#: pysollib/tk/selectgame.py:179 msgid "48 cards" msgstr "48 карт" -#: pysollib/tk/selectgame.py:189 +#: pysollib/tk/selectgame.py:180 msgid "52 cards" msgstr "52 карты" -#: pysollib/tk/selectgame.py:190 +#: pysollib/tk/selectgame.py:181 msgid "64 cards" msgstr "64 карты" -#: pysollib/tk/selectgame.py:191 +#: pysollib/tk/selectgame.py:182 msgid "78 cards" msgstr "78 карт" -#: pysollib/tk/selectgame.py:192 +#: pysollib/tk/selectgame.py:183 msgid "104 cards" msgstr "104 карты" -#: pysollib/tk/selectgame.py:193 +#: pysollib/tk/selectgame.py:184 msgid "144 cards" msgstr "144 карты" -#: pysollib/tk/selectgame.py:194 +#: pysollib/tk/selectgame.py:185 msgid "Other number" msgstr "Другое количество" -#: pysollib/tk/selectgame.py:196 +#: pysollib/tk/selectgame.py:187 msgid "by Number of Decks" msgstr "По количеству колод" -#: pysollib/tk/selectgame.py:197 +#: pysollib/tk/selectgame.py:188 msgid "1 deck games" msgstr "Игры с 1 колодой" -#: pysollib/tk/selectgame.py:198 +#: pysollib/tk/selectgame.py:189 msgid "2 deck games" msgstr "Игры с 2 колодами" -#: pysollib/tk/selectgame.py:199 +#: pysollib/tk/selectgame.py:190 msgid "3 deck games" msgstr "Игры с 3 колодами" -#: pysollib/tk/selectgame.py:200 +#: pysollib/tk/selectgame.py:191 msgid "4 deck games" msgstr "Игры с 4 колодами" -#: pysollib/tk/selectgame.py:202 +#: pysollib/tk/selectgame.py:193 msgid "by Number of Redeals" msgstr "По количеству пересдач" -#: pysollib/tk/selectgame.py:203 +#: pysollib/tk/selectgame.py:194 msgid "No redeal" msgstr "Без пересдачи" -#: pysollib/tk/selectgame.py:204 +#: pysollib/tk/selectgame.py:195 msgid "1 redeal" msgstr "1 пересдача" -#: pysollib/tk/selectgame.py:205 +#: pysollib/tk/selectgame.py:196 msgid "2 redeals" msgstr "2 пересдачи" -#: pysollib/tk/selectgame.py:206 +#: pysollib/tk/selectgame.py:197 msgid "3 redeals" msgstr "3 пересдачи" -#: pysollib/tk/selectgame.py:207 +#: pysollib/tk/selectgame.py:198 msgid "Unlimited redeals" msgstr "Неограниченное количество пересдач" -#: pysollib/tk/selectgame.py:209 +#: pysollib/tk/selectgame.py:200 msgid "Other number of redeals" msgstr "Другое количество пересдач" -#: pysollib/tk/selectgame.py:214 +#: pysollib/tk/selectgame.py:205 msgid "Other Categories" msgstr "Другие категории" -#: pysollib/tk/selectgame.py:215 +#: pysollib/tk/selectgame.py:206 msgid "Games for Children (very easy)" msgstr "Игры для детей (очень легкие)" -#: pysollib/tk/selectgame.py:216 +#: pysollib/tk/selectgame.py:207 msgid "Games with Scoring" msgstr "Игры со счётом" -#: pysollib/tk/selectgame.py:217 +#: pysollib/tk/selectgame.py:208 msgid "Games with Separate Decks" msgstr "Игры с раздельными колодами" -#: pysollib/tk/selectgame.py:218 +#: pysollib/tk/selectgame.py:209 msgid "Open Games (all cards visible)" msgstr "Открытые игры (все карты видны)" -#: pysollib/tk/selectgame.py:219 +#: pysollib/tk/selectgame.py:210 msgid "Relaxed Variants" msgstr "Облегченные варианты" -#: pysollib/tk/selectgame.py:358 +#: pysollib/tk/selectgame.py:349 msgid "About game" msgstr "Об игре " -#: pysollib/tk/selectgame.py:371 +#: pysollib/tk/selectgame.py:362 msgid "Name:" msgstr "Имя:" -#: pysollib/tk/selectgame.py:372 +#: pysollib/tk/selectgame.py:363 msgid "Alternate names:" msgstr "Другие имена:" -#: pysollib/tk/selectgame.py:373 +#: pysollib/tk/selectgame.py:364 msgid "Category:" msgstr "Категория:" -#: pysollib/tk/selectgame.py:375 +#: pysollib/tk/selectgame.py:366 msgid "Skill level:" msgstr "Уровень мастерства:" -#: pysollib/tk/selectgame.py:376 +#: pysollib/tk/selectgame.py:367 msgid "Decks:" msgstr "Колод:" -#: pysollib/tk/selectgame.py:377 +#: pysollib/tk/selectgame.py:368 msgid "Redeals:" msgstr "Пересдач:" -#: pysollib/tk/selectgame.py:379 +#: pysollib/tk/selectgame.py:370 msgid "Played:" msgstr "Играл:" -#: pysollib/tk/selectgame.py:380 pysollib/tk/tkstats.py:111 +#: pysollib/tk/selectgame.py:371 pysollib/tk/tkstats.py:111 #: pysollib/tk/tkstats.py:163 msgid "Won:" msgstr "Выиграл:" -#: pysollib/tk/selectgame.py:381 pysollib/tk/tkstats.py:112 +#: pysollib/tk/selectgame.py:372 pysollib/tk/tkstats.py:112 #: pysollib/tk/tkstats.py:164 msgid "Lost:" msgstr "Проиграл:" -#: pysollib/tk/selectgame.py:382 pysollib/tk/tkstats.py:805 +#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:805 msgid "Playing time:" msgstr "Игровое время:" -#: pysollib/tk/selectgame.py:383 pysollib/tk/tkstats.py:812 +#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:812 msgid "Moves:" msgstr "Ходов:" -#: pysollib/tk/selectgame.py:384 +#: pysollib/tk/selectgame.py:375 msgid "% won:" msgstr "% побед:" -#: pysollib/tk/selectgame.py:417 +#: pysollib/tk/selectgame.py:407 msgid "&Rules" msgstr "&Правила" -#: pysollib/tk/selectgame.py:497 +#: pysollib/tk/selectgame.py:487 msgid "Playable Preview - " msgstr "Играемый предпросмотр - " -#: pysollib/tk/selectgame.py:553 +#: pysollib/tk/selectgame.py:549 msgid "variable" msgstr "переменное кол-во" -#: pysollib/tk/selectgame.py:554 +#: pysollib/tk/selectgame.py:550 msgid "unlimited" msgstr "неограниченное кол-во" @@ -2843,111 +2934,107 @@ msgstr "Все фоновые изображения" msgid "&Solid color..." msgstr "М&онотонный цвет..." -#: pysollib/tk/soundoptionsdialog.py:77 +#: pysollib/tk/soundoptionsdialog.py:75 msgid "Are You Sure" msgstr "Вы уверены" -#: pysollib/tk/soundoptionsdialog.py:79 +#: pysollib/tk/soundoptionsdialog.py:77 msgid "Deal" msgstr "Сдача" -#: pysollib/tk/soundoptionsdialog.py:80 +#: pysollib/tk/soundoptionsdialog.py:78 msgid "Deal waste" msgstr "Сдача на сброс" -#: pysollib/tk/soundoptionsdialog.py:82 +#: pysollib/tk/soundoptionsdialog.py:80 msgid "Turn waste" msgstr "Переворачивание сброса" -#: pysollib/tk/soundoptionsdialog.py:83 +#: pysollib/tk/soundoptionsdialog.py:81 msgid "Start drag" msgstr "Начало перемещения" -#: pysollib/tk/soundoptionsdialog.py:85 +#: pysollib/tk/soundoptionsdialog.py:83 msgid "Drop" msgstr "Сброс карты" -#: pysollib/tk/soundoptionsdialog.py:86 +#: pysollib/tk/soundoptionsdialog.py:84 msgid "Drop pair" msgstr "Сброс двух карт" -#: pysollib/tk/soundoptionsdialog.py:87 +#: pysollib/tk/soundoptionsdialog.py:85 msgid "Auto drop" msgstr "Автосброс карты" -#: pysollib/tk/soundoptionsdialog.py:89 +#: pysollib/tk/soundoptionsdialog.py:87 msgid "Flip" msgstr "Переворачивание" -#: pysollib/tk/soundoptionsdialog.py:90 +#: pysollib/tk/soundoptionsdialog.py:88 msgid "Auto flip" msgstr "Автоматическое переворачивание" -#: pysollib/tk/soundoptionsdialog.py:91 +#: pysollib/tk/soundoptionsdialog.py:89 msgid "Move" msgstr "Перемещение" -#: pysollib/tk/soundoptionsdialog.py:92 +#: pysollib/tk/soundoptionsdialog.py:90 msgid "No move" msgstr "Без пермещения" -#: pysollib/tk/soundoptionsdialog.py:94 pysollib/tk/toolbar.py:189 +#: pysollib/tk/soundoptionsdialog.py:92 pysollib/tk/toolbar.py:203 msgid "Undo" msgstr "Отмена" -#: pysollib/tk/soundoptionsdialog.py:95 pysollib/tk/toolbar.py:190 +#: pysollib/tk/soundoptionsdialog.py:93 pysollib/tk/toolbar.py:204 msgid "Redo" msgstr "Повтор" -#: pysollib/tk/soundoptionsdialog.py:97 +#: pysollib/tk/soundoptionsdialog.py:95 msgid "Autopilot lost" msgstr "Автопилот выиграл" -#: pysollib/tk/soundoptionsdialog.py:98 +#: pysollib/tk/soundoptionsdialog.py:96 msgid "Autopilot won" msgstr "Автопилот проиграл" -#: pysollib/tk/soundoptionsdialog.py:101 +#: pysollib/tk/soundoptionsdialog.py:99 msgid "Game lost" msgstr "Игра проиграна" -#: pysollib/tk/soundoptionsdialog.py:103 +#: pysollib/tk/soundoptionsdialog.py:101 msgid "Perfect game" msgstr "Великолепная игра" -#: pysollib/tk/soundoptionsdialog.py:113 +#: pysollib/tk/soundoptionsdialog.py:111 msgid "Sound enabled" msgstr "Звук доступен" -#: pysollib/tk/soundoptionsdialog.py:119 +#: pysollib/tk/soundoptionsdialog.py:117 msgid "Use DirectX for sound playing" msgstr "Использовать DirectX для вывода звука" -#: pysollib/tk/soundoptionsdialog.py:125 +#: pysollib/tk/soundoptionsdialog.py:123 msgid "Sample volume:" msgstr "Уровень звуков:" -#: pysollib/tk/soundoptionsdialog.py:133 +#: pysollib/tk/soundoptionsdialog.py:131 msgid "Music volume:" msgstr "Уровень музыки:" -#: pysollib/tk/soundoptionsdialog.py:146 +#: pysollib/tk/soundoptionsdialog.py:144 msgid "Enable samles" msgstr "Включить звуки" -#: pysollib/tk/soundoptionsdialog.py:171 +#: pysollib/tk/soundoptionsdialog.py:170 msgid "&Apply" msgstr "&Применить" -#: pysollib/tk/soundoptionsdialog.py:171 pysollib/tk/soundoptionsdialog.py:173 -msgid "&Mixer..." -msgstr "Ми&ксер..." - -#: pysollib/tk/soundoptionsdialog.py:222 +#: pysollib/tk/soundoptionsdialog.py:206 msgid "Sound preferences info" msgstr "Информация о настройках звука" -#: pysollib/tk/soundoptionsdialog.py:223 +#: pysollib/tk/soundoptionsdialog.py:207 msgid "" "Changing DirectX settings will take effect\n" "the next time you restart " @@ -2955,11 +3042,11 @@ msgstr "" "Изменения установок DirectX вступят в силу\n" "при следующем запуске " -#: pysollib/tk/statusbar.py:136 +#: pysollib/tk/statusbar.py:158 msgid "Moves/Total moves" msgstr "Ходов/Всего ходов" -#: pysollib/tk/statusbar.py:138 +#: pysollib/tk/statusbar.py:160 msgid "Games played: won/lost" msgstr "Игр: выиграно/проиграно" @@ -2999,25 +3086,25 @@ msgstr "Текст рядом с пиктограммами" msgid "Text only" msgstr "Только текст" -#: pysollib/tk/tkhtml.py:230 +#: pysollib/tk/tkhtml.py:255 msgid "Index" msgstr "Индекс" -#: pysollib/tk/tkhtml.py:234 +#: pysollib/tk/tkhtml.py:259 msgid "Back" msgstr "Назад" -#: pysollib/tk/tkhtml.py:238 +#: pysollib/tk/tkhtml.py:263 msgid "Forward" msgstr "Вперед" -#: pysollib/tk/tkhtml.py:242 +#: pysollib/tk/tkhtml.py:267 msgid "Close" msgstr "Закрыть" -#: pysollib/tk/tkhtml.py:360 +#: pysollib/tk/tkhtml.py:389 msgid "" -" HTML limitation:\n" +"HTML limitation:\n" "The %s protocol is not supported yet.\n" "\n" "Please use your standard web browser\n" @@ -3031,9 +3118,9 @@ msgstr "" "чтобы открыть URL:\n" "%s\n" -#: pysollib/tk/tkhtml.py:385 pysollib/tk/tkhtml.py:389 +#: pysollib/tk/tkhtml.py:414 pysollib/tk/tkhtml.py:418 msgid "Unable to service request:\n" -msgstr "" +msgstr "Невозможно выполнить запрос:\n" #: pysollib/tk/tkstats.py:95 msgid "Total" @@ -3204,15 +3291,15 @@ msgstr "Всего ходов:" msgid "No TOP for this game" msgstr "TOP для текущей игры отсутствует" -#: pysollib/tk/toolbar.py:183 +#: pysollib/tk/toolbar.py:197 msgid "New" msgstr "Новая" -#: pysollib/tk/toolbar.py:184 +#: pysollib/tk/toolbar.py:198 msgid "Restart" msgstr "Начало" -#: pysollib/tk/toolbar.py:184 +#: pysollib/tk/toolbar.py:198 msgid "" "Restart the\n" "current game" @@ -3220,11 +3307,11 @@ msgstr "" "Начать текущую игру\n" "с начала" -#: pysollib/tk/toolbar.py:186 +#: pysollib/tk/toolbar.py:200 msgid "Open" msgstr "Открыть" -#: pysollib/tk/toolbar.py:186 +#: pysollib/tk/toolbar.py:200 msgid "" "Open a\n" "saved game" @@ -3232,63 +3319,63 @@ msgstr "" "Открыть\n" "сохраненную игру" -#: pysollib/tk/toolbar.py:187 +#: pysollib/tk/toolbar.py:201 msgid "Save" msgstr "Сохранить" -#: pysollib/tk/toolbar.py:187 +#: pysollib/tk/toolbar.py:201 msgid "Save game" msgstr "Сохранить игру" -#: pysollib/tk/toolbar.py:189 +#: pysollib/tk/toolbar.py:203 msgid "Undo last move" msgstr "Отменить последний ход" -#: pysollib/tk/toolbar.py:190 +#: pysollib/tk/toolbar.py:204 msgid "Redo last move" msgstr "Вернуть ход" -#: pysollib/tk/toolbar.py:191 +#: pysollib/tk/toolbar.py:205 msgid "Auto drop cards" msgstr "Автоматически сбросить карты" -#: pysollib/tk/toolbar.py:191 +#: pysollib/tk/toolbar.py:205 msgid "Autodrop" msgstr "Сбросить" -#: pysollib/tk/toolbar.py:192 +#: pysollib/tk/toolbar.py:206 msgid "Pause" msgstr "Пауза" -#: pysollib/tk/toolbar.py:192 +#: pysollib/tk/toolbar.py:206 msgid "Pause game" msgstr "Приостановить игру" -#: pysollib/tk/toolbar.py:194 +#: pysollib/tk/toolbar.py:208 msgid "View statistics" msgstr "Посмотреть статистику" -#: pysollib/tk/toolbar.py:195 +#: pysollib/tk/toolbar.py:209 msgid "Rules" msgstr "Правила" -#: pysollib/tk/toolbar.py:195 +#: pysollib/tk/toolbar.py:209 msgid "Rules for this game" msgstr "Правила текущей игры" -#: pysollib/tk/toolbar.py:197 +#: pysollib/tk/toolbar.py:211 msgid "Quit" msgstr "Выйти" -#: pysollib/tk/toolbar.py:209 +#: pysollib/tk/toolbar.py:225 msgid "Player" msgstr "Игрок" -#: pysollib/tk/toolbar.py:210 +#: pysollib/tk/toolbar.py:226 msgid "Player options" msgstr "Установки игрока" -#: pysollib/tk/toolbar.py:435 +#: pysollib/tk/toolbar.py:464 msgid "Toolbar" msgstr "Панель инструментов" @@ -3320,6 +3407,12 @@ msgstr "красный" msgid "cardset" msgstr "набор карт" +#~ msgid "Balance $%4d" +#~ msgstr "Баланс $%4d" + +#~ msgid "&Mixer..." +#~ msgstr "Ми&ксер..." + #~ msgid "Error while saving options" #~ msgstr "Ошибка при сохранении настроек" diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index bbbb2138..f0e65251 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -535,7 +535,9 @@ class GameManager: # access games database - we do not expose hidden games # - def getAllGames(self): return self.__all_games + def getAllGames(self): + ##return self.__all_games + return self.__games.values() def getGamesIdSortedById(self): if self.__games_by_id is None: diff --git a/pysollib/games/__init__.py b/pysollib/games/__init__.py index 8c6dee31..5bb03ec7 100644 --- a/pysollib/games/__init__.py +++ b/pysollib/games/__init__.py @@ -42,7 +42,6 @@ import parallels import pasdedeux import picturegallery import pileon -import poker import pushpin import pyramid import royalcotillion diff --git a/pysollib/games/doublets.py b/pysollib/games/doublets.py index e6751384..679bc382 100644 --- a/pysollib/games/doublets.py +++ b/pysollib/games/doublets.py @@ -138,5 +138,6 @@ class Doublets(Game): # register the game registerGame(GameInfo(111, Doublets, "Doublets", - GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) + GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK, + altnames=('Double or Quits',) )) diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index b3a2ebf3..02fdf85e 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -87,7 +87,7 @@ class Fan(Game): for r in range(reserves): s.reserves.append(self.ReserveStack_Class(x, y, self)) x += l.XS - x = (self.width - decks*4*l.XS - 2*l.XS) / 2 + x = (self.width - decks*4*l.XS) # - 2*l.XS) / 2 dx = l.XS else: dx = (self.width - decks*4*l.XS)/(decks*4+1) @@ -532,7 +532,7 @@ class CloverLeaf(Game): class FreeFan(Fan): def createGame(self): - Fan.createGame(self, reserves=2) + Fan.createGame(self, reserves=2, playcards=8) # /*********************************************************************** @@ -640,6 +640,90 @@ class FascinationFan(Fan): shallHighlightMatch = Game._shallHighlightMatch_AC +# /*********************************************************************** +# // Crescent +# ************************************************************************/ + +class Crescent_Talon(RedealTalonStack): + + def dealCards(self, sound=0): + old_state = self.game.enterState(self.game.S_DEAL) + ncards = 0 + intern1, intern2 = self.game.s.internals + if sound and self.game.app.opt.animations: + self.game.startDealSample() + for r in self.game.s.rows: + if len(r.cards) <= 1: + continue + ncards += len(r.cards) + # move cards to internal stacks + while len(r.cards) != 1: + self.game.moveMove(1, r, intern1, frames=4) + self.game.moveMove(1, r, intern2, frames=4) + # move back + while intern1.cards: + self.game.moveMove(1, intern1, r, frames=4) + self.game.moveMove(1, intern2, r, frames=4) + self.game.nextRoundMove(self) + if sound: + self.game.stopSamples() + self.game.leaveState(old_state) + return ncards + + +class Crescent(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self): + l, s = Layout(self), self.s + playcards = 10 + w0 = l.XS+(playcards-1)*l.XOFFSET + w, h = l.XM+max(4*w0, 9*l.XS), l.YM+5*l.YS + self.setSize(w, h) + x, y = l.XM, l.YM + s.talon = Crescent_Talon(x, y, self, max_rounds=4) + tx, ty, ta, tf = l.getTextAttr(s.talon, 'ne') + font=self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + x, y = w-8*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) + x += l.XS + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=KING, dir=-1)) + x += l.XS + y = l.YM+l.YS + for i in range(4): + x = l.XM + for j in range(4): + stack = UD_SS_RowStack(x, y, self, base_rank=NO_RANK, mod=13) + s.rows.append(stack) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 + x += w0 + y += l.YS + self.s.internals.append(InvisibleStack(self)) + self.s.internals.append(InvisibleStack(self)) + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, KING) and c.deck == 0, + (c.rank, c.suit))) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + shallHighlightMatch = Game._shallHighlightMatch_SSW + + # register the game registerGame(GameInfo(56, Fan, "Fan", @@ -678,4 +762,6 @@ registerGame(GameInfo(517, TroikaPlus, "Troika +", GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(625, FascinationFan, "Fascination Fan", GI.GT_FAN_TYPE, 1, 6, GI.SL_BALANCED)) +registerGame(GameInfo(647, Crescent, "Crescent", + GI.GT_FAN_TYPE, 2, 3, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index 1f3dfdf2..ed53fcb8 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -556,6 +556,56 @@ class KingCell(FreeCell): shallHighlightMatch = Game._shallHighlightMatch_RK +# /*********************************************************************** +# // Headquarters +# ************************************************************************/ + +class Headquarters_Reserve(ReserveStack): + + def acceptsCards(self, from_stack, cards): + if not ReserveStack.acceptsCards(self, from_stack, cards): + return False + return len(self.cards) == 0 + + +class Headquarters(Game): + + def createGame(self, rows=8, reserves=6): + l, s = Layout(self), self.s + w, h = l.XM+(rows+reserves+1)*l.XS, l.YM+3*l.YS+16*l.YOFFSET + self.setSize(w, h) + x, y = l.XM+(rows+reserves+1-8)*l.XS/2, l.YM + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i%4)) + x += l.XS + x, y = l.XM, l.YM+l.YS + for i in range(reserves): + stack = Headquarters_Reserve(x, y, self, + max_cards=UNLIMITED_CARDS, + max_accept=UNLIMITED_CARDS, + max_move=UNLIMITED_CARDS) + s.reserves.append(stack) + stack.CARD_YOFFSET = l.YOFFSET + x += l.XS + x, y = l.XM+(reserves+1)*l.XS, l.YM+l.YS + for j in range(rows): + s.rows.append(AC_RowStack(x, y, self, base_rank=NO_RANK)) + x += l.XS + x, y = w-l.XS, h-l.YS + s.talon = InitialDealTalonStack(x, y, self) + + l.defaultStackGroups() + + + def startGame(self): + for i in range(12): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + shallHighlightMatch = Game._shallHighlightMatch_AC + + # register the game registerGame(GameInfo(5, RelaxedFreeCell, "Relaxed FreeCell", @@ -600,4 +650,6 @@ registerGame(GameInfo(520, GermanFreeCell, "German FreeCell", GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_SKILL)) registerGame(GameInfo(542, KingCell, "KingCell", GI.GT_FREECELL | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(648, Headquarters, "Headquarters", + GI.GT_FREECELL | GI.GT_OPEN | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/mahjongg/mahjongg2.py b/pysollib/games/mahjongg/mahjongg2.py index bd609944..5c40adf9 100644 --- a/pysollib/games/mahjongg/mahjongg2.py +++ b/pysollib/games/mahjongg/mahjongg2.py @@ -80,7 +80,7 @@ r(5235, "Kyodai 41", layout="0CaeCagCaivbevbgvbiCcdoceocgociCcjvddhdevdfhdgCdgvd r(5236, "Kyodai 42", layout="0oaboadCagoajoalhbahbcvbchbeobfvbgobhhbihbkvbkhbmacbacdacjaclhdbhddodevdfCdgvdhodihdjhdlaecaekhfchfeoffvfgofhhfihfkagdCggagjhhdhhfhhhhhjaieaiihjehjghjiakfCkgakhhlfvlghlhCmfamgomgCmhhnfvnghnhaogCoghpfhphCqcvqdoqeCqeaqgoqgoqiCqivqjCqkhrfhrhasgCsghtfvtghthCufaugougCuhhvfvvghvhawfCwgawhhxehxghxiayeayihzdhzfhzhhzjaAdCAgaAjhBchBeoBfvBgoBhhBihBkaCcaCkhDbhDdoDevDfCDgvDhoDihDjhDlaEbaEdaEjaElhFahFcvFchFeoFfvFgoFhhFihFkvFkhFmoGboGdCGgoGjoGl") r(5237, "Lattice", layout="0aaiacebciacmaecbeeaegbeiaekbemaeoagecgiagmaicbieaigciiaikbimaioakeckiakmamcbmebmgdmibmkbmmamoboeeoibomaqabqccqeeqgdqieqkcqmbqoaqqbseesibsmaucbuebugduibukbumauoawecwiawmaycbyeaygcyiaykbymayoaAecAiaAmaCcbCeaCgbCiaCkbCmaCoaEebEiaEmaGi") # -r(5238, "Leo", layout="0aapabiablhbphcfacghchhclacnocpadjodladpvdpheeaefheiaelvelhepCepofihflCflafnofphgdagevgiagjoglagpvgphhiChiahlvhlhhpChphicaidoiihilCilainoipvjiajjojlajpvjpbkabkchkiCkiaklvklhkpCkpolbolihllalnolpbmabmcvmiamjomlampvmphnianlhnpooiholaonoophpfaphapjappaqfhqiaqlhqphrdarnasehsqhtcatpaudbumhuphvbcvgavqawccwlhwqhxbcxjaxpayccylhyphzbczgazqaAdbAmhAqhBcaBpaCehCphDeaDgaDohEgaEiaEmhEohFiaFkhFmhGk") +#r(5238, "Leo", layout="0aapabiablhbphcfacghchhclacnocpadjodladpvdpheeaefheiaelvelhepCepofihflCflafnofphgdagevgiagjoglagpvgphhiChiahlvhlhhpChphicaidoiihilCilainoipvjiajjojlajpvjpbkabkchkiCkiaklvklhkpCkpolbolihllalnolpbmabmcvmiamjomlampvmphnianlhnpooiholaonoophpfaphapjappaqfhqiaqlhqphrdarnasehsqhtcatpaudbumhuphvbcvgavqawccwlhwqhxbcxjaxpayccylhyphzbczgazqaAdbAmhAqhBcaBpaCehCphDeaDgaDohEgaEiaEmhEohFiaFkhFmhGk") # r(5239, "Loose Ends", layout="0aaaoabaaioapaaqhbahbihbqacboccachociacjocoacphdbhdivdihdpaecoedaegaeioeiaekoenaeohfchfivfihfoagdogeaghogiagjogmagnhhdhhivhihhnaieoifaiioiioilaimhjfhjihjlakgokgakiakkokkhlholihljamahmbamcomchmdvmdameomehmfvmfamgvmhamiCmivmjamkhmlvmlammommhmnvmnamoomohmpamqhnhonihnjaogoogaoiaokookhpfhpihplaqeoqfaqioqioqlaqmhrdhrivrihrnasdoseashosiasjosmasnhtchtivtihtoaucoudaugauiouiaukounauohvbhvivvihvpawbowcawhowiawjowoawphxahxihxqayaoybayioypayq") r(5240, "Mini Traditional", ncards=48, layout="0aaeacdacfhdeaecaeeoeeaeghfdvfehffagbagdogeagfaghhhchhevhehhgaiaaicoicaieoieaigoigaiihjchjevjehjgakbakdokeakfakhhldvlehlfamcameomeamghneaodaofaqe") diff --git a/pysollib/games/special/__init__.py b/pysollib/games/special/__init__.py index 7e17ccf0..98a5e348 100644 --- a/pysollib/games/special/__init__.py +++ b/pysollib/games/special/__init__.py @@ -1,4 +1,5 @@ import hanoi import memory import pegged +import poker import tarock diff --git a/pysollib/games/poker.py b/pysollib/games/special/poker.py similarity index 100% rename from pysollib/games/poker.py rename to pysollib/games/special/poker.py diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 0e95f691..1f4ff34d 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -909,6 +909,71 @@ class CircleEight(Game): shallHighlightMatch = Game._shallHighlightMatch_RKW +# /*********************************************************************** +# // Adela +# ************************************************************************/ + +class Adela_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if not SS_FoundationStack.acceptsCards(self, from_stack, cards): + return False + index = list(self.game.s.foundations).index(self) + index = index%8 + return len(self.game.s.foundations[index].cards) > 0 + + +class Adela(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+9.5*l.XS, l.YM+4*l.YS) + + x, y = l.XM+l.XS, l.YM + for i in range(8): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i%4, + base_rank=JACK, dir=-1, max_cards=11)) + x += l.XS + x, y = l.XM+l.XS, l.YM+l.YS + for i in range(8): + s.foundations.append(Adela_Foundation(x, y, self, suit=i%4, + base_rank=QUEEN, max_cards=1)) + x += l.XS + x, y = l.XM+l.XS, l.YM+2*l.YS + for i in range(8): + s.foundations.append(Adela_Foundation(x, y, self, suit=i%4, + base_rank=KING, max_cards=1)) + x += l.XS + x, y = l.XM, l.YM+l.YS + s.talon = DealRowTalonStack(x, y, self) + l.createText(s.talon, 'n') + x, y = l.XM+l.XS/2, l.YM+3*l.YS + for i in range(9): + stack = SS_RowStack(x, y, self, max_move=1, dir=1) + s.rows.append(stack) + stack.CARD_YOFFSET = 0 + x += l.XS + + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + if self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, stack) + self.leaveState(old_state) + + shallHighlightMatch = Game._shallHighlightMatch_SS + + + # register the game registerGame(GameInfo(330, Sultan, "Sultan", GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK, @@ -945,3 +1010,5 @@ registerGame(GameInfo(598, PicturePatience, "Picture Patience", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(635, CircleEight, "Circle Eight", GI.GT_1DECK_TYPE, 1, 1, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(646, Adela, "Adela", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/move.py b/pysollib/move.py index d27adab4..8ae8c3c2 100644 --- a/pysollib/move.py +++ b/pysollib/move.py @@ -505,7 +505,7 @@ class ASingleCardMove(AtomicMove): # /*********************************************************************** -# // AInnerMove - change position of single card in stack +# // AInnerMove - change position of single card in stack (TODO) # ************************************************************************/ class AInnerMove(AtomicMove): @@ -515,10 +515,10 @@ class AInnerMove(AtomicMove): self.from_pos, self.to_pos = from_pos, to_pos def redo(self, game): - pass + stack = game.allstacks[self.stack_id] def undo(self, game): - pass + stack = game.allstacks[self.stack_id] def cmpForRedo(self, other): return cmp((self.stack_id, self.from_pos, self.to_pos), diff --git a/pysollib/stack.py b/pysollib/stack.py index 082c0749..d3e28250 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -298,7 +298,9 @@ class Stack: misc = None, # canvas item ) view.top_bottom = None # the highest of all bottom items - view.is_visible = view.x >= -100 and view.y >= -100 + cardw, cardh = game.app.images.CARDW, game.app.images.CARDH + dx, dy = cardw+view.canvas.xmargin, cardh+view.canvas.ymargin + view.is_visible = view.x >= -dx and view.y >= -dy view.is_open = -1 view.can_hide_cards = -1 view.max_shadow_cards = -1 @@ -2217,9 +2219,11 @@ class ReserveStack(OpenStack): class InvisibleStack(Stack): def __init__(self, game, **cap): - x, y = -500, -500 - len(game.allstacks) + ##x, y = -500, -500 - len(game.allstacks) + cardw, cardh = game.app.images.CARDW, game.app.images.CARDH + x, y = cardw+game.canvas.xmargin, cardh+game.canvas.ymargin kwdefault(cap, max_move=0, max_accept=0) - Stack.__init__(self, x, y, game, cap=cap) + Stack.__init__(self, -x-10, -y-10, game, cap=cap) def assertStack(self): Stack.assertStack(self) diff --git a/pysollib/tk/findcarddialog.py b/pysollib/tk/findcarddialog.py index f42c370f..fc2465b2 100644 --- a/pysollib/tk/findcarddialog.py +++ b/pysollib/tk/findcarddialog.py @@ -54,10 +54,10 @@ class FindCardDialog(Tkinter.Toplevel): # ##self.images_dir = dir if size == 'large': - self.images_dir = os.path.join(dir, 'large-emblems') + self.images_dir = os.path.join(dir, 'large') self.label_width, self.label_height = LARGE_EMBLEMS_SIZE else: - self.images_dir = os.path.join(dir, 'small-emblems') + self.images_dir = os.path.join(dir, 'small') self.label_width, self.label_height = SMALL_EMBLEMS_SIZE self.canvas = MfxCanvas(self, bg='white') ##self.canvas = MfxCanvas(self, bg='black') diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index a84fc103..7b773582 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -518,34 +518,30 @@ class PysolMenubar(PysolMenubarActions): games = map(self.app.gdb.get, self.app.gdb.getGamesIdSortedByName()) ##games = tuple(games) ###menu = MfxMenu(menu, label="Select &game") - menu.add_command(label=n_("All &games..."), command=self.mSelectGameDialog, accelerator="G") - menu.add_command(label=n_("Playable pre&view..."), command=self.mSelectGameDialogWithPreview, accelerator="V") + menu.add_command(label=n_("All &games..."), accelerator="G", + command=self.mSelectGameDialog) + menu.add_command(label=n_("Playable pre&view..."), accelerator="V", + command=self.mSelectGameDialogWithPreview) menu.add_separator() - data = (n_("&Popular games"), lambda gi: gi.si.game_flags & GI.GT_POPULAR) - self._addSelectGameSubMenu(menu, games, (data, ), - self.mSelectGamePopular, self.tkopt.gameid_popular) - submenu = MfxMenu(menu, label=n_("&French games")) - self._addSelectGameSubMenu(submenu, games, GI.SELECT_GAME_BY_TYPE, - self.mSelectGame, self.tkopt.gameid) + self._addSelectPopularGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) + self._addSelectFrenchGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) if self.progress: self.progress.update(step=1) - submenu = MfxMenu(menu, label=n_("&Mahjongg games")) - self._addSelectMahjonggGameSubMenu(submenu, - self.mSelectGame, self.tkopt.gameid) - submenu = MfxMenu(menu, label=n_("&Oriental games")) - self._addSelectGameSubMenu(submenu, games, - GI.SELECT_ORIENTAL_GAME_BY_TYPE, - self.mSelectGame, self.tkopt.gameid) - submenu = MfxMenu(menu, label=n_("&Special games")) - self._addSelectGameSubMenu(submenu, games, GI.SELECT_SPECIAL_GAME_BY_TYPE, - self.mSelectGame, self.tkopt.gameid) + self._addSelectMahjonggGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) + self._addSelectOrientalGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) + self._addSelectSpecialGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) menu.add_separator() if self.progress: self.progress.update(step=1) - submenu = MfxMenu(menu, label=n_("All games by name")) - self._addSelectAllGameSubMenu(submenu, games, - self.mSelectGame, self.tkopt.gameid) + self._addSelectAllGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) - def _addSelectGameSubMenu(self, menu, games, select_data, command, variable): + def _addSelectGameSubMenu(self, games, menu, select_data, + command, variable): ##print select_data need_sep = 0 for label, select_func in select_data: @@ -559,104 +555,112 @@ class PysolMenubar(PysolMenubarActions): menu.add_separator() need_sep = 0 submenu = MfxMenu(menu, label=label) - self._addSelectGameSubSubMenu(submenu, g, command, variable) + self._addSelectGameSubSubMenu(g, submenu, command, variable) - def _addSelectMahjonggGameSubMenu(self, menu, command, variable): -## games = [] -## g = [] -## c0 = c1 = None -## for i in self.app.gdb.getGamesIdSortedByShortName(): -## gi = self.app.gdb.get(i) -## if gi.si.game_type == GI.GT_MAHJONGG: -## c = gettext(gi.short_name).strip()[0] -## if c0 is None: -## c0 = c -## elif c != c0: -## if g: -## games.append((c0, g)) -## g = [] -## c0 = c -## #else: -## #if g: -## g.append(gi) -## if g: -## games.append((c0, g)) -## n = 0 -## gg = [] -## c0 = c1 = None -## for c, g in games: -## if c0 is None: -## c0 = c -## if len(gg) + len(g) > self.__cb_max: -## if gg: -## if c0 != c1: -## label = c0+' - '+c1 -## else: -## label = c1 -## c0 = c -## submenu = MfxMenu(menu, label=label, name=None) -## self._addSelectGameSubSubMenu(submenu, gg, command, -## variable, short_name=True) -## gg = [] -## c1 = c -## gg += g -## if gg: -## label = c0+' - '+c -## submenu = MfxMenu(menu, label=label, name=None) -## self._addSelectGameSubSubMenu(submenu, gg, command, -## variable, short_name=True) -## return + def _getNumGames(self, games, select_data): + ngames = 0 + for label, select_func in select_data: + ngames += len(filter(select_func, games)) + return ngames + def _addSelectMahjonggGameSubMenu(self, games, menu, command, variable): + select_func = lambda gi: gi.si.game_type == GI.GT_MAHJONGG + mahjongg_games = filter(select_func, games) + if len(mahjongg_games) == 0: + return + # + menu = MfxMenu(menu, label=n_("&Mahjongg games")) - g = [] - c0 = c1 = None - for i in self.app.gdb.getGamesIdSortedByShortName(): - gi = self.app.gdb.get(i) - if gi.si.game_type == GI.GT_MAHJONGG: - c = gettext(gi.short_name).strip()[0] - if c0 is None: - c0 = c - if len(g) >= self.__cb_max and c != c1: - label = c0 + ' - ' + c1 - if c0 == c1: - label = c0 - submenu = MfxMenu(menu, label=label, name=None) - self._addSelectGameSubSubMenu(submenu, g, command, - variable, short_name=True) - g = [gi] - c0 = c - else: - g.append(gi) - c1 = c - if g: + def add_menu(games, c0, c1, menu=menu, + variable=variable, command=command): + if not games: + return label = c0 + ' - ' + c1 + if c0 == c1: + label = c0 submenu = MfxMenu(menu, label=label, name=None) - self._addSelectGameSubSubMenu(submenu, g, command, + self._addSelectGameSubSubMenu(games, submenu, command, variable, short_name=True) - def _addSelectAllGameSubMenu(self, menu, g, command, variable): + games = {} + for gi in mahjongg_games: + c = gettext(gi.short_name).strip()[0] + if games.has_key(c): + games[c].append(gi) + else: + games[c] = [gi] + games = games.items() + games.sort() + g0 = [] + c0 = c1 = games[0][0] + for c, g1 in games: + if len(g0)+len(g1) >= self.__cb_max: + add_menu(g0, c0, c1) + g0 = g1 + c0 = c1 = c + else: + g0 += g1 + c1 = c + add_menu(g0, c0, c1) + + def _addSelectPopularGameSubMenu(self, games, menu, command, variable): + select_func = lambda gi: gi.si.game_flags & GI.GT_POPULAR + if len(filter(select_func, games)) == 0: + return + data = (n_("&Popular games"), select_func) + self._addSelectGameSubMenu(games, menu, (data, ), + self.mSelectGamePopular, + self.tkopt.gameid_popular) + + def _addSelectFrenchGameSubMenu(self, games, menu, command, variable): + if self._getNumGames(games, GI.SELECT_GAME_BY_TYPE) == 0: + return + submenu = MfxMenu(menu, label=n_("&French games")) + self._addSelectGameSubMenu(games, submenu, GI.SELECT_GAME_BY_TYPE, + self.mSelectGame, self.tkopt.gameid) + + def _addSelectOrientalGameSubMenu(self, games, menu, command, variable): + if self._getNumGames(games, GI.SELECT_ORIENTAL_GAME_BY_TYPE) == 0: + return + submenu = MfxMenu(menu, label=n_("&Oriental games")) + self._addSelectGameSubMenu(games, submenu, + GI.SELECT_ORIENTAL_GAME_BY_TYPE, + self.mSelectGame, self.tkopt.gameid) + + def _addSelectSpecialGameSubMenu(self, games, menu, command, variable): + if self._getNumGames(games, GI.SELECT_ORIENTAL_GAME_BY_TYPE) == 0: + return + submenu = MfxMenu(menu, label=n_("&Special games")) + self._addSelectGameSubMenu(games, submenu, + GI.SELECT_SPECIAL_GAME_BY_TYPE, + self.mSelectGame, self.tkopt.gameid) + + def _addSelectAllGameSubMenu(self, games, menu, command, variable): + menu = MfxMenu(menu, label=n_("All games by name")) n, d = 0, self.__cb_max i = 0 while True: if self.progress: self.progress.update(step=1) columnbreak = i > 0 and (i % d) == 0 i += 1 - if not g[n:n+d]: + if not games[n:n+d]: break - m = min(n+d-1, len(g)-1) - label = gettext(g[n].name)[:3]+' - '+gettext(g[m].name)[:3] + m = min(n+d-1, len(games)-1) + label = gettext(games[n].name)[:3]+' - '+gettext(games[m].name)[:3] submenu = MfxMenu(menu, label=label, name=None) - self._addSelectGameSubSubMenu(submenu, g[n:n+d], command, variable) + self._addSelectGameSubSubMenu(games[n:n+d], submenu, + command, variable) n += d if columnbreak: menu.entryconfigure(i, columnbreak=columnbreak) - def _addSelectGameSubSubMenu(self, menu, g, command, variable, short_name=False): + def _addSelectGameSubSubMenu(self, games, menu, command, variable, + short_name=False): ##cb = (25, self.__cb_max) [ len(g) > 4 * 25 ] ##cb = min(cb, self.__cb_max) cb = self.__cb_max - for i in range(len(g)): - gi = g[i] + for i in range(len(games)): + gi = games[i] columnbreak = i > 0 and (i % cb) == 0 if short_name: label = gi.short_name @@ -728,11 +732,11 @@ class PysolMenubar(PysolMenubarActions): games.append(gi) if len(games) > self.__cb_max*4: games.sort(lambda a, b: cmp(gettext(a.name), gettext(b.name))) - self._addSelectAllGameSubMenu(submenu, games, + self._addSelectAllGameSubMenu(games, submenu, command=self.mSelectGame, variable=self.tkopt.gameid) else: - self._addSelectGameSubSubMenu(submenu, games, + self._addSelectGameSubSubMenu(games, submenu, command=self.mSelectGame, variable=self.tkopt.gameid) state = self._getEnabledState diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 099ab5f2..7a359574 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -63,9 +63,9 @@ REMOTE_PROTOCOLS = ("ftp:", "gopher:", "http:", "mailto:", "news:", "telnet:") # // # ************************************************************************/ -class tkHTMLWriter(formatter.DumbWriter): +class tkHTMLWriter(formatter.NullWriter): def __init__(self, text, viewer, app): - formatter.DumbWriter.__init__(self, self, maxcol=9999) + formatter.NullWriter.__init__(self) self.text = text self.viewer = viewer @@ -113,12 +113,6 @@ class tkHTMLWriter(formatter.DumbWriter): return Functor(self.viewer, href) def write(self, data): - ## FIXME - ##if self.col == 0 and self.atbreak == 0: - ## self.text.insert("insert", self.indent) - self.text.insert("insert", data) - - def __write(self, data): self.text.insert("insert", data) def anchor_bgn(self, href, name, type): @@ -131,14 +125,7 @@ class tkHTMLWriter(formatter.DumbWriter): if self.anchor: url = self.anchor[0] tag = "href_" + url - anchor_mark = self.anchor_mark - if self.text.get(anchor_mark) == ' ': # FIXME - try: - y, x = anchor_mark.split('.') - anchor_mark = y+'.'+str(int(x)+1) - except: - pass - self.text.tag_add(tag, anchor_mark, "insert") + self.text.tag_add(tag, self.anchor_mark, "insert") self.text.tag_bind(tag, "<1>", self.createCallback(url)) self.text.tag_bind(tag, "", lambda e: self.anchor_enter(url)) self.text.tag_bind(tag, "", self.anchor_leave) @@ -183,33 +170,35 @@ class tkHTMLWriter(formatter.DumbWriter): self.indent = " " * level def send_label_data(self, data): - ##self.__write(self.indent + data + " ") - self.__write(self.indent) + ##self.write(self.indent + data + " ") + self.write(self.indent) if data == '*': #
  • img = self.viewer.symbols_img.get('disk') if img: self.text.image_create(index='insert', image=img, padx=0, pady=0) else: - self.__write('*') + self.write('*') else: - self.__write(data) - self.__write(' ') + self.write(data) + self.write(' ') def send_paragraph(self, blankline): - if self.col > 0: - self.__write("\n") - if blankline > 0: - self.__write("\n" * blankline) - self.col = 0 - self.atbreak = 0 + self.write('\n' * blankline) + + def send_line_break(self): + self.write('\n') def send_hor_rule(self, *args): width = int(int(self.text["width"]) * 0.9) - self.__write("_" * width) - self.__write("\n") - self.col = 0 - self.atbreak = 0 + self.write("_" * width) + self.write("\n") + + def send_literal_data(self, data): + self.write(data) + + def send_flowing_data(self, data): + self.write(data) # /*********************************************************************** @@ -218,6 +207,7 @@ class tkHTMLWriter(formatter.DumbWriter): class tkHTMLParser(htmllib.HTMLParser): def anchor_bgn(self, href, name, type): + self.formatter.flush_softspace() htmllib.HTMLParser.anchor_bgn(self, href, name, type) self.formatter.writer.anchor_bgn(href, name, type) diff --git a/pysollib/version.py b/pysollib/version.py index 1ed2586b..8eeca7e0 100644 --- a/pysollib/version.py +++ b/pysollib/version.py @@ -25,6 +25,6 @@ VERSION_MAJOR = 4 VERSION_MINOR = 82 VERSION_TUPLE = (4, 82) -FC_VERSION = "0.9.2" +FC_VERSION = "0.9.3" #FC_VERSION_TUPLE = (0, 4, 0) From 5f8256088545b21f68eaafe95dabe64163c925db Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 10 Aug 2006 21:19:27 +0000 Subject: [PATCH 042/266] + new option: `shrink face down' * changed talon/waste text anchor: `ss' -> `s', `nn' -> `n' * fixed support python 2.2 and tk 8.3 git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@43 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- MANIFEST.in | 3 +- pysollib/actions.py | 8 +++++ pysollib/app.py | 1 + pysollib/games/acesup.py | 11 +++--- pysollib/games/algerian.py | 2 +- pysollib/games/auldlangsyne.py | 6 ++-- pysollib/games/beleagueredcastle.py | 6 ++-- pysollib/games/braid.py | 8 ++--- pysollib/games/bristol.py | 2 +- pysollib/games/calculation.py | 6 ++-- pysollib/games/canfield.py | 10 +++--- pysollib/games/curdsandwhey.py | 12 +++---- pysollib/games/diplomat.py | 14 ++++---- pysollib/games/doublets.py | 6 ++-- pysollib/games/eiffeltower.py | 4 +-- pysollib/games/glenwood.py | 4 +-- pysollib/games/golf.py | 13 +++---- pysollib/games/gypsy.py | 2 +- pysollib/games/harp.py | 6 ++-- pysollib/games/katzenschwanz.py | 2 +- pysollib/games/klondike.py | 2 +- pysollib/games/montecarlo.py | 18 +++++----- pysollib/games/numerica.py | 6 ++-- pysollib/games/parallels.py | 2 +- pysollib/games/royalcotillion.py | 5 ++- pysollib/games/royaleast.py | 4 +-- pysollib/games/special/memory.py | 2 +- pysollib/games/special/pegged.py | 2 +- pysollib/games/special/tarock.py | 16 ++++----- pysollib/games/spider.py | 4 +-- pysollib/games/sultan.py | 8 ++--- pysollib/games/ultra/dashavatara.py | 8 ++--- pysollib/games/ultra/hanafuda.py | 4 +-- pysollib/games/ultra/hanafuda1.py | 15 ++++---- pysollib/games/ultra/hexadeck.py | 8 ++--- pysollib/games/ultra/mughal.py | 6 ++-- pysollib/games/windmill.py | 8 ++--- pysollib/layout.py | 56 ++++++++++++++++------------- pysollib/move.py | 5 +++ pysollib/pysolrandom.py | 10 ++++-- pysollib/stack.py | 28 ++++++++++++--- pysollib/tk/menubar.py | 13 +++---- pysollib/tk/selectgame.py | 12 ++----- pysollib/tk/soundoptionsdialog.py | 2 +- pysollib/tk/tkhtml.py | 4 --- pysollib/tk/toolbar.py | 39 +++++++++++--------- setup.py | 1 - 47 files changed, 225 insertions(+), 189 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 2afd0be5..9f12a899 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -6,8 +6,7 @@ include pysol setup.py setup.cfg MANIFEST.in Makefile COPYING README #recursive-include pysollib *.py include pysollib/*.py pysollib/tk/*.py include pysollib/games/*.py pysollib/games/special/*.py -include pysollib/games/ultra/*.py pysollib/games/contrib/*.py -include pysollib/games/mahjongg/*.py +include pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py include docs/* include po/* include scripts/build.bat scripts/create_iss.py scripts/mahjongg_utils.py diff --git a/pysollib/actions.py b/pysollib/actions.py index 25561a40..fbdd1635 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -126,6 +126,7 @@ class PysolMenubarActions: shadow = BooleanVar(), shade = BooleanVar(), shade_filled_stacks = BooleanVar(), + shrink_face_down = BooleanVar(), toolbar = IntVar(), toolbar_style = StringVar(), toolbar_relief = StringVar(), @@ -169,6 +170,7 @@ class PysolMenubarActions: tkopt.highlight_cards.set(opt.highlight_cards) tkopt.highlight_samerank.set(opt.highlight_samerank) tkopt.highlight_not_matching.set(opt.highlight_not_matching) + tkopt.shrink_face_down.set(opt.shrink_face_down) tkopt.shade_filled_stacks.set(opt.shade_filled_stacks) tkopt.mahjongg_show_removed.set(opt.mahjongg_show_removed) tkopt.shisen_show_hint.set(opt.shisen_show_hint) @@ -869,6 +871,12 @@ class PysolMenubarActions: self.app.opt.highlight_not_matching = self.tkopt.highlight_not_matching.get() ##self.game.updateMenus() + def mOptShrinkFaceDown(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shrink_face_down = self.tkopt.shrink_face_down.get() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + def mOptShadeFilledStacks(self, *args): if self._cancelDrag(break_pause=False): return self.app.opt.shade_filled_stacks = self.tkopt.shade_filled_stacks.get() diff --git a/pysollib/app.py b/pysollib/app.py index fe0c8615..7ec92c6a 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -104,6 +104,7 @@ class Options: self.animations = 2 # default to Timer based self.shadow = 1 self.shade = 1 + self.shrink_face_down = True self.shade_filled_stacks = True self.demo_logo = 1 self.toolbar = 1 diff --git a/pysollib/games/acesup.py b/pysollib/games/acesup.py index 66b3380c..823546a5 100644 --- a/pysollib/games/acesup.py +++ b/pysollib/games/acesup.py @@ -93,7 +93,7 @@ class AcesUp(Game): if reserve: l.createText(s.talon, "ne") else: - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + 3*l.XS/2 for i in range(rows): s.rows.append(self.RowStack_Class(x, y, self)) @@ -101,7 +101,7 @@ class AcesUp(Game): x = x + l.XS/2 stack = self.Foundation_Class(x, y, self, suit=ANY_SUIT, max_move=0, dir=0, base_rank=ANY_RANK, max_cards=48) - l.createText(stack, "ss") + l.createText(stack, "s") s.foundations.append(stack) if reserve: @@ -221,16 +221,17 @@ class PerpetualMotion(Game): # create stacks x, y, = l.XM, l.YM s.talon = PerpetualMotion_Talon(x, y, self, max_rounds=-1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + 3*l.XS/2 for i in range(4): s.rows.append(PerpetualMotion_RowStack(x, y, self, dir=0, base_rank=NO_RANK)) x = x + l.XS x = l.XM + 6*l.XS - stack = PerpetualMotion_Foundation(x, y, self, ANY_SUIT, base_rank=ANY_RANK, + stack = PerpetualMotion_Foundation(x, y, self, ANY_SUIT, + base_rank=ANY_RANK, max_cards=52, max_move=0, min_accept=4, max_accept=4) - l.createText(stack, "ss") + l.createText(stack, "s") s.foundations.append(stack) # define stack-groups diff --git a/pysollib/games/algerian.py b/pysollib/games/algerian.py index 17b0ae4e..5a1b7cbb 100644 --- a/pysollib/games/algerian.py +++ b/pysollib/games/algerian.py @@ -98,7 +98,7 @@ class Carthage(Game): x += l.XS+d s.talon = self.Talon_Class(l.XM, l.YM, self) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index d69286dc..d31acec8 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -68,7 +68,7 @@ class TamOShanter(Game): else: x, y, = l.XM, l.YM s.talon = self.Talon_Class(x, y, self) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") if texts: tx, ty, ta, tf = l.getTextAttr(s.talon, 'nn') font = self.app.getFont('canvas_default') @@ -271,7 +271,7 @@ class Interregnum(Game): s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) else: - l.createText(s.talon, "nn") + l.createText(s.talon, "n") # define stack-groups l.defaultStackGroups() @@ -417,7 +417,7 @@ class Colorado(Game): x, y = l.XM+9*l.XS, l.YM+3*l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x -= l.XS s.waste = WasteStack(x, y, self, max_cards=1) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 5e95333b..7131d566 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -391,15 +391,15 @@ class Zerline(Game): y = l.YM x = l.XM + w s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x += l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") x += l.XS stack = Zerline_ReserveStack(x, y, self, max_cards=reserve_max_cards) s.reserves.append(stack) stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 - l.createText(stack, "ss") + l.createText(stack, "s") x = l.XM + w for j in range(decks): y = l.YM+l.TEXT_HEIGHT+l.YS diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py index 850457ea..39dae0a9 100644 --- a/pysollib/games/braid.py +++ b/pysollib/games/braid.py @@ -160,13 +160,13 @@ class Braid(Game): s.braid = Braid_BraidStack(x, y, self) x, y = l.XM + 7 * l.XS, l.YM + l.YS * 3/2 s.talon = WasteTalonStack(x, y, self, max_rounds=3) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") s.talon.texts.rounds = MfxCanvasText(self.canvas, x + l.CW / 2, y - l.TEXT_MARGIN, anchor="s", font=font) x = x - l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") y = l.YM for i in range(4): x = l.XM+8*l.XS @@ -339,10 +339,10 @@ class Backbone(Game): x, y = l.XM+rows*l.XS/2, h-l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") x += l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "nn") + l.createText(s.waste, "n") # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/bristol.py b/pysollib/games/bristol.py index d298f834..1199c02d 100644 --- a/pysollib/games/bristol.py +++ b/pysollib/games/bristol.py @@ -210,7 +210,7 @@ class Dover(Bristol): x += l.XS if text: x, y = l.XM+8*l.XS, l.YM - tx, ty, ta, tf = l.getTextAttr(None, "s") + tx, ty, ta, tf = l.getTextAttr(None, "ss") tx, ty = x+tx+l.XM, y+ty font = self.app.getFont("canvas_default") self.texts.info = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index c1cbdaae..15475c15 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -165,7 +165,7 @@ class Calculation(Game): self.setRegion(s.rows, (-999, y, 999999, 999999)) x = l.XM s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") y = y + l.YS s.waste = WasteStack(x, y, self, max_cards=1) @@ -254,10 +254,10 @@ class BetsyRoss(Calculation): anchor="w", font=self.app.getFont("canvas_fixed")) x = l.XM s.talon = WasteTalonStack(x, y, self, max_rounds=3) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") y = y + l.YS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 4549b951..97510582 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -376,10 +376,10 @@ class EagleWing(Canfield): # create stacks x, y = l.XM, l.YM s.talon = WasteTalonStack(x, y, self, max_rounds=3, num_deal=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") for i in range(4): x = l.XM + (i+3)*l.XS s.foundations.append(self.Foundation_Class(x, y, self, i, mod=13, max_move=0)) @@ -395,7 +395,7 @@ class EagleWing(Canfield): x, y = l.XM + 4*l.XS, ry s.reserves.append(self.ReserveStack_Class(x, y, self)) ##s.reserves[0].CARD_YOFFSET = 0 - l.createText(s.reserves[0], "ss") + l.createText(s.reserves[0], "s") # define stack-groups l.defaultStackGroups() @@ -505,9 +505,9 @@ class LittleGate(Gate): s.rows.append(self.RowStack_Class(x, y, self)) x += l.XS s.talon = WasteTalonStack(l.XM, l.YM, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") s.waste = WasteStack(l.XM+l.XS, l.YM, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index 3a32eed7..6ecf2964 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -233,7 +233,7 @@ class Arachnida(CurdsAndWhey): # create stacks x, y = l.XM, l.YM s.talon = DealRowTalonStack(x, y, self) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x += l.XS for i in range(10): stack = self.RowStack_Class(x, y, self, base_rank=ANY_RANK, @@ -243,7 +243,7 @@ class Arachnida(CurdsAndWhey): x += l.XS s.foundations.append(AbstractFoundationStack(x, y, self, suit=ANY_SUIT, max_accept=0, max_cards=104)) - l.createText(s.foundations[0], "ss") + l.createText(s.foundations[0], "s") # define stack-groups l.defaultStackGroups() @@ -300,10 +300,10 @@ class GermanPatience(Game): x += l.XS x, y = l.XM, h-l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, 'nn') + l.createText(s.talon, 'n') x += l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, 'nn') + l.createText(s.waste, 'n') l.defaultStackGroups() @@ -361,7 +361,7 @@ class TrustyTwelve(Game): self.setSize(l.XM+(rows+1)*l.XS, l.YM+l.YS+12*l.YOFFSET) x, y = l.XM, l.YM s.talon = TalonStack(x, y, self) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x += l.XS for i in range(rows): s.rows.append(RK_RowStack(x, y, self, max_move=1)) @@ -398,7 +398,7 @@ class SweetSixteen(TrustyTwelve): self.setSize(l.XM+9*l.XS, l.YM+2*l.YS+20*l.YOFFSET) x, y = l.XM, l.YM s.talon = TalonStack(x, y, self) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") y = l.YM for i in range(2): x = l.XM+l.XS diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py index 93b8de48..297a28af 100644 --- a/pysollib/games/diplomat.py +++ b/pysollib/games/diplomat.py @@ -81,10 +81,10 @@ class Diplomat(Game): x = x + l.XS x, y, = l.XM, self.height - l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "nn") + l.createText(s.waste, "n") # define stack-groups l.defaultStackGroups() @@ -161,17 +161,15 @@ class Congress(Diplomat): s.rows.append(stack) x, y, = l.XM, l.YM s.talon = WasteTalonStack(x, y, self, max_rounds=max_rounds) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") if max_rounds > 1: tx, ty, ta, tf = l.getTextAttr(s.waste, "ne") font = self.app.getFont("canvas_default") - s.talon.texts.rounds = MfxCanvasText(self.canvas, - tx, ty, - anchor=ta, - font=font) + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/doublets.py b/pysollib/games/doublets.py index 679bc382..a9f2084a 100644 --- a/pysollib/games/doublets.py +++ b/pysollib/games/doublets.py @@ -81,15 +81,15 @@ class Doublets(Game): s.foundations.append(Doublets_Foundation(x, y, self, ANY_SUIT, dir=0, mod=13, max_move=0, max_cards=48)) - l.createText(s.foundations[0], "ss") + l.createText(s.foundations[0], "s") ## help = "A, 2, 4, 8, 3, 6, Q, J, 9, 5, 10, 7, A, ..." ## self.texts.help = MfxCanvasText(self.canvas, x + l.CW/2, y + l.YS + l.YM, anchor="n", text=help) x, y = l.XM, l.YM + 3*l.YS/2 s.talon = WasteTalonStack(x, y, self, max_rounds=3) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/eiffeltower.py b/pysollib/games/eiffeltower.py index b55f855b..068b7cb1 100644 --- a/pysollib/games/eiffeltower.py +++ b/pysollib/games/eiffeltower.py @@ -83,10 +83,10 @@ class EiffelTower(Game): x = l.XM + 6 * l.XS y = l.YM + 5 * l.YS / 2 s.waste = self.Waste_Class(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") x = x + l.XS s.talon = self.Talon_Class(x, y, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/glenwood.py b/pysollib/games/glenwood.py index ce739d81..ea28e824 100644 --- a/pysollib/games/glenwood.py +++ b/pysollib/games/glenwood.py @@ -109,10 +109,10 @@ class Glenwood(Game): # create stacks x, y = l.XM, l.YM s.talon = Glenwood_Talon(x, y, self, max_rounds=2, num_deal=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x += l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") x += l.XS+l.XM for i in range(4): s.foundations.append(self.Foundation_Class(x, y, self, i, dir=1, diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 13a916f3..51eb939a 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -144,11 +144,11 @@ class Golf(Game): x = x + l.XS x, y = l.XM, self.height - l.YS s.talon = Golf_Talon(x, y, self, max_rounds=1) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") x = x + l.XS s.waste = self.Waste_Class(x, y, self) s.waste.CARD_XOFFSET = l.XOFFSET - l.createText(s.waste, "nn") + l.createText(s.waste, "n") # the Waste is also our only Foundation in this game s.foundations.append(s.waste) @@ -249,10 +249,10 @@ class Elevator(RelaxedGolf): x = x + l.XS x, y = l.XM, l.YM s.talon = Golf_Talon(x, y, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = self.Waste_Class(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # the Waste is also our only Foundation in this game s.foundations.append(s.waste) @@ -334,8 +334,9 @@ class BlackHole(Game): r.CARD_XOFFSET = l.XOFFSET r.CARD_YOFFSET = 0 x, y = l.XM + 2*w, l.YM + 3*l.YS/2 - s.foundations.append(BlackHole_Foundation(x, y, self, ANY_SUIT, dir=0, mod=13, max_move=0, max_cards=52)) - l.createText(s.foundations[0], "ss") + s.foundations.append(BlackHole_Foundation(x, y, self, suit=ANY_SUIT, + dir=0, mod=13, max_move=0, max_cards=52)) + l.createText(s.foundations[0], "s") x, y = l.XM + 4*w, self.height - l.YS s.talon = InitialDealTalonStack(x, y, self) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index 3b84e649..718cf761 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -249,7 +249,7 @@ class MissMilligan(Gypsy): if s.reserves: self.setRegion(s.reserves, (-999, ry, rx - 1, 999999)) else: - l.createText(s.talon, "ss") + l.createText(s.talon, "s") rx = -999 x, y = l.XM + (8-rows)*l.XS/2, l.YM + l.YS for i in range(rows): diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index 8a9d5d49..6aeaebc0 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -79,10 +79,10 @@ class DoubleKlondike(Game): assert s.talon.texts.rounds is None tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") if layout.get("texts"): - ty = ty - 2*l.TEXT_MARGIN + ty = ty - l.TEXT_MARGIN + font = self.app.getFont("canvas_default") s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, - anchor=ta, - font=self.app.getFont("canvas_default")) + anchor=ta, font=font) return l def startGame(self, flip=0): diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index 25ce1f77..ade7d835 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -298,7 +298,7 @@ class SalicLaw(DerKatzenschwanz): s.rows.append(stack) x += l.XS s.talon = SalicLaw_Talon(l.XM+9*l.XS, l.YM, self) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index a7bf7d45..4448e24d 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -608,7 +608,7 @@ class Jane(Klondike): x, y = l.XM, l.YM s.talon = self.Talon_Class(x, y, self, max_rounds=max_rounds) - l.createText(s.talon, 'ss') + l.createText(s.talon, 's') x += l.XS s.waste = WasteStack(l.XM+l.XS, l.YM, self) diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index 3d868218..c31474da 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -136,10 +136,10 @@ class MonteCarlo(Game): x, y = l.XM + 11*l.XS/2, l.YM s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, max_move=0, max_cards=self.gameinfo.ncards, base_rank=ANY_RANK)) - l.createText(s.foundations[0], "ss") + l.createText(s.foundations[0], "s") y = y + 2*l.YS s.talon = self.Talon_Class(x, y, self, max_rounds=1) - l.createText(s.talon, "ss", text_format="%D") + l.createText(s.talon, "s", text_format="%D") # define stack-groups l.defaultStackGroups() @@ -285,11 +285,11 @@ class SimplePairs(MonteCarlo): dir=0, base_rank=NO_RANK)) x, y = l.XM, l.YM + 3*l.YS/2 s.talon = TalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + 5*l.XS s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, - max_move=0, max_cards=52, base_rank=ANY_RANK)) - l.createText(s.foundations[0], "ss") + max_move=0, max_cards=52, base_rank=ANY_RANK)) + l.createText(s.foundations[0], "s") # define stack-groups l.defaultStackGroups() @@ -408,7 +408,7 @@ class Fourteen(Game): x, y = l.XM + 6*l.XS, l.YM s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, max_move=0, max_cards=52, base_rank=ANY_RANK)) - l.createText(s.foundations[0], "ss") + l.createText(s.foundations[0], "s") x, y = self.width - l.XS, self.height - l.YS s.talon = InitialDealTalonStack(x, y, self) @@ -478,7 +478,7 @@ class Nestor(Game): x, y = self.width-l.XS, self.height-l.YS s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, max_move=0, max_cards=52, base_rank=ANY_RANK)) - l.createText(s.foundations[0], "nn") + l.createText(s.foundations[0], "n") x, y = l.XM, self.height - l.YS s.talon = InitialDealTalonStack(x, y, self) @@ -552,7 +552,7 @@ class Vertical(Nestor): x, y = self.width-l.XS, l.YM s.foundations.append(self.Foundation_Class(x, y, self, suit=ANY_SUIT, max_move=0, max_cards=52, base_rank=ANY_RANK)) - l.createText(s.foundations[0], "ss") + l.createText(s.foundations[0], "s") x -= l.XS s.talon = InitialDealTalonStack(x, y, self) @@ -599,7 +599,7 @@ class TheWish(Game): x, y = self.width - l.XS, self.height - l.YS s.foundations.append(AbstractFoundationStack(x, y, self, suit=ANY_SUIT, max_move=0, max_cards=32, max_accept=0, base_rank=ANY_RANK)) - l.createText(s.foundations[0], "nn") + l.createText(s.foundations[0], "n") # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index bd36c947..f160deef 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -351,7 +351,7 @@ class Frog(Game): s.reserves.append(stack) x += l.XS s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x += l.XS s.waste = WasteStack(x, y, self, max_cards=1) x += l.XS @@ -430,7 +430,7 @@ class Gnat(Game): # create stacks x, y = l.XM, l.YM s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x += l.XS s.waste = WasteStack(x, y, self, max_cards=1) x += l.XS @@ -448,7 +448,7 @@ class Gnat(Game): for j in range(3): s.reserves.append(OpenStack(x, y, self, max_accept=0)) y += l.YS - x += l.YS + x += l.XS # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/parallels.py b/pysollib/games/parallels.py index ce5f4cb2..a1779d12 100644 --- a/pysollib/games/parallels.py +++ b/pysollib/games/parallels.py @@ -132,7 +132,7 @@ class Parallels(Game): self.setSize(l.XM+12*l.XS, l.YM+7*l.YS) # create stacks s.talon = Parallels_TalonStack(l.XM, l.YM, self) - l.createText(s.talon, 'ss') + l.createText(s.talon, 's') n = 0 y = l.YM for i in range(7): diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 44d6491f..c6d52e81 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -152,10 +152,10 @@ class OddAndEven(RoyalCotillion): x = x + l.XS x, y = l.XM, self.height - l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=2) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "nn") + l.createText(s.waste, "n") # define stack-groups l.defaultStackGroups() @@ -226,7 +226,6 @@ class Kingdom(RoyalCotillion): # // Grant's Reinforcement # ************************************************************************/ - class Alhambra_Hint(CautiousDefaultHint): def _getDropCardScore(self, score, color, r, t, ncards): return 93000, color diff --git a/pysollib/games/royaleast.py b/pysollib/games/royaleast.py index 9f7f34f0..14c40ba8 100644 --- a/pysollib/games/royaleast.py +++ b/pysollib/games/royaleast.py @@ -78,10 +78,10 @@ class RoyalEast(Game): s.rows.append(stack) x, y = l.XM, l.YM + 3*l.YS/2 s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/special/memory.py b/pysollib/games/special/memory.py index d7169f93..b39c87a4 100644 --- a/pysollib/games/special/memory.py +++ b/pysollib/games/special/memory.py @@ -137,7 +137,7 @@ class Memory24(Game): max_move=0, max_accept=0, max_cards=1)) x, y = l.XM, l.YM s.talon = InitialDealTalonStack(x, y, self) - l.createText(s.talon, anchor="nn", text_format="%D") + l.createText(s.talon, anchor="n", text_format="%D") s.internals.append(InvisibleStack(self)) # define stack-groups diff --git a/pysollib/games/special/pegged.py b/pysollib/games/special/pegged.py index ecc75d91..6a674ced 100644 --- a/pysollib/games/special/pegged.py +++ b/pysollib/games/special/pegged.py @@ -142,7 +142,7 @@ class Pegged(Game): self.map[stack.pos] = stack x, y = self.width - l.XS, l.YM s.foundations.append(AbstractFoundationStack(x, y, self, ANY_SUIT, max_move=0, max_accept=0, max_cards=self.gameinfo.ncards)) - l.createText(s.foundations[0], "ss") + l.createText(s.foundations[0], "s") y = self.height - l.YS s.talon = InitialDealTalonStack(x, y, self) s.internals.append(InvisibleStack(self)) diff --git a/pysollib/games/special/tarock.py b/pysollib/games/special/tarock.py index 54bcb427..7f84e125 100644 --- a/pysollib/games/special/tarock.py +++ b/pysollib/games/special/tarock.py @@ -282,10 +282,10 @@ class WheelOfFortune(AbstractTarockGame): x = self.width - l.XS y = self.height - l.YS * 1.5 s.talon = WasteTalonStack(x, y, self, num_deal=2, max_rounds=1) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") x = x - l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "nn") + l.createText(s.waste, "n") # Define stack groups l.defaultStackGroups() @@ -335,10 +335,10 @@ class ImperialTrumps(AbstractTarockGame): # Create talon x = l.XM s.talon = WasteTalonStack(x, y, self, num_deal=1, max_rounds=-1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # Create rows x = l.XM @@ -684,10 +684,10 @@ class Grasshopper(AbstractTarockGame): x = l.XM y = l.YM s.talon = WasteTalonStack(x, y, self, num_deal=1, max_rounds=self.MAX_ROUNDS) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # Create foundations x = x + l.XM + l.XS @@ -796,14 +796,14 @@ class Ponytail(Tarock_GameMethods, Braid): x = l.XM + 7 * l.XS y = l.YM + 2*l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=3) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") s.talon.texts.rounds = MfxCanvasText(self.canvas, x + l.CW / 2, y - l.YM, anchor="s", font=self.app.getFont("canvas_default")) x = x - l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") x = l.XM + 8 * l.XS y = l.YM for i in range(4): diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index cfbe4405..ad39692c 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -681,7 +681,7 @@ class Chelicera(Game): # create stacks x, y = l.XM, l.YM s.talon = TalonStack(x, y, self) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x += l.XS for i in range(7): s.rows.append(Chelicera_RowStack(x, y, self, base_rank=KING)) @@ -765,7 +765,7 @@ class SpiderWeb(RelaxedSpider): # create stacks x, y = l.XM, l.YM s.talon = DealRowTalonStack(x, y, self) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x += 2*l.XS s.reserves.append(ReserveStack(x, y, self)) x += 2*l.XS diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 1f4ff34d..9efca13d 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -253,10 +253,10 @@ class Contradance(Game): x, y = l.XM+3*l.XS, l.YM+3*l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=2) - l.createText(s.talon, 'nn') + l.createText(s.talon, 'n') x += l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, 'nn') + l.createText(s.waste, 'n') l.defaultStackGroups() @@ -292,10 +292,10 @@ class IdleAces(Game): x, y = l.XM, l.YM s.talon = WasteTalonStack(x, y, self, max_rounds=3) - l.createText(s.talon, 'ss') + l.createText(s.talon, 's') x += l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, 'ss') + l.createText(s.waste, 's') x0, y0 = l.XM+2*l.XS, l.YM k = 0 for i, j in((2, 0), (0, 1.5), (4, 1.5), (2, 3)): diff --git a/pysollib/games/ultra/dashavatara.py b/pysollib/games/ultra/dashavatara.py index 8e5ec00f..3d435652 100644 --- a/pysollib/games/ultra/dashavatara.py +++ b/pysollib/games/ultra/dashavatara.py @@ -480,7 +480,7 @@ class TenAvatars(AbstractDashavataraGame): # Create talon s.talon = DealRowTalonStack(l.XM, self.height - l.YS, self) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") # Define stack groups l.defaultStackGroups() @@ -883,14 +883,14 @@ class Journey(AbstractDashavataraGame): # Create talon x, y = l.XM + l.XS * 2 + l.XS * decks, h - l.YS - l.YM s.talon = WasteTalonStack(x, y, self, max_rounds=3) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") s.talon.texts.rounds = MfxCanvasText(self.canvas, self.width / 2, h - l.YM * 2.5, anchor="center", font=self.app.getFont("canvas_default")) x = x + l.XS * 2 s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # define stack-groups self.sg.talonstacks = [s.talon] + [s.waste] @@ -1010,7 +1010,7 @@ class AppachansWaterfall(AbstractDashavataraGame): # Create talon s.talon = DealRowTalonStack(l.XM, y, self) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") # Define stack groups l.defaultStackGroups() diff --git a/pysollib/games/ultra/hanafuda.py b/pysollib/games/ultra/hanafuda.py index 21eff49d..b3e818ec 100644 --- a/pysollib/games/ultra/hanafuda.py +++ b/pysollib/games/ultra/hanafuda.py @@ -594,10 +594,10 @@ class FourWinds(AbstractFlowerGame): x = x + 2 * l.XS y = y + 2 * l.YS s.talon = WasteTalonStack(x, y, self, num_deal=1, max_rounds=2) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # Define stack-groups l.defaultStackGroups() diff --git a/pysollib/games/ultra/hanafuda1.py b/pysollib/games/ultra/hanafuda1.py index 4ddd5ab3..60abacba 100644 --- a/pysollib/games/ultra/hanafuda1.py +++ b/pysollib/games/ultra/hanafuda1.py @@ -133,8 +133,9 @@ class LesserQueue(AbstractFlowerGame): # set window decks = self.gameinfo.decks - h = l.YM + l.YS * 5.5 - self.setSize(l.XM + l.XS * 10.5, l.YM + h) + yoffset = l.YOFFSET*self.BRAID_OFFSET + h = l.YM+max(l.YS*5.5, l.YS+self.BRAID_CARDS*yoffset+2*l.TEXT_MARGIN) + self.setSize(l.XM + l.XS * 10.5, h) # extra settings self.base_card = None @@ -164,16 +165,16 @@ class LesserQueue(AbstractFlowerGame): s.braid = Queue_BraidStack(x, y, self, yoffset=self.BRAID_OFFSET) # Create talon, waste - x, y = l.XM, l.YM + l.YS * 4.3 + x, y = l.XM, h-l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=3) - l.createText(s.talon, "ss") + l.createText(s.talon, "n") s.talon.texts.rounds = MfxCanvasText(self.canvas, - self.width / 2, h - l.YM * 2.5, + self.width/2, h-2*l.TEXT_MARGIN, anchor="center", font=self.app.getFont("canvas_default")) x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "n") # Create foundations x = l.XM @@ -187,7 +188,7 @@ class LesserQueue(AbstractFlowerGame): y = y + l.YS x = x + l.XS self.texts.info = MfxCanvasText(self.canvas, - self.width / 2, h - l.YM / 2, + self.width/2, h-l.TEXT_MARGIN, anchor="center", font=self.app.getFont("canvas_default")) diff --git a/pysollib/games/ultra/hexadeck.py b/pysollib/games/ultra/hexadeck.py index 6a8284a2..cf54dd19 100644 --- a/pysollib/games/ultra/hexadeck.py +++ b/pysollib/games/ultra/hexadeck.py @@ -331,10 +331,10 @@ class BitsNBytes(Game): x = l.XM y = l.YM s.talon = WasteTalonStack(x, y, self, num_deal=2, max_rounds=2) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") y += l.YS + l.TEXT_HEIGHT s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # Define stack groups l.defaultStackGroups() @@ -1099,14 +1099,14 @@ class MerlinsMeander(AbstractHexADeckGame): # Create talon, waste x, y = l.XM + l.XS * 7, l.YM + l.YS * 1.5 s.talon = WasteTalonStack(x, y, self, max_rounds=3) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") s.talon.texts.rounds = MfxCanvasText(self.canvas, x + l.CW / 2, y - l.YM, anchor="s", font=self.app.getFont("canvas_default")) x = x - l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # Create foundations x, y = l.XM + l.XS * 8, l.YM diff --git a/pysollib/games/ultra/mughal.py b/pysollib/games/ultra/mughal.py index 48c25201..8d840239 100644 --- a/pysollib/games/ultra/mughal.py +++ b/pysollib/games/ultra/mughal.py @@ -392,7 +392,7 @@ class EightLegions(AbstractMughalGame): # Create talon s.talon = DealRowTalonStack(l.XM, self.height - l.YS, self) - l.createText(s.talon, "nn") + l.createText(s.talon, "n") # Define stack groups l.defaultStackGroups() @@ -727,14 +727,14 @@ class AkbarsTriumph(AbstractMughalGame): # Create talon x, y = l.XM + l.XS * 2 + l.XS * decks, h - l.YS - l.YM s.talon = WasteTalonStack(x, y, self, max_rounds = 3) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") s.talon.texts.rounds = MfxCanvasText(self.canvas, self.width / 2, h - l.YM * 2.5, anchor = "center", font=self.app.getFont("canvas_default")) x = x + l.XS * 2 s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") # define stack-groups self.sg.talonstacks = [s.talon] + [s.waste] diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py index fb8025d5..4588b398 100644 --- a/pysollib/games/windmill.py +++ b/pysollib/games/windmill.py @@ -98,10 +98,10 @@ class Windmill(Game): x = l.XM y = l.YM s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") x0, y0 = x + l.XS, y for d in self.ROWS_LAYOUT: x, y = x0 + d[0] * l.XS, y0 + d[1] * l.YS @@ -221,10 +221,10 @@ class NapoleonsTomb(Windmill): x = l.XM y = l.YM s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, "ss") + l.createText(s.talon, "s") x = x + l.XS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "ss") + l.createText(s.waste, "s") x0, y0 = x + l.XS, y for d in ((0,1), (1,0), (1,2), (2,1)): x, y = x0 + d[0] * l.XS, y0 + d[1] * l.YS diff --git a/pysollib/layout.py b/pysollib/layout.py index 6e3eb23c..74b7d282 100644 --- a/pysollib/layout.py +++ b/pysollib/layout.py @@ -133,6 +133,7 @@ class Layout: self.XOFFSET = self.XOFFSET / self.game.preview if kw.has_key("YOFFSET"): self.YOFFSET = self.YOFFSET / self.game.preview + self.TEXT_HEIGHT = 10 def __createStack(self, x, y, suit=None): stack = _LayoutStack(x, y, suit) @@ -144,6 +145,10 @@ class Layout: self.stackmap[mapkey] = stack return stack + def _setText(self, stack, anchor="center"): + tx, ty, ta, tf = self.getTextAttr(stack, anchor) + stack.setText(tx, ty, ta, tf) + # # # @@ -196,16 +201,17 @@ class Layout: def getTextAttr(self, stack, anchor): x, y = 0, 0 delta_x, delta_y = 4, 4 + delta_yy = 10 if stack is not None: x, y = stack.x, stack.y if anchor == "n": return (x+self.CW/2, y-delta_y, "s", "%d") if anchor == "nn": - return (x+self.CW/2, y-self.TEXT_MARGIN, "s", "%d") + return (x+self.CW/2, y-delta_yy, "s", "%d") if anchor == "s": return (x+self.CW/2, y+self.CH+delta_y, "n", "%d") if anchor == "ss": - return (x+self.CW/2, y+self.CH+self.TEXT_MARGIN, "n", "%d") + return (x+self.CW/2, y+self.CH+delta_yy, "n", "%d") if anchor == "nw": return (x-delta_x, y, "ne", "%d") if anchor == "sw": @@ -226,9 +232,9 @@ class Layout: return assert stack.texts.ncards is None tx, ty, ta, tf = self.getTextAttr(stack, anchor) + font = self.game.app.getFont("canvas_default") stack.texts.ncards = MfxCanvasText(self.canvas, tx+dx, ty+dy, - anchor=ta, - font=self.game.app.getFont("canvas_default")) + anchor=ta, font=font) stack.texts.ncards.text_format = text_format or tf def setRegion(self, stacks, rects): @@ -376,7 +382,7 @@ class Layout: self.s.talon = s = S(x, y) if texts: # place text right of stack - s.setText(x + XS, y + CH, anchor="sw", format="%3d") + self._setText(s, anchor="se") # set window self.size = (w, h) @@ -425,13 +431,13 @@ class Layout: self.s.talon = s = S(x, y) if texts: # place text right of stack - s.setText(x + XS, y + CH, anchor="sw", format="%3d") + self._setText(s, anchor="se") if waste: x = x - XS self.s.waste = s = S(x, y) if texts: # place text left of stack - s.setText(x - self.TEXT_MARGIN, y + CH, anchor="se", format="%3d") + self._setText(s, anchor="sw") # create reserves x, y = XM, h-YS for i in range(reserves): @@ -483,12 +489,12 @@ class Layout: self.s.waste = s = S(x, y) if texts: # place text above stack - s.setText(x + CW / 2, y - self.TEXT_MARGIN, anchor="s") + self._setText(s, 'n') x = w - XS self.s.talon = s = S(x, y) if texts: # place text above stack - s.setText(x + CW / 2, y - self.TEXT_MARGIN, anchor="s") + self._setText(s, 'n') # set window self.size = (w, YM + h + YS) @@ -524,17 +530,17 @@ class Layout: if texts: if waste or not center or maxrows - frows <= 1: # place text below stack - s.setText(x + CW / 2, y + YS, anchor="n") + self._setText(s, 's') text_height = self.TEXT_HEIGHT else: # place text right of stack - s.setText(x + XS, y, anchor="nw", format="%3d") + self._setText(s, 'ne') if waste: x = x + XS self.s.waste = s = S(x, y) if texts: # place text below stack - s.setText(x + CW / 2, y + YS, anchor="n") + self._setText(s, 's') text_height = self.TEXT_HEIGHT for row in range(foundrows): @@ -600,7 +606,7 @@ class Layout: self.s.talon = s = S(x, y) if texts: # place text right of stack - s.setText(x + XS, y + CH, anchor="sw", format="%3d") + self._setText(s, 'se') # set window self.size = (XM + (rows+decks)*XS, h) @@ -635,17 +641,17 @@ class Layout: if texts: if waste or not center or maxrows - frows <= 1: # place text below stack - s.setText(x + CW / 2, y + YS, anchor="n") + self._setText(s, 's') yextra = 20 else: # place text right of stack - s.setText(x + XS, y, anchor="nw", format="%3d") + self._setText(s, 'ne') if waste: x = x + XS self.s.waste = s = S(x, y) if texts: # place text below stack - s.setText(x + CW / 2, y + YS, anchor="n") + self._setText(s, 's') x = XM + (maxrows - frows) * XS if center and frows + 2 * (1 + waste + 1) <= maxrows: # center the foundations @@ -700,17 +706,17 @@ class Layout: if texts: if waste or not center or toprows - rows <= 1: # place text below stack - s.setText(x + CW / 2, y + YS, anchor="n") + self._setText(s, 's') yextra = 20 else: # place text right of stack - s.setText(x + XS, y, anchor="nw", format="%3d") + self._setText(s, 'ne') if waste: x = x + XS self.s.waste = s = S(x, y) if texts: # place text below stack - s.setText(x + CW / 2, y + YS, anchor="n") + self._setText(s, 's') # left & right x, y = XM, YM @@ -789,7 +795,7 @@ class Layout: self.s.talon = s = S(x, y) if texts: # place text right of stack - s.setText(x + XS, y + CH, anchor="sw", format="%3d") + self._setText(s, 'se') # set window self.size = (XM + toprows * XS, YM + YS + h) @@ -851,7 +857,7 @@ class Layout: self.s.talon = s = S(x, y) if texts: # place text right of stack - s.setText(x + XS, y + CH, anchor="sw", format="%3d") + self._setText(s, 'se') # set window self.size = (w, YM + YS + h) @@ -884,7 +890,7 @@ class Layout: self.s.talon = s = S(x, y) if texts: # place text below stack - s.setText(x + CW / 2, y + YS, anchor="center", format="%d") + self._setText(s, 's') # create rows x, y = XS + XM * 3, YM @@ -898,7 +904,7 @@ class Layout: self.setRegion(self.s.rows, (XS + XM, -999, 999999, 999999)) # create reserves - x, y = XM, YM * 3 + YS + x, y = XM, YM + YS + self.TEXT_HEIGHT for i in range(decks): for i in range(reserves / decks): self.s.reserves.append(S(x, y)) @@ -985,9 +991,9 @@ class Layout: # Talon x, y = XM, YM self.s.talon = s = S(x, y) - s.setText(x + XS, y + CH, anchor = "sw", format = "%3d") + self._setText(s, 'se') self.s.waste = s = S(x, y + YS) - s.setText(x + XS, y + YS + CH, anchor = "sw", format = "%3d") + self._setText(s, 'se') # Create foundations x = w - fspace - XS * frows / 2 diff --git a/pysollib/move.py b/pysollib/move.py index 8ae8c3c2..86920afa 100644 --- a/pysollib/move.py +++ b/pysollib/move.py @@ -149,6 +149,7 @@ class AFlipAllMove(AtomicMove): card.showBack() else: card.showFace() + stack.refreshView() def undo(self, game): stack = game.allstacks[self.stack_id] @@ -157,6 +158,7 @@ class AFlipAllMove(AtomicMove): card.showBack() else: card.showFace() + stack.refreshView() def cmpForRedo(self, other): return cmp(self.stack_id, other.stack_id) @@ -463,6 +465,7 @@ class ACloseStackMove(AtomicMove): # /*********************************************************************** # // ASingleCardMove - move single card from *anyone* position +# // (for ArbitraryStack) # ************************************************************************/ class ASingleCardMove(AtomicMove): @@ -487,6 +490,7 @@ class ASingleCardMove(AtomicMove): game.animatedMoveTo(from_stack, to_stack, [card], x, y, frames=self.frames, shadow=self.shadow) to_stack.addCard(card) + stack.refreshView() def undo(self, game): from_stack = game.allstacks[self.from_stack_id] @@ -498,6 +502,7 @@ class ASingleCardMove(AtomicMove): ## game.animatedMoveTo(from_stack, to_stack, [card], x, y, ## frames=self.frames, shadow=self.shadow) from_stack.insertCard(card, from_pos) + stack.refreshView() def cmpForRedo(self, other): return cmp((self.from_stack_id, self.to_stack_id, self.from_pos), diff --git a/pysollib/pysolrandom.py b/pysollib/pysolrandom.py index c3178ea4..e2a1d7c8 100644 --- a/pysollib/pysolrandom.py +++ b/pysollib/pysolrandom.py @@ -148,7 +148,7 @@ class MFXRandom: # Get a random integer in the range [a, b] including both end points. def randint(self, a, b): - return a + int(self.random() * (b+1-a)) + return a + long(self.random() * (b+1-a)) def randrange(self, a, b): return self.randint(a, b-1) @@ -234,9 +234,13 @@ class LCRandom31(MFXRandom): self.seed = (self.seed*214013L + 2531011L) & self.MAX_SEED return a + (int(self.seed >> 16) % (b+1-a)) + # select -##PysolRandom = LCRandom64 -PysolRandom = SysRandom +if sys.version_info >= (2,3): + PysolRandom = SysRandom +else: + PysolRandom = LCRandom64 + # /*********************************************************************** # // PySol support code diff --git a/pysollib/stack.py b/pysollib/stack.py index d3e28250..6876c8f0 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -274,6 +274,7 @@ class Stack: view.CARD_XOFFSET = 0 view.CARD_YOFFSET = 0 view.group = MfxCanvasGroup(view.canvas) + view.shrink_face_down = 1 ##view.group.move(view.x, view.y) # image items view.images = Struct( @@ -382,6 +383,11 @@ class Stack: # don't display a shadow if the YOFFSET of the stack # and the images don't match self.max_shadow_cards = 1 + if (self.game.app.opt.shrink_face_down and + type(ox) is int and type(oy) is int): + if ((ox == 0 and oy >= self.game.app.images.CARD_YOFFSET/2) or + (oy == 0 and ox >= self.game.app.images.CARD_XOFFSET/2)): + self.shrink_face_down = 2 # bottom image if self.is_visible: self.prepareBottom() @@ -702,10 +708,16 @@ class Stack: for c in model.cards: if c is card: break - x = x + view.CARD_XOFFSET[ix] - y = y + view.CARD_YOFFSET[iy] + d = self.shrink_face_down + if c.face_up: + x += self.CARD_XOFFSET[ix] + y += self.CARD_YOFFSET[iy] + else: + x += int(self.CARD_XOFFSET[ix]/d) + y += int(self.CARD_YOFFSET[iy]/d) ix = (ix + 1) % lx iy = (iy + 1) % ly + return (x, y) def getOffsetFor(self, card): @@ -742,8 +754,13 @@ class Stack: c.item.tkraise(item) item = c.item if not view.can_hide_cards: - x = x + view.CARD_XOFFSET[ix] - y = y + view.CARD_YOFFSET[iy] + d = self.shrink_face_down + if c.face_up: + x += self.CARD_XOFFSET[ix] + y += self.CARD_YOFFSET[iy] + else: + x += int(self.CARD_XOFFSET[ix]/d) + y += int(self.CARD_YOFFSET[iy]/d) ix = (ix + 1) % lx iy = (iy + 1) % ly c.moveTo(x, y) @@ -2240,6 +2257,9 @@ class InvisibleStack(Stack): # /*********************************************************************** # // ArbitraryStack (stack with arbitrary access) +# // +# // NB: don't support hint and demo for non-top cards +# // NB: this stack only for CARD_XOFFSET == 0 # ************************************************************************/ class ArbitraryStack(OpenStack): diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 7b773582..633da8ae 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -90,12 +90,12 @@ def createToolbarMenu(menubar, menu): variable=menubar.tkopt.toolbar_relief, value=Tkinter.RAISED, command=menubar.mOptToolbarRelief) - - submenu = MfxMenu(menu, label=n_('Compound'), tearoff=tearoff) - for comp, label in COMPOUNDS: - submenu.add_radiobutton(label=label, - variable=menubar.tkopt.toolbar_compound, - value=comp, command=menubar.mOptToolbarCompound) + if Tkinter.TkVersion >= 8.4: + submenu = MfxMenu(menu, label=n_('Compound'), tearoff=tearoff) + for comp, label in COMPOUNDS: + submenu.add_radiobutton( + label=label, variable=menubar.tkopt.toolbar_compound, + value=comp, command=menubar.mOptToolbarCompound) menu.add_separator() menu.add_radiobutton(label=n_("Hide"), variable=menubar.tkopt.toolbar, value=0, @@ -371,6 +371,7 @@ class PysolMenubar(PysolMenubarActions): submenu.add_checkbutton(label=n_("Card shado&w"), variable=self.tkopt.shadow, command=self.mOptShadow) submenu.add_checkbutton(label=n_("Shade &legal moves"), variable=self.tkopt.shade, command=self.mOptShade) submenu.add_checkbutton(label=n_("&Negative cards bottom"), variable=self.tkopt.negative_bottom, command=self.mOptNegativeBottom) + submenu.add_checkbutton(label=n_("Shrink face-down cards"), variable=self.tkopt.shrink_face_down, command=self.mOptShrinkFaceDown) submenu.add_checkbutton(label=n_("Shade &filled stacks"), variable=self.tkopt.shade_filled_stacks, command=self.mOptShadeFilledStacks) submenu = MfxMenu(menu, label=n_("A&nimations")) submenu.add_radiobutton(label=n_("&None"), variable=self.tkopt.animations, value=0, command=self.mOptAnimations) diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index 6baa6853..b291e678 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -349,8 +349,8 @@ class SelectGameDialogWithPreview(SelectGameDialog): info_frame = Tkinter.LabelFrame(right_frame, text=_('About game')) stats_frame = Tkinter.LabelFrame(right_frame, text=_('Statistics')) else: - info_frame = Tkinter.Frame(right_frame) - stats_frame = Tkinter.Frame(right_frame) + info_frame = Tkinter.Frame(right_frame, bd=2, relief='groove') + stats_frame = Tkinter.Frame(right_frame, bd=2, relief='groove') info_frame.grid(row=0, column=0, padx=padx, pady=pady, ipadx=padx, ipady=pady, sticky='nws') stats_frame.grid(row=0, column=1, padx=padx, pady=pady, @@ -485,14 +485,6 @@ class SelectGameDialogWithPreview(SelectGameDialog): ##self.top.wm_title("Select Game - " + self.app.getGameTitleName(gameid)) title = self.app.getGameTitleName(gameid) self.top.wm_title(_("Playable Preview - ") + title) -## if False: -## cw, ch = canvas.winfo_width(), canvas.winfo_height() -## if cw >= 100 and ch >= 100: -## MfxCanvasText(canvas, cw / 2, ch - 4, -## preview=0, anchor="s", text=_("Playable Area"), -## font=self.app.getFont("canvas_large")) -## if self.app.opt.table_text_color: -## canvas.setTextColor(self.app.opt.table_text_color_value) # self.preview_game = gi.gameclass(gi) self.preview_game.createPreview(self.preview_app) diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index 1b577346..bc3d2f67 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -144,7 +144,7 @@ class SoundOptionsDialog(MfxDialog): frame = Tkinter.LabelFrame(top_frame, text=_('Enable samles'), padx=5, pady=5) else: - frame = Tkinter.Frame(top_frame) + frame = Tkinter.Frame(top_frame, bd=2, relief='groove') frame.pack(expand=1, fill='both', padx=5, pady=5) frame.columnconfigure(0, weight=1) frame.columnconfigure(1, weight=1) diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 7a359574..5bba1d91 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -223,10 +223,6 @@ class tkHTMLParser(htmllib.HTMLParser): def handle_image(self, src, alt, ismap, align, width, height): self.formatter.writer.viewer.showImage(src, alt, ismap, align, width, height) - def do_br(self, attrs): - #self.formatter.add_line_break() - self.formatter.add_literal_data('\n') - # /*********************************************************************** # // diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index f03dd1ef..fa754965 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -214,7 +214,7 @@ class PysolToolbar(PysolToolbarActions): sep = self._createSeparator() sep.bind("<1>", self.clickHandler) sep.bind("<3>", self.rightclickHandler) - elif l == 'Pause' and Tkinter.TkVersion >= 8.4: + elif l == 'Pause': self._createButton(l, f, check=True, tooltip=t) else: self._createButton(l, f, tooltip=t) @@ -344,22 +344,24 @@ class PysolToolbar(PysolToolbarActions): position = len(self._widgets) bd = self.button_relief == 'flat' and 1 or 2 kw = { - 'position': position, - 'toolbar': self, - 'toolbar_name': name, - 'command': command, - 'takefocus': 0, - 'text': gettext(label), - 'bd': bd, - 'relief': self.button_relief, - 'overrelief': 'raised', - 'padx': self.button_pad, - 'pady': self.button_pad + 'position' : position, + 'toolbar' : self, + 'toolbar_name' : name, + 'command' : command, + 'takefocus' : 0, + 'text' : gettext(label), + 'bd' : bd, + 'relief' : self.button_relief, + 'padx' : self.button_pad, + 'pady' : self.button_pad } + if Tkinter.TkVersion >= 8.4: + kw['overrelief'] = 'raised' if image: kw['image'] = image if check: - kw['offrelief'] = self.button_relief + if Tkinter.TkVersion >= 8.4: + kw['offrelief'] = self.button_relief kw['indicatoron'] = False kw['selectcolor'] = '' button = ToolbarCheckbutton(self.frame, **kw) @@ -506,27 +508,30 @@ class PysolToolbar(PysolToolbarActions): if isinstance(w, ToolbarButton): w.config(relief=self.button_relief, bd=bd) elif isinstance(w, ToolbarCheckbutton): - w.config(relief=self.button_relief, - offrelief=self.button_relief, bd=bd) + w.config(relief=self.button_relief, bd=bd) + if Tkinter.TkVersion >= 8.4: + w.config(offrelief=self.button_relief) elif w.__class__ is ToolbarSeparator: # not ToolbarFlatSeparator w.config(relief=self.separator_relief) return True def setCompound(self, compound, force=False): + if Tkinter.TkVersion < 8.4: + return False if not force and self.compound == compound: return False for w in self._widgets: if not isinstance(w, (ToolbarButton, ToolbarCheckbutton)): continue if compound == 'text': - w.config(compound=Tkinter.NONE, image='') + w.config(compound='none', image='') else: image = getattr(self, w.toolbar_name+'_image') w.config(compound=compound, image=image) self.compound = compound return True - def _setOrient(self, orient=Tkinter.HORIZONTAL, force=False): + def _setOrient(self, orient='horizontal', force=False): if not force and self.orient == orient: return False for w in self._widgets: diff --git a/setup.py b/setup.py index 2da5fad8..0e35d451 100644 --- a/setup.py +++ b/setup.py @@ -57,7 +57,6 @@ kw = { 'packages' : ['pysollib', 'pysollib.tk', 'pysollib.games', - 'pysollib.games.contrib', 'pysollib.games.special', 'pysollib.games.ultra', 'pysollib.games.mahjongg'], From a74786ed32edce0a11c3153f6b07c6ff2c06142a Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 11 Aug 2006 21:09:32 +0000 Subject: [PATCH 043/266] + 5 new games - pysollib/acard.py, pysollib/tk/card.py - removed support of old version tk * misc. improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@44 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/games.pot | 8 +- po/pysol.pot | 346 ++++++++++++----------- po/ru_games.po | 14 +- po/ru_pysol.po | 416 +++++++++++++++------------- pysollib/acard.py | 8 +- pysollib/game.py | 2 +- pysollib/games/beleagueredcastle.py | 82 ++++++ pysollib/games/calculation.py | 102 +++++++ pysollib/games/klondike.py | 33 ++- pysollib/games/montecarlo.py | 49 ++++ pysollib/games/sultan.py | 21 +- pysollib/games/terrace.py | 2 +- pysollib/games/tournament.py | 60 ++++ pysollib/stack.py | 78 +++--- pysollib/tk/card.py | 36 +-- pysollib/tk/menubar.py | 2 +- scripts/all_games.py | 2 + 17 files changed, 784 insertions(+), 477 deletions(-) diff --git a/po/games.pot b/po/games.pot index fb51027c..d8839805 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Wed Aug 9 19:09:14 2006\n" +"POT-Creation-Date: Fri Aug 11 02:15:03 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1602,9 +1602,6 @@ msgstr "" msgid "Legion" msgstr "" -msgid "Leo" -msgstr "" - msgid "Les Quatre Coins" msgstr "" @@ -1944,9 +1941,6 @@ msgstr "" msgid "Mahjongg Lattice" msgstr "" -msgid "Mahjongg Leo" -msgstr "" - msgid "Mahjongg Lion" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index a61a78e6..ce48a38a 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Wed Aug 9 19:09:09 2006\n" +"POT-Creation-Date: Fri Aug 11 02:14:56 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -15,44 +15,44 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:358 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:360 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "" -#: pysollib/actions.py:371 pysollib/tk/menubar.py:698 -#: pysollib/tk/menubar.py:712 +#: pysollib/actions.py:373 pysollib/tk/menubar.py:699 +#: pysollib/tk/menubar.py:713 msgid "Select game" msgstr "" -#: pysollib/actions.py:394 +#: pysollib/actions.py:396 msgid "Invalid game number" msgstr "" -#: pysollib/actions.py:395 +#: pysollib/actions.py:397 msgid "" "Invalid game number\n" msgstr "" -#: pysollib/actions.py:412 +#: pysollib/actions.py:414 msgid "Select next game number" msgstr "" -#: pysollib/actions.py:421 pysollib/actions.py:431 +#: pysollib/actions.py:423 pysollib/actions.py:433 msgid "Select new game number" msgstr "" -#: pysollib/actions.py:422 +#: pysollib/actions.py:424 msgid "" "\n" "\n" "Enter new game number" msgstr "" -#: pysollib/actions.py:423 +#: pysollib/actions.py:425 msgid "&Next number" msgstr "" -#: pysollib/actions.py:423 pysollib/app.py:1142 pysollib/app.py:1154 +#: pysollib/actions.py:425 pysollib/app.py:1143 pysollib/app.py:1155 #: pysollib/game.py:904 pysollib/game.py:1828 pysollib/main.py:439 #: pysollib/main.py:447 pysollib/tk/colorsdialog.py:132 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 @@ -61,7 +61,7 @@ msgstr "" #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 #: pysollib/tk/soundoptionsdialog.py:170 pysollib/tk/soundoptionsdialog.py:211 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:503 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:499 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 #: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 #: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:777 @@ -70,12 +70,12 @@ msgstr "" msgid "&OK" msgstr "" -#: pysollib/actions.py:423 pysollib/app.py:1154 pysollib/game.py:904 +#: pysollib/actions.py:425 pysollib/app.py:1155 pysollib/game.py:904 #: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 #: pysollib/game.py:1318 pysollib/tk/colorsdialog.py:132 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 -#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:893 -#: pysollib/tk/menubar.py:895 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:894 +#: pysollib/tk/menubar.py:896 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:170 @@ -83,128 +83,128 @@ msgstr "" msgid "&Cancel" msgstr "" -#: pysollib/actions.py:439 +#: pysollib/actions.py:441 msgid "Select random game" msgstr "" -#: pysollib/actions.py:475 +#: pysollib/actions.py:477 msgid "Select next game" msgstr "" -#: pysollib/actions.py:508 pysollib/tk/toolbar.py:211 +#: pysollib/actions.py:510 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "" -#: pysollib/actions.py:558 +#: pysollib/actions.py:560 msgid "Clear bookmarks" msgstr "" -#: pysollib/actions.py:559 +#: pysollib/actions.py:561 msgid "Clear all bookmarks ?" msgstr "" -#: pysollib/actions.py:569 +#: pysollib/actions.py:571 msgid "Restart game" msgstr "" -#: pysollib/actions.py:570 +#: pysollib/actions.py:572 msgid "Restart this game ?" msgstr "" -#: pysollib/actions.py:611 +#: pysollib/actions.py:613 msgid "" "Comments for %s:\n" "\n" msgstr "" -#: pysollib/actions.py:613 +#: pysollib/actions.py:615 msgid "Comments for " msgstr "" -#: pysollib/actions.py:631 pysollib/actions.py:667 +#: pysollib/actions.py:633 pysollib/actions.py:669 msgid "Error while writing to file" msgstr "" -#: pysollib/actions.py:634 pysollib/actions.py:670 +#: pysollib/actions.py:636 pysollib/actions.py:672 msgid " Info" msgstr "" -#: pysollib/actions.py:635 +#: pysollib/actions.py:637 msgid "" "Comments were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:652 +#: pysollib/actions.py:654 msgid "Demo statistics" msgstr "" -#: pysollib/actions.py:655 +#: pysollib/actions.py:657 msgid "Your statistics" msgstr "" -#: pysollib/actions.py:671 +#: pysollib/actions.py:673 msgid "" " were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:685 +#: pysollib/actions.py:687 msgid " Demo" msgstr "" -#: pysollib/actions.py:685 +#: pysollib/actions.py:687 msgid " Demo " msgstr "" -#: pysollib/actions.py:688 pysollib/actions.py:706 +#: pysollib/actions.py:690 pysollib/actions.py:708 msgid " for " msgstr "" -#: pysollib/actions.py:694 pysollib/actions.py:713 +#: pysollib/actions.py:696 pysollib/actions.py:715 msgid "Statistics for " msgstr "" -#: pysollib/actions.py:697 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:699 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "" -#: pysollib/actions.py:700 +#: pysollib/actions.py:702 msgid "Full log" msgstr "" -#: pysollib/actions.py:703 +#: pysollib/actions.py:705 msgid "Session log" msgstr "" -#: pysollib/actions.py:709 +#: pysollib/actions.py:711 msgid "Game Info" msgstr "" -#: pysollib/actions.py:718 +#: pysollib/actions.py:720 msgid "Full log for " msgstr "" -#: pysollib/actions.py:723 +#: pysollib/actions.py:725 msgid "Session log for " msgstr "" -#: pysollib/actions.py:728 +#: pysollib/actions.py:730 msgid "Reset all statistics" msgstr "" -#: pysollib/actions.py:729 +#: pysollib/actions.py:731 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" msgstr "" -#: pysollib/actions.py:735 +#: pysollib/actions.py:737 msgid "Reset game statistics" msgstr "" -#: pysollib/actions.py:736 +#: pysollib/actions.py:738 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -212,27 +212,27 @@ msgid "" "%s ?" msgstr "" -#: pysollib/actions.py:792 +#: pysollib/actions.py:794 msgid "Play demo" msgstr "" -#: pysollib/actions.py:803 +#: pysollib/actions.py:805 msgid "Set player options" msgstr "" -#: pysollib/actions.py:898 +#: pysollib/actions.py:906 msgid "Sound settings" msgstr "" -#: pysollib/actions.py:919 +#: pysollib/actions.py:927 msgid "Set colors" msgstr "" -#: pysollib/actions.py:938 +#: pysollib/actions.py:946 msgid "Set fonts" msgstr "" -#: pysollib/actions.py:947 +#: pysollib/actions.py:955 msgid "Set timeouts" msgstr "" @@ -240,23 +240,23 @@ msgstr "" msgid "Unknown" msgstr "" -#: pysollib/app.py:1004 +#: pysollib/app.py:1005 msgid "Loading %s %s..." msgstr "" -#: pysollib/app.py:1039 +#: pysollib/app.py:1040 msgid " load error" msgstr "" -#: pysollib/app.py:1040 +#: pysollib/app.py:1041 msgid "Error while loading " msgstr "" -#: pysollib/app.py:1134 +#: pysollib/app.py:1135 msgid "Incompatible " msgstr "" -#: pysollib/app.py:1136 +#: pysollib/app.py:1137 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -265,7 +265,7 @@ msgid "" "Please select a %s type %s.\n" msgstr "" -#: pysollib/app.py:1152 +#: pysollib/app.py:1153 msgid "Please select a %s type %s" msgstr "" @@ -678,14 +678,14 @@ msgstr "" #: pysollib/games/braid.py:248 pysollib/games/camelot.py:555 #: pysollib/games/napoleon.py:182 pysollib/games/ultra/dashavatara.py:959 -#: pysollib/games/ultra/hanafuda1.py:256 pysollib/games/ultra/hexadeck.py:1190 +#: pysollib/games/ultra/hanafuda1.py:257 pysollib/games/ultra/hexadeck.py:1190 #: pysollib/games/ultra/mughal.py:802 msgid " Ascending" msgstr "" #: pysollib/games/braid.py:250 pysollib/games/camelot.py:554 #: pysollib/games/napoleon.py:184 pysollib/games/ultra/dashavatara.py:961 -#: pysollib/games/ultra/hanafuda1.py:258 pysollib/games/ultra/hexadeck.py:1192 +#: pysollib/games/ultra/hanafuda1.py:259 pysollib/games/ultra/hexadeck.py:1192 #: pysollib/games/ultra/mughal.py:804 msgid " Descending" msgstr "" @@ -699,12 +699,12 @@ msgid "" msgstr "" #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1287 pysollib/util.py:81 +#: pysollib/stack.py:1304 pysollib/util.py:81 msgid "King" msgstr "" #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1286 pysollib/util.py:81 +#: pysollib/stack.py:1303 pysollib/util.py:81 msgid "Queen" msgstr "" @@ -721,11 +721,11 @@ msgid "X" msgstr "" #: pysollib/games/golf.py:114 pysollib/games/golf.py:300 -#: pysollib/stack.py:1898 +#: pysollib/stack.py:1915 msgid "Tableau. No building." msgstr "" -#: pysollib/games/golf.py:384 pysollib/stack.py:1831 +#: pysollib/games/golf.py:385 pysollib/stack.py:1848 msgid "Foundation. Build up regardless of suit." msgstr "" @@ -737,7 +737,7 @@ msgstr "" msgid "Reserve. Only Kings are acceptable." msgstr "" -#: pysollib/games/larasgame.py:163 pysollib/stack.py:1508 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1525 msgid "Round %d" msgstr "" @@ -786,7 +786,7 @@ msgstr "" msgid "Deal %d" msgstr "" -#: pysollib/games/numerica.py:259 pysollib/games/royalcotillion.py:841 +#: pysollib/games/numerica.py:259 pysollib/games/royalcotillion.py:840 msgid "Foundation. Build up by color." msgstr "" @@ -840,7 +840,7 @@ msgstr "" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1288 pysollib/util.py:80 +#: pysollib/stack.py:1305 pysollib/util.py:80 msgid "Ace" msgstr "" @@ -1566,201 +1566,201 @@ msgstr "" msgid "Top 10" msgstr "" -#: pysollib/stack.py:1282 +#: pysollib/stack.py:1299 msgid "Base card - %s." msgstr "" -#: pysollib/stack.py:1283 +#: pysollib/stack.py:1300 msgid "Empty row cannot be filled." msgstr "" -#: pysollib/stack.py:1284 +#: pysollib/stack.py:1301 msgid "any card" msgstr "" -#: pysollib/stack.py:1285 pysollib/util.py:81 +#: pysollib/stack.py:1302 pysollib/util.py:81 msgid "Jack" msgstr "" -#: pysollib/stack.py:1298 +#: pysollib/stack.py:1315 msgid "No cards" msgstr "" -#: pysollib/stack.py:1299 +#: pysollib/stack.py:1316 msgid "1 card" msgstr "" -#: pysollib/stack.py:1300 +#: pysollib/stack.py:1317 msgid " cards" msgstr "" -#: pysollib/stack.py:1517 pysollib/stack.py:1519 pysollib/stack.py:1550 +#: pysollib/stack.py:1534 pysollib/stack.py:1536 pysollib/stack.py:1567 msgid "Redeal" msgstr "" -#: pysollib/stack.py:1519 +#: pysollib/stack.py:1536 msgid "Stop" msgstr "" -#: pysollib/stack.py:1570 +#: pysollib/stack.py:1587 msgid "Variable redeals." msgstr "" -#: pysollib/stack.py:1571 +#: pysollib/stack.py:1588 msgid "Unlimited redeals." msgstr "" -#: pysollib/stack.py:1572 +#: pysollib/stack.py:1589 msgid "No redeals." msgstr "" -#: pysollib/stack.py:1573 +#: pysollib/stack.py:1590 msgid "One redeal." msgstr "" -#: pysollib/stack.py:1574 +#: pysollib/stack.py:1591 msgid " redeals." msgstr "" -#: pysollib/stack.py:1576 +#: pysollib/stack.py:1593 msgid "Talon." msgstr "" -#: pysollib/stack.py:1762 pysollib/stack.py:2212 +#: pysollib/stack.py:1779 pysollib/stack.py:2229 msgid "Reserve. No building." msgstr "" -#: pysollib/stack.py:1799 +#: pysollib/stack.py:1816 msgid "Foundation." msgstr "" -#: pysollib/stack.py:1815 +#: pysollib/stack.py:1832 msgid "Foundation. Build up by suit." msgstr "" -#: pysollib/stack.py:1816 +#: pysollib/stack.py:1833 msgid "Foundation. Build down by suit." msgstr "" -#: pysollib/stack.py:1817 pysollib/stack.py:1833 pysollib/stack.py:1855 +#: pysollib/stack.py:1834 pysollib/stack.py:1850 pysollib/stack.py:1872 msgid "Foundation. Build by same rank." msgstr "" -#: pysollib/stack.py:1832 +#: pysollib/stack.py:1849 msgid "Foundation. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1853 +#: pysollib/stack.py:1870 msgid "Foundation. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1854 +#: pysollib/stack.py:1871 msgid "Foundation. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1928 +#: pysollib/stack.py:1945 msgid "Tableau. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1929 +#: pysollib/stack.py:1946 msgid "Tableau. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1930 pysollib/stack.py:1940 pysollib/stack.py:1949 -#: pysollib/stack.py:1958 pysollib/stack.py:1968 pysollib/stack.py:1991 -#: pysollib/stack.py:2001 +#: pysollib/stack.py:1947 pysollib/stack.py:1957 pysollib/stack.py:1966 +#: pysollib/stack.py:1975 pysollib/stack.py:1985 pysollib/stack.py:2008 +#: pysollib/stack.py:2018 msgid "Tableau. Build by same rank." msgstr "" -#: pysollib/stack.py:1938 +#: pysollib/stack.py:1955 msgid "Tableau. Build up by color." msgstr "" -#: pysollib/stack.py:1939 +#: pysollib/stack.py:1956 msgid "Tableau. Build down by color." msgstr "" -#: pysollib/stack.py:1947 +#: pysollib/stack.py:1964 msgid "Tableau. Build up by suit." msgstr "" -#: pysollib/stack.py:1948 +#: pysollib/stack.py:1965 msgid "Tableau. Build down by suit." msgstr "" -#: pysollib/stack.py:1956 +#: pysollib/stack.py:1973 msgid "Tableau. Build up regardless of suit." msgstr "" -#: pysollib/stack.py:1957 +#: pysollib/stack.py:1974 msgid "Tableau. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1966 +#: pysollib/stack.py:1983 msgid "Tableau. Build up in any suit but the same." msgstr "" -#: pysollib/stack.py:1967 +#: pysollib/stack.py:1984 msgid "Tableau. Build down in any suit but the same." msgstr "" -#: pysollib/stack.py:1989 +#: pysollib/stack.py:2006 msgid "Tableau. Build up regardless of suit. Sequences of cards in alternate color can be moved as a unit." msgstr "" -#: pysollib/stack.py:1990 +#: pysollib/stack.py:2007 msgid "Tableau. Build down regardless of suit. Sequences of cards in alternate color can be moved as a unit." msgstr "" -#: pysollib/stack.py:1999 +#: pysollib/stack.py:2016 msgid "Tableau. Build up regardless of suit. Sequences of cards in the same suit can be moved as a unit." msgstr "" -#: pysollib/stack.py:2000 +#: pysollib/stack.py:2017 msgid "Tableau. Build down regardless of suit. Sequences of cards in the same suit can be moved as a unit." msgstr "" -#: pysollib/stack.py:2022 +#: pysollib/stack.py:2039 msgid "Tableau. Build up by alternate color, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:2023 +#: pysollib/stack.py:2040 msgid "Tableau. Build down by alternate color, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:2024 pysollib/stack.py:2037 +#: pysollib/stack.py:2041 pysollib/stack.py:2054 msgid "Tableau. Build by same rank, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:2035 +#: pysollib/stack.py:2052 msgid "Tableau. Build up by suit, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:2036 +#: pysollib/stack.py:2053 msgid "Tableau. Build down by suit, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:2069 +#: pysollib/stack.py:2086 msgid "Tableau. Build up or down by color." msgstr "" -#: pysollib/stack.py:2080 +#: pysollib/stack.py:2097 msgid "Tableau. Build up or down by alternate color." msgstr "" -#: pysollib/stack.py:2091 +#: pysollib/stack.py:2108 msgid "Tableau. Build up or down by suit." msgstr "" -#: pysollib/stack.py:2102 +#: pysollib/stack.py:2119 msgid "Tableau. Build up or down regardless of suit." msgstr "" -#: pysollib/stack.py:2113 +#: pysollib/stack.py:2130 msgid "Waste." msgstr "" -#: pysollib/stack.py:2213 +#: pysollib/stack.py:2230 msgid "Free cell." msgstr "" @@ -2082,7 +2082,7 @@ msgstr "" msgid "&Deal cards" msgstr "" -#: pysollib/tk/menubar.py:307 pysollib/tk/menubar.py:342 +#: pysollib/tk/menubar.py:307 msgid "&Auto drop" msgstr "" @@ -2162,6 +2162,10 @@ msgstr "" msgid "Auto &face up" msgstr "" +#: pysollib/tk/menubar.py:342 +msgid "A&uto drop" +msgstr "" + #: pysollib/tk/menubar.py:343 msgid "Auto &deal" msgstr "" @@ -2243,159 +2247,163 @@ msgid "&Negative cards bottom" msgstr "" #: pysollib/tk/menubar.py:374 -msgid "Shade &filled stacks" +msgid "Shrink face-down cards" msgstr "" #: pysollib/tk/menubar.py:375 -msgid "A&nimations" +msgid "Shade &filled stacks" msgstr "" #: pysollib/tk/menubar.py:376 -msgid "&None" +msgid "A&nimations" msgstr "" #: pysollib/tk/menubar.py:377 -msgid "&Timer based" +msgid "&None" msgstr "" #: pysollib/tk/menubar.py:378 -msgid "&Fast" +msgid "&Timer based" msgstr "" #: pysollib/tk/menubar.py:379 -msgid "&Slow" +msgid "&Fast" msgstr "" #: pysollib/tk/menubar.py:380 -msgid "&Very slow" +msgid "&Slow" msgstr "" #: pysollib/tk/menubar.py:381 -msgid "Stick&y mouse" +msgid "&Very slow" msgstr "" #: pysollib/tk/menubar.py:382 +msgid "Stick&y mouse" +msgstr "" + +#: pysollib/tk/menubar.py:383 msgid "Use mouse for undo/redo" msgstr "" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:385 msgid "&Fonts..." msgstr "" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:386 msgid "&Colors..." msgstr "" -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:387 msgid "Time&outs..." msgstr "" -#: pysollib/tk/menubar.py:388 +#: pysollib/tk/menubar.py:389 msgid "&Toolbar" msgstr "" -#: pysollib/tk/menubar.py:390 +#: pysollib/tk/menubar.py:391 msgid "Stat&usbar" msgstr "" -#: pysollib/tk/menubar.py:391 +#: pysollib/tk/menubar.py:392 msgid "Show &statusbar" msgstr "" -#: pysollib/tk/menubar.py:392 +#: pysollib/tk/menubar.py:393 msgid "Show &number of cards" msgstr "" -#: pysollib/tk/menubar.py:393 +#: pysollib/tk/menubar.py:394 msgid "Show &help bar" msgstr "" -#: pysollib/tk/menubar.py:394 +#: pysollib/tk/menubar.py:395 msgid "Save games &geometry" msgstr "" -#: pysollib/tk/menubar.py:395 +#: pysollib/tk/menubar.py:396 msgid "&Demo logo" msgstr "" -#: pysollib/tk/menubar.py:396 +#: pysollib/tk/menubar.py:397 msgid "Startup splash sc&reen" msgstr "" -#: pysollib/tk/menubar.py:402 +#: pysollib/tk/menubar.py:403 msgid "&Help" msgstr "" -#: pysollib/tk/menubar.py:403 +#: pysollib/tk/menubar.py:404 msgid "&Contents" msgstr "" -#: pysollib/tk/menubar.py:404 +#: pysollib/tk/menubar.py:405 msgid "&How to play" msgstr "" -#: pysollib/tk/menubar.py:405 +#: pysollib/tk/menubar.py:406 msgid "&Rules for this game" msgstr "" -#: pysollib/tk/menubar.py:406 +#: pysollib/tk/menubar.py:407 msgid "&License terms" msgstr "" -#: pysollib/tk/menubar.py:409 +#: pysollib/tk/menubar.py:410 msgid "&About " msgstr "" -#: pysollib/tk/menubar.py:521 +#: pysollib/tk/menubar.py:522 msgid "All &games..." msgstr "" -#: pysollib/tk/menubar.py:523 +#: pysollib/tk/menubar.py:524 msgid "Playable pre&view..." msgstr "" -#: pysollib/tk/menubar.py:572 +#: pysollib/tk/menubar.py:573 msgid "&Mahjongg games" msgstr "" -#: pysollib/tk/menubar.py:610 +#: pysollib/tk/menubar.py:611 msgid "&Popular games" msgstr "" -#: pysollib/tk/menubar.py:618 +#: pysollib/tk/menubar.py:619 msgid "&French games" msgstr "" -#: pysollib/tk/menubar.py:625 +#: pysollib/tk/menubar.py:626 msgid "&Oriental games" msgstr "" -#: pysollib/tk/menubar.py:633 +#: pysollib/tk/menubar.py:634 msgid "&Special games" msgstr "" -#: pysollib/tk/menubar.py:639 +#: pysollib/tk/menubar.py:640 msgid "All games by name" msgstr "" -#: pysollib/tk/menubar.py:893 pysollib/tk/menubar.py:895 +#: pysollib/tk/menubar.py:894 pysollib/tk/menubar.py:896 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "" -#: pysollib/tk/menubar.py:895 +#: pysollib/tk/menubar.py:896 msgid "&Info..." msgstr "" -#: pysollib/tk/menubar.py:898 +#: pysollib/tk/menubar.py:899 msgid "Select " msgstr "" -#: pysollib/tk/menubar.py:959 +#: pysollib/tk/menubar.py:960 msgid "Select table background" msgstr "" -#: pysollib/tk/menubar.py:971 pysollib/tk/selecttile.py:177 +#: pysollib/tk/menubar.py:972 pysollib/tk/selecttile.py:177 msgid "Select table color" msgstr "" @@ -2550,23 +2558,23 @@ msgstr "" msgid "by Skill Level" msgstr "" -#: pysollib/tk/selectgame.py:170 pysollib/tk/selectgame.py:542 +#: pysollib/tk/selectgame.py:170 pysollib/tk/selectgame.py:534 msgid "Luck only" msgstr "" -#: pysollib/tk/selectgame.py:171 pysollib/tk/selectgame.py:543 +#: pysollib/tk/selectgame.py:171 pysollib/tk/selectgame.py:535 msgid "Mostly luck" msgstr "" -#: pysollib/tk/selectgame.py:172 pysollib/tk/selectgame.py:544 +#: pysollib/tk/selectgame.py:172 pysollib/tk/selectgame.py:536 msgid "Balanced" msgstr "" -#: pysollib/tk/selectgame.py:173 pysollib/tk/selectgame.py:545 +#: pysollib/tk/selectgame.py:173 pysollib/tk/selectgame.py:537 msgid "Mostly skill" msgstr "" -#: pysollib/tk/selectgame.py:174 pysollib/tk/selectgame.py:546 +#: pysollib/tk/selectgame.py:174 pysollib/tk/selectgame.py:538 msgid "Skill only" msgstr "" @@ -2744,11 +2752,11 @@ msgstr "" msgid "Playable Preview - " msgstr "" -#: pysollib/tk/selectgame.py:549 +#: pysollib/tk/selectgame.py:541 msgid "variable" msgstr "" -#: pysollib/tk/selectgame.py:550 +#: pysollib/tk/selectgame.py:542 msgid "unlimited" msgstr "" @@ -2930,23 +2938,23 @@ msgstr "" msgid "Text only" msgstr "" -#: pysollib/tk/tkhtml.py:255 +#: pysollib/tk/tkhtml.py:251 msgid "Index" msgstr "" -#: pysollib/tk/tkhtml.py:259 +#: pysollib/tk/tkhtml.py:255 msgid "Back" msgstr "" -#: pysollib/tk/tkhtml.py:263 +#: pysollib/tk/tkhtml.py:259 msgid "Forward" msgstr "" -#: pysollib/tk/tkhtml.py:267 +#: pysollib/tk/tkhtml.py:263 msgid "Close" msgstr "" -#: pysollib/tk/tkhtml.py:389 +#: pysollib/tk/tkhtml.py:385 msgid "" "HTML limitation:\n" "The %s protocol is not supported yet.\n" @@ -2956,7 +2964,7 @@ msgid "" "%s\n" msgstr "" -#: pysollib/tk/tkhtml.py:414 pysollib/tk/tkhtml.py:418 +#: pysollib/tk/tkhtml.py:410 pysollib/tk/tkhtml.py:414 msgid "" "Unable to service request:\n" msgstr "" @@ -3204,7 +3212,7 @@ msgstr "" msgid "Player options" msgstr "" -#: pysollib/tk/toolbar.py:464 +#: pysollib/tk/toolbar.py:466 msgid "Toolbar" msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 49ddfe07..5fd798ed 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Wed Aug 9 19:09:14 2006\n" +"POT-Creation-Date: Fri Aug 11 02:15:03 2006\n" "PO-Revision-Date: 2006-08-09 23:52+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" @@ -1644,9 +1644,6 @@ msgstr "Le Grande Teton" msgid "Legion" msgstr "Легион" -msgid "Leo" -msgstr "Лев" - msgid "Les Quatre Coins" msgstr "Les Quatre Coins" @@ -1990,9 +1987,6 @@ msgstr "Маджонг Лабиринт" msgid "Mahjongg Lattice" msgstr "Маджонг Решётка" -msgid "Mahjongg Leo" -msgstr "Маджонг Лев" - msgid "Mahjongg Lion" msgstr "Маджонг Лион" @@ -3711,6 +3705,12 @@ msgstr "Зевс" msgid "Zodiac" msgstr "Зодиак" +#~ msgid "Leo" +#~ msgstr "Лев" + +#~ msgid "Mahjongg Leo" +#~ msgstr "Маджонг Лев" + #, fuzzy #~ msgid "Big Ground" #~ msgstr "Большая гора" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 8690c272..9b9773f1 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Wed Aug 9 19:09:09 2006\n" -"PO-Revision-Date: 2006-08-10 00:30+0400\n" +"POT-Creation-Date: Fri Aug 11 02:14:56 2006\n" +"PO-Revision-Date: 2006-08-11 02:13+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -14,32 +14,32 @@ msgstr "" "Content-Transfer-Encoding: utf-8\n" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:358 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:360 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "Новая игра" -#: pysollib/actions.py:371 pysollib/tk/menubar.py:698 -#: pysollib/tk/menubar.py:712 +#: pysollib/actions.py:373 pysollib/tk/menubar.py:699 +#: pysollib/tk/menubar.py:713 msgid "Select game" msgstr "Выбрать игру" -#: pysollib/actions.py:394 +#: pysollib/actions.py:396 msgid "Invalid game number" msgstr "Неправильный номер игры" -#: pysollib/actions.py:395 +#: pysollib/actions.py:397 msgid "Invalid game number\n" msgstr "Неправильный номер игры\n" -#: pysollib/actions.py:412 +#: pysollib/actions.py:414 msgid "Select next game number" msgstr "Выберите номер следующей игры" -#: pysollib/actions.py:421 pysollib/actions.py:431 +#: pysollib/actions.py:423 pysollib/actions.py:433 msgid "Select new game number" msgstr "Выберите номер новой игры" -#: pysollib/actions.py:422 +#: pysollib/actions.py:424 msgid "" "\n" "\n" @@ -49,11 +49,11 @@ msgstr "" "\n" "Введите номер новой игры" -#: pysollib/actions.py:423 +#: pysollib/actions.py:425 msgid "&Next number" msgstr "&Следующий номер" -#: pysollib/actions.py:423 pysollib/app.py:1142 pysollib/app.py:1154 +#: pysollib/actions.py:425 pysollib/app.py:1143 pysollib/app.py:1155 #: pysollib/game.py:904 pysollib/game.py:1828 pysollib/main.py:439 #: pysollib/main.py:447 pysollib/tk/colorsdialog.py:132 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 @@ -62,7 +62,7 @@ msgstr "&Следующий номер" #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 #: pysollib/tk/soundoptionsdialog.py:170 pysollib/tk/soundoptionsdialog.py:211 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:503 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:499 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 #: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 #: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:777 @@ -71,12 +71,12 @@ msgstr "&Следующий номер" msgid "&OK" msgstr "&ОК" -#: pysollib/actions.py:423 pysollib/app.py:1154 pysollib/game.py:904 +#: pysollib/actions.py:425 pysollib/app.py:1155 pysollib/game.py:904 #: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 #: pysollib/game.py:1318 pysollib/tk/colorsdialog.py:132 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 -#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:893 -#: pysollib/tk/menubar.py:895 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:894 +#: pysollib/tk/menubar.py:896 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:170 @@ -84,35 +84,35 @@ msgstr "&ОК" msgid "&Cancel" msgstr "От&мена" -#: pysollib/actions.py:439 +#: pysollib/actions.py:441 msgid "Select random game" msgstr "Выбор случайной игры" -#: pysollib/actions.py:475 +#: pysollib/actions.py:477 msgid "Select next game" msgstr "Выбрать следующую игру" -#: pysollib/actions.py:508 pysollib/tk/toolbar.py:211 +#: pysollib/actions.py:510 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "Выйти из " -#: pysollib/actions.py:558 +#: pysollib/actions.py:560 msgid "Clear bookmarks" msgstr "Удалить закладки" -#: pysollib/actions.py:559 +#: pysollib/actions.py:561 msgid "Clear all bookmarks ?" msgstr "Удалить все закладки?" -#: pysollib/actions.py:569 +#: pysollib/actions.py:571 msgid "Restart game" msgstr "Начать игру с начала" -#: pysollib/actions.py:570 +#: pysollib/actions.py:572 msgid "Restart this game ?" msgstr "Начать игру с начала?" -#: pysollib/actions.py:611 +#: pysollib/actions.py:613 msgid "" "Comments for %s:\n" "\n" @@ -120,19 +120,19 @@ msgstr "" "Комментарий для %s:\n" "\n" -#: pysollib/actions.py:613 +#: pysollib/actions.py:615 msgid "Comments for " msgstr "Комментарий для " -#: pysollib/actions.py:631 pysollib/actions.py:667 +#: pysollib/actions.py:633 pysollib/actions.py:669 msgid "Error while writing to file" msgstr "Ошибка при записи в файл" -#: pysollib/actions.py:634 pysollib/actions.py:670 +#: pysollib/actions.py:636 pysollib/actions.py:672 msgid " Info" msgstr " Информация" -#: pysollib/actions.py:635 +#: pysollib/actions.py:637 msgid "" "Comments were appended to\n" "\n" @@ -140,15 +140,15 @@ msgstr "" "Комментарий добавлен в файл\n" "\n" -#: pysollib/actions.py:652 +#: pysollib/actions.py:654 msgid "Demo statistics" msgstr "Статистика демо" -#: pysollib/actions.py:655 +#: pysollib/actions.py:657 msgid "Your statistics" msgstr "Ваша статистика" -#: pysollib/actions.py:671 +#: pysollib/actions.py:673 msgid "" " were appended to\n" "\n" @@ -156,52 +156,52 @@ msgstr "" " добавлена в файл\n" "\n" -#: pysollib/actions.py:685 +#: pysollib/actions.py:687 msgid " Demo" msgstr " Демо" -#: pysollib/actions.py:685 +#: pysollib/actions.py:687 msgid " Demo " msgstr " Демо " -#: pysollib/actions.py:688 pysollib/actions.py:706 +#: pysollib/actions.py:690 pysollib/actions.py:708 msgid " for " msgstr " для " -#: pysollib/actions.py:694 pysollib/actions.py:713 +#: pysollib/actions.py:696 pysollib/actions.py:715 msgid "Statistics for " msgstr "Статистика игры " -#: pysollib/actions.py:697 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:699 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "Статистика" -#: pysollib/actions.py:700 +#: pysollib/actions.py:702 msgid "Full log" msgstr "Полный лог" -#: pysollib/actions.py:703 +#: pysollib/actions.py:705 msgid "Session log" msgstr "Лог сессии" -#: pysollib/actions.py:709 +#: pysollib/actions.py:711 msgid "Game Info" msgstr "Информация об игре" -#: pysollib/actions.py:718 +#: pysollib/actions.py:720 msgid "Full log for " msgstr "Полный лог для " -#: pysollib/actions.py:723 +#: pysollib/actions.py:725 msgid "Session log for " msgstr "Лог сессии для " -#: pysollib/actions.py:728 +#: pysollib/actions.py:730 msgid "Reset all statistics" msgstr "Очистить всю статистику" -#: pysollib/actions.py:729 +#: pysollib/actions.py:731 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" @@ -209,11 +209,11 @@ msgstr "" "Очистить всю статистику и лог для игрока\n" "%s?" -#: pysollib/actions.py:735 +#: pysollib/actions.py:737 msgid "Reset game statistics" msgstr "Очистить статистику игры" -#: pysollib/actions.py:736 +#: pysollib/actions.py:738 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -225,27 +225,27 @@ msgstr "" "и игры\n" "%s?" -#: pysollib/actions.py:792 +#: pysollib/actions.py:794 msgid "Play demo" msgstr "Показать демо" -#: pysollib/actions.py:803 +#: pysollib/actions.py:805 msgid "Set player options" msgstr "Установить настройки игрока" -#: pysollib/actions.py:898 +#: pysollib/actions.py:906 msgid "Sound settings" msgstr "Настройка звука" -#: pysollib/actions.py:919 +#: pysollib/actions.py:927 msgid "Set colors" msgstr "Настроить цвета" -#: pysollib/actions.py:938 +#: pysollib/actions.py:946 msgid "Set fonts" msgstr "Настроить шрифт" -#: pysollib/actions.py:947 +#: pysollib/actions.py:955 msgid "Set timeouts" msgstr "Настроить таймауты" @@ -253,23 +253,23 @@ msgstr "Настроить таймауты" msgid "Unknown" msgstr "Неизвестный" -#: pysollib/app.py:1004 +#: pysollib/app.py:1005 msgid "Loading %s %s..." msgstr "Загружается %s %s..." -#: pysollib/app.py:1039 +#: pysollib/app.py:1040 msgid " load error" msgstr " ошибка при загрузке" -#: pysollib/app.py:1040 +#: pysollib/app.py:1041 msgid "Error while loading " msgstr "Ошибка при загрузке" -#: pysollib/app.py:1134 +#: pysollib/app.py:1135 msgid "Incompatible " msgstr "Несовместимый " -#: pysollib/app.py:1136 +#: pysollib/app.py:1137 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -283,7 +283,7 @@ msgstr "" "\n" "Необходимо выбрать %s типа %s.\n" -#: pysollib/app.py:1152 +#: pysollib/app.py:1153 msgid "Please select a %s type %s" msgstr "Выберите %s типа %s" @@ -738,14 +738,14 @@ msgstr "Игровой стол. Складывать не считаясь с #: pysollib/games/braid.py:248 pysollib/games/camelot.py:555 #: pysollib/games/napoleon.py:182 pysollib/games/ultra/dashavatara.py:959 -#: pysollib/games/ultra/hanafuda1.py:256 pysollib/games/ultra/hexadeck.py:1190 +#: pysollib/games/ultra/hanafuda1.py:257 pysollib/games/ultra/hexadeck.py:1190 #: pysollib/games/ultra/mughal.py:802 msgid " Ascending" msgstr " вверх" #: pysollib/games/braid.py:250 pysollib/games/camelot.py:554 #: pysollib/games/napoleon.py:184 pysollib/games/ultra/dashavatara.py:961 -#: pysollib/games/ultra/hanafuda1.py:258 pysollib/games/ultra/hexadeck.py:1192 +#: pysollib/games/ultra/hanafuda1.py:259 pysollib/games/ultra/hexadeck.py:1192 #: pysollib/games/ultra/mughal.py:804 msgid " Descending" msgstr " вниз" @@ -763,18 +763,19 @@ msgstr "" "4: 8 Д 3 7 В 2 6 10 Т 5 9 К" #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1287 pysollib/util.py:81 +#: pysollib/stack.py:1304 pysollib/util.py:81 msgid "King" msgstr "Король" #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1286 pysollib/util.py:81 +#: pysollib/stack.py:1303 pysollib/util.py:81 msgid "Queen" msgstr "Королева" #: pysollib/games/curdsandwhey.py:60 msgid "Tableau. Build down by suit or of the same rank." -msgstr "Игровой стол. Складывать в масть по убыванию или с таким же достоинством." +msgstr "" +"Игровой стол. Складывать в масть по убыванию или с таким же достоинством." #: pysollib/games/fan.py:280 msgid "Draw" @@ -785,11 +786,11 @@ msgid "X" msgstr "Х" #: pysollib/games/golf.py:114 pysollib/games/golf.py:300 -#: pysollib/stack.py:1898 +#: pysollib/stack.py:1915 msgid "Tableau. No building." msgstr "Игровой стол. Без выкладывания." -#: pysollib/games/golf.py:384 pysollib/stack.py:1831 +#: pysollib/games/golf.py:385 pysollib/stack.py:1848 msgid "Foundation. Build up regardless of suit." msgstr "Базовая ячейка. Складывать по возрастанию не считаясь с мастью." @@ -801,7 +802,7 @@ msgstr "Баланс $%d" msgid "Reserve. Only Kings are acceptable." msgstr "Резерв. Только для королей." -#: pysollib/games/larasgame.py:163 pysollib/stack.py:1508 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1525 msgid "Round %d" msgstr "Раунд %d" @@ -865,7 +866,7 @@ msgstr "Раунд %d/%d" msgid "Deal %d" msgstr "Сдача %d" -#: pysollib/games/numerica.py:259 pysollib/games/royalcotillion.py:841 +#: pysollib/games/numerica.py:259 pysollib/games/royalcotillion.py:840 msgid "Foundation. Build up by color." msgstr "Базовая ячейка. Складывать по возрастанию в соответствии с цветом." @@ -930,7 +931,7 @@ msgstr "Жезлы" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1288 pysollib/util.py:80 +#: pysollib/stack.py:1305 pysollib/util.py:80 msgid "Ace" msgstr "Туз" @@ -1204,19 +1205,25 @@ msgstr "" msgid "" "Tableau. Build down in any suit but the same, can move any face-up cards " "regardless of sequence." -msgstr "Игровой стол. Складывать по убыванию в любую масть кроме такой же, можно перемещать любую серию открытых карт." +msgstr "" +"Игровой стол. Складывать по убыванию в любую масть кроме такой же, можно " +"перемещать любую серию открытых карт." #: pysollib/games/yukon.py:198 msgid "" "Tableau. Build up or down by suit, can move any face-up cards regardless of " "sequence." -msgstr "Игровой стол. Складывать по возрастанию или убыванию в соответствии с мастью, можно перемещать любую серию открытых карт." +msgstr "" +"Игровой стол. Складывать по возрастанию или убыванию в соответствии с " +"мастью, можно перемещать любую серию открытых карт." #: pysollib/games/yukon.py:215 msgid "" "Tableau. Build up or down by alternate color, can move any face-up cards " "regardless of sequence." -msgstr "Игровой стол. Складывать по возрастанию или убыванию чередуя цвет, можно перемещать любую серию открытых карт." +msgstr "" +"Игровой стол. Складывать по возрастанию или убыванию чередуя цвет, можно " +"перемещать любую серию открытых карт." #: pysollib/games/yukon.py:317 msgid "" @@ -1234,7 +1241,9 @@ msgstr "" msgid "" "Tableau. Build down regardless of suit, can move any face-up cards " "regardless of sequence." -msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью, можно перемещать любую серию открытых карт." +msgstr "" +"Игровой стол. Складывать по убыванию не считаясь с мастью, можно перемещать " +"любую серию открытых карт." #: pysollib/help.py:64 msgid "A Python Solitaire Game Collection\n" @@ -1701,218 +1710,239 @@ msgstr "США" msgid "Top 10" msgstr "Top 10" -#: pysollib/stack.py:1282 +#: pysollib/stack.py:1299 msgid "Base card - %s." msgstr "Базовая карта - %s." -#: pysollib/stack.py:1283 +#: pysollib/stack.py:1300 msgid "Empty row cannot be filled." msgstr "Пустой ряд не заполняется." -#: pysollib/stack.py:1284 +#: pysollib/stack.py:1301 msgid "any card" -msgstr "любая сарта" +msgstr "любая карта" -#: pysollib/stack.py:1285 pysollib/util.py:81 +#: pysollib/stack.py:1302 pysollib/util.py:81 msgid "Jack" msgstr "Валет" -#: pysollib/stack.py:1298 +#: pysollib/stack.py:1315 msgid "No cards" msgstr "Нет карт" -#: pysollib/stack.py:1299 +#: pysollib/stack.py:1316 msgid "1 card" msgstr "1 карта" -#: pysollib/stack.py:1300 +#: pysollib/stack.py:1317 msgid " cards" msgstr " карт" -#: pysollib/stack.py:1517 pysollib/stack.py:1519 pysollib/stack.py:1550 +#: pysollib/stack.py:1534 pysollib/stack.py:1536 pysollib/stack.py:1567 msgid "Redeal" msgstr "Сдать" -#: pysollib/stack.py:1519 +#: pysollib/stack.py:1536 msgid "Stop" msgstr "Стоп" -#: pysollib/stack.py:1570 +#: pysollib/stack.py:1587 msgid "Variable redeals." msgstr "Переменное количество пересдач." -#: pysollib/stack.py:1571 +#: pysollib/stack.py:1588 msgid "Unlimited redeals." msgstr "Неограниченное количество пересдач." -#: pysollib/stack.py:1572 +#: pysollib/stack.py:1589 msgid "No redeals." msgstr "Без пересдачи." -#: pysollib/stack.py:1573 +#: pysollib/stack.py:1590 msgid "One redeal." msgstr "1 пересдача." -#: pysollib/stack.py:1574 +#: pysollib/stack.py:1591 msgid " redeals." msgstr " пересдачи." -#: pysollib/stack.py:1576 +#: pysollib/stack.py:1593 msgid "Talon." msgstr "Колода." -#: pysollib/stack.py:1762 pysollib/stack.py:2212 +#: pysollib/stack.py:1779 pysollib/stack.py:2229 msgid "Reserve. No building." msgstr "Резерв. Без выкладывания." -#: pysollib/stack.py:1799 +#: pysollib/stack.py:1816 msgid "Foundation." msgstr "Базовая ячейка" -#: pysollib/stack.py:1815 +#: pysollib/stack.py:1832 msgid "Foundation. Build up by suit." msgstr "Базовая ячейка. Складывать по возрастанию в соответствии с мастью." -#: pysollib/stack.py:1816 +#: pysollib/stack.py:1833 msgid "Foundation. Build down by suit." msgstr "Базовая ячейка. Складывать по убыванию в соответствии с мастью." -#: pysollib/stack.py:1817 pysollib/stack.py:1833 pysollib/stack.py:1855 +#: pysollib/stack.py:1834 pysollib/stack.py:1850 pysollib/stack.py:1872 msgid "Foundation. Build by same rank." msgstr "Базовая ячейка. Складывать в соответствии с достоинством." -#: pysollib/stack.py:1832 +#: pysollib/stack.py:1849 msgid "Foundation. Build down regardless of suit." msgstr "Базовая ячейка. Складывать не считаясь с мастью." -#: pysollib/stack.py:1853 +#: pysollib/stack.py:1870 msgid "Foundation. Build up by alternate color." msgstr "Базовая ячейка. Складывать по возрастанию чередуя цвет." -#: pysollib/stack.py:1854 +#: pysollib/stack.py:1871 msgid "Foundation. Build down by alternate color." msgstr "Базовая ячейка. Складывать по убыванию чередуя цвет." -#: pysollib/stack.py:1928 +#: pysollib/stack.py:1945 msgid "Tableau. Build up by alternate color." msgstr "Игровой стол. Складывать по возрастанию чередуя цвет." -#: pysollib/stack.py:1929 +#: pysollib/stack.py:1946 msgid "Tableau. Build down by alternate color." msgstr "Игровой стол. Складывать по убыванию чередуя цвет." -#: pysollib/stack.py:1930 pysollib/stack.py:1940 pysollib/stack.py:1949 -#: pysollib/stack.py:1958 pysollib/stack.py:1968 pysollib/stack.py:1991 -#: pysollib/stack.py:2001 +#: pysollib/stack.py:1947 pysollib/stack.py:1957 pysollib/stack.py:1966 +#: pysollib/stack.py:1975 pysollib/stack.py:1985 pysollib/stack.py:2008 +#: pysollib/stack.py:2018 msgid "Tableau. Build by same rank." msgstr "Игровой стол. Складывать в соответствии с достоинством." -#: pysollib/stack.py:1938 +#: pysollib/stack.py:1955 msgid "Tableau. Build up by color." msgstr "Игровой стол. Складывать по возрастанию в соответствии с цветом." -#: pysollib/stack.py:1939 +#: pysollib/stack.py:1956 msgid "Tableau. Build down by color." msgstr "Игровой стол. Складывать по убыванию в соответствии с цветом." -#: pysollib/stack.py:1947 +#: pysollib/stack.py:1964 msgid "Tableau. Build up by suit." msgstr "Игровой стол. Складывать по возрастанию в соответствии с мастью." -#: pysollib/stack.py:1948 +#: pysollib/stack.py:1965 msgid "Tableau. Build down by suit." msgstr "Игровой стол. Складывать по убыванию в соответствии с мастью." -#: pysollib/stack.py:1956 +#: pysollib/stack.py:1973 msgid "Tableau. Build up regardless of suit." msgstr "Игровой стол. Складывать по возрастанию не считаясь с мастью." -#: pysollib/stack.py:1957 +#: pysollib/stack.py:1974 msgid "Tableau. Build down regardless of suit." msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью." -#: pysollib/stack.py:1966 +#: pysollib/stack.py:1983 msgid "Tableau. Build up in any suit but the same." msgstr "Игровой стол. Складывать по возрастанию в любую масть кроме такой же." -#: pysollib/stack.py:1967 +#: pysollib/stack.py:1984 msgid "Tableau. Build down in any suit but the same." msgstr "Игровой стол. Складывать по убыванию в любую масть кроме такой же." -#: pysollib/stack.py:1989 +#: pysollib/stack.py:2006 msgid "" "Tableau. Build up regardless of suit. Sequences of cards in alternate color " "can be moved as a unit." -msgstr "Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно перемещать серии карт чередующихся цветом." +msgstr "" +"Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно " +"перемещать серии карт чередующихся цветом." -#: pysollib/stack.py:1990 +#: pysollib/stack.py:2007 msgid "" "Tableau. Build down regardless of suit. Sequences of cards in alternate " "color can be moved as a unit." -msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать серии карт чередующихся цветом." +msgstr "" +"Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать " +"серии карт чередующихся цветом." -#: pysollib/stack.py:1999 +#: pysollib/stack.py:2016 msgid "" "Tableau. Build up regardless of suit. Sequences of cards in the same suit " "can be moved as a unit." -msgstr "Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно перемещать серии карт одинаковой масти." +msgstr "" +"Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно " +"перемещать серии карт одинаковой масти." -#: pysollib/stack.py:2000 +#: pysollib/stack.py:2017 msgid "" "Tableau. Build down regardless of suit. Sequences of cards in the same suit " "can be moved as a unit." -msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать серии карт одинаковой масти." +msgstr "" +"Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать " +"серии карт одинаковой масти." -#: pysollib/stack.py:2022 +#: pysollib/stack.py:2039 msgid "" "Tableau. Build up by alternate color, can move any face-up cards regardless " "of sequence." -msgstr "Игровой стол. Складывать по возрастанию чередуя цвет, можно перемещать любую серию открытых карт." +msgstr "" +"Игровой стол. Складывать по возрастанию чередуя цвет, можно перемещать любую " +"серию открытых карт." -#: pysollib/stack.py:2023 +#: pysollib/stack.py:2040 msgid "" "Tableau. Build down by alternate color, can move any face-up cards " "regardless of sequence." -msgstr "Игровой стол. Складывать по убыванию чередуя цвет, можно перемещать любую серию открытых карт." +msgstr "" +"Игровой стол. Складывать по убыванию чередуя цвет, можно перемещать любую " +"серию открытых карт." -#: pysollib/stack.py:2024 pysollib/stack.py:2037 +#: pysollib/stack.py:2041 pysollib/stack.py:2054 msgid "" "Tableau. Build by same rank, can move any face-up cards regardless of " "sequence." -msgstr "Игровой стол. Складывать в соответствии с достоинством, можно перемещать любую серию открытых карт." +msgstr "" +"Игровой стол. Складывать в соответствии с достоинством, можно перемещать " +"любую серию открытых карт." -#: pysollib/stack.py:2035 +#: pysollib/stack.py:2052 msgid "" "Tableau. Build up by suit, can move any face-up cards regardless of sequence." -msgstr "Игровой стол. Складывать по возрастанию в соответствии с мастью, можно перемещать любую серию открытых карт." +msgstr "" +"Игровой стол. Складывать по возрастанию в соответствии с мастью, можно " +"перемещать любую серию открытых карт." -#: pysollib/stack.py:2036 +#: pysollib/stack.py:2053 msgid "" "Tableau. Build down by suit, can move any face-up cards regardless of " "sequence." -msgstr "Игровой стол. Складывать по убыванию в соответствии с мастью, можно перемещать любую серию открытых карт." +msgstr "" +"Игровой стол. Складывать по убыванию в соответствии с мастью, можно " +"перемещать любую серию открытых карт." -#: pysollib/stack.py:2069 +#: pysollib/stack.py:2086 msgid "Tableau. Build up or down by color." -msgstr "Игровой стол. Складывать по возрастанию или убыванию в соответствии с цветом." +msgstr "" +"Игровой стол. Складывать по возрастанию или убыванию в соответствии с цветом." -#: pysollib/stack.py:2080 +#: pysollib/stack.py:2097 msgid "Tableau. Build up or down by alternate color." msgstr "Игровой стол. Складывать по возрастанию или убыванию чередуя цвет." -#: pysollib/stack.py:2091 +#: pysollib/stack.py:2108 msgid "Tableau. Build up or down by suit." -msgstr "Игровой стол. Складывать по возрастанию или убыванию в соответствии с мастью." +msgstr "" +"Игровой стол. Складывать по возрастанию или убыванию в соответствии с мастью." -#: pysollib/stack.py:2102 +#: pysollib/stack.py:2119 msgid "Tableau. Build up or down regardless of suit." -msgstr "Игровой стол. Складывать по возрастанию или убыванию не считаясь с мастью." +msgstr "" +"Игровой стол. Складывать по возрастанию или убыванию не считаясь с мастью." -#: pysollib/stack.py:2113 +#: pysollib/stack.py:2130 msgid "Waste." msgstr "Сброс." -#: pysollib/stack.py:2213 +#: pysollib/stack.py:2230 msgid "Free cell." msgstr "Свободная ячейка." @@ -2234,7 +2264,7 @@ msgstr "&Игра" msgid "&Deal cards" msgstr "&Сдать карты" -#: pysollib/tk/menubar.py:307 pysollib/tk/menubar.py:342 +#: pysollib/tk/menubar.py:307 msgid "&Auto drop" msgstr "С&бросить карты" @@ -2312,7 +2342,11 @@ msgstr "Настройки &автоматической игры" #: pysollib/tk/menubar.py:341 msgid "Auto &face up" -msgstr "Автоматически переворачивать" +msgstr "Автоматически &переворачивать" + +#: pysollib/tk/menubar.py:342 +msgid "A&uto drop" +msgstr "А&втоматически сбрасывать карты" #: pysollib/tk/menubar.py:343 msgid "Auto &deal" @@ -2395,159 +2429,163 @@ msgid "&Negative cards bottom" msgstr "&Негативные контуры карты" #: pysollib/tk/menubar.py:374 +msgid "Shrink face-down cards" +msgstr "Сжимать закрытые карты" + +#: pysollib/tk/menubar.py:375 msgid "Shade &filled stacks" msgstr "Затемнять заполненные ячейки" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:376 msgid "A&nimations" msgstr "Анимаци&я" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:377 msgid "&None" msgstr "&Нет" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:378 msgid "&Timer based" msgstr "Базирующаяся на &таймере" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:379 msgid "&Fast" msgstr "&Быстрая" -#: pysollib/tk/menubar.py:379 +#: pysollib/tk/menubar.py:380 msgid "&Slow" msgstr "&Медленная" -#: pysollib/tk/menubar.py:380 +#: pysollib/tk/menubar.py:381 msgid "&Very slow" msgstr "&Очень медленная" -#: pysollib/tk/menubar.py:381 +#: pysollib/tk/menubar.py:382 msgid "Stick&y mouse" msgstr "&Липкая мышь" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:383 msgid "Use mouse for undo/redo" msgstr "Использовать мышь для вперед/назад" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:385 msgid "&Fonts..." msgstr "&Шрифты..." -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:386 msgid "&Colors..." msgstr "&Цвета..." -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:387 msgid "Time&outs..." msgstr "Тайма&уты..." -#: pysollib/tk/menubar.py:388 +#: pysollib/tk/menubar.py:389 msgid "&Toolbar" msgstr "Панель и&нструментов" -#: pysollib/tk/menubar.py:390 +#: pysollib/tk/menubar.py:391 msgid "Stat&usbar" msgstr "Панель с&остояния" -#: pysollib/tk/menubar.py:391 +#: pysollib/tk/menubar.py:392 msgid "Show &statusbar" msgstr "Показывать панель состояния" -#: pysollib/tk/menubar.py:392 +#: pysollib/tk/menubar.py:393 msgid "Show &number of cards" msgstr "Показывать количество карт" -#: pysollib/tk/menubar.py:393 +#: pysollib/tk/menubar.py:394 msgid "Show &help bar" msgstr "Показывать панель помощи" -#: pysollib/tk/menubar.py:394 +#: pysollib/tk/menubar.py:395 msgid "Save games &geometry" msgstr "Сохранение &геометрии игры" -#: pysollib/tk/menubar.py:395 +#: pysollib/tk/menubar.py:396 msgid "&Demo logo" msgstr "Д&емо лого" -#: pysollib/tk/menubar.py:396 +#: pysollib/tk/menubar.py:397 msgid "Startup splash sc&reen" msgstr "О&кно запуска" -#: pysollib/tk/menubar.py:402 +#: pysollib/tk/menubar.py:403 msgid "&Help" msgstr "&Помощь" -#: pysollib/tk/menubar.py:403 +#: pysollib/tk/menubar.py:404 msgid "&Contents" msgstr "&Содержание" -#: pysollib/tk/menubar.py:404 +#: pysollib/tk/menubar.py:405 msgid "&How to play" msgstr "Как &играть" -#: pysollib/tk/menubar.py:405 +#: pysollib/tk/menubar.py:406 msgid "&Rules for this game" msgstr "&Правила текущей игры" -#: pysollib/tk/menubar.py:406 +#: pysollib/tk/menubar.py:407 msgid "&License terms" msgstr "&Лицензия" -#: pysollib/tk/menubar.py:409 +#: pysollib/tk/menubar.py:410 msgid "&About " msgstr "&О программе " -#: pysollib/tk/menubar.py:521 +#: pysollib/tk/menubar.py:522 msgid "All &games..." msgstr "&Все игры..." -#: pysollib/tk/menubar.py:523 +#: pysollib/tk/menubar.py:524 msgid "Playable pre&view..." msgstr "Играемый &предпросмотр..." -#: pysollib/tk/menubar.py:572 +#: pysollib/tk/menubar.py:573 msgid "&Mahjongg games" msgstr "Игры маджонг" -#: pysollib/tk/menubar.py:610 +#: pysollib/tk/menubar.py:611 msgid "&Popular games" msgstr "&Популярные игры" -#: pysollib/tk/menubar.py:618 +#: pysollib/tk/menubar.py:619 msgid "&French games" msgstr "&Классические игры" -#: pysollib/tk/menubar.py:625 +#: pysollib/tk/menubar.py:626 msgid "&Oriental games" msgstr "&Восточные игры" -#: pysollib/tk/menubar.py:633 +#: pysollib/tk/menubar.py:634 msgid "&Special games" msgstr "&Особые игры" -#: pysollib/tk/menubar.py:639 +#: pysollib/tk/menubar.py:640 msgid "All games by name" msgstr "Все игры по имени" -#: pysollib/tk/menubar.py:893 pysollib/tk/menubar.py:895 +#: pysollib/tk/menubar.py:894 pysollib/tk/menubar.py:896 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "&Загрузить" -#: pysollib/tk/menubar.py:895 +#: pysollib/tk/menubar.py:896 msgid "&Info..." msgstr "&Информация..." -#: pysollib/tk/menubar.py:898 +#: pysollib/tk/menubar.py:899 msgid "Select " msgstr "Выбрать " -#: pysollib/tk/menubar.py:959 +#: pysollib/tk/menubar.py:960 msgid "Select table background" msgstr "Выбрать фоновое изображение" -#: pysollib/tk/menubar.py:971 pysollib/tk/selecttile.py:177 +#: pysollib/tk/menubar.py:972 pysollib/tk/selecttile.py:177 msgid "Select table color" msgstr "Выбрать цвет" @@ -2704,23 +2742,23 @@ msgstr "Популярные игры" msgid "by Skill Level" msgstr "По уровню мастерства" -#: pysollib/tk/selectgame.py:170 pysollib/tk/selectgame.py:542 +#: pysollib/tk/selectgame.py:170 pysollib/tk/selectgame.py:534 msgid "Luck only" msgstr "Только на везение" -#: pysollib/tk/selectgame.py:171 pysollib/tk/selectgame.py:543 +#: pysollib/tk/selectgame.py:171 pysollib/tk/selectgame.py:535 msgid "Mostly luck" msgstr "В основном на везение" -#: pysollib/tk/selectgame.py:172 pysollib/tk/selectgame.py:544 +#: pysollib/tk/selectgame.py:172 pysollib/tk/selectgame.py:536 msgid "Balanced" msgstr "Сбалансированные" -#: pysollib/tk/selectgame.py:173 pysollib/tk/selectgame.py:545 +#: pysollib/tk/selectgame.py:173 pysollib/tk/selectgame.py:537 msgid "Mostly skill" msgstr "В основном на мастерство" -#: pysollib/tk/selectgame.py:174 pysollib/tk/selectgame.py:546 +#: pysollib/tk/selectgame.py:174 pysollib/tk/selectgame.py:538 msgid "Skill only" msgstr "Только на мастерство" @@ -2898,11 +2936,11 @@ msgstr "&Правила" msgid "Playable Preview - " msgstr "Играемый предпросмотр - " -#: pysollib/tk/selectgame.py:549 +#: pysollib/tk/selectgame.py:541 msgid "variable" msgstr "переменное кол-во" -#: pysollib/tk/selectgame.py:550 +#: pysollib/tk/selectgame.py:542 msgid "unlimited" msgstr "неограниченное кол-во" @@ -3086,23 +3124,23 @@ msgstr "Текст рядом с пиктограммами" msgid "Text only" msgstr "Только текст" -#: pysollib/tk/tkhtml.py:255 +#: pysollib/tk/tkhtml.py:251 msgid "Index" msgstr "Индекс" -#: pysollib/tk/tkhtml.py:259 +#: pysollib/tk/tkhtml.py:255 msgid "Back" msgstr "Назад" -#: pysollib/tk/tkhtml.py:263 +#: pysollib/tk/tkhtml.py:259 msgid "Forward" msgstr "Вперед" -#: pysollib/tk/tkhtml.py:267 +#: pysollib/tk/tkhtml.py:263 msgid "Close" msgstr "Закрыть" -#: pysollib/tk/tkhtml.py:389 +#: pysollib/tk/tkhtml.py:385 msgid "" "HTML limitation:\n" "The %s protocol is not supported yet.\n" @@ -3118,7 +3156,7 @@ msgstr "" "чтобы открыть URL:\n" "%s\n" -#: pysollib/tk/tkhtml.py:414 pysollib/tk/tkhtml.py:418 +#: pysollib/tk/tkhtml.py:410 pysollib/tk/tkhtml.py:414 msgid "Unable to service request:\n" msgstr "Невозможно выполнить запрос:\n" @@ -3375,7 +3413,7 @@ msgstr "Игрок" msgid "Player options" msgstr "Установки игрока" -#: pysollib/tk/toolbar.py:464 +#: pysollib/tk/toolbar.py:466 msgid "Toolbar" msgstr "Панель инструментов" diff --git a/pysollib/acard.py b/pysollib/acard.py index a1569350..510b3270 100644 --- a/pysollib/acard.py +++ b/pysollib/acard.py @@ -84,11 +84,8 @@ class AbstractCard: self.y = y self.item = None self.face_up = 0 - # To improve display speed, we move cards out of the visible canvas. - # Because the whole area that will be passed by a move will get - # updated by Tk, we must choose an optimal way off the screen. + # To improve display speed, we hide cards (except 2 top cards). self.hide_stack = None - self.hide_x = self.hide_y = 0 def __str__(self): # Return a string for debug print statements. @@ -99,12 +96,11 @@ class AbstractCard: def moveTo(self, x, y): # Move the card to absolute position (x, y). - # The card remains hidden. dx, dy = 0, 0 if self.game.app.opt.randomize_place: d = 1 dx, dy = randint(-d, d), randint(-d, d) - self.moveBy(x - self.x + self.hide_x + dx, y - self.y + self.hide_y + dy) + self.moveBy(x - self.x + dx, y - self.y + dy) def moveBy(self, dx, dy): # Move the card by (dx, dy). diff --git a/pysollib/game.py b/pysollib/game.py index e084847e..f53bbeca 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1537,7 +1537,7 @@ for %d moves. self.canvas.update_idletasks() return EVENT_HANDLED else: - # remove items later + # remove items later (find_card_dialog) return items def highlightNotMatching(self): diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 7131d566..26d3e4c9 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -44,6 +44,7 @@ from pysollib.layout import Layout from pysollib.hint import CautiousDefaultHint, FreeCellType_Hint from pysollib.pysoltk import MfxCanvasText + # /*********************************************************************** # // # ************************************************************************/ @@ -231,6 +232,7 @@ class Fortress(Game): # /*********************************************************************** # // Bastion # // Ten by One +# // Castles End # ************************************************************************/ class Bastion(Game): @@ -291,6 +293,84 @@ class TenByOne(Bastion): self.s.talon.dealRowAvail() +class CastlesEnd_Foundation(SS_FoundationStack): + def acceptsCards(self, from_stack, cards): + if self.game.getState() == 0: + if cards[0].suit != self.cap.base_suit: + return False + return True + return SS_FoundationStack.acceptsCards(self, from_stack, cards) + +class CastlesEnd_StackMethods: + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + state = self.game.getState() + self.game.moveMove(ncards, self, to_stack, + frames=frames, shadow=shadow) + if state == 0: + base_rank = to_stack.cards[0].rank + self.game.base_rank = base_rank + for s in self.game.s.foundations: + s.cap.base_rank = base_rank + self.fillStack() + +class CastlesEnd_RowStack(CastlesEnd_StackMethods, UD_AC_RowStack): + def acceptsCards(self, from_stack, cards): + if self.game.getState() == 0: + return False + return UD_AC_RowStack.acceptsCards(self, from_stack, cards) + +class CastlesEnd_Reserve(CastlesEnd_StackMethods, OpenStack): + pass + + +class CastlesEnd(Bastion): + Foundation_Class = StackWrapper(CastlesEnd_Foundation, min_cards=1, mod=13) + RowStack_Class = StackWrapper(CastlesEnd_RowStack, mod=13) + ReserveStack_Class = CastlesEnd_Reserve + + def createGame(self): + l = Bastion.createGame(self) + self.base_rank = None + tx, ty, ta, tf = l.getTextAttr(self.s.foundations[-1], 'se') + font = self.app.getFont('canvas_default') + self.texts.info = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + + def updateText(self): + if self.preview > 1: + return + if not self.texts.info: + return + if self.base_rank is None: + t = "" + else: + t = RANKS[self.base_rank] + self.texts.info.config(text=t) + + def getState(self): + for s in self.s.foundations: + if s.cards: + return 1 + return 0 + + def _restoreGameHook(self, game): + for s in self.s.foundations: + s.cap.base_rank = game.loadinfo.base_rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_rank=p.load()) + + def _saveGameHook(self, p): + base_rank = NO_RANK + for s in self.s.foundations: + if s.cards: + base_rank = s.cards[0].rank + break + p.dump(base_rank) + + shallHighlightMatch = Game._shallHighlightMatch_ACW + + # /*********************************************************************** # // Chessboard # ************************************************************************/ @@ -805,3 +885,5 @@ registerGame(GameInfo(535, ExiledKings, "Exiled Kings", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(626, Soother, "Soother", GI.GT_4DECK_TYPE | GI.GT_ORIGINAL, 4, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(650, CastlesEnd, "Castles End", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index 15475c15..b2c61ba1 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -352,6 +352,106 @@ class One234(Calculation): self.s.talon.dealRow(rows=self.s.foundations) +# /*********************************************************************** +# // Senior Wrangler +# ************************************************************************/ + +class SeniorWrangler_Talon(DealRowTalonStack): + + def canDealCards(self): + if self.round == self.max_rounds: + return False + return not self.game.isGameWon() + + def dealCards(self, sound=0): + num_cards = 0 + r = self.game.s.rows[self.round-1] + if not r.cards: + self.game.nextRoundMove(self) + return + if sound: + self.game.startDealSample() + old_state = self.game.enterState(self.game.S_DEAL) + while r.cards: + self.game.flipMove(r) + self.game.moveMove(1, r, self, frames=4, shadow=0) + self.dealRowAvail(rows=self.game.s.rows[self.round-1:], sound=0) + while self.cards: + num_cards += self.dealRowAvail(sound=0) + self.game.nextRoundMove(self) + self.game.leaveState(old_state) + if sound: + self.game.stopSamples() + return num_cards + +class SeniorWrangler_RowStack(BasicRowStack): + #clickHandler = BasicRowStack.doubleclickHandler + pass + + +class SeniorWrangler(Game): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + # set window + self.setSize(l.XM+9.5*l.XS, l.YM+3*l.YS+l.TEXT_HEIGHT) + + # create stacks + x, y = l.XM+1.5*l.XS, l.YM + for i in range(8): + stack = BetsyRoss_Foundation(x, y, self, base_rank=i, + max_cards=1, max_move=0, max_accept=0) + s.foundations.append(stack) + x = x + l.XS + x, y = l.XM+1.5*l.XS, l.YM+l.YS + for i in range(8): + stack = BetsyRoss_Foundation(x, y, self, base_rank=(2*i+3)%13, + mod=13, dir=i+1, + max_cards=12, max_move=0) + tx, ty, ta, tf = l.getTextAttr(stack, "s") + font = self.app.getFont("canvas_default") + stack.texts.misc = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + s.foundations.append(stack) + x = x + l.XS + x, y = l.XM+1.5*l.XS, l.YM+2*l.YS+l.TEXT_HEIGHT + for i in range(8): + stack = SeniorWrangler_RowStack(x, y, self, max_accept=0) + s.rows.append(stack) + stack.CARD_YOFFSET = 0 + x += l.XS + x, y = l.XM, l.YM+l.YS + s.talon = SeniorWrangler_Talon(x, y, self, max_rounds=9) + tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") + font = self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + + # define stack-groups + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + top = [] + ranks = [] + for c in cards[:]: + if c.rank in range(1,9) and c.rank not in ranks: + ranks.append(c.rank) + cards.remove(c) + top.append(c) + top.sort(lambda a, b: cmp(b.rank, a.rank)) + return cards+top + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations[:8], frames=0) + for i in range(11): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + # register the game registerGame(GameInfo(256, Calculation, "Calculation", @@ -365,4 +465,6 @@ registerGame(GameInfo(134, BetsyRoss, "Betsy Ross", "Quadruple Alliance", "Plus Belle") )) registerGame(GameInfo(550, One234, "One234", GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(653, SeniorWrangler, "Senior Wrangler", + GI.GT_2DECK_TYPE, 2, 8, GI.SL_BALANCED)) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 4448e24d..58d1c2ce 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -377,6 +377,7 @@ class AgnesSorel(Klondike): # /*********************************************************************** # // 8 x 8 # // Achtmal Acht +# // Eight by Eight # ************************************************************************/ class EightTimesEight(Klondike): @@ -404,6 +405,25 @@ class AchtmalAcht(EightTimesEight): font=self.app.getFont("canvas_default")) +class EightByEight_RowStack(RK_RowStack): + def acceptsCards(self, from_stack, cards): + if not RK_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return len(cards) == 1 + return True + +class EightByEight(EightTimesEight): + Layout_Method = Layout.klondikeLayout ##gypsyLayout + Talon_Class = CanfieldRush_Talon + RowStack_Class = EightByEight_RowStack + + def createGame(self): + Klondike.createGame(self, rows=8, max_rounds=3) + + shallHighlightMatch = Game._shallHighlightMatch_RK + + # /*********************************************************************** # // Batsford # // Batsford Again @@ -627,7 +647,6 @@ class Jane(Klondike): x = x0 + ((i+1) & 1) * l.XS stack = OpenStack(x, y, self, max_accept=0) stack.CARD_YOFFSET = l.YM / 3 - stack.is_open = 1 s.reserves.append(stack) y = y + l.YS / 2 # not needed, as no cards may be placed on the reserves @@ -678,7 +697,7 @@ class Senate(Jane): playcards = 10 l, s = Layout(self), self.s - self.setSize(3*l.XM+(rows+6)*l.XS, l.YM+2*(l.YS+playcards*l.YOFFSET)) + self.setSize(l.XM+(rows+7)*l.XS, l.YM+2*(l.YS+playcards*l.YOFFSET)) x, y = l.XM, l.YM for i in range(rows): @@ -686,22 +705,22 @@ class Senate(Jane): x += l.XS for y in l.YM, l.YM+l.YS+playcards*l.YOFFSET: - x = 2*l.XM+rows*l.XS + x = l.XM+rows*l.XS+l.XS/2 for i in range(4): stack = OpenStack(x, y, self, max_accept=0) stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET s.reserves.append(stack) x += l.XS - x = 3*l.XM+(rows+4)*l.XS + x = l.XM+(rows+5)*l.XS for i in range(2): y = l.YM+l.YS for j in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=j)) y += l.YS x += l.XS - x, y = 3*l.XM+(rows+5)*l.XS, l.YM + x, y = self.width-l.XS, l.YM s.talon = AgnesBernauer_Talon(x, y, self) - l.createText(s.talon, 'sw') + l.createText(s.talon, 'nw') l.defaultStackGroups() @@ -1430,5 +1449,7 @@ registerGame(GameInfo(633, Athena, "Athena", GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) registerGame(GameInfo(634, Chinaman, "Chinaman", GI.GT_KLONDIKE, 1, 1, GI.SL_BALANCED)) +registerGame(GameInfo(651, EightByEight, "Eight by Eight", + GI.GT_KLONDIKE, 2, 2, GI.SL_BALANCED)) diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index c31474da..5cf198f1 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -765,6 +765,53 @@ class DerLetzteMonarch(Game): return diff in (-13, -1, 1, 13) +# /*********************************************************************** +# // Doublets +# ************************************************************************/ + +class DoubletsII(Game): + FILL_STACKS_AFTER_DROP = False # for Nestor_RowStack + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+12*l.XS, l.YM+3*l.YS+3*l.YOFFSET) + + x, y = l.XM, l.YM + for i in range(12): + s.rows.append(Nestor_RowStack(x, y, self, + max_move=1, max_accept=1, + dir=0, base_rank=NO_RANK)) + x += l.XS + x, y = l.XM, self.height-l.YS + s.talon = TalonStack(x, y, self) + l.createText(s.talon, 'n') + + x, y = self.width-l.XS, self.height-l.YS + s.foundations.append(AbstractFoundationStack(x, y, self, suit=ANY_SUIT, + max_move=0, max_cards=52, + base_rank=ANY_RANK, max_accept=0)) + l.createText(s.foundations[0], "n") + + l.defaultStackGroups() + + def startGame(self): + for i in range(3): + self.s.talon.dealRow(frames=0, flip=0) + self.startDealSample() + self.s.talon.dealRow() + + def fillStack(self, stack): + if stack in self.s.rows: + if stack.cards: + stack.flipMove() + else: + if self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) + + # register the game registerGame(GameInfo(89, MonteCarlo, "Monte Carlo", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK, @@ -795,4 +842,6 @@ registerGame(GameInfo(329, TheWishOpen, "The Wish (open)", ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) registerGame(GameInfo(368, Vertical, "Vertical", GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(649, DoubletsII, "Doublets II", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 9efca13d..abaeeefc 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -124,39 +124,40 @@ class Boudoir(Game): def createGame(self): l, s = Layout(self), self.s - self.setSize(l.XM+5*l.XS, l.YM+4*l.YS) + self.setSize(l.XM+5.5*l.XS, l.YM+4*l.YS) - x, y = l.XM, l.YM+l.YS-l.TEXT_HEIGHT/2 + x, y = l.XM, l.YM+l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=3) tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") font=self.app.getFont("canvas_default") s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) - l.createText(s.talon, "s") - y += l.YS+l.TEXT_HEIGHT + l.createText(s.talon, 'ne') + y += l.YS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "s") + l.createText(s.waste, 'ne') - x, y = l.XM+l.XS, l.YM + x, y = l.XM+1.5*l.XS, l.YM for i in range(4): - s.foundations.append(SS_FoundationStack(x, y, self, suit=i, max_cards=13)) + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + max_cards=13)) x += l.XS - x = l.XM+l.XS + x = l.XM+1.5*l.XS y += l.YS for i in range(4): s.rows.append(AbstractFoundationStack(x, y, self, suit=i, max_cards=1, max_move=0, base_rank=QUEEN)) x += l.XS - x = l.XM+l.XS + x = l.XM+1.5*l.XS y += l.YS for i in range(4): s.rows.append(AbstractFoundationStack(x, y, self, suit=i, max_cards=1, max_move=0, base_rank=JACK)) x += l.XS - x = l.XM+l.XS + x = l.XM+1.5*l.XS y += l.YS for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, diff --git a/pysollib/games/terrace.py b/pysollib/games/terrace.py index 14f953cb..27f28756 100644 --- a/pysollib/games/terrace.py +++ b/pysollib/games/terrace.py @@ -146,7 +146,7 @@ class Terrace(Game): self.setSize(l.XM + maxrows*l.XS + l.XM, l.YM + 3*l.YS + h) # extra settings - self.base_card = None + self.base_rank = None # create stacks x, y = l.XM + w1, l.YM diff --git a/pysollib/games/tournament.py b/pysollib/games/tournament.py index f3b187fe..a203343a 100644 --- a/pysollib/games/tournament.py +++ b/pysollib/games/tournament.py @@ -281,6 +281,64 @@ class Saxony(Game): self.s.talon.dealRow() +# /*********************************************************************** +# // Ladies Battle +# ************************************************************************/ + +class LadiesBattle_RowStack(AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return False + if from_stack in self.game.s.reserves: + return False + return True + + +class LadiesBattle(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+9*l.XS, max(l.YM+l.YS+20*l.YOFFSET, l.YM+6*l.YS)) + + x, y, = l.XM+1.5*l.XS, l.YM + for i in range(6): + s.rows.append(LadiesBattle_RowStack(x, y, self, + max_move=1, mod=13)) + x = x + l.XS + x, y = l.XM, l.YM+l.YS/2 + for i in range(4): + s.reserves.append(OpenStack(x, y, self, max_accept=0)) + y += l.YS + x, y = self.width-l.XS, l.YM+l.YS/2 + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=QUEEN, mod=13)) + y += l.YS + x, y = self.width-l.XS, self.height-l.YS + s.talon = DealRowTalonStack(x, y, self) + l.createText(s.talon, "sw") + l.defaultStackGroups() + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (JACK, QUEEN), (c.rank, c.suit))) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + if self.s.talon.cards: + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + + shallHighlightMatch = Game._shallHighlightMatch_ACW + + # register the game registerGame(GameInfo(303, Tournament, "Tournament", @@ -292,6 +350,8 @@ registerGame(GameInfo(386, KingsdownEights, "Kingsdown Eights", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(645, Saxony, "Saxony", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(652, LadiesBattle, "Ladies Battle", + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/stack.py b/pysollib/stack.py index 6876c8f0..031f6574 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -211,6 +211,11 @@ class Stack: # its face up on a (single or double) click, and also support # moving a subpile around. + # constants + MIN_VISIBLE_XOFFSET = 5 + MIN_VISIBLE_YOFFSET = 5 + SHRINK_FACTOR = 2. + def __init__(self, x, y, game, cap={}): # Arguments are the stack's nominal x and y position (the top # left corner of the first card placed in the stack), and the @@ -239,6 +244,8 @@ class Stack: model.id = id model.game = game model.cards = [] + # + model.is_filled = False # capabilites - the game logic model.cap = Struct( @@ -305,8 +312,6 @@ class Stack: view.is_open = -1 view.can_hide_cards = -1 view.max_shadow_cards = -1 - # - view.is_filled = False def destruct(self): # help breaking circular references @@ -360,23 +365,12 @@ class Stack: self.can_hide_cards = 0 elif self.canvas.preview: self.can_hide_cards = 0 - if self.can_hide_cards: - # compute hide-off direction (see class Card) - CW, CH = self.game.app.images.CARDW, self.game.app.images.CARDH - cx = self.x + CW / 2 - cy = self.y + CH / 2 - if cy < 3 * CH / 2: - self.hide_x, self.hide_y = 0, -10000 # hide at top - elif cx < 3 * CW / 2: - self.hide_x, self.hide_y = -10000, 0 # hide at left - elif cy > self.game.height - 3 * CH / 2: - self.hide_x, self.hide_y = 0, 10000 # hide at bottom - else: - self.hide_x, self.hide_y = 10000, 0 # hide at right if self.is_open < 0: - self.is_open = (self.is_visible and - (abs(self.CARD_XOFFSET[0]) >= 5 or - abs(self.CARD_YOFFSET[0]) >= 5)) + self.is_open = False + if (self.is_visible and + (abs(self.CARD_XOFFSET[0]) >= self.MIN_VISIBLE_XOFFSET or + abs(self.CARD_YOFFSET[0]) >= self.MIN_VISIBLE_YOFFSET)): + self.is_open = True if self.max_shadow_cards < 0: self.max_shadow_cards = 999999 if abs(self.CARD_YOFFSET[0]) != self.game.app.images.CARD_YOFFSET: @@ -385,9 +379,11 @@ class Stack: self.max_shadow_cards = 1 if (self.game.app.opt.shrink_face_down and type(ox) is int and type(oy) is int): - if ((ox == 0 and oy >= self.game.app.images.CARD_YOFFSET/2) or - (oy == 0 and ox >= self.game.app.images.CARD_XOFFSET/2)): - self.shrink_face_down = 2 + # no shrink if xoffset/yoffset too small + f = self.SHRINK_FACTOR + if ((ox == 0 and oy >= self.game.app.images.CARD_YOFFSET/f) or + (oy == 0 and ox >= self.game.app.images.CARD_XOFFSET/f)): + self.shrink_face_down = f # bottom image if self.is_visible: self.prepareBottom() @@ -745,7 +741,7 @@ class Stack: for c in cards[-2:]: ##print "refresh unhide 1", c, c.hide_stack c.unhide() - ##print "refresh unhide 1", c, c.hide_stack, c.hide_x, c.hide_y + ##print "refresh unhide 1", c, c.hide_stack # update the card postions and stacking order item = cards[0].item x, y = view.x, view.y @@ -778,17 +774,15 @@ class Stack: format = "%d" if format: t = format % len(self.cards) - if 0 and self.game.app.debug: + if 0 and self.game.app.debug >= 4: visible = 0 for c in self.cards: if c.isHidden(): assert c.hide_stack is not None - assert c.hide_x != 0 or c.hide_y != 0 else: visible = visible + 1 assert c.hide_stack is None - assert c.hide_x == 0 and c.hide_y == 0 - t = t + " %2d" % visible + t = t + " (%d)" % visible self.texts.ncards.config(text=t) def basicShallHighlightSameRank(self, card): @@ -800,11 +794,10 @@ class Stack: return True if not self.is_open: return False - dx, dy = self.getOffsetFor(card) - if dx == 0 and dy <= 4: - return False - if dx <= 4 and dy == 0: - return False +## dx, dy = self.getOffsetFor(card) +## if ((dx == 0 and dy <= self.MIN_VISIBLE_XOFFSET) or +## (dx <= self.MIN_VISIBLE_YOFFSET and dy == 0)): +## return False return True def basicShallHighlightMatch(self, card): @@ -984,7 +977,7 @@ class Stack: if self.game.demo: self.game.stopDemo(event) if self.game.busy: return EVENT_HANDLED - if not self.game.app.opt.sticky_mouse: # 1: + if not self.game.app.opt.sticky_mouse: # use a timer to update the drag # this allows us to skip redraws on slow machines drag = self.game.drag @@ -1229,6 +1222,9 @@ class Stack: def _shadeStack(self): if not self.game.app.opt.shade_filled_stacks: return +## if (self.CARD_XOFFSET != (0,) or +## self.CARD_YOFFSET != (0,)): +## return if not self.images.shade_img: img = self.game.app.images.getShade() self.images.shade_img = img @@ -1237,11 +1233,11 @@ class Stack: if img is None: return if not self.items.shade_item: - self.game.canvas.update_idletasks() + #self.game.canvas.update_idletasks() card = self.cards[-1] item = MfxCanvasImage(self.game.canvas, card.x, card.y, image=img, anchor=ANCHOR_NW) - ##item.tkraise() + #item.tkraise() item.addtag(self.group) self.items.shade_item = item @@ -1355,17 +1351,9 @@ class DealRow_StackMethods: for r in stacks: assert not self.getCard().face_up assert r is not self - if frames == 0 and self.game.moves.state == self.game.S_INIT: - # optimized a little bit for initial dealing - c = self.removeCard(update=0) - r.addCard(c, update=0) - # doing the flip after the move seems to be a little faster - if flip: - c.showFace() - else: - if flip: - self.game.flipMove(self) - self.game.moveMove(1, self, r, frames=frames) + if flip: + self.game.flipMove(self) + self.game.moveMove(1, self, r, frames=frames) self.game.leaveState(old_state) return len(stacks) diff --git a/pysollib/tk/card.py b/pysollib/tk/card.py index c63a586c..0a18e617 100644 --- a/pysollib/tk/card.py +++ b/pysollib/tk/card.py @@ -49,36 +49,7 @@ from tkcanvas import MfxCanvasGroup, MfxCanvasImage # // # ************************************************************************/ -# any Tk version -class _HideableCard_1(AbstractCard): - def hide(self, stack): - if stack is self.hide_stack: - return - if self.hide_stack: - hx, hy = stack.hide_x - self.hide_x, stack.hide_y - self.hide_y - else: - hx, hy = stack.hide_x, stack.hide_y - ####self.item.move(hx, hy) - item = self.item - item.canvas.tk.call(item.canvas._w, "move", item.id, hx, hy) - self.hide_x, self.hide_y = stack.hide_x, stack.hide_y - self.hide_stack = stack - ##print "hide:", self.id, hx, hy, self.item.coords() - - def unhide(self): - if self.hide_stack is None: - return 0 - ####self.item.move(-self.hide_x, -self.hide_y) - item = self.item - item.canvas.tk.call(item.canvas._w, "move", item.id, -self.hide_x, -self.hide_y) - ##print "unhide:", self.id, -self.hide_x, -self.hide_y, self.item.coords() - self.hide_x, self.hide_y = 0, 0 - self.hide_stack = None - return 1 - - -# needs Tk 8.3.0 or better -class _HideableCard_2(AbstractCard): +class _HideableCard(AbstractCard): def hide(self, stack): if stack is self.hide_stack: return @@ -95,11 +66,6 @@ class _HideableCard_2(AbstractCard): return 1 -_HideableCard =_HideableCard_1 -if 1 and tkversion >= (8, 3, 0, 0): - _HideableCard =_HideableCard_2 - - # /*********************************************************************** # // New implemetation since 2.10 # // diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 633da8ae..a24c4e88 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -339,7 +339,7 @@ class PysolMenubar(PysolMenubarActions): menu.add_command(label=n_("&Player options..."), command=self.mOptPlayerOptions) submenu = MfxMenu(menu, label=n_("&Automatic play")) submenu.add_checkbutton(label=n_("Auto &face up"), variable=self.tkopt.autofaceup, command=self.mOptAutoFaceUp) - submenu.add_checkbutton(label=n_("&Auto drop"), variable=self.tkopt.autodrop, command=self.mOptAutoDrop) + submenu.add_checkbutton(label=n_("A&uto drop"), variable=self.tkopt.autodrop, command=self.mOptAutoDrop) submenu.add_checkbutton(label=n_("Auto &deal"), variable=self.tkopt.autodeal, command=self.mOptAutoDeal) submenu.add_separator() submenu.add_checkbutton(label=n_("&Quick play"), variable=self.tkopt.quickplay, command=self.mOptQuickPlay) diff --git a/scripts/all_games.py b/scripts/all_games.py index 07464c34..de790a3a 100755 --- a/scripts/all_games.py +++ b/scripts/all_games.py @@ -221,6 +221,8 @@ def plain_text(): if gi.category == GI.GC_FRENCH: ##print str(gi.gameclass) print gi.name.encode('utf-8') + for n in gi.altnames: + print n.encode('utf-8') ##name = gi.name.lower() ##name = re.sub('\W', '', name) ##print id, name #, gi.si.game_type, gi.si.game_type == GI.GC_FRENCH From 952125b5f8b32fe8997474befcdd622a066ff60f Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 12 Aug 2006 21:15:56 +0000 Subject: [PATCH 044/266] + 6 new games * misc. improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@45 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 3 + pysollib/games/calculation.py | 18 +- pysollib/games/picturegallery.py | 3 +- pysollib/games/pushpin.py | 81 ++++++-- pysollib/games/pyramid.py | 332 +++++++++++++++++++++++++++++-- pysollib/games/sultan.py | 89 +-------- pysollib/games/takeaway.py | 83 ++++++++ pysollib/games/windmill.py | 81 +++++++- pysollib/stack.py | 15 +- 9 files changed, 576 insertions(+), 129 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index f53bbeca..de1f209d 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1478,6 +1478,9 @@ for %d moves. sx0, sy0 = s.getOffsetFor(c1) x1, y1 = s.getPositionFor(c1) x2, y2 = x1, y1 + if c1 is s.cards[-1]: + # last card in the stack (for Pyramid-like games) + tkraise = True else: # highlight pile if len(s.CARD_XOFFSET) > 1: diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index b2c61ba1..8cfad24d 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -392,30 +392,20 @@ class SeniorWrangler_RowStack(BasicRowStack): class SeniorWrangler(Game): def createGame(self): - # create layout l, s = Layout(self), self.s - # set window - self.setSize(l.XM+9.5*l.XS, l.YM+3*l.YS+l.TEXT_HEIGHT) + self.setSize(l.XM+9.5*l.XS, l.YM+3*l.YS) - # create stacks x, y = l.XM+1.5*l.XS, l.YM for i in range(8): stack = BetsyRoss_Foundation(x, y, self, base_rank=i, - max_cards=1, max_move=0, max_accept=0) - s.foundations.append(stack) - x = x + l.XS - x, y = l.XM+1.5*l.XS, l.YM+l.YS - for i in range(8): - stack = BetsyRoss_Foundation(x, y, self, base_rank=(2*i+3)%13, - mod=13, dir=i+1, - max_cards=12, max_move=0) + mod=13, dir=i+1, max_move=0) tx, ty, ta, tf = l.getTextAttr(stack, "s") font = self.app.getFont("canvas_default") stack.texts.misc = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) s.foundations.append(stack) x = x + l.XS - x, y = l.XM+1.5*l.XS, l.YM+2*l.YS+l.TEXT_HEIGHT + x, y = l.XM+1.5*l.XS, l.YM+2*l.YS for i in range(8): stack = SeniorWrangler_RowStack(x, y, self, max_accept=0) s.rows.append(stack) @@ -436,7 +426,7 @@ class SeniorWrangler(Game): top = [] ranks = [] for c in cards[:]: - if c.rank in range(1,9) and c.rank not in ranks: + if c.rank in range(8) and c.rank not in ranks: ranks.append(c.rank) cards.remove(c) top.append(c) diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py index b1582fbe..8b8a8115 100644 --- a/pysollib/games/picturegallery.py +++ b/pysollib/games/picturegallery.py @@ -581,7 +581,8 @@ registerGame(GameInfo(398, MountOlympus, "Mount Olympus", registerGame(GameInfo(399, Zeus, "Zeus", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(546, RoyalParade, "Royal Parade", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL, + rules_filename='virginiareel.html')) registerGame(GameInfo(547, VirginiaReel, "Virginia Reel", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/pushpin.py b/pysollib/games/pushpin.py index 4f491ff5..f0710104 100644 --- a/pysollib/games/pushpin.py +++ b/pysollib/games/pushpin.py @@ -22,12 +22,10 @@ __all__ = [] # imports -import sys, types # PySol imports from pysollib.gamedb import registerGame, GameInfo, GI from pysollib.util import * -from pysollib.mfxutil import kwdefault from pysollib.stack import * from pysollib.game import Game from pysollib.layout import Layout @@ -91,8 +89,7 @@ class PushPin_RowStack(ReserveStack): def acceptsCards(self, from_stack, cards): if not self.cards: - return from_stack.id > self.id - return True + return False if abs(self.id - from_stack.id) != 1: return False ps = min(self.id, from_stack.id)-1 @@ -128,6 +125,7 @@ class PushPin_RowStack(ReserveStack): class PushPin(Game): Hint_Class = PushPin_Hint + RowStack_Class = PushPin_RowStack # # game layout @@ -154,7 +152,7 @@ class PushPin(Game): if i%2: k = xx-j-1 x, y = l.XM + k*l.XS, l.YM + i*l.YS - s.rows.append(PushPin_RowStack(x, y, self)) + s.rows.append(self.RowStack_Class(x, y, self)) s.talon = PushPin_Talon(l.XM, l.YM, self) s.foundations.append(PushPin_Foundation(l.XM, h-l.YS, self, suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, @@ -171,9 +169,7 @@ class PushPin(Game): def isGameWon(self): return len(self.s.foundations[0].cards) == 50 - def fillEmptyStacks(self): - if not self.demo: - self.startDealSample() + def _fillOne(self): rows = self.s.rows i = 0 for r in rows: @@ -185,14 +181,21 @@ class PushPin(Game): if r.cards: break j += 1 - for r in rows[j:]: - if not r.cards: + else: + return 0 + self.moveMove(1, rows[j], rows[i], frames=2, shadow=0) + return 1 + + def fillEmptyStacks(self): + if not self.demo: + self.startDealSample() + old_state = self.enterState(self.S_FILL) + while True: + if not self._fillOne(): break - self.moveMove(1, r, rows[i], frames=2, shadow=0) - i += 1 + self.leaveState(old_state) if not self.demo: self.stopSamples() - return 0 def getAutoStacks(self, event=None): return ((), (), ()) @@ -223,9 +226,61 @@ class Queens(PushPin): self.s.talon.dealRow() +# /*********************************************************************** +# // Accordion +# ************************************************************************/ + +class Accordion_Hint(AbstractHint): + + def computeHints(self): + game = self.game + rows = game.s.rows + for i in range(len(rows)-3): + r1, r2 = rows[i], rows[i+1] + if r1.cards and r2.cards: + c1, c2 = r1.cards[0], r2.cards[0] + if c1.rank == c2.rank or c1.suit == c2.suit: + self.addHint(5000, 1, r1, r2) + r1, r2 = rows[i], rows[i+3] + if r1.cards and r2.cards: + c1, c2 = r1.cards[0], r2.cards[0] + if c1.rank == c2.rank or c1.suit == c2.suit: + self.addHint(6000, 1, r1, r2) + + +class Accordion_RowStack(PushPin_RowStack): + + def acceptsCards(self, from_stack, cards): + if not self.cards: + return False + if abs(self.id - from_stack.id) not in (1,3): + return False + c1, c2 = self.cards[-1], cards[0] + if c1.rank == c2.rank: + return True + return c1.suit == c2.suit + + clickHandler = ReserveStack.clickHandler + + +class Accordion(PushPin): + Hint_Class = Accordion_Hint + RowStack_Class = Accordion_RowStack + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:2]) + + def isGameWon(self): + return len(self.s.foundations[0].cards) == 52 + + registerGame(GameInfo(287, PushPin, "Push Pin", GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(288, RoyalMarriage, "Royal Marriage", GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) ## registerGame(GameInfo(303, Queens, "Queens", ## GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0)) +registerGame(GameInfo(656, Accordion, "Accordion", + GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED, + altnames=('Idle Year', 'Methuselah', 'Tower of Babel') )) diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index 5a23824c..c180554a 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -168,7 +168,10 @@ class Pyramid_RowStack(Pyramid_StackMethods, OpenStack): class Pyramid(Game): Hint_Class = Pyramid_Hint + Foundation_Class = Pyramid_Foundation Talon_Class = StackWrapper(Pyramid_Talon, max_rounds=3, max_accept=1) + RowStack_Class = Pyramid_RowStack + WasteStack_Class = Pyramid_Waste # # game layout @@ -191,25 +194,26 @@ class Pyramid(Game): x = l.XM + (8-i) * l.XS / 2 y = l.YM + i * l.YS / 2 for j in range(i+1): - s.rows.append(Pyramid_RowStack(x, y, self)) + s.rows.append(self.RowStack_Class(x, y, self)) x = x + l.XS x, y = l.XM, l.YM s.talon = self.Talon_Class(x, y, self) if texts: l.createText(s.talon, "se") - tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") - font=self.app.getFont("canvas_default") - s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, - anchor=ta, font=font) + if s.talon.max_rounds > 1: + tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") + font=self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) if waste: y = y + l.YS - s.waste = Pyramid_Waste(x, y, self, max_accept=1) + s.waste = self.WasteStack_Class(x, y, self, max_accept=1) l.createText(s.waste, "se") x, y = self.width - l.XS, l.YM - s.foundations.append(Pyramid_Foundation(x, y, self, - suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, - max_move=0, max_cards=52)) + s.foundations.append(self.Foundation_Class(x, y, self, + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_move=0, max_cards=52)) if reserves: x, y = l.XM+(max_rows-reserves)*l.XS/2, l.YM+4*l.YS for i in range(reserves): @@ -222,6 +226,7 @@ class Pyramid(Game): l.defaultStackGroups() self.sg.openstacks.append(s.talon) self.sg.dropstacks.append(s.talon) + self.sg.openstacks.append(s.waste) # @@ -280,7 +285,6 @@ class Giza(Pyramid): # // FIXME: UNFINISHED # // (this doesn't work yet as 2 cards of the Waste should be playable) # ************************************************************************/ -# Thirteen #89404422185320919548 class Thirteen(Pyramid): @@ -306,7 +310,7 @@ class Thirteen(Pyramid): s.talon = WasteTalonStack(x, y, self, max_rounds=1) l.createText(s.talon, "s") x = x + l.XS - s.waste = Pyramid_Waste(x, y, self) + s.waste = Pyramid_Waste(x, y, self, max_accept=1) l.createText(s.waste, "s") s.waste.CARD_XOFFSET = 14 x, y = self.width - l.XS, l.YM @@ -484,6 +488,11 @@ class Elevens(Pyramid): self.leaveState(old_state) + def shallHighlightMatch(self, stack1, card1, stack2, card2): + # FIXME + return False + + class ElevensToo(Elevens): def fillStack(self, stack): @@ -676,6 +685,297 @@ class TripleAlliance(Game): return len(self.s.foundations[0].cards) == 51 +# /*********************************************************************** +# // Pharaohs +# ************************************************************************/ + +class Pharaohs_RowStack(Pyramid_RowStack): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return False + if not self.cards: + return False + r0, r1 = cards[0].rank, self.cards[-1].rank + if r0+r1 == 11: + return True + return r0 == r1 + + def basicIsBlocked(self): + for r in self.blockmap: + if r.cards: + return True + return False + + +class Pharaohs(Pyramid): + + Talon_Class = InitialDealTalonStack + RowStack_Class = Pharaohs_RowStack + + PYRAMID_Y_FACTOR = 3 + + def _createPyramid(self, l, x0, y0, size): + rows = [] + # create stacks + for i in range(size): + x = x0 + (size-1-i) * l.XS / 2 + y = y0 + i * l.YS / self.PYRAMID_Y_FACTOR + for j in range(i+1): + stack = self.RowStack_Class(x, y, self) + rows.append(stack) + stack.blockmap = [] + x = x + l.XS + # compute blocking + n = 0 + lr = len(rows) + for i in range(size-1): + for j in range(i+1): + k = n+i+1 + rows[n].blockmap = [rows[k],rows[k+1]] + n += 1 + return rows + + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w = l.XM + 9*l.XS + h = l.YM + 5.67*l.YS + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM + s.rows += self._createPyramid(l, x, y, 2) + x, y = l.XM+2*l.XS, l.YM + s.rows += self._createPyramid(l, x, y, 7) + x, y = l.XM+2.5*l.XS, l.YM+3*l.YS + s.rows += self._createPyramid(l, x, y, 6) + + x, y = l.XM, self.height-l.YS + s.talon = self.Talon_Class(x, y, self) + x, y = self.width - l.XS, l.YM + s.foundations.append(Pyramid_Foundation(x, y, self, + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_move=0, max_cards=52)) + + # define stack-groups + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(frames=4) + + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return (card1.rank + card2.rank == 11 or + card1.rank == card2.rank) + + +# /*********************************************************************** +# // Baroness +# ************************************************************************/ + +class Baroness_Talon(DealRowTalonStack): + def dealCards(self, sound=0): + rows = self.game.s.rows + if len(self.cards) == 7: + rows += self.game.s.reserves + return self.dealRowAvail(rows=rows, sound=sound) + + +class Baroness_RowStack(Giza_Reserve): + + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return False + if not self.cards: + return True + return cards[0].rank + self.cards[-1].rank == 11 + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + if to_stack in self.game.s.rows and not to_stack.cards: + return OpenStack.moveMove(self, ncards, to_stack, frames, shadow) + return Giza_Reserve.moveMove(self, ncards, to_stack, frames, shadow) + + +class Baroness(Pyramid): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + self.setSize(l.XM+9*l.XS, l.YM+max(3.5*l.YS, l.YS+12*l.YOFFSET)) + + # create stacks + x, y = l.XM, l.YM + s.talon = Baroness_Talon(x, y, self) + l.createText(s.talon, 's') + + x += 2*l.XS + for i in range(5): + stack = Baroness_RowStack(x, y, self, max_accept=1) + s.rows.append(stack) + stack.CARD_YOFFSET = l.YOFFSET + x += l.XS + x += l.XS + s.foundations.append(Pyramid_Foundation(x, y, self, + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_move=0, max_cards=52)) + x, y = l.XM, self.height-l.YS + s.reserves.append(Giza_Reserve(x, y, self, max_accept=1)) + y -= l.YS + s.reserves.append(Giza_Reserve(x, y, self, max_accept=1)) + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Apophis +# ************************************************************************/ + +class Apophis_Hint(Pyramid_Hint): + def computeHints(self): + DefaultHint.computeHints(self) + if self.hints: + return + reserves = self.game.s.reserves + for i in range(3): + for j in range(i+1,3): + r1 = reserves[i] + r2 = reserves[j] + if r1.cards and r2.acceptsCards(r1, r1.cards[-1:]): + self.addHint(50000+len(r1.cards)+len(r2.cards), 1, r1, r2) + + +class Apophis_RowStack(Pharaohs_RowStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return False + if not self.cards: + return False + r0, r1 = cards[0].rank, self.cards[-1].rank + return r0+r1 == 11 + + +class Apophis_Talon(RedealTalonStack): + def canDealCards(self): + r_cards = sum([len(r.cards) for r in self.game.s.reserves]) + if self.cards: + return True + elif r_cards and self.round != self.max_rounds: + return True + return False + + def dealCards(self, sound=0): + num_cards = 0 + if sound and self.game.app.opt.animations: + self.game.startDealSample() + if not self.cards: + num_cards = self._redeal(rows=self.game.s.reserves, frames=4) + self.game.nextRoundMove(self) + num_cards += self.dealRowAvail(rows=self.game.s.reserves, sound=0) + if sound: + self.game.stopSamples() + return num_cards + + +class Apophis(Pharaohs): + Hint_Class = Apophis_Hint + RowStack_Class = Apophis_RowStack + + PYRAMID_Y_FACTOR = 2 + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w = l.XM + 9*l.XS + h = l.YM + 4*l.YS + self.setSize(w, h) + + # create stacks + x, y = l.XM+1.5*l.XS, l.YM + s.rows = self._createPyramid(l, x, y, 7) + + x, y = l.XM, l.YM + s.talon = Apophis_Talon(x, y, self, max_rounds=3) + l.createText(s.talon, 'se') + tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") + font = self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + y += l.YS + for i in range(3): + stack = Pyramid_Waste(x, y, self, max_accept=1) + s.reserves.append(stack) + l.createText(stack, 'se') + y += l.YS + x, y = self.width - l.XS, l.YM + s.foundations.append(Pyramid_Foundation(x, y, self, + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_move=0, max_cards=52)) + + # define stack-groups + l.defaultStackGroups() + + def startGame(self): + self.startDealSample() + self.s.talon.dealRow(frames=3) + self.s.talon.dealCards() + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return card1.rank + card2.rank == 11 + +# /*********************************************************************** +# // Cheops +# ************************************************************************/ + +class Cheops_StackMethods(Pyramid_StackMethods): + def acceptsCards(self, from_stack, cards): + if self.basicIsBlocked(): + return 0 + if from_stack is self or not self.cards or len(cards) != 1: + return 0 + c = self.cards[-1] + return (c.face_up and cards[0].face_up and + abs(cards[0].rank-c.rank) in (0,1)) + +class Cheops_Talon(Cheops_StackMethods, Pyramid_Talon): + def clickHandler(self, event): + return FaceUpWasteTalonStack.clickHandler(self, event) + +class Cheops_Waste(Cheops_StackMethods, Pyramid_Waste): + def clickHandler(self, event): + return WasteStack.clickHandler(self, event) + +class Cheops_RowStack(Cheops_StackMethods, Pyramid_RowStack): + def clickHandler(self, event): + return OpenStack.clickHandler(self, event) + + +class Cheops(Pyramid): + + Foundation_Class = AbstractFoundationStack + Talon_Class = StackWrapper(Cheops_Talon, max_rounds=1, max_accept=1) + RowStack_Class = Cheops_RowStack + WasteStack_Class = Cheops_Waste + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return abs(card1.rank-card2.rank) in (0,1) + + + # register the game registerGame(GameInfo(38, Pyramid, "Pyramid", GI.GT_PAIRING_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) @@ -697,5 +997,13 @@ registerGame(GameInfo(597, Fifteens, "Fifteens", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(619, TripleAlliance, "Triple Alliance", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) - +registerGame(GameInfo(655, Pharaohs, "Pharaohs", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(657, Baroness, "Baroness", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_BALANCED, + altnames=('Five Piles',) )) +registerGame(GameInfo(658, Apophis, "Apophis", + GI.GT_PAIRING_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(659, Cheops, "Cheops", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index abaeeefc..26ab7c0e 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -189,32 +189,32 @@ class CaptiveQueens(Game): def createGame(self): l, s = Layout(self), self.s - self.setSize(l.XM+5*l.XS, max(l.YM+3*l.YS, l.YM+2*l.YS+3*l.TEXT_HEIGHT)) + self.setSize(l.XM+5.5*l.XS, l.YM+3*l.YS) - x, y = l.XM, l.YM+l.TEXT_HEIGHT + x, y = l.XM, l.YM+l.YS/2 s.talon = WasteTalonStack(x, y, self, max_rounds=3) - l.createText(s.talon, "s") + l.createText(s.talon, "se") tx, ty, ta, tf = l.getTextAttr(s.talon, "nn") font = self.app.getFont("canvas_default") s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, anchor=ta, font=font) - y += l.YS+l.TEXT_HEIGHT + y += l.YS s.waste = WasteStack(x, y, self) - l.createText(s.waste, "s") + l.createText(s.waste, "se") - x, y = l.XM+l.XS, l.YM + x, y = l.XM+1.5*l.XS, l.YM for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, mod=13, max_cards=6, base_rank=4, dir=-1)) x += l.XS - x, y = l.XM+l.XS, l.YM+l.YS + x, y = l.XM+1.5*l.XS, l.YM+l.YS for i in range(4): s.rows.append(AbstractFoundationStack(x, y, self, suit=i, max_cards=1, max_move=0, base_rank=QUEEN)) x += l.XS - x, y = l.XM+l.XS, l.YM+2*l.YS + x, y = l.XM+1.5*l.XS, l.YM+2*l.YS for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i, mod=13, max_cards=6, base_rank=5)) @@ -224,7 +224,7 @@ class CaptiveQueens(Game): def startGame(self): self.startDealSample() - self.s.talon.dealCards() # deal first card to WasteStack + self.s.talon.dealCards() def isGameWon(self): return (len(self.s.talon.cards) + len(self.s.waste.cards)) == 0 @@ -562,75 +562,6 @@ class Patriarchs(PicturePatience): self.s.talon.dealCards() -# /*********************************************************************** -# // Simplicity -# ************************************************************************/ - -class Simplicity(Game): - Hint_Class = CautiousDefaultHint - - def createGame(self, max_rounds=2): - - l, s = Layout(self), self.s - self.setSize(l.XM+8*l.XS, l.YM+4*l.YS) - - self.base_card = None - - i = 0 - for x, y in ((l.XM, l.YM), - (l.XM+7*l.XS, l.YM), - (l.XM, l.YM+3*l.YS), - (l.XM+7*l.XS, l.YM+3*l.YS), - ): - s.foundations.append(SS_FoundationStack(x, y, self, suit=i, mod=13)) - i += 1 - y = l.YM+l.YS - for i in range(2): - x = l.XM+l.XS - for j in range(6): - stack = AC_RowStack(x, y, self, max_move=1, mod=13) - stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 - s.rows.append(stack) - x += l.XS - y += l.YS - x, y = l.XM+3*l.XS, l.YM - s.talon = WasteTalonStack(x, y, self, max_rounds=1) - l.createText(s.talon, 'sw') - x += l.XS - s.waste = WasteStack(x, y, self) - l.createText(s.waste, 'se') - - l.defaultStackGroups() - - - def startGame(self): - self.startDealSample() - # deal base_card to Foundations, update foundations cap.base_rank - self.base_card = self.s.talon.getCard() - for s in self.s.foundations: - s.cap.base_rank = self.base_card.rank - self.flipMove(self.s.talon) - self.moveMove(1, self.s.talon, self.s.foundations[self.base_card.suit]) - self.s.talon.dealRow() - self.s.talon.dealCards() - - - shallHighlightMatch = Game._shallHighlightMatch_ACW - - - def _restoreGameHook(self, game): - self.base_card = self.cards[game.loadinfo.base_card_id] - for s in self.s.foundations: - s.cap.base_rank = self.base_card.rank - - def _loadGameHook(self, p): - self.loadinfo.addattr(base_card_id=None) # register extra load var. - self.loadinfo.base_card_id = p.load() - - def _saveGameHook(self, p): - p.dump(self.base_card.id) - - # /*********************************************************************** # // Sixes and Sevens # ************************************************************************/ @@ -997,8 +928,6 @@ registerGame(GameInfo(424, Matrimony, "Matrimony", GI.GT_2DECK_TYPE, 2, 16, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(429, Patriarchs, "Patriarchs", GI.GT_2DECK_TYPE, 2, 1, GI.SL_MOSTLY_LUCK)) -registerGame(GameInfo(437, Simplicity, "Simplicity", - GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(438, SixesAndSevens, "Sixes and Sevens", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(477, CornerSuite, "Corner Suite", diff --git a/pysollib/games/takeaway.py b/pysollib/games/takeaway.py index 1acdc3fc..c9773c14 100644 --- a/pysollib/games/takeaway.py +++ b/pysollib/games/takeaway.py @@ -108,12 +108,95 @@ class FourStacks(TakeAway): shallHighlightMatch = Game._shallHighlightMatch_AC +# /*********************************************************************** +# // Striptease +# ************************************************************************/ + +class Striptease_RowStack(UD_RK_RowStack): + def acceptsCards(self, from_stack, cards): + if not self.basicAcceptsCards(from_stack, cards): + return False + if not self.cards: + return True + r1, r2 = self.cards[-1].rank, cards[0].rank + if ((r1 == JACK and r2 == KING) or + (r2 == JACK and r1 == KING)): + return True + return ((r1+1) % 13 == r2 or (r2+1) % 13 == r1) + def getBottomImage(self): + return self.game.app.images.getReserveBottom() + + +class Striptease_Reserve(OpenStack): + def canFlipCard(self): + if not OpenStack.canFlipCard(self): + return False + for r in self.game.s.reserves: + if len(r.cards) > 2: + return False + return True + + +class Striptease(TakeAway): + + def createGame(self): + l, s = Layout(self), self.s + w, h = l.XM+9*l.XS, l.YM+l.YS+16*l.YOFFSET + self.setSize(w, h) + + x, y = l.XM, l.YM + for i in range(4): + stack = Striptease_Reserve(x, y, self, max_move=1, + min_cards=1, max_accept=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.reserves.append(stack) + x += l.XS + x += l.XS + for i in range(4): + stack = Striptease_RowStack(x, y, self, max_move=0) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, l.YOFFSET + s.rows.append(stack) + x += l.XS + s.talon = InitialDealTalonStack(w-l.XS, h-l.YS, self) + + l.defaultAll() + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == QUEEN, None)) + + def startGame(self): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.s.talon.dealRow(rows=self.s.reserves, flip=0, frames=0) + for i in range(8): + self.s.talon.dealRow(rows=self.s.reserves, frames=0) + self.startDealSample() + for i in range(3): + self.s.talon.dealRow(rows=self.s.reserves) + + def isGameWon(self): + for r in self.s.reserves: + if len(r.cards) != 1: + return False + return True + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + r1, r2 = card1.rank, card2.rank + if r1 == QUEEN or r2 == QUEEN: + return False + if ((r1 == JACK and r2 == KING) or + (r2 == JACK and r1 == KING)): + return True + return ((r1+1) % 13 == r2 or (r2+1) % 13 == r1) + # register the game registerGame(GameInfo(334, TakeAway, "Take Away", GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(335, FourStacks, "Four Stacks", GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(654, Striptease, "Striptease", + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py index 4588b398..5a78cab3 100644 --- a/pysollib/games/windmill.py +++ b/pysollib/games/windmill.py @@ -376,17 +376,92 @@ class FourSeasons(Czarina): pass +# /*********************************************************************** +# // Simplicity +# ************************************************************************/ + +class Simplicity(Game): + Hint_Class = CautiousDefaultHint + + def createGame(self, max_rounds=2): + + l, s = Layout(self), self.s + self.setSize(l.XM+8*l.XS, l.YM+4*l.YS) + + self.base_card = None + + i = 0 + for x, y in ((l.XM, l.YM), + (l.XM+7*l.XS, l.YM), + (l.XM, l.YM+3*l.YS), + (l.XM+7*l.XS, l.YM+3*l.YS), + ): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, mod=13)) + i += 1 + y = l.YM+l.YS + for i in range(2): + x = l.XM+l.XS + for j in range(6): + stack = AC_RowStack(x, y, self, max_move=1, mod=13) + stack.CARD_XOFFSET, stack.CARD_YOFFSET = 0, 0 + s.rows.append(stack) + x += l.XS + y += l.YS + x, y = l.XM+3*l.XS, l.YM + s.talon = WasteTalonStack(x, y, self, max_rounds=1) + l.createText(s.talon, 'sw') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'se') + + l.defaultStackGroups() + + + def startGame(self): + self.startDealSample() + # deal base_card to Foundations, update foundations cap.base_rank + self.base_card = self.s.talon.getCard() + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + self.flipMove(self.s.talon) + self.moveMove(1, self.s.talon, self.s.foundations[self.base_card.suit]) + self.s.talon.dealRow() + self.s.talon.dealCards() + + + shallHighlightMatch = Game._shallHighlightMatch_ACW + + + def _restoreGameHook(self, game): + self.base_card = self.cards[game.loadinfo.base_card_id] + for s in self.s.foundations: + s.cap.base_rank = self.base_card.rank + + def _loadGameHook(self, p): + self.loadinfo.addattr(base_card_id=None) # register extra load var. + self.loadinfo.base_card_id = p.load() + + def _saveGameHook(self, p): + p.dump(self.base_card.id) + + # register the game registerGame(GameInfo(30, Windmill, "Windmill", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(277, NapoleonsTomb, "Napoleon's Tomb", GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(417, Corners, "Corners", - GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) + GI.GT_1DECK_TYPE, 1, 2, GI.SL_MOSTLY_LUCK, + rules_filename='fourseasons.html')) +registerGame(GameInfo(437, Simplicity, "Simplicity", + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK, + rules_filename='fourseasons.html')) registerGame(GameInfo(483, Czarina, "Czarina", - GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK, + rules_filename='fourseasons.html')) registerGame(GameInfo(484, FourSeasons, "Four Seasons", - GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) + GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK, + altnames=('Corner Card', 'Vanishing Cross') )) registerGame(GameInfo(561, DutchSolitaire, "Dutch Solitaire", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/stack.py b/pysollib/stack.py index 031f6574..dabb02c6 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -1422,11 +1422,7 @@ class DealBaseCard_StackMethods: class RedealCards_StackMethods: - def redealCards(self, rows=None, sound=0, - shuffle=False, reverse=False, frames=0): - if sound and self.game.app.opt.animations: - self.game.startDealSample() - lr = len(self.game.s.rows) + def _redeal(self, rows=None, reverse=False, frames=0): # move all cards to the Talon num_cards = 0 assert len(self.cards) == 0 @@ -1438,10 +1434,17 @@ class RedealCards_StackMethods: for r in rows: for i in range(len(r.cards)): num_cards += 1 - self.game.moveMove(1, r, self, frames=frames) + self.game.moveMove(1, r, self, frames=frames, shadow=0) if self.cards[-1].face_up: self.game.flipMove(self) assert len(self.cards) == num_cards + return num_cards + + def redealCards(self, rows=None, sound=0, + shuffle=False, reverse=False, frames=0): + if sound and self.game.app.opt.animations: + self.game.startDealSample() + num_cards = self._redeal(rows=rows, reverse=reverse, frames=frames) if num_cards == 0: # game already finished return 0 if shuffle: From 97537e05a25476db7d9312ef203ff356936a07e9 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 13 Aug 2006 21:10:55 +0000 Subject: [PATCH 045/266] + 1 new game + new stacks: DealRowRedealTalonStack and DealReserveRedealTalonStack ++ support GTK started git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@46 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/actions.py | 76 ++--- pysollib/app.py | 71 ++--- pysollib/game.py | 2 +- pysollib/games/pyramid.py | 104 ++----- pysollib/games/sultan.py | 56 ++++ pysollib/games/tournament.py | 43 +-- pysollib/pysolgtk/__init__.py | 0 pysollib/pysolgtk/card.py | 137 +++++++++ pysollib/pysolgtk/colorsdialog.py | 45 +++ pysollib/pysolgtk/demooptionsdialog.py | 56 ++++ pysollib/pysolgtk/edittextdialog.py | 52 ++++ pysollib/pysolgtk/findcarddialog.py | 55 ++++ pysollib/pysolgtk/fontsdialog.py | 48 +++ pysollib/pysolgtk/gameinfodialog.py | 42 +++ pysollib/pysolgtk/menubar.py | 295 ++++++++++++++++++ pysollib/pysolgtk/playeroptionsdialog.py | 52 ++++ pysollib/pysolgtk/progressbar.py | 173 +++++++++++ pysollib/pysolgtk/selectcardset.py | 50 +++ pysollib/pysolgtk/selecttile.py | 50 +++ pysollib/pysolgtk/soundoptionsdialog.py | 50 +++ pysollib/pysolgtk/statusbar.py | 75 +++++ pysollib/pysolgtk/timeoutsdialog.py | 42 +++ pysollib/pysolgtk/tkcanvas.py | 370 +++++++++++++++++++++++ pysollib/pysolgtk/tkconst.py | 66 ++++ pysollib/pysolgtk/tkhtml.py | 56 ++++ pysollib/pysolgtk/tkstats.py | 65 ++++ pysollib/pysolgtk/tkutil.py | 267 ++++++++++++++++ pysollib/pysolgtk/tkwidget.py | 222 ++++++++++++++ pysollib/pysolgtk/tkwrap.py | 294 ++++++++++++++++++ pysollib/pysolgtk/toolbar.py | 177 +++++++++++ pysollib/pysoltk.py | 71 +++-- pysollib/settings.py | 3 + pysollib/stack.py | 82 ++++- pysollib/tk/menubar.py | 12 +- pysollib/tk/tkwrap.py | 27 +- 35 files changed, 3070 insertions(+), 216 deletions(-) create mode 100644 pysollib/pysolgtk/__init__.py create mode 100644 pysollib/pysolgtk/card.py create mode 100644 pysollib/pysolgtk/colorsdialog.py create mode 100644 pysollib/pysolgtk/demooptionsdialog.py create mode 100644 pysollib/pysolgtk/edittextdialog.py create mode 100644 pysollib/pysolgtk/findcarddialog.py create mode 100644 pysollib/pysolgtk/fontsdialog.py create mode 100644 pysollib/pysolgtk/gameinfodialog.py create mode 100644 pysollib/pysolgtk/menubar.py create mode 100644 pysollib/pysolgtk/playeroptionsdialog.py create mode 100644 pysollib/pysolgtk/progressbar.py create mode 100644 pysollib/pysolgtk/selectcardset.py create mode 100644 pysollib/pysolgtk/selecttile.py create mode 100644 pysollib/pysolgtk/soundoptionsdialog.py create mode 100644 pysollib/pysolgtk/statusbar.py create mode 100644 pysollib/pysolgtk/timeoutsdialog.py create mode 100644 pysollib/pysolgtk/tkcanvas.py create mode 100644 pysollib/pysolgtk/tkconst.py create mode 100644 pysollib/pysolgtk/tkhtml.py create mode 100644 pysollib/pysolgtk/tkstats.py create mode 100644 pysollib/pysolgtk/tkutil.py create mode 100644 pysollib/pysolgtk/tkwidget.py create mode 100644 pysollib/pysolgtk/tkwrap.py create mode 100644 pysollib/pysolgtk/toolbar.py diff --git a/pysollib/actions.py b/pysollib/actions.py index fbdd1635..5967a3c2 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -58,7 +58,7 @@ from pysoltk import GameInfoDialog from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE from pysoltk import MfxMessageDialog, MfxSimpleEntry from pysoltk import MfxExceptionDialog -from pysoltk import BooleanVar, IntVar, StringVar +from pysoltk import MfxRadioMenuItem, MfxCheckMenuItem, StringVar from pysoltk import PlayerOptionsDialog from pysoltk import SoundOptionsDialog #from pysoltk import HintOptionsDialog @@ -103,50 +103,50 @@ class PysolMenubarActions: ) # structure to convert menu-options to Toolkit variables self.tkopt = Struct( - gameid = IntVar(), - gameid_popular = IntVar(), - comment = BooleanVar(), - autofaceup = BooleanVar(), - autodrop = BooleanVar(), - autodeal = BooleanVar(), - quickplay = BooleanVar(), - undo = BooleanVar(), - bookmarks = BooleanVar(), - hint = BooleanVar(), - highlight_piles = BooleanVar(), - highlight_cards = BooleanVar(), - highlight_samerank = BooleanVar(), - highlight_not_matching = BooleanVar(), - mahjongg_show_removed = BooleanVar(), - shisen_show_hint = BooleanVar(), - sound = BooleanVar(), - cardback = IntVar(), - tabletile = IntVar(), - animations = IntVar(), - shadow = BooleanVar(), - shade = BooleanVar(), - shade_filled_stacks = BooleanVar(), - shrink_face_down = BooleanVar(), - toolbar = IntVar(), + gameid = MfxRadioMenuItem(self), + gameid_popular = MfxRadioMenuItem(self), + comment = MfxCheckMenuItem(self), + autofaceup = MfxCheckMenuItem(self), + autodrop = MfxCheckMenuItem(self), + autodeal = MfxCheckMenuItem(self), + quickplay = MfxCheckMenuItem(self), + undo = MfxCheckMenuItem(self), + bookmarks = MfxCheckMenuItem(self), + hint = MfxCheckMenuItem(self), + highlight_piles = MfxCheckMenuItem(self), + highlight_cards = MfxCheckMenuItem(self), + highlight_samerank = MfxCheckMenuItem(self), + highlight_not_matching = MfxCheckMenuItem(self), + mahjongg_show_removed = MfxCheckMenuItem(self), + shisen_show_hint = MfxCheckMenuItem(self), + sound = MfxCheckMenuItem(self), + cardback = MfxRadioMenuItem(self), + tabletile = MfxRadioMenuItem(self), + animations = MfxRadioMenuItem(self), + shadow = MfxCheckMenuItem(self), + shade = MfxCheckMenuItem(self), + shade_filled_stacks = MfxCheckMenuItem(self), + shrink_face_down = MfxCheckMenuItem(self), + toolbar = MfxRadioMenuItem(self), toolbar_style = StringVar(), toolbar_relief = StringVar(), toolbar_compound = StringVar(), - toolbar_size = IntVar(), - statusbar = BooleanVar(), - num_cards = BooleanVar(), - helpbar = BooleanVar(), - save_games_geometry = BooleanVar(), - splashscreen = BooleanVar(), - demo_logo = BooleanVar(), - sticky_mouse = BooleanVar(), - mouse_undo = BooleanVar(), - negative_bottom = BooleanVar(), - pause = BooleanVar(), + toolbar_size = MfxRadioMenuItem(self), + statusbar = MfxCheckMenuItem(self), + num_cards = MfxCheckMenuItem(self), + helpbar = MfxCheckMenuItem(self), + save_games_geometry = MfxCheckMenuItem(self), + splashscreen = MfxCheckMenuItem(self), + demo_logo = MfxCheckMenuItem(self), + sticky_mouse = MfxCheckMenuItem(self), + mouse_undo = MfxCheckMenuItem(self), + negative_bottom = MfxCheckMenuItem(self), + pause = MfxCheckMenuItem(self), toolbar_vars = {}, ) for w in TOOLBAR_BUTTONS: - self.tkopt.toolbar_vars[w] = BooleanVar() + self.tkopt.toolbar_vars[w] = MfxCheckMenuItem(self) def connectGame(self, game): diff --git a/pysollib/app.py b/pysollib/app.py index 7ec92c6a..cd06d797 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -55,7 +55,7 @@ from images import Images, SubsampledImages from pysolrandom import PysolRandom from game import Game from gamedb import GI, GAME_DB, loadGame -from settings import TOP_SIZE, TOP_TITLE +from settings import TOP_SIZE, TOP_TITLE, TOOLKIT # Toolkit imports from pysoltk import tkname, tkversion, wm_withdraw, loadImage @@ -85,29 +85,29 @@ class Options: self.saved = 0 # options menu: self.player = _("Unknown") - self.confirm = 1 - self.update_player_stats = 1 - self.autofaceup = 1 - self.autodrop = 0 - self.autodeal = 1 - self.quickplay = 1 - self.undo = 1 - self.bookmarks = 1 - self.hint = 1 - self.highlight_piles = 1 - self.highlight_cards = 1 - self.highlight_samerank = 1 - self.highlight_not_matching = 1 + self.confirm = True + self.update_player_stats = True + self.autofaceup = True + self.autodrop = False + self.autodeal = True + self.quickplay = True + self.undo = True + self.bookmarks = True + self.hint = True + self.highlight_piles = True + self.highlight_cards = True + self.highlight_samerank = True + self.highlight_not_matching = True self.mahjongg_show_removed = False self.mahjongg_create_solvable = True self.shisen_show_hint = True self.animations = 2 # default to Timer based - self.shadow = 1 - self.shade = 1 + self.shadow = True + self.shade = True self.shrink_face_down = True self.shade_filled_stacks = True - self.demo_logo = 1 - self.toolbar = 1 + self.demo_logo = True + self.toolbar = True ##self.toolbar_style = 'default' self.toolbar_style = 'crystal' if os.name == 'posix': @@ -118,11 +118,11 @@ class Options: self.toolbar_vars = {} for w in TOOLBAR_BUTTONS: self.toolbar_vars[w] = True - self.statusbar = 1 - self.num_cards = 0 - self.helpbar = 0 + self.statusbar = True + self.num_cards = False + self.helpbar = False # sound - self.sound = 1 + self.sound = True self.sound_mode = 1 self.sound_sample_volume = 128 self.sound_music_volume = 128 @@ -234,8 +234,8 @@ class Options: # not changeable options def setConstants(self): - self.win_animation = 1 - self.dragcursor = 1 + self.win_animation = True + self.dragcursor = True self.randomize_place = False def copy(self): @@ -661,14 +661,15 @@ class Application: self.top.grid_rowconfigure(1, weight=1) self.setTile(self.tabletile_index, force=True) # create the toolbar - dir = self.getToolbarImagesDir() - self.toolbar = PysolToolbar(self.top, dir=dir, - size=self.opt.toolbar_size, - relief=self.opt.toolbar_relief, - compound=self.opt.toolbar_compound) - self.toolbar.show(self.opt.toolbar) - for w, v in self.opt.toolbar_vars.items(): - self.toolbar.config(w, v) + if TOOLKIT == 'tk': + dir = self.getToolbarImagesDir() + self.toolbar = PysolToolbar(self.top, dir=dir, + size=self.opt.toolbar_size, + relief=self.opt.toolbar_relief, + compound=self.opt.toolbar_compound) + self.toolbar.show(self.opt.toolbar) + for w, v in self.opt.toolbar_vars.items(): + self.toolbar.config(w, v) # if self.intro.progress: self.intro.progress.update(step=1) # @@ -754,7 +755,8 @@ class Application: self.game.create(self) # connect with game self.menubar.connectGame(self.game) - self.toolbar.connectGame(self.game, self.menubar) + if self.toolbar: ##~ + self.toolbar.connectGame(self.game, self.menubar) self.game.updateStatus(player=self.opt.player) # update "Recent games" menubar entry if id in self.opt.recent_gameid: @@ -805,7 +807,8 @@ class Application: # free game def freeGame(self): # disconnect from game - self.toolbar.connectGame(None, None) + if self.toolbar: ##~ + self.toolbar.connectGame(None, None) self.menubar.connectGame(None) # clean up the canvas self.canvas.deleteAllItems() diff --git a/pysollib/game.py b/pysollib/game.py index de1f209d..975921ba 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1556,7 +1556,7 @@ for %d moves. color = self.app.opt.highlight_not_matching_color width = 6 x0, y0 = x+width/2-self.canvas.xmargin, y+width/2-self.canvas.ymargin - x1, y1 = x+w-width/2-self.canvas.xmargin, y+h-width/2-self.canvas.ymargin + x1, y1 = x+w-width-self.canvas.xmargin, y+h-width-self.canvas.ymargin r = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, width=width, fill=None, outline=color) self.canvas.update_idletasks() diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index c180554a..f13e971d 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -142,19 +142,13 @@ class Pyramid_RowStack(Pyramid_StackMethods, OpenStack): def __init__(self, x, y, game): OpenStack.__init__(self, x, y, game, max_accept=1, max_cards=2) self.CARD_YOFFSET = 1 - - STEP = (1, 2, 2, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6, 6, 6) + self.blockmap = [] def basicIsBlocked(self): - r, step = self.game.s.rows, self.STEP - i, n = self.id, 1 - while i < 21: - i = i + step[i] - n = n + 1 - for j in range(i, i+n): - if r[j].cards: - return 1 - return 0 + for r in self.blockmap: + if r.cards: + return True + return False def clickHandler(self, event): if self._dropKingClickHandler(event): @@ -173,10 +167,33 @@ class Pyramid(Game): RowStack_Class = Pyramid_RowStack WasteStack_Class = Pyramid_Waste + PYRAMID_Y_FACTOR = 2 + # # game layout # + def _createPyramid(self, l, x0, y0, size): + rows = [] + # create stacks + for i in range(size): + x = x0 + (size-1-i) * l.XS / 2 + y = y0 + i * l.YS / self.PYRAMID_Y_FACTOR + for j in range(i+1): + stack = self.RowStack_Class(x, y, self) + rows.append(stack) + x = x + l.XS + # compute blocking + n = 0 + lr = len(rows) + for i in range(size-1): + for j in range(i+1): + k = n+i+1 + rows[n].blockmap = [rows[k],rows[k+1]] + n += 1 + return rows + + def createGame(self, rows=4, reserves=0, waste=True, texts=True): # create layout l, s = Layout(self), self.s @@ -190,12 +207,8 @@ class Pyramid(Game): self.setSize(w, h) # create stacks - for i in range(7): - x = l.XM + (8-i) * l.XS / 2 - y = l.YM + i * l.YS / 2 - for j in range(i+1): - s.rows.append(self.RowStack_Class(x, y, self)) - x = x + l.XS + x, y = l.XM+l.XS, l.YM + s.rows = self._createPyramid(l, x, y, 7) x, y = l.XM, l.YM s.talon = self.Talon_Class(x, y, self) @@ -315,8 +328,8 @@ class Thirteen(Pyramid): s.waste.CARD_XOFFSET = 14 x, y = self.width - l.XS, l.YM s.foundations.append(Pyramid_Foundation(x, y, self, - suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, - max_move=0, max_cards=UNLIMITED_CARDS)) + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_move=0, max_cards=52)) # define stack-groups self.sg.talonstacks = [s.talon] + [s.waste] @@ -690,7 +703,6 @@ class TripleAlliance(Game): # ************************************************************************/ class Pharaohs_RowStack(Pyramid_RowStack): - def acceptsCards(self, from_stack, cards): if not self.basicAcceptsCards(from_stack, cards): return False @@ -701,12 +713,6 @@ class Pharaohs_RowStack(Pyramid_RowStack): return True return r0 == r1 - def basicIsBlocked(self): - for r in self.blockmap: - if r.cards: - return True - return False - class Pharaohs(Pyramid): @@ -715,28 +721,6 @@ class Pharaohs(Pyramid): PYRAMID_Y_FACTOR = 3 - def _createPyramid(self, l, x0, y0, size): - rows = [] - # create stacks - for i in range(size): - x = x0 + (size-1-i) * l.XS / 2 - y = y0 + i * l.YS / self.PYRAMID_Y_FACTOR - for j in range(i+1): - stack = self.RowStack_Class(x, y, self) - rows.append(stack) - stack.blockmap = [] - x = x + l.XS - # compute blocking - n = 0 - lr = len(rows) - for i in range(size-1): - for j in range(i+1): - k = n+i+1 - rows[n].blockmap = [rows[k],rows[k+1]] - n += 1 - return rows - - def createGame(self): # create layout l, s = Layout(self), self.s @@ -867,28 +851,6 @@ class Apophis_RowStack(Pharaohs_RowStack): return r0+r1 == 11 -class Apophis_Talon(RedealTalonStack): - def canDealCards(self): - r_cards = sum([len(r.cards) for r in self.game.s.reserves]) - if self.cards: - return True - elif r_cards and self.round != self.max_rounds: - return True - return False - - def dealCards(self, sound=0): - num_cards = 0 - if sound and self.game.app.opt.animations: - self.game.startDealSample() - if not self.cards: - num_cards = self._redeal(rows=self.game.s.reserves, frames=4) - self.game.nextRoundMove(self) - num_cards += self.dealRowAvail(rows=self.game.s.reserves, sound=0) - if sound: - self.game.stopSamples() - return num_cards - - class Apophis(Pharaohs): Hint_Class = Apophis_Hint RowStack_Class = Apophis_RowStack @@ -909,7 +871,7 @@ class Apophis(Pharaohs): s.rows = self._createPyramid(l, x, y, 7) x, y = l.XM, l.YM - s.talon = Apophis_Talon(x, y, self, max_rounds=3) + s.talon = DealReserveRedealTalonStack(x, y, self, max_rounds=3) l.createText(s.talon, 'se') tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") font = self.app.getFont("canvas_default") diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 26ab7c0e..f1d3322e 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -905,6 +905,60 @@ class Adela(Game): shallHighlightMatch = Game._shallHighlightMatch_SS +# /*********************************************************************** +# // Toni +# ************************************************************************/ + +class Toni(Game): + + def createGame(self): + + l, s = Layout(self), self.s + self.setSize(l.XM+8.5*l.XS, l.YM+4*l.YS) + + y = l.YM + suit = 0 + for i in (0,1,3,4): + x = l.XM+(2+i)*l.XS + s.foundations.append(SS_FoundationStack(x, y, self, suit=suit)) + suit += 1 + + x, y = l.XM+4*l.XS, l.YM + for i in range(4): + s.foundations.append(SS_FoundationStack(x, y, self, suit=i, + base_rank=KING, dir=-1)) + y += l.YS + + for i, j in ((0,0),(1,0),(2,0),(5,0),(6,0),(7,0), + (0,1),(1,1),(2,1),(5,1),(6,1),(7,1), + ): + x, y = l.XM+(0.5+i)*l.XS, l.YM+(1.5+j)*l.YS + stack = BasicRowStack(x, y, self, max_accept=0) + s.rows.append(stack) + stack.CARD_YOFFSET = 0 + + x, y = l.XM, l.YM + s.talon = DealRowRedealTalonStack(x, y, self, max_rounds=3) + l.createText(s.talon, 'se') + tx, ty, ta, tf = l.getTextAttr(s.talon, 'ne') + font = self.app.getFont('canvas_default') + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + + l.defaultStackGroups() + + + def _shuffleHook(self, cards): + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank in (ACE, KING) and c.deck == 0, (c.rank, c.suit))) + + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + # register the game registerGame(GameInfo(330, Sultan, "Sultan", @@ -942,3 +996,5 @@ registerGame(GameInfo(635, CircleEight, "Circle Eight", GI.GT_1DECK_TYPE, 1, 1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(646, Adela, "Adela", GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(660, Toni, "Toni", + GI.GT_2DECK_TYPE, 2, 2, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/tournament.py b/pysollib/games/tournament.py index a203343a..b3c40933 100644 --- a/pysollib/games/tournament.py +++ b/pysollib/games/tournament.py @@ -34,46 +34,27 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.pysoltk import MfxCanvasText + # /*********************************************************************** -# // +# // Tournament # ************************************************************************/ - -class Tournament_Talon(TalonStack): - - def canDealCards(self): - if self.round == self.max_rounds and not self.cards: - return False - return not self.game.isGameWon() - +class Tournament_Talon(DealRowRedealTalonStack): def dealCards(self, sound=0): + num_cards = 0 + if sound and self.game.app.opt.animations: + self.game.startDealSample() if len(self.cards) == 0: - self._redeal() - self.game.startDealSample() - n = 0 + num_cards = self._redeal(reverse=True, frames=0) + self.game.nextRoundMove(self) for r in self.game.s.rows: for i in range(4): if not self.cards: break - n += self.dealRow([r]) - self.game.stopSamples() - return n - - def _redeal(self): - # move all cards to the Talon - lr = len(self.game.s.rows) - num_cards = 0 - assert len(self.cards) == 0 - for r in self.game.s.rows[::-1]: - for i in range(len(r.cards)): - num_cards = num_cards + 1 - self.game.moveMove(1, r, self, frames=0) - self.game.flipMove(self) - assert len(self.cards) == num_cards - if num_cards == 0: # game already finished - return - self.game.nextRoundMove(self) - return + num_cards += self.dealRow([r], sound=0) + if sound: + self.game.stopSamples() + return num_cards class Tournament(Game): diff --git a/pysollib/pysolgtk/__init__.py b/pysollib/pysolgtk/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pysollib/pysolgtk/card.py b/pysollib/pysolgtk/card.py new file mode 100644 index 00000000..d89fca57 --- /dev/null +++ b/pysollib/pysolgtk/card.py @@ -0,0 +1,137 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import gtk + +# PySol imports +from pysollib.acard import AbstractCard + +# Toolkit imports +from tkcanvas import MfxCanvasGroup, MfxCanvasImage + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class _HideableCard(AbstractCard): + def hide(self, stack): + if stack is self.hide_stack: + return + self.item.hide() + self.hide_stack = stack + + def unhide(self): + if self.hide_stack is None: + return 0 + self.item.show() + self.hide_stack = None + return 1 + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class _OneImageCard(_HideableCard): + def __init__(self, id, deck, suit, rank, game, x=0, y=0): + _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y) + images = game.app.images + self.__face_image = images.getFace(deck, suit, rank) + self.__back_image = images.getBack(deck, suit, rank) + self.__image = MfxCanvasImage(game.canvas, self.x, self.y, + image=self.__back_image, + anchor=gtk.ANCHOR_NW) + if 0: + # using a group for a single image doesn't gain much + self.item = MfxCanvasGroup(game.canvas) + self.__image.addtag(self.item) + else: + self.item = self.__image + + def showFace(self, unhide=1): + if not self.face_up: + self.__image.config(image=self.__face_image) + self.tkraise(unhide) + self.face_up = 1 + + def showBack(self, unhide=1): + if self.face_up: + self.__image.config(image=self.__back_image) + self.tkraise(unhide) + self.face_up = 0 + + def updateCardBackground(self, image): + self.__back_image = image + if not self.face_up: + self.__image.config(image=image) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class _TwoImageCard(_HideableCard): + def __init__(self, id, deck, suit, rank, game, x=0, y=0): + _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y) + images = game.app.images + self.item = MfxCanvasGroup(game.canvas) + self.__face = MfxCanvasImage(game.canvas, self.x, self.y, image=images.getFace(deck, suit, rank), anchor='nw') + self.__back = MfxCanvasImage(game.canvas, self.x, self.y, image=images.getBack(deck, suit, rank), anchor='nw') + self.__face.addtag(self.item) + self.__back.addtag(self.item) + self.__face.hide() + + def showFace(self, unhide=1): + if not self.face_up: + self.__back.hide() + self.__face.show() + self.tkraise(unhide) + self.face_up = 1 + + def showBack(self, unhide=1): + if self.face_up: + self.__face.hide() + self.__back.show() + self.tkraise(unhide) + self.face_up = 0 + + def updateCardBackground(self, image): + self.__back.config(image=image) + + + +# choose the implementation +Card = _TwoImageCard +Card = _OneImageCard + diff --git a/pysollib/pysolgtk/colorsdialog.py b/pysollib/pysolgtk/colorsdialog.py new file mode 100644 index 00000000..8c9ce661 --- /dev/null +++ b/pysollib/pysolgtk/colorsdialog.py @@ -0,0 +1,45 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['ColorsDialog'] + +## # imports +## import os, sys +## import Tkinter +## from tkColorChooser import askcolor + +## # PySol imports +## from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +## # Toolkit imports +## from tkconst import EVENT_HANDLED, EVENT_PROPAGATE + +from tkwidget import MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class ColorsDialog(MfxDialog): + pass + + + diff --git a/pysollib/pysolgtk/demooptionsdialog.py b/pysollib/pysolgtk/demooptionsdialog.py new file mode 100644 index 00000000..4af6b269 --- /dev/null +++ b/pysollib/pysolgtk/demooptionsdialog.py @@ -0,0 +1,56 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import os, sys +from gtk import * + +# PySol imports +from mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkwidget import MfxDialog + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class DemoOptionsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + pass + + +class HintOptionsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + pass + diff --git a/pysollib/pysolgtk/edittextdialog.py b/pysollib/pysolgtk/edittextdialog.py new file mode 100644 index 00000000..60fc06a5 --- /dev/null +++ b/pysollib/pysolgtk/edittextdialog.py @@ -0,0 +1,52 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['EditTextDialog'] + +# imports +## import os, sys, Tkinter + +# PySol imports + +# Toolkit imports +from tkwidget import MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class EditTextDialog(MfxDialog): + pass + diff --git a/pysollib/pysolgtk/findcarddialog.py b/pysollib/pysolgtk/findcarddialog.py new file mode 100644 index 00000000..ee358356 --- /dev/null +++ b/pysollib/pysolgtk/findcarddialog.py @@ -0,0 +1,55 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['create_find_card_dialog', + 'connect_game_find_card_dialog', + 'destroy_find_card_dialog', + ] + +# imports +## import os +## import Tkinter +## import traceback + +## # PySol imports + +## # Toolkit imports +## from tkutil import after, after_cancel +## from tkutil import bind, unbind_destroy, makeImage +## from tkcanvas import MfxCanvas, MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle + + +# /*********************************************************************** +# // +# ************************************************************************/ + +find_card_dialog = None + +def create_find_card_dialog(parent, game, dir): + pass + +def connect_game_find_card_dialog(game): + pass + +def destroy_find_card_dialog(): + pass + + diff --git a/pysollib/pysolgtk/fontsdialog.py b/pysollib/pysolgtk/fontsdialog.py new file mode 100644 index 00000000..d2cb80ab --- /dev/null +++ b/pysollib/pysolgtk/fontsdialog.py @@ -0,0 +1,48 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['FontsDialog'] + +## # imports +## import os, sys +## import types +## import Tkinter +## import tkFont + +## # PySol imports +## from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +## # Toolkit imports +## from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +## from tkutil import bind + +from tkwidget import MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class FontsDialog(MfxDialog): + pass + + + + diff --git a/pysollib/pysolgtk/gameinfodialog.py b/pysollib/pysolgtk/gameinfodialog.py new file mode 100644 index 00000000..fba75120 --- /dev/null +++ b/pysollib/pysolgtk/gameinfodialog.py @@ -0,0 +1,42 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + + +__all__ = ['GameInfoDialog'] + +## # imports +## import os, sys +## import Tkinter + +## # PySol imports +## from pysollib.mfxutil import KwStruct +## from pysollib.gamedb import GI + +# Toolkit imports +from tkwidget import MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class GameInfoDialog(MfxDialog): + pass + diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py new file mode 100644 index 00000000..77054ded --- /dev/null +++ b/pysollib/pysolgtk/menubar.py @@ -0,0 +1,295 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import math, os, re, string, sys + +import gtk +from gtk import gdk +TRUE, FALSE = True, False + +# PySol imports +from pysollib.gamedb import GI +from pysollib.actions import PysolMenubarActions + +# toolkit imports +from tkutil import setTransient +from tkutil import color_tk2gtk, color_gtk2tk +from selectcardset import SelectCardsetDialogWithPreview +from selectcardset import SelectCardsetByTypeDialogWithPreview + + +# /*********************************************************************** +# // - create menubar +# // - update menubar +# // - menu actions +# ************************************************************************/ + +class PysolMenubar(PysolMenubarActions): + def __init__(self, app, top, progress=None): + PysolMenubarActions.__init__(self, app, top) + self.menus = None + self.menu_items = None + # create menus + menubar, accel = self.createMenus() + # additional key bindings + ### FIXME + ###self.accel.add("Space", None, None, None, None) + # delete the old menubar + # set the menubar + ##~ accel.attach(self.top) + top.add_accel_group(accel) + w = menubar.get_widget('
    ') + self.top.vbox.pack_start(w, expand=FALSE, fill=FALSE) + self.top.vbox.reorder_child(w, 0) + self.__menubar = menubar + self.__accel = accel + self.menus = menubar + + + # + # create menubar + # + + def m(self, *args): + ##print args + pass + + def _initItemFactory(self): + self.menu_items = ( + ("/_File", None, None, 0, ""), + ("/File/", None, None, 0, ""), + ("/File/_New Game", "N", self.mNewGame, 0, ""), + ("/File/Select _game", None, None, 0, ""), + ) + + # + # /File/Select game + # + + mi, radio = [], "" + games = self.app.gdb.getGamesIdSortedByName() + i = 0 + path = "/File/Select game" + columnbreak = 25 + n = 0 + mm = [] + t1 = t2 = None + for id in games: + if t1 is None: + t1 = self.app.getGameMenuitemName(id)[:3] + if n == columnbreak: + t2 = self.app.getGameMenuitemName(id)[:3] + pp = '%s/%s-%s' % (path, t1, t2) + mi.append((pp, None, None, 0, '')) + for m in mm: + p = '%s/%s' % (pp, m[0]) + mi.append((p, None, self.mSelectGame, m[1], radio)) + if radio[0] == '<': + radio = re.sub('_', '', p) + n = 0 + mm = [] + t1 = t2 + + mm.append((self.app.getGameMenuitemName(id), id)) + n += 1 + + t2 = self.app.getGameMenuitemName(id)[:3] + pp = '%s/%s-%s' % (path, t1, t2) + mi.append((pp, None, None, 0, '')) + for m in mm: + p = '%s/%s' % (pp, m[0]) + mi.append((p, None, self.mSelectGame, m[1], radio)) + + self.menu_items = self.menu_items + tuple(mi) + self.tkopt.gameid.path = radio + + # + # + # + + self.menu_items = self.menu_items + ( + ("/File/Select game by number...", None, self.mSelectGameById, 0, ""), + ("/File/", None, None, 0, ""), + ("/File/_Open", "O", self.m, 0, ""), + ("/File/_Save", "S", self.mSave, 0, ""), + ("/File/Save _as...", None, self.m, 0, ""), + ("/File/", None, None, 0, ""), + ("/File/_Quit", "Q", self.mQuit, 0, ""), + ("/_Edit", None, None, 0, ""), + ("/Edit/", None, None, 0, ""), + ("/Edit/_Undo", "Z", self.mUndo, 0, ""), + ("/Edit/_Redo", "R", self.mRedo, 0, ""), + ("/Edit/Redo _all", None, self.mRedoAll, 0, ""), + ("/Edit/", None, None, 0, ""), + ("/Edit/Restart _game", "G", self.mRestart, 0, ""), + ("/_Game", None, None, 0, ""), + ("/Game/", None, None, 0, ""), + ("/Game/_Deal cards", "D", self.mDeal, 0, ""), + ("/Game/_Auto drop", "A", self.mDrop, 0, ""), + ("/Game/", None, None, 0, ""), + ("/Game/S_tatus...", "T", self.mStatus, 0, ""), + ("/_Assist", None, None, 0, ""), + ("/Assist/", None, None, 0, ""), + ("/Assist/_Hint", "H", self.mHint, 0, ""), + ("/Assist/Highlight _piles", "Shift", self.mHighlightPiles, 0, ""), + ("/Assist/", None, None, 0, ""), + ("/Assist/_Demo", "D", self.mDemo, 0, ""), + ("/Assist/Demo (all games)", "", self.mMixedDemo, 0, ""), + ("/_Options", None, None, 0, ""), + ("/Options/", None, None, 0, ""), + ("/Options/_Confirm", None, self.mOptConfirm, 0, ""), + ("/Options/Auto_play", "P", self.mOptAutoDrop, 0, ""), + ("/Options/_Automatic _face up", "F", self.mOptAutoFaceUp, 0, ""), + ("/Options/Highlight _matching cards", None, self.mOptEnableHighlightCards, 0, ""), + ("/Options/", None, None, 0, ""), + ) + + mi, radio = [], "" + path = "/Options/Cards_et" + mi.append((path, None, None, 0, "")) + for i in range(self.app.cardset_manager.len()): + columnbreak = i > 0 and (i % 25) == 0 + p = path + '/' + self.app.cardset_manager.get(i).name + mi.append((p, None, self.mOptCardset, i, radio)) + if radio[0] == '<': + radio = re.sub('_', '', p) + self.menu_items = self.menu_items + tuple(mi) +## self.tkopt.cardset.path = radio + + self.menu_items = self.menu_items + ( + ("/Options/Table color...", None, self.mOptTableColor, 0, ""), + ) + + mi, radio = [], "" + path = "/Options/_Animations" + mi.append((path, None, None, 0, "")) + i = 0 + for k in ("_None", "_Fast", "_Timer based"): + p = path + '/' + k + mi.append((p, None, self.mOptAnimations, i, radio)) + if radio[0] == '<': + radio = re.sub('_', '', p) + i = i + 1 + self.menu_items = self.menu_items + tuple(mi) + self.tkopt.animations.path = radio + + self.menu_items = self.menu_items + ( + ("/Options/Card shadow", None, self.mOptShadow, 0, ""), + ("/Options/Shade legal moves", None, self.mOptShade, 0, ""), + ("/Options/", None, None, 0, ""), + ("/Options/_Hint options...", None, self.mOptHintOptions, 0, ""), + ("/Options/_Demo options...", None, self.mOptDemoOptions, 0, ""), + ("/_Help", None, None, 0, ""), + ("/Help/", None, None, 0, ""), + ("/Help/_Contents", "F1", self.mHelp, 0, ""), + ("/Help/_Rules", None, self.mHelpRules, 0, ""), + ("/Help/", None, None, 0, ""), + ("/Help/_About PySol...", None, self.mHelpAbout, 0, ""), + ) + + + def createMenus(self): + if not self.menu_items: + self._initItemFactory() + accel = gtk.AccelGroup() + item_factory = gtk.ItemFactory(gtk.MenuBar, '
    ', accel) + item_factory.create_items(self.menu_items) + return item_factory, accel + + + # + # menu updates + # + + def setMenuState(self, state, path): + return + w = self.__menubar.get_widget(path) + w.set_sensitive(state) + + def setToolbarState(self, state, path): + ##~ w = getattr(self.app.toolbar, path + "_button") + ##~ w.set_sensitive(state) + pass + + + # + # menu actions + # + + def mOpen(self, *args): + pass + + def mSaveAs(self, *event): + pass + + def mOptCardset(self, *args): + pass + + def mOptTableColor(self, *args): + win = gtk.ColorSelectionDialog("Select table color") + win.help_button.destroy() + win.set_position(gtk.WIN_POS_MOUSE) + win.colorsel.set_current_color(gdk.color_parse(self.app.opt.table_color)) + + ##win.colorsel.set_update_policy(UPDATE_CONTINUOUS) + def delete_event(widget, *event): + widget.destroy() + def ok_button_clicked(_button, self=self, win=win): + c = win.colorsel.get_current_color() + c = '#%02x%02x%02x' % (c.red/256, c.green/256, c.blue/256) + win.destroy() + self.app.opt.table_color = c + self.game.canvas.config(bg=self.app.opt.table_color) + self.top.config(bg=self.app.opt.table_color) + win.connect("delete_event", delete_event) + win.ok_button.connect("clicked", ok_button_clicked) + win.cancel_button.connect("clicked", win.destroy) + setTransient(win, self.top) + win.show() + + def mOptConfirm(self, *args): + pass + + def mOptHintOptions(self, *args): + pass + + def mOptDemoOptions(self, *args): + pass + + def updateFavoriteGamesMenu(self, *args): + pass + +## def mSelectGame(self, gameid, menuitem): +## if menuitem.get_active(): +## self._mSelectGame(gameid) + diff --git a/pysollib/pysolgtk/playeroptionsdialog.py b/pysollib/pysolgtk/playeroptionsdialog.py new file mode 100644 index 00000000..32dd4982 --- /dev/null +++ b/pysollib/pysolgtk/playeroptionsdialog.py @@ -0,0 +1,52 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PlayerOptionsDialog'] + +# imports +import gtk + +# PySol imports + +# Toolkit imports +from tkwidget import MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PlayerOptionsDialog(MfxDialog): + pass + diff --git a/pysollib/pysolgtk/progressbar.py b/pysollib/pysolgtk/progressbar.py new file mode 100644 index 00000000..957c1d2e --- /dev/null +++ b/pysollib/pysolgtk/progressbar.py @@ -0,0 +1,173 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import os, sys + +import gtk +from gtk import gdk +TRUE, FALSE = True, False + +# Toolkit imports +from tkutil import makeToplevel, setTransient + + +# /*********************************************************************** +# // a simple progress bar +# ************************************************************************/ + +class PysolProgressBar: + def __init__(self, app, parent, title=None, images=None, + color='blue', bg='#c0c0c0', + height=25, show_text=1, norm=1): + self.parent = parent + self.percent = 0 + self.norm = norm + self.top = makeToplevel(parent, title=title) + self.top.set_position(gtk.WIN_POS_CENTER) + ##self.top.set_policy(FALSE, FALSE, FALSE) + self.top.set_resizable(FALSE) + self.top.connect("delete_event", self.wmDeleteWindow) + + # hbox + hbox = gtk.HBox(spacing=5) + hbox.set_border_width(10) + hbox.show() + self.top.vbox.pack_start(hbox, FALSE, FALSE) + # hbox-1: image +## if images and images[0]: +## im = images[0].clone() +## im.show() +## hbox.pack_start(im, FALSE, FALSE) + # hbox-2:vbox + vbox = gtk.VBox() + vbox.show() + hbox.pack_start(vbox, FALSE, FALSE) + # hbox-2:vbox:pbar + self.pbar = gtk.ProgressBar() + self.pbar.show() + vbox.pack_start(self.pbar, TRUE, FALSE) + self.pbar.realize() + ##~ self.pbar.set_show_text(show_text) + self.pbar.set_text(str(show_text)+'%') + w, h = self.pbar.size_request() + self.pbar.set_size_request(max(w, 300), max(h, height)) + # set color + c = self.pbar.get_colormap().alloc_color(color) + self.pbar.style.bg[gtk.STATE_PRELIGHT] = c + ##~ style = self.pbar.get_style().copy() + ##~ style.bg[gtk.STATE_PRELIGHT] = c + ##~ self.pbar.set_style(style) + # hbox-3:image +## if images and images[1]: +## im = images[1].clone() +## im.show() +## hbox.pack_start(im, FALSE, FALSE) + # set icon + if app: + try: + name = app.dataloader.findFile('pysol.xpm') + bg = self.top.get_style().bg[gtk.STATE_NORMAL] + pixmap, mask = create_pixmap_from_xpm(self.top, bg, name) + self.top.set_icon(pixmap, mask) + except: pass + ##~ self.top.get_window().set_cursor(cursor_new(gdk.WATCH)) + setTransient(self.top, parent) + self.top.show() + self.update(percent=0) + + def destroy(self): + self.top.destroy() + + def pack(self): + pass + + def update(self, percent=None, step=1): + if percent is None: + self.percent = self.percent + step + elif percent > self.percent: + self.percent = percent + self.percent = min(100, max(0, self.percent)) + self.pbar.set_fraction(self.percent / 100.0) + self.pbar.set_text(str(int(self.percent))+'%') + ##~ self.pbar.update(self.percent / 100.0) + self.update_idletasks() + + def update_idletasks(self): + while gtk.events_pending(): + gtk.mainiteration() + + def wmDeleteWindow(self, *args): + return TRUE + + +# /*********************************************************************** +# // +# ************************************************************************/ + +#%ifndef BUNDLE + +class TestProgressBar: + def __init__(self, parent, images=None): + self.parent = parent + self.progress = PysolProgressBar(None, parent, title="Progress", + images=images, color='#008200') + self.progress.pack() + self.func = [ self.update, 0 ] + self.func[1] = timeout_add(30, self.func[0]) + + def update(self, *args): + if self.progress.percent >= 100: + self.progress.destroy() + mainquit() + return FALSE + self.progress.update(step=1) + return TRUE + +def progressbar_main(args): + root = gtk.Window() + root.connect("destroy", mainquit) + root.connect("delete_event", mainquit) + images = None + if 1: + from tkwrap import loadImage + im = loadImage(os.path.join(os.pardir, os.pardir, 'data', 'images', 'jokers', 'joker07_40_774.gif')) + images = (im, im) + pb = TestProgressBar(root, images=images) + mainloop() + return 0 + +if __name__ == '__main__': + sys.exit(progressbar_main(sys.argv)) + +#%endif + diff --git a/pysollib/pysolgtk/selectcardset.py b/pysollib/pysolgtk/selectcardset.py new file mode 100644 index 00000000..6464647d --- /dev/null +++ b/pysollib/pysolgtk/selectcardset.py @@ -0,0 +1,50 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import os, re, sys, types +from gtk import * + +# Toolkit imports +from tkwidget import MfxDialog + + +# /*********************************************************************** +# // Dialog +# ************************************************************************/ + +class SelectCardsetDialogWithPreview(MfxDialog): + pass + +class SelectCardsetByTypeDialogWithPreview(SelectCardsetDialogWithPreview): + pass + diff --git a/pysollib/pysolgtk/selecttile.py b/pysollib/pysolgtk/selecttile.py new file mode 100644 index 00000000..09cee74e --- /dev/null +++ b/pysollib/pysolgtk/selecttile.py @@ -0,0 +1,50 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +## # imports +## import os, string, sys, types +## import Tkinter, tkColorChooser + +## # PySol imports +## from pysollib.mfxutil import destruct, Struct, KwStruct +## from pysollib.resource import CSI + +## # Toolkit imports +## from tkutil import loadImage +## from tkwidget import MfxDialog, MfxScrolledCanvas +## from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode +## from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas + diff --git a/pysollib/pysolgtk/soundoptionsdialog.py b/pysollib/pysolgtk/soundoptionsdialog.py new file mode 100644 index 00000000..572b6a20 --- /dev/null +++ b/pysollib/pysolgtk/soundoptionsdialog.py @@ -0,0 +1,50 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import os, sys +import gtk + +# PySol imports + +# Toolkit imports +from tkwidget import MfxDialog + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class SoundOptionsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + pass + diff --git a/pysollib/pysolgtk/statusbar.py b/pysollib/pysolgtk/statusbar.py new file mode 100644 index 00000000..7783db5c --- /dev/null +++ b/pysollib/pysolgtk/statusbar.py @@ -0,0 +1,75 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import os, sys +import gtk +TRUE, FALSE = True, False + +# PySol imports + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PysolStatusbar: + def __init__(self, top): + self.top = top + self.side = '#init#' + + def updateText(self, **kw): + pass + + def configLabel(self, name, **kw): + pass + + def show(self, side='bottom', resize=0): + return 0 + + def hide(self, resize=0): + self.show(None, resize) + + def getSide(self): + return self.side + + def destroy(self): + pass + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class HelpStatusbar(PysolStatusbar): + pass + diff --git a/pysollib/pysolgtk/timeoutsdialog.py b/pysollib/pysolgtk/timeoutsdialog.py new file mode 100644 index 00000000..13283977 --- /dev/null +++ b/pysollib/pysolgtk/timeoutsdialog.py @@ -0,0 +1,42 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['TimeoutsDialog'] + +## # imports +## import os, sys +## import Tkinter + +## # PySol imports +## from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +## # Toolkit imports +## from tkconst import EVENT_HANDLED, EVENT_PROPAGATE + +from tkwidget import MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class TimeoutsDialog(MfxDialog): + pass + diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py new file mode 100644 index 00000000..c1c5b716 --- /dev/null +++ b/pysollib/pysolgtk/tkcanvas.py @@ -0,0 +1,370 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# +# This files tries to wrap a limited subset of the Tkinter canvas +# into GTK / Gnome. +# + +# +# Some background information: +# +# - Each card is a canvas group consisting of a background and foreground +# image. Turning a card raises the respective image within that group. +# +# - Each stack is a canvas group consisting of cards (i.e. a group of groups) +# +# - Cards change stacks, and are bound to the main canvas when dragging +# around. +# + + +# imports +import os, sys, types + +import gtk +from gtk import gdk +import gnome.canvas +TRUE, FALSE = True, False + +# toolkit imports +from tkutil import anchor_tk2gtk, loadImage, bind + +# /*********************************************************************** +# // canvas items +# // +# // My first (obvious) approach was to subclass the GnomeCanvas* +# // classes, but this didn't work at all... +# // +# // Now I've resorted to delegation, but what are the Gnome canvas item +# // classes for then ? +# ************************************************************************/ + +class _CanvasItem: + def __init__(self, canvas): + self.canvas = canvas + def addtag(self, group): + ##~ assert isinstance(group._item, CanvasGroup) + self._item.reparent(group._item) + def bind(self, sequence, func, add=None): + bind(self._item, sequence, func, add) + def bbox(self): + ## FIXME + return (0, 0, 0, 0) + def dtag(self, group): + ##~ assert isinstance(group._item, CanvasGroup) + self._item.reparent(self.canvas.root()) + def delete(self): + if self._item is not None: + self._item.destroy() + self._item = None + def hide(self): + self._item.hide() + def lower(self, positions=None): + ##print "lower", self._item, positions + if positions is None: + self._item.lower_to_bottom() + else: + ##~ assert type(positions) is types.IntType and positions > 0 + ##~ self._item.lower(positions) + pass + def move(self, x, y): + self._item.move(x, y) + def show(self): + self._item.show() + def tkraise(self, positions=None): + ##print "tkraise", self._item, positions + if positions is None: + self._item.raise_to_top() + else: + ##~ assert type(positions) is types.IntType and positions > 0 + ##~ self._item.raise_(positions) + pass + + +class MfxCanvasGroup(_CanvasItem): + def __init__(self, canvas): + _CanvasItem.__init__(self, canvas) + self._item = canvas.root().add(gnome.canvas.CanvasGroup, x=0, y=0) + + + +class MfxCanvasImage(_CanvasItem): + def __init__(self, canvas, x, y, image, anchor=gtk.ANCHOR_NW): + _CanvasItem.__init__(self, canvas) + anchor = anchor_tk2gtk(anchor) + self._item = canvas.root().add(gnome.canvas.CanvasPixbuf, + x=x, y=y, + pixbuf=image.pixbuf, + width=image.width(), + height=image.height(), + anchor=anchor) + + def config(self, image): + ##~ assert isinstance(image.im, GdkImlib.Image) + self._item.set(pixbuf=image.pixbuf) + + +class MfxCanvasLine(_CanvasItem): + def __init__(self, canvas, x1, y1, x2, y2, width, fill, arrow, arrowshape): + _CanvasItem.__init__(self, canvas) + # FIXME + self._item = None + + +class MfxCanvasRectangle(_CanvasItem): + def __init__(self, canvas, x1, y1, x2, y2, width, fill, outline): + self._item = canvas.root().add('rect', x1=x1, y1=y1, x2=x2, y2=y2, + width_pixels=width, outline_color=outline) + if fill is not None: + self._item.set(fill_color=fill) + + +class MfxCanvasText(_CanvasItem): + def __init__(self, canvas, x, y, anchor=gtk.ANCHOR_NW, preview=-1, **kw): + if preview < 0: + preview = canvas.preview + if preview > 1: + return + anchor = anchor_tk2gtk(anchor) + self._item = canvas.root().add(gnome.canvas.CanvasText, + x=x, y=y, anchor=anchor) + if not kw.has_key('fill'): + kw['fill'] = canvas._text_color + for k, v in kw.items(): + self[k] = v + self.text_format = None + canvas._text_items.append(self) + + def __setitem__(self, key, value): + if key == 'fill': + self._item.set(fill_color=value) + elif key == 'font': + self._item.set(font=value) + elif key == 'text': + self._item.set(text=value) + else: + raise AttributeError, key + + def config(self, **kw): + for k, v in kw.items(): + self[k] = v + + def __getitem__(self, key): + if key == 'text': + # FIXME + return "" + else: + raise AttributeError, key + cget = __getitem__ + + +# /*********************************************************************** +# // canvas +# ************************************************************************/ + +class MfxCanvas(gnome.canvas.Canvas): + def __init__(self, top, bg=None, highlightthickness=0): + self.preview = 0 + # Tkinter compat + self.items = {} + # private + self.__tileimage = None + self.__tiles = [] + # friend MfxCanvasText + self._text_color = '#000000' + self._text_items = [] + # + gnome.canvas.Canvas.__init__(self) + self.style = self.get_style().copy() + if bg is not None: + c = self.get_colormap().alloc(bg) + self.style.bg[gtk.STATE_NORMAL] = c + self.set_style(self.style) + self.set_scroll_region(0, 0, gdk.screen_width(), gdk.screen_height()) + top.vbox.pack_start(self) + ## + self.top = top + self.xmargin, self.ymargin = 0, 0 + + def __setattr__(self, name, value): + self.__dict__[name] = value + + def bind(self, sequence=None, func=None, add=None): + assert add is None + # FIXME + print "TkCanvas bind:", sequence + return + + def cget(self, attr): + if attr == 'cursor': + # FIXME + return gdk.LEFT_PTR + return self.get_window().get_cursor(v) + print "TkCanvas cget:", attr + raise AttributeError, attr + + def configure(self, **kw): + height, width = -1, -1 + for k, v in kw.items(): + if k == "background" or k == "bg": + print 'configure: bg:', v + c = self.get_colormap().alloc_color(v) + self.style.bg[gtk.STATE_NORMAL] = c + ##~ self.set_style(self.style) + self.queue_draw() + elif k == "cursor": + ##~ w = self.window + ##~ if w: + ##~ w.set_cursor(cursor_new(v)) + pass + elif k == "height": + height = v + elif k == "width": + width = v + else: + print "TkCanvas", k, v + raise AttributeError, k + if height > 0 and width > 0: + self.set_size_request(width, height) + #self.queue_draw() + #self.queue_resize() + #self.show() + #pass + + config = configure + + # PySol extension + # delete all CanvasItems, but keep the background and top tiles + def deleteAllItems(self): + ## FIXME + pass + + # PySol extension + def findCard(self, stack, event): + # FIXME + ##w = self.get_item_at(event.x, event.y) + ##print w + return stack._findCardXY(event.x, event.y) + + def pack(self, **kw): + self.show() + + # PySol extension + def setTextColor(self, color): + if self._text_color != color: + self._text_color = color + for item in self._text_items: + item.set(fill_color=_self.text_color) + + # PySol extension - set a tiled background image + def setTile(self, app, i, force=False): + ##print 'setTile' + tile = app.tabletile_manager.get(i) + if tile is None or tile.error: + return False + if i == 0: + assert tile.color + assert tile.filename is None + else: + assert tile.color is None + assert tile.filename + assert tile.basename + if not force: + if i == app.tabletile_index and tile.color == app.opt.table_color: + return False + # + if not self._setTile(tile.filename, tile.stretch): + tile.error = True + return False + + if i == 0: + self.configure(bg=tile.color) + ##app.top.config(bg=tile.color) + color = None + else: + self.configure(bg=app.top_bg) + ##app.top.config(bg=app.top_bg) + color = tile.text_color + + if app.opt.table_text_color: + self.setTextColor(app.opt.table_text_color_value) + else: + self.setTextColor(color) + + return True + + + ### FIXME: should use style.bg_pixmap ???? + def _setTile(self, image, stretch=False): + try: + if image and type(image) is types.StringType: + image = loadImage(image) + except: + return 0 + for item in self.__tiles: + item.destroy() + self.__tiles = [] + # must keep a reference to the image, otherwise Python will + # garbage collect it... + self.__tileimage = image + if image is None: + return 1 + iw, ih = image.width(), image.height() + sw = max(self.winfo_screenwidth(), 1024) + sh = max(self.winfo_screenheight(), 768) + for x in range(0, sw - 1, iw): + for y in range(0, sh - 1, ih): + item = self.root().add('image', x=x, y=y, width=iw, height=ih, + image=image.im._im, + anchor=gtk.ANCHOR_NW) + item.lower_to_bottom() + self.__tiles.append(item) + return 1 + + def setTopImage(self, image, cw=0, ch=0): + ## FIXME + pass + + def update_idletasks(self): + self.update_now() + + def grid(self, *args, **kw): + pass + + def setInitialSize(self, width, height): + self.set_size_request(width, height) + if self.window: + self.window.resize(width, height) + + + diff --git a/pysollib/pysolgtk/tkconst.py b/pysollib/pysolgtk/tkconst.py new file mode 100644 index 00000000..a6dae2b0 --- /dev/null +++ b/pysollib/pysolgtk/tkconst.py @@ -0,0 +1,66 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import sys +from gtk import gdk + + +# /*********************************************************************** +# // constants +# ************************************************************************/ + +tkname = "gnome" +# (major version, minor version, micro version, patchlevel) +tkversion = (0, 0, 0, 0) + +EVENT_HANDLED = 1 +EVENT_PROPAGATE = 0 + +CURSOR_DRAG = gdk.HAND1 +CURSOR_WATCH = gdk.WATCH + +TOOLBAR_BUTTONS = ( + "new", + "restart", + "open", + "save", + "undo", + "redo", + "autodrop", + "pause", + "statistics", + "rules", + "quit", + "player", + ) + diff --git a/pysollib/pysolgtk/tkhtml.py b/pysollib/pysolgtk/tkhtml.py new file mode 100644 index 00000000..be7d3ba6 --- /dev/null +++ b/pysollib/pysolgtk/tkhtml.py @@ -0,0 +1,56 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import os, sys + +# PySol imports + +# Toolkit imports +from tkwidget import MfxDialog + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class tkHTMLViewer: + symbols_fn = {} + + def __init__(self, parent): + self.parent = parent + self.parent.wm_deiconify() + + def display(self, url, add=1, relpath=1): + pass + + diff --git a/pysollib/pysolgtk/tkstats.py b/pysollib/pysolgtk/tkstats.py new file mode 100644 index 00000000..7d9c893c --- /dev/null +++ b/pysollib/pysolgtk/tkstats.py @@ -0,0 +1,65 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import os, sys +import gtk + +# PySol imports + +# Toolkit imports +from tkwidget import MfxDialog + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class SingleGame_StatsDialog(MfxDialog): + pass + +class AllGames_StatsDialog(MfxDialog): + pass + +class FullLog_StatsDialog(AllGames_StatsDialog): + pass + +class SessionLog_StatsDialog(FullLog_StatsDialog): + pass + +class Status_StatsDialog(MfxDialog): + pass + +class Top_StatsDialog(MfxDialog): + pass + + diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py new file mode 100644 index 00000000..cc2325ee --- /dev/null +++ b/pysollib/pysolgtk/tkutil.py @@ -0,0 +1,267 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import sys, os, string, time, types + +import gtk +from gtk import gdk +TRUE, FALSE = True, False + + + +# /*********************************************************************** +# // window util +# ************************************************************************/ + +def wm_withdraw(window): + ##window.unmap() + pass + +def wm_deiconify(window): + window.show_all() + +def wm_map(window, maximized=None): + window.show_all() + +def wm_set_icon(window, icon): + pass + +def makeToplevel(parent, title=None, class_=None, gtkclass=gtk.Window): + window = gtkclass() + ##~ window.style = window.get_style().copy() + ##~ window.set_style(window.style) + if not hasattr(window, 'vbox'): + window.vbox = gtk.VBox() + window.vbox.show() + window.add(window.vbox) + window.realize() # needed for set_icon_name() + if title: + window.set_title(title) + ##~ window.set_icon_name(title) + if class_: + ## window.set_wmclass(???) ## FIXME + pass + return window + + +def setTransient(window, parent, relx=0.5, rely=0.3, expose=1): + window.realize() + ##~ grab_add(window) + if parent: + window.set_transient_for(parent) + if expose: + #window.unmap() # Become visible at the desired location + pass + + +# /*********************************************************************** +# // conversion util +# ************************************************************************/ + +def anchor_tk2gtk(anchor): + if type(anchor) is types.IntType: + assert 0 <= anchor <= 8 + return anchor + if type(anchor) is types.StringType: + a = ['center', 'n', 'nw', 'ne', 's', 'sw', 'se', 'w', 'e'] + return a.index(string.lower(anchor)) + assert 0 + + +def color_tk2gtk(col): + r = string.atoi(col[1:3], 16) / 255.0 + g = string.atoi(col[3:5], 16) / 255.0 + b = string.atoi(col[5:7], 16) / 255.0 + return (r, g, b, 1.0) + + +def color_gtk2tk(col): + r = int(round(col[0] * 255.0)) + g = int(round(col[1] * 255.0)) + b = int(round(col[2] * 255.0)) + return "#%02x%02x%02x" % (r, g, b) + + +# /*********************************************************************** +# // image util +# ************************************************************************/ + + + +class _PysolPixmap: + def __init__(self, file=None): + if file: + self.pixbuf = gdk.pixbuf_new_from_file(file) + else: + self.pixbuf = gdk.Pixbuf() + + def clone(self): + return self.pixbuf.copy() + + def width(self): + return self.pixbuf.get_width() + + def height(self): + return self.pixbuf.get_height() + + def subsample(self, x, y=None): + ## FIXME + return None + + +def loadImage(file): + return _PysolPixmap(file=file) + +def copyImage(image, x, y, width, height): + return image + +def createImage(width, height, fill, outline=None): + return _PysolPixmap() + + +# /*********************************************************************** +# // event wrapper +# // this really sucks, need something better... +# ************************************************************************/ + +def _wrap_b1_press(e): + return e.type == gdk.BUTTON_PRESS and e.button == 1 + +def _wrap_b2_press(e): + return e.type == gdk.BUTTON_PRESS and e.button == 2 + +def _wrap_b3_press(e): + return e.type == gdk.BUTTON_PRESS and e.button == 3 + +def _wrap_b1_motion(e): + return e.type == gdk.MOTION_NOTIFY and (e.state & gdk.BUTTON_PRESS_MASK) + +def _wrap_b1_release(e): + return e.type == gdk.BUTTON_RELEASE and e.button == 1 + +def _wrap_key_press(e, key): + return e.type == gdk.KEY_PRESS and e.key == key + + +_wrap_handlers = { + '<1>': _wrap_b1_press, + '': _wrap_b1_press, + '<2>': _wrap_b2_press, + '': _wrap_b2_press, + '<3>': _wrap_b3_press, + '': _wrap_b3_press, + '': _wrap_b1_motion, + '': _wrap_b1_release, +} +for c in " " + string.letters: + seq = "<" + c + ">" + if not _wrap_handlers.has_key(seq): + _wrap_handlers[seq] = lambda e, key=c: _wrap_key_press(e, key) +#print _wrap_handlers + + + +__bindings = {} + +def _wrap_event(widget, event, l): + for wrap, func in l: + if wrap(event): + #print "event:", wrap, func, event + return func(event) + return 0 + + +def bind(widget, sequence, func, add=None): + wrap = _wrap_handlers.get(sequence) + if not wrap: + ##print "NOT BOUND:", sequence + return + # HACK for MfxCanvasItem + if hasattr(widget, '_item'): + widget = widget._item + # + k = id(widget) + if __bindings.has_key(k): + __bindings[k].append((wrap, func)) + else: + l = [(wrap, func)] + widget.connect('event', _wrap_event, l) + __bindings[k] = l + + +def unbind_destroy(widget): + k = id(widget) + if __bindings.has_key(k): + ## FIXME + del __bindings[k] + + +# /*********************************************************************** +# // timer wrapper +# ************************************************************************/ + +def after(widget, ms, func, *args): + ## FIXME + return None + +def after_idle(widget, func, *args): + ## FIXME + return None + +def after_cancel(t): + if t is not None: + ## FIXME + pass + + +# /*********************************************************************** +# // font +# ************************************************************************/ + +getFont_cache = {} + +def getFont(name, cardw=0): + key = (name, cardw) + font = getFont_cache.get(key) + if font: + return font + # default + ### FIXME + font = "Helvetica-14" + font = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*" + getFont_cache[key] = font + return font + + +def getTextWidth(text, font=None, root=None): + return 10 diff --git a/pysollib/pysolgtk/tkwidget.py b/pysollib/pysolgtk/tkwidget.py new file mode 100644 index 00000000..8abaaf83 --- /dev/null +++ b/pysollib/pysolgtk/tkwidget.py @@ -0,0 +1,222 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import os, sys + +import gtk +TRUE, FALSE = True, False + +# PySol imports + +# Toolkit imports +from tkutil import makeToplevel, setTransient, wm_withdraw +from tkcanvas import MfxCanvas + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class _MyDialog(gtk.Dialog): + def __init__(self): + gtk.Dialog.__init__(self) + self.style = self.get_style().copy() + self.set_style(self.style) + self.connect("destroy", self.quit) + self.connect("delete_event", self.quit) + + def __setattr__(self, name, value): + self.__dict__[name] = value + + def quit(self, *args): + self.hide() + self.destroy() + gtk.mainquit() + + +class MfxDialog(_MyDialog): + def __init__(self, parent, title='', + timeout=0, + resizable=0, + text='', justify='center', + strings=("OK",), default=0, + width=0, separatorwidth=0, + font=None, + buttonfont=None, + padx='20', pady='20', + bitmap=None, bitmap_side='left', bitmap_padx=20, bitmap_pady=20, + image=None, image_side='left', image_padx=10, image_pady=20): + _MyDialog.__init__(self) + self.status = 1 + self.button = -1 + bitmap = None + self.init(parent, text, strings, default, bitmap, TRUE) + #font = "Times-14" + if font: + self.style.font = load_font(font) + self.set_style(self.style) + self.set_title(title) + self.show() + gtk.mainloop() + + def init(self, parent, message="", buttons=(), default=-1, + pixmap=None, modal=TRUE): + if modal: + setTransient(self, parent) + hbox = gtk.HBox(spacing=5) + hbox.set_border_width(5) + self.vbox.pack_start(hbox) + hbox.show() +## if pixmap: +## self.realize() +## pixmap = gtk.Pixmap(self, pixmap) +## hbox.pack_start(pixmap, expand=FALSE) +## pixmap.show() + label = gtk.Label(message) + hbox.pack_start(label) + label.show() + for i in range(len(buttons)): + text = buttons[i] + b = gtk.Button(text) + b.set_flags(gtk.CAN_DEFAULT) + if i == default: + b.grab_focus() + b.grab_default() + b.set_data("user_data", i) + b.connect("clicked", self.click) + self.action_area.pack_start(b) + b.show() + self.ret = None + + def click(self, button): + self.status = 0 + self.button = button.get_data("user_data") + self.quit() + + +MfxMessageDialog = MfxDialog + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxExceptionDialog(MfxDialog): + def __init__(self, parent, ex, title="Error", **kw): + kw = KwStruct(kw, bitmap="error") + text = str(kw.get("text", "")) + if text and text[-1] != "\n": + text = text + "\n" + text = text + "\n" + if isinstance(ex, EnvironmentError) and ex.filename is not None: + t = '[Errno %s] %s:\n%s' % (ex.errno, ex.strerror, repr(ex.filename)) + else: + t = str(ex) + kw.text = text + t + apply(MfxDialog.__init__, (self, parent, title), kw.__dict__) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxSimpleSlider(_MyDialog): + def __init__(self, parent, title, + label, value, from_, to, resolution, + resizable=0): + self.button = 0 + self.status = 1 + self.value = value + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxSimpleEntry(_MyDialog): + def __init__(self, parent, title, label, value, resizable=0, **kw): + _MyDialog.__init__(self) + self.button = 0 + self.status = 1 + self.value = value + self.init(parent, label, TRUE) + self.entry.set_text(str(value)) + self.set_title(title) + self.show() + gtk.mainloop() + + def init(self, parent, message="", modal=TRUE): + if modal: + setTransient(self, parent) + box = gtk.VBox(spacing=10) + box.set_border_width(10) + self.vbox.pack_start(box) + box.show() + if message: + label = gtk.Label(message) + box.pack_start(label) + label.show() + self.entry = gtk.Entry() + box.pack_start(self.entry) + self.entry.show() + self.entry.grab_focus() + button = gtk.Button("OK") + button.connect("clicked", self.click) + button.set_flags(CAN_DEFAULT) + self.action_area.pack_start(button) + button.show() + button.grab_default() + button = gtk.Button("Cancel") + button.connect("clicked", self.quit) + button.set_flags(CAN_DEFAULT) + self.action_area.pack_start(button) + button.show() + + def click(self, button): + self.status = 0 + self.value = self.entry.get_text() + self.quit() + + +class MfxScrolledCanvas(MfxCanvas): + def __init__(self, parent, hbar=2, vbar=2, **kw): + MfxCanvas.__init__(self, parent) + self.canvas = self + + + + + +class SelectDialogTreeData: + pass + diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py new file mode 100644 index 00000000..e25d2f7a --- /dev/null +++ b/pysollib/pysolgtk/tkwrap.py @@ -0,0 +1,294 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import os, sys, time, types + +import gtk +from gtk import gdk +TRUE, FALSE = True, False + +# PySol imports +## from pysollib.images import Images + +# Toolkit imports +from tkutil import makeToplevel, loadImage + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class TclError: + pass + +def makeHelpToplevel(parent, title=None, class_=None): + return makeToplevel(parent, title=title, class_=class_, gtkclass=_MfxToplevel) + + +class MfxCheckMenuItem: + def __init__(self, menubar, path=None): + self.menubar = menubar + self.path = path + self.value = None + def get(self): + print 'MfxCheckMenuItem.get:', self.path + if self.path is None: return 0 + w = self.menubar.menus.get_widget(self.path) + return w.active + def set(self, value): + print 'MfxCheckMenuItem.set:', value, self.path + if self.path is None: return + if not value or value == 'false': value = 0 + assert type(value) is types.IntType and 0 <= value <= 1 + self.value = value + w = self.menubar.menus.get_widget(self.path) + w.set_active(value) + #print self.path, value, w, w.active + + +class MfxRadioMenuItem(MfxCheckMenuItem): + def get(self): + print 'MfxRadioMenuItem.get:', self.path, self.value + if self.path is None: return 0 + w = self.menubar.menus.get_widget(self.path) + #from pprint import pprint + #pprint(dir(w)) + #print 'widget:', w + #print w.active + #print w.__dict__ + return self.value + def set(self, value): + print 'MfxRadioMenuItem.set:', value, self.path + if self.path is None: return + if not value or value == 'false': value = 0 + assert type(value) is types.IntType and 0 <= value + self.value = value + #w = self.menubar.menus.get_widget(self.path) + #w.set_active(value) + #print self.path, value #, w, w.active + + +class StringVar: + def set(self, v): + pass + + +# /*********************************************************************** +# // A toplevel window. +# ************************************************************************/ + +class _MfxToplevel(gtk.Window): + def __init__(self, *args, **kw): + gtk.Window.__init__(self, type=gtk.WINDOW_TOPLEVEL) + ##~ self.style = self.get_style().copy() + self.set_style(self.style) + self.vbox = gtk.VBox() + self.vbox.show() + self.add(self.vbox) + self.realize() + + def cget(self, attr): + if attr == 'cursor': + # FIXME + return gdk.LEFT_PTR + return self.get_window().get_cursor(v) + print "Toplevel cget:", attr + ##~ raise AttributeError, attr + + def configure(self, **kw): + height, width = -1, -1 + for k, v in kw.items(): + if k == "background" or k == "bg": + c = self.get_colormap().alloc_color(v) + self.style.bg[gtk.STATE_NORMAL] = c + ##~ self.set_style(self.style) + self.queue_draw() + elif k == "cursor": + self.setCursor(v) + elif k == "height": + height = v + elif k == "width": + width = v + else: + print "Toplevel configure:", k, v + raise AttributeError, k + if height > 0 and width > 0: + ## FIXME + #self.set_default_size(width, height) + self.set_size_request(width, height) + #self.set_geometry_hints(base_width=width, base_height=height) + + config = configure + + def mainloop(self): + gtk.mainloop() # the global function + + def mainquit(self): + gtk.mainquit() # the global function + + def screenshot(self, filename): + pass + + def setCursor(self, cursor): + self.get_window().set_cursor(cursor_new(v)) + + def tk_setPalette(self, *args): + # FIXME ? + pass + + def update(self): + self.update_idletasks() + + def update_idletasks(self): + while gtk.events_pending(): + gtk.mainiteration(TRUE) + + def winfo_ismapped(self): + # FIXME + return 1 + + def winfo_screenwidth(self): + return gdk.screen_width() + + def winfo_screenheight(self): + return gdk.screen_height() + + def winfo_screendepth(self): + ##print 'winfo_screendepth', self.window.get_geometry() + return self.window.get_geometry()[-1] + + def wm_command(self, *args): + # FIXME + pass + + def wm_deiconify(self): + self.show_all() + + def wm_geometry(self, newGeometry=None): + ##print 'wm_geometry', newGeometry + if newGeometry == '': + self.resize(1, 1) + else: + w, h = newGeometry + self.resize(w, h) + + + + def wm_group(self, pathName=None): + # FIXME + pass + + def wm_iconbitmap(self, name): + if name and name[0] == '@' and name[-4:] == '.xbm': + name = name[1:-4] + '.xpm' + bg = self.get_style().bg[gtk.STATE_NORMAL] + pixmap, mask = create_pixmap_from_xpm(self, bg, name) + self.set_icon(pixmap, mask) + + def wm_iconname(self, name): + pass + ##~ self.set_icon_name(name) + + def wm_minsize(self, width, height): + self.set_geometry_hints(min_width=width, min_height=height) + + def wm_protocol(self, name=None, func=None): + if name == 'WM_DELETE_WINDOW': + self.connect("delete_event", func) + else: + raise AttributeError, name + + def wm_title(self, title): + self.set_title(title) + + def option_add(self, *args): + print self, 'option_add' + pass + + def option_get(self, *args): + print self, 'option_get' + return None + + def grid_columnconfigure(self, *args, **kw): + print self, 'grid_columnconfigure' + pass + + def grid_rowconfigure(self, *args, **kw): + print self, 'grid_rowconfigure' + pass + + def interruptSleep(self, *args, **kw): + ##print self, 'interruptSleep' + pass + + def wm_state(self): + print self, 'wm_state' + pass + + + +# /*********************************************************************** +# // The root toplevel window of an application. +# ************************************************************************/ + +class MfxRoot(_MfxToplevel): + def __init__(self, **kw): + apply(_MfxToplevel.__init__, (self,), kw) + self.app = None + + def connectApp(self, app): + self.app = app + + # sometimes an update() is needed under Windows, whereas + # under Unix an update_idletask() would be enough... + def busyUpdate(self): + game = None + if self.app: game = self.app.game + if not game: + self.update() + elif not game.busy: + game.busy = 1 + self.update() + game.busy = 0 + + # FIXME - make sleep interruptible + def sleep(self, seconds): + time.sleep(seconds) + + def wmDeleteWindow(self, *args): + if self.app and self.app.menubar: + self.app.menubar.mQuit() + else: + ##self.after_idle(self.quit) + pass + return TRUE diff --git a/pysollib/pysolgtk/toolbar.py b/pysollib/pysolgtk/toolbar.py new file mode 100644 index 00000000..76f6c9e4 --- /dev/null +++ b/pysollib/pysolgtk/toolbar.py @@ -0,0 +1,177 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +##---------------------------------------------------------------------------## + + +# imports +import os, re, sys + +import gtk +TRUE, FALSE = True, False + +# PySol imports + +from pysollib.actions import PysolToolbarActions + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PysolToolbar(PysolToolbarActions): + def __init__(self, top, dir, relief=0): + PysolToolbarActions.__init__(self) + self.top = top + self.dir = dir + self.side = -1 + + self.toolbar = gtk.Toolbar(ORIENTATION_HORIZONTAL, TOOLBAR_ICONS) + self.bg = top.get_style().bg[STATE_NORMAL] + + self._createButton('new', self.mNewGame, tooltip='New game') + self._createButton('open', self.mOpen , tooltip='Open a \nsaved game') + self._createSeparator() + self._createButton('restart', self.mRestart, tooltip='Restart the \ncurrent game') + self._createButton('save', self.mSave, tooltip='Save game') + self._createSeparator() + self._createButton('undo', self.mUndo, tooltip='Undo') + self._createButton('redo', self.mRedo, tooltip='Redo') + self._createButton('autodrop',self.mDrop, tooltip='Auto drop') + self._createSeparator() + self._createButton('stats', self.mStatus, tooltip='Statistics') + self._createButton('rules', self.mHelpRules, tooltip='Rules') + self._createSeparator() + self._createButton('quit', self.mQuit, tooltip='Quit PySol') + self._createSeparator() + # no longer needed + self.bg = None + # + top.vbox.pack_start(self.toolbar, FALSE, FALSE) + + + # util + def _createButton(self, name, command, padx=0, tooltip=None): +## file = os.path.join(self.dir, name+".gif") +## im = GdkImlib.Image(file) +## im.render() +## pixmap = im.make_pixmap() +## if tooltip: tooltip = re.sub(r'\n', '', tooltip) + +##append_item(text, tooltip_text, tooltip_private_text, icon, callback, user_data=None) + + button = self.toolbar.append_item(name, tooltip, "", None, command) + setattr(self, name + "_button", button) + + def _createLabel(self, name, padx=0, side='IGNORE', tooltip=None): + ## FIXME: append_widget + pass + + def _createSeparator(self): + self.toolbar.append_space() + + + # + # wrappers + # + + def _busy(self): + return not (self.side and self.game and not self.game.busy and self.menubar) + + def destroy(self): + self.toolbar.destroy() + + def getSide(self): + return self.side + + def hide(self, resize=1): + self.show(None, resize) + + def show(self, side=1, resize=1): + self.side = side + if side: + self.toolbar.show() + else: + self.toolbar.hide() + + + # + # public methods + # + + def setCursor(self, cursor): + if self.side: + # FIXME + pass + + def setRelief(self, relief): + # FIXME + pass + + def updateText(self, **kw): + # FIXME + pass + + +# /*********************************************************************** +# // +# ************************************************************************/ + +#%ifndef BUNDLE + +class TestToolbar(PysolToolbar): + def __init__(self, top, args): + from util import DataLoader + dir = "kde-large" + dir = "gnome-large" + if len(args) > 1: dir = args[1] + dir = os.path.join(os.pardir, os.pardir, "data", "toolbar", dir) + ##print dataloader.dir + PysolToolbar.__init__(self, top, dir) + # test some settings + self.updateText(player="Player\nPySol") + self.undo_button.set_state(STATE_INSENSITIVE) + def mQuit(self, *args): + mainquit() + +def toolbar_main(args): + from tkwrap import MfxRoot + root = MfxRoot() + root.connect("destroy", mainquit) + root.connect("delete_event", mainquit) + toolbar = TestToolbar(root, args) + root.show_all() + mainloop() + return 0 + +if __name__ == '__main__': + sys.exit(toolbar_main(sys.argv)) + +#%endif + diff --git a/pysollib/pysoltk.py b/pysollib/pysoltk.py index d94fca66..fe126af8 100644 --- a/pysollib/pysoltk.py +++ b/pysollib/pysoltk.py @@ -19,25 +19,52 @@ ## ##---------------------------------------------------------------------------## -from tk.tkconst import * -from tk.tkutil import * -from tk.tkcanvas import * -from tk.tkwrap import * -from tk.tkwidget import * -from tk.tkhtml import * -from tk.edittextdialog import * -from tk.tkstats import * -from tk.playeroptionsdialog import * -from tk.soundoptionsdialog import * -from tk.timeoutsdialog import * -from tk.colorsdialog import * -from tk.fontsdialog import * -from tk.findcarddialog import * -from tk.gameinfodialog import * -from tk.toolbar import * -from tk.statusbar import * -from tk.progressbar import * -from tk.menubar import * -from tk.card import * -from tk.selectcardset import * -from tk.selecttree import * +from settings import TOOLKIT + +if TOOLKIT == 'tk': + from tk.tkconst import * + from tk.tkutil import * + from tk.tkcanvas import * + from tk.tkwrap import * + from tk.tkwidget import * + from tk.tkhtml import * + from tk.edittextdialog import * + from tk.tkstats import * + from tk.playeroptionsdialog import * + from tk.soundoptionsdialog import * + from tk.timeoutsdialog import * + from tk.colorsdialog import * + from tk.fontsdialog import * + from tk.findcarddialog import * + from tk.gameinfodialog import * + from tk.toolbar import * + from tk.statusbar import * + from tk.progressbar import * + from tk.menubar import * + from tk.card import * + from tk.selectcardset import * + from tk.selecttree import * + +else: + from pysolgtk.tkconst import * + from pysolgtk.tkutil import * + from pysolgtk.tkcanvas import * + from pysolgtk.tkwrap import * + from pysolgtk.tkwidget import * + from pysolgtk.tkhtml import * + from pysolgtk.edittextdialog import * + from pysolgtk.tkstats import * + from pysolgtk.playeroptionsdialog import * + from pysolgtk.soundoptionsdialog import * + from pysolgtk.timeoutsdialog import * + from pysolgtk.colorsdialog import * + from pysolgtk.fontsdialog import * + from pysolgtk.findcarddialog import * + from pysolgtk.gameinfodialog import * + from pysolgtk.toolbar import * + from pysolgtk.statusbar import * + from pysolgtk.progressbar import * + from pysolgtk.menubar import * + from pysolgtk.card import * + from pysolgtk.selectcardset import * + diff --git a/pysollib/settings.py b/pysollib/settings.py index f1a1dc3f..70cb08f8 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -28,6 +28,9 @@ n_ = lambda x: x PACKAGE = "PySol" PACKAGE_URL = "http://sourceforge.net/projects/pysolfc/" +TOOLKIT = 'gtk' +TOOLKIT = 'tk' + # data dirs DATA_DIRS = [] # you can add your extra directories here diff --git a/pysollib/stack.py b/pysollib/stack.py index dabb02c6..389e92d4 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -50,6 +50,8 @@ __all__ = ['cardsFaceUp', 'DealRowTalonStack', 'InitialDealTalonStack', 'RedealTalonStack', + 'DealRowRedealTalonStack', + 'DealReserveRedealTalonStack', 'OpenStack', 'AbstractFoundationStack', 'SS_FoundationStack', @@ -104,6 +106,7 @@ from pysoltk import after, after_idle, after_cancel from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText from pysoltk import Card from pysoltk import getTextWidth +from settings import TOOLKIT # /*********************************************************************** @@ -977,7 +980,7 @@ class Stack: if self.game.demo: self.game.stopDemo(event) if self.game.busy: return EVENT_HANDLED - if not self.game.app.opt.sticky_mouse: + if not self.game.app.opt.sticky_mouse and TOOLKIT == 'tk': # use a timer to update the drag # this allows us to skip redraws on slow machines drag = self.game.drag @@ -1056,6 +1059,8 @@ class Stack: drag.noshade_stacks = [ self ] drag.cards = self.getDragCards(i) drag.index = i + if TOOLKIT == 'gtk': + drag.stack.group.tkraise() images = game.app.images drag.shadows = self.createShadows(drag.cards) ##sx, sy = 0, 0 @@ -1070,6 +1075,8 @@ class Stack: for s in drag.shadows: if dx > 0 or dy > 0: s.move(dx, dy) + if TOOLKIT == 'gtk': + s.addtag(drag.stack.group) s.tkraise() for card in drag.cards: card.tkraise() @@ -1149,8 +1156,13 @@ class Stack: image=img1, anchor=ANCHOR_SE) s2 = MfxCanvasImage(self.game.canvas, cx, cy, image=img0, anchor=ANCHOR_SE) - s1.lower(c.item) - s2.lower(c.item) + if TOOLKIT == 'tk': + s1.lower(c.item) + s2.lower(c.item) + elif TOOLKIT == 'gtk': + positions = 2 ## FIXME + s1.lower(positions) + s2.lower(positions) return (s1, s2) return () @@ -1213,10 +1225,15 @@ class Stack: img = MfxCanvasImage(game.canvas, sx, sy, image=img, anchor=ANCHOR_NW) drag.shade_img = img # raise/lower the shade image to the correct stacking order - if drag.shadows: - img.lower(drag.shadows[0]) - else: - img.lower(drag.cards[0].item) + if TOOLKIT == 'tk': + if drag.shadows: + img.lower(drag.shadows[0]) + else: + img.lower(drag.cards[0].item) + elif TOOLKIT == 'gtk': + img.tkraise() + drag.stack.group.tkraise() + # for closeStackMove def _shadeStack(self): @@ -1547,7 +1564,11 @@ class TalonStack(Stack, self.images.redeal = MfxCanvasImage(self.game.canvas, cx, cy, image=img, anchor="center") self.images.redeal_img = img - self.images.redeal.tkraise(self.top_bottom) + if TOOLKIT == 'tk': + self.images.redeal.tkraise(self.top_bottom) + elif TOOLKIT == 'gtk': + ### FIXME + pass self.images.redeal.addtag(self.group) self.top_bottom = self.images.redeal if images.CARDH >= 90: @@ -1563,7 +1584,11 @@ class TalonStack(Stack, self.texts.redeal = MfxCanvasText(self.game.canvas, cx, cy, anchor=ca, font=font) self.texts.redeal_str = "" - self.texts.redeal.tkraise(self.top_bottom) + if TOOLKIT == 'tk': + self.texts.redeal.tkraise(self.top_bottom) + elif TOOLKIT == 'gtk': + ### FIXME + pass self.texts.redeal.addtag(self.group) self.top_bottom = self.texts.redeal @@ -1612,6 +1637,45 @@ class RedealTalonStack(TalonStack, RedealCards_StackMethods): RedealCards_StackMethods.redealCards(self, sound=sound) +class DealRowRedealTalonStack(TalonStack, RedealCards_StackMethods): + + def canDealCards(self, rows=None): + if rows is None: + rows = self.game.s.rows + r_cards = sum([len(r.cards) for r in rows]) + if self.cards: + return True + elif r_cards and self.round != self.max_rounds: + return True + return False + + def dealCards(self, sound=0, rows=None): + num_cards = 0 + if rows is None: + rows = self.game.s.rows + if sound and self.game.app.opt.animations: + self.game.startDealSample() + if not self.cards: + # move all cards to talon + num_cards = self._redeal(rows=rows, frames=4) + self.game.nextRoundMove(self) + num_cards += self.dealRowAvail(rows=rows, sound=0) + if sound: + self.game.stopSamples() + return num_cards + + +class DealReserveRedealTalonStack(DealRowRedealTalonStack): + + def canDealCards(self, rows=None): + return DealRowRedealTalonStack.canDealCards(self, + rows=self.game.s.reserves) + + def dealCards(self, sound=0, rows=None): + return DealRowRedealTalonStack.dealCards(self, sound=sound, + rows=self.game.s.reserves) + + # /*********************************************************************** # // An OpenStack is a stack where cards can be placed and dragged # // (i.e. FoundationStack, RowStack, ReserveStack, ...) diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index a24c4e88..62ed3d0d 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -966,12 +966,12 @@ class PysolMenubar(PysolMenubarActions): elif d.key > 0 and d.key != self.app.tabletile_index: self._mOptTableTile(d.key) - def mOptTableColor(self, *event): - if self._cancelDrag(break_pause=False): return - c = tkColorChooser.askcolor(initialcolor=self.app.opt.table_color, - title=_("Select table color")) - if c and c[1]: - self._mOptTableColor(c[1]) +## def mOptTableColor(self, *event): +## if self._cancelDrag(break_pause=False): return +## c = tkColorChooser.askcolor(initialcolor=self.app.opt.table_color, +## title=_("Select table color")) +## if c and c[1]: +## self._mOptTableColor(c[1]) def mOptToolbar(self, *event): ##if self._cancelDrag(break_pause=False): return diff --git a/pysollib/tk/tkwrap.py b/pysollib/tk/tkwrap.py index dfb21889..74b26631 100644 --- a/pysollib/tk/tkwrap.py +++ b/pysollib/tk/tkwrap.py @@ -34,8 +34,8 @@ ##---------------------------------------------------------------------------## __all__ = ['TclError', - 'BooleanVar', - 'IntVar', + 'MfxCheckMenuItem', + 'MfxRadioMenuItem', 'StringVar', 'MfxRoot'] @@ -53,8 +53,27 @@ from tkconst import EVENT_HANDLED, EVENT_PROPAGATE # // menubar # ************************************************************************/ -BooleanVar = Tkinter.BooleanVar -IntVar = Tkinter.IntVar +class MfxCheckMenuItem(Tkinter.BooleanVar): + def __init__(self, menubar, path=None): + Tkinter.BooleanVar.__init__(self) + def set(self, value): + if not value or value == "false": value = 0 + ##print value, type(value) + ##assert type(value) is types.IntType and 0 <= value <= 1 + Tkinter.BooleanVar.set(self, value) + + +class MfxRadioMenuItem(Tkinter.IntVar): + def __init__(self, menubar, path=None): + Tkinter.IntVar.__init__(self) + def set(self, value): + ##assert type(value) is types.IntType and 0 <= value + Tkinter.IntVar.set(self, value) + + +## BooleanVar = Tkinter.BooleanVar +## IntVar = Tkinter.IntVar + StringVar = Tkinter.StringVar From fe95ee5ae7422b7b49c46abbbce978739ee9489d Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 14 Aug 2006 21:14:27 +0000 Subject: [PATCH 046/266] * improved support GTK (alpha) git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@47 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/acard.py | 1 + pysollib/app.py | 15 +- pysollib/game.py | 77 +++--- pysollib/pysolgtk/menubar.py | 450 +++++++++++++++++++++---------- pysollib/pysolgtk/progressbar.py | 23 +- pysollib/pysolgtk/tkcanvas.py | 89 ++++-- pysollib/pysolgtk/tkutil.py | 8 +- pysollib/pysolgtk/tkwidget.py | 24 +- pysollib/pysolgtk/tkwrap.py | 48 ++-- pysollib/pysolgtk/toolbar.py | 87 ++++-- pysollib/stack.py | 9 +- pysollib/tk/tkcanvas.py | 4 + 12 files changed, 552 insertions(+), 283 deletions(-) diff --git a/pysollib/acard.py b/pysollib/acard.py index 510b3270..f2ac72a5 100644 --- a/pysollib/acard.py +++ b/pysollib/acard.py @@ -95,6 +95,7 @@ class AbstractCard: return self.hide_stack is not None def moveTo(self, x, y): + ##print 'moveTo', x, y # Move the card to absolute position (x, y). dx, dy = 0, 0 if self.game.app.opt.randomize_place: diff --git a/pysollib/app.py b/pysollib/app.py index cd06d797..3a34b466 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -661,13 +661,13 @@ class Application: self.top.grid_rowconfigure(1, weight=1) self.setTile(self.tabletile_index, force=True) # create the toolbar + dir = self.getToolbarImagesDir() + self.toolbar = PysolToolbar(self.top, dir=dir, + size=self.opt.toolbar_size, + relief=self.opt.toolbar_relief, + compound=self.opt.toolbar_compound) + self.toolbar.show(self.opt.toolbar) if TOOLKIT == 'tk': - dir = self.getToolbarImagesDir() - self.toolbar = PysolToolbar(self.top, dir=dir, - size=self.opt.toolbar_size, - relief=self.opt.toolbar_relief, - compound=self.opt.toolbar_compound) - self.toolbar.show(self.opt.toolbar) for w, v in self.opt.toolbar_vars.items(): self.toolbar.config(w, v) # @@ -807,8 +807,7 @@ class Application: # free game def freeGame(self): # disconnect from game - if self.toolbar: ##~ - self.toolbar.connectGame(None, None) + self.toolbar.connectGame(None, None) self.menubar.connectGame(None) # clean up the canvas self.canvas.deleteAllItems() diff --git a/pysollib/game.py b/pysollib/game.py index 975921ba..4b1353d1 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -181,41 +181,7 @@ class Game: assert hasattr(self.s.talon, "round") assert hasattr(self.s.talon, "max_rounds") if self.app.debug: - class_name = self.__class__.__name__ - if self.s.foundations: - ncards = 0 - for stack in self.s.foundations: - ncards += stack.cap.max_cards - if ncards != self.gameinfo.ncards: - print 'WARNING: invalid sum of foundations.max_cards:', \ - class_name, ncards, self.gameinfo.ncards - if self.s.rows: - from stack import AC_RowStack, UD_AC_RowStack, \ - SS_RowStack, UD_SS_RowStack, \ - RK_RowStack, UD_RK_RowStack, \ - Spider_AC_RowStack, Spider_SS_RowStack - r = self.s.rows[0] - for c, f in ( - ((Spider_AC_RowStack, Spider_SS_RowStack), - (self._shallHighlightMatch_RK, - self._shallHighlightMatch_RKW)), - ((AC_RowStack, UD_AC_RowStack), - (self._shallHighlightMatch_AC, - self._shallHighlightMatch_ACW)), - ((SS_RowStack, UD_SS_RowStack), - (self._shallHighlightMatch_SS, - self._shallHighlightMatch_SSW)), - ((RK_RowStack, UD_RK_RowStack), - (self._shallHighlightMatch_RK, - self._shallHighlightMatch_RKW)),): - if isinstance(r, c): - if not self.shallHighlightMatch in f: - print 'WARNING: shallHighlightMatch is not valid:', \ - class_name, r.__class__ - if r.cap.mod == 13 and self.shallHighlightMatch != f[1]: - print 'WARNING: shallHighlightMatch is not valid (wrap):', \ - class_name, r.__class__ - break + self._checkGame() # optimize regions self.optimizeRegions() # create cards @@ -243,6 +209,45 @@ class Game: ##print timer self.showHelp() # just in case + + def _checkGame(self): + class_name = self.__class__.__name__ + if self.s.foundations: + ncards = 0 + for stack in self.s.foundations: + ncards += stack.cap.max_cards + if ncards != self.gameinfo.ncards: + print 'WARNING: invalid sum of foundations.max_cards:', \ + class_name, ncards, self.gameinfo.ncards + if self.s.rows: + from stack import AC_RowStack, UD_AC_RowStack, \ + SS_RowStack, UD_SS_RowStack, \ + RK_RowStack, UD_RK_RowStack, \ + Spider_AC_RowStack, Spider_SS_RowStack + r = self.s.rows[0] + for c, f in ( + ((Spider_AC_RowStack, Spider_SS_RowStack), + (self._shallHighlightMatch_RK, + self._shallHighlightMatch_RKW)), + ((AC_RowStack, UD_AC_RowStack), + (self._shallHighlightMatch_AC, + self._shallHighlightMatch_ACW)), + ((SS_RowStack, UD_SS_RowStack), + (self._shallHighlightMatch_SS, + self._shallHighlightMatch_SSW)), + ((RK_RowStack, UD_RK_RowStack), + (self._shallHighlightMatch_RK, + self._shallHighlightMatch_RKW)),): + if isinstance(r, c): + if not self.shallHighlightMatch in f: + print 'WARNING: shallHighlightMatch is not valid:', \ + class_name, r.__class__ + if r.cap.mod == 13 and self.shallHighlightMatch != f[1]: + print 'WARNING: shallHighlightMatch is not valid (wrap):', \ + class_name, r.__class__ + break + + def initBindings(self): # note: a Game is only allowed to bind self.canvas and not to self.top ##bind(self.canvas, "<1>", self.clickHandler) @@ -768,6 +773,7 @@ class Game: return EVENT_PROPAGATE def undoHandler(self, event): + if not self.app: return EVENT_PROPAGATE # FIXME (GTK) self._defaultHandler() if self.app.opt.mouse_undo and not self.event_handled: self.app.menubar.mUndo() @@ -775,6 +781,7 @@ class Game: return EVENT_PROPAGATE def redoHandler(self, event): + if not self.app: return EVENT_PROPAGATE # FIXME (GTK) self._defaultHandler() if self.app.opt.mouse_undo and not self.event_handled: self.app.menubar.mRedo() diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 77054ded..48606bd2 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -31,11 +31,10 @@ # imports -import math, os, re, string, sys +import os, re, sys import gtk from gtk import gdk -TRUE, FALSE = True, False # PySol imports from pysollib.gamedb import GI @@ -57,23 +56,32 @@ from selectcardset import SelectCardsetByTypeDialogWithPreview class PysolMenubar(PysolMenubarActions): def __init__(self, app, top, progress=None): PysolMenubarActions.__init__(self, app, top) - self.menus = None - self.menu_items = None + self.progress = progress + ##self.menus = None + ##self.menu_items = None # create menus - menubar, accel = self.createMenus() - # additional key bindings - ### FIXME - ###self.accel.add("Space", None, None, None, None) - # delete the old menubar - # set the menubar - ##~ accel.attach(self.top) - top.add_accel_group(accel) - w = menubar.get_widget('
    ') - self.top.vbox.pack_start(w, expand=FALSE, fill=FALSE) - self.top.vbox.reorder_child(w, 0) - self.__menubar = menubar - self.__accel = accel - self.menus = menubar + menubar = self.createMenubar() + self.top.table.attach(menubar, + 0, 1, 0, 1, + gtk.EXPAND | gtk.FILL, 0, + 0, 0); + menubar.show() + + +## menubar, accel = self.createMenus() +## # additional key bindings +## ### FIXME +## ###self.accel.add("Space", None, None, None, None) +## # delete the old menubar +## # set the menubar +## ##~ accel.attach(self.top) +## top.add_accel_group(accel) +## w = menubar.get_widget('
    ') +## self.top.vbox.pack_start(w, expand=FALSE, fill=FALSE) +## self.top.vbox.reorder_child(w, 0) +## self.__menubar = menubar +## self.__accel = accel +## self.menus = menubar # @@ -84,141 +92,301 @@ class PysolMenubar(PysolMenubarActions): ##print args pass - def _initItemFactory(self): - self.menu_items = ( - ("/_File", None, None, 0, ""), - ("/File/", None, None, 0, ""), - ("/File/_New Game", "N", self.mNewGame, 0, ""), - ("/File/Select _game", None, None, 0, ""), - ) + def createMenubar(self): - # - # /File/Select game - # + entries = ( + ('New', gtk.STOCK_NEW, '_New', 'N', 'New game', self.mNewGame), + ('Open', gtk.STOCK_OPEN, '_Open', 'O', 'Open a\nsaved game', self.mOpen), + ('Restart', gtk.STOCK_REFRESH, '_Restart', 'G', 'Restart the\ncurrent game', self.mRestart), + ('Save', gtk.STOCK_SAVE, '_Save', 'S', 'Save game', self.mSave), + ('Undo', gtk.STOCK_UNDO, 'Undo', 'Z', 'Undo', self.mUndo), + ('Redo', gtk.STOCK_REDO, 'Redo', 'R', 'Redo', self.mRedo), + ('Autodrop',gtk.STOCK_JUMP_TO, '_Auto drop', 'A', 'Auto drop', self.mDrop), + ('Stats', gtk.STOCK_EXECUTE, 'Stats', None, 'Statistics', self.mStatus), + ('Rules', gtk.STOCK_HELP, 'Rules', None, 'Rules', self.mHelpRules), + ('Quit', gtk.STOCK_QUIT, 'Quit', 'Q', 'Quit PySol', self.mQuit), - mi, radio = [], "" - games = self.app.gdb.getGamesIdSortedByName() + ("FileMenu", None, "_File" ), + ("SelectGame", None, "Select _game"), + ("EditMenu", None, '_Edit'), + ("GameMenu", None, "_Game"), + ("AssistMenu", None, "_Assist"), + ("OptionsMenu", None, "_Options"), + ("HelpMenu", None, "_Help"), + + ('SelectGameByNumber', None, "Select game by number...", None, None, self.mSelectGameById), + ("SaveAs", None, 'Save _as...', None, None, self.m), + ("RedoAll", None, 'Redo _all', None, None, self.mRedoAll), + ("DealCards", None, '_Deal cards', "D", None, self.mDeal), + ("Status", None, 'S_tatus...', "T", None, self.mStatus), + ("Hint", None, '_Hint', "H", None, self.mHint), + ("HighlightPiles", None, 'Highlight _piles', None, None, self.mHighlightPiles), + ("Demo", None, '_Demo', "D", None, self.mDemo), + ("DemoAllGames", None, 'Demo (all games)', None, None, self.mMixedDemo), + ("Contents", None, '_Contents', 'F1', None, self.mHelp), + ("About", None, '_About PySol...', None, None, self.mHelpAbout), +) + + toggle_entries = ( + ("Confirm", None, '_Confirm', None, None, self.mOptConfirm), + ("Autoplay", None, 'Auto_play', "P", None, self.mOptAutoDrop), + ("AutomaticFaceUp", None,'_Automatic _face up', "F", None, self.mOptAutoFaceUp), + ("HighlightMatchingCards", None, 'Highlight _matching cards', None, None, self.mOptEnableHighlightCards), + ("CardShadow", None, 'Card shadow', None, None, self.mOptShadow), + ("ShadeLegalMoves", None, 'Shade legal moves', None, None, self.mOptShade), + +) + + ui_info = ''' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +''' + # + ui_manager = gtk.UIManager() + ui_manager_id = ui_manager.add_ui_from_string(ui_info) + + action_group = gtk.ActionGroup("PySolActions") + action_group.add_actions(entries) + action_group.add_toggle_actions(toggle_entries) + + ui_manager.insert_action_group(action_group, 0) + self.top.add_accel_group(ui_manager.get_accel_group()) + self.top.ui_manager = ui_manager + menubar = ui_manager.get_widget("/MenuBar") + + games = map(self.app.gdb.get, self.app.gdb.getGamesIdSortedByName()) + + menu_item = ui_manager.get_widget("/MenuBar/FileMenu/SelectGame") + menu_item.show() + menu = gtk.Menu() + menu_item.set_submenu(menu) + self._addSelectAllGameSubMenu(games, menu, self.mSelectGame) + + return menubar + + + def _createSubMenu(self, menu, label): + menu_item = gtk.MenuItem(label) + menu.add(menu_item) + menu_item.show() + submenu = gtk.Menu() + menu_item.set_submenu(submenu) + return submenu + + def _addSelectGameSubMenu(self, games, menu, command, group): + for g in games: + label = g.name + menu_item = gtk.RadioMenuItem(group, label) + group = menu_item + menu.add(menu_item) + menu_item.show() + menu_item.connect('toggled', command, g.id) + + def _addSelectAllGameSubMenu(self, games, menu, command): + cb_max = gdk.screen_height()/20 + n, d = 0, cb_max i = 0 - path = "/File/Select game" - columnbreak = 25 - n = 0 - mm = [] - t1 = t2 = None - for id in games: - if t1 is None: - t1 = self.app.getGameMenuitemName(id)[:3] - if n == columnbreak: - t2 = self.app.getGameMenuitemName(id)[:3] - pp = '%s/%s-%s' % (path, t1, t2) - mi.append((pp, None, None, 0, '')) - for m in mm: - p = '%s/%s' % (pp, m[0]) - mi.append((p, None, self.mSelectGame, m[1], radio)) - if radio[0] == '<': - radio = re.sub('_', '', p) - n = 0 - mm = [] - t1 = t2 + group = None + while True: + if self.progress: self.progress.update(step=1) + i += 1 + if not games[n:n+d]: + break + m = min(n+d-1, len(games)-1) + label = games[n].name[:3]+' - '+games[m].name[:3] + submenu = self._createSubMenu(menu, label=label) + group = self._addSelectGameSubMenu(games[n:n+d], submenu, + command, group) + n += d - mm.append((self.app.getGameMenuitemName(id), id)) - n += 1 - t2 = self.app.getGameMenuitemName(id)[:3] - pp = '%s/%s-%s' % (path, t1, t2) - mi.append((pp, None, None, 0, '')) - for m in mm: - p = '%s/%s' % (pp, m[0]) - mi.append((p, None, self.mSelectGame, m[1], radio)) +## def _initItemFactory(self): +## self.menu_items = ( +## ("/_File", None, None, 0, ""), +## ("/File/", None, None, 0, ""), +## ("/File/_New Game", "N", self.mNewGame, 0, ""), +## ("/File/Select _game", None, None, 0, ""), +## ) - self.menu_items = self.menu_items + tuple(mi) - self.tkopt.gameid.path = radio +## # +## # /File/Select game +## # - # - # - # +## mi, radio = [], "" +## games = self.app.gdb.getGamesIdSortedByName() +## i = 0 +## path = "/File/Select game" +## columnbreak = 25 +## n = 0 +## mm = [] +## t1 = t2 = None +## for id in games: +## if t1 is None: +## t1 = self.app.getGameMenuitemName(id)[:3] +## if n == columnbreak: +## t2 = self.app.getGameMenuitemName(id)[:3] +## pp = '%s/%s-%s' % (path, t1, t2) +## mi.append((pp, None, None, 0, '')) +## for m in mm: +## p = '%s/%s' % (pp, m[0]) +## mi.append((p, None, self.mSelectGame, m[1], radio)) +## if radio[0] == '<': +## radio = re.sub('_', '', p) +## n = 0 +## mm = [] +## t1 = t2 - self.menu_items = self.menu_items + ( - ("/File/Select game by number...", None, self.mSelectGameById, 0, ""), - ("/File/", None, None, 0, ""), - ("/File/_Open", "O", self.m, 0, ""), - ("/File/_Save", "S", self.mSave, 0, ""), - ("/File/Save _as...", None, self.m, 0, ""), - ("/File/", None, None, 0, ""), - ("/File/_Quit", "Q", self.mQuit, 0, ""), - ("/_Edit", None, None, 0, ""), - ("/Edit/", None, None, 0, ""), - ("/Edit/_Undo", "Z", self.mUndo, 0, ""), - ("/Edit/_Redo", "R", self.mRedo, 0, ""), - ("/Edit/Redo _all", None, self.mRedoAll, 0, ""), - ("/Edit/", None, None, 0, ""), - ("/Edit/Restart _game", "G", self.mRestart, 0, ""), - ("/_Game", None, None, 0, ""), - ("/Game/", None, None, 0, ""), - ("/Game/_Deal cards", "D", self.mDeal, 0, ""), - ("/Game/_Auto drop", "A", self.mDrop, 0, ""), - ("/Game/", None, None, 0, ""), - ("/Game/S_tatus...", "T", self.mStatus, 0, ""), - ("/_Assist", None, None, 0, ""), - ("/Assist/", None, None, 0, ""), - ("/Assist/_Hint", "H", self.mHint, 0, ""), - ("/Assist/Highlight _piles", "Shift", self.mHighlightPiles, 0, ""), - ("/Assist/", None, None, 0, ""), - ("/Assist/_Demo", "D", self.mDemo, 0, ""), - ("/Assist/Demo (all games)", "", self.mMixedDemo, 0, ""), - ("/_Options", None, None, 0, ""), - ("/Options/", None, None, 0, ""), - ("/Options/_Confirm", None, self.mOptConfirm, 0, ""), - ("/Options/Auto_play", "P", self.mOptAutoDrop, 0, ""), - ("/Options/_Automatic _face up", "F", self.mOptAutoFaceUp, 0, ""), - ("/Options/Highlight _matching cards", None, self.mOptEnableHighlightCards, 0, ""), - ("/Options/", None, None, 0, ""), - ) +## mm.append((self.app.getGameMenuitemName(id), id)) +## n += 1 - mi, radio = [], "" - path = "/Options/Cards_et" - mi.append((path, None, None, 0, "")) - for i in range(self.app.cardset_manager.len()): - columnbreak = i > 0 and (i % 25) == 0 - p = path + '/' + self.app.cardset_manager.get(i).name - mi.append((p, None, self.mOptCardset, i, radio)) - if radio[0] == '<': - radio = re.sub('_', '', p) - self.menu_items = self.menu_items + tuple(mi) -## self.tkopt.cardset.path = radio +## t2 = self.app.getGameMenuitemName(id)[:3] +## pp = '%s/%s-%s' % (path, t1, t2) +## mi.append((pp, None, None, 0, '')) +## for m in mm: +## p = '%s/%s' % (pp, m[0]) +## mi.append((p, None, self.mSelectGame, m[1], radio)) - self.menu_items = self.menu_items + ( - ("/Options/Table color...", None, self.mOptTableColor, 0, ""), - ) +## self.menu_items = self.menu_items + tuple(mi) +## self.tkopt.gameid.path = radio - mi, radio = [], "" - path = "/Options/_Animations" - mi.append((path, None, None, 0, "")) - i = 0 - for k in ("_None", "_Fast", "_Timer based"): - p = path + '/' + k - mi.append((p, None, self.mOptAnimations, i, radio)) - if radio[0] == '<': - radio = re.sub('_', '', p) - i = i + 1 - self.menu_items = self.menu_items + tuple(mi) - self.tkopt.animations.path = radio +## # +## # +## # - self.menu_items = self.menu_items + ( - ("/Options/Card shadow", None, self.mOptShadow, 0, ""), - ("/Options/Shade legal moves", None, self.mOptShade, 0, ""), - ("/Options/", None, None, 0, ""), - ("/Options/_Hint options...", None, self.mOptHintOptions, 0, ""), - ("/Options/_Demo options...", None, self.mOptDemoOptions, 0, ""), - ("/_Help", None, None, 0, ""), - ("/Help/", None, None, 0, ""), - ("/Help/_Contents", "F1", self.mHelp, 0, ""), - ("/Help/_Rules", None, self.mHelpRules, 0, ""), - ("/Help/", None, None, 0, ""), - ("/Help/_About PySol...", None, self.mHelpAbout, 0, ""), - ) +## self.menu_items = self.menu_items + ( +## ("/File/Select game by number...", None, self.mSelectGameById, 0, ""), +## ("/File/", None, None, 0, ""), +## ("/File/_Open", "O", self.m, 0, ""), +## ("/File/_Save", "S", self.mSave, 0, ""), +## ("/File/Save _as...", None, self.m, 0, ""), +## ("/File/", None, None, 0, ""), +## ("/File/_Quit", "Q", self.mQuit, 0, ""), +## ("/_Edit", None, None, 0, ""), +## ("/Edit/", None, None, 0, ""), +## ("/Edit/_Undo", "Z", self.mUndo, 0, ""), +## ("/Edit/_Redo", "R", self.mRedo, 0, ""), +## ("/Edit/Redo _all", None, self.mRedoAll, 0, ""), +## ("/Edit/", None, None, 0, ""), +## ("/Edit/Restart _game", "G", self.mRestart, 0, ""), +## ("/_Game", None, None, 0, ""), +## ("/Game/", None, None, 0, ""), +## ("/Game/_Deal cards", "D", self.mDeal, 0, ""), +## ("/Game/_Auto drop", "A", self.mDrop, 0, ""), +## ("/Game/", None, None, 0, ""), +## ("/Game/S_tatus...", "T", self.mStatus, 0, ""), +## ("/_Assist", None, None, 0, ""), +## ("/Assist/", None, None, 0, ""), +## ("/Assist/_Hint", "H", self.mHint, 0, ""), +## ("/Assist/Highlight _piles", "Shift", self.mHighlightPiles, 0, ""), +## ("/Assist/", None, None, 0, ""), +## ("/Assist/_Demo", "D", self.mDemo, 0, ""), +## ("/Assist/Demo (all games)", "", self.mMixedDemo, 0, ""), +## ("/_Options", None, None, 0, ""), +## ("/Options/", None, None, 0, ""), +## ("/Options/_Confirm", None, self.mOptConfirm, 0, ""), +## ("/Options/Auto_play", "P", self.mOptAutoDrop, 0, ""), +## ("/Options/_Automatic _face up", "F", self.mOptAutoFaceUp, 0, ""), +## ("/Options/Highlight _matching cards", None, self.mOptEnableHighlightCards, 0, ""), +## ("/Options/", None, None, 0, ""), +## ) + +## mi, radio = [], "" +## path = "/Options/Cards_et" +## mi.append((path, None, None, 0, "")) +## for i in range(self.app.cardset_manager.len()): +## columnbreak = i > 0 and (i % 25) == 0 +## p = path + '/' + self.app.cardset_manager.get(i).name +## mi.append((p, None, self.mOptCardset, i, radio)) +## if radio[0] == '<': +## radio = re.sub('_', '', p) +## self.menu_items = self.menu_items + tuple(mi) +## ## self.tkopt.cardset.path = radio + +## self.menu_items = self.menu_items + ( +## ("/Options/Table color...", None, self.mOptTableColor, 0, ""), +## ) + +## mi, radio = [], "" +## path = "/Options/_Animations" +## mi.append((path, None, None, 0, "")) +## i = 0 +## for k in ("_None", "_Fast", "_Timer based"): +## p = path + '/' + k +## mi.append((p, None, self.mOptAnimations, i, radio)) +## if radio[0] == '<': +## radio = re.sub('_', '', p) +## i = i + 1 +## self.menu_items = self.menu_items + tuple(mi) +## self.tkopt.animations.path = radio + +## self.menu_items = self.menu_items + ( +## ("/Options/Card shadow", None, self.mOptShadow, 0, ""), +## ("/Options/Shade legal moves", None, self.mOptShade, 0, ""), +## ("/Options/", None, None, 0, ""), +## ("/Options/_Hint options...", None, self.mOptHintOptions, 0, ""), +## ("/Options/_Demo options...", None, self.mOptDemoOptions, 0, ""), +## ("/_Help", None, None, 0, ""), +## ("/Help/", None, None, 0, ""), +## ("/Help/_Contents", "F1", self.mHelp, 0, ""), +## ("/Help/_Rules", None, self.mHelpRules, 0, ""), +## ("/Help/", None, None, 0, ""), +## ("/Help/_About PySol...", None, self.mHelpAbout, 0, ""), +## ) def createMenus(self): + return self._initUI() + if not self.menu_items: self._initItemFactory() accel = gtk.AccelGroup() @@ -289,7 +457,7 @@ class PysolMenubar(PysolMenubarActions): def updateFavoriteGamesMenu(self, *args): pass -## def mSelectGame(self, gameid, menuitem): -## if menuitem.get_active(): -## self._mSelectGame(gameid) + def mSelectGame(self, menu_item, game_id): + if menu_item.get_active(): + self._mSelectGame(game_id) diff --git a/pysollib/pysolgtk/progressbar.py b/pysollib/pysolgtk/progressbar.py index 957c1d2e..39b9afaa 100644 --- a/pysollib/pysolgtk/progressbar.py +++ b/pysollib/pysolgtk/progressbar.py @@ -51,6 +51,7 @@ class PysolProgressBar: height=25, show_text=1, norm=1): self.parent = parent self.percent = 0 + self.steps_sum = 0 self.norm = norm self.top = makeToplevel(parent, title=title) self.top.set_position(gtk.WIN_POS_CENTER) @@ -62,7 +63,11 @@ class PysolProgressBar: hbox = gtk.HBox(spacing=5) hbox.set_border_width(10) hbox.show() - self.top.vbox.pack_start(hbox, FALSE, FALSE) + self.top.table.attach(hbox, + 0, 1, 0, 1, + 0, 0, + 0, 0) + # hbox-1: image ## if images and images[0]: ## im = images[0].clone() @@ -112,19 +117,23 @@ class PysolProgressBar: pass def update(self, percent=None, step=1): + ##self.steps_sum += step + ##print self.steps_sum, self.norm + step = step/self.norm if percent is None: - self.percent = self.percent + step + self.percent += step elif percent > self.percent: self.percent = percent - self.percent = min(100, max(0, self.percent)) - self.pbar.set_fraction(self.percent / 100.0) - self.pbar.set_text(str(int(self.percent))+'%') + percent = int(self.percent) + percent = min(100, max(0, percent)) + self.pbar.set_fraction(percent / 100.0) + self.pbar.set_text(str(percent)+'%') ##~ self.pbar.update(self.percent / 100.0) self.update_idletasks() def update_idletasks(self): while gtk.events_pending(): - gtk.mainiteration() + gtk.main_iteration() def wmDeleteWindow(self, *args): return TRUE @@ -163,7 +172,7 @@ def progressbar_main(args): im = loadImage(os.path.join(os.pardir, os.pardir, 'data', 'images', 'jokers', 'joker07_40_774.gif')) images = (im, im) pb = TestProgressBar(root, images=images) - mainloop() + main() return 0 if __name__ == '__main__': diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index c1c5b716..0868b0ec 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -70,25 +70,31 @@ from tkutil import anchor_tk2gtk, loadImage, bind # ************************************************************************/ class _CanvasItem: + def __init__(self, canvas): self.canvas = canvas + canvas._all_items.append(self) + def addtag(self, group): + ##print self, 'addtag' ##~ assert isinstance(group._item, CanvasGroup) self._item.reparent(group._item) + def dtag(self, group): + pass + ##print self, 'dtag' + ##~ assert isinstance(group._item, CanvasGroup) + ##self._item.reparent(self.canvas.root()) + def bind(self, sequence, func, add=None): bind(self._item, sequence, func, add) def bbox(self): ## FIXME return (0, 0, 0, 0) - def dtag(self, group): - ##~ assert isinstance(group._item, CanvasGroup) - self._item.reparent(self.canvas.root()) def delete(self): if self._item is not None: self._item.destroy() self._item = None - def hide(self): - self._item.hide() + def lower(self, positions=None): ##print "lower", self._item, positions if positions is None: @@ -97,19 +103,26 @@ class _CanvasItem: ##~ assert type(positions) is types.IntType and positions > 0 ##~ self._item.lower(positions) pass - def move(self, x, y): - self._item.move(x, y) - def show(self): - self._item.show() def tkraise(self, positions=None): ##print "tkraise", self._item, positions if positions is None: self._item.raise_to_top() else: + print 'tkraise', positions ##~ assert type(positions) is types.IntType and positions > 0 ##~ self._item.raise_(positions) + self._item.raise_to_top() pass + def move(self, x, y): + self._item.move(x, y) + moveTo = move + + def show(self): + self._item.show() + def hide(self): + self._item.hide() + class MfxCanvasGroup(_CanvasItem): def __init__(self, canvas): @@ -121,7 +134,8 @@ class MfxCanvasGroup(_CanvasItem): class MfxCanvasImage(_CanvasItem): def __init__(self, canvas, x, y, image, anchor=gtk.ANCHOR_NW): _CanvasItem.__init__(self, canvas) - anchor = anchor_tk2gtk(anchor) + if type(anchor) is str: + anchor = anchor_tk2gtk(anchor) self._item = canvas.root().add(gnome.canvas.CanvasPixbuf, x=x, y=y, pixbuf=image.pixbuf, @@ -151,6 +165,7 @@ class MfxCanvasRectangle(_CanvasItem): class MfxCanvasText(_CanvasItem): def __init__(self, canvas, x, y, anchor=gtk.ANCHOR_NW, preview=-1, **kw): + _CanvasItem.__init__(self, canvas) if preview < 0: preview = canvas.preview if preview > 1: @@ -197,21 +212,27 @@ class MfxCanvas(gnome.canvas.Canvas): self.preview = 0 # Tkinter compat self.items = {} + self._all_items = [] + self._text_items = [] # private self.__tileimage = None self.__tiles = [] # friend MfxCanvasText self._text_color = '#000000' - self._text_items = [] # gnome.canvas.Canvas.__init__(self) - self.style = self.get_style().copy() + style = self.get_style().copy() if bg is not None: c = self.get_colormap().alloc(bg) - self.style.bg[gtk.STATE_NORMAL] = c - self.set_style(self.style) - self.set_scroll_region(0, 0, gdk.screen_width(), gdk.screen_height()) - top.vbox.pack_start(self) + style.bg[gtk.STATE_NORMAL] = c + self.set_style(style) + ##self.set_scroll_region(0, 0, gdk.screen_width(), gdk.screen_height()) + top.table.attach(self, + 0, 1, 2, 3, + gtk.EXPAND | gtk.FILL, gtk.EXPAND | gtk.FILL, + 0, 0) + + ## self.top = top self.xmargin, self.ymargin = 0, 0 @@ -237,7 +258,7 @@ class MfxCanvas(gnome.canvas.Canvas): height, width = -1, -1 for k, v in kw.items(): if k == "background" or k == "bg": - print 'configure: bg:', v + ##print 'configure: bg:', v c = self.get_colormap().alloc_color(v) self.style.bg[gtk.STATE_NORMAL] = c ##~ self.set_style(self.style) @@ -266,8 +287,11 @@ class MfxCanvas(gnome.canvas.Canvas): # PySol extension # delete all CanvasItems, but keep the background and top tiles def deleteAllItems(self): - ## FIXME - pass + for i in self._all_items: + if i._item: + i._item.destroy() + ##i._item = None + self._all_items = [] # PySol extension def findCard(self, stack, event): @@ -326,6 +350,11 @@ class MfxCanvas(gnome.canvas.Canvas): ### FIXME: should use style.bg_pixmap ???? def _setTile(self, image, stretch=False): + self.realize() + self.show_now() + sw, sh = self.get_size() + print self.get_size() + return try: if image and type(image) is types.StringType: image = loadImage(image) @@ -356,15 +385,31 @@ class MfxCanvas(gnome.canvas.Canvas): pass def update_idletasks(self): + ##print 'MfxCanvas.update_idletasks' self.update_now() + ##gdk.window_process_all_updates() + self.show_now() def grid(self, *args, **kw): - pass + #print '1 >->', self.window + if self.window: + #print '2 >->', self.window + self.window.resize(self._width, self._height) def setInitialSize(self, width, height): + print 'setInitialSize:', width, height + self._width, self._height = width, height self.set_size_request(width, height) - if self.window: - self.window.resize(width, height) + #self.set_size(width, height) + #self.queue_resize() + self.set_scroll_region(0,0,width,height) + #if self.window: + # self.window.resize(width, height) +class MfxScrolledCanvas(MfxCanvas): + def __init__(self, parent, hbar=2, vbar=2, **kw): + MfxCanvas.__init__(self, parent) + self.canvas = self + diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index cc2325ee..8d15f50f 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -60,10 +60,10 @@ def makeToplevel(parent, title=None, class_=None, gtkclass=gtk.Window): window = gtkclass() ##~ window.style = window.get_style().copy() ##~ window.set_style(window.style) - if not hasattr(window, 'vbox'): - window.vbox = gtk.VBox() - window.vbox.show() - window.add(window.vbox) + if not hasattr(window, 'table'): + window.table = gtk.Table(1, 4, False) + window.table.show() + window.add(window.table) window.realize() # needed for set_icon_name() if title: window.set_title(title) diff --git a/pysollib/pysolgtk/tkwidget.py b/pysollib/pysolgtk/tkwidget.py index 8abaaf83..67b72101 100644 --- a/pysollib/pysolgtk/tkwidget.py +++ b/pysollib/pysolgtk/tkwidget.py @@ -40,7 +40,6 @@ TRUE, FALSE = True, False # Toolkit imports from tkutil import makeToplevel, setTransient, wm_withdraw -from tkcanvas import MfxCanvas # /*********************************************************************** @@ -61,7 +60,7 @@ class _MyDialog(gtk.Dialog): def quit(self, *args): self.hide() self.destroy() - gtk.mainquit() + gtk.main_quit() class MfxDialog(_MyDialog): @@ -74,20 +73,22 @@ class MfxDialog(_MyDialog): font=None, buttonfont=None, padx='20', pady='20', - bitmap=None, bitmap_side='left', bitmap_padx=20, bitmap_pady=20, - image=None, image_side='left', image_padx=10, image_pady=20): + bitmap=None, bitmap_side='left', + bitmap_padx=20, bitmap_pady=20, + image=None, image_side='left', + image_padx=10, image_pady=20): _MyDialog.__init__(self) self.status = 1 self.button = -1 bitmap = None self.init(parent, text, strings, default, bitmap, TRUE) #font = "Times-14" - if font: - self.style.font = load_font(font) - self.set_style(self.style) +## if font: +## self.style.font = load_font(font) +## self.set_style(self.style) self.set_title(title) self.show() - gtk.mainloop() + gtk.main() def init(self, parent, message="", buttons=(), default=-1, pixmap=None, modal=TRUE): @@ -173,7 +174,7 @@ class MfxSimpleEntry(_MyDialog): self.entry.set_text(str(value)) self.set_title(title) self.show() - gtk.mainloop() + gtk.main() def init(self, parent, message="", modal=TRUE): if modal: @@ -208,11 +209,6 @@ class MfxSimpleEntry(_MyDialog): self.quit() -class MfxScrolledCanvas(MfxCanvas): - def __init__(self, parent, hbar=2, vbar=2, **kw): - MfxCanvas.__init__(self, parent) - self.canvas = self - diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index e25d2f7a..92a0d66d 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -35,7 +35,6 @@ import os, sys, time, types import gtk from gtk import gdk -TRUE, FALSE = True, False # PySol imports ## from pysollib.images import Images @@ -61,12 +60,12 @@ class MfxCheckMenuItem: self.path = path self.value = None def get(self): - print 'MfxCheckMenuItem.get:', self.path + ##print 'MfxCheckMenuItem.get:', self.path if self.path is None: return 0 w = self.menubar.menus.get_widget(self.path) return w.active def set(self, value): - print 'MfxCheckMenuItem.set:', value, self.path + ##print 'MfxCheckMenuItem.set:', value, self.path if self.path is None: return if not value or value == 'false': value = 0 assert type(value) is types.IntType and 0 <= value <= 1 @@ -78,7 +77,7 @@ class MfxCheckMenuItem: class MfxRadioMenuItem(MfxCheckMenuItem): def get(self): - print 'MfxRadioMenuItem.get:', self.path, self.value + ##print 'MfxRadioMenuItem.get:', self.path, self.value if self.path is None: return 0 w = self.menubar.menus.get_widget(self.path) #from pprint import pprint @@ -88,7 +87,7 @@ class MfxRadioMenuItem(MfxCheckMenuItem): #print w.__dict__ return self.value def set(self, value): - print 'MfxRadioMenuItem.set:', value, self.path + ##print 'MfxRadioMenuItem.set:', value, self.path if self.path is None: return if not value or value == 'false': value = 0 assert type(value) is types.IntType and 0 <= value @@ -112,9 +111,12 @@ class _MfxToplevel(gtk.Window): gtk.Window.__init__(self, type=gtk.WINDOW_TOPLEVEL) ##~ self.style = self.get_style().copy() self.set_style(self.style) - self.vbox = gtk.VBox() - self.vbox.show() - self.add(self.vbox) + #self.vbox = gtk.VBox() + #self.vbox.show() + #self.add(self.vbox) + self.table = gtk.Table(3, 5, False) + self.add(self.table) + self.table.show() self.realize() def cget(self, attr): @@ -143,18 +145,21 @@ class _MfxToplevel(gtk.Window): print "Toplevel configure:", k, v raise AttributeError, k if height > 0 and width > 0: + print 'configure: size:', width, height ## FIXME #self.set_default_size(width, height) - self.set_size_request(width, height) + #self.set_size_request(width, height) #self.set_geometry_hints(base_width=width, base_height=height) + pass + config = configure def mainloop(self): - gtk.mainloop() # the global function + gtk.main() # the global function def mainquit(self): - gtk.mainquit() # the global function + gtk.main_quit() # the global function def screenshot(self, filename): pass @@ -170,8 +175,9 @@ class _MfxToplevel(gtk.Window): self.update_idletasks() def update_idletasks(self): + ##print '_MfxToplevel.update_idletasks' while gtk.events_pending(): - gtk.mainiteration(TRUE) + gtk.main_iteration(True) def winfo_ismapped(self): # FIXME @@ -197,7 +203,8 @@ class _MfxToplevel(gtk.Window): def wm_geometry(self, newGeometry=None): ##print 'wm_geometry', newGeometry if newGeometry == '': - self.resize(1, 1) + self.reshow_with_initial_size() + ##self.resize(1, 1) else: w, h = newGeometry self.resize(w, h) @@ -231,20 +238,23 @@ class _MfxToplevel(gtk.Window): def wm_title(self, title): self.set_title(title) + def tkraise(self): + self.present() + def option_add(self, *args): - print self, 'option_add' + ##print self, 'option_add' pass def option_get(self, *args): - print self, 'option_get' + ##print self, 'option_get' return None def grid_columnconfigure(self, *args, **kw): - print self, 'grid_columnconfigure' + ##print self, 'grid_columnconfigure' pass def grid_rowconfigure(self, *args, **kw): - print self, 'grid_rowconfigure' + ##print self, 'grid_rowconfigure' pass def interruptSleep(self, *args, **kw): @@ -252,7 +262,7 @@ class _MfxToplevel(gtk.Window): pass def wm_state(self): - print self, 'wm_state' + ##print self, 'wm_state' pass @@ -291,4 +301,4 @@ class MfxRoot(_MfxToplevel): else: ##self.after_idle(self.quit) pass - return TRUE + return True diff --git a/pysollib/pysolgtk/toolbar.py b/pysollib/pysolgtk/toolbar.py index 76f6c9e4..92053988 100644 --- a/pysollib/pysolgtk/toolbar.py +++ b/pysollib/pysolgtk/toolbar.py @@ -41,54 +41,80 @@ TRUE, FALSE = True, False from pysollib.actions import PysolToolbarActions + # /*********************************************************************** # // # ************************************************************************/ class PysolToolbar(PysolToolbarActions): - def __init__(self, top, dir, relief=0): + def __init__(self, top, dir, size=0, relief=0, compound=None): + PysolToolbarActions.__init__(self) self.top = top self.dir = dir self.side = -1 - self.toolbar = gtk.Toolbar(ORIENTATION_HORIZONTAL, TOOLBAR_ICONS) - self.bg = top.get_style().bg[STATE_NORMAL] + self.toolbar = gtk.Toolbar(gtk.ORIENTATION_HORIZONTAL, + gtk.TOOLBAR_ICONS) + + #self.bg = top.get_style().bg[gtk.STATE_NORMAL] + ui_info = ''' + + + + + + + + + + + + + + + + + + +''' + ui_manager = self.top.ui_manager # created in menubar.py + ui_manager_id = ui_manager.add_ui_from_string(ui_info) + + toolbar = ui_manager.get_widget("/ToolBar") + toolbar.set_tooltips(True) + toolbar.set_style(gtk.TOOLBAR_ICONS) + toolbar.show() + + top.table.attach(toolbar, + 0, 1, 1, 2, + gtk.EXPAND | gtk.FILL, 0, + 0, 0) + toolbar.show() + + - self._createButton('new', self.mNewGame, tooltip='New game') - self._createButton('open', self.mOpen , tooltip='Open a \nsaved game') - self._createSeparator() - self._createButton('restart', self.mRestart, tooltip='Restart the \ncurrent game') - self._createButton('save', self.mSave, tooltip='Save game') - self._createSeparator() - self._createButton('undo', self.mUndo, tooltip='Undo') - self._createButton('redo', self.mRedo, tooltip='Redo') - self._createButton('autodrop',self.mDrop, tooltip='Auto drop') - self._createSeparator() - self._createButton('stats', self.mStatus, tooltip='Statistics') - self._createButton('rules', self.mHelpRules, tooltip='Rules') - self._createSeparator() - self._createButton('quit', self.mQuit, tooltip='Quit PySol') - self._createSeparator() # no longer needed self.bg = None # - top.vbox.pack_start(self.toolbar, FALSE, FALSE) + # util - def _createButton(self, name, command, padx=0, tooltip=None): -## file = os.path.join(self.dir, name+".gif") -## im = GdkImlib.Image(file) -## im.render() -## pixmap = im.make_pixmap() -## if tooltip: tooltip = re.sub(r'\n', '', tooltip) + def _createButton(self, name, command, padx=0, stock=None, tooltip=None): + ##button = self.toolbar.append_item(name, tooltip, "", stock, command) + ##button = self.toolbar.insert_stock(stock, tooltip, '', command, None, -1) + image = gtk.Image() + image.set_from_stock(stock, gtk.ICON_SIZE_SMALL_TOOLBAR) -##append_item(text, tooltip_text, tooltip_private_text, icon, callback, user_data=None) - - button = self.toolbar.append_item(name, tooltip, "", None, command) + button = gtk.ToolButton(None, name) + button.set_tooltip(tooltip) + #button.set_relief(gtk.RELIEF_NONE) + #button.connect('activate', command) + self.toolbar.insert(button, -1) setattr(self, name + "_button", button) + def _createLabel(self, name, padx=0, side='IGNORE', tooltip=None): ## FIXME: append_widget pass @@ -110,6 +136,9 @@ class PysolToolbar(PysolToolbarActions): def getSide(self): return self.side + def getSize(self): + return 0 + def hide(self, resize=1): self.show(None, resize) @@ -158,7 +187,7 @@ class TestToolbar(PysolToolbar): self.updateText(player="Player\nPySol") self.undo_button.set_state(STATE_INSENSITIVE) def mQuit(self, *args): - mainquit() + gtk.main_quit() def toolbar_main(args): from tkwrap import MfxRoot diff --git a/pysollib/stack.py b/pysollib/stack.py index 389e92d4..e33e9a23 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -485,6 +485,7 @@ class Stack: if update_positions: for c in model.cards[card_index:]: view._position(c) + if update: view.updateText() if self.is_filled: @@ -1044,8 +1045,8 @@ class Stack: i = self._findCard(event) if i < 0 or not self.canMoveCards(self.cards[i:]): return - if self.is_filled: - self.items.shade_item.config(state='hidden') + if self.is_filled and self.items.shade_item: + self.items.shade_item.hide() x_offset, y_offset = self.cards[i].x, self.cards[i].y if sound: self.game.playSample("startdrag") @@ -1275,8 +1276,8 @@ class Stack: drag.shadows = [] drag.stack = None drag.cards = [] - if self.is_filled: - self.items.shade_item.config(state='normal') + if self.is_filled and self.items.shade_item: + self.items.shade_item.show() self.items.shade_item.tkraise() # finish a drag operation diff --git a/pysollib/tk/tkcanvas.py b/pysollib/tk/tkcanvas.py index 6a9b3d3d..c97a73c7 100644 --- a/pysollib/tk/tkcanvas.py +++ b/pysollib/tk/tkcanvas.py @@ -80,6 +80,10 @@ class MfxCanvasImage(Canvas.ImageItem): def moveTo(self, x, y): c = self.coords() self.move(x - int(c[0]), y - int(c[1])) + def show(self): + self.config(state='normal') + def hide(self): + self.config(state='hidden') MfxCanvasLine = Canvas.Line From f4bde621e7a46f9faff57d9ad33b5b95e0f07b55 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Tue, 15 Aug 2006 21:15:02 +0000 Subject: [PATCH 047/266] * improved support GTK (alpha) git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@48 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 4 + pysollib/main.py | 2 +- pysollib/pysolgtk/menubar.py | 261 ++++++++----------------------- pysollib/pysolgtk/progressbar.py | 24 +-- pysollib/pysolgtk/selecttile.py | 227 ++++++++++++++++++++++++--- pysollib/pysolgtk/statusbar.py | 72 +++++++-- pysollib/pysolgtk/tkcanvas.py | 191 +++++++++++++++------- pysollib/pysolgtk/tkutil.py | 103 ++++++------ pysollib/pysolgtk/tkwidget.py | 139 +++++++++++----- pysollib/pysolgtk/tkwrap.py | 3 +- pysollib/settings.py | 2 +- pysollib/tk/selecttile.py | 13 +- pysollib/tk/statusbar.py | 7 +- 13 files changed, 657 insertions(+), 391 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index 3a34b466..b3fb4f7e 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -770,6 +770,10 @@ class Application: self.intro.progress.destroy() destruct(self.intro.progress) self.intro.progress = None + if TOOLKIT == 'gtk': + ## FIXME + self.top.update_idletasks() + self.top.show_now() # prepare game autoplay = 0 if self.nextgame.loadedgame is not None: diff --git a/pysollib/main.py b/pysollib/main.py index f223e9aa..705d89fc 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -483,7 +483,7 @@ def pysol_exit(app): if app.audio is not None: app.audio.destroy() # shut down audio destruct(app.audio) - app.wm_withdraw() + ##app.wm_withdraw() if app.canvas is not None: app.canvas.destroy() destruct(app.canvas) diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 48606bd2..0fe33aab 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -45,6 +45,7 @@ from tkutil import setTransient from tkutil import color_tk2gtk, color_gtk2tk from selectcardset import SelectCardsetDialogWithPreview from selectcardset import SelectCardsetByTypeDialogWithPreview +from selecttile import SelectTileDialogWithPreview # /*********************************************************************** @@ -57,8 +58,6 @@ class PysolMenubar(PysolMenubarActions): def __init__(self, app, top, progress=None): PysolMenubarActions.__init__(self, app, top) self.progress = progress - ##self.menus = None - ##self.menu_items = None # create menus menubar = self.createMenubar() self.top.table.attach(menubar, @@ -68,22 +67,6 @@ class PysolMenubar(PysolMenubarActions): menubar.show() -## menubar, accel = self.createMenus() -## # additional key bindings -## ### FIXME -## ###self.accel.add("Space", None, None, None, None) -## # delete the old menubar -## # set the menubar -## ##~ accel.attach(self.top) -## top.add_accel_group(accel) -## w = menubar.get_widget('
    ') -## self.top.vbox.pack_start(w, expand=FALSE, fill=FALSE) -## self.top.vbox.reorder_child(w, 0) -## self.__menubar = menubar -## self.__accel = accel -## self.menus = menubar - - # # create menubar # @@ -106,13 +89,14 @@ class PysolMenubar(PysolMenubarActions): ('Rules', gtk.STOCK_HELP, 'Rules', None, 'Rules', self.mHelpRules), ('Quit', gtk.STOCK_QUIT, 'Quit', 'Q', 'Quit PySol', self.mQuit), - ("FileMenu", None, "_File" ), - ("SelectGame", None, "Select _game"), - ("EditMenu", None, '_Edit'), - ("GameMenu", None, "_Game"), - ("AssistMenu", None, "_Assist"), - ("OptionsMenu", None, "_Options"), - ("HelpMenu", None, "_Help"), + ("FileMenu", None, "_File" ), + ("SelectGame", None, "Select _game"), + ("EditMenu", None, '_Edit'), + ("GameMenu", None, "_Game"), + ("AssistMenu", None, "_Assist"), + ("OptionsMenu", None, "_Options"), + ('AnimationsMenu', None, '_Animations'), + ("HelpMenu", None, "_Help"), ('SelectGameByNumber', None, "Select game by number...", None, None, self.mSelectGameById), ("SaveAs", None, 'Save _as...', None, None, self.m), @@ -121,12 +105,13 @@ class PysolMenubar(PysolMenubarActions): ("Status", None, 'S_tatus...', "T", None, self.mStatus), ("Hint", None, '_Hint', "H", None, self.mHint), ("HighlightPiles", None, 'Highlight _piles', None, None, self.mHighlightPiles), - ("Demo", None, '_Demo', "D", None, self.mDemo), - ("DemoAllGames", None, 'Demo (all games)', None, None, self.mMixedDemo), - ("Contents", None, '_Contents', 'F1', None, self.mHelp), - ("About", None, '_About PySol...', None, None, self.mHelpAbout), + ("Demo", None, '_Demo', "D", None, self.mDemo), + ("DemoAllGames", None, 'Demo (all games)', None, None, self.mMixedDemo), + ("TableTile", None, "Table t_ile...", None, None, self.mOptTableTile), + ("Contents", None, '_Contents', 'F1', None, self.mHelp), + ("About", None, '_About PySol...', None, None, self.mHelpAbout), ) - + # toggle_entries = ( ("Confirm", None, '_Confirm', None, None, self.mOptConfirm), ("Autoplay", None, 'Auto_play', "P", None, self.mOptAutoDrop), @@ -136,7 +121,15 @@ class PysolMenubar(PysolMenubarActions): ("ShadeLegalMoves", None, 'Shade legal moves', None, None, self.mOptShade), ) - + # + animations_entries = ( + ("AnimationNone", None, "_None", None, None, 0), + ("AnimationFast", None, "_Fast", None, None, 1), + ("AnimationTimer", None, "_Timer based", None, None, 2), + ("AnimationSlow", None, "_Slow", None, None, 3), + ("AnimationVerySlow", None, "_Very slow", None, None, 4), + ) + # ui_info = ''' @@ -178,6 +171,15 @@ class PysolMenubar(PysolMenubarActions): + + + + + + + + +
    @@ -198,6 +200,9 @@ class PysolMenubar(PysolMenubarActions): action_group = gtk.ActionGroup("PySolActions") action_group.add_actions(entries) action_group.add_toggle_actions(toggle_entries) + action_group.add_radio_actions(animations_entries, + self.app.opt.animations, + self.mOptAnimations) ui_manager.insert_action_group(action_group, 0) self.top.add_accel_group(ui_manager.get_accel_group()) @@ -250,151 +255,6 @@ class PysolMenubar(PysolMenubarActions): n += d -## def _initItemFactory(self): -## self.menu_items = ( -## ("/_File", None, None, 0, ""), -## ("/File/", None, None, 0, ""), -## ("/File/_New Game", "N", self.mNewGame, 0, ""), -## ("/File/Select _game", None, None, 0, ""), -## ) - -## # -## # /File/Select game -## # - -## mi, radio = [], "" -## games = self.app.gdb.getGamesIdSortedByName() -## i = 0 -## path = "/File/Select game" -## columnbreak = 25 -## n = 0 -## mm = [] -## t1 = t2 = None -## for id in games: -## if t1 is None: -## t1 = self.app.getGameMenuitemName(id)[:3] -## if n == columnbreak: -## t2 = self.app.getGameMenuitemName(id)[:3] -## pp = '%s/%s-%s' % (path, t1, t2) -## mi.append((pp, None, None, 0, '')) -## for m in mm: -## p = '%s/%s' % (pp, m[0]) -## mi.append((p, None, self.mSelectGame, m[1], radio)) -## if radio[0] == '<': -## radio = re.sub('_', '', p) -## n = 0 -## mm = [] -## t1 = t2 - -## mm.append((self.app.getGameMenuitemName(id), id)) -## n += 1 - -## t2 = self.app.getGameMenuitemName(id)[:3] -## pp = '%s/%s-%s' % (path, t1, t2) -## mi.append((pp, None, None, 0, '')) -## for m in mm: -## p = '%s/%s' % (pp, m[0]) -## mi.append((p, None, self.mSelectGame, m[1], radio)) - -## self.menu_items = self.menu_items + tuple(mi) -## self.tkopt.gameid.path = radio - -## # -## # -## # - -## self.menu_items = self.menu_items + ( -## ("/File/Select game by number...", None, self.mSelectGameById, 0, ""), -## ("/File/", None, None, 0, ""), -## ("/File/_Open", "O", self.m, 0, ""), -## ("/File/_Save", "S", self.mSave, 0, ""), -## ("/File/Save _as...", None, self.m, 0, ""), -## ("/File/", None, None, 0, ""), -## ("/File/_Quit", "Q", self.mQuit, 0, ""), -## ("/_Edit", None, None, 0, ""), -## ("/Edit/", None, None, 0, ""), -## ("/Edit/_Undo", "Z", self.mUndo, 0, ""), -## ("/Edit/_Redo", "R", self.mRedo, 0, ""), -## ("/Edit/Redo _all", None, self.mRedoAll, 0, ""), -## ("/Edit/", None, None, 0, ""), -## ("/Edit/Restart _game", "G", self.mRestart, 0, ""), -## ("/_Game", None, None, 0, ""), -## ("/Game/", None, None, 0, ""), -## ("/Game/_Deal cards", "D", self.mDeal, 0, ""), -## ("/Game/_Auto drop", "A", self.mDrop, 0, ""), -## ("/Game/", None, None, 0, ""), -## ("/Game/S_tatus...", "T", self.mStatus, 0, ""), -## ("/_Assist", None, None, 0, ""), -## ("/Assist/", None, None, 0, ""), -## ("/Assist/_Hint", "H", self.mHint, 0, ""), -## ("/Assist/Highlight _piles", "Shift", self.mHighlightPiles, 0, ""), -## ("/Assist/", None, None, 0, ""), -## ("/Assist/_Demo", "D", self.mDemo, 0, ""), -## ("/Assist/Demo (all games)", "", self.mMixedDemo, 0, ""), -## ("/_Options", None, None, 0, ""), -## ("/Options/", None, None, 0, ""), -## ("/Options/_Confirm", None, self.mOptConfirm, 0, ""), -## ("/Options/Auto_play", "P", self.mOptAutoDrop, 0, ""), -## ("/Options/_Automatic _face up", "F", self.mOptAutoFaceUp, 0, ""), -## ("/Options/Highlight _matching cards", None, self.mOptEnableHighlightCards, 0, ""), -## ("/Options/", None, None, 0, ""), -## ) - -## mi, radio = [], "" -## path = "/Options/Cards_et" -## mi.append((path, None, None, 0, "")) -## for i in range(self.app.cardset_manager.len()): -## columnbreak = i > 0 and (i % 25) == 0 -## p = path + '/' + self.app.cardset_manager.get(i).name -## mi.append((p, None, self.mOptCardset, i, radio)) -## if radio[0] == '<': -## radio = re.sub('_', '', p) -## self.menu_items = self.menu_items + tuple(mi) -## ## self.tkopt.cardset.path = radio - -## self.menu_items = self.menu_items + ( -## ("/Options/Table color...", None, self.mOptTableColor, 0, ""), -## ) - -## mi, radio = [], "" -## path = "/Options/_Animations" -## mi.append((path, None, None, 0, "")) -## i = 0 -## for k in ("_None", "_Fast", "_Timer based"): -## p = path + '/' + k -## mi.append((p, None, self.mOptAnimations, i, radio)) -## if radio[0] == '<': -## radio = re.sub('_', '', p) -## i = i + 1 -## self.menu_items = self.menu_items + tuple(mi) -## self.tkopt.animations.path = radio - -## self.menu_items = self.menu_items + ( -## ("/Options/Card shadow", None, self.mOptShadow, 0, ""), -## ("/Options/Shade legal moves", None, self.mOptShade, 0, ""), -## ("/Options/", None, None, 0, ""), -## ("/Options/_Hint options...", None, self.mOptHintOptions, 0, ""), -## ("/Options/_Demo options...", None, self.mOptDemoOptions, 0, ""), -## ("/_Help", None, None, 0, ""), -## ("/Help/", None, None, 0, ""), -## ("/Help/_Contents", "F1", self.mHelp, 0, ""), -## ("/Help/_Rules", None, self.mHelpRules, 0, ""), -## ("/Help/", None, None, 0, ""), -## ("/Help/_About PySol...", None, self.mHelpAbout, 0, ""), -## ) - - - def createMenus(self): - return self._initUI() - - if not self.menu_items: - self._initItemFactory() - accel = gtk.AccelGroup() - item_factory = gtk.ItemFactory(gtk.MenuBar, '
    ', accel) - item_factory.create_items(self.menu_items) - return item_factory, accel - - # # menu updates # @@ -423,27 +283,21 @@ class PysolMenubar(PysolMenubarActions): def mOptCardset(self, *args): pass - def mOptTableColor(self, *args): - win = gtk.ColorSelectionDialog("Select table color") - win.help_button.destroy() - win.set_position(gtk.WIN_POS_MOUSE) - win.colorsel.set_current_color(gdk.color_parse(self.app.opt.table_color)) - - ##win.colorsel.set_update_policy(UPDATE_CONTINUOUS) - def delete_event(widget, *event): - widget.destroy() - def ok_button_clicked(_button, self=self, win=win): - c = win.colorsel.get_current_color() - c = '#%02x%02x%02x' % (c.red/256, c.green/256, c.blue/256) - win.destroy() - self.app.opt.table_color = c - self.game.canvas.config(bg=self.app.opt.table_color) - self.top.config(bg=self.app.opt.table_color) - win.connect("delete_event", delete_event) - win.ok_button.connect("clicked", ok_button_clicked) - win.cancel_button.connect("clicked", win.destroy) - setTransient(win, self.top) - win.show() + def mOptTableTile(self, *args): + if self._cancelDrag(break_pause=False): return + key = self.app.tabletile_index + if key <= 0: + key = self.app.opt.table_color.lower() + d = SelectTileDialogWithPreview(self.top, app=self.app, + title=_("Select table background"), + manager=self.app.tabletile_manager, + key=key) + if d.status == 0 and d.button in (0, 1): + if type(d.key) is str: + self._mOptTableColor(d.key) + elif d.key > 0 and d.key != self.app.tabletile_index: + self._mOptTableTile(d.key) + def mOptConfirm(self, *args): pass @@ -461,3 +315,16 @@ class PysolMenubar(PysolMenubarActions): if menu_item.get_active(): self._mSelectGame(game_id) + def mOptAnimations(self, a1, a2): + ##print a1.get_current_value(), a2.get_current_value() + self.app.opt.animations = a1.get_current_value() + + + def _mOptTableTile(self, i): + self.app.setTile(i) + + def _mOptTableColor(self, color): + tile = self.app.tabletile_manager.get(0) + tile.color = color + self.app.setTile(0) + diff --git a/pysollib/pysolgtk/progressbar.py b/pysollib/pysolgtk/progressbar.py index 39b9afaa..93c41362 100644 --- a/pysollib/pysolgtk/progressbar.py +++ b/pysollib/pysolgtk/progressbar.py @@ -69,10 +69,11 @@ class PysolProgressBar: 0, 0) # hbox-1: image -## if images and images[0]: -## im = images[0].clone() -## im.show() -## hbox.pack_start(im, FALSE, FALSE) + if images and images[0]: + im = gtk.Image() + im.set_from_pixbuf(images[0].pixbuf) + hbox.pack_start(im, expand=False, fill=False) + im.show() # hbox-2:vbox vbox = gtk.VBox() vbox.show() @@ -87,16 +88,17 @@ class PysolProgressBar: w, h = self.pbar.size_request() self.pbar.set_size_request(max(w, 300), max(h, height)) # set color - c = self.pbar.get_colormap().alloc_color(color) - self.pbar.style.bg[gtk.STATE_PRELIGHT] = c + ##~ c = self.pbar.get_colormap().alloc_color(color) + ##~ self.pbar.style.bg[gtk.STATE_PRELIGHT] = c ##~ style = self.pbar.get_style().copy() ##~ style.bg[gtk.STATE_PRELIGHT] = c ##~ self.pbar.set_style(style) # hbox-3:image -## if images and images[1]: -## im = images[1].clone() -## im.show() -## hbox.pack_start(im, FALSE, FALSE) + if images and images[1]: + im = gtk.Image() + im.set_from_pixbuf(images[1].pixbuf) + hbox.pack_end(im, expand=False) + im.show() # set icon if app: try: @@ -105,9 +107,9 @@ class PysolProgressBar: pixmap, mask = create_pixmap_from_xpm(self.top, bg, name) self.top.set_icon(pixmap, mask) except: pass - ##~ self.top.get_window().set_cursor(cursor_new(gdk.WATCH)) setTransient(self.top, parent) self.top.show() + self.top.window.set_cursor(gdk.Cursor(gdk.WATCH)) self.update(percent=0) def destroy(self): diff --git a/pysollib/pysolgtk/selecttile.py b/pysollib/pysolgtk/selecttile.py index 09cee74e..3239a634 100644 --- a/pysollib/pysolgtk/selecttile.py +++ b/pysollib/pysolgtk/selecttile.py @@ -1,17 +1,7 @@ -## vim:ts=4:et:nowrap -## ##---------------------------------------------------------------------------## ## ## PySol -- a Python Solitaire game ## -## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer -## All Rights Reserved. -## ## 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 2 of the License, or @@ -27,24 +17,219 @@ ## If not, write to the Free Software Foundation, Inc., ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -## Markus F.X.J. Oberhumer -## -## http://www.oberhumer.com/pysol -## ##---------------------------------------------------------------------------## -## # imports +# imports + ## import os, string, sys, types -## import Tkinter, tkColorChooser +import gobject, gtk +from gtk import gdk ## # PySol imports ## from pysollib.mfxutil import destruct, Struct, KwStruct -## from pysollib.resource import CSI +from pysollib.resource import CSI +from pysollib.mfxutil import kwdefault, KwStruct -## # Toolkit imports +# Toolkit imports ## from tkutil import loadImage -## from tkwidget import MfxDialog, MfxScrolledCanvas -## from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode -## from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas +from tkwidget import MfxDialog +from tkcanvas import MfxCanvas +from tkutil import setTransient + + +class SelectTileDialogWithPreview(MfxDialog): + + def __init__(self, parent, title, app, manager, key=None, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, **kw) + # + top_box, bottom_box = self.createBox() + # + if key is None: + key = manager.getSelected() + self.app = app + self.manager = manager + self.key = key + self.preview_key = -1 + self.all_keys = [] + self.table_color = app.opt.table_color + + sw = gtk.ScrolledWindow() + sw.set_shadow_type(gtk.SHADOW_ETCHED_IN) + sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + top_box.pack_start(sw) + + # + model = self._create_tree_model(manager, key) + treeview = gtk.TreeView(model) + treeview.set_rules_hint(True) + treeview.set_headers_visible(False) + + renderer = gtk.CellRendererText() + renderer.set_property('xalign', 0.0) + + column = gtk.TreeViewColumn('Tiles', renderer, text=0) + column.set_clickable(True) + treeview.append_column(column) + + sw.add(treeview) + treeview.expand_all() + + selection = treeview.get_selection() + selection.connect('changed', self.treeview_show_selected) + + treeview.connect('row-activated', self.row_activated) + self.treeview = treeview + + # + self.preview = MfxCanvas(top_box) # width=w2 + top_box.pack_end(self.preview) + self.preview.show() + + self.createButtons(bottom_box, kw) + + self.updatePreview(key) + + self.show_all() + gtk.main() + + + def _getSelected(self): + selection = self.treeview.get_selection() + model, path = selection.get_selected_rows() + if not path: + return None + iter = model.get_iter(path[0]) + index = model.get_value(iter, 1) + if index < 0: + return None + return self.all_keys[index] + + + def row_activated(self, w, row, col): + print 'row_activated_event', row, col + + + def treeview_show_selected(self, w): + key = self._getSelected() + self.updatePreview(key) + + + def _create_tree_model(self, manager, key): + self.all_keys = [] + index = 0 + # + model = gtk.TreeStore(gobject.TYPE_STRING, + gobject.TYPE_INT) + # + iter = model.append(None) + model.set(iter, 0, _('Solid color'), 1, -1) + for color, value in ((_('Blue'), '#0082df'), + (_('Green'), '#008200'), + (_('Navy'), '#000086'), + (_('Olive'), '#868200'), + (_('Orange'), '#f79600'), + (_('Teal'), '#008286'),): + child_iter = model.append(iter) + model.set(child_iter, 0, color, 1, index) + self.all_keys.append(value) + index += 1 + # + tiles = manager.getAllSortedByName() + tiles = filter(lambda obj: not obj.error, tiles) + tiles = filter(lambda tile: tile.index > 0 and tile.filename, tiles) + # + iter = model.append(None) + model.set(iter, 0, _('All Backgrounds'), 1, -1) + if tiles: + for tile in tiles: + child_iter = model.append(iter) + model.set(child_iter, 0, tile.name, 1, index) + self.all_keys.append(tile.index) + index += 1 + else: + child_iter = model.append(iter) + model.set(child_iter, 0, _('(no tiles)'), 1, -1) + + return model + + + def updatePreview(self, key): + ##print 'updatePreview:', key + if key is None: + return + if key == self.preview_key: + return + canvas = self.preview + canvas.deleteAllItems() + if type(key) is str: + # solid color + canvas.config(bg=key) + ##canvas.setTile(None) + ##canvas.setTextColor(None) + self.preview_key = key + self.table_color = key + else: + # image + tile = self.manager.get(key) + if tile: + if self.preview.setTile(self.app, key): + return + self.preview_key = -1 + + + def initKw(self, kw): + kwdefault(kw, + strings=(_('&OK'), _('&Solid color...'), _('&Cancel'),), + default=0, + resizable=1, + font=None, + padx=10, pady=10, + width=600, height=400, + ##~ buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + + def _colorselOkClicked(self, w, d): + c = d.colorsel.get_current_color() + c = '#%02x%02x%02x' % (c.red/256, c.green/256, c.blue/256) + d.destroy() + self.updatePreview(c) + selection = self.treeview.get_selection() + selection.unselect_all() + + + def createColorsel(self): + win = gtk.ColorSelectionDialog('Select table color') + win.help_button.destroy() + win.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + if type(self.preview_key) is str: + color = self.preview_key + else: + color = self.app.opt.table_color + win.colorsel.set_current_color(gdk.color_parse(color)) + win.connect('delete_event', lambda w, e: win.destroy()) + win.ok_button.connect('clicked', self._colorselOkClicked, win) + win.cancel_button.connect('clicked', lambda w: win.destroy()) + setTransient(win, self) + win.show() + + + def done(self, button): + b = button.get_data('user_data') + if b == 1: + self.createColorsel() + return + if b == 0: + self.key = self._getSelected() + if not self.key: + self.key = self.preview_key + self.status = 0 + self.button = b + self.hide() + self.quit() + + diff --git a/pysollib/pysolgtk/statusbar.py b/pysollib/pysolgtk/statusbar.py index 7783db5c..4182fbbe 100644 --- a/pysollib/pysolgtk/statusbar.py +++ b/pysollib/pysolgtk/statusbar.py @@ -33,7 +33,6 @@ # imports import os, sys import gtk -TRUE, FALSE = True, False # PySol imports @@ -42,25 +41,54 @@ TRUE, FALSE = True, False # // # ************************************************************************/ -class PysolStatusbar: - def __init__(self, top): +class BasicStatusbar: + def __init__(self, top, row, column, columnspan): self.top = top - self.side = '#init#' + self._widgets = [] + self.hbox = gtk.HBox() + top.table.attach(self.hbox, + column, column+columnspan, row, row+1, + gtk.EXPAND | gtk.FILL, 0, + 0, 0) + self.createLabel('space', width=2) + + + def createLabel(self, name, fill=False, expand=False, grip=False, width=0): + label = gtk.Statusbar() + self.hbox.pack_start(label, fill=fill, expand=expand) + label.show() + if not grip: + label.set_has_resize_grip(False) + setattr(self, name + "_label", label) + label.set_size_request(width*8, -1) + ##lb = label.get_children()[0].get_children()[0] + ##lb.set_justify(gtk.JUSTIFY_CENTER) + self._widgets.append(label) + ##label.push(0, '') + def updateText(self, **kw): - pass + for k, v in kw.items(): + label = getattr(self, k + "_label") + label.pop(0) + label.push(0, unicode(v)) + def configLabel(self, name, **kw): + print 'statusbar.configLabel', kw pass - def show(self, side='bottom', resize=0): - return 0 + def show(self, show=True, resize=False): + if show: + self.hbox.show() + else: + self.hbox.hide() + return True - def hide(self, resize=0): - self.show(None, resize) + def hide(self, resize=False): + self.show(False, resize) + return True - def getSide(self): - return self.side def destroy(self): pass @@ -69,7 +97,25 @@ class PysolStatusbar: # /*********************************************************************** # // # ************************************************************************/ +class PysolStatusbar(BasicStatusbar): + def __init__(self, top): + BasicStatusbar.__init__(self, top, row=4, column=0, columnspan=3) + # + for n, t, w in ( + ("time", _("Playing time"), 10), + ("moves", _('Moves/Total moves'), 10), + ("gamenumber", _("Game number"), 26), + ("stats", _("Games played: won/lost"), 12), + ): + self.createLabel(n, width=w) + # + l = self.createLabel("info", fill=True, expand=True, grip=True) + + + +class HelpStatusbar(BasicStatusbar): + def __init__(self, top): + BasicStatusbar.__init__(self, top, row=5, column=0, columnspan=3) + self.createLabel("info", fill=True, expand=True) -class HelpStatusbar(PysolStatusbar): - pass diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index 0868b0ec..2947ecae 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -51,6 +51,7 @@ # imports import os, sys, types +import gobject import gtk from gtk import gdk import gnome.canvas @@ -123,6 +124,10 @@ class _CanvasItem: def hide(self): self._item.hide() + def connect(self, signal, func, args): + ##print signal + self._item.connect('event', func, args) + class MfxCanvasGroup(_CanvasItem): def __init__(self, canvas): @@ -148,15 +153,49 @@ class MfxCanvasImage(_CanvasItem): self._item.set(pixbuf=image.pixbuf) + +## arrow = MfxCanvasLine(self.canvas, x1, y1, x2, y2, width=7, +## fill=self.app.opt.hintarrow_color, +## arrow="last", arrowshape=(30,30,10)) +## arrow = MfxCanvasLine(game.canvas, +## coords, +## {'width': w, +## 'fill': game.app.opt.hintarrow_color, +## ##'arrow': 'last', +## ##'arrowshape': (s1, s1, s2) +## } +## ) + class MfxCanvasLine(_CanvasItem): - def __init__(self, canvas, x1, y1, x2, y2, width, fill, arrow, arrowshape): + def __init__(self, canvas, *points, **kw): _CanvasItem.__init__(self, canvas) - # FIXME - self._item = None + kwargs = {} + if kw.has_key('arrow'): + if kw['arrow'] == 'first': + kwargs['first_arrowhead'] = True + elif kw['arrow'] == 'last': + kwargs['last_arrowhead'] = True + elif kw['arrow'] == 'both': + kwargs['first_arrowhead'] = True + kwargs['last_arrowhead'] = True + if kw.has_key('fill'): + kwargs['fill_color'] = kw['fill'] + if kw.has_key('width'): + kwargs['width_units'] = float(kw['width']) + if kw.has_key('arrowshape'): + kwargs['arrow_shape_a'] = kw['arrowshape'][0] + kwargs['arrow_shape_b'] = kw['arrowshape'][1] + kwargs['arrow_shape_c'] = kw['arrowshape'][2] + self._item = canvas.root().add(gnome.canvas.CanvasLine, + points=points, **kwargs) + self._item.show() + canvas.show_all() + class MfxCanvasRectangle(_CanvasItem): def __init__(self, canvas, x1, y1, x2, y2, width, fill, outline): + _CanvasItem.__init__(self, canvas) self._item = canvas.root().add('rect', x1=x1, y1=y1, x2=x2, y2=y2, width_pixels=width, outline_color=outline) if fill is not None: @@ -209,11 +248,14 @@ class MfxCanvasText(_CanvasItem): class MfxCanvas(gnome.canvas.Canvas): def __init__(self, top, bg=None, highlightthickness=0): + print 'MfxCanvas', bg self.preview = 0 # Tkinter compat self.items = {} self._all_items = [] self._text_items = [] + self._width, self._height = -1, -1 + self._tile = None # private self.__tileimage = None self.__tiles = [] @@ -226,20 +268,28 @@ class MfxCanvas(gnome.canvas.Canvas): c = self.get_colormap().alloc(bg) style.bg[gtk.STATE_NORMAL] = c self.set_style(style) - ##self.set_scroll_region(0, 0, gdk.screen_width(), gdk.screen_height()) - top.table.attach(self, - 0, 1, 2, 3, - gtk.EXPAND | gtk.FILL, gtk.EXPAND | gtk.FILL, - 0, 0) + self.top_bg = top.style.bg[gtk.STATE_NORMAL] ## self.top = top self.xmargin, self.ymargin = 0, 0 + self.connect('size-allocate', self._sizeAllocate) + + def __setattr__(self, name, value): self.__dict__[name] = value + def _sizeAllocate(self, w, rect): + ##print '_sizeAllocate', rect.x, rect.y, rect.width, rect.height + if self._width > 0: + w = self._width + h = min(self._height, rect.height) + self.set_scroll_region(0,0,w,h) + if self._tile and self._tile.filename: + self._setTile() + def bind(self, sequence=None, func=None, add=None): assert add is None # FIXME @@ -292,6 +342,9 @@ class MfxCanvas(gnome.canvas.Canvas): i._item.destroy() ##i._item = None self._all_items = [] + if self.__tileimage: + self.__tileimage.destroy() + self.__tileimage = None # PySol extension def findCard(self, stack, event): @@ -312,8 +365,8 @@ class MfxCanvas(gnome.canvas.Canvas): # PySol extension - set a tiled background image def setTile(self, app, i, force=False): - ##print 'setTile' tile = app.tabletile_manager.get(i) + ##print 'setTile', i, tile if tile is None or tile.error: return False if i == 0: @@ -326,18 +379,20 @@ class MfxCanvas(gnome.canvas.Canvas): if not force: if i == app.tabletile_index and tile.color == app.opt.table_color: return False + if self._tile is tile: + return False # - if not self._setTile(tile.filename, tile.stretch): - tile.error = True - return False - + self._tile = tile if i == 0: + if self.__tileimage: + self.__tileimage.destroy() + self.__tileimage = None self.configure(bg=tile.color) ##app.top.config(bg=tile.color) color = None else: - self.configure(bg=app.top_bg) - ##app.top.config(bg=app.top_bg) + self._setTile() + self.configure(bg=self.top_bg) color = tile.text_color if app.opt.table_text_color: @@ -349,36 +404,56 @@ class MfxCanvas(gnome.canvas.Canvas): ### FIXME: should use style.bg_pixmap ???? - def _setTile(self, image, stretch=False): - self.realize() - self.show_now() - sw, sh = self.get_size() - print self.get_size() - return - try: - if image and type(image) is types.StringType: - image = loadImage(image) - except: - return 0 - for item in self.__tiles: - item.destroy() - self.__tiles = [] - # must keep a reference to the image, otherwise Python will - # garbage collect it... - self.__tileimage = image - if image is None: - return 1 - iw, ih = image.width(), image.height() - sw = max(self.winfo_screenwidth(), 1024) - sh = max(self.winfo_screenheight(), 768) - for x in range(0, sw - 1, iw): - for y in range(0, sh - 1, ih): - item = self.root().add('image', x=x, y=y, width=iw, height=ih, - image=image.im._im, - anchor=gtk.ANCHOR_NW) - item.lower_to_bottom() - self.__tiles.append(item) - return 1 + def _setTile(self): + if not self._tile: + return + ##print '_setTile:', self.get_size(), self._tile.filename + # + filename = self._tile.filename + stretch = self._tile.stretch + + if not filename: + return False + if not self.window: # not realized yet + return False + + self.setBackgroundImage(filename, stretch) + + def setBackgroundImage(self, filename, stretch): + + width, height = self.get_size() + pixbuf = gtk.gdk.pixbuf_new_from_file(filename) + w, h = pixbuf.get_width(), pixbuf.get_height() + dx, dy = self.world_to_window(0, 0) + dx, dy = int(dx), int(dy) + + if self.__tileimage: + self.__tileimage.destroy() + self.__tileimage = None + + if stretch: + bg_pixbuf = pixbuf.scale_simple(width, height, gdk.INTERP_BILINEAR) + else: + bg_pixbuf = gdk.Pixbuf(pixbuf.get_colorspace(), + pixbuf.get_has_alpha(), + pixbuf.get_bits_per_sample(), + width, height) + y = 0 + while y < height: + x = 0 + while x < width: + ww = min(w, width-x) + hh = min(h, height-y) + pixbuf.copy_area(0, 0, ww, hh, bg_pixbuf, x, y) + x += w + y += h + + w = self.root().add(gnome.canvas.CanvasPixbuf, + pixbuf=bg_pixbuf, x=0-dx, y=0-dy) + w.lower_to_bottom() + self.__tileimage = w + + def setTopImage(self, image, cw=0, ch=0): ## FIXME @@ -386,25 +461,31 @@ class MfxCanvas(gnome.canvas.Canvas): def update_idletasks(self): ##print 'MfxCanvas.update_idletasks' + #gdk.window_process_all_updates() + #self.show_now() self.update_now() - ##gdk.window_process_all_updates() - self.show_now() def grid(self, *args, **kw): - #print '1 >->', self.window - if self.window: - #print '2 >->', self.window - self.window.resize(self._width, self._height) + self.top.table.attach(self, + 0, 1, 2, 3, + gtk.EXPAND | gtk.FILL, gtk.EXPAND | gtk.FILL | gtk.SHRINK, + 0, 0) + self.show() + + + def _resize(self): + ##print '_resize:', self._width, self._height + #if self.window: + self.set_size(self._width, self._height) + self.window.resize(self._width, self._height) def setInitialSize(self, width, height): - print 'setInitialSize:', width, height + ##print 'setInitialSize:', width, height self._width, self._height = width, height self.set_size_request(width, height) #self.set_size(width, height) #self.queue_resize() - self.set_scroll_region(0,0,width,height) - #if self.window: - # self.window.resize(width, height) + gobject.idle_add(self._resize, priority=gobject.PRIORITY_HIGH_IDLE) class MfxScrolledCanvas(MfxCanvas): diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index 8d15f50f..7e576770 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -33,7 +33,8 @@ # imports import sys, os, string, time, types -import gtk +import gobject +import pango, gtk from gtk import gdk TRUE, FALSE = True, False @@ -44,14 +45,13 @@ TRUE, FALSE = True, False # ************************************************************************/ def wm_withdraw(window): - ##window.unmap() - pass + window.hide() def wm_deiconify(window): - window.show_all() + window.present() def wm_map(window, maximized=None): - window.show_all() + window.show() def wm_set_icon(window, icon): pass @@ -157,12 +157,24 @@ def createImage(width, height, fill, outline=None): def _wrap_b1_press(e): return e.type == gdk.BUTTON_PRESS and e.button == 1 +def _wrap_b1_double(e): + return e.type == gdk._2BUTTON_PRESS and e.button == 1 + +def _wrap_b1_control(e): + return e.type == gdk.BUTTON_PRESS and e.button == 1 and (e.state & gdk.CONTROL_MASK) + +def _wrap_b1_shift(e): + return e.type == gdk.BUTTON_PRESS and e.button == 1 and (e.state & gdk.SHIFT_MASK) + def _wrap_b2_press(e): return e.type == gdk.BUTTON_PRESS and e.button == 2 def _wrap_b3_press(e): return e.type == gdk.BUTTON_PRESS and e.button == 3 +def _wrap_b3_control(e): + return e.type == gdk.BUTTON_PRESS and e.button == 3 and (e.state & gdk.CONTROL_MASK) + def _wrap_b1_motion(e): return e.type == gdk.MOTION_NOTIFY and (e.state & gdk.BUTTON_PRESS_MASK) @@ -172,23 +184,35 @@ def _wrap_b1_release(e): def _wrap_key_press(e, key): return e.type == gdk.KEY_PRESS and e.key == key +def _wrap_enter(e): + return e.type == gdk.ENTER_NOTIFY + +def _wrap_leave(e): + return e.type == gdk.LEAVE_NOTIFY _wrap_handlers = { - '<1>': _wrap_b1_press, - '': _wrap_b1_press, - '<2>': _wrap_b2_press, - '': _wrap_b2_press, - '<3>': _wrap_b3_press, - '': _wrap_b3_press, - '': _wrap_b1_motion, - '': _wrap_b1_release, + '<1>': (_wrap_b1_press, 'button-press-event'), + '': (_wrap_b1_press, 'button-press-event'), + '': (_wrap_b1_double, 'button-press-event'), + '': (_wrap_b1_control, 'button-press-event'), + '': (_wrap_b1_shift, 'button-press-event'), + '<2>': (_wrap_b2_press, 'button-press-event'), + '': (_wrap_b2_press, 'button-press-event'), + '<3>': (_wrap_b3_press, 'button-press-event'), + '': (_wrap_b3_press, 'button-press-event'), + '': (_wrap_b3_control, 'button-press-event'), + '': (_wrap_b1_motion, 'motion-notify-event'), + '': (_wrap_b1_release, 'button-release-event'), + '': (_wrap_enter, 'enter-notify-event'), + '': (_wrap_leave, 'leave-notify-event'), } -for c in " " + string.letters: - seq = "<" + c + ">" - if not _wrap_handlers.has_key(seq): - _wrap_handlers[seq] = lambda e, key=c: _wrap_key_press(e, key) -#print _wrap_handlers +## for c in " " + string.letters: +## seq = "<" + c + ">" +## if not _wrap_handlers.has_key(seq): +## _wrap_handlers[seq] = lambda e, key=c: _wrap_key_press(e, key) +## import pprint; pprint.pprint(_wrap_handlers) +## NOT BOUND: __bindings = {} @@ -204,22 +228,20 @@ def _wrap_event(widget, event, l): def bind(widget, sequence, func, add=None): wrap = _wrap_handlers.get(sequence) if not wrap: - ##print "NOT BOUND:", sequence + print "NOT BOUND:", sequence return - # HACK for MfxCanvasItem - if hasattr(widget, '_item'): - widget = widget._item + wrap, signal = wrap # k = id(widget) if __bindings.has_key(k): __bindings[k].append((wrap, func)) else: l = [(wrap, func)] - widget.connect('event', _wrap_event, l) + widget.connect(signal, _wrap_event, l) __bindings[k] = l - def unbind_destroy(widget): + return k = id(widget) if __bindings.has_key(k): ## FIXME @@ -231,37 +253,28 @@ def unbind_destroy(widget): # ************************************************************************/ def after(widget, ms, func, *args): - ## FIXME - return None + timer = gtk.timeout_add(ms, func, *args) + return timer def after_idle(widget, func, *args): - ## FIXME + gobject.idle_add(func, *args) return None def after_cancel(t): if t is not None: - ## FIXME - pass + gtk.timeout_remove(t) # /*********************************************************************** # // font # ************************************************************************/ -getFont_cache = {} - -def getFont(name, cardw=0): - key = (name, cardw) - font = getFont_cache.get(key) - if font: - return font - # default - ### FIXME - font = "Helvetica-14" - font = "-adobe-helvetica-medium-r-normal--*-100-*-*-*-*-*-*" - getFont_cache[key] = font - return font - - def getTextWidth(text, font=None, root=None): - return 10 + if root: + pango_font_desc = pango.FontDescription(font[0]+' '+str(font[1])) + pangolayout = root.create_pango_layout(text) + width = pangolayout.get_pixel_extents()[1][2] + return width + return 0 + + diff --git a/pysollib/pysolgtk/tkwidget.py b/pysollib/pysolgtk/tkwidget.py index 67b72101..3fb56765 100644 --- a/pysollib/pysolgtk/tkwidget.py +++ b/pysollib/pysolgtk/tkwidget.py @@ -34,13 +34,15 @@ import os, sys import gtk -TRUE, FALSE = True, False +from gtk import gdk # PySol imports # Toolkit imports from tkutil import makeToplevel, setTransient, wm_withdraw +from pysollib.mfxutil import kwdefault, KwStruct + # /*********************************************************************** # // @@ -49,8 +51,8 @@ from tkutil import makeToplevel, setTransient, wm_withdraw class _MyDialog(gtk.Dialog): def __init__(self): gtk.Dialog.__init__(self) - self.style = self.get_style().copy() - self.set_style(self.style) + style = self.get_style().copy() + self.set_style(style) self.connect("destroy", self.quit) self.connect("delete_event", self.quit) @@ -67,12 +69,13 @@ class MfxDialog(_MyDialog): def __init__(self, parent, title='', timeout=0, resizable=0, + width=-1, height=-1, text='', justify='center', strings=("OK",), default=0, - width=0, separatorwidth=0, + separatorwidth=0, font=None, buttonfont=None, - padx='20', pady='20', + padx=20, pady=20, bitmap=None, bitmap_side='left', bitmap_padx=20, bitmap_pady=20, image=None, image_side='left', @@ -80,52 +83,116 @@ class MfxDialog(_MyDialog): _MyDialog.__init__(self) self.status = 1 self.button = -1 - bitmap = None - self.init(parent, text, strings, default, bitmap, TRUE) - #font = "Times-14" -## if font: -## self.style.font = load_font(font) -## self.set_style(self.style) - self.set_title(title) - self.show() - gtk.main() - def init(self, parent, message="", buttons=(), default=-1, - pixmap=None, modal=TRUE): + modal=True if modal: setTransient(self, parent) + + + # settings + if width > 0 or height > 0: + self.set_size_request(width, height) + #self.window.resize(width, height) + self.set_title(title) + # + self.connect('key-press-event', self._keyPressEvent) + self.show() + + def createBox(self): hbox = gtk.HBox(spacing=5) hbox.set_border_width(5) self.vbox.pack_start(hbox) hbox.show() -## if pixmap: -## self.realize() -## pixmap = gtk.Pixmap(self, pixmap) -## hbox.pack_start(pixmap, expand=FALSE) -## pixmap.show() - label = gtk.Label(message) - hbox.pack_start(label) - label.show() - for i in range(len(buttons)): - text = buttons[i] + return hbox, self.action_area + + def createBitmaps(self, box, kw): + if kw['bitmap']: + stock = {"info": gtk.STOCK_DIALOG_INFO, + "error": gtk.STOCK_DIALOG_ERROR, + "warning": gtk.STOCK_DIALOG_WARNING, + "question": gtk.STOCK_DIALOG_QUESTION} [kw['bitmap']] + im = gtk.image_new_from_stock(stock, gtk.ICON_SIZE_DIALOG) + box.pack_start(im) + im.xpad, im.ypad = kw['bitmap_padx'], kw['bitmap_pady'] + im.show() + elif kw['image']: + im = gtk.Image() + im.set_from_pixbuf(kw['image'].pixbuf) + if kw['image_side'] == 'left': + box.pack_start(im) + else: + box.pack_end(im) + im.xpad, im.ypad = kw['image_padx'], kw['image_pady'] + im.show() + + def createButtons(self, box, kw): + strings, default = kw['strings'], kw['default'] + for i in range(len(strings)): + text = strings[i] + if not text: + continue + text = text.replace('&', '_') b = gtk.Button(text) b.set_flags(gtk.CAN_DEFAULT) if i == default: b.grab_focus() - b.grab_default() + ##~ b.grab_default() b.set_data("user_data", i) - b.connect("clicked", self.click) - self.action_area.pack_start(b) + b.connect("clicked", self.done) + box.pack_start(b) b.show() - self.ret = None - def click(self, button): + def initKw(self, kw): + kwdefault(kw, + timeout=0, resizable=0, + text="", justify="center", + strings=(_("&OK"),), + default=0, + width=0, + padx=20, pady=20, + bitmap=None, bitmap_side="left", + bitmap_padx=10, bitmap_pady=20, + image=None, image_side="left", + image_padx=10, image_pady=20, + ) +## # default to separator if more than one button +## sw = 2 * (len(kw.strings) > 1) +## kwdefault(kw.__dict__, separatorwidth=sw) + return kw + + def done(self, button): self.status = 0 self.button = button.get_data("user_data") self.quit() + def _keyPressEvent(self, w, e): + if gdk.keyval_name(e.keyval) == 'Escape': + self.quit() -MfxMessageDialog = MfxDialog + +class MfxMessageDialog(MfxDialog): + def __init__(self, parent, title, **kw): + ##print 'MfxMessageDialog', kw + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, **kw) + + top_box, bottom_box = self.createBox() + self.createBitmaps(top_box, kw) + + label = gtk.Label(kw['text']) + label.set_justify(gtk.JUSTIFY_CENTER) + label.xpad, label.ypad = kw['padx'], kw['pady'] + top_box.pack_start(label) + + self.createButtons(bottom_box, kw) + + label.show() + gtk.main() + + def initKw(self, kw): + if kw.has_key('bitmap'): + kwdefault(kw, width=250, height=150) + return MfxDialog.initKw(self, kw) # /*********************************************************************** @@ -170,13 +237,13 @@ class MfxSimpleEntry(_MyDialog): self.button = 0 self.status = 1 self.value = value - self.init(parent, label, TRUE) + self.init(parent, label, True) self.entry.set_text(str(value)) self.set_title(title) self.show() gtk.main() - def init(self, parent, message="", modal=TRUE): + def init(self, parent, message="", modal=True): if modal: setTransient(self, parent) box = gtk.VBox(spacing=10) @@ -192,7 +259,7 @@ class MfxSimpleEntry(_MyDialog): self.entry.show() self.entry.grab_focus() button = gtk.Button("OK") - button.connect("clicked", self.click) + button.connect("clicked", self.done) button.set_flags(CAN_DEFAULT) self.action_area.pack_start(button) button.show() @@ -203,7 +270,7 @@ class MfxSimpleEntry(_MyDialog): self.action_area.pack_start(button) button.show() - def click(self, button): + def done(self, button): self.status = 0 self.value = self.entry.get_text() self.quit() diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index 92a0d66d..d0c64400 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -198,7 +198,7 @@ class _MfxToplevel(gtk.Window): pass def wm_deiconify(self): - self.show_all() + self.present() def wm_geometry(self, newGeometry=None): ##print 'wm_geometry', newGeometry @@ -293,6 +293,7 @@ class MfxRoot(_MfxToplevel): # FIXME - make sleep interruptible def sleep(self, seconds): + gdk.window_process_all_updates() time.sleep(seconds) def wmDeleteWindow(self, *args): diff --git a/pysollib/settings.py b/pysollib/settings.py index 70cb08f8..491b40d7 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -29,7 +29,7 @@ PACKAGE = "PySol" PACKAGE_URL = "http://sourceforge.net/projects/pysolfc/" TOOLKIT = 'gtk' -TOOLKIT = 'tk' +#TOOLKIT = 'tk' # data dirs DATA_DIRS = [] diff --git a/pysollib/tk/selecttile.py b/pysollib/tk/selecttile.py index c82bf12b..d1aa55e3 100644 --- a/pysollib/tk/selecttile.py +++ b/pysollib/tk/selecttile.py @@ -197,10 +197,11 @@ class SelectTileDialogWithPreview(MfxDialog): canvas.setTextColor(None) self.preview_key = key self.table_color = key - return - tile = self.manager.get(key) - if tile: - if self.preview.setTile(self.app, key): - return - self.preview_key = -1 + else: + # image + tile = self.manager.get(key) + if tile: + if self.preview.setTile(self.app, key): + return + self.preview_key = -1 diff --git a/pysollib/tk/statusbar.py b/pysollib/tk/statusbar.py index e69f3e3e..a92fa916 100644 --- a/pysollib/tk/statusbar.py +++ b/pysollib/tk/statusbar.py @@ -40,13 +40,12 @@ __all__ = ['PysolStatusbar', import os, sys, Tkinter if __name__ == '__main__': - d = os.path.abspath(os.path.join(sys.path[0], '..', '..')) + d = os.path.abspath(os.path.join(sys.path[0], os.pardir, os.pardir)) sys.path.append(d) import gettext gettext.install('pysol', d, unicode=True) # PySol imports -from pysollib.mfxutil import destruct # Toolkit imports from tkwidget import MfxTooltip @@ -137,8 +136,8 @@ class MfxStatusbar: self._show = show return True - def hide(self, resize=0): - self.show(None, resize) + def hide(self, resize=False): + self.show(False, resize) def destroy(self): for w in self._tooltips: From 06c287d6f1e3cbb1cbad706e66d7aaf026ef7d4c Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 16 Aug 2006 21:20:28 +0000 Subject: [PATCH 048/266] * improved support GTK (alpha) git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@49 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/actions.py | 2 +- pysollib/game.py | 2 +- pysollib/help.py | 4 +- pysollib/pysolgtk/menubar.py | 217 +++++---- pysollib/pysolgtk/playeroptionsdialog.py | 65 ++- pysollib/pysolgtk/selecttile.py | 2 +- pysollib/pysolgtk/tkcanvas.py | 59 ++- pysollib/pysolgtk/tkhtml.py | 556 ++++++++++++++++++++++- pysollib/pysolgtk/tkwidget.py | 43 +- pysollib/pysolgtk/tkwrap.py | 18 +- pysollib/pysolgtk/toolbar.py | 56 +-- pysollib/tk/menubar.py | 2 +- pysollib/tk/tkhtml.py | 14 +- 13 files changed, 834 insertions(+), 206 deletions(-) diff --git a/pysollib/actions.py b/pysollib/actions.py index 5967a3c2..04df3482 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -305,7 +305,7 @@ class PysolMenubarActions: self.setMenuState(ms.redo, "edit.redo") self.setMenuState(ms.redo, "edit.redoall") self.updateBookmarkMenuState() - self.setMenuState(ms.restart, "edit.restartgame") + self.setMenuState(ms.restart, "edit.restart") # Game menu self.setMenuState(ms.deal, "game.dealcards") self.setMenuState(ms.autodrop, "game.autodrop") diff --git a/pysollib/game.py b/pysollib/game.py index 4b1353d1..fc8e7eac 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1001,7 +1001,7 @@ class Game: if self.app.debug and not self.top.winfo_ismapped(): return #self.top.busyUpdate() - self.canvas.after(200) + ##self.canvas.after(200) self.canvas.update_idletasks() old_a = self.app.opt.animations if old_a == 0: diff --git a/pysollib/help.py b/pysollib/help.py index c42f6403..40ef2287 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -160,9 +160,7 @@ def helpHTML(app, document, dir_, top=None): wm_set_icon(top, app.dataloader.findIcon()) except: pass - viewer = tkHTMLViewer(top) - viewer.app = app - viewer.home = help_html_index + viewer = tkHTMLViewer(top, app, help_html_index) viewer.display(doc) #wm_map(top, maximized=maximized) viewer.parent.tkraise() diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 0fe33aab..905784b0 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -78,116 +78,130 @@ class PysolMenubar(PysolMenubarActions): def createMenubar(self): entries = ( - ('New', gtk.STOCK_NEW, '_New', 'N', 'New game', self.mNewGame), - ('Open', gtk.STOCK_OPEN, '_Open', 'O', 'Open a\nsaved game', self.mOpen), - ('Restart', gtk.STOCK_REFRESH, '_Restart', 'G', 'Restart the\ncurrent game', self.mRestart), - ('Save', gtk.STOCK_SAVE, '_Save', 'S', 'Save game', self.mSave), - ('Undo', gtk.STOCK_UNDO, 'Undo', 'Z', 'Undo', self.mUndo), - ('Redo', gtk.STOCK_REDO, 'Redo', 'R', 'Redo', self.mRedo), - ('Autodrop',gtk.STOCK_JUMP_TO, '_Auto drop', 'A', 'Auto drop', self.mDrop), - ('Stats', gtk.STOCK_EXECUTE, 'Stats', None, 'Statistics', self.mStatus), - ('Rules', gtk.STOCK_HELP, 'Rules', None, 'Rules', self.mHelpRules), - ('Quit', gtk.STOCK_QUIT, 'Quit', 'Q', 'Quit PySol', self.mQuit), + ('new', gtk.STOCK_NEW, '_New', 'N', 'New game', self.mNewGame), + ('open', gtk.STOCK_OPEN, '_Open', 'O', 'Open a\nsaved game', self.mOpen), + ('restart', gtk.STOCK_REFRESH, '_Restart', 'G', 'Restart the\ncurrent game', self.mRestart), + ('save', gtk.STOCK_SAVE, '_Save', 'S', 'Save game', self.mSave), + ('undo', gtk.STOCK_UNDO, 'Undo', 'Z', 'Undo', self.mUndo), + ('redo', gtk.STOCK_REDO, 'Redo', 'R', 'Redo', self.mRedo), + ('autodrop',gtk.STOCK_JUMP_TO, '_Auto drop', 'A', 'Auto drop', self.mDrop), + ('stats', gtk.STOCK_HOME, 'Stats', None, 'Statistics', self.mStatus), + ('rules', gtk.STOCK_HELP, 'Rules', 'F1', 'Rules', self.mHelpRules), + ('quit', gtk.STOCK_QUIT, 'Quit', 'Q', 'Quit PySol', self.mQuit), - ("FileMenu", None, "_File" ), - ("SelectGame", None, "Select _game"), - ("EditMenu", None, '_Edit'), - ("GameMenu", None, "_Game"), - ("AssistMenu", None, "_Assist"), - ("OptionsMenu", None, "_Options"), - ('AnimationsMenu', None, '_Animations'), - ("HelpMenu", None, "_Help"), + ('file', None, '_File' ), + ('selectgame', None, 'Select _game'), + ('edit', None, '_Edit'), + ('game', None, '_Game'), + ('assist', None, '_Assist'), + ('options', None, '_Options'), + ("automaticplay", None, "_Automatic play"), - ('SelectGameByNumber', None, "Select game by number...", None, None, self.mSelectGameById), - ("SaveAs", None, 'Save _as...', None, None, self.m), - ("RedoAll", None, 'Redo _all', None, None, self.mRedoAll), - ("DealCards", None, '_Deal cards', "D", None, self.mDeal), - ("Status", None, 'S_tatus...', "T", None, self.mStatus), - ("Hint", None, '_Hint', "H", None, self.mHint), - ("HighlightPiles", None, 'Highlight _piles', None, None, self.mHighlightPiles), - ("Demo", None, '_Demo', "D", None, self.mDemo), - ("DemoAllGames", None, 'Demo (all games)', None, None, self.mMixedDemo), - ("TableTile", None, "Table t_ile...", None, None, self.mOptTableTile), - ("Contents", None, '_Contents', 'F1', None, self.mHelp), - ("About", None, '_About PySol...', None, None, self.mHelpAbout), + ('animations', None, '_Animations'), + ('help', None, '_Help'), + + ('selectgamebynumber', None, 'Select game by number...', None, None, self.mSelectGameById), + ('saveas', None, 'Save _as...', None, None, self.m), + ('redoall', None, 'Redo _all', None, None, self.mRedoAll), + ('dealcards', None, '_Deal cards', 'D', None, self.mDeal), + ('status', None, 'S_tatus...', 'T', None, self.mStatus), + ('hint', None, '_Hint', 'H', None, self.mHint), + ('highlightpiles', None, 'Highlight _piles', None, None, self.mHighlightPiles), + ('demo', None,'_Demo', 'D',None,self.mDemo), + ('demoallgames', None,'Demo (all games)', None,None,self.mMixedDemo), + ('playeroptions',None,'_Player options...',None,None,self.mOptPlayerOptions), + ('tabletile', None,'Table t_ile...', None,None,self.mOptTableTile), + ('contents', None,'_Contents','F1',None,self.mHelp), + ('aboutpysol', None,'_About PySol...', None,None,self.mHelpAbout), ) + # toggle_entries = ( - ("Confirm", None, '_Confirm', None, None, self.mOptConfirm), - ("Autoplay", None, 'Auto_play', "P", None, self.mOptAutoDrop), - ("AutomaticFaceUp", None,'_Automatic _face up', "F", None, self.mOptAutoFaceUp), - ("HighlightMatchingCards", None, 'Highlight _matching cards', None, None, self.mOptEnableHighlightCards), - ("CardShadow", None, 'Card shadow', None, None, self.mOptShadow), - ("ShadeLegalMoves", None, 'Shade legal moves', None, None, self.mOptShade), + ('pause', gtk.STOCK_STOP, '_Pause', 'P', 'Pause game', self.mPause), + ('optautodrop', None, 'A_uto drop', None, None, self.mOptAutoDrop), + ('autofaceup', None, 'Auto _face up', None, None, self.mOptAutoFaceUp), + ("autodeal", None, "Auto _deal", None, None, self.mOptAutoDeal), + ("quickplay", None, '_Quick play', None, None, self.mOptQuickPlay), + + ('highlightmatchingcards', None, 'Highlight _matching cards', None, None, self.mOptEnableHighlightCards), + ('cardshadow', None, 'Card shadow', None, None, self.mOptShadow), + ('shadelegalmoves', None, 'Shade legal moves', None, None, self.mOptShade), ) + # animations_entries = ( - ("AnimationNone", None, "_None", None, None, 0), - ("AnimationFast", None, "_Fast", None, None, 1), - ("AnimationTimer", None, "_Timer based", None, None, 2), - ("AnimationSlow", None, "_Slow", None, None, 3), - ("AnimationVerySlow", None, "_Very slow", None, None, 4), + ('animationnone', None, '_None', None, None, 0), + ('animationfast', None, '_Fast', None, None, 1), + ('animationtimer', None, '_Timer based', None, None, 2), + ('animationslow', None, '_Slow', None, None, 3), + ('animationveryslow', None, '_Very slow', None, None, 4), ) # ui_info = ''' - + - - - + + + - - - + + + - + - - - - + + + + - + - - - + + + + - + - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + - - + + + + + + + + + + + + - - - - + + + + @@ -197,7 +211,7 @@ class PysolMenubar(PysolMenubarActions): ui_manager = gtk.UIManager() ui_manager_id = ui_manager.add_ui_from_string(ui_info) - action_group = gtk.ActionGroup("PySolActions") + action_group = gtk.ActionGroup('PySolActions') action_group.add_actions(entries) action_group.add_toggle_actions(toggle_entries) action_group.add_radio_actions(animations_entries, @@ -207,11 +221,11 @@ class PysolMenubar(PysolMenubarActions): ui_manager.insert_action_group(action_group, 0) self.top.add_accel_group(ui_manager.get_accel_group()) self.top.ui_manager = ui_manager - menubar = ui_manager.get_widget("/MenuBar") + menubar = ui_manager.get_widget('/menubar') games = map(self.app.gdb.get, self.app.gdb.getGamesIdSortedByName()) - menu_item = ui_manager.get_widget("/MenuBar/FileMenu/SelectGame") + menu_item = ui_manager.get_widget('/menubar/file/selectgame') menu_item.show() menu = gtk.Menu() menu_item.set_submenu(menu) @@ -238,7 +252,7 @@ class PysolMenubar(PysolMenubarActions): menu_item.connect('toggled', command, g.id) def _addSelectAllGameSubMenu(self, games, menu, command): - cb_max = gdk.screen_height()/20 + cb_max = gdk.screen_height()/24 n, d = 0, cb_max i = 0 group = None @@ -259,15 +273,29 @@ class PysolMenubar(PysolMenubarActions): # menu updates # +## WARNING: setMenuState: not found: /menubar/file/holdandquit +## WARNING: setMenuState: not found: /menubar/assist/findcard def setMenuState(self, state, path): - return - w = self.__menubar.get_widget(path) - w.set_sensitive(state) + path_map = {'help.rulesforthisgame': '/menubar/help/rules',} + if path_map.has_key(path): + path = path_map[path] + else: + path = '/menubar/'+path.replace('.', '/') + menuitem = self.top.ui_manager.get_widget(path) + if not menuitem: + ##print 'WARNING: setMenuState: not found:', path + return + menuitem.set_sensitive(state) + + def setToolbarState(self, state, path): - ##~ w = getattr(self.app.toolbar, path + "_button") - ##~ w.set_sensitive(state) - pass + path = '/toolbar/'+path + button = self.top.ui_manager.get_widget(path) + if not button: + print 'WARNING: setToolbarState: not found:', path + else: + button.set_sensitive(state) # @@ -289,7 +317,7 @@ class PysolMenubar(PysolMenubarActions): if key <= 0: key = self.app.opt.table_color.lower() d = SelectTileDialogWithPreview(self.top, app=self.app, - title=_("Select table background"), + title=_('Select table background'), manager=self.app.tabletile_manager, key=key) if d.status == 0 and d.button in (0, 1): @@ -299,9 +327,6 @@ class PysolMenubar(PysolMenubarActions): self._mOptTableTile(d.key) - def mOptConfirm(self, *args): - pass - def mOptHintOptions(self, *args): pass diff --git a/pysollib/pysolgtk/playeroptionsdialog.py b/pysollib/pysolgtk/playeroptionsdialog.py index 32dd4982..352ad045 100644 --- a/pysollib/pysolgtk/playeroptionsdialog.py +++ b/pysollib/pysolgtk/playeroptionsdialog.py @@ -36,17 +36,78 @@ __all__ = ['PlayerOptionsDialog'] # imports -import gtk +import gobject, gtk # PySol imports # Toolkit imports from tkwidget import MfxDialog +from pysollib.mfxutil import kwdefault + # /*********************************************************************** # // # ************************************************************************/ class PlayerOptionsDialog(MfxDialog): - pass + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, **kw) + # + top_box, bottom_box = self.createVBox() + # + label = gtk.Label('Please enter your name') + label.show() + top_box.pack_start(label) + self.player_entry = gtk.Entry() + self.player_entry.show() + top_box.pack_start(self.player_entry, expand=False) + completion = gtk.EntryCompletion() + self.player_entry.set_completion(completion) + model = gtk.ListStore(gobject.TYPE_STRING) + print '>>', app.getAllUserNames() + for name in app.getAllUserNames(): + iter = model.append() + model.set(iter, 0, name) + completion.set_model(model) + completion.set_text_column(0) + self.player_entry.set_text(app.opt.player) + # + self.confirm_quit_check = gtk.CheckButton(_('Confirm quit')) + self.confirm_quit_check.show() + top_box.pack_start(self.confirm_quit_check) + self.confirm_quit_check.set_active(app.opt.confirm != 0) + # + self.update_stats_check = gtk.CheckButton(_('Update statistics and logs')) + self.update_stats_check.show() + top_box.pack_start(self.update_stats_check) + self.update_stats_check.set_active(app.opt.update_player_stats != 0) + # + self.createButtons(bottom_box, kw) + self.show_all() + gtk.main() + + + def initKw(self, kw): + kwdefault(kw, + strings=(_('&OK'), _('&Cancel'),), + default=0, + #resizable=1, + #font=None, + padx=10, pady=10, + #width=600, height=400, + ##~ buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + + def done(self, button): + self.button = button.get_data('user_data') + self.player = self.player_entry.get_text() + self.confirm = self.confirm_quit_check.get_active() + self.update_stats = self.update_stats_check.get_active() + self.win_animation = False + self.quit() + + diff --git a/pysollib/pysolgtk/selecttile.py b/pysollib/pysolgtk/selecttile.py index 3239a634..0bf43a24 100644 --- a/pysollib/pysolgtk/selecttile.py +++ b/pysollib/pysolgtk/selecttile.py @@ -44,7 +44,7 @@ class SelectTileDialogWithPreview(MfxDialog): kw = self.initKw(kw) MfxDialog.__init__(self, parent, title, **kw) # - top_box, bottom_box = self.createBox() + top_box, bottom_box = self.createHBox() # if key is None: key = manager.getSelected() diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index 2947ecae..a66a95fa 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -80,6 +80,7 @@ class _CanvasItem: ##print self, 'addtag' ##~ assert isinstance(group._item, CanvasGroup) self._item.reparent(group._item) + def dtag(self, group): pass ##print self, 'dtag' @@ -88,9 +89,11 @@ class _CanvasItem: def bind(self, sequence, func, add=None): bind(self._item, sequence, func, add) + def bbox(self): ## FIXME return (0, 0, 0, 0) + def delete(self): if self._item is not None: self._item.destroy() @@ -120,15 +123,18 @@ class _CanvasItem: moveTo = move def show(self): - self._item.show() + if self._item: + self._item.show() def hide(self): - self._item.hide() + if self._item: + self._item.hide() def connect(self, signal, func, args): ##print signal self._item.connect('event', func, args) + class MfxCanvasGroup(_CanvasItem): def __init__(self, canvas): _CanvasItem.__init__(self, canvas) @@ -153,19 +159,6 @@ class MfxCanvasImage(_CanvasItem): self._item.set(pixbuf=image.pixbuf) - -## arrow = MfxCanvasLine(self.canvas, x1, y1, x2, y2, width=7, -## fill=self.app.opt.hintarrow_color, -## arrow="last", arrowshape=(30,30,10)) -## arrow = MfxCanvasLine(game.canvas, -## coords, -## {'width': w, -## 'fill': game.app.opt.hintarrow_color, -## ##'arrow': 'last', -## ##'arrowshape': (s1, s1, s2) -## } -## ) - class MfxCanvasLine(_CanvasItem): def __init__(self, canvas, *points, **kw): _CanvasItem.__init__(self, canvas) @@ -192,7 +185,6 @@ class MfxCanvasLine(_CanvasItem): canvas.show_all() - class MfxCanvasRectangle(_CanvasItem): def __init__(self, canvas, x1, y1, x2, y2, width, fill, outline): _CanvasItem.__init__(self, canvas) @@ -259,6 +251,7 @@ class MfxCanvas(gnome.canvas.Canvas): # private self.__tileimage = None self.__tiles = [] + self.__topimage = None # friend MfxCanvasText self._text_color = '#000000' # @@ -346,6 +339,14 @@ class MfxCanvas(gnome.canvas.Canvas): self.__tileimage.destroy() self.__tileimage = None + def hideAllItems(self): + for i in self._all_items: + i.hide() + + def showAllItems(self): + for i in self._all_items: + i.show() + # PySol extension def findCard(self, stack, event): # FIXME @@ -415,11 +416,13 @@ class MfxCanvas(gnome.canvas.Canvas): if not filename: return False if not self.window: # not realized yet - return False + self.realize() + ##return False self.setBackgroundImage(filename, stretch) def setBackgroundImage(self, filename, stretch): + print 'setBackgroundImage', filename width, height = self.get_size() pixbuf = gtk.gdk.pixbuf_new_from_file(filename) @@ -456,8 +459,23 @@ class MfxCanvas(gnome.canvas.Canvas): def setTopImage(self, image, cw=0, ch=0): - ## FIXME - pass + if self.__topimage: + self.__topimage.destroy() + self.__topimage = None + if not image: + return + if type(image) is str: + pixbuf = gtk.gdk.pixbuf_new_from_file(image) + else: + pixbuf = image.pixbuf + w, h = self.get_size() + iw, ih = pixbuf.get_width(), pixbuf.get_height() + x, y = (w-iw)/2, (h-ih)/2 + dx, dy = self.world_to_window(0, 0) + dx, dy = int(dx), int(dy) + self.__topimage = self.root().add(gnome.canvas.CanvasPixbuf, + pixbuf=pixbuf, x=x-dx, y=y-dy) + def update_idletasks(self): ##print 'MfxCanvas.update_idletasks' @@ -465,6 +483,7 @@ class MfxCanvas(gnome.canvas.Canvas): #self.show_now() self.update_now() + def grid(self, *args, **kw): self.top.table.attach(self, 0, 1, 2, 3, @@ -485,7 +504,7 @@ class MfxCanvas(gnome.canvas.Canvas): self.set_size_request(width, height) #self.set_size(width, height) #self.queue_resize() - gobject.idle_add(self._resize, priority=gobject.PRIORITY_HIGH_IDLE) + #gobject.idle_add(self._resize, priority=gobject.PRIORITY_HIGH_IDLE) class MfxScrolledCanvas(MfxCanvas): diff --git a/pysollib/pysolgtk/tkhtml.py b/pysollib/pysolgtk/tkhtml.py index be7d3ba6..607463d5 100644 --- a/pysollib/pysolgtk/tkhtml.py +++ b/pysollib/pysolgtk/tkhtml.py @@ -4,9 +4,13 @@ ## ## PySol -- a Python Solitaire game ## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer ## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer ## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer ## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. ## ## 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 @@ -24,19 +28,169 @@ ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## ## Markus F.X.J. Oberhumer -## -## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html +## +## http://www.oberhumer.com/pysol ## ##---------------------------------------------------------------------------## +__all__ = ['tkHTMLViewer'] # imports -import os, sys +import os, sys, re, types +import htmllib, formatter +import traceback + +import gtk, pango, gobject +from gtk import gdk + +if __name__ == '__main__': + d = os.path.abspath(os.path.join(sys.path[0], '..', '..')) + sys.path.append(d) + import gettext + gettext.install('pysol', d, unicode=True) # PySol imports +from pysollib.mfxutil import Struct, openURL +from pysollib.settings import PACKAGE # Toolkit imports -from tkwidget import MfxDialog +from tkutil import bind, unbind_destroy, loadImage +from tkwidget import MfxMessageDialog + + +REMOTE_PROTOCOLS = ('ftp:', 'gopher:', 'http:', 'mailto:', 'news:', 'telnet:') + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class tkHTMLWriter(formatter.NullWriter): + def __init__(self, text, viewer, app): + formatter.NullWriter.__init__(self) + + self.text = text # gtk.TextBuffer + self.viewer = viewer # tkHTMLViewer + + self.anchor = None + self.anchor_mark = None + + self.font = None + self.font_mark = None + self.indent = '' + + + def write(self, data): + data = unicode(data) + self.text.insert(self.text.get_end_iter(), data, len(data)) + + def anchor_bgn(self, href, name, type): + if href: + ##self.text.update_idletasks() # update display during parsing + self.anchor = (href, name, type) + self.anchor_mark = self.text.get_end_iter().get_offset() + + def anchor_end(self): + if self.anchor: + href = self.anchor[0] + tag_name = 'href_' + href + if self.viewer.anchor_tags.has_key(tag_name): + tag = self.viewer.anchor_tags[tag_name][0] + else: + tag = self.text.create_tag(tag_name, foreground='blue', + underline=pango.UNDERLINE_SINGLE) + self.viewer.anchor_tags[tag_name] = (tag, href) + tag.connect('event', self.viewer.anchor_event, href) + u = self.viewer.normurl(href, with_protocol=False) + if u in self.viewer.visited_urls: + tag.set_property('foreground', '#660099') + start = self.text.get_iter_at_offset(self.anchor_mark) + end = self.text.get_end_iter() + ##print 'apply_tag href >>', start.get_offset(), end.get_offset() + self.text.apply_tag(tag, start, end) + + self.anchor = None + + def new_font(self, font): + # end the current font + if self.font: + ##print 'end_font(%s)' % `self.font` + start = self.text.get_iter_at_offset(self.font_mark) + end = self.text.get_end_iter() + ##print 'apply_tag font >>', start.get_offset(), end.get_offset() + self.text.apply_tag_by_name(self.font, start, end) + self.font = None + # start the new font + if font: + ##print 'start_font(%s)' % `font` + self.font_mark = self.text.get_end_iter().get_offset() + if self.viewer.fontmap.has_key(font[0]): + self.font = font[0] + elif font[3]: + self.font = 'pre' + elif font[2]: + self.font = 'bold' + elif font[1]: + self.font = 'italic' + else: + self.font = None + + def new_margin(self, margin, level): + self.indent = ' ' * level + + def send_label_data(self, data): + ##self.write(self.indent + data + ' ') + self.write(self.indent) + if data == '*': #
  • + img = self.viewer.symbols_img.get('disk') + if img: + self.text.insert_pixbuf(self.text.get_end_iter(), img) + else: + self.write('*') ##unichr(0x2022) + else: + self.write(data) + self.write(' ') + + def send_paragraph(self, blankline): + self.write('\n' * blankline) + + def send_line_break(self): + self.write('\n') + + def send_hor_rule(self, *args): + ##~ width = int(int(self.text['width']) * 0.9) + width = 70 + self.write('_' * width) + self.write('\n') + + def send_literal_data(self, data): + self.write(data) + + def send_flowing_data(self, data): + self.write(data) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class tkHTMLParser(htmllib.HTMLParser): + def anchor_bgn(self, href, name, type): + self.formatter.flush_softspace() + htmllib.HTMLParser.anchor_bgn(self, href, name, type) + self.formatter.writer.anchor_bgn(href, name, type) + + def anchor_end(self): + if self.anchor: + self.anchor = None + self.formatter.writer.anchor_end() + + def do_dt(self, attrs): + self.formatter.end_paragraph(1) + self.ddpop() + + def handle_image(self, src, alt, ismap, align, width, height): + self.formatter.writer.viewer.showImage(src, alt, ismap, align, width, height) # /*********************************************************************** @@ -44,13 +198,397 @@ from tkwidget import MfxDialog # ************************************************************************/ class tkHTMLViewer: - symbols_fn = {} + symbols_fn = {} # filenames, loaded in Application.loadImages3 + symbols_img = {} - def __init__(self, parent): + def __init__(self, parent, app=None, home=None): self.parent = parent - self.parent.wm_deiconify() + self.app = app + self.home = home + self.url = None + self.history = Struct( + list = [], + index = 0, + ) + self.visited_urls = [] + self.images = {} + self.anchor_tags = {} - def display(self, url, add=1, relpath=1): - pass + # create buttons + button_width = 8 + vbox = gtk.VBox() + parent.table.attach(vbox, + 0, 1, 0, 1, + gtk.EXPAND | gtk.FILL, gtk.EXPAND | gtk.FILL | gtk.SHRINK, + 0, 0) + + buttons_box = gtk.HBox() + vbox.pack_start(buttons_box, fill=True, expand=False) + for name, label, callback in ( + ('homeButton', _('Index'), self.goHome), + ('backButton', _('Back'), self.goBack), + ('forwardButton', _('Forward'), self.goForward), + ('closeButton', _('Close'), self.destroy) ): + button = gtk.Button(label) + button.show() + button.connect('clicked', callback) + buttons_box.pack_start(button, fill=True, expand=False) + button.set_property('can-focus', False) + setattr(self, name, button) + + # create text widget + self.textview = gtk.TextView() + self.textview.show() + self.textview.set_left_margin(10) + self.textview.set_right_margin(10) + self.textview.set_cursor_visible(False) + self.textview.set_editable(False) + self.textview.set_wrap_mode(gtk.WRAP_WORD) + self.textbuffer = self.textview.get_buffer() + + sw = gtk.ScrolledWindow() + sw.set_property('hscrollbar-policy', gtk.POLICY_AUTOMATIC) + sw.set_property('vscrollbar-policy', gtk.POLICY_AUTOMATIC) + sw.set_property('border-width', 0) + sw.add(self.textview) + sw.show() + vbox.pack_start(sw, fill=True, expand=True) + self.vadjustment = sw.get_vadjustment() + self.hadjustment = sw.get_hadjustment() + + # statusbar + self.statusbar = gtk.Statusbar() + self.statusbar.show() + vbox.pack_start(self.statusbar, fill=True, expand=False) + + # load images + for name, fn in self.symbols_fn.items(): + self.symbols_img[name] = self.getImage(fn) + + # bindings + parent.connect('key-press-event', self.key_press_event) + parent.connect('destroy', self.destroy) + self.textview.connect('motion-notify-event', self.motion_notify_event) + self.textview.connect('leave-notify-event', self.leave_event) + self.textview.connect('enter-notify-event', self.motion_notify_event) + + self._changed_cursor = False + + self.createFontMap() + + # cursor + self.defcursor = gdk.XTERM + self.handcursor = gdk.HAND2 + ##self.textview.realize() + ##window = self.textview.get_window(gtk.TEXT_WINDOW_TEXT) + ##window.set_cursor(gdk.Cursor(self.defcursor)) + + parent.set_default_size(600, 440) + parent.show_all() + + + def motion_notify_event(self, widget, event): + x, y, _ = widget.window.get_pointer() + x, y = widget.window_to_buffer_coords(gtk.TEXT_WINDOW_TEXT, x, y) + tags = widget.get_iter_at_location(x, y).get_tags() + is_over_anchor = False + for tag, href in self.anchor_tags.values(): + if tag in tags: + is_over_anchor = True + break + if is_over_anchor: + if not self._changed_cursor: + ##print 'set cursor hand' + window = widget.get_window(gtk.TEXT_WINDOW_TEXT) + window.set_cursor(gdk.Cursor(self.handcursor)) + self._changed_cursor = True + self.statusbar.pop(0) + href = url = self.normurl(href) + self.statusbar.push(0, href) + else: + if self._changed_cursor: + ##print 'set cursor xterm' + window = widget.get_window(gtk.TEXT_WINDOW_TEXT) + window.set_cursor(gdk.Cursor(self.defcursor)) + self._changed_cursor = False + self.statusbar.pop(0) + return False + + def leave_event(self, widget, event): + if self._changed_cursor: + ##print 'set cursor xterm' + window = widget.get_window(gtk.TEXT_WINDOW_TEXT) + window.set_cursor(gdk.Cursor(self.defcursor)) + self._changed_cursor = False + self.statusbar.pop(0) + + def anchor_event(self, tag, textview, event, iter, href): + #print 'anchor_event:', args + if event.type == gdk.BUTTON_PRESS and event.button == 1: + self.updateHistoryXYView() + self.display(href) + return True + return False + + def key_press_event(self, w, e): + if gdk.keyval_name(e.keyval) == 'Escape': + self.destroy() + + + def createFontMap(self): + try: ## if app + default_font = self.app.getFont('sans') + fixed_font = self.app.getFont('fixed') + except: + traceback.print_exc() + default_font = ('times new roman', 12) + fixed_font = ('courier', 12) + size = default_font[1] + sign = 1 + if size < 0: sign = -1 + self.fontmap = { + 'h1' : (default_font[0], size + 12*sign, 'bold'), + 'h2' : (default_font[0], size + 8*sign, 'bold'), + 'h3' : (default_font[0], size + 6*sign, 'bold'), + 'h4' : (default_font[0], size + 4*sign, 'bold'), + 'h5' : (default_font[0], size + 2*sign, 'bold'), + 'h6' : (default_font[0], size + 1*sign, 'bold'), + 'bold' : (default_font[0], size, 'bold'), + } + + for tag_name in self.fontmap.keys(): + font = self.fontmap[tag_name] + font = font[0]+' '+str(font[1]) + tag = self.textbuffer.create_tag(tag_name, font=font) + tag.set_property('weight', pango.WEIGHT_BOLD) + + font = font[0]+' '+str(font[1]) + tag = self.textbuffer.create_tag('italic', style=pango.STYLE_ITALIC) + self.fontmap['italic'] = (font[0], size, 'italic') + font = fixed_font[0]+' '+str(fixed_font[1]) + self.textbuffer.create_tag('pre', font=font) + self.fontmap['pre'] = fixed_font + # set default font + fd = pango.FontDescription(default_font[0]+' '+str(default_font[1])) + if 'bold' in default_font: + fd.set_weight(pango.WEIGHT_BOLD) + if 'italic' in default_font: + fd.set_style(pango.STYLE_ITALIC) + self.textview.modify_font(fd) + + def destroy(self, *event): + self.parent.destroy() + self.parent = None + + def get_position(self): + pos = self.hadjustment.get_value(), self.vadjustment.get_value() + return pos + + def set_position(self, pos): + def callback(pos, hadj, vadj): + hadj.set_value(pos[0]) + vadj.set_value(pos[1]) + gobject.idle_add(callback, pos, self.hadjustment, self.vadjustment) + + # locate a file relative to the current self.url + def basejoin(self, url, baseurl=None, relpath=1): + if baseurl is None: + baseurl = self.url + if 0: + import urllib + url = urllib.pathname2url(url) + if relpath and self.url: + url = urllib.basejoin(baseurl, url) + else: + url = os.path.normpath(url) + if relpath and baseurl and not os.path.isabs(url): + h1, t1 = os.path.split(url) + h2, t2 = os.path.split(baseurl) + if h1 != h2: + url = os.path.join(h2, h1, t1) + url = os.path.normpath(url) + return url + + def normurl(self, url, with_protocol=True): + for p in REMOTE_PROTOCOLS: + if url.startswith(p): + break + else: + url = self.basejoin(url) + if with_protocol: + if os.name == 'nt': + url = url.replace('\\', '/') + url = 'file://'+url + return url + + def openfile(self, url): + if url[-1:] == '/' or os.path.isdir(url): + url = os.path.join(url, 'index.html') + url = os.path.normpath(url) + return open(url, 'rb'), url + + def display(self, url, add=1, relpath=1, position=(0,0)): + ##print 'display:', url, position + # for some reason we have to stop the PySol demo + # (is this a multithread problem with Tkinter ?) + try: + ##self.app.game.stopDemo() + ##self.app.game._cancelDrag() + pass + except: + pass + + # ftp: and http: would work if we use urllib, but this widget is + # far too limited to display anything but our documentation... + for p in REMOTE_PROTOCOLS: + if url.startswith(p): + if not openURL(url): + self.errorDialog(PACKAGE + _('''HTML limitation: +The %s protocol is not supported yet. + +Please use your standard web browser +to open the following URL: +%s +''') % (p, url)) + return + + # locate the file relative to the current url + url = self.basejoin(url, relpath=relpath) + + # read the file + try: + file = None + if 0: + import urllib + file = urllib.urlopen(url) + else: + file, url = self.openfile(url) + data = file.read() + file.close() + file = None + except Exception, ex: + if file: file.close() + self.errorDialog(_('Unable to service request:\n') + url + '\n\n' + str(ex)) + return + except: + if file: file.close() + self.errorDialog(_('Unable to service request:\n') + url) + return + + self.url = url + if self.home is None: + self.home = self.url + if add: + self.addHistory(self.url, position=position) + + ##print self.history.index, self.history.list + if self.history.index > 1: + self.backButton.set_sensitive(True) + else: + self.backButton.set_sensitive(False) + if self.history.index < len(self.history.list): + self.forwardButton.set_sensitive(True) + else: + self.forwardButton.set_sensitive(False) + + start, end = self.textbuffer.get_bounds() + self.textbuffer.delete(start, end) + + writer = tkHTMLWriter(self.textbuffer, self, self.app) + fmt = formatter.AbstractFormatter(writer) + parser = tkHTMLParser(fmt) + parser.feed(data) + parser.close() + + self.set_position(position) + + self.parent.set_title(parser.title) + + + def addHistory(self, url, position=(0,0)): + if not url in self.visited_urls: + self.visited_urls.append(url) + if self.history.index > 0: + u, pos = self.history.list[self.history.index-1] + if u == url: + self.updateHistoryXYView() + return + del self.history.list[self.history.index : ] + self.history.list.append((url, position)) + self.history.index = self.history.index + 1 + + def updateHistoryXYView(self): + if self.history.index > 0: + url, position = self.history.list[self.history.index-1] + position = self.get_position() + self.history.list[self.history.index-1] = (url, position) + + def goBack(self, *event): + if self.history.index > 1: + self.updateHistoryXYView() + self.history.index = self.history.index - 1 + url, position = self.history.list[self.history.index-1] + self.display(url, add=0, relpath=0, position=position) + + def goForward(self, *event): + if self.history.index < len(self.history.list): + self.updateHistoryXYView() + url, position = self.history.list[self.history.index] + self.history.index = self.history.index + 1 + self.display(url, add=0, relpath=0, position=position) + + def goHome(self, *event): + if self.home and self.home != self.url: + self.updateHistoryXYView() + self.display(self.home, relpath=0) + + def errorDialog(self, msg): + d = MfxMessageDialog(self.parent, title=PACKAGE+' HTML Problem', + text=msg, bitmap='warning', + strings=(_('&OK'),), default=0) + + def getImage(self, fn): + if self.images.has_key(fn): + return self.images[fn] + try: + img = gdk.pixbuf_new_from_file(fn) + except: + img = None + self.images[fn] = img + return img + + def showImage(self, src, alt, ismap, align, width, height): + url = self.basejoin(src) + img = self.getImage(url) + if img: + iter = self.textbuffer.get_end_iter() + self.textbuffer.insert_pixbuf(iter, img) + + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +def tkhtml_main(args): + try: + url = args[1] + except: + url = os.path.join(os.pardir, os.pardir, 'data', 'html', 'index.html') + top = gtk.Window() + table = gtk.Table() + table.show() + top.add(table) + top.table = table + viewer = tkHTMLViewer(top) + viewer.app = None + viewer.display(url) + top.connect('destroy', lambda w: gtk.main_quit()) + gtk.main() + return 0 + +if __name__ == '__main__': + sys.exit(tkhtml_main(sys.argv)) diff --git a/pysollib/pysolgtk/tkwidget.py b/pysollib/pysolgtk/tkwidget.py index 3fb56765..34a7f8b8 100644 --- a/pysollib/pysolgtk/tkwidget.py +++ b/pysollib/pysolgtk/tkwidget.py @@ -60,6 +60,7 @@ class _MyDialog(gtk.Dialog): self.__dict__[name] = value def quit(self, *args): + self.status = 0 self.hide() self.destroy() gtk.main_quit() @@ -88,7 +89,6 @@ class MfxDialog(_MyDialog): if modal: setTransient(self, parent) - # settings if width > 0 or height > 0: self.set_size_request(width, height) @@ -96,14 +96,22 @@ class MfxDialog(_MyDialog): self.set_title(title) # self.connect('key-press-event', self._keyPressEvent) - self.show() - def createBox(self): - hbox = gtk.HBox(spacing=5) - hbox.set_border_width(5) - self.vbox.pack_start(hbox) - hbox.show() - return hbox, self.action_area + + def createBox(self, widget_class=gtk.HBox): + box = widget_class(spacing=5) + box.set_border_width(5) + self.vbox.pack_start(box) + box.show() + return box, self.action_area + + createHBox = createBox + + def createVBox(self): + return self.createBox(widget_class=gtk.VBox) + + def createTable(self): + return self.createBox(widget_class=gtk.Table) def createBitmaps(self, box, kw): if kw['bitmap']: @@ -133,10 +141,10 @@ class MfxDialog(_MyDialog): continue text = text.replace('&', '_') b = gtk.Button(text) - b.set_flags(gtk.CAN_DEFAULT) + b.set_property('can-default', True) if i == default: b.grab_focus() - ##~ b.grab_default() + #b.grab_default() b.set_data("user_data", i) b.connect("clicked", self.done) box.pack_start(b) @@ -181,17 +189,22 @@ class MfxMessageDialog(MfxDialog): label = gtk.Label(kw['text']) label.set_justify(gtk.JUSTIFY_CENTER) - label.xpad, label.ypad = kw['padx'], kw['pady'] + label.set_property('xpad', kw['padx']) + label.set_property('ypad', kw['pady']) top_box.pack_start(label) self.createButtons(bottom_box, kw) label.show() + self.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + ##self.set_position(gtk.WIN_POS_CENTER) + + self.show_all() gtk.main() def initKw(self, kw): - if kw.has_key('bitmap'): - kwdefault(kw, width=250, height=150) + #if kw.has_key('bitmap'): + # kwdefault(kw, width=250, height=150) return MfxDialog.initKw(self, kw) @@ -260,13 +273,13 @@ class MfxSimpleEntry(_MyDialog): self.entry.grab_focus() button = gtk.Button("OK") button.connect("clicked", self.done) - button.set_flags(CAN_DEFAULT) + button.set_flags(gtk.CAN_DEFAULT) self.action_area.pack_start(button) button.show() button.grab_default() button = gtk.Button("Cancel") button.connect("clicked", self.quit) - button.set_flags(CAN_DEFAULT) + button.set_flags(gtk.CAN_DEFAULT) self.action_area.pack_start(button) button.show() diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index d0c64400..abf38f50 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -110,7 +110,7 @@ class _MfxToplevel(gtk.Window): def __init__(self, *args, **kw): gtk.Window.__init__(self, type=gtk.WINDOW_TOPLEVEL) ##~ self.style = self.get_style().copy() - self.set_style(self.style) + ##~ self.set_style(self.style) #self.vbox = gtk.VBox() #self.vbox.show() #self.add(self.vbox) @@ -145,7 +145,7 @@ class _MfxToplevel(gtk.Window): print "Toplevel configure:", k, v raise AttributeError, k if height > 0 and width > 0: - print 'configure: size:', width, height + ##print 'configure: size:', width, height ## FIXME #self.set_default_size(width, height) #self.set_size_request(width, height) @@ -202,12 +202,15 @@ class _MfxToplevel(gtk.Window): def wm_geometry(self, newGeometry=None): ##print 'wm_geometry', newGeometry - if newGeometry == '': - self.reshow_with_initial_size() + print 'allow_shrink:', self.allow_shrink + if not newGeometry: + pass + ##self.reshow_with_initial_size() ##self.resize(1, 1) else: - w, h = newGeometry - self.resize(w, h) + pass + ##w, h = newGeometry + ##self.resize(w, h) @@ -227,7 +230,8 @@ class _MfxToplevel(gtk.Window): ##~ self.set_icon_name(name) def wm_minsize(self, width, height): - self.set_geometry_hints(min_width=width, min_height=height) + pass + ##~ self.set_geometry_hints(min_width=width, min_height=height) def wm_protocol(self, name=None, func=None): if name == 'WM_DELETE_WINDOW': diff --git a/pysollib/pysolgtk/toolbar.py b/pysollib/pysolgtk/toolbar.py index 92053988..046a39f3 100644 --- a/pysollib/pysolgtk/toolbar.py +++ b/pysollib/pysolgtk/toolbar.py @@ -57,31 +57,31 @@ class PysolToolbar(PysolToolbarActions): self.toolbar = gtk.Toolbar(gtk.ORIENTATION_HORIZONTAL, gtk.TOOLBAR_ICONS) - #self.bg = top.get_style().bg[gtk.STATE_NORMAL] ui_info = ''' - - - + + + - - + + - - - + + + + - - + + - + ''' ui_manager = self.top.ui_manager # created in menubar.py ui_manager_id = ui_manager.add_ui_from_string(ui_info) - toolbar = ui_manager.get_widget("/ToolBar") + toolbar = ui_manager.get_widget("/toolbar") toolbar.set_tooltips(True) toolbar.set_style(gtk.TOOLBAR_ICONS) toolbar.show() @@ -93,36 +93,6 @@ class PysolToolbar(PysolToolbarActions): toolbar.show() - - # no longer needed - self.bg = None - # - - - - # util - def _createButton(self, name, command, padx=0, stock=None, tooltip=None): - ##button = self.toolbar.append_item(name, tooltip, "", stock, command) - ##button = self.toolbar.insert_stock(stock, tooltip, '', command, None, -1) - image = gtk.Image() - image.set_from_stock(stock, gtk.ICON_SIZE_SMALL_TOOLBAR) - - button = gtk.ToolButton(None, name) - button.set_tooltip(tooltip) - #button.set_relief(gtk.RELIEF_NONE) - #button.connect('activate', command) - self.toolbar.insert(button, -1) - setattr(self, name + "_button", button) - - - def _createLabel(self, name, padx=0, side='IGNORE', tooltip=None): - ## FIXME: append_widget - pass - - def _createSeparator(self): - self.toolbar.append_space() - - # # wrappers # diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 62ed3d0d..56b26082 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -300,7 +300,7 @@ class PysolMenubar(PysolMenubarActions): menu.add_command(label=n_("&Clear bookmarks"), command=self.mClearBookmarks) menu.add_separator() - menu.add_command(label=n_("Restart &game"), command=self.mRestart, accelerator=m+"G") + menu.add_command(label=n_("Restart"), command=self.mRestart, accelerator=m+"G") menu = MfxMenu(self.__menubar, label=n_("&Game")) menu.add_command(label=n_("&Deal cards"), command=self.mDeal, accelerator="D") diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 5bba1d91..5761cda0 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -232,9 +232,10 @@ class tkHTMLViewer: symbols_fn = {} # filenames, loaded in Application.loadImages3 symbols_img = {} - def __init__(self, parent): + def __init__(self, parent, app=None, home=None): self.parent = parent - self.home = None + self.app = app + self.home = home self.url = None self.history = Struct( list = [], @@ -371,11 +372,10 @@ class tkHTMLViewer: def display(self, url, add=1, relpath=1, xview=0, yview=0): # for some reason we have to stop the PySol demo # (is this a multithread problem with Tkinter ?) - if self.__dict__.get("app"): - if self.app and self.app.game: - self.app.game.stopDemo() - ##self.app.game._cancelDrag() - ##pass + if self.app and self.app.game: + self.app.game.stopDemo() + ##self.app.game._cancelDrag() + ##pass # ftp: and http: would work if we use urllib, but this widget is # far too limited to display anything but our documentation... From 7478cfa2c75838f01588a4f388b29d070c78e539 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 18 Aug 2006 00:00:29 +0000 Subject: [PATCH 049/266] * improved support GTK (alpha) git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@50 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/ru_games.po | 4 +- pysollib/game.py | 8 +- pysollib/pysolgtk/menubar.py | 216 ++++++-- pysollib/pysolgtk/playeroptionsdialog.py | 1 - pysollib/pysolgtk/progressbar.py | 23 +- pysollib/pysolgtk/selectgame.py | 605 +++++++++++++++++++++++ pysollib/pysolgtk/selecttile.py | 1 - pysollib/pysolgtk/statusbar.py | 23 +- pysollib/pysolgtk/tkcanvas.py | 85 ++-- pysollib/pysolgtk/tkutil.py | 27 +- pysollib/pysolgtk/tkwidget.py | 10 +- pysollib/pysolgtk/tkwrap.py | 1 - pysollib/pysolgtk/toolbar.py | 2 +- pysollib/tk/menubar.py | 6 +- 14 files changed, 894 insertions(+), 118 deletions(-) create mode 100644 pysollib/pysolgtk/selectgame.py diff --git a/po/ru_games.po b/po/ru_games.po index 5fd798ed..6832b0a2 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" "POT-Creation-Date: Fri Aug 11 02:15:03 2006\n" -"PO-Revision-Date: 2006-08-09 23:52+0400\n" +"PO-Revision-Date: 2006-08-17 20:14+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -2729,7 +2729,7 @@ msgid "Pyramid 2" msgstr "Пирамида 2" msgid "Pyramid Golf" -msgstr "Пирамидальный Голф" +msgstr "Пирамидальный Гольф" msgid "Q.C." msgstr "" diff --git a/pysollib/game.py b/pysollib/game.py index fc8e7eac..e35e8839 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -46,8 +46,7 @@ from mfxutil import format_time from util import get_version_tuple, Timer from util import ACE, QUEEN, KING from version import VERSION, VERSION_TUPLE -from settings import PACKAGE -from settings import TOP_TITLE +from settings import PACKAGE, TOOLKIT, TOP_TITLE from gamedb import GI from resource import CSI from pysolrandom import PysolRandom, LCRandom31 @@ -518,10 +517,15 @@ class Game: self.busy = old_busy def resetGame(self): + ##print '--- resetGame ---' self.hints.list = None self.s.talon.removeAllCards() for stack in self.allstacks: + ##print stack stack.resetGame() + if TOOLKIT == 'gtk': + # FIXME (pyramid like games) + stack.group.tkraise() if self.preview <= 1: for t in (self.texts.score, self.texts.base_rank,): if t: diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 905784b0..9a048d35 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -39,6 +39,7 @@ from gtk import gdk # PySol imports from pysollib.gamedb import GI from pysollib.actions import PysolMenubarActions +from pysollib.settings import PACKAGE # toolkit imports from tkutil import setTransient @@ -47,6 +48,14 @@ from selectcardset import SelectCardsetDialogWithPreview from selectcardset import SelectCardsetByTypeDialogWithPreview from selecttile import SelectTileDialogWithPreview +from selectgame import SelectGameDialogWithPreview + +gettext = _ + + +def ltk2gtk(s): + return gettext(s).replace('&', '_') + # /*********************************************************************** # // - create menubar @@ -78,71 +87,74 @@ class PysolMenubar(PysolMenubarActions): def createMenubar(self): entries = ( - ('new', gtk.STOCK_NEW, '_New', 'N', 'New game', self.mNewGame), - ('open', gtk.STOCK_OPEN, '_Open', 'O', 'Open a\nsaved game', self.mOpen), - ('restart', gtk.STOCK_REFRESH, '_Restart', 'G', 'Restart the\ncurrent game', self.mRestart), - ('save', gtk.STOCK_SAVE, '_Save', 'S', 'Save game', self.mSave), - ('undo', gtk.STOCK_UNDO, 'Undo', 'Z', 'Undo', self.mUndo), - ('redo', gtk.STOCK_REDO, 'Redo', 'R', 'Redo', self.mRedo), - ('autodrop',gtk.STOCK_JUMP_TO, '_Auto drop', 'A', 'Auto drop', self.mDrop), - ('stats', gtk.STOCK_HOME, 'Stats', None, 'Statistics', self.mStatus), - ('rules', gtk.STOCK_HELP, 'Rules', 'F1', 'Rules', self.mHelpRules), - ('quit', gtk.STOCK_QUIT, 'Quit', 'Q', 'Quit PySol', self.mQuit), + ('newgame', gtk.STOCK_NEW, ltk2gtk('&New game'), 'N', ltk2gtk('New game'), self.mNewGame), + ('open', gtk.STOCK_OPEN, ltk2gtk('&Open...'), 'O', ltk2gtk('Open a\nsaved game'), self.mOpen), + ('restart', gtk.STOCK_REFRESH, ltk2gtk('&Restart'), 'G', ltk2gtk('Restart the\ncurrent game'), self.mRestart), + ('save', gtk.STOCK_SAVE, ltk2gtk('&Save'), 'S', ltk2gtk('Save game'), self.mSave), + ('undo', gtk.STOCK_UNDO, ltk2gtk('&Undo'), 'Z', ltk2gtk('Undo'), self.mUndo), + ('redo', gtk.STOCK_REDO, ltk2gtk('&Redo'), 'R', ltk2gtk('Redo'), self.mRedo), + ('autodrop',gtk.STOCK_JUMP_TO, ltk2gtk('&Auto drop'), 'A', ltk2gtk('Auto drop'), self.mDrop), + ('stats', gtk.STOCK_HOME, ltk2gtk('Stats'), None, ltk2gtk('Statistics'), self.mStatus), + ('rules', gtk.STOCK_HELP, ltk2gtk('Rules'), 'F1', ltk2gtk('Rules'), self.mHelpRules), + ('quit', gtk.STOCK_QUIT, ltk2gtk('&Quit'), 'Q', ltk2gtk('Quit PySol'), self.mQuit), - ('file', None, '_File' ), - ('selectgame', None, 'Select _game'), - ('edit', None, '_Edit'), - ('game', None, '_Game'), - ('assist', None, '_Assist'), - ('options', None, '_Options'), - ("automaticplay", None, "_Automatic play"), + ('file', None, ltk2gtk('&File')), + ('selectgame', None, ltk2gtk('Select &game')), + ('edit', None, ltk2gtk('&Edit')), + ('game', None, ltk2gtk('&Game')), + ('assist', None, ltk2gtk('&Assist')), + ('options', None, ltk2gtk('&Options')), + ("automaticplay", None, ltk2gtk("&Automatic play")), - ('animations', None, '_Animations'), - ('help', None, '_Help'), + ('animations', None, ltk2gtk('A&nimations')), + ('help', None, ltk2gtk('&Help')), - ('selectgamebynumber', None, 'Select game by number...', None, None, self.mSelectGameById), - ('saveas', None, 'Save _as...', None, None, self.m), - ('redoall', None, 'Redo _all', None, None, self.mRedoAll), - ('dealcards', None, '_Deal cards', 'D', None, self.mDeal), - ('status', None, 'S_tatus...', 'T', None, self.mStatus), - ('hint', None, '_Hint', 'H', None, self.mHint), - ('highlightpiles', None, 'Highlight _piles', None, None, self.mHighlightPiles), - ('demo', None,'_Demo', 'D',None,self.mDemo), - ('demoallgames', None,'Demo (all games)', None,None,self.mMixedDemo), - ('playeroptions',None,'_Player options...',None,None,self.mOptPlayerOptions), - ('tabletile', None,'Table t_ile...', None,None,self.mOptTableTile), - ('contents', None,'_Contents','F1',None,self.mHelp), - ('aboutpysol', None,'_About PySol...', None,None,self.mHelpAbout), + ('playablepreview', None, ltk2gtk('Playable pre&view...'), 'V', None, self.mSelectGameDialogWithPreview), + ('selectgamebynumber', None, ltk2gtk('Select game by nu&mber...'), None, None, self.mSelectGameById), + ('saveas', None, ltk2gtk('Save &as...'), None, None, self.m), + ('redoall', None, ltk2gtk('Redo &all'), None, None, self.mRedoAll), + ('dealcards', None, ltk2gtk('&Deal cards'), 'D', None, self.mDeal), + ('status', None, ltk2gtk('S&tatus...'), 'T', None, self.mStatus), + ('hint', None, ltk2gtk('&Hint'), 'H', None, self.mHint), + ('highlightpiles', None, ltk2gtk('Highlight p&iles'), None, None, self.mHighlightPiles), + ('demo', None,ltk2gtk('&Demo'), 'D',None,self.mDemo), + ('demoallgames', None,ltk2gtk('Demo (&all games)'), None,None,self.mMixedDemo), + ('playeroptions',None,ltk2gtk('&Player options...'),None,None,self.mOptPlayerOptions), + ('tabletile', None,ltk2gtk('Table t&ile...'), None,None,self.mOptTableTile), + ('contents', None,ltk2gtk('&Contents'),'F1',None,self.mHelp), + ('aboutpysol', None,ltk2gtk('&About ')+PACKAGE+'...', None,None,self.mHelpAbout), ) # toggle_entries = ( - ('pause', gtk.STOCK_STOP, '_Pause', 'P', 'Pause game', self.mPause), - ('optautodrop', None, 'A_uto drop', None, None, self.mOptAutoDrop), - ('autofaceup', None, 'Auto _face up', None, None, self.mOptAutoFaceUp), - ("autodeal", None, "Auto _deal", None, None, self.mOptAutoDeal), - ("quickplay", None, '_Quick play', None, None, self.mOptQuickPlay), + ('pause', gtk.STOCK_STOP, ltk2gtk('&Pause'), 'P', ltk2gtk('Pause game'), self.mPause), + ('optautodrop', None, ltk2gtk('A&uto drop'), None, None, self.mOptAutoDrop), + ('autofaceup', None, ltk2gtk('Auto &face up'), None, None, self.mOptAutoFaceUp), + ("autodeal", None, ltk2gtk("Auto &deal"), None, None, self.mOptAutoDeal), + ("quickplay", None, ltk2gtk('&Quick play'), None, None, self.mOptQuickPlay), - ('highlightmatchingcards', None, 'Highlight _matching cards', None, None, self.mOptEnableHighlightCards), - ('cardshadow', None, 'Card shadow', None, None, self.mOptShadow), - ('shadelegalmoves', None, 'Shade legal moves', None, None, self.mOptShade), + ('highlightmatchingcards', None, ltk2gtk('Highlight &matching cards'), None, None, self.mOptEnableHighlightCards), + ('cardshadow', None, ltk2gtk('Card shado&w'), None, None, self.mOptShadow), + ('shadelegalmoves', None, ltk2gtk('Shade &legal moves'), None, None, self.mOptShade), ) # animations_entries = ( - ('animationnone', None, '_None', None, None, 0), - ('animationfast', None, '_Fast', None, None, 1), - ('animationtimer', None, '_Timer based', None, None, 2), - ('animationslow', None, '_Slow', None, None, 3), - ('animationveryslow', None, '_Very slow', None, None, 4), + ('animationnone', None, ltk2gtk('&None'), None, None, 0), + ('animationfast', None, ltk2gtk('&Fast'), None, None, 1), + ('animationtimer', None, ltk2gtk('&Timer based'), None, None, 2), + ('animationslow', None, ltk2gtk('&Slow'), None, None, 3), + ('animationveryslow', None, ltk2gtk('&Very slow'), None, None, 4), ) # ui_info = ''' + + @@ -179,7 +191,7 @@ class PysolMenubar(PysolMenubarActions): - + @@ -245,6 +257,7 @@ class PysolMenubar(PysolMenubarActions): def _addSelectGameSubMenu(self, games, menu, command, group): for g in games: label = g.name + label = gettext(label) menu_item = gtk.RadioMenuItem(group, label) group = menu_item menu.add(menu_item) @@ -262,7 +275,9 @@ class PysolMenubar(PysolMenubarActions): if not games[n:n+d]: break m = min(n+d-1, len(games)-1) - label = games[n].name[:3]+' - '+games[m].name[:3] + n1, n2 = games[n].name, games[m].name + n1, n2 = gettext(n1), gettext(n2) + label = n1[:3]+' - '+n2[:3] submenu = self._createSubMenu(menu, label=label) group = self._addSelectGameSubMenu(games[n:n+d], submenu, command, group) @@ -276,7 +291,10 @@ class PysolMenubar(PysolMenubarActions): ## WARNING: setMenuState: not found: /menubar/file/holdandquit ## WARNING: setMenuState: not found: /menubar/assist/findcard def setMenuState(self, state, path): - path_map = {'help.rulesforthisgame': '/menubar/help/rules',} + path_map = { + 'help.rulesforthisgame': '/menubar/help/rules', + 'options.automaticplay.autodrop': '/menubar/options/automaticplay/optautodrop' + } if path_map.has_key(path): path = path_map[path] else: @@ -302,11 +320,80 @@ class PysolMenubar(PysolMenubarActions): # menu actions # + def _createFileChooser(self, title, action, idir, ifile): + d = gtk.FileChooserDialog(title, self.top, action, + (gtk.STOCK_OPEN, gtk.RESPONSE_ACCEPT, + gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) + + d.set_current_folder(idir) + if ifile: + d.set_current_name(ifile) + + filter = gtk.FileFilter() + filter.set_name('PySol files') + filter.add_pattern('*.pso') + d.add_filter(filter) + + filter = gtk.FileFilter() + filter.set_name('All files') + filter.add_pattern('*') + d.add_filter(filter) + + resp = d.run() + if resp == gtk.RESPONSE_ACCEPT: + filename = d.get_filename() + else: + filename = None + d.destroy() + return filename + + def mOpen(self, *args): - pass + if self._cancelDrag(break_pause=False): return + filename = self.game.filename + if filename: + idir, ifile = os.path.split(os.path.normpath(filename)) + else: + idir, ifile = "", "" + if not idir: + idir = self.app.dn.savegames + filename = self._createFileChooser(_('Open Game'), + gtk.FILE_CHOOSER_ACTION_OPEN, + idir, '') + if filename: + ##filename = os.path.normpath(filename) + ##filename = os.path.normcase(filename) + if os.path.isfile(filename): + self.game.loadGame(filename) + def mSaveAs(self, *event): - pass + if self._cancelDrag(break_pause=False): return + if not self.menustate.save_as: + return + filename = self.game.filename + if not filename: + filename = self.app.getGameSaveName(self.game.id) + if os.name == "posix": + filename = filename + "-" + self.game.getGameNumber(format=0) + elif os.path.supports_unicode_filenames: # new in python 2.3 + filename = filename + "-" + self.game.getGameNumber(format=0) + else: + filename = filename + "-01" + filename = filename + '.pso' + idir, ifile = os.path.split(os.path.normpath(filename)) + if not idir: + idir = self.app.dn.savegames + ##print self.game.filename, ifile + filename = self._createFileChooser(_('Save Game'), + gtk.FILE_CHOOSER_ACTION_SAVE, + idir, ifile) + if filename: + ##filename = os.path.normpath(filename) + ##filename = os.path.normcase(filename) + self.game.saveGame(filename) + self.updateMenus() + def mOptCardset(self, *args): pass @@ -353,3 +440,32 @@ class PysolMenubar(PysolMenubarActions): tile.color = color self.app.setTile(0) + + def mSelectGameDialogWithPreview(self, *event): + if self._cancelDrag(break_pause=False): return +## self.game.setCursor(cursor=CURSOR_WATCH) + bookmark = None +## if 0: +## # use a bookmark for our preview game +## if self.game.setBookmark(-2, confirm=0): +## bookmark = self.game.gsaveinfo.bookmarks[-2][0] +## del self.game.gsaveinfo.bookmarks[-2] + ##~ after_idle(self.top, self.__restoreCursor) + d = SelectGameDialogWithPreview(self.top, title=_("Select game"), + app=self.app, gameid=self.game.id, + bookmark=bookmark) + return self._mSelectGameDialog(d) + + def _mSelectGameDialog(self, d): + if d.status == 0 and d.button == 0 and d.gameid != self.game.id: + ##~ self.tkopt.gameid.set(d.gameid) + ##~ self.tkopt.gameid_popular.set(d.gameid) + if 0: + self._mSelectGame(d.gameid, random=d.random) + else: + # don't ask areYouSure() + self._cancelDrag() + self.game.endGame() + self.game.quitGame(d.gameid, random=d.random) + + diff --git a/pysollib/pysolgtk/playeroptionsdialog.py b/pysollib/pysolgtk/playeroptionsdialog.py index 352ad045..7f556c9e 100644 --- a/pysollib/pysolgtk/playeroptionsdialog.py +++ b/pysollib/pysolgtk/playeroptionsdialog.py @@ -93,7 +93,6 @@ class PlayerOptionsDialog(MfxDialog): strings=(_('&OK'), _('&Cancel'),), default=0, #resizable=1, - #font=None, padx=10, pady=10, #width=600, height=400, ##~ buttonpadx=10, buttonpady=5, diff --git a/pysollib/pysolgtk/progressbar.py b/pysollib/pysolgtk/progressbar.py index 93c41362..6238455b 100644 --- a/pysollib/pysolgtk/progressbar.py +++ b/pysollib/pysolgtk/progressbar.py @@ -35,7 +35,6 @@ import os, sys import gtk from gtk import gdk -TRUE, FALSE = True, False # Toolkit imports from tkutil import makeToplevel, setTransient @@ -55,8 +54,7 @@ class PysolProgressBar: self.norm = norm self.top = makeToplevel(parent, title=title) self.top.set_position(gtk.WIN_POS_CENTER) - ##self.top.set_policy(FALSE, FALSE, FALSE) - self.top.set_resizable(FALSE) + self.top.set_resizable(False) self.top.connect("delete_event", self.wmDeleteWindow) # hbox @@ -67,21 +65,22 @@ class PysolProgressBar: 0, 1, 0, 1, 0, 0, 0, 0) - # hbox-1: image if images and images[0]: im = gtk.Image() im.set_from_pixbuf(images[0].pixbuf) hbox.pack_start(im, expand=False, fill=False) im.show() + im.set_property('xpad', 10) + im.set_property('ypad', 5) # hbox-2:vbox vbox = gtk.VBox() vbox.show() - hbox.pack_start(vbox, FALSE, FALSE) + hbox.pack_start(vbox, False, False) # hbox-2:vbox:pbar self.pbar = gtk.ProgressBar() self.pbar.show() - vbox.pack_start(self.pbar, TRUE, FALSE) + vbox.pack_start(self.pbar, True, False) self.pbar.realize() ##~ self.pbar.set_show_text(show_text) self.pbar.set_text(str(show_text)+'%') @@ -99,6 +98,8 @@ class PysolProgressBar: im.set_from_pixbuf(images[1].pixbuf) hbox.pack_end(im, expand=False) im.show() + im.set_property('xpad', 10) + im.set_property('ypad', 5) # set icon if app: try: @@ -130,15 +131,17 @@ class PysolProgressBar: percent = min(100, max(0, percent)) self.pbar.set_fraction(percent / 100.0) self.pbar.set_text(str(percent)+'%') - ##~ self.pbar.update(self.percent / 100.0) self.update_idletasks() + def reset(self, percent=0): + self.percent = percent + def update_idletasks(self): while gtk.events_pending(): gtk.main_iteration() def wmDeleteWindow(self, *args): - return TRUE + return True # /*********************************************************************** @@ -160,9 +163,9 @@ class TestProgressBar: if self.progress.percent >= 100: self.progress.destroy() mainquit() - return FALSE + return False self.progress.update(step=1) - return TRUE + return True def progressbar_main(args): root = gtk.Window() diff --git a/pysollib/pysolgtk/selectgame.py b/pysollib/pysolgtk/selectgame.py new file mode 100644 index 00000000..0c54618f --- /dev/null +++ b/pysollib/pysolgtk/selectgame.py @@ -0,0 +1,605 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import os, re, sys, types +import gtk, gobject + +#from UserList import UserList + +# PySol imports +from pysollib.mfxutil import destruct, Struct, KwStruct +from pysollib.mfxutil import kwdefault +from pysollib.mfxutil import format_time +from pysollib.gamedb import GI +from pysollib.help import helpHTML +from pysollib.resource import CSI + +# Toolkit imports +from tkutil import unbind_destroy +from tkwidget import MfxDialog +from tkcanvas import MfxCanvas, MfxCanvasText + +gettext = _ + + +# /*********************************************************************** +# // Dialog +# ************************************************************************/ + +class SelectGameDialogWithPreview(MfxDialog): + #Tree_Class = SelectGameTreeWithPreview + game_store = None + # + _paned_position = 300 + _expanded_rows = [] + _geometry = None + _selected_row = None + _vadjustment_position = None + + def __init__(self, parent, title, app, gameid, bookmark=None, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, **kw) + # + self.app = app + self.gameid = gameid + self.bookmark = bookmark + self.random = None + # + if self.game_store is None: + self.createGameStore() + # + top_box, bottom_box = self.createHBox() + # paned + hpaned = gtk.HPaned() + self.hpaned = hpaned + hpaned.show() + top_box.pack_start(hpaned, expand=True, fill=True) + # left + sw = gtk.ScrolledWindow() + sw.show() + self.sw_vadjustment = sw.get_vadjustment() + hpaned.pack1(sw, True, True) + sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + # tree + treeview = gtk.TreeView(self.game_store) + self.treeview = treeview + treeview.show() + sw.add(treeview) + treeview.set_rules_hint(True) + treeview.set_headers_visible(False) + renderer = gtk.CellRendererText() + renderer.set_property('xalign', 0.0) + column = gtk.TreeViewColumn('Games', renderer, text=0) + column.set_clickable(True) + treeview.append_column(column) + selection = treeview.get_selection() + selection.connect('changed', self.showSelected) + # right + table = gtk.Table(2, 2, False) + table.show() + hpaned.pack2(table, True, True) + # frames + frame = gtk.Frame(label=_('About game')) + frame.show() + table.attach(frame, + 0, 1, 0, 1, + gtk.FILL, gtk.FILL, + 0, 0) + frame.set_border_width(4) + info_frame = gtk.Table(2, 7, False) + info_frame.show() + frame.add(info_frame) + info_frame.set_border_width(4) + # + frame = gtk.Frame(label=_('Statistics')) + frame.show() + table.attach(frame, + 1, 2, 0, 1, + gtk.FILL, gtk.FILL, + 0, 0) + frame.set_border_width(4) + stats_frame = gtk.Table(2, 6, False) + stats_frame.show() + frame.add(stats_frame) + stats_frame.set_border_width(4) + # info + self.info_labels = {} + i = 0 + for n, t, f, row in ( + ('name', _('Name:'), info_frame, 0), + ('altnames', _('Alternate names:'), info_frame, 1), + ('category', _('Category:'), info_frame, 2), + ('type', _('Type:'), info_frame, 3), + ('skill_level', _('Skill level:'), info_frame, 4), + ('decks', _('Decks:'), info_frame, 5), + ('redeals', _('Redeals:'), info_frame, 6), + # + ('played', _('Played:'), stats_frame, 0), + ('won', _('Won:'), stats_frame, 1), + ('lost', _('Lost:'), stats_frame, 2), + ('time', _('Playing time:'), stats_frame, 3), + ('moves', _('Moves:'), stats_frame, 4), + ('percent', _('% won:'), stats_frame, 5), + ): + title_label = gtk.Label() + title_label.show() + title_label.set_text(t) + title_label.set_alignment(0., 0.) + title_label.set_property('xpad', 2) + title_label.set_property('ypad', 2) + f.attach(title_label, + 0, 1, row, row+1, + gtk.FILL, 0, + 0, 0) + text_label = gtk.Label() + text_label.show() + text_label.set_alignment(0., 0.) + text_label.set_property('xpad', 2) + text_label.set_property('ypad', 2) + f.attach(text_label, + 1, 2, row, row+1, + gtk.FILL, 0, + 0, 0) + self.info_labels[n] = (title_label, text_label) + # canvas + self.preview = MfxCanvas(self) + self.preview.show() + table.attach(self.preview, + 0, 2, 1, 2, + gtk.EXPAND|gtk.FILL|gtk.SHRINK, gtk.EXPAND|gtk.FILL|gtk.SHRINK, + 0, 0) + self.preview.set_border_width(4) + self.preview.setTile(app, app.tabletile_index, force=True) + + # set the scale factor + self.preview.preview = 2 + # create a preview of the current game + self.preview_key = -1 + self.preview_game = None + self.preview_app = None + ##~ self.updatePreview(gameid, animations=0) + ##~ SelectGameTreeWithPreview.html_viewer = None + + self.connect('unrealize', self._unrealizeEvent) + + self.createButtons(bottom_box, kw) + self._restoreSettings() + self.show_all() + gtk.main() + + + def _addGamesFromData(self, data, store, root_iter, root_label, all_games): + gl = [] + for label, selecter in data: + games = self._selectGames(all_games, selecter) + if games: + gl.append((label, games)) + if not gl: + return + iter = store.append(root_iter) + store.set(iter, 0, root_label, 1, -1) + for label, games in gl: + label = gettext(label) + label = label.replace("&", "") + self._addGames(store, iter, label, games) + + + def _addGames(self, store, root_iter, root_label, games): + if not games: + return + iter = store.append(root_iter) + store.set(iter, 0, root_label, 1, -1) + for id, name in games: + child_iter = store.append(iter) + name = gettext(name) + store.set(child_iter, 0, name, 1, id) + + #def _addNode(self, store, root_iter, root_label, games): + + + def _selectGames(self, all_games, selecter): + # return list of tuples (gameid, gamename) + if selecter is None: + return [(gi.id, gi.name) for gi in all_games] + elif selecter == 'alt': + return all_games + return [(gi.id, gi.name) for gi in all_games if selecter(gi)] + + + def createGameStore(self): + store = gtk.TreeStore(gobject.TYPE_STRING, gobject.TYPE_INT) + app = self.app + gdb = app.gdb + + all_games = map(gdb.get, gdb.getGamesIdSortedByName()) + # + alter_games = gdb.getGamesTuplesSortedByAlternateName() + for label, games, selecter in ( + (_('All Games'), all_games, None), + (_('Alternate Names'), alter_games, 'alt'), + (_('Popular Games'), all_games, lambda gi: gi.si.game_flags & GI.GT_POPULAR), + ): + games = self._selectGames(games, selecter) + self._addGames(store, None, label, games) + + # by type + games = self._selectGames(all_games, + lambda gi: gi.si.game_type == GI.GT_MAHJONGG) + self._addGames(store, None, _("Mahjongg Games"), games) + self._addGamesFromData(GI.SELECT_ORIENTAL_GAME_BY_TYPE, store, + None, _("Oriental Games"), all_games) + self._addGamesFromData(GI.SELECT_SPECIAL_GAME_BY_TYPE, store, + None, _("Special Games"), all_games) + self._addGamesFromData(GI.SELECT_GAME_BY_TYPE, store, + None, _("French games"), all_games) + # by skill level + data = ( + (_('Luck only'), lambda gi: gi.skill_level == GI.SL_LUCK), + (_('Mostly luck'), lambda gi: gi.skill_level == GI.SL_MOSTLY_LUCK), + (_('Balanced'), lambda gi: gi.skill_level == GI.SL_BALANCED), + (_('Mostly skill'), lambda gi: gi.skill_level == GI.SL_MOSTLY_SKILL), + (_('Skill only'), lambda gi: gi.skill_level == GI.SL_SKILL), + ) + self._addGamesFromData(data, store, None, + _("by Skill Level"), all_games) + + # by game feature + root_iter = store.append(None) + store.set(root_iter, 0, _('by Game Feature'), 1, -1) + data = ( + (_("32 cards"), lambda gi: gi.si.ncards == 32), + (_("48 cards"), lambda gi: gi.si.ncards == 48), + (_("52 cards"), lambda gi: gi.si.ncards == 52), + (_("64 cards"), lambda gi: gi.si.ncards == 64), + (_("78 cards"), lambda gi: gi.si.ncards == 78), + (_("104 cards"), lambda gi: gi.si.ncards == 104), + (_("144 cards"), lambda gi: gi.si.ncards == 144), + (_("Other number"), lambda gi: gi.si.ncards not in (32, 48, 52, 64, 78, 104, 144)),) + self._addGamesFromData(data, store, root_iter, + _("by Number of Cards"), all_games) + data = ( + (_("1 deck games"), lambda gi: gi.si.decks == 1), + (_("2 deck games"), lambda gi: gi.si.decks == 2), + (_("3 deck games"), lambda gi: gi.si.decks == 3), + (_("4 deck games"), lambda gi: gi.si.decks == 4),) + self._addGamesFromData(data, store, root_iter, + _("by Number of Decks"), all_games) + data = ( + (_("No redeal"), lambda gi: gi.si.redeals == 0), + (_("1 redeal"), lambda gi: gi.si.redeals == 1), + (_("2 redeals"), lambda gi: gi.si.redeals == 2), + (_("3 redeals"), lambda gi: gi.si.redeals == 3), + (_("Unlimited redeals"), lambda gi: gi.si.redeals == -1), + ##(_("Variable redeals"), lambda gi: gi.si.redeals == -2), + (_("Other number of redeals"), lambda gi: gi.si.redeals not in (-1, 0, 1, 2, 3)),) + self._addGamesFromData(data, store, root_iter, + _("by Number of Redeals"), all_games) + + data = [] + for label, vg in GI.GAMES_BY_COMPATIBILITY: + selecter = lambda gi, vg=vg: gi.id in vg + label = gettext(label) + data.append((label, selecter)) + self._addGamesFromData(data, store, root_iter, + _("by Compatibility"), all_games) + + # by PySol version + data = [] + for version, vg in GI.GAMES_BY_PYSOL_VERSION: + selecter = lambda gi, vg=vg: gi.id in vg + label = _("New games in v. ") + version + data.append((label, selecter)) + self._addGamesFromData(data, store, None, + _("by PySol version"), all_games) + + # + data = ( + (_("Games for Children (very easy)"), lambda gi: gi.si.game_flags & GI.GT_CHILDREN), + (_("Games with Scoring"), lambda gi: gi.si.game_flags & GI.GT_SCORE), + (_("Games with Separate Decks"), lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS), + (_("Open Games (all cards visible)"), lambda gi: gi.si.game_flags & GI.GT_OPEN), + (_("Relaxed Variants"), lambda gi: gi.si.game_flags & GI.GT_RELAXED),) + self._addGamesFromData(data, store, None, + _("Other Categories"), all_games) + + # + self._addGamesFromData(GI.SELECT_ORIGINAL_GAME_BY_TYPE, store, + None, _("Original Games"), all_games) + ##self._addGamesFromData(GI.SELECT_CONTRIB_GAME_BY_TYPE, store, + ## None, _("Contrib Game"), all_games) + + SelectGameDialogWithPreview.game_store = store + return + + + def initKw(self, kw): + kwdefault(kw, + strings=(_("&Select"), _("&Rules"), _("&Cancel"),), + default=0, + ##padx=10, pady=10, + width=600, height=400, + ##~ buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + + def _unrealizeEvent(self, w): + self.deletePreview(destroy=1) + #self.preview.unbind_all() + self._saveSettings() + + + def _saveSettings(self): + SelectGameDialogWithPreview._geometry = self.get_size() + self._saveExpandedRows() + SelectGameDialogWithPreview._paned_position = self.hpaned.get_position() + selection = self.treeview.get_selection() + model, path = selection.get_selected_rows() + if path: + print 'save selected:', path + SelectGameDialogWithPreview._selected_row = path[0] + SelectGameDialogWithPreview._vadjustment_position = self.sw_vadjustment.get_value() + + + def _restoreSettings(self): + if self._geometry: + self.resize(self._geometry[0], self._geometry[1]) + self._loadExpandedRows() + self.hpaned.set_position(self._paned_position) + if self._selected_row: + selection = self.treeview.get_selection() + ##selection.select_path(self._selected_row) + ##selection.unselect_all() + gtk.idle_add(selection.select_path, self._selected_row) + if self._vadjustment_position is not None: + ##self.sw_vadjustment.set_value(self._vadjustment_position) + gtk.idle_add(self.sw_vadjustment.set_value, + self._vadjustment_position) + + + def _getSelected(self): + selection = self.treeview.get_selection() + model, path = selection.get_selected_rows() + if not path: + return None + iter = model.get_iter(path[0]) + index = model.get_value(iter, 1) + if index < 0: + return None + return index + + + def showSelected(self, w): + id = self._getSelected() + if id: + self.updatePreview(id) + ##self.updateInfo(id) + + + def deletePreview(self, destroy=0): + self.preview_key = -1 + # clean up the canvas + if self.preview: + unbind_destroy(self.preview) + self.preview.deleteAllItems() + ##~ if destroy: + ##~ self.preview.delete("all") + # + #for l in self.info_labels.values(): + # l.config(text='') + # destruct the game + if self.preview_game: + self.preview_game.endGame() + self.preview_game.destruct() + destruct(self.preview_game) + self.preview_game = None + # destruct the app + if destroy: + if self.preview_app: + destruct(self.preview_app) + self.preview_app = None + + def updatePreview(self, gameid, animations=5): + if gameid == self.preview_key: + return + self.deletePreview() + canvas = self.preview + # + gi = self.app.gdb.get(gameid) + if not gi: + self.preview_key = -1 + return + # + if self.preview_app is None: + self.preview_app = Struct( + # variables + audio = self.app.audio, + canvas = canvas, + cardset = self.app.cardset.copy(), + comments = self.app.comments.new(), + debug = 0, + gamerandom = self.app.gamerandom, + gdb = self.app.gdb, + gimages = self.app.gimages, + images = self.app.subsampled_images, + menubar = None, + miscrandom = self.app.miscrandom, + opt = self.app.opt.copy(), + startup_opt = self.app.startup_opt, + stats = self.app.stats.new(), + top = None, + top_cursor = self.app.top_cursor, + toolbar = None, + # methods + constructGame = self.app.constructGame, + getFont = self.app.getFont, + ) + self.preview_app.opt.shadow = 0 + self.preview_app.opt.shade = 0 + # + self.preview_app.audio = None # turn off audio for intial dealing + if animations >= 0: + self.preview_app.opt.animations = animations + # + if self.preview_game: + self.preview_game.endGame() + self.preview_game.destruct() + ##self.top.wm_title("Select Game - " + self.app.getGameTitleName(gameid)) + title = self.app.getGameTitleName(gameid) + self.set_title(_("Playable Preview - ") + title) + # + self.preview_game = gi.gameclass(gi) + self.preview_game.createPreview(self.preview_app) + tx, ty = 0, 0 + gw, gh = self.preview_game.width, self.preview_game.height + ##~ canvas.config(scrollregion=(-tx, -ty, -tx, -ty)) + ##~ canvas.xview_moveto(0) + ##~ canvas.yview_moveto(0) + # + random = None + if gameid == self.gameid: + random = self.app.game.random.copy() + if gameid == self.gameid and self.bookmark: + self.preview_game.restoreGameFromBookmark(self.bookmark) + else: + self.preview_game.newGame(random=random, autoplay=1) + ##~ canvas.config(scrollregion=(-tx, -ty, gw, gh)) + # + self.preview_app.audio = self.app.audio + if self.app.opt.animations: + self.preview_app.opt.animations = 5 + else: + self.preview_app.opt.animations = 0 + # save seed + self.random = self.preview_game.random.copy() + self.random.origin = self.random.ORIGIN_PREVIEW + self.preview_key = gameid + # + self.updateInfo(gameid) + # + rules_button = self.buttons[1] + if self.app.getGameRulesFilename(gameid): + rules_button.set_sensitive(True) + else: + rules_button.set_sensitive(False) + + def updateInfo(self, gameid): + gi = self.app.gdb.get(gameid) + # info + name = gettext(gi.name) + altnames = '\n'.join([gettext(n) for n in gi.altnames]) + category = gettext(CSI.TYPE[gi.category]) + type = '' + if GI.TYPE_NAMES.has_key(gi.si.game_type): + type = gettext(GI.TYPE_NAMES[gi.si.game_type]) + sl = { + GI.SL_LUCK: _('Luck only'), + GI.SL_MOSTLY_LUCK: _('Mostly luck'), + GI.SL_BALANCED: _('Balanced'), + GI.SL_MOSTLY_SKILL: _('Mostly skill'), + GI.SL_SKILL: _('Skill only'), + } + skill_level = sl.get(gi.skill_level) + if gi.redeals == -2: redeals = _('variable') + elif gi.redeals == -1: redeals = _('unlimited') + else: redeals = str(gi.redeals) + # stats + won, lost, time, moves = self.app.stats.getFullStats(self.app.opt.player, gameid) + if won+lost > 0: percent = "%.1f" % (100.0*won/(won+lost)) + else: percent = "0.0" + time = format_time(time) + moves = str(round(moves, 1)) + for n, t in ( + ('name', name), + ('altnames', altnames), + ('category', category), + ('type', type), + ('skill_level', skill_level), + ('decks', gi.decks), + ('redeals', redeals), + ('played', won+lost), + ('won', won), + ('lost', lost), + ('time', time), + ('moves', moves), + ('percent', percent), + ): + title_label, text_label = self.info_labels[n] + if t == '': + title_label.hide() + text_label.hide() + else: + title_label.show() + text_label.show() + text_label.set_text(str(t)) + #self.info_labels[n].config(text=t) + + def _saveExpandedRows(self): + treeview = self.treeview + SelectGameDialogWithPreview._expanded_rows = [] + treeview.map_expanded_rows( + lambda tv, path, self=self: + SelectGameDialogWithPreview._expanded_rows.append(path)) + print self._expanded_rows + + def _loadExpandedRows(self): + for path in self._expanded_rows: + self.treeview.expand_to_path(path) + + def done(self, button): + button = button.get_data("user_data") + print 'done', button + if button == 0: # Ok or double click + id = self._getSelected() + if id: + self.gameid = id + ##~ self.tree.n_expansions = 1 # save xyview in any case + if button == 1: # Rules + id = self._getSelected() + if id: + doc = self.app.getGameRulesFilename(id) + if not doc: + return + dir = os.path.join("html", "rules") + helpHTML(self.app, doc, dir, self) + return + + self.status = 0 + self.button = button + self.quit() + + diff --git a/pysollib/pysolgtk/selecttile.py b/pysollib/pysolgtk/selecttile.py index 0bf43a24..4cb3b9bd 100644 --- a/pysollib/pysolgtk/selecttile.py +++ b/pysollib/pysolgtk/selecttile.py @@ -184,7 +184,6 @@ class SelectTileDialogWithPreview(MfxDialog): strings=(_('&OK'), _('&Solid color...'), _('&Cancel'),), default=0, resizable=1, - font=None, padx=10, pady=10, width=600, height=400, ##~ buttonpadx=10, buttonpady=5, diff --git a/pysollib/pysolgtk/statusbar.py b/pysollib/pysolgtk/statusbar.py index 4182fbbe..310a5b72 100644 --- a/pysollib/pysolgtk/statusbar.py +++ b/pysollib/pysolgtk/statusbar.py @@ -50,21 +50,25 @@ class BasicStatusbar: column, column+columnspan, row, row+1, gtk.EXPAND | gtk.FILL, 0, 0, 0) - self.createLabel('space', width=2) - def createLabel(self, name, fill=False, expand=False, grip=False, width=0): + def createLabel(self, name, fill=False, expand=False, + tooltip=None, grip=False, width=0): label = gtk.Statusbar() self.hbox.pack_start(label, fill=fill, expand=expand) label.show() if not grip: label.set_has_resize_grip(False) setattr(self, name + "_label", label) - label.set_size_request(width*8, -1) - ##lb = label.get_children()[0].get_children()[0] - ##lb.set_justify(gtk.JUSTIFY_CENTER) + label.set_size_request(width*7, -1) + lb = label.get_children()[0].get_children()[0] + lb.set_alignment(0.5, 0.0) self._widgets.append(label) ##label.push(0, '') +## if tooltip: +## tt = gtk.Tooltips() +## tt.set_tip(label, tooltip, '') +## tt.enable() def updateText(self, **kw): @@ -75,8 +79,11 @@ class BasicStatusbar: def configLabel(self, name, **kw): - print 'statusbar.configLabel', kw - pass + label = getattr(self, name + "_label") + # FIXME kw['fg'] + label.pop(0) + label.push(0, unicode(kw['text'])) + def show(self, show=True, resize=False): if show: @@ -107,7 +114,7 @@ class PysolStatusbar(BasicStatusbar): ("gamenumber", _("Game number"), 26), ("stats", _("Games played: won/lost"), 12), ): - self.createLabel(n, width=w) + self.createLabel(n, width=w, tooltip=t) # l = self.createLabel("info", fill=True, expand=True, grip=True) diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index a66a95fa..2875d3b4 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -60,6 +60,7 @@ TRUE, FALSE = True, False # toolkit imports from tkutil import anchor_tk2gtk, loadImage, bind + # /*********************************************************************** # // canvas items # // @@ -75,17 +76,19 @@ class _CanvasItem: def __init__(self, canvas): self.canvas = canvas canvas._all_items.append(self) + self._group = None def addtag(self, group): ##print self, 'addtag' ##~ assert isinstance(group._item, CanvasGroup) self._item.reparent(group._item) + self._group = group def dtag(self, group): - pass ##print self, 'dtag' ##~ assert isinstance(group._item, CanvasGroup) ##self._item.reparent(self.canvas.root()) + self._group = None def bind(self, sequence, func, add=None): bind(self._item, sequence, func, add) @@ -100,23 +103,33 @@ class _CanvasItem: self._item = None def lower(self, positions=None): - ##print "lower", self._item, positions + print "lower", self._item, positions if positions is None: - self._item.lower_to_bottom() + if self._group: + self._group._item.lower_to_bottom() + ##self._item.lower_to_bottom() + else: + self._item.lower_to_bottom() else: + print self, 'lower', positions ##~ assert type(positions) is types.IntType and positions > 0 - ##~ self._item.lower(positions) - pass + self._item.lower(positions) + def tkraise(self, positions=None): - ##print "tkraise", self._item, positions + ##print "tkraise", self._group, self._item.get_property('parent') #self._item, positions if positions is None: self._item.raise_to_top() + self._item.get_property('parent').raise_to_top() +## if self._group: +## self._group._item.raise_to_top() +## ##self._item.raise_to_top() +## else: +## self._item.raise_to_top() else: - print 'tkraise', positions + print self, 'tkraise', positions ##~ assert type(positions) is types.IntType and positions > 0 ##~ self._item.raise_(positions) self._item.raise_to_top() - pass def move(self, x, y): self._item.move(x, y) @@ -141,7 +154,6 @@ class MfxCanvasGroup(_CanvasItem): self._item = canvas.root().add(gnome.canvas.CanvasGroup, x=0, y=0) - class MfxCanvasImage(_CanvasItem): def __init__(self, canvas, x, y, image, anchor=gtk.ANCHOR_NW): _CanvasItem.__init__(self, canvas) @@ -188,10 +200,10 @@ class MfxCanvasLine(_CanvasItem): class MfxCanvasRectangle(_CanvasItem): def __init__(self, canvas, x1, y1, x2, y2, width, fill, outline): _CanvasItem.__init__(self, canvas) - self._item = canvas.root().add('rect', x1=x1, y1=y1, x2=x2, y2=y2, - width_pixels=width, outline_color=outline) - if fill is not None: - self._item.set(fill_color=fill) + kw = {'x1': x1, 'x2': x2, 'y1': y1, 'y2': y2, 'width_pixels': width} + if fill: kw['fill_color'] = fill + if outline: kw['outline_color'] = outline + self._item = canvas.root().add(gnome.canvas.CanvasRect, **kw) class MfxCanvasText(_CanvasItem): @@ -200,6 +212,7 @@ class MfxCanvasText(_CanvasItem): if preview < 0: preview = canvas.preview if preview > 1: + self._item = None return anchor = anchor_tk2gtk(anchor) self._item = canvas.root().add(gnome.canvas.CanvasText, @@ -240,7 +253,6 @@ class MfxCanvasText(_CanvasItem): class MfxCanvas(gnome.canvas.Canvas): def __init__(self, top, bg=None, highlightthickness=0): - print 'MfxCanvas', bg self.preview = 0 # Tkinter compat self.items = {} @@ -263,12 +275,12 @@ class MfxCanvas(gnome.canvas.Canvas): self.set_style(style) self.top_bg = top.style.bg[gtk.STATE_NORMAL] - ## self.top = top self.xmargin, self.ymargin = 0, 0 self.connect('size-allocate', self._sizeAllocate) + self.connect('destroy', self.destroyEvent) def __setattr__(self, name, value): @@ -294,9 +306,27 @@ class MfxCanvas(gnome.canvas.Canvas): # FIXME return gdk.LEFT_PTR return self.get_window().get_cursor(v) + elif attr == 'width': + return self.get_size()[0] + elif attr == 'height': + return self.get_size()[1] print "TkCanvas cget:", attr raise AttributeError, attr + def xview(self): + w, h = self.get_size() + dx, dy = self.world_to_window(0, 0) + return -float(dx)/w, 1.0 + def yview(self): + w, h = self.get_size() + dx, dy = self.world_to_window(0, 0) + return -float(dy)/h, 1.0 + + def winfo_width(self): + return self.get_size()[0] + def winfo_height(self): + return self.get_size()[1] + def configure(self, **kw): height, width = -1, -1 for k, v in kw.items(): @@ -320,10 +350,6 @@ class MfxCanvas(gnome.canvas.Canvas): raise AttributeError, k if height > 0 and width > 0: self.set_size_request(width, height) - #self.queue_draw() - #self.queue_resize() - #self.show() - #pass config = configure @@ -335,7 +361,7 @@ class MfxCanvas(gnome.canvas.Canvas): i._item.destroy() ##i._item = None self._all_items = [] - if self.__tileimage: + if 0: #self.__tileimage: self.__tileimage.destroy() self.__tileimage = None @@ -457,7 +483,6 @@ class MfxCanvas(gnome.canvas.Canvas): self.__tileimage = w - def setTopImage(self, image, cw=0, ch=0): if self.__topimage: self.__topimage.destroy() @@ -482,6 +507,7 @@ class MfxCanvas(gnome.canvas.Canvas): #gdk.window_process_all_updates() #self.show_now() self.update_now() + pass def grid(self, *args, **kw): @@ -492,19 +518,22 @@ class MfxCanvas(gnome.canvas.Canvas): self.show() - def _resize(self): - ##print '_resize:', self._width, self._height - #if self.window: - self.set_size(self._width, self._height) - self.window.resize(self._width, self._height) - def setInitialSize(self, width, height): ##print 'setInitialSize:', width, height self._width, self._height = width, height self.set_size_request(width, height) #self.set_size(width, height) #self.queue_resize() - #gobject.idle_add(self._resize, priority=gobject.PRIORITY_HIGH_IDLE) + + + def destroyEvent(self, w): + #print 'MfxCanvas.destroyEvent' + self.hide() +## self.deleteAllItems() +## if self.__topimage: +## self.__topimage.destroy() +## self.__topimage = None + class MfxScrolledCanvas(MfxCanvas): diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index 7e576770..69b07582 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -119,14 +119,20 @@ def color_gtk2tk(col): class _PysolPixmap: - def __init__(self, file=None): + def __init__(self, file=None, pixbuf=None, width=0, height=0, + fill=None, outline=None): if file: self.pixbuf = gdk.pixbuf_new_from_file(file) + elif pixbuf: + self.pixbuf = pixbuf else: - self.pixbuf = gdk.Pixbuf() + self.pixbuf = gdk.Pixbuf(gdk.COLORSPACE_RGB, + True, 8, width, height) def clone(self): - return self.pixbuf.copy() + pixbuf = self.pixbuf.copy() + im = _PysolPixmap(pixbuf=pixbuf) + return im def width(self): return self.pixbuf.get_width() @@ -134,19 +140,24 @@ class _PysolPixmap: def height(self): return self.pixbuf.get_height() - def subsample(self, x, y=None): - ## FIXME - return None + def subsample(self, r): + w, h = self.pixbuf.get_width(), self.pixbuf.get_height() + w, h = int(float(w)/r), int(float(h)/r) + pixbuf = self.pixbuf.scale_simple(w, h, gdk.INTERP_BILINEAR) + im = _PysolPixmap(pixbuf=pixbuf) + return im def loadImage(file): return _PysolPixmap(file=file) def copyImage(image, x, y, width, height): - return image + # FIXME + return image.clone() def createImage(width, height, fill, outline=None): - return _PysolPixmap() + # FIXME + return _PysolPixmap(width=width, height=height, fill=fill, outline=outline) # /*********************************************************************** diff --git a/pysollib/pysolgtk/tkwidget.py b/pysollib/pysolgtk/tkwidget.py index 34a7f8b8..1cef442c 100644 --- a/pysollib/pysolgtk/tkwidget.py +++ b/pysollib/pysolgtk/tkwidget.py @@ -74,8 +74,6 @@ class MfxDialog(_MyDialog): text='', justify='center', strings=("OK",), default=0, separatorwidth=0, - font=None, - buttonfont=None, padx=20, pady=20, bitmap=None, bitmap_side='left', bitmap_padx=20, bitmap_pady=20, @@ -84,6 +82,7 @@ class MfxDialog(_MyDialog): _MyDialog.__init__(self) self.status = 1 self.button = -1 + self.buttons = [] modal=True if modal: @@ -121,7 +120,8 @@ class MfxDialog(_MyDialog): "question": gtk.STOCK_DIALOG_QUESTION} [kw['bitmap']] im = gtk.image_new_from_stock(stock, gtk.ICON_SIZE_DIALOG) box.pack_start(im) - im.xpad, im.ypad = kw['bitmap_padx'], kw['bitmap_pady'] + im.set_property('xpad', kw['bitmap_padx']) + im.set_property('ypad', kw['bitmap_pady']) im.show() elif kw['image']: im = gtk.Image() @@ -130,7 +130,8 @@ class MfxDialog(_MyDialog): box.pack_start(im) else: box.pack_end(im) - im.xpad, im.ypad = kw['image_padx'], kw['image_pady'] + im.set_property('xpad', kw['image_padx']) + im.set_property('ypad', kw['image_pady']) im.show() def createButtons(self, box, kw): @@ -149,6 +150,7 @@ class MfxDialog(_MyDialog): b.connect("clicked", self.done) box.pack_start(b) b.show() + self.buttons.append(b) def initKw(self, kw): kwdefault(kw, diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index abf38f50..a11f3977 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -202,7 +202,6 @@ class _MfxToplevel(gtk.Window): def wm_geometry(self, newGeometry=None): ##print 'wm_geometry', newGeometry - print 'allow_shrink:', self.allow_shrink if not newGeometry: pass ##self.reshow_with_initial_size() diff --git a/pysollib/pysolgtk/toolbar.py b/pysollib/pysolgtk/toolbar.py index 046a39f3..f2e7845d 100644 --- a/pysollib/pysolgtk/toolbar.py +++ b/pysollib/pysolgtk/toolbar.py @@ -60,7 +60,7 @@ class PysolToolbar(PysolToolbarActions): ui_info = ''' - + diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 56b26082..f43b3b33 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -853,7 +853,8 @@ class PysolMenubar(PysolMenubarActions): if not idir: idir = self.app.dn.savegames d = tkFileDialog.Open() - filename = d.show(filetypes=self.FILETYPES, defaultextension=self.DEFAULTEXTENSION, + filename = d.show(filetypes=self.FILETYPES, + defaultextension=self.DEFAULTEXTENSION, initialdir=idir, initialfile=ifile) if filename: filename = os.path.normpath(filename) @@ -880,7 +881,8 @@ class PysolMenubar(PysolMenubarActions): idir = self.app.dn.savegames ##print self.game.filename, ifile d = tkFileDialog.SaveAs() - filename = d.show(filetypes=self.FILETYPES, defaultextension=self.DEFAULTEXTENSION, + filename = d.show(filetypes=self.FILETYPES, + defaultextension=self.DEFAULTEXTENSION, initialdir=idir, initialfile=ifile) if filename: filename = os.path.normpath(filename) From c124104d9a7e0c82874b51b049a9bada6e2a59de Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 18 Aug 2006 21:21:08 +0000 Subject: [PATCH 050/266] * improved support GTK (alpha) git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@51 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 8 +- pysollib/game.py | 13 ++ pysollib/pysolgtk/card.py | 6 +- pysollib/pysolgtk/menubar.py | 233 +++++++++++++++++------ pysollib/pysolgtk/playeroptionsdialog.py | 1 - pysollib/pysolgtk/pysoltree.py | 125 ++++++++++++ pysollib/pysolgtk/selectcardset.py | 228 +++++++++++++++++++++- pysollib/pysolgtk/selectgame.py | 72 +------ pysollib/pysolgtk/selecttile.py | 83 +++----- pysollib/pysolgtk/tkcanvas.py | 75 ++++---- pysollib/pysolgtk/tkconst.py | 5 +- pysollib/pysolgtk/tkwidget.py | 4 +- pysollib/pysolgtk/tkwrap.py | 15 +- pysollib/tk/selectcardset.py | 2 +- 14 files changed, 644 insertions(+), 226 deletions(-) create mode 100644 pysollib/pysolgtk/pysoltree.py diff --git a/pysollib/app.py b/pysollib/app.py index b3fb4f7e..8032d75e 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -65,7 +65,7 @@ from pysoltk import PysolMenubar from pysoltk import PysolProgressBar from pysoltk import PysolToolbar from pysoltk import PysolStatusbar, HelpStatusbar -from pysoltk import SelectCardsetByTypeDialogWithPreview +from pysoltk import SelectCardsetDialogWithPreview from pysoltk import SelectDialogTreeData from pysoltk import tkHTMLViewer from pysoltk import TOOLBAR_BUTTONS @@ -770,10 +770,6 @@ class Application: self.intro.progress.destroy() destruct(self.intro.progress) self.intro.progress = None - if TOOLKIT == 'gtk': - ## FIXME - self.top.update_idletasks() - self.top.show_now() # prepare game autoplay = 0 if self.nextgame.loadedgame is not None: @@ -1155,7 +1151,7 @@ Please select a %s type %s. def __selectCardsetDialog(self, t): key = self.cardset.index - d = SelectCardsetByTypeDialogWithPreview( + d = SelectCardsetDialogWithPreview( self.top, title=_("Please select a %s type %s") % (t[0], CARDSET), app=self, manager=self.cardset_manager, key=key, strings=(None, _("&OK"), _("&Cancel")), default=1) diff --git a/pysollib/game.py b/pysollib/game.py index e35e8839..85a2ef2a 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -426,6 +426,12 @@ class Game: wm_map(self.top, maximized=self.app.opt.wm_maximized) self.top.busyUpdate() self.stopSamples() + # + if TOOLKIT == 'gtk': + ## FIXME + if self.top: + self.top.update_idletasks() + self.top.show_now() # let's go self.moves.state = self.S_INIT self.startGame() @@ -503,6 +509,12 @@ class Game: self.stats.update_time = time.time() self.busy = old_busy # + if TOOLKIT == 'gtk': + ## FIXME + if self.top: + self.top.update_idletasks() + self.top.show_now() + # self.startPlayTimer() # restore a bookmarked game (e.g. after changing the cardset) @@ -548,6 +560,7 @@ class Game: # with another game from there def quitGame(self, id=0, random=None, loadedgame=None, startdemo=0, bookmark=0, holdgame=0): + print 'quitGame' self.updateTime() if bookmark: id, random = self.id, self.random diff --git a/pysollib/pysolgtk/card.py b/pysollib/pysolgtk/card.py index d89fca57..7d9f5e10 100644 --- a/pysollib/pysolgtk/card.py +++ b/pysollib/pysolgtk/card.py @@ -116,14 +116,14 @@ class _TwoImageCard(_HideableCard): if not self.face_up: self.__back.hide() self.__face.show() - self.tkraise(unhide) + ##self.tkraise(unhide) self.face_up = 1 def showBack(self, unhide=1): if self.face_up: self.__face.hide() self.__back.show() - self.tkraise(unhide) + ##self.tkraise(unhide) self.face_up = 0 def updateCardBackground(self, image): @@ -133,5 +133,5 @@ class _TwoImageCard(_HideableCard): # choose the implementation Card = _TwoImageCard -Card = _OneImageCard +#Card = _OneImageCard # FIXME: this implementation lost any cards (bug?) diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 9a048d35..0223101b 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -45,7 +45,6 @@ from pysollib.settings import PACKAGE from tkutil import setTransient from tkutil import color_tk2gtk, color_gtk2tk from selectcardset import SelectCardsetDialogWithPreview -from selectcardset import SelectCardsetByTypeDialogWithPreview from selecttile import SelectTileDialogWithPreview from selectgame import SelectGameDialogWithPreview @@ -87,66 +86,153 @@ class PysolMenubar(PysolMenubarActions): def createMenubar(self): entries = ( - ('newgame', gtk.STOCK_NEW, ltk2gtk('&New game'), 'N', ltk2gtk('New game'), self.mNewGame), - ('open', gtk.STOCK_OPEN, ltk2gtk('&Open...'), 'O', ltk2gtk('Open a\nsaved game'), self.mOpen), - ('restart', gtk.STOCK_REFRESH, ltk2gtk('&Restart'), 'G', ltk2gtk('Restart the\ncurrent game'), self.mRestart), - ('save', gtk.STOCK_SAVE, ltk2gtk('&Save'), 'S', ltk2gtk('Save game'), self.mSave), - ('undo', gtk.STOCK_UNDO, ltk2gtk('&Undo'), 'Z', ltk2gtk('Undo'), self.mUndo), - ('redo', gtk.STOCK_REDO, ltk2gtk('&Redo'), 'R', ltk2gtk('Redo'), self.mRedo), - ('autodrop',gtk.STOCK_JUMP_TO, ltk2gtk('&Auto drop'), 'A', ltk2gtk('Auto drop'), self.mDrop), - ('stats', gtk.STOCK_HOME, ltk2gtk('Stats'), None, ltk2gtk('Statistics'), self.mStatus), - ('rules', gtk.STOCK_HELP, ltk2gtk('Rules'), 'F1', ltk2gtk('Rules'), self.mHelpRules), - ('quit', gtk.STOCK_QUIT, ltk2gtk('&Quit'), 'Q', ltk2gtk('Quit PySol'), self.mQuit), - ('file', None, ltk2gtk('&File')), - ('selectgame', None, ltk2gtk('Select &game')), - ('edit', None, ltk2gtk('&Edit')), - ('game', None, ltk2gtk('&Game')), - ('assist', None, ltk2gtk('&Assist')), - ('options', None, ltk2gtk('&Options')), - ("automaticplay", None, ltk2gtk("&Automatic play")), + ### toolbar + ('newgame', gtk.STOCK_NEW, + ltk2gtk('&New game'), 'N', + ltk2gtk('New game'), + self.mNewGame), + ('open', gtk.STOCK_OPEN, + ltk2gtk('&Open...'), 'O', + ltk2gtk('Open a\nsaved game'), + self.mOpen), + ('restart', gtk.STOCK_REFRESH, + ltk2gtk('&Restart'), 'G', + ltk2gtk('Restart the\ncurrent game'), + self.mRestart), + ('save', gtk.STOCK_SAVE, + ltk2gtk('&Save'), 'S', + ltk2gtk('Save game'), + self.mSave), + ('undo', gtk.STOCK_UNDO, + ltk2gtk('&Undo'), 'Z', + ltk2gtk('Undo'), + self.mUndo), + ('redo', gtk.STOCK_REDO, + ltk2gtk('&Redo'), 'R', + ltk2gtk('Redo'), + self.mRedo), + ('autodrop', gtk.STOCK_JUMP_TO, + ltk2gtk('&Auto drop'), 'A', + ltk2gtk('Auto drop'), + self.mDrop), + ('stats', gtk.STOCK_INDEX, + ltk2gtk('Stats'), None, + ltk2gtk('Statistics'), + self.mStatus), + ('rules', gtk.STOCK_HELP, + ltk2gtk('Rules'), 'F1', + ltk2gtk('Rules'), + self.mHelpRules), + ('quit', gtk.STOCK_QUIT, + ltk2gtk('&Quit'), 'Q', + ltk2gtk('Quit PySol'), + self.mQuit), - ('animations', None, ltk2gtk('A&nimations')), - ('help', None, ltk2gtk('&Help')), + ### menus + ('file', None, ltk2gtk('&File')), + ('selectgame', None, ltk2gtk('Select &game')), + ('edit', None, ltk2gtk('&Edit')), + ('game', None, ltk2gtk('&Game')), + ('assist', None, ltk2gtk('&Assist')), + ('options', None, ltk2gtk('&Options')), + ('assistlevel', None, ltk2gtk("Assist &level")), + ("automaticplay", None, ltk2gtk("&Automatic play")), + ('animations', None, ltk2gtk('A&nimations')), + ('help', None, ltk2gtk('&Help')), - ('playablepreview', None, ltk2gtk('Playable pre&view...'), 'V', None, self.mSelectGameDialogWithPreview), - ('selectgamebynumber', None, ltk2gtk('Select game by nu&mber...'), None, None, self.mSelectGameById), - ('saveas', None, ltk2gtk('Save &as...'), None, None, self.m), - ('redoall', None, ltk2gtk('Redo &all'), None, None, self.mRedoAll), - ('dealcards', None, ltk2gtk('&Deal cards'), 'D', None, self.mDeal), - ('status', None, ltk2gtk('S&tatus...'), 'T', None, self.mStatus), - ('hint', None, ltk2gtk('&Hint'), 'H', None, self.mHint), - ('highlightpiles', None, ltk2gtk('Highlight p&iles'), None, None, self.mHighlightPiles), - ('demo', None,ltk2gtk('&Demo'), 'D',None,self.mDemo), - ('demoallgames', None,ltk2gtk('Demo (&all games)'), None,None,self.mMixedDemo), - ('playeroptions',None,ltk2gtk('&Player options...'),None,None,self.mOptPlayerOptions), - ('tabletile', None,ltk2gtk('Table t&ile...'), None,None,self.mOptTableTile), - ('contents', None,ltk2gtk('&Contents'),'F1',None,self.mHelp), - ('aboutpysol', None,ltk2gtk('&About ')+PACKAGE+'...', None,None,self.mHelpAbout), -) + ### menuitems + ('playablepreview', None, + ltk2gtk('Playable pre&view...'), 'V', + None, self.mSelectGameDialogWithPreview), + ('selectgamebynumber', None, + ltk2gtk('Select game by nu&mber...'), None, + None, self.mSelectGameById), + ('saveas', None, + ltk2gtk('Save &as...'), None, + None, self.m), + ('redoall', None, + ltk2gtk('Redo &all'), None, + None, self.mRedoAll), + ('dealcards', None, + ltk2gtk('&Deal cards'), 'D', + None, self.mDeal), + ('status', None, + ltk2gtk('S&tatus...'), 'T', + None, self.mStatus), + ('hint', None, + ltk2gtk('&Hint'), 'H', + None, self.mHint), + ('highlightpiles', None, + ltk2gtk('Highlight p&iles'), None, + None, self.mHighlightPiles), + ('demo', None, + ltk2gtk('&Demo'), 'D', + None,self.mDemo), + ('demoallgames', None, + ltk2gtk('Demo (&all games)'), None, + None,self.mMixedDemo), + ('playeroptions', None, + ltk2gtk('&Player options...'), None, + None,self.mOptPlayerOptions), + ('tabletile', None, + ltk2gtk('Table t&ile...'), None, + None,self.mOptTableTile), + ('cardset', None, + ltk2gtk('Cards&et...'), 'E', + None, self.mSelectCardsetDialog), + ('contents', None, + ltk2gtk('&Contents'), 'F1', + None, self.mHelp), + ('aboutpysol', None, + ltk2gtk('&About ')+PACKAGE+'...', + None,None,self.mHelpAbout), + ('updateall', None, + 'Redraw Game', 'L', + None, + self.updateAll), + ) # - toggle_entries = ( - ('pause', gtk.STOCK_STOP, ltk2gtk('&Pause'), 'P', ltk2gtk('Pause game'), self.mPause), - ('optautodrop', None, ltk2gtk('A&uto drop'), None, None, self.mOptAutoDrop), - ('autofaceup', None, ltk2gtk('Auto &face up'), None, None, self.mOptAutoFaceUp), - ("autodeal", None, ltk2gtk("Auto &deal"), None, None, self.mOptAutoDeal), - ("quickplay", None, ltk2gtk('&Quick play'), None, None, self.mOptQuickPlay), - - ('highlightmatchingcards', None, ltk2gtk('Highlight &matching cards'), None, None, self.mOptEnableHighlightCards), - ('cardshadow', None, ltk2gtk('Card shado&w'), None, None, self.mOptShadow), - ('shadelegalmoves', None, ltk2gtk('Shade &legal moves'), None, None, self.mOptShade), - -) + toggle_entries = [ + ('pause', # name + gtk.STOCK_STOP, ltk2gtk('&Pause'), # stock, label + 'P', ltk2gtk('Pause game'), # accelerator, tooltip + self.mPause, # callback + False, # initial value + ), ] + for label, name, opt_name in ( + ('A&uto drop', 'optautodrop', 'autodrop'), + ('Auto &face up', '', 'autofaceup'), + ('Auto &deal', '', 'autodeal'), + ('&Quick play', '', 'quickplay'), + ('Enable &undo', '', 'undo'), + ('Enable &bookmarks' , '', 'bookmarks'), + ('Enable &hint', '', 'hint'), + ('Enable highlight p&iles', '', 'highlight_piles'), + ('Enable highlight &cards', '', 'highlight_cards'), + ('Enable highlight same &rank', '', 'highlight_samerank'), + ('Highlight &no matching', '', 'highlight_not_matching'), + ('Card shado&w', '', 'shadow'), + ('Shade &legal moves', '', 'shade'), + ): + if not name: + name = re.sub(r"[^0-9a-zA-Z]", "", label).lower() + toggle_entries.append( + (name, + None, ltk2gtk(label), + None, None, + lambda w, opt_name=opt_name: self.mOptToggle(w, opt_name), + getattr(self.app.opt, opt_name))) # animations_entries = ( - ('animationnone', None, ltk2gtk('&None'), None, None, 0), - ('animationfast', None, ltk2gtk('&Fast'), None, None, 1), - ('animationtimer', None, ltk2gtk('&Timer based'), None, None, 2), - ('animationslow', None, ltk2gtk('&Slow'), None, None, 3), - ('animationveryslow', None, ltk2gtk('&Very slow'), None, None, 4), - ) + ('animationnone', None, ltk2gtk('&None'), None, None, 0), + ('animationfast', None, ltk2gtk('&Fast'), None, None, 1), + ('animationtimer', None, ltk2gtk('&Timer based'), None, None, 2), + ('animationslow', None, ltk2gtk('&Slow'), None, None, 3), + ('animationveryslow', None, ltk2gtk('&Very slow'), None, None, 4), + ) # ui_info = ''' @@ -170,6 +256,8 @@ class PysolMenubar(PysolMenubarActions): + + @@ -196,9 +284,18 @@ class PysolMenubar(PysolMenubarActions): - + + + + + + + + + + @@ -395,8 +492,6 @@ class PysolMenubar(PysolMenubarActions): self.updateMenus() - def mOptCardset(self, *args): - pass def mOptTableTile(self, *args): if self._cancelDrag(break_pause=False): return @@ -469,3 +564,29 @@ class PysolMenubar(PysolMenubarActions): self.game.quitGame(d.gameid, random=d.random) + def mSelectCardsetDialog(self, *event): + if self._cancelDrag(break_pause=False): return + key = self.app.nextgame.cardset.index + d = SelectCardsetDialogWithPreview(self.top, title=_("Select cardset"), + app=self.app, manager=self.app.cardset_manager, key=key) + cs = self.app.cardset_manager.get(d.key) + if cs is None or d.key == self.app.cardset.index: + return + if d.status == 0 and d.button in (0, 1) and d.key >= 0: + self.app.nextgame.cardset = cs + if d.button == 0: + self._cancelDrag() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + self.app.opt.games_geometry = {} # clear saved games geometry + + + def mOptToggle(self, w, opt): + ##print 'mOptToggle:', opt, w.get_active() + if self._cancelDrag(break_pause=False): return + self.app.opt.__dict__[opt] = w.get_active() + + + def updateAll(self, *event): + self.app.canvas.updateAll() + diff --git a/pysollib/pysolgtk/playeroptionsdialog.py b/pysollib/pysolgtk/playeroptionsdialog.py index 7f556c9e..3b14fee0 100644 --- a/pysollib/pysolgtk/playeroptionsdialog.py +++ b/pysollib/pysolgtk/playeroptionsdialog.py @@ -65,7 +65,6 @@ class PlayerOptionsDialog(MfxDialog): completion = gtk.EntryCompletion() self.player_entry.set_completion(completion) model = gtk.ListStore(gobject.TYPE_STRING) - print '>>', app.getAllUserNames() for name in app.getAllUserNames(): iter = model.append() model.set(iter, 0, name) diff --git a/pysollib/pysolgtk/pysoltree.py b/pysollib/pysolgtk/pysoltree.py new file mode 100644 index 00000000..eea69282 --- /dev/null +++ b/pysollib/pysolgtk/pysoltree.py @@ -0,0 +1,125 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + + +# imports +import os, re, sys, types +import gtk, gobject + +# PySol imports + +# Toolkit imports + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PysolTreeView: + + _expanded_rows = [] + _selected_row = None + _vadjustment_position = None + + def __init__(self, parent, store, **kw): + # + sw = gtk.ScrolledWindow() + self.scrolledwindow = sw + sw.show() + self.sw_vadjustment = sw.get_vadjustment() + sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + # + treeview = gtk.TreeView(store) + self.treeview = treeview + treeview.show() + sw.add(treeview) + treeview.set_rules_hint(True) + treeview.set_headers_visible(False) + renderer = gtk.CellRendererText() + renderer.set_property('xalign', 0.0) + column = gtk.TreeViewColumn('Column Name', renderer, text=0) + column.set_clickable(True) + treeview.append_column(column) + selection = treeview.get_selection() + selection.connect('changed', parent.showSelected) + treeview.connect('unrealize', self._unrealizeEvent) + + self._restoreSettings() + + + def _unrealizeEvent(self, w): + self._saveSettings() + + + def _saveSettings(self): + self._saveExpandedRows() + selection = self.treeview.get_selection() + model, path = selection.get_selected_rows() + if path: + PysolTreeView._selected_row = path[0] + PysolTreeView._vadjustment_position = self.sw_vadjustment.get_value() + + def _restoreSettings(self): + self._loadExpandedRows() + if self._selected_row: + selection = self.treeview.get_selection() + ##selection.select_path(self._selected_row) + ##selection.unselect_all() + gtk.idle_add(selection.select_path, self._selected_row) + if self._vadjustment_position is not None: + ##self.sw_vadjustment.set_value(self._vadjustment_position) + gtk.idle_add(self.sw_vadjustment.set_value, + self._vadjustment_position) + + + def _saveExpandedRows(self): + treeview = self.treeview + PysolTreeView._expanded_rows = [] + treeview.map_expanded_rows( + lambda tv, path, self=self: + PysolTreeView._expanded_rows.append(path)) + + def _loadExpandedRows(self): + for path in self._expanded_rows: + self.treeview.expand_to_path(path) + + + def getSelected(self): + selection = self.treeview.get_selection() + model, path = selection.get_selected_rows() + if not path: + return None + iter = model.get_iter(path[0]) + index = model.get_value(iter, 1) + return index + + + def unselectAll(self): + selection = self.treeview.get_selection() + selection.unselect_all() + + + + + + + + diff --git a/pysollib/pysolgtk/selectcardset.py b/pysollib/pysolgtk/selectcardset.py index 6464647d..75776ee7 100644 --- a/pysollib/pysolgtk/selectcardset.py +++ b/pysollib/pysolgtk/selectcardset.py @@ -32,10 +32,17 @@ # imports import os, re, sys, types -from gtk import * +import gtk, gobject + +# PySol imports +from pysollib.resource import CSI +from pysollib.mfxutil import kwdefault # Toolkit imports from tkwidget import MfxDialog +from pysoltree import PysolTreeView +from tkcanvas import MfxCanvas, MfxCanvasImage +from tkutil import loadImage # /*********************************************************************** @@ -43,8 +50,221 @@ from tkwidget import MfxDialog # ************************************************************************/ class SelectCardsetDialogWithPreview(MfxDialog): - pass + _cardset_store = None + + def __init__(self, parent, title, app, manager, key=None, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, **kw) + # + top_box, bottom_box = self.createHBox() + # + if key is None: + key = manager.getSelected() + self.app = app + self.manager = manager + self.key = key + self.preview_key = -1 + self.all_keys = [] + + if self._cardset_store is None: + self._createStore() + + #padx, pady = kw.padx, kw.pady + padx, pady = 5, 5 + # left + # paned + hpaned = gtk.HPaned() + self.hpaned = hpaned + hpaned.show() + top_box.pack_start(hpaned, expand=True, fill=True) + # tree + treeview = PysolTreeView(self, self._cardset_store) + self.treeview = treeview + hpaned.pack1(treeview.scrolledwindow, True, True) + ##treeview.treeview.expand_all() + # right + sw = gtk.ScrolledWindow() + sw.show() + sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) + hpaned.pack2(sw, True, True) + ##self.scrolledwindow = sw + # + self.preview = MfxCanvas(self) + self.preview.show() + sw.add(self.preview) + #hpaned.pack2(self.preview, True, True) + self.preview.setTile(app, app.tabletile_index, force=True) + # + hpaned.set_position(240) + + self.createButtons(bottom_box, kw) + + ##~self.updatePreview(key) + + self.show_all() + gtk.main() + + + def _selectCardset(self, all_cardsets, selecter): + if selecter is None: + return [(cs.index, cs.name) for cs in all_cardsets] + return [(cs.index, cs.name) for cs in all_cardsets if selecter(cs)] + + + def _addCardsets(self, store, root_iter, root_label, cardsets): + iter = store.append(root_iter) + store.set(iter, 0, root_label, 1, -1) + for index, name in cardsets: + child_iter = store.append(iter) + ##~ name = gettext(name) + store.set(child_iter, 0, name, 1, index) + + + def _addCardsetsByType(self, store, root_label, all_cardsets, + cardset_types, selecter_type, registered): + manager = self.manager + root_iter = store.append(None) + store.set(root_iter, 0, root_label, 1, -1) + items = cardset_types.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + added = False + for key, label in items: + if not getattr(manager, registered).has_key(key): + continue + cardsets = [] + for cs in all_cardsets: + si = getattr(cs.si, selecter_type) + if type(si) is int: # type + if key == si: + cardsets.append((cs.index, cs.name)) + else: # style, nationality, date + if key in si: + cardsets.append((cs.index, cs.name)) + if cardsets: + added = True + self._addCardsets(store, root_iter, label, cardsets) + if added: + selecter = lambda cs, selecter_type=selecter_type: \ + not getattr(cs.si, selecter_type) + cs = self._selectCardset(all_cardsets, selecter) + if cs: + self._addCardsets(store, root_iter, _('Uncategorized'), cs) + else: + iter = store.append(root_iter) + store.set(iter, 0, _('(no cardsets)'), 1, -1) + + def _createStore(self): + store = gtk.TreeStore(gobject.TYPE_STRING, + gobject.TYPE_INT) + manager = self.manager + all_cardsets = manager.getAllSortedByName() + all_cardsets = filter(lambda obj: not obj.error, all_cardsets) + + cs = self._selectCardset(all_cardsets, None) + self._addCardsets(store, None, 'All cadsets', cs) + + root_iter = store.append(None) + store.set(root_iter, 0, _('by Size'), 1, -1) + for label, selecter in ( + (_("Tiny cardsets"), lambda cs: cs.si.size == CSI.SIZE_TINY), + (_("Small cardsets"), lambda cs: cs.si.size == CSI.SIZE_SMALL), + (_("Medium cardsets"), lambda cs: cs.si.size == CSI.SIZE_MEDIUM), + (_("Large cardsets"), lambda cs: cs.si.size == CSI.SIZE_LARGE), + (_("XLarge cardsets"), lambda cs: cs.si.size == CSI.SIZE_XLARGE),): + cs = self._selectCardset(all_cardsets, selecter) + if cs: + self._addCardsets(store, root_iter, label, cs) + + self._addCardsetsByType(store, _('by Type'), all_cardsets, + CSI.TYPE, 'type', 'registered_types') + self._addCardsetsByType(store, _('by Style'), all_cardsets, + CSI.STYLE, 'styles', 'registered_styles') + self._addCardsetsByType(store, _('by Nationality'), all_cardsets, + CSI.NATIONALITY, 'nationalities', + 'registered_nationalities') + self._addCardsetsByType(store, _('by Date'), all_cardsets, + CSI.DATE, 'dates', 'registered_dates') + + self._cardset_store = store + + + def getSelected(self): + index = self.treeview.getSelected() + if index < 0: + return None + return index + + + def showSelected(self, w): + key = self.getSelected() + if not key is None: + self.updatePreview(key) + pass + + + def updatePreview(self, key): + if key == self.preview_key: + return + canvas = self.preview + canvas.deleteAllItems() + self.preview_images = [] + cs = self.manager.get(key) + if not cs: + self.preview_key = -1 + return + names, columns = cs.getPreviewCardNames() + try: + #???names, columns = cs.getPreviewCardNames() + for n in names: + f = os.path.join(cs.dir, n + cs.ext) + self.preview_images.append(loadImage(file=f)) + except: + self.preview_key = -1 + self.preview_images = [] + return + i, x, y, sx, sy, dx, dy = 0, 10, 10, 0, 0, cs.CARDW + 10, cs.CARDH + 10 + for image in self.preview_images: + MfxCanvasImage(canvas, x, y, anchor="nw", image=image) + sx, sy = max(x, sx), max(y, sy) + i = i + 1 + if i % columns == 0: + x, y = 10, y + dy + else: + x = x + dx + canvas.config(width=sx+dx, height=sy+dy) + canvas.set_scroll_region(0, 0, sx+dx, sy+dy) + self.preview_key = key + + + def initKw(self, kw): + kwdefault(kw, + strings=(_("&Load"), _("&Cancel"), _("&Info..."),), + default=1, + resizable=1, + padx=10, pady=10, + width=600, height=400, + ) + return MfxDialog.initKw(self, kw) + + + def createInfo(self): + pass + + + def done(self, button): + b = button.get_data('user_data') + if b == 2: + self.createInfo() + return + if b == 0: + self.key = self.getSelected() + if not self.key: + self.key = self.preview_key + self.status = 0 + self.button = b + self.hide() + self.quit() + + -class SelectCardsetByTypeDialogWithPreview(SelectCardsetDialogWithPreview): - pass diff --git a/pysollib/pysolgtk/selectgame.py b/pysollib/pysolgtk/selectgame.py index 0c54618f..f297d209 100644 --- a/pysollib/pysolgtk/selectgame.py +++ b/pysollib/pysolgtk/selectgame.py @@ -52,6 +52,7 @@ from pysollib.resource import CSI from tkutil import unbind_destroy from tkwidget import MfxDialog from tkcanvas import MfxCanvas, MfxCanvasText +from pysoltree import PysolTreeView gettext = _ @@ -89,25 +90,8 @@ class SelectGameDialogWithPreview(MfxDialog): hpaned.show() top_box.pack_start(hpaned, expand=True, fill=True) # left - sw = gtk.ScrolledWindow() - sw.show() - self.sw_vadjustment = sw.get_vadjustment() - hpaned.pack1(sw, True, True) - sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - # tree - treeview = gtk.TreeView(self.game_store) - self.treeview = treeview - treeview.show() - sw.add(treeview) - treeview.set_rules_hint(True) - treeview.set_headers_visible(False) - renderer = gtk.CellRendererText() - renderer.set_property('xalign', 0.0) - column = gtk.TreeViewColumn('Games', renderer, text=0) - column.set_clickable(True) - treeview.append_column(column) - selection = treeview.get_selection() - selection.connect('changed', self.showSelected) + self.treeview = PysolTreeView(self, self.game_store) + hpaned.pack1(self.treeview.scrolledwindow, True, True) # right table = gtk.Table(2, 2, False) table.show() @@ -228,8 +212,6 @@ class SelectGameDialogWithPreview(MfxDialog): name = gettext(name) store.set(child_iter, 0, name, 1, id) - #def _addNode(self, store, root_iter, root_label, games): - def _selectGames(self, all_games, selecter): # return list of tuples (gameid, gamename) @@ -350,9 +332,7 @@ class SelectGameDialogWithPreview(MfxDialog): kwdefault(kw, strings=(_("&Select"), _("&Rules"), _("&Cancel"),), default=0, - ##padx=10, pady=10, width=600, height=400, - ##~ buttonpadx=10, buttonpady=5, ) return MfxDialog.initKw(self, kw) @@ -365,49 +345,25 @@ class SelectGameDialogWithPreview(MfxDialog): def _saveSettings(self): SelectGameDialogWithPreview._geometry = self.get_size() - self._saveExpandedRows() SelectGameDialogWithPreview._paned_position = self.hpaned.get_position() - selection = self.treeview.get_selection() - model, path = selection.get_selected_rows() - if path: - print 'save selected:', path - SelectGameDialogWithPreview._selected_row = path[0] - SelectGameDialogWithPreview._vadjustment_position = self.sw_vadjustment.get_value() def _restoreSettings(self): if self._geometry: self.resize(self._geometry[0], self._geometry[1]) - self._loadExpandedRows() self.hpaned.set_position(self._paned_position) - if self._selected_row: - selection = self.treeview.get_selection() - ##selection.select_path(self._selected_row) - ##selection.unselect_all() - gtk.idle_add(selection.select_path, self._selected_row) - if self._vadjustment_position is not None: - ##self.sw_vadjustment.set_value(self._vadjustment_position) - gtk.idle_add(self.sw_vadjustment.set_value, - self._vadjustment_position) - def _getSelected(self): - selection = self.treeview.get_selection() - model, path = selection.get_selected_rows() - if not path: - return None - iter = model.get_iter(path[0]) - index = model.get_value(iter, 1) + def getSelected(self): + index = self.treeview.getSelected() if index < 0: return None return index - def showSelected(self, w): - id = self._getSelected() + id = self.getSelected() if id: self.updatePreview(id) - ##self.updateInfo(id) def deletePreview(self, destroy=0): @@ -568,28 +524,16 @@ class SelectGameDialogWithPreview(MfxDialog): text_label.set_text(str(t)) #self.info_labels[n].config(text=t) - def _saveExpandedRows(self): - treeview = self.treeview - SelectGameDialogWithPreview._expanded_rows = [] - treeview.map_expanded_rows( - lambda tv, path, self=self: - SelectGameDialogWithPreview._expanded_rows.append(path)) - print self._expanded_rows - - def _loadExpandedRows(self): - for path in self._expanded_rows: - self.treeview.expand_to_path(path) - def done(self, button): button = button.get_data("user_data") print 'done', button if button == 0: # Ok or double click - id = self._getSelected() + id = self.getSelected() if id: self.gameid = id ##~ self.tree.n_expansions = 1 # save xyview in any case if button == 1: # Rules - id = self._getSelected() + id = self.getSelected() if id: doc = self.app.getGameRulesFilename(id) if not doc: diff --git a/pysollib/pysolgtk/selecttile.py b/pysollib/pysolgtk/selecttile.py index 4cb3b9bd..91fd3e8b 100644 --- a/pysollib/pysolgtk/selecttile.py +++ b/pysollib/pysolgtk/selecttile.py @@ -26,16 +26,17 @@ import gobject, gtk from gtk import gdk -## # PySol imports +# PySol imports ## from pysollib.mfxutil import destruct, Struct, KwStruct from pysollib.resource import CSI -from pysollib.mfxutil import kwdefault, KwStruct +from pysollib.mfxutil import kwdefault # Toolkit imports ## from tkutil import loadImage from tkwidget import MfxDialog from tkcanvas import MfxCanvas from tkutil import setTransient +from pysoltree import PysolTreeView class SelectTileDialogWithPreview(MfxDialog): @@ -54,38 +55,22 @@ class SelectTileDialogWithPreview(MfxDialog): self.preview_key = -1 self.all_keys = [] self.table_color = app.opt.table_color - - sw = gtk.ScrolledWindow() - sw.set_shadow_type(gtk.SHADOW_ETCHED_IN) - sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - top_box.pack_start(sw) - + # paned + hpaned = gtk.HPaned() + self.hpaned = hpaned + hpaned.show() + top_box.pack_start(hpaned, expand=True, fill=True) # - model = self._create_tree_model(manager, key) - treeview = gtk.TreeView(model) - treeview.set_rules_hint(True) - treeview.set_headers_visible(False) - - renderer = gtk.CellRendererText() - renderer.set_property('xalign', 0.0) - - column = gtk.TreeViewColumn('Tiles', renderer, text=0) - column.set_clickable(True) - treeview.append_column(column) - - sw.add(treeview) - treeview.expand_all() - - selection = treeview.get_selection() - selection.connect('changed', self.treeview_show_selected) - - treeview.connect('row-activated', self.row_activated) + model = self._createStore(manager, key) + treeview = PysolTreeView(self, model) self.treeview = treeview - + hpaned.pack1(treeview.scrolledwindow, True, True) + treeview.treeview.expand_all() # self.preview = MfxCanvas(top_box) # width=w2 - top_box.pack_end(self.preview) + hpaned.pack2(self.preview, True, True) self.preview.show() + hpaned.set_position(240) self.createButtons(bottom_box, kw) @@ -95,28 +80,24 @@ class SelectTileDialogWithPreview(MfxDialog): gtk.main() - def _getSelected(self): - selection = self.treeview.get_selection() - model, path = selection.get_selected_rows() - if not path: - return None - iter = model.get_iter(path[0]) - index = model.get_value(iter, 1) + def rowActivated(self, w, row, col): + # FIXME + print 'row-activated-event', row, col + + + def getSelected(self): + index = self.treeview.getSelected() if index < 0: return None return self.all_keys[index] - def row_activated(self, w, row, col): - print 'row_activated_event', row, col - - - def treeview_show_selected(self, w): - key = self._getSelected() + def showSelected(self, w): + key = self.getSelected() self.updatePreview(key) - def _create_tree_model(self, manager, key): + def _createStore(self, manager, key): self.all_keys = [] index = 0 # @@ -156,18 +137,18 @@ class SelectTileDialogWithPreview(MfxDialog): def updatePreview(self, key): - ##print 'updatePreview:', key + ##print 'updatePreview:', key, type(key) if key is None: return if key == self.preview_key: return canvas = self.preview - canvas.deleteAllItems() + ##canvas.deleteAllItems() if type(key) is str: # solid color canvas.config(bg=key) - ##canvas.setTile(None) - ##canvas.setTextColor(None) + canvas.setBackgroundImage(None) + canvas.setTextColor(None) self.preview_key = key self.table_color = key else: @@ -186,7 +167,6 @@ class SelectTileDialogWithPreview(MfxDialog): resizable=1, padx=10, pady=10, width=600, height=400, - ##~ buttonpadx=10, buttonpady=5, ) return MfxDialog.initKw(self, kw) @@ -196,12 +176,11 @@ class SelectTileDialogWithPreview(MfxDialog): c = '#%02x%02x%02x' % (c.red/256, c.green/256, c.blue/256) d.destroy() self.updatePreview(c) - selection = self.treeview.get_selection() - selection.unselect_all() + self.treeview.unselectAll() def createColorsel(self): - win = gtk.ColorSelectionDialog('Select table color') + win = gtk.ColorSelectionDialog(_('Select table color')) win.help_button.destroy() win.set_position(gtk.WIN_POS_CENTER_ON_PARENT) if type(self.preview_key) is str: @@ -222,7 +201,7 @@ class SelectTileDialogWithPreview(MfxDialog): self.createColorsel() return if b == 0: - self.key = self._getSelected() + self.key = self.getSelected() if not self.key: self.key = self.preview_key self.status = 0 diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index 2875d3b4..90b6572d 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -76,19 +76,17 @@ class _CanvasItem: def __init__(self, canvas): self.canvas = canvas canvas._all_items.append(self) - self._group = None def addtag(self, group): ##print self, 'addtag' ##~ assert isinstance(group._item, CanvasGroup) self._item.reparent(group._item) - self._group = group def dtag(self, group): ##print self, 'dtag' ##~ assert isinstance(group._item, CanvasGroup) ##self._item.reparent(self.canvas.root()) - self._group = None + pass def bind(self, sequence, func, add=None): bind(self._item, sequence, func, add) @@ -103,33 +101,23 @@ class _CanvasItem: self._item = None def lower(self, positions=None): - print "lower", self._item, positions - if positions is None: - if self._group: - self._group._item.lower_to_bottom() - ##self._item.lower_to_bottom() - else: - self._item.lower_to_bottom() - else: - print self, 'lower', positions - ##~ assert type(positions) is types.IntType and positions > 0 - self._item.lower(positions) + return # used for reordered shadow; don't need? +## if positions is None: +## self._item.lower_to_bottom() +## self._item.get_property('parent').raise_to_top() +## else: +## ##~ assert type(positions) is types.IntType and positions > 0 +## self._item.lower(positions) def tkraise(self, positions=None): - ##print "tkraise", self._group, self._item.get_property('parent') #self._item, positions + ##print 'tkraise', positions if positions is None: self._item.raise_to_top() self._item.get_property('parent').raise_to_top() -## if self._group: -## self._group._item.raise_to_top() -## ##self._item.raise_to_top() -## else: -## self._item.raise_to_top() else: - print self, 'tkraise', positions + print self, 'tkraise', positions # don't used? ##~ assert type(positions) is types.IntType and positions > 0 - ##~ self._item.raise_(positions) - self._item.raise_to_top() + self._item.raise_(positions) def move(self, x, y): self._item.move(x, y) @@ -165,6 +153,7 @@ class MfxCanvasImage(_CanvasItem): width=image.width(), height=image.height(), anchor=anchor) + self._item.show() def config(self, image): ##~ assert isinstance(image.im, GdkImlib.Image) @@ -194,16 +183,19 @@ class MfxCanvasLine(_CanvasItem): self._item = canvas.root().add(gnome.canvas.CanvasLine, points=points, **kwargs) self._item.show() - canvas.show_all() + #canvas.show_all() class MfxCanvasRectangle(_CanvasItem): - def __init__(self, canvas, x1, y1, x2, y2, width, fill, outline): + def __init__(self, canvas, x1, y1, x2, y2, + width=0, fill=None, outline=None): _CanvasItem.__init__(self, canvas) - kw = {'x1': x1, 'x2': x2, 'y1': y1, 'y2': y2, 'width_pixels': width} - if fill: kw['fill_color'] = fill + kw = {'x1': x1, 'x2': x2, 'y1': y1, 'y2': y2} + if width: kw['width_pixels'] = width + if fill: kw['fill_color'] = fill if outline: kw['outline_color'] = outline self._item = canvas.root().add(gnome.canvas.CanvasRect, **kw) + self._item.show() class MfxCanvasText(_CanvasItem): @@ -223,6 +215,7 @@ class MfxCanvasText(_CanvasItem): self[k] = v self.text_format = None canvas._text_items.append(self) + self._item.show() def __setitem__(self, key, value): if key == 'fill': @@ -241,7 +234,7 @@ class MfxCanvasText(_CanvasItem): def __getitem__(self, key): if key == 'text': # FIXME - return "" + return self._item.get_property('text') else: raise AttributeError, key cget = __getitem__ @@ -330,12 +323,12 @@ class MfxCanvas(gnome.canvas.Canvas): def configure(self, **kw): height, width = -1, -1 for k, v in kw.items(): - if k == "background" or k == "bg": + if k in ("background", "bg"): ##print 'configure: bg:', v c = self.get_colormap().alloc_color(v) self.style.bg[gtk.STATE_NORMAL] = c ##~ self.set_style(self.style) - self.queue_draw() + ##~ self.queue_draw() elif k == "cursor": ##~ w = self.window ##~ if w: @@ -445,10 +438,15 @@ class MfxCanvas(gnome.canvas.Canvas): self.realize() ##return False - self.setBackgroundImage(filename, stretch) + gtk.idle_add(self.setBackgroundImage, filename, stretch) - def setBackgroundImage(self, filename, stretch): + def setBackgroundImage(self, filename, stretch=False): print 'setBackgroundImage', filename + if filename is None: + if self.__tileimage: + self.__tileimage.destroy() + self.__tileimage = None + return width, height = self.get_size() pixbuf = gtk.gdk.pixbuf_new_from_file(filename) @@ -509,6 +507,19 @@ class MfxCanvas(gnome.canvas.Canvas): self.update_now() pass + def updateAll(self): + print 'Canvas - updateAll', + for i in self._all_items: + i._item.hide() + self.update_now() + n = 0 + for i in self._all_items: + i._item.show() + print n, i + n += 1 + self.update_now() + #self.window.invalidate_rect((0, 0, 400, 400), True) + def grid(self, *args, **kw): self.top.table.attach(self, diff --git a/pysollib/pysolgtk/tkconst.py b/pysollib/pysolgtk/tkconst.py index a6dae2b0..df733e72 100644 --- a/pysollib/pysolgtk/tkconst.py +++ b/pysollib/pysolgtk/tkconst.py @@ -31,9 +31,12 @@ # imports -import sys +##import sys + from gtk import gdk +from gtk import ANCHOR_NW, ANCHOR_SW, ANCHOR_NE, ANCHOR_SE + # /*********************************************************************** # // constants diff --git a/pysollib/pysolgtk/tkwidget.py b/pysollib/pysolgtk/tkwidget.py index 1cef442c..974853b9 100644 --- a/pysollib/pysolgtk/tkwidget.py +++ b/pysollib/pysolgtk/tkwidget.py @@ -51,8 +51,8 @@ from pysollib.mfxutil import kwdefault, KwStruct class _MyDialog(gtk.Dialog): def __init__(self): gtk.Dialog.__init__(self) - style = self.get_style().copy() - self.set_style(style) + ##~ style = self.get_style().copy() + ##~ self.set_style(style) self.connect("destroy", self.quit) self.connect("delete_event", self.quit) diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index a11f3977..2b8065b7 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -124,17 +124,24 @@ class _MfxToplevel(gtk.Window): # FIXME return gdk.LEFT_PTR return self.get_window().get_cursor(v) + elif attr in ("background", "bg"): + c = self.style.bg[gtk.STATE_NORMAL] + c = '#%02x%02x%02x' % (c.red/256, c.green/256, c.blue/256) + return c print "Toplevel cget:", attr ##~ raise AttributeError, attr + return None def configure(self, **kw): height, width = -1, -1 for k, v in kw.items(): - if k == "background" or k == "bg": - c = self.get_colormap().alloc_color(v) - self.style.bg[gtk.STATE_NORMAL] = c + if k in ("background", "bg"): + ##print "Toplevel configure: bg" + ##~ c = self.get_colormap().alloc_color(v) + ##~ self.style.bg[gtk.STATE_NORMAL] = c ##~ self.set_style(self.style) - self.queue_draw() + ##~ self.queue_draw() + pass elif k == "cursor": self.setCursor(v) elif k == "height": diff --git a/pysollib/tk/selectcardset.py b/pysollib/tk/selectcardset.py index 8612ea36..17fc322a 100644 --- a/pysollib/tk/selectcardset.py +++ b/pysollib/tk/selectcardset.py @@ -33,7 +33,7 @@ ## ##---------------------------------------------------------------------------## -__all__ = ['SelectCardsetByTypeDialogWithPreview'] +__all__ = ['SelectCardsetDialogWithPreview'] # imports import os, re, sys, types, Tkinter From b2ee652928d4135bfadac489477f5688504aec58 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 19 Aug 2006 22:45:59 +0000 Subject: [PATCH 051/266] * improved GTK bindings; menu and stats-dialog git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@52 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- data/pysolfc.glade | 1 + pysol | 6 + pysollib/app.py | 4 +- pysollib/game.py | 8 +- pysollib/help.py | 12 +- pysollib/main.py | 35 ++-- pysollib/pysolgtk/menubar.py | 235 +++++++++++++++-------- pysollib/pysolgtk/progressbar.py | 6 - pysollib/pysolgtk/tkcanvas.py | 29 ++- pysollib/pysolgtk/tkconst.py | 1 - pysollib/pysolgtk/tkstats.py | 314 ++++++++++++++++++++++++++++++- pysollib/pysolgtk/tkutil.py | 2 - pysollib/pysolgtk/tkwidget.py | 11 +- pysollib/pysolgtk/tkwrap.py | 12 +- pysollib/pysolgtk/toolbar.py | 67 ++++--- pysollib/settings.py | 2 +- pysollib/stack.py | 16 +- pysollib/tk/menubar.py | 3 +- pysollib/tk/tkconst.py | 5 +- 19 files changed, 586 insertions(+), 183 deletions(-) create mode 120000 data/pysolfc.glade diff --git a/data/pysolfc.glade b/data/pysolfc.glade new file mode 120000 index 00000000..2d4f6279 --- /dev/null +++ b/data/pysolfc.glade @@ -0,0 +1 @@ +../../../pysolfc/pysolfc.glade \ No newline at end of file diff --git a/pysol b/pysol index 77070ee1..b53c9be6 100755 --- a/pysol +++ b/pysol @@ -59,6 +59,12 @@ if os.name == 'nt': ##if locale_dir: locale_dir = os.path.normpath(locale_dir) gettext.install('pysol', locale_dir, unicode=True) +## init toolkit +if '--gtk' in sys.argv: + import pysollib.settings + pysollib.settings.TOOLKIT = 'gtk' + sys.argv.remove('--gtk') + from pysollib.main import main #import pychecker.checker diff --git a/pysollib/app.py b/pysollib/app.py index 8032d75e..cb8d6771 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -58,7 +58,7 @@ from gamedb import GI, GAME_DB, loadGame from settings import TOP_SIZE, TOP_TITLE, TOOLKIT # Toolkit imports -from pysoltk import tkname, tkversion, wm_withdraw, loadImage +from pysoltk import wm_withdraw, loadImage from pysoltk import MfxMessageDialog, MfxExceptionDialog from pysoltk import TclError, MfxRoot, MfxCanvas, MfxScrolledCanvas from pysoltk import PysolMenubar @@ -107,7 +107,7 @@ class Options: self.shrink_face_down = True self.shade_filled_stacks = True self.demo_logo = True - self.toolbar = True + self.toolbar = 1 # 0 == hide, 1,2,3,4 == top, bottom, lef, right ##self.toolbar_style = 'default' self.toolbar_style = 'crystal' if os.name == 'posix': diff --git a/pysollib/game.py b/pysollib/game.py index 85a2ef2a..7555d1d9 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -52,7 +52,7 @@ from resource import CSI from pysolrandom import PysolRandom, LCRandom31 from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE from pysoltk import CURSOR_WATCH, ANCHOR_SW, ANCHOR_SE -from pysoltk import tkname, bind, wm_map +from pysoltk import bind, wm_map from pysoltk import after, after_idle, after_cancel from pysoltk import MfxMessageDialog, MfxExceptionDialog from pysoltk import MfxCanvasText, MfxCanvasImage @@ -393,8 +393,8 @@ class Game: if self.canvas: self.canvas.config(cursor=cursor) ##self.canvas.update_idletasks() - if self.app and self.app.toolbar: - self.app.toolbar.setCursor(cursor=cursor) + #if self.app and self.app.toolbar: + # self.app.toolbar.setCursor(cursor=cursor) # @@ -529,7 +529,6 @@ class Game: self.busy = old_busy def resetGame(self): - ##print '--- resetGame ---' self.hints.list = None self.s.talon.removeAllCards() for stack in self.allstacks: @@ -560,7 +559,6 @@ class Game: # with another game from there def quitGame(self, id=0, random=None, loadedgame=None, startdemo=0, bookmark=0, holdgame=0): - print 'quitGame' self.updateTime() if bookmark: id, random = self.id, self.random diff --git a/pysollib/help.py b/pysollib/help.py index 40ef2287..28dfeca4 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -41,9 +41,9 @@ import Tkinter # PySol imports from mfxutil import EnvError -from settings import PACKAGE, PACKAGE_URL +from settings import PACKAGE, PACKAGE_URL, TOOLKIT from version import VERSION, FC_VERSION -from pysoltk import tkname, makeHelpToplevel, wm_map, wm_set_icon +from pysoltk import makeHelpToplevel, wm_map, wm_set_icon from pysoltk import MfxMessageDialog from pysoltk import tkHTMLViewer from gamedb import GAME_DB @@ -95,10 +95,10 @@ def helpCredits(app, timeout=0, sound=1): if sound: app.audio.playSample("credits") t = "" - if tkname == "tk": t = "Tcl/Tk, " - elif tkname == "gnome": t = "PyGTK, " - elif tkname == "kde": t = "pyKDE, " - elif tkname == "wx": t = "wxPython, " + if TOOLKIT == "tk": t = "Tcl/Tk, " + elif TOOLKIT == "gtk": t = "PyGTK, " + elif TOOLKIT == "kde": t = "pyKDE, " + elif TOOLKIT == "wx": t = "wxPython, " d = MfxMessageDialog(app.top, title=_("Credits"), timeout=timeout, text=PACKAGE+_(''' credits go to: diff --git a/pysollib/main.py b/pysollib/main.py index 705d89fc..afdc65ae 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -44,7 +44,7 @@ import gettext from mfxutil import destruct, EnvError from util import CARDSET, DataLoader from version import VERSION -from settings import PACKAGE +from settings import PACKAGE, TOOLKIT from resource import Tile from gamedb import GI from app import Application @@ -52,12 +52,11 @@ from pysolaudio import thread, pysolsoundserver from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient, Win32AudioClient # Toolkit imports -from pysoltk import tkname, tkversion, wm_withdraw, wm_set_icon, loadImage +from pysoltk import tkversion, wm_withdraw, wm_set_icon, loadImage from pysoltk import MfxMessageDialog, MfxExceptionDialog from pysoltk import TclError, MfxRoot from pysoltk import PysolProgressBar -from tkFont import Font # /*********************************************************************** # // @@ -327,20 +326,22 @@ def pysol_init(app, args): font = top.option_get('font', '') else: font = None - try: - f = Font(top, font) - except: - print >> sys.stderr, "invalid font name:", font - pass - else: - if font: - fa = f.actual() - app.opt.fonts["default"] = (fa["family"], - fa["size"], - fa["slant"], - fa["weight"]) + if TOOLKIT == 'tk': + from tkFont import Font + try: + f = Font(top, font) + except: + print >> sys.stderr, "invalid font name:", font + pass else: - app.opt.fonts["default"] = None + if font: + fa = f.actual() + app.opt.fonts["default"] = (fa["family"], + fa["size"], + fa["slant"], + fa["weight"]) + else: + app.opt.fonts["default"] = None # check games if len(app.gdb.getGamesIdSortedByName()) == 0: @@ -559,7 +560,7 @@ def main(args=None): print "%s needs Python 1.5.2 or better (you have %s)" % (PACKAGE, sys.version) return 1 assert len(tkversion) == 4 - if tkname == "tk": + if TOOLKIT == "tk": import Tkinter if tkversion < (8, 0, 0, 0): print "%s needs Tcl/Tk 8.0 or better (you have %s)" % (PACKAGE, str(tkversion)) diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 0223101b..068bc18b 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -53,6 +53,7 @@ gettext = _ def ltk2gtk(s): + # label tk to gtk return gettext(s).replace('&', '_') @@ -69,7 +70,7 @@ class PysolMenubar(PysolMenubarActions): # create menus menubar = self.createMenubar() self.top.table.attach(menubar, - 0, 1, 0, 1, + 0, 3, 0, 1, gtk.EXPAND | gtk.FILL, 0, 0, 0); menubar.show() @@ -119,7 +120,7 @@ class PysolMenubar(PysolMenubarActions): ('stats', gtk.STOCK_INDEX, ltk2gtk('Stats'), None, ltk2gtk('Statistics'), - self.mStatus), + lambda w, self=self: self.mPlayerStats(mode=101)), ('rules', gtk.STOCK_HELP, ltk2gtk('Rules'), 'F1', ltk2gtk('Rules'), @@ -136,9 +137,12 @@ class PysolMenubar(PysolMenubarActions): ('game', None, ltk2gtk('&Game')), ('assist', None, ltk2gtk('&Assist')), ('options', None, ltk2gtk('&Options')), - ('assistlevel', None, ltk2gtk("Assist &level")), - ("automaticplay", None, ltk2gtk("&Automatic play")), + ('assistlevel', None, ltk2gtk('Assist &level')), + ('automaticplay', None, ltk2gtk('&Automatic play')), ('animations', None, ltk2gtk('A&nimations')), + ('cardview', None, ltk2gtk('Card &view')), + ('toolbar', None, ltk2gtk('&Toolbar')), + ('statusbar', None, ltk2gtk('Stat&usbar')), ('help', None, ltk2gtk('&Help')), ### menuitems @@ -150,7 +154,10 @@ class PysolMenubar(PysolMenubarActions): None, self.mSelectGameById), ('saveas', None, ltk2gtk('Save &as...'), None, - None, self.m), + None, self.mSaveAs), + ('holdandquit', None, + ltk2gtk('&Hold and quit'), None, + None, self.mHoldAndQuit), ('redoall', None, ltk2gtk('Redo &all'), None, None, self.mRedoAll), @@ -195,34 +202,53 @@ class PysolMenubar(PysolMenubarActions): # toggle_entries = [ - ('pause', # name - gtk.STOCK_STOP, ltk2gtk('&Pause'), # stock, label - 'P', ltk2gtk('Pause game'), # accelerator, tooltip - self.mPause, # callback - False, # initial value - ), ] - for label, name, opt_name in ( - ('A&uto drop', 'optautodrop', 'autodrop'), - ('Auto &face up', '', 'autofaceup'), - ('Auto &deal', '', 'autodeal'), - ('&Quick play', '', 'quickplay'), - ('Enable &undo', '', 'undo'), - ('Enable &bookmarks' , '', 'bookmarks'), - ('Enable &hint', '', 'hint'), - ('Enable highlight p&iles', '', 'highlight_piles'), - ('Enable highlight &cards', '', 'highlight_cards'), - ('Enable highlight same &rank', '', 'highlight_samerank'), - ('Highlight &no matching', '', 'highlight_not_matching'), - ('Card shado&w', '', 'shadow'), - ('Shade &legal moves', '', 'shade'), + ('pause', gtk.STOCK_STOP, # action, stock + ltk2gtk('&Pause'), 'P', # label, accelerator + ltk2gtk('Pause game'), # tooltip + self.mPause, # callback + False, # initial value + ), + ('negativecardsbottom', None, + ltk2gtk('&Negative cards bottom'), None, None, + self.mOptNegativeBottom, + self.app.opt.negative_bottom, + ), + ('showstatusbar', None, + ltk2gtk('Show &statusbar'), None, None, + self.mOptStatusbar, + self.app.opt.statusbar, + ), + ] + for label, action, opt_name, update_game in ( + ('A&uto drop', 'optautodrop', 'autodrop', False), + ('Auto &face up', '', 'autofaceup', False), + ('Auto &deal', '', 'autodeal', False), + ('&Quick play', '', 'quickplay', False), + ('Enable &undo', '', 'undo', False), + ('Enable &bookmarks', '', 'bookmarks', False), + ('Enable &hint', '', 'hint', False), + ('Enable highlight p&iles', '', 'highlight_piles', False), + ('Enable highlight &cards', '', 'highlight_cards', False), + ('Enable highlight same &rank', '', 'highlight_samerank', False), + ('Highlight &no matching', '', 'highlight_not_matching', False), + ('Card shado&w', '', 'shadow', False), + ('Shade &legal moves', '', 'shade', False), + ('Shrink face-down cards', '', 'shrink_face_down', True), + ('Shade &filled stacks', '', 'shade_filled_stacks', True), + ('Stick&y mouse', '', 'sticky_mouse', False), + ('Show &number of cards', '', 'num_cards', False), + ('&Demo logo', '', 'demo_logo', False), + ('Startup splash sc&reen', '', 'splashscreen', False), + ('&Show removed tiles (in Mahjongg games)', '', 'mahjongg_show_removed', True), + ('Show hint &arrow (in Shisen-Sho games)', '', 'shisen_show_hint', False), ): - if not name: - name = re.sub(r"[^0-9a-zA-Z]", "", label).lower() + if not action: + action = re.sub(r'[^0-9a-zA-Z]', '', label).lower() toggle_entries.append( - (name, + (action, None, ltk2gtk(label), None, None, - lambda w, opt_name=opt_name: self.mOptToggle(w, opt_name), + lambda w, o=opt_name, u=update_game: self.mOptToggle(w, o, u), getattr(self.app.opt, opt_name))) # @@ -233,6 +259,14 @@ class PysolMenubar(PysolMenubarActions): ('animationslow', None, ltk2gtk('&Slow'), None, None, 3), ('animationveryslow', None, ltk2gtk('&Very slow'), None, None, 4), ) + toolbar_side_entries = ( + ('toolbarhide', None, ltk2gtk('Hide'), None, None, 0), + ('toolbartop', None, ltk2gtk('Top'), None, None, 1), + ('toolbarbottom', None, ltk2gtk('Bottom'), None, None, 2), + ('toolbarleft', None, ltk2gtk('Left'), None, None, 3), + ('toolbarright', None, ltk2gtk('Right'), None, None, 4), + ) + # ui_info = ''' @@ -247,6 +281,7 @@ class PysolMenubar(PysolMenubarActions): + @@ -256,8 +291,10 @@ class PysolMenubar(PysolMenubarActions): + @@ -266,6 +303,7 @@ class PysolMenubar(PysolMenubarActions): + @@ -292,6 +330,9 @@ class PysolMenubar(PysolMenubarActions): + + + @@ -303,8 +344,28 @@ class PysolMenubar(PysolMenubarActions): - - + + + + + + + + + + + + + + + + + + + + + +
    • @@ -326,6 +387,9 @@ class PysolMenubar(PysolMenubarActions): action_group.add_radio_actions(animations_entries, self.app.opt.animations, self.mOptAnimations) + action_group.add_radio_actions(toolbar_side_entries, + self.app.opt.toolbar, + self.mOptToolbar) ui_manager.insert_action_group(action_group, 0) self.top.add_accel_group(ui_manager.get_accel_group()) @@ -421,7 +485,6 @@ class PysolMenubar(PysolMenubarActions): d = gtk.FileChooserDialog(title, self.top, action, (gtk.STOCK_OPEN, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) - d.set_current_folder(idir) if ifile: d.set_current_name(ifile) @@ -451,7 +514,7 @@ class PysolMenubar(PysolMenubarActions): if filename: idir, ifile = os.path.split(os.path.normpath(filename)) else: - idir, ifile = "", "" + idir, ifile = '', '' if not idir: idir = self.app.dn.savegames filename = self._createFileChooser(_('Open Game'), @@ -471,12 +534,12 @@ class PysolMenubar(PysolMenubarActions): filename = self.game.filename if not filename: filename = self.app.getGameSaveName(self.game.id) - if os.name == "posix": - filename = filename + "-" + self.game.getGameNumber(format=0) + if os.name == 'posix': + filename = filename + '-' + self.game.getGameNumber(format=0) elif os.path.supports_unicode_filenames: # new in python 2.3 - filename = filename + "-" + self.game.getGameNumber(format=0) + filename = filename + '-' + self.game.getGameNumber(format=0) else: - filename = filename + "-01" + filename = filename + '-01' filename = filename + '.pso' idir, ifile = os.path.split(os.path.normpath(filename)) if not idir: @@ -493,49 +556,14 @@ class PysolMenubar(PysolMenubarActions): - def mOptTableTile(self, *args): - if self._cancelDrag(break_pause=False): return - key = self.app.tabletile_index - if key <= 0: - key = self.app.opt.table_color.lower() - d = SelectTileDialogWithPreview(self.top, app=self.app, - title=_('Select table background'), - manager=self.app.tabletile_manager, - key=key) - if d.status == 0 and d.button in (0, 1): - if type(d.key) is str: - self._mOptTableColor(d.key) - elif d.key > 0 and d.key != self.app.tabletile_index: - self._mOptTableTile(d.key) - - - def mOptHintOptions(self, *args): - pass - - def mOptDemoOptions(self, *args): - pass - def updateFavoriteGamesMenu(self, *args): pass + def mSelectGame(self, menu_item, game_id): if menu_item.get_active(): self._mSelectGame(game_id) - def mOptAnimations(self, a1, a2): - ##print a1.get_current_value(), a2.get_current_value() - self.app.opt.animations = a1.get_current_value() - - - def _mOptTableTile(self, i): - self.app.setTile(i) - - def _mOptTableColor(self, color): - tile = self.app.tabletile_manager.get(0) - tile.color = color - self.app.setTile(0) - - def mSelectGameDialogWithPreview(self, *event): if self._cancelDrag(break_pause=False): return ## self.game.setCursor(cursor=CURSOR_WATCH) @@ -546,12 +574,9 @@ class PysolMenubar(PysolMenubarActions): ## bookmark = self.game.gsaveinfo.bookmarks[-2][0] ## del self.game.gsaveinfo.bookmarks[-2] ##~ after_idle(self.top, self.__restoreCursor) - d = SelectGameDialogWithPreview(self.top, title=_("Select game"), + d = SelectGameDialogWithPreview(self.top, title=_('Select game'), app=self.app, gameid=self.game.id, bookmark=bookmark) - return self._mSelectGameDialog(d) - - def _mSelectGameDialog(self, d): if d.status == 0 and d.button == 0 and d.gameid != self.game.id: ##~ self.tkopt.gameid.set(d.gameid) ##~ self.tkopt.gameid_popular.set(d.gameid) @@ -564,10 +589,28 @@ class PysolMenubar(PysolMenubarActions): self.game.quitGame(d.gameid, random=d.random) + def mOptTableTile(self, *args): + if self._cancelDrag(break_pause=False): return + key = self.app.tabletile_index + if key <= 0: + key = self.app.opt.table_color.lower() + d = SelectTileDialogWithPreview(self.top, app=self.app, + title=_('Select table background'), + manager=self.app.tabletile_manager, + key=key) + if d.status == 0 and d.button in (0, 1): + if type(d.key) is str: + tile = self.app.tabletile_manager.get(0) + tile.color = color + self.app.setTile(0) + elif d.key > 0 and d.key != self.app.tabletile_index: + self.app.setTile(i) + + def mSelectCardsetDialog(self, *event): if self._cancelDrag(break_pause=False): return key = self.app.nextgame.cardset.index - d = SelectCardsetDialogWithPreview(self.top, title=_("Select cardset"), + d = SelectCardsetDialogWithPreview(self.top, title=_('Select cardset'), app=self.app, manager=self.app.cardset_manager, key=key) cs = self.app.cardset_manager.get(d.key) if cs is None or d.key == self.app.cardset.index: @@ -581,10 +624,42 @@ class PysolMenubar(PysolMenubarActions): self.app.opt.games_geometry = {} # clear saved games geometry - def mOptToggle(self, w, opt): + def mOptToggle(self, w, opt_name, update_game): ##print 'mOptToggle:', opt, w.get_active() if self._cancelDrag(break_pause=False): return - self.app.opt.__dict__[opt] = w.get_active() + self.app.opt.__dict__[opt_name] = w.get_active() + if update_game: + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def mOptNegativeBottom(self, w): + if self._cancelDrag(): return + self.app.opt.negative_bottom = w.get_active() + self.app.updateCardset() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + + def mOptAnimations(self, w1, w2): + self.app.opt.animations = w1.get_current_value() + + + def mOptToolbar(self, w1, w2): + if self._cancelDrag(break_pause=False): return + side = w1.get_current_value() + self.app.opt.toolbar = side + if self.app.toolbar.show(side, resize=1): + self.top.update_idletasks() + + + def mOptStatusbar(self, w): + if self._cancelDrag(break_pause=False): return + if not self.app.statusbar: return + side = w.get_active() + self.app.opt.statusbar = side + resize = not self.app.opt.save_games_geometry + if self.app.statusbar.show(side, resize=resize): + self.top.update_idletasks() def updateAll(self, *event): diff --git a/pysollib/pysolgtk/progressbar.py b/pysollib/pysolgtk/progressbar.py index 6238455b..82e8e6c3 100644 --- a/pysollib/pysolgtk/progressbar.py +++ b/pysollib/pysolgtk/progressbar.py @@ -86,12 +86,6 @@ class PysolProgressBar: self.pbar.set_text(str(show_text)+'%') w, h = self.pbar.size_request() self.pbar.set_size_request(max(w, 300), max(h, height)) - # set color - ##~ c = self.pbar.get_colormap().alloc_color(color) - ##~ self.pbar.style.bg[gtk.STATE_PRELIGHT] = c - ##~ style = self.pbar.get_style().copy() - ##~ style.bg[gtk.STATE_PRELIGHT] = c - ##~ self.pbar.set_style(style) # hbox-3:image if images and images[1]: im = gtk.Image() diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index 90b6572d..1570974d 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -76,6 +76,7 @@ class _CanvasItem: def __init__(self, canvas): self.canvas = canvas canvas._all_items.append(self) + self._is_hidden = False def addtag(self, group): ##print self, 'addtag' @@ -126,9 +127,11 @@ class _CanvasItem: def show(self): if self._item: self._item.show() + self._is_hidden = False def hide(self): if self._item: self._item.hide() + self._is_hidden = True def connect(self, signal, func, args): ##print signal @@ -251,6 +254,7 @@ class MfxCanvas(gnome.canvas.Canvas): self.items = {} self._all_items = [] self._text_items = [] + self._hidden_items = [] self._width, self._height = -1, -1 self._tile = None # private @@ -327,13 +331,10 @@ class MfxCanvas(gnome.canvas.Canvas): ##print 'configure: bg:', v c = self.get_colormap().alloc_color(v) self.style.bg[gtk.STATE_NORMAL] = c - ##~ self.set_style(self.style) - ##~ self.queue_draw() elif k == "cursor": - ##~ w = self.window - ##~ if w: - ##~ w.set_cursor(cursor_new(v)) - pass + if not self.window: + self.realize() + self.window.set_cursor(gdk.Cursor(v)) elif k == "height": height = v elif k == "width": @@ -359,12 +360,16 @@ class MfxCanvas(gnome.canvas.Canvas): self.__tileimage = None def hideAllItems(self): + self._hidden_items = [] for i in self._all_items: - i.hide() + if not i._is_hidden: + i.hide() + self._hidden_items.append(i) def showAllItems(self): - for i in self._all_items: + for i in self._hidden_items: i.show() + self._hidden_items = [] # PySol extension def findCard(self, stack, event): @@ -440,8 +445,9 @@ class MfxCanvas(gnome.canvas.Canvas): gtk.idle_add(self.setBackgroundImage, filename, stretch) + def setBackgroundImage(self, filename, stretch=False): - print 'setBackgroundImage', filename + ##print 'setBackgroundImage', filename if filename is None: if self.__tileimage: self.__tileimage.destroy() @@ -504,6 +510,9 @@ class MfxCanvas(gnome.canvas.Canvas): ##print 'MfxCanvas.update_idletasks' #gdk.window_process_all_updates() #self.show_now() + # FIXME + ##if self.__topimage: + ## self.__topimage.raise_to_top() self.update_now() pass @@ -523,7 +532,7 @@ class MfxCanvas(gnome.canvas.Canvas): def grid(self, *args, **kw): self.top.table.attach(self, - 0, 1, 2, 3, + 1, 2, 2, 3, gtk.EXPAND | gtk.FILL, gtk.EXPAND | gtk.FILL | gtk.SHRINK, 0, 0) self.show() diff --git a/pysollib/pysolgtk/tkconst.py b/pysollib/pysolgtk/tkconst.py index df733e72..d7a36b1e 100644 --- a/pysollib/pysolgtk/tkconst.py +++ b/pysollib/pysolgtk/tkconst.py @@ -42,7 +42,6 @@ from gtk import ANCHOR_NW, ANCHOR_SW, ANCHOR_NE, ANCHOR_SE # // constants # ************************************************************************/ -tkname = "gnome" # (major version, minor version, micro version, patchlevel) tkversion = (0, 0, 0, 0) diff --git a/pysollib/pysolgtk/tkstats.py b/pysollib/pysolgtk/tkstats.py index 7d9c893c..70ccdafe 100644 --- a/pysollib/pysolgtk/tkstats.py +++ b/pysollib/pysolgtk/tkstats.py @@ -31,21 +31,275 @@ # imports -import os, sys -import gtk +import os, sys, time +import gtk, gobject, pango +import gtk.glade # PySol imports +from pysollib.mfxutil import format_time +from pysollib.settings import TOP_TITLE +from pysollib.stats import PysolStatsFormatter # Toolkit imports -from tkwidget import MfxDialog +from tkwidget import MfxDialog, MfxMessageDialog + + +glade_file = os.path.join(sys.path[0], 'data', 'pysolfc.glade') + +open(glade_file) # /*********************************************************************** # // # ************************************************************************/ -class SingleGame_StatsDialog(MfxDialog): - pass +class StatsWriter(PysolStatsFormatter.StringWriter): + def __init__(self, store): + self.store = store + + def p(self, s): + pass + + def pheader(self, s): + pass + + def pstats(self, *args, **kwargs): + gameid=kwargs.get('gameid', None) + if gameid is None: + # header + return + iter = self.store.append(None) + self.store.set(iter, + 0, args[0], + 1, args[1], + 2, args[2], + 3, args[3], + 4, args[4], + 5, args[5], + 6, args[6], + 7, gameid) + + +class FullLogWriter(PysolStatsFormatter.StringWriter): + def __init__(self, store): + self.store = store + + def p(self, s): + pass + + def pheader(self, s): + pass + + def plog(self, gamename, gamenumber, date, status, gameid=-1, won=-1): + if gameid < 0: + # header + return + iter = self.store.append(None) + self.store.set(iter, + 0, gamename, + 1, gamenumber, + 2, date, + 3, status, + 4, gameid) + + +class Game_StatsDialog: + + def __init__(self, parent, header, app, player, gameid): + # + self.app = app + + formatter = PysolStatsFormatter(self.app) + # + self.widgets_tree = gtk.glade.XML(glade_file) + #game_name_combo = self.widgets_tree.get_widget('game_name_combo') + #model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_INT) + #game_name_combo.set_model(model) + #game_name_combo.set_text_column(0) + stats_dialog = self.widgets_tree.get_widget('stats_dialog') + stats_dialog.set_title('Game Statistics') + stats_dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + # total + won, lost = app.stats.getStats(player, gameid) + self._createText('total', won, lost) + drawing = self.widgets_tree.get_widget('total_drawingarea') + drawing.connect('expose_event', self._createChart, won, lost) + # current session + won, lost = app.stats.getSessionStats(player, gameid) + self._createText('current', won, lost) + drawing = self.widgets_tree.get_widget('session_drawingarea') + drawing.connect('expose_event', self._createChart, won, lost) + # + store = self._createStatsList() + writer = StatsWriter(store) + formatter.writeStats(writer, player, header, sort_by='name') + # + store = self._createLogList('full_log_treeview') + writer = FullLogWriter(store) + formatter.writeFullLog(writer, player, header) + # + store = self._createLogList('session_log_treeview') + writer = FullLogWriter(store) + formatter.writeSessionLog(writer, player, header) + # + stats_dialog.set_transient_for(parent) + stats_dialog.resize(400, 300) + + stats_dialog.run() + self.status = -1 + stats_dialog.destroy() + + + def _createText(self, name, won, lost): + pwon, plost = self._getPwon(won, lost) + label = self.widgets_tree.get_widget(name+'_num_won_label') + label.set_text(str(won)) + label = self.widgets_tree.get_widget(name+'_num_lost_label') + label.set_text(str(lost)) + label = self.widgets_tree.get_widget(name+'_percent_won_label') + label.set_text(str(int(round(pwon*100)))+'%') + label = self.widgets_tree.get_widget(name+'_percent_lost_label') + label.set_text(str(int(round(plost*100)))+'%') + label = self.widgets_tree.get_widget(name+'_num_total_label') + label.set_text(str(won+lost)) + + + def _createChart(self, drawing, e, won, lost): + pwon, plost = self._getPwon(won, lost) + s, ewon, elost = 0, int(360.0*pwon), int(360.0*plost) + + win = drawing.window + colormap = drawing.get_colormap() + gc = win.new_gc() + gc.set_colormap(colormap) + + alloc = drawing.allocation + width, height = alloc.width, alloc.height + w, h = 90, 50 + ##x, y = 10, 10 + x, y = (width-w)/2, (height-h)/2 + dy = 9 + y = y-dy/2 + + if won+lost > 0: + gc.set_rgb_fg_color(colormap.alloc_color('#007f00')) + win.draw_arc(gc, True, x, y+dy, w, h, s*64, ewon*64) + gc.set_rgb_fg_color(colormap.alloc_color('#7f0000')) + win.draw_arc(gc, True, x, y+dy, w, h, (s+ewon)*64, elost*64) + gc.set_rgb_fg_color(colormap.alloc_color('#00ff00')) + win.draw_arc(gc, True, x, y, w, h, s*64, ewon*64) + gc.set_rgb_fg_color(colormap.alloc_color('#ff0000')) + win.draw_arc(gc, True, x, y, w, h, (s+ewon)*64, elost*64) + else: + gc.set_rgb_fg_color(colormap.alloc_color('#7f7f7f')) + win.draw_arc(gc, True, x, y+dy, w, h, 0, 360*64) + gc.set_rgb_fg_color(colormap.alloc_color('#f0f0f0')) + win.draw_arc(gc, True, x, y, w, h, 0, 360*64) + gc.set_rgb_fg_color(colormap.alloc_color('#bfbfbf')) + pangolayout = drawing.create_pango_layout('No games') + ext = pangolayout.get_extents() + tw, th = ext[1][2]/pango.SCALE, ext[1][3]/pango.SCALE + win.draw_layout( + gc, + x+w/2-tw/2, y+h/2-th/2, + pangolayout) + + + def _createStatsList(self): + treeview = self.widgets_tree.get_widget('all_games_treeview') + n = 0 + for label in ( + '', + _('Played'), + _('Won'), + _('Lost'), + _('Playing time'), + _('Moves'), + _('% won'), + ): + column = gtk.TreeViewColumn(label, gtk.CellRendererText(), + text=n) + column.set_resizable(True) + column.set_sort_column_id(n) + treeview.append_column(column) + n += 1 + # + store = gtk.ListStore(gobject.TYPE_STRING, # name + gobject.TYPE_INT, # played + gobject.TYPE_INT, # won + gobject.TYPE_INT, # lost + gobject.TYPE_STRING, # playing time + gobject.TYPE_STRING, # moves + gobject.TYPE_STRING, # % won + gobject.TYPE_INT, # gameid + ) + sortable = gtk.TreeModelSort(store) + treeview.set_model(sortable) + sortable.set_sort_func(4, self._cmpPlayingTime) + sortable.set_sort_func(5, self._cmpMoves) + sortable.set_sort_func(6, self._cmpPercent) + return store + + + def _createLogList(self, name): + # + treeview = self.widgets_tree.get_widget(name) + n = 0 + for label in ( + _('Game'), + _('Game number'), + _('Started at'), + _('Status'), + ): + column = gtk.TreeViewColumn(label, gtk.CellRendererText(), + text=n) + column.set_resizable(True) + column.set_sort_column_id(n) + treeview.append_column(column) + n += 1 + # + store = gtk.ListStore(gobject.TYPE_STRING, # game name + gobject.TYPE_STRING, # game number + gobject.TYPE_STRING, # started at + gobject.TYPE_STRING, # status + gobject.TYPE_INT, # gameid + ) + treeview.set_model(store) + return store + + + def _getPwon(self, won, lost): + pwon, plost = 0.0, 0.0 + if won + lost > 0: + pwon = float(won) / (won + lost) + pwon = min(max(pwon, 0.00001), 0.99999) + plost = 1.0 - pwon + return pwon, plost + + + def _cmpPlayingTime(self, store, iter1, iter2): + val1 = store.get_value(iter1, 4) + val2 = store.get_value(iter2, 4) + t1 = map(int, val1.split(':')) + t2 = map(int, val2.split(':')) + return cmp(len(t1), len(t2)) or cmp(t1, t2) + + def _cmpMoves(self, store, iter1, iter2): + val1 = store.get_value(iter1, 5) + val2 = store.get_value(iter2, 5) + return cmp(float(val1), float(val2)) + + def _cmpPercent(self, store, iter1, iter2): + val1 = store.get_value(iter1, 6) + val2 = store.get_value(iter2, 6) + return cmp(float(val1), float(val2)) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +SingleGame_StatsDialog = Game_StatsDialog class AllGames_StatsDialog(MfxDialog): pass @@ -56,8 +310,54 @@ class FullLog_StatsDialog(AllGames_StatsDialog): class SessionLog_StatsDialog(FullLog_StatsDialog): pass -class Status_StatsDialog(MfxDialog): - pass + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Status_StatsDialog(MfxMessageDialog): #MfxDialog + def __init__(self, parent, game): + stats, gstats = game.stats, game.gstats + w1 = w2 = '' + n = 0 + for s in game.s.foundations: + n = n + len(s.cards) + w1 = (_('Highlight piles: ') + str(stats.highlight_piles) + '\n' + + _('Highlight cards: ') + str(stats.highlight_cards) + '\n' + + _('Highlight same rank: ') + str(stats.highlight_samerank) + '\n') + if game.s.talon: + if game.gameinfo.redeals != 0: + w2 = w2 + _('\nRedeals: ') + str(game.s.talon.round - 1) + w2 = w2 + _('\nCards in Talon: ') + str(len(game.s.talon.cards)) + if game.s.waste and game.s.waste not in game.s.foundations: + w2 = w2 + _('\nCards in Waste: ') + str(len(game.s.waste.cards)) + if game.s.foundations: + w2 = w2 + _('\nCards in Foundations: ') + str(n) + # + date = time.strftime('%Y-%m-%d %H:%M', time.localtime(game.gstats.start_time)) + MfxMessageDialog.__init__(self, parent, title=_('Game status'), + text=game.getTitleName() + '\n' + + game.getGameNumber(format=1) + '\n' + + _('Playing time: ') + game.getTime() + '\n' + + _('Started at: ') + date + '\n\n'+ + _('Moves: ') + str(game.moves.index) + '\n' + + _('Undo moves: ') + str(stats.undo_moves) + '\n' + + _('Bookmark moves: ') + str(gstats.goto_bookmark_moves) + '\n' + + _('Demo moves: ') + str(stats.demo_moves) + '\n' + + _('Total player moves: ') + str(stats.player_moves) + '\n' + + _('Total moves in this game: ') + str(stats.total_moves) + '\n' + + _('Hints: ') + str(stats.hints) + '\n' + + '\n' + + w1 + w2, + strings=(_('&OK'), + (_('&Statistics...'), 101), + (TOP_TITLE+'...', 105), ), + image=game.app.gimages.logos[3], + image_side='left', image_padx=20, + padx=20, + ) + + class Top_StatsDialog(MfxDialog): pass diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index 69b07582..f19d28dd 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -58,8 +58,6 @@ def wm_set_icon(window, icon): def makeToplevel(parent, title=None, class_=None, gtkclass=gtk.Window): window = gtkclass() - ##~ window.style = window.get_style().copy() - ##~ window.set_style(window.style) if not hasattr(window, 'table'): window.table = gtk.Table(1, 4, False) window.table.show() diff --git a/pysollib/pysolgtk/tkwidget.py b/pysollib/pysolgtk/tkwidget.py index 974853b9..71d8f24d 100644 --- a/pysollib/pysolgtk/tkwidget.py +++ b/pysollib/pysolgtk/tkwidget.py @@ -51,8 +51,6 @@ from pysollib.mfxutil import kwdefault, KwStruct class _MyDialog(gtk.Dialog): def __init__(self): gtk.Dialog.__init__(self) - ##~ style = self.get_style().copy() - ##~ self.set_style(style) self.connect("destroy", self.quit) self.connect("delete_event", self.quit) @@ -110,6 +108,7 @@ class MfxDialog(_MyDialog): return self.createBox(widget_class=gtk.VBox) def createTable(self): + # FIXME return self.createBox(widget_class=gtk.Table) def createBitmaps(self, box, kw): @@ -140,13 +139,17 @@ class MfxDialog(_MyDialog): text = strings[i] if not text: continue + if isinstance(text, (list, tuple)): + text, index = text + else: # str + index = i text = text.replace('&', '_') b = gtk.Button(text) b.set_property('can-default', True) - if i == default: + if index == default: b.grab_focus() #b.grab_default() - b.set_data("user_data", i) + b.set_data("user_data", index) b.connect("clicked", self.done) box.pack_start(b) b.show() diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index 2b8065b7..7813fcc1 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -109,12 +109,10 @@ class StringVar: class _MfxToplevel(gtk.Window): def __init__(self, *args, **kw): gtk.Window.__init__(self, type=gtk.WINDOW_TOPLEVEL) - ##~ self.style = self.get_style().copy() - ##~ self.set_style(self.style) #self.vbox = gtk.VBox() #self.vbox.show() #self.add(self.vbox) - self.table = gtk.Table(3, 5, False) + self.table = gtk.Table(3, 6, False) self.add(self.table) self.table.show() self.realize() @@ -137,10 +135,6 @@ class _MfxToplevel(gtk.Window): for k, v in kw.items(): if k in ("background", "bg"): ##print "Toplevel configure: bg" - ##~ c = self.get_colormap().alloc_color(v) - ##~ self.style.bg[gtk.STATE_NORMAL] = c - ##~ self.set_style(self.style) - ##~ self.queue_draw() pass elif k == "cursor": self.setCursor(v) @@ -256,7 +250,9 @@ class _MfxToplevel(gtk.Window): pass def option_get(self, *args): - ##print self, 'option_get' + if args and args[0] == 'font': + return self.get_style().font_desc.to_string() + print '_MfxToplevel: option_get', args return None def grid_columnconfigure(self, *args, **kw): diff --git a/pysollib/pysolgtk/toolbar.py b/pysollib/pysolgtk/toolbar.py index f2e7845d..93f32386 100644 --- a/pysollib/pysolgtk/toolbar.py +++ b/pysollib/pysolgtk/toolbar.py @@ -32,12 +32,10 @@ # imports import os, re, sys - import gtk -TRUE, FALSE = True, False +from gtk import gdk # PySol imports - from pysollib.actions import PysolToolbarActions @@ -54,9 +52,6 @@ class PysolToolbar(PysolToolbarActions): self.dir = dir self.side = -1 - self.toolbar = gtk.Toolbar(gtk.ORIENTATION_HORIZONTAL, - gtk.TOOLBAR_ICONS) - ui_info = ''' @@ -82,15 +77,11 @@ class PysolToolbar(PysolToolbarActions): ui_manager_id = ui_manager.add_ui_from_string(ui_info) toolbar = ui_manager.get_widget("/toolbar") + self.toolbar = toolbar toolbar.set_tooltips(True) toolbar.set_style(gtk.TOOLBAR_ICONS) - toolbar.show() - top.table.attach(toolbar, - 0, 1, 1, 2, - gtk.EXPAND | gtk.FILL, 0, - 0, 0) - toolbar.show() + self._attached = False # @@ -103,6 +94,11 @@ class PysolToolbar(PysolToolbarActions): def destroy(self): self.toolbar.destroy() + + # + # public methods + # + def getSide(self): return self.side @@ -110,24 +106,51 @@ class PysolToolbar(PysolToolbarActions): return 0 def hide(self, resize=1): - self.show(None, resize) + self.show(0, resize) def show(self, side=1, resize=1): + if self.side == side: + return 0 self.side = side - if side: - self.toolbar.show() - else: + if not side: + # hide self.toolbar.hide() + return 1 + # show + if side == 1: + # top + x, y = 1, 1 + elif side == 2: + # bottom + x, y = 1, 3 + elif side == 3: + # left + x, y = 0, 2 + else: + # right + x, y = 2, 2 + # set orient + if side in (1, 2): + orient = gtk.ORIENTATION_HORIZONTAL + else: + orient = gtk.ORIENTATION_VERTICAL + self.toolbar.set_orientation(orient) + if self._attached: + self.top.table.remove(self.toolbar) + row_span, column_span = 1, 1 + self.top.table.attach(self.toolbar, + x, x+1, y, y+1, + gtk.FILL, gtk.FILL, + 0, 0) + self.toolbar.show() + self._attached = True + return 1 - # - # public methods - # - def setCursor(self, cursor): if self.side: - # FIXME - pass + if self.toolbar.window: + self.toolbar.window.set_cursor(gdk.Cursor(v)) def setRelief(self, relief): # FIXME diff --git a/pysollib/settings.py b/pysollib/settings.py index 491b40d7..70cb08f8 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -29,7 +29,7 @@ PACKAGE = "PySol" PACKAGE_URL = "http://sourceforge.net/projects/pysolfc/" TOOLKIT = 'gtk' -#TOOLKIT = 'tk' +TOOLKIT = 'tk' # data dirs DATA_DIRS = [] diff --git a/pysollib/stack.py b/pysollib/stack.py index e33e9a23..72d06e79 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -99,7 +99,7 @@ from util import Timer from util import ACE, KING, SUITS from util import ANY_SUIT, ANY_COLOR, ANY_RANK, NO_RANK from util import NO_REDEAL, UNLIMITED_REDEALS, VARIABLE_REDEALS -from pysoltk import tkname, EVENT_HANDLED, EVENT_PROPAGATE +from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE from pysoltk import CURSOR_DRAG, ANCHOR_NW, ANCHOR_SE from pysoltk import bind, unbind_destroy from pysoltk import after, after_idle, after_cancel @@ -887,7 +887,11 @@ class Stack: self.cards[i].item.tkraise() self.game.canvas.update_idletasks() self.game.sleep(self.game.app.opt.raise_card_sleep) - self.cards[i].item.lower(self.cards[i+1].item) + if TOOLKIT == 'tk': + self.cards[i].item.lower(self.cards[i+1].item) + elif TOOLKIT == 'gtk': + for c in self.cards[i+1:]: + c.tkraise() self.game.canvas.update_idletasks() return 1 @@ -1160,10 +1164,10 @@ class Stack: if TOOLKIT == 'tk': s1.lower(c.item) s2.lower(c.item) - elif TOOLKIT == 'gtk': - positions = 2 ## FIXME - s1.lower(positions) - s2.lower(positions) +## elif TOOLKIT == 'gtk': +## positions = 2 ## FIXME +## s1.lower(positions) +## s2.lower(positions) return (s1, s2) return () diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index f43b3b33..8357442e 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -1042,8 +1042,7 @@ class PysolMenubar(PysolMenubarActions): def mOptNegativeBottom(self, *event): if self._cancelDrag(): return - n = self.tkopt.negative_bottom.get() - self.app.opt.negative_bottom = n + self.app.opt.negative_bottom = self.tkopt.negative_bottom.get() self.app.updateCardset() self.game.endGame(bookmark=1) self.game.quitGame(bookmark=1) diff --git a/pysollib/tk/tkconst.py b/pysollib/tk/tkconst.py index 94c52dbc..f5fefcb1 100644 --- a/pysollib/tk/tkconst.py +++ b/pysollib/tk/tkconst.py @@ -33,8 +33,7 @@ ## ##---------------------------------------------------------------------------## -__all__ = ['tkname', - 'tkversion', +__all__ = ['tkversion', 'TK_DASH_PATCH', 'EVENT_HANDLED', 'EVENT_PROPAGATE', @@ -64,8 +63,6 @@ n_ = lambda x: x # // constants # ************************************************************************/ -tkname = "tk" - # (major version, minor version, micro version, patchlevel) tkversion = (8, 0, 0, 0) try: From e4e11cc237962e01259e47f260aa5dd8afa3203e Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 21 Aug 2006 21:17:19 +0000 Subject: [PATCH 052/266] * improved GTK bindings; menu, stats-dialog, colors-dialog, timeouts-dialog git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@53 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/ru_pysol.po | 4 +- pysollib/actions.py | 155 ++--------- pysollib/app.py | 38 +-- pysollib/game.py | 34 ++- pysollib/games/mahjongg/shisensho.py | 4 +- pysollib/main.py | 4 +- pysollib/pysolgtk/colorsdialog.py | 110 +++++++- pysollib/pysolgtk/fontsdialog.py | 15 +- pysollib/pysolgtk/menubar.py | 274 +++++++++++++++---- pysollib/pysolgtk/selecttile.py | 6 +- pysollib/pysolgtk/timeoutsdialog.py | 83 +++++- pysollib/pysolgtk/tkcanvas.py | 102 ++++--- pysollib/pysolgtk/tkstats.py | 385 ++++++++++++++++++++------- pysollib/pysolgtk/tkutil.py | 8 +- pysollib/stack.py | 54 ++-- pysollib/tk/colorsdialog.py | 82 +++--- pysollib/tk/findcarddialog.py | 2 +- pysollib/tk/menubar.py | 122 ++++++++- pysollib/tk/selecttile.py | 2 +- pysollib/tk/timeoutsdialog.py | 24 +- pysollib/tk/tkcanvas.py | 32 ++- pysollib/tk/tkstats.py | 6 +- pysollib/tk/tkwidget.py | 9 +- 23 files changed, 1066 insertions(+), 489 deletions(-) diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 9b9773f1..c0e251e9 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" "POT-Creation-Date: Fri Aug 11 02:14:56 2006\n" -"PO-Revision-Date: 2006-08-11 02:13+0400\n" +"PO-Revision-Date: 2006-08-20 17:42+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -2386,7 +2386,7 @@ msgstr "Разрешить показывать карты &одного дос #: pysollib/tk/menubar.py:353 msgid "Highlight &no matching" -msgstr "Подсветка отсутствия &совпадения:" +msgstr "Подсветка отсутствия &совпадения" #: pysollib/tk/menubar.py:355 msgid "&Show removed tiles (in Mahjongg games)" diff --git a/pysollib/actions.py b/pysollib/actions.py index 04df3482..5a0b06c1 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -378,12 +378,6 @@ class PysolMenubarActions: self.game.endGame() self.game.quitGame(id, random=random) - def mSelectGame(self, *args): - self._mSelectGame(self.tkopt.gameid.get()) - - def mSelectGamePopular(self, *args): - self._mSelectGame(self.tkopt.gameid_popular.get()) - def _mNewGameBySeed(self, seed, origin): try: random = constructRandom(seed) @@ -762,19 +756,19 @@ class PysolMenubarActions: def mHint(self, *args): if self._cancelDrag(): return if self.app.opt.hint: - if self.game.showHint(0, self.app.opt.hint_sleep): + if self.game.showHint(0, self.app.opt.timeouts['hint']): self.game.stats.hints += 1 def mHint1(self, *args): if self._cancelDrag(): return if self.app.opt.hint: - if self.game.showHint(1, self.app.opt.hint_sleep): + if self.game.showHint(1, self.app.opt.timeouts['hint']): self.game.stats.hints += 1 def mHighlightPiles(self, *args): if self._cancelDrag(): return if self.app.opt.highlight_piles: - if self.game.highlightPiles(self.app.opt.highlight_piles_sleep): + if self.game.highlightPiles(self.app.opt.timeouts['highlight_piles']): self.game.stats.highlight_piles += 1 def mDemo(self, *args): @@ -787,7 +781,6 @@ class PysolMenubarActions: self._mDemo(mixed=1) def _mDemo(self, mixed): - if self._cancelDrag(): return if self.changed(): # only ask if there have been no demo moves or hints yet if self.game.stats.demo_moves == 0 and self.game.stats.hints == 0: @@ -814,134 +807,36 @@ class PysolMenubarActions: self.game.updateStatus(player=self.app.opt.player) self.game.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.game.id)) - def mOptAutoFaceUp(self, *args): - if self._cancelDrag(): return - self.app.opt.autofaceup = self.tkopt.autofaceup.get() - if self.app.opt.autofaceup: - self.game.autoPlay() - - def mOptAutoDrop(self, *args): - if self._cancelDrag(): return - self.app.opt.autodrop = self.tkopt.autodrop.get() - if self.app.opt.autodrop: - self.game.autoPlay() - - def mOptAutoDeal(self, *args): - if self._cancelDrag(): return - self.app.opt.autodeal = self.tkopt.autodeal.get() - if self.app.opt.autodeal: - self.game.autoPlay() - - def mOptQuickPlay(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.quickplay = self.tkopt.quickplay.get() - - def mOptEnableUndo(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.undo = self.tkopt.undo.get() - self.game.updateMenus() - - def mOptEnableBookmarks(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.bookmarks = self.tkopt.bookmarks.get() - self.game.updateMenus() - - def mOptEnableHint(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.hint = self.tkopt.hint.get() - self.game.updateMenus() - - def mOptEnableHighlightPiles(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.highlight_piles = self.tkopt.highlight_piles.get() - self.game.updateMenus() - - def mOptEnableHighlightCards(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.highlight_cards = self.tkopt.highlight_cards.get() - self.game.updateMenus() - - def mOptEnableHighlightSameRank(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.highlight_samerank = self.tkopt.highlight_samerank.get() - ##self.game.updateMenus() - - def mOptEnableHighlightNotMatching(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.highlight_not_matching = self.tkopt.highlight_not_matching.get() - ##self.game.updateMenus() - - def mOptShrinkFaceDown(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.shrink_face_down = self.tkopt.shrink_face_down.get() - self.game.endGame(bookmark=1) - self.game.quitGame(bookmark=1) - - def mOptShadeFilledStacks(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.shade_filled_stacks = self.tkopt.shade_filled_stacks.get() - self.game.endGame(bookmark=1) - self.game.quitGame(bookmark=1) - - def mOptMahjonggShowRemoved(self, *args): - if self._cancelDrag(): return - self.app.opt.mahjongg_show_removed = self.tkopt.mahjongg_show_removed.get() - ##self.game.updateMenus() - self.game.endGame(bookmark=1) - self.game.quitGame(bookmark=1) - - def mOptShisenShowHint(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.shisen_show_hint = self.tkopt.shisen_show_hint.get() - ##self.game.updateMenus() - -## def mOptSound(self, *args): -## if self._cancelDrag(break_pause=False): return -## self.app.opt.sound = self.tkopt.sound.get() -## if not self.app.opt.sound: -## self.app.audio.stopAll() - def mOptSoundDialog(self, *args): if self._cancelDrag(break_pause=False): return d = SoundOptionsDialog(self.top, _("Sound settings"), self.app) self.tkopt.sound.set(self.app.opt.sound) - def mOptAnimations(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.animations = self.tkopt.animations.get() - - def mOptShadow(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.shadow = self.tkopt.shadow.get() - - def mOptShade(self, *args): - if self._cancelDrag(break_pause=False): return - self.app.opt.shade = self.tkopt.shade.get() - ## def mOptIrregularPiles(self, *args): ## if self._cancelDrag(): return ## self.app.opt.irregular_piles = self.tkopt.irregular_piles.get() - def mOptColorsOptions(self, *args): + def mOptColors(self, *args): if self._cancelDrag(break_pause=False): return d = ColorsDialog(self.top, _("Set colors"), self.app) - table_text_color = self.app.opt.table_text_color - table_text_color_value = self.app.opt.table_text_color_value + text_color = self.app.opt.colors['text'] + use_default_text_color = self.app.opt.use_default_text_color if d.status == 0 and d.button == 0: - self.app.opt.table_text_color = d.table_text_color - self.app.opt.table_text_color_value = d.table_text_color_value - ##self.app.opt.table_color = d.table_color - self.app.opt.highlight_piles_colors = d.highlight_piles_colors - self.app.opt.highlight_cards_colors = d.highlight_cards_colors - self.app.opt.highlight_samerank_colors = d.highlight_samerank_colors - self.app.opt.hintarrow_color = d.hintarrow_color - self.app.opt.highlight_not_matching_color = d.highlight_not_matching_color + self.app.opt.use_default_text_color = d.use_default_color + self.app.opt.colors['text'] = d.text_color + self.app.opt.colors['piles'] = d.piles_color + self.app.opt.colors['cards_1'] = d.cards_1_color + self.app.opt.colors['cards_2'] = d.cards_2_color + self.app.opt.colors['samerank_1'] = d.samerank_1_color + self.app.opt.colors['samerank_2'] = d.samerank_2_color + self.app.opt.colors['hintarrow'] = d.hintarrow_color + self.app.opt.colors['not_matching'] = d.not_matching_color # - if table_text_color != self.app.opt.table_text_color \ - or table_text_color_value != self.app.opt.table_text_color_value: + if (text_color != self.app.opt.colors['text'] or + use_default_text_color != self.app.opt.use_default_text_color): self.app.setTile(self.tkopt.tabletile.get(), 1) - def mOptFontsOptions(self, *args): + def mOptFonts(self, *args): if self._cancelDrag(break_pause=False): return d = FontsDialog(self.top, _("Set fonts"), self.app) if d.status == 0 and d.button == 0: @@ -950,16 +845,16 @@ class PysolMenubarActions: self.game.endGame(bookmark=1) self.game.quitGame(bookmark=1) - def mOptTimeoutsOptions(self, *args): + def mOptTimeouts(self, *args): if self._cancelDrag(break_pause=False): return d = TimeoutsDialog(self.top, _("Set timeouts"), self.app) if d.status == 0 and d.button == 0: - self.app.opt.demo_sleep = d.demo_sleep - self.app.opt.hint_sleep = d.hint_sleep - self.app.opt.raise_card_sleep = d.raise_card_sleep - self.app.opt.highlight_piles_sleep = d.highlight_piles_sleep - self.app.opt.highlight_cards_sleep = d.highlight_cards_sleep - self.app.opt.highlight_samerank_sleep = d.highlight_samerank_sleep + self.app.opt.timeouts['demo'] = d.demo_timeout + self.app.opt.timeouts['hint'] = d.hint_timeout + self.app.opt.timeouts['raise_card'] = d.raise_card_timeout + self.app.opt.timeouts['highlight_piles'] = d.highlight_piles_timeout + self.app.opt.timeouts['highlight_cards'] = d.highlight_cards_timeout + self.app.opt.timeouts['highlight_samerank'] = d.highlight_samerank_timeout ## def mOptSave(self, *args): ## if self._cancelDrag(break_pause=False): return diff --git a/pysollib/app.py b/pysollib/app.py index cb8d6771..0ebdd5eb 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -167,21 +167,27 @@ class Options: self.fonts["sans"] = ("times new roman", 12) self.fonts["fixed"] = ("courier new", 10) # colors - self.table_color = "#008200" - self.highlight_piles_colors = (None, "#ffc000") - self.highlight_cards_colors = (None, "#ffc000", None, "#0000ff") - self.highlight_samerank_colors = (None, "#ffc000", None, "#0000ff") - self.hintarrow_color = "#303030" - self.highlight_not_matching_color = '#ff0000' - self.table_text_color = False # `False' is mean use default - self.table_text_color_value = '#ffffff' + self.colors = { + 'table': '#008200', + 'text': '#ffffff', + 'piles': '#ffc000', + 'cards_1': '#ffc000', + 'cards_2': '#0000ff', + 'samerank_1': '#ffc000', + 'samerank_2': '#0000ff', + 'hintarrow': '#303030', + 'not_matching': '#ff0000', + } + self.use_default_text_color = True # delays - self.hint_sleep = 1.0 - self.demo_sleep = 1.0 - self.raise_card_sleep = 1.0 - self.highlight_piles_sleep = 1.0 - self.highlight_cards_sleep = 1.0 - self.highlight_samerank_sleep = 1.0 + self.timeouts = { + 'hint': 1.0, + 'demo': 1.0, + 'raise_card': 1.0, + 'highlight_piles': 1.0, + 'highlight_cards': 1.0, + 'highlight_samerank': 1.0, + } # additional startup information self.num_recent_games = 15 self.recent_gameid = [] @@ -935,7 +941,7 @@ class Application: if self.scrolled_canvas.setTile(self, i, force): tile = self.tabletile_manager.get(i) if i == 0: - self.opt.table_color = tile.color + self.opt.colors['table'] = tile.color self.opt.tabletile_name = None else: self.opt.tabletile_name = tile.basename @@ -1005,7 +1011,7 @@ class Application: self.wm_save_state() self.wm_withdraw() title = _("Loading %s %s...") % (CARDSET, cs.name) - color = self.opt.table_color + color = self.opt.colors['table'] if self.tabletile_index > 0: color = "#008200" progress = PysolProgressBar(self, self.top, title=title, diff --git a/pysollib/game.py b/pysollib/game.py index 7555d1d9..3a1d7508 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1470,7 +1470,7 @@ for %d moves. def highlightCard(self, suit, rank): if not self.app: return None - col = self.app.opt.highlight_samerank_colors[1] + col = self.app.opt.colors['samerank_1'] info = [] for s in self.allstacks: for c in s.cards: @@ -1546,10 +1546,19 @@ for %d moves. y2 = y2 + self.app.images.CARDH tkraise = True ##print c1, c2, x1, y1, x2, y2 - r = MfxCanvasRectangle(self.canvas, x1-1, y1-1, x2+1, y2+1, - width=4, fill=None, outline=color) - if tkraise: - r.tkraise(c2.item) + if TOOLKIT == 'tk': + r = MfxCanvasRectangle(self.canvas, x1-1, y1-1, x2+1, y2+1, + width=4, fill=None, outline=color) + if tkraise: + r.tkraise(c2.item) + elif TOOLKIT == 'gtk': + r = MfxCanvasRectangle(self.canvas, x1-1, y1-1, x2+1, y2+1, + width=4, fill=None, outline=color, + group=s.group) + if tkraise: + i = s.cards.index(c2) + for c in s.cards[i+1:]: + c.tkraise(1) items.append(r) if not items: return 0 @@ -1575,14 +1584,14 @@ for %d moves. y = int(int(self.canvas.cget('height'))*(self.canvas.yview()[0])) w, h = self.canvas.winfo_width(), self.canvas.winfo_height() # - color = self.app.opt.highlight_not_matching_color + color = self.app.opt.colors['not_matching'] width = 6 x0, y0 = x+width/2-self.canvas.xmargin, y+width/2-self.canvas.ymargin x1, y1 = x+w-width-self.canvas.xmargin, y+h-width-self.canvas.ymargin r = MfxCanvasRectangle(self.canvas, x0, y0, x1, y1, width=width, fill=None, outline=color) self.canvas.update_idletasks() - self.sleep(self.app.opt.highlight_cards_sleep) + self.sleep(self.app.opt.timeouts['highlight_cards']) r.delete() self.canvas.update_idletasks() @@ -1591,7 +1600,7 @@ for %d moves. if not stackinfo: self.highlightNotMatching() return 0 - col = self.app.opt.highlight_piles_colors + col = self.app.opt.colors['piles'] hi = [] for si in stackinfo: for s in si[0]: @@ -1771,7 +1780,7 @@ for %d moves. y2 = y2 + images.CARDH / 2 # draw the hint arrow = MfxCanvasLine(self.canvas, x1, y1, x2, y2, width=7, - fill=self.app.opt.hintarrow_color, + fill=self.app.opt.colors['hintarrow'], arrow="last", arrowshape=(30,30,10)) self.canvas.update_idletasks() # wait @@ -1794,7 +1803,7 @@ for %d moves. self.demo = Struct( level = level, mixed = mixed, - sleep = self.app.opt.demo_sleep, + sleep = self.app.opt.timeouts['demo'], last_deal = [], hint = None, keypress = None, @@ -1979,8 +1988,9 @@ for %d moves. ta = self.getDemoInfoTextAttr(tinfo) if ta: font = self.app.getFont("canvas_large") - self.demo.info_text = MfxCanvasText(self.canvas, ta[1], ta[2], anchor=ta[0], - font=font, text=self.getDemoInfoText()) + self.demo.info_text = MfxCanvasText(self.canvas, ta[1], ta[2], + anchor=ta[0], font=font, + text=self.getDemoInfoText()) def getDemoInfoText(self): return self.gameinfo.short_name diff --git a/pysollib/games/mahjongg/shisensho.py b/pysollib/games/mahjongg/shisensho.py index 58c05b69..32e9b9da 100644 --- a/pysollib/games/mahjongg/shisensho.py +++ b/pysollib/games/mahjongg/shisensho.py @@ -228,7 +228,7 @@ class Shisen_RowStack(Mahjongg_RowStack): game.updateStackMove(game.s.talon, 2|16) # for undo if not game.demo: if game.app.opt.shisen_show_hint: - self.drawArrow(other_stack, game.app.opt.hint_sleep) + self.drawArrow(other_stack, game.app.opt.timeouts['hint']) game.playSample("droppair", priority=200) # game.moveMove(n, self, f, frames=frames, shadow=shadow) @@ -275,7 +275,7 @@ class Shisen_RowStack(Mahjongg_RowStack): arrow = MfxCanvasLine(game.canvas, coords, {'width': w, - 'fill': game.app.opt.hintarrow_color, + 'fill': game.app.opt.colors['hintarrow'], ##'arrow': 'last', ##'arrowshape': (s1, s1, s2) } diff --git a/pysollib/main.py b/pysollib/main.py index afdc65ae..6f1dab6f 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -374,7 +374,7 @@ Please check your %s installation. # init tiles manager = app.tabletile_manager tile = Tile() - tile.color = app.opt.table_color + tile.color = app.opt.colors['table'] tile.name = "None" tile.filename = None manager.register(tile) @@ -449,7 +449,7 @@ Sounds and background music will be disabled.'''), # create the progress bar title = _("Welcome to ") + PACKAGE - color = app.opt.table_color + color = app.opt.colors['table'] if app.tabletile_index > 0: color = "#008200" app.intro.progress = PysolProgressBar(app, top, title=title, color=color, diff --git a/pysollib/pysolgtk/colorsdialog.py b/pysollib/pysolgtk/colorsdialog.py index 8c9ce661..d7fefbbc 100644 --- a/pysollib/pysolgtk/colorsdialog.py +++ b/pysollib/pysolgtk/colorsdialog.py @@ -21,25 +21,115 @@ __all__ = ['ColorsDialog'] -## # imports +# imports ## import os, sys -## import Tkinter -## from tkColorChooser import askcolor +import gtk, gobject, pango +import gtk.glade +from gtk import gdk -## # PySol imports -## from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct +# PySol imports -## # Toolkit imports -## from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +# Toolkit imports -from tkwidget import MfxDialog + +gettext = _ # /*********************************************************************** # // # ************************************************************************/ -class ColorsDialog(MfxDialog): - pass +class ColorsDialog: + +## self.app.opt.table_text_color = d.table_text_color +## self.app.opt.table_text_color_value = d.table_text_color_value +## ##self.app.opt.table_color = d.table_color +## self.app.opt.highlight_piles_colors = d.highlight_piles_colors +## self.app.opt.highlight_cards_colors = d.highlight_cards_colors +## self.app.opt.highlight_samerank_colors = d.highlight_samerank_colors +## self.app.opt.hintarrow_color = d.hintarrow_color +## self.app.opt.highlight_not_matching_color = d.highlight_not_matching_color + + def __init__(self, parent, title, app, **kw): + + glade_file = app.dataloader.findFile('pysolfc.glade') + self.widgets_tree = gtk.glade.XML(glade_file) + + keys = ( + 'text', + 'piles', + 'cards_1', + 'cards_2', + 'samerank_1', + 'samerank_2', + 'hintarrow', + 'not_matching', + ) + for n in keys: + label = self.widgets_tree.get_widget(n+'_label') + self._setColor(label, app.opt.colors[n]) + button = self.widgets_tree.get_widget(n+'_button') + button.connect('clicked', self._changeColor, n, label) + checkbutton = self.widgets_tree.get_widget('use_default_checkbutton') + checkbutton.set_active(not app.opt.use_default_text_color) + + self._translateLabels() + + dialog = self.widgets_tree.get_widget('colors_dialog') + self.dialog = dialog + dialog.set_title(title) + dialog.set_transient_for(parent) + dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + + self.status = -1 + self.button = -1 + response = dialog.run() + if response == gtk.RESPONSE_OK: + self.status = 0 + self.button = 0 + for n in keys: + w = self.widgets_tree.get_widget(n+'_label') + c = w.get_data('user_data') + setattr(self, n+'_color', c) + self.use_default_color = not checkbutton.get_active() + + dialog.destroy() + def _setColor(self, label, color): + c = gdk.color_parse(color) + al = pango.AttrList() + al.insert(pango.AttrBackground(c.red, c.green, c.blue, 0, 10)) + label.set_attributes(al) + label.set_data('user_data', color) + + + def _changeColor(self, w, name, label): + print '_changeColor', name + color = label.get_data('user_data') + dialog = gtk.ColorSelectionDialog(_('Select color')) + dialog.help_button.destroy() + dialog.set_transient_for(self.dialog) + dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + dialog.colorsel.set_current_color(gdk.color_parse(color)) + response = dialog.run() + if response == gtk.RESPONSE_OK: + c = dialog.colorsel.get_current_color() + c = '#%02x%02x%02x' % (c.red/256, c.green/256, c.blue/256) + self._setColor(label, c) + dialog.destroy() + + + def _translateLabels(self): + for n in ( + 'label31', + 'label32', + 'label33', + 'label34', + 'label35', + 'label36', + 'label37', + ): + w = self.widgets_tree.get_widget(n) + w.set_text(gettext(w.get_text())) + diff --git a/pysollib/pysolgtk/fontsdialog.py b/pysollib/pysolgtk/fontsdialog.py index d2cb80ab..d99e4853 100644 --- a/pysollib/pysolgtk/fontsdialog.py +++ b/pysollib/pysolgtk/fontsdialog.py @@ -21,28 +21,29 @@ __all__ = ['FontsDialog'] -## # imports +# imports ## import os, sys ## import types ## import Tkinter ## import tkFont +import gtk, gobject, pango +import gtk.glade -## # PySol imports +# PySol imports ## from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct -## # Toolkit imports +# Toolkit imports ## from tkconst import EVENT_HANDLED, EVENT_PROPAGATE ## from tkutil import bind -from tkwidget import MfxDialog # /*********************************************************************** # // # ************************************************************************/ -class FontsDialog(MfxDialog): - pass - +class FontsDialog: + def __init__(self, parent, title, app, **kw): + pass diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 068bc18b..ced06062 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -51,7 +51,6 @@ from selectgame import SelectGameDialogWithPreview gettext = _ - def ltk2gtk(s): # label tk to gtk return gettext(s).replace('&', '_') @@ -67,6 +66,7 @@ class PysolMenubar(PysolMenubarActions): def __init__(self, app, top, progress=None): PysolMenubarActions.__init__(self, app, top) self.progress = progress + self._cb_max = gdk.screen_height()/24 # create menus menubar = self.createMenubar() self.top.table.attach(menubar, @@ -89,10 +89,10 @@ class PysolMenubar(PysolMenubarActions): entries = ( ### toolbar - ('newgame', gtk.STOCK_NEW, - ltk2gtk('&New game'), 'N', - ltk2gtk('New game'), - self.mNewGame), + ('newgame', gtk.STOCK_NEW, # action name, stock + ltk2gtk('&New game'), 'N', # label, accelerator + ltk2gtk('New game'), # tooltip + self.mNewGame), # callback ('open', gtk.STOCK_OPEN, ltk2gtk('&Open...'), 'O', ltk2gtk('Open a\nsaved game'), @@ -118,11 +118,11 @@ class PysolMenubar(PysolMenubarActions): ltk2gtk('Auto drop'), self.mDrop), ('stats', gtk.STOCK_INDEX, - ltk2gtk('Stats'), None, + ltk2gtk('&Statistics'), None, ltk2gtk('Statistics'), lambda w, self=self: self.mPlayerStats(mode=101)), ('rules', gtk.STOCK_HELP, - ltk2gtk('Rules'), 'F1', + ltk2gtk('&Rules'), 'F1', ltk2gtk('Rules'), self.mHelpRules), ('quit', gtk.STOCK_QUIT, @@ -131,19 +131,21 @@ class PysolMenubar(PysolMenubarActions): self.mQuit), ### menus - ('file', None, ltk2gtk('&File')), - ('selectgame', None, ltk2gtk('Select &game')), - ('edit', None, ltk2gtk('&Edit')), - ('game', None, ltk2gtk('&Game')), - ('assist', None, ltk2gtk('&Assist')), - ('options', None, ltk2gtk('&Options')), - ('assistlevel', None, ltk2gtk('Assist &level')), - ('automaticplay', None, ltk2gtk('&Automatic play')), - ('animations', None, ltk2gtk('A&nimations')), - ('cardview', None, ltk2gtk('Card &view')), - ('toolbar', None, ltk2gtk('&Toolbar')), - ('statusbar', None, ltk2gtk('Stat&usbar')), - ('help', None, ltk2gtk('&Help')), + ('file', None, ltk2gtk('&File')), + ('recentgames', None, ltk2gtk('R&ecent games')), + ('favoritegames', None, ltk2gtk('Fa&vorite games')), + ('select', None, ltk2gtk('&Select')), + ('edit', None, ltk2gtk('&Edit')), + ('game', None, ltk2gtk('&Game')), + ('assist', None, ltk2gtk('&Assist')), + ('options', None, ltk2gtk('&Options')), + ('assistlevel', None, ltk2gtk('Assist &level')), + ('automaticplay', None, ltk2gtk('&Automatic play')), + ('animations', None, ltk2gtk('A&nimations')), + ('cardview', None, ltk2gtk('Card &view')), + ('toolbar', None, ltk2gtk('&Toolbar')), + ('statusbar', None, ltk2gtk('Stat&usbar')), + ('help', None, ltk2gtk('&Help')), ### menuitems ('playablepreview', None, @@ -152,6 +154,12 @@ class PysolMenubar(PysolMenubarActions): ('selectgamebynumber', None, ltk2gtk('Select game by nu&mber...'), None, None, self.mSelectGameById), + ('addtofavorites', None, + ltk2gtk('A&dd to favorites'), None, + None, self.mAddFavor), + ('removefromfavorites', None, + ltk2gtk('R&emove from favorites'), None, + None, self.mDelFavor), ('saveas', None, ltk2gtk('Save &as...'), None, None, self.mSaveAs), @@ -188,6 +196,12 @@ class PysolMenubar(PysolMenubarActions): ('cardset', None, ltk2gtk('Cards&et...'), 'E', None, self.mSelectCardsetDialog), + ('timeouts', None, + ltk2gtk('Time&outs...'), None, + None, self.mOptTimeouts), + ('colors', None, + ltk2gtk('&Colors...'), None, + None, self.mOptColors), ('contents', None, ltk2gtk('&Contents'), 'F1', None, self.mHelp), @@ -274,8 +288,10 @@ class PysolMenubar(PysolMenubarActions): - - + + + + @@ -283,6 +299,12 @@ class PysolMenubar(PysolMenubarActions): + + + + + + @@ -353,6 +375,9 @@ class PysolMenubar(PysolMenubarActions): + + + @@ -394,19 +419,28 @@ class PysolMenubar(PysolMenubarActions): ui_manager.insert_action_group(action_group, 0) self.top.add_accel_group(ui_manager.get_accel_group()) self.top.ui_manager = ui_manager - menubar = ui_manager.get_widget('/menubar') + + #ui_manager.get_widget('/menubar/file/recentgames').show() + #ui_manager.get_widget('/menubar/file/favoritegames').show() games = map(self.app.gdb.get, self.app.gdb.getGamesIdSortedByName()) + menu = ui_manager.get_widget('/menubar/select').get_submenu() + self._createSelectMenu(games, menu) - menu_item = ui_manager.get_widget('/menubar/file/selectgame') - menu_item.show() - menu = gtk.Menu() - menu_item.set_submenu(menu) - self._addSelectAllGameSubMenu(games, menu, self.mSelectGame) - + menubar = ui_manager.get_widget('/menubar') return menubar + # + # Select Game menu creation + # + + def _getNumGames(self, games, select_data): + ngames = 0 + for label, select_func in select_data: + ngames += len(filter(select_func, games)) + return ngames + def _createSubMenu(self, menu, label): menu_item = gtk.MenuItem(label) menu.add(menu_item) @@ -415,21 +449,26 @@ class PysolMenubar(PysolMenubarActions): menu_item.set_submenu(submenu) return submenu - def _addSelectGameSubMenu(self, games, menu, command, group): - for g in games: - label = g.name - label = gettext(label) - menu_item = gtk.RadioMenuItem(group, label) - group = menu_item - menu.add(menu_item) - menu_item.show() - menu_item.connect('toggled', command, g.id) + def _addGamesMenuItem(self, menu, gi, short_name=False): + if short_name: + label = gi.short_name + else: + label = gi.name + label = gettext(label) + menu_item = gtk.MenuItem(label) + menu_item.set_data('user_data', gi.id) + menu_item.connect('activate', self.mSelectGame) + menu.add(menu_item) + menu_item.show() - def _addSelectAllGameSubMenu(self, games, menu, command): - cb_max = gdk.screen_height()/24 - n, d = 0, cb_max + def _addGamesSubMenu(self, games, menu, short_name=False): + for gi in games: + self._addGamesMenuItem(menu, gi, short_name=short_name) + + def _addAllGamesMenu(self, games, menu): + menu = self._createSubMenu(menu, label=ltk2gtk('&All games by name')) + n, d = 0, self._cb_max i = 0 - group = None while True: if self.progress: self.progress.update(step=1) i += 1 @@ -440,16 +479,88 @@ class PysolMenubar(PysolMenubarActions): n1, n2 = gettext(n1), gettext(n2) label = n1[:3]+' - '+n2[:3] submenu = self._createSubMenu(menu, label=label) - group = self._addSelectGameSubMenu(games[n:n+d], submenu, - command, group) + self._addGamesSubMenu(games[n:n+d], submenu) n += d + def _addSelectedGamesSubMenu(self, games, menu, select_data): + for label, select_func in select_data: + g = filter(select_func, games) + if not g: + continue + submenu = self._createSubMenu(menu, label=label) + self._addGamesSubMenu(g, submenu) + + def _addPopularGamesMenu(self, games, menu): + select_func = lambda gi: gi.si.game_flags & GI.GT_POPULAR + if len(filter(select_func, games)) == 0: + return + data = (ltk2gtk('&Popular games'), select_func) + self._addSelectedGamesSubMenu(games, menu, (data, )) + + def _addGamesByType(self, games, menu, label, data): + if self._getNumGames(games, data) == 0: + return + submenu = self._createSubMenu(menu, label=label) + self._addSelectedGamesSubMenu(games, submenu, data) + + def _addMahjonggGamesMenu(self, games, menu): + select_func = lambda gi: gi.si.game_type == GI.GT_MAHJONGG + mahjongg_games = filter(select_func, games) + if len(mahjongg_games) == 0: + return + menu = self._createSubMenu(menu, label=ltk2gtk('&Mahjongg games')) + # + def add_menu(games, c0, c1, menu=menu): + if not games: + return + label = c0 + ' - ' + c1 + if c0 == c1: + label = c0 + submenu = self._createSubMenu(menu, label=label) + self._addGamesSubMenu(games, submenu, short_name=True) + # + games = {} + for gi in mahjongg_games: + c = gettext(gi.short_name).strip()[0] + if games.has_key(c): + games[c].append(gi) + else: + games[c] = [gi] + games = games.items() + games.sort() + # + g0 = [] + c0 = c1 = games[0][0] + for c, g1 in games: + if len(g0)+len(g1) >= self._cb_max: + add_menu(g0, c0, c1) + g0 = g1 + c0 = c1 = c + else: + g0 += g1 + c1 = c + add_menu(g0, c0, c1) + + + def _createSelectMenu(self, games, menu): + assert isinstance(menu, gtk.Menu) + self._addPopularGamesMenu(games, menu) + for l, d in ( + (ltk2gtk('&French games'), GI.SELECT_GAME_BY_TYPE), + (ltk2gtk('&Oriental games'), GI.SELECT_ORIENTAL_GAME_BY_TYPE), + (ltk2gtk('&Special games'), GI.SELECT_SPECIAL_GAME_BY_TYPE), + ): + self._addGamesByType(games, menu, l, d) + self._addMahjonggGamesMenu(games, menu) + sep = gtk.SeparatorMenuItem() + menu.add(sep) + self._addAllGamesMenu(games, menu) + # # menu updates # -## WARNING: setMenuState: not found: /menubar/file/holdandquit ## WARNING: setMenuState: not found: /menubar/assist/findcard def setMenuState(self, state, path): path_map = { @@ -467,7 +578,6 @@ class PysolMenubar(PysolMenubarActions): menuitem.set_sensitive(state) - def setToolbarState(self, state, path): path = '/toolbar/'+path button = self.top.ui_manager.get_widget(path) @@ -481,9 +591,59 @@ class PysolMenubar(PysolMenubarActions): # menu actions # - def _createFileChooser(self, title, action, idir, ifile): + def mAddFavor(self, w): + gameid = self.app.game.id + if gameid not in self.app.opt.favorite_gameid: + self.app.opt.favorite_gameid.append(gameid) + self.updateFavoriteGamesMenu() + + def mDelFavor(self, w): + gameid = self.app.game.id + if gameid in self.app.opt.favorite_gameid: + self.app.opt.favorite_gameid.remove(gameid) + self.updateFavoriteGamesMenu() + + def updateFavoriteGamesMenu(self): + games = self.app.opt.favorite_gameid + self._updateGamesMenu('/menubar/file/favoritegames', games) + in_favor = self.app.game.id in games + item = self.top.ui_manager.get_widget('/menubar/file/addtofavorites') + item.set_sensitive(not in_favor) + item = self.top.ui_manager.get_widget('/menubar/file/removefromfavorites') + item.set_sensitive(in_favor) + + def updateRecentGamesMenu(self, games): + self._updateGamesMenu('/menubar/file/recentgames', games) + + def _updateGamesMenu(self, path, games): + item = self.top.ui_manager.get_widget(path) + item.show() + menu = item.get_submenu() + menu.show() + # + menu_games = [] + def checkFavor(item): + gameid = item.get_data('user_data') + if gameid in games: + menu_games.append(gameid) + else: + menu.remove(item) + menu.foreach(checkFavor) + # + for gameid in games: + if gameid not in menu_games: + gi = self.app.getGameInfo(gameid) + self._addGamesMenuItem(menu, gi) + if not games: + item = gtk.MenuItem(_('Empty')) + item.show() + item.set_sensitive(False) + menu.add(item) + + + def _createFileChooser(self, title, action, idir, ifile, stock): d = gtk.FileChooserDialog(title, self.top, action, - (gtk.STOCK_OPEN, gtk.RESPONSE_ACCEPT, + (stock, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL)) d.set_current_folder(idir) if ifile: @@ -519,7 +679,8 @@ class PysolMenubar(PysolMenubarActions): idir = self.app.dn.savegames filename = self._createFileChooser(_('Open Game'), gtk.FILE_CHOOSER_ACTION_OPEN, - idir, '') + idir, '', + gtk.STOCK_OPEN) if filename: ##filename = os.path.normpath(filename) ##filename = os.path.normcase(filename) @@ -547,7 +708,8 @@ class PysolMenubar(PysolMenubarActions): ##print self.game.filename, ifile filename = self._createFileChooser(_('Save Game'), gtk.FILE_CHOOSER_ACTION_SAVE, - idir, ifile) + idir, ifile, + gtk.STOCK_SAVE) if filename: ##filename = os.path.normpath(filename) ##filename = os.path.normcase(filename) @@ -555,14 +717,10 @@ class PysolMenubar(PysolMenubarActions): self.updateMenus() + def mSelectGame(self, menu_item): + game_id = menu_item.get_data('user_data') + self._mSelectGame(game_id) - def updateFavoriteGamesMenu(self, *args): - pass - - - def mSelectGame(self, menu_item, game_id): - if menu_item.get_active(): - self._mSelectGame(game_id) def mSelectGameDialogWithPreview(self, *event): if self._cancelDrag(break_pause=False): return @@ -593,7 +751,7 @@ class PysolMenubar(PysolMenubarActions): if self._cancelDrag(break_pause=False): return key = self.app.tabletile_index if key <= 0: - key = self.app.opt.table_color.lower() + key = self.app.opt.colors['table'] d = SelectTileDialogWithPreview(self.top, app=self.app, title=_('Select table background'), manager=self.app.tabletile_manager, diff --git a/pysollib/pysolgtk/selecttile.py b/pysollib/pysolgtk/selecttile.py index 91fd3e8b..08c52d6b 100644 --- a/pysollib/pysolgtk/selecttile.py +++ b/pysollib/pysolgtk/selecttile.py @@ -54,7 +54,7 @@ class SelectTileDialogWithPreview(MfxDialog): self.key = key self.preview_key = -1 self.all_keys = [] - self.table_color = app.opt.table_color + self.table_color = app.opt.colors['table'] # paned hpaned = gtk.HPaned() self.hpaned = hpaned @@ -150,7 +150,7 @@ class SelectTileDialogWithPreview(MfxDialog): canvas.setBackgroundImage(None) canvas.setTextColor(None) self.preview_key = key - self.table_color = key + self.colors['table'] = key else: # image tile = self.manager.get(key) @@ -186,7 +186,7 @@ class SelectTileDialogWithPreview(MfxDialog): if type(self.preview_key) is str: color = self.preview_key else: - color = self.app.opt.table_color + color = self.app.opt.colors['table'] win.colorsel.set_current_color(gdk.color_parse(color)) win.connect('delete_event', lambda w, e: win.destroy()) win.ok_button.connect('clicked', self._colorselOkClicked, win) diff --git a/pysollib/pysolgtk/timeoutsdialog.py b/pysollib/pysolgtk/timeoutsdialog.py index 13283977..4d98ef31 100644 --- a/pysollib/pysolgtk/timeoutsdialog.py +++ b/pysollib/pysolgtk/timeoutsdialog.py @@ -21,22 +21,87 @@ __all__ = ['TimeoutsDialog'] -## # imports +# imports ## import os, sys -## import Tkinter +import gtk, gobject, pango +import gtk.glade -## # PySol imports -## from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct +# PySol imports -## # Toolkit imports -## from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +# Toolkit imports -from tkwidget import MfxDialog + +gettext = _ # /*********************************************************************** # // # ************************************************************************/ -class TimeoutsDialog(MfxDialog): - pass +class TimeoutsDialog: + + def __init__(self, parent, title, app, **kw): + + glade_file = app.dataloader.findFile('pysolfc.glade') + self.widgets_tree = gtk.glade.XML(glade_file) + + keys = ( + 'demo', + 'hint', + 'raise_card', + 'highlight_piles', + 'highlight_cards', + 'highlight_samerank', + ) + + dic = {} + for n in keys: + def callback(w, n=n): + sp = self.widgets_tree.get_widget(n+'_spinbutton') + sc = self.widgets_tree.get_widget(n+'_scale') + sp.set_value(sc.get_value()) + dic[n+'_scale_value_changed'] = callback + def callback(w, n=n): + sp = self.widgets_tree.get_widget(n+'_spinbutton') + sc = self.widgets_tree.get_widget(n+'_scale') + sc.set_value(sp.get_value()) + dic[n+'_spinbutton_value_changed'] = callback + self.widgets_tree.signal_autoconnect(dic) + + for n in keys: + v = app.opt.timeouts[n] + w = self.widgets_tree.get_widget(n+'_spinbutton') + w.set_value(v) + w = self.widgets_tree.get_widget(n+'_scale') + w.set_value(v) + + self._translateLabels() + + dialog = self.widgets_tree.get_widget('timeouts_dialog') + dialog.set_title(title) + dialog.set_transient_for(parent) + dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + + self.status = -1 + self.button = -1 + response = dialog.run() + if response == gtk.RESPONSE_OK: + self.status = 0 + self.button = 0 + for n in keys: + w = self.widgets_tree.get_widget(n+'_spinbutton') + setattr(self, n+'_timeout', w.get_value()) + + dialog.destroy() + + def _translateLabels(self): + for n in ( + 'label25', + 'label26', + 'label27', + 'label28', + 'label29', + 'label30', + ): + w = self.widgets_tree.get_widget(n) + w.set_text(gettext(w.get_text())) diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index 1570974d..43ff8751 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -77,11 +77,16 @@ class _CanvasItem: self.canvas = canvas canvas._all_items.append(self) self._is_hidden = False + self._x, self._y = 0, 0 + self._group = None def addtag(self, group): ##print self, 'addtag' ##~ assert isinstance(group._item, CanvasGroup) self._item.reparent(group._item) + if self._group == group: + print 'addtag: new_group == old_group' + self._group = group def dtag(self, group): ##print self, 'dtag' @@ -102,11 +107,14 @@ class _CanvasItem: self._item = None def lower(self, positions=None): - return # used for reordered shadow; don't need? + print 'lower', self, positions + return # don't need? ## if positions is None: -## self._item.lower_to_bottom() -## self._item.get_property('parent').raise_to_top() +## pass +## ##self._item.lower_to_bottom() +## ##self._item.get_property('parent').lower_to_bottom() ## else: +## print self, positions ## ##~ assert type(positions) is types.IntType and positions > 0 ## self._item.lower(positions) @@ -116,13 +124,18 @@ class _CanvasItem: self._item.raise_to_top() self._item.get_property('parent').raise_to_top() else: - print self, 'tkraise', positions # don't used? + #print self, 'tkraise', positions + #self._item.raise_to_top() ##~ assert type(positions) is types.IntType and positions > 0 - self._item.raise_(positions) + self._item.raise_to_top() #positions) def move(self, x, y): self._item.move(x, y) - moveTo = move + self._x, self._y = self._x+x, self._y+y + + def moveTo(self, x, y): + self._item.move(x-self._x, y-self._y) + self._x, self._y = x, y def show(self): if self._item: @@ -146,16 +159,22 @@ class MfxCanvasGroup(_CanvasItem): class MfxCanvasImage(_CanvasItem): - def __init__(self, canvas, x, y, image, anchor=gtk.ANCHOR_NW): + def __init__(self, canvas, x, y, image, anchor=gtk.ANCHOR_NW, group=None): _CanvasItem.__init__(self, canvas) + self._x, self._y = x, y if type(anchor) is str: anchor = anchor_tk2gtk(anchor) - self._item = canvas.root().add(gnome.canvas.CanvasPixbuf, - x=x, y=y, - pixbuf=image.pixbuf, - width=image.width(), - height=image.height(), - anchor=anchor) + if group: + self._group = group + group = group._item + else: + group = canvas.root() + self._item = group.add(gnome.canvas.CanvasPixbuf, + x=x, y=y, + pixbuf=image.pixbuf, + width=image.width(), + height=image.height(), + anchor=anchor) self._item.show() def config(self, image): @@ -183,35 +202,52 @@ class MfxCanvasLine(_CanvasItem): kwargs['arrow_shape_a'] = kw['arrowshape'][0] kwargs['arrow_shape_b'] = kw['arrowshape'][1] kwargs['arrow_shape_c'] = kw['arrowshape'][2] - self._item = canvas.root().add(gnome.canvas.CanvasLine, - points=points, **kwargs) + if kw.has_key('group'): + self._group = kw['group'] + group = kw['group']._item + else: + group = canvas.root() + self._item = group.add(gnome.canvas.CanvasLine, + points=points, **kwargs) self._item.show() - #canvas.show_all() class MfxCanvasRectangle(_CanvasItem): def __init__(self, canvas, x1, y1, x2, y2, - width=0, fill=None, outline=None): + width=0, fill=None, outline=None, group=None): _CanvasItem.__init__(self, canvas) + self._x, self._y = x1, y1 kw = {'x1': x1, 'x2': x2, 'y1': y1, 'y2': y2} if width: kw['width_pixels'] = width if fill: kw['fill_color'] = fill if outline: kw['outline_color'] = outline - self._item = canvas.root().add(gnome.canvas.CanvasRect, **kw) + if group: + self._group = group + group = group._item + else: + group = canvas.root() + self._item = group.add(gnome.canvas.CanvasRect, **kw) self._item.show() class MfxCanvasText(_CanvasItem): def __init__(self, canvas, x, y, anchor=gtk.ANCHOR_NW, preview=-1, **kw): _CanvasItem.__init__(self, canvas) + self._x, self._y = x, y if preview < 0: preview = canvas.preview if preview > 1: self._item = None return anchor = anchor_tk2gtk(anchor) - self._item = canvas.root().add(gnome.canvas.CanvasText, - x=x, y=y, anchor=anchor) + if kw.has_key('group'): + self._group = kw['group'] + group = kw['group']._item + del kw['group'] + else: + group = canvas.root() + self._item = group.add(gnome.canvas.CanvasText, + x=x, y=y, anchor=anchor) if not kw.has_key('fill'): kw['fill'] = canvas._text_color for k, v in kw.items(): @@ -236,7 +272,6 @@ class MfxCanvasText(_CanvasItem): def __getitem__(self, key): if key == 'text': - # FIXME return self._item.get_property('text') else: raise AttributeError, key @@ -295,7 +330,7 @@ class MfxCanvas(gnome.canvas.Canvas): def bind(self, sequence=None, func=None, add=None): assert add is None # FIXME - print "TkCanvas bind:", sequence + print 'TkCanvas bind:', sequence return def cget(self, attr): @@ -307,7 +342,7 @@ class MfxCanvas(gnome.canvas.Canvas): return self.get_size()[0] elif attr == 'height': return self.get_size()[1] - print "TkCanvas cget:", attr + print 'TkCanvas cget:', attr raise AttributeError, attr def xview(self): @@ -327,20 +362,20 @@ class MfxCanvas(gnome.canvas.Canvas): def configure(self, **kw): height, width = -1, -1 for k, v in kw.items(): - if k in ("background", "bg"): + if k in ('background', 'bg'): ##print 'configure: bg:', v c = self.get_colormap().alloc_color(v) self.style.bg[gtk.STATE_NORMAL] = c - elif k == "cursor": + elif k == 'cursor': if not self.window: self.realize() self.window.set_cursor(gdk.Cursor(v)) - elif k == "height": + elif k == 'height': height = v - elif k == "width": + elif k == 'width': width = v else: - print "TkCanvas", k, v + print 'TkCanvas', k, v raise AttributeError, k if height > 0 and width > 0: self.set_size_request(width, height) @@ -386,7 +421,7 @@ class MfxCanvas(gnome.canvas.Canvas): if self._text_color != color: self._text_color = color for item in self._text_items: - item.set(fill_color=_self.text_color) + item._item.set(fill_color=self._text_color) # PySol extension - set a tiled background image def setTile(self, app, i, force=False): @@ -402,7 +437,8 @@ class MfxCanvas(gnome.canvas.Canvas): assert tile.filename assert tile.basename if not force: - if i == app.tabletile_index and tile.color == app.opt.table_color: + if (i == app.tabletile_index and + tile.color == app.opt.colors['table']): return False if self._tile is tile: return False @@ -420,10 +456,10 @@ class MfxCanvas(gnome.canvas.Canvas): self.configure(bg=self.top_bg) color = tile.text_color - if app.opt.table_text_color: - self.setTextColor(app.opt.table_text_color_value) - else: + if app.opt.use_default_text_color: self.setTextColor(color) + else: + self.setTextColor(app.opt.colors['text']) return True diff --git a/pysollib/pysolgtk/tkstats.py b/pysollib/pysolgtk/tkstats.py index 70ccdafe..9e02ee7a 100644 --- a/pysollib/pysolgtk/tkstats.py +++ b/pysollib/pysolgtk/tkstats.py @@ -1,13 +1,7 @@ -## vim:ts=4:et:nowrap -## ##---------------------------------------------------------------------------## ## ## PySol -- a Python Solitaire game ## -## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer -## ## 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 2 of the License, or @@ -23,10 +17,6 @@ ## If not, write to the Free Software Foundation, Inc., ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -## Markus F.X.J. Oberhumer -## -## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html -## ##---------------------------------------------------------------------------## @@ -37,16 +27,13 @@ import gtk.glade # PySol imports from pysollib.mfxutil import format_time -from pysollib.settings import TOP_TITLE +from pysollib.settings import TOP_TITLE, PACKAGE from pysollib.stats import PysolStatsFormatter # Toolkit imports from tkwidget import MfxDialog, MfxMessageDialog - -glade_file = os.path.join(sys.path[0], 'data', 'pysolfc.glade') - -open(glade_file) +gettext = _ # /*********************************************************************** @@ -54,6 +41,7 @@ open(glade_file) # ************************************************************************/ class StatsWriter(PysolStatsFormatter.StringWriter): + def __init__(self, store): self.store = store @@ -70,7 +58,7 @@ class StatsWriter(PysolStatsFormatter.StringWriter): return iter = self.store.append(None) self.store.set(iter, - 0, args[0], + 0, gettext(args[0]), 1, args[1], 2, args[2], 3, args[3], @@ -80,9 +68,12 @@ class StatsWriter(PysolStatsFormatter.StringWriter): 7, gameid) -class FullLogWriter(PysolStatsFormatter.StringWriter): +class LogWriter(PysolStatsFormatter.StringWriter): + MAX_ROWS = 10000 + def __init__(self, store): self.store = store + self._num_rows = 0 def p(self, s): pass @@ -94,13 +85,16 @@ class FullLogWriter(PysolStatsFormatter.StringWriter): if gameid < 0: # header return + if self._num_rows > self.MAX_ROWS: + return iter = self.store.append(None) self.store.set(iter, - 0, gamename, + 0, gettext(gamename), 1, gamenumber, 2, date, 3, status, 4, gameid) + self._num_rows += 1 class Game_StatsDialog: @@ -108,49 +102,153 @@ class Game_StatsDialog: def __init__(self, parent, header, app, player, gameid): # self.app = app - + self.player = player + self.gameid = gameid + self.games = {} + self.games_id = [] # sorted by name + # formatter = PysolStatsFormatter(self.app) + glade_file = app.dataloader.findFile('pysolfc.glade') + # + games = app.gdb.getGamesIdSortedByName() + n = 0 + current = 0 + for id in games: + won, lost = self.app.stats.getStats(self.player, id) + if won+lost > 0 or id == gameid: + gi = app.gdb.get(id) + if id == gameid: + current = n + self.games[n] = gi + self.games_id.append(id) + n += 1 # self.widgets_tree = gtk.glade.XML(glade_file) - #game_name_combo = self.widgets_tree.get_widget('game_name_combo') - #model = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_INT) - #game_name_combo.set_model(model) - #game_name_combo.set_text_column(0) - stats_dialog = self.widgets_tree.get_widget('stats_dialog') - stats_dialog.set_title('Game Statistics') - stats_dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) - # total - won, lost = app.stats.getStats(player, gameid) - self._createText('total', won, lost) - drawing = self.widgets_tree.get_widget('total_drawingarea') - drawing.connect('expose_event', self._createChart, won, lost) - # current session - won, lost = app.stats.getSessionStats(player, gameid) - self._createText('current', won, lost) - drawing = self.widgets_tree.get_widget('session_drawingarea') - drawing.connect('expose_event', self._createChart, won, lost) # + table = self.widgets_tree.get_widget('current_game_table') + combo = self._createGameCombo(table, 1, 0, self._currentComboChanged) + # total + self._createText('total') + drawing = self.widgets_tree.get_widget('total_drawingarea') + drawing.connect('expose_event', self._drawingExposeEvent, 'total') + # current session + self._createText('session') + drawing = self.widgets_tree.get_widget('session_drawingarea') + drawing.connect('expose_event', self._drawingExposeEvent, 'session') + # top 10 + table = self.widgets_tree.get_widget('top_10_table') + combo = self._createGameCombo(table, 1, 0, self._top10ComboChanged) + self._createTop() + self._updateTop(gameid) + # all games stat store = self._createStatsList() writer = StatsWriter(store) formatter.writeStats(writer, player, header, sort_by='name') - # + # full log store = self._createLogList('full_log_treeview') - writer = FullLogWriter(store) + writer = LogWriter(store) formatter.writeFullLog(writer, player, header) - # + # session log store = self._createLogList('session_log_treeview') - writer = FullLogWriter(store) + writer = LogWriter(store) formatter.writeSessionLog(writer, player, header) # - stats_dialog.set_transient_for(parent) - stats_dialog.resize(400, 300) - - stats_dialog.run() + self._translateLabels() + dialog = self.widgets_tree.get_widget('stats_dialog') + dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + dialog.set_transient_for(parent) + dialog.resize(500, 340) + dialog.set_title(PACKAGE+' - '+_("Statistics")) + # + dialog.run() self.status = -1 - stats_dialog.destroy() + dialog.destroy() - def _createText(self, name, won, lost): + def _translateLabels(self): + # mnemonic + for n in ( + 'label1', + 'label2', + 'label3', + 'label4', + 'label15', + 'label16', + 'label17', + 'label18', + ): + w = self.widgets_tree.get_widget(n) + w.set_text_with_mnemonic(gettext(w.get_label())) + # simple + for n in ( + 'label5', + 'label6', + 'label7', + 'label14' + ): + w = self.widgets_tree.get_widget(n) + w.set_text(gettext(w.get_text())) + # markup + for n in ( + 'label8', + 'label9', + 'label10', + 'label11', + 'label12', + 'label13', + 'label19', + 'label20', + 'label21', + 'label22', + 'label23', + 'label24', + ): + w = self.widgets_tree.get_widget(n) + s = gettext(w.get_label()) + w.set_markup('%s' % s) + + + def _createGameCombo(self, table, x, y, callback): + combo = gtk.combo_box_new_text() + combo.show() + table.attach(combo, + x, x+1, y, y+1, + gtk.FILL|gtk.EXPAND, 0, + 4, 4) + # + n = 0 + current = 0 + for id in self.games_id: + gi = self.app.gdb.get(id) + combo.append_text(gettext(gi.name)) + if id == self.gameid: + current = n + n += 1 + combo.set_active(current) + combo.connect('changed', callback) #self._comboChanged) + + + def _currentComboChanged(self, w): + gi = self.games[w.get_active()] + self.gameid = gi.id + self._createText('total') + drawing = self.widgets_tree.get_widget('total_drawingarea') + self._createChart(drawing, 'total') + self._createText('session') + drawing = self.widgets_tree.get_widget('session_drawingarea') + self._createChart(drawing, 'session') + + + def _top10ComboChanged(self, w): + gi = self.games[w.get_active()] + self._updateTop(gi.id) + + + def _createText(self, name): + if name == 'total': + won, lost = self.app.stats.getStats(self.player, self.gameid) + else: + won, lost = self.app.stats.getSessionStats(self.player, self.gameid) pwon, plost = self._getPwon(won, lost) label = self.widgets_tree.get_widget(name+'_num_won_label') label.set_text(str(won)) @@ -164,7 +262,15 @@ class Game_StatsDialog: label.set_text(str(won+lost)) - def _createChart(self, drawing, e, won, lost): + def _drawingExposeEvent(self, drawing, e, frame): + self._createChart(drawing, frame) + + + def _createChart(self, drawing, frame): + if frame == 'total': + won, lost = self.app.stats.getStats(self.player, self.gameid) + else: + won, lost = self.app.stats.getSessionStats(self.player, self.gameid) pwon, plost = self._getPwon(won, lost) s, ewon, elost = 0, int(360.0*pwon), int(360.0*plost) @@ -182,34 +288,128 @@ class Game_StatsDialog: y = y-dy/2 if won+lost > 0: - gc.set_rgb_fg_color(colormap.alloc_color('#007f00')) + gc.set_foreground(colormap.alloc_color('#008000')) win.draw_arc(gc, True, x, y+dy, w, h, s*64, ewon*64) - gc.set_rgb_fg_color(colormap.alloc_color('#7f0000')) + gc.set_foreground(colormap.alloc_color('black')) + win.draw_arc(gc, False, x, y+dy, w, h, s*64, ewon*64) + gc.set_foreground(colormap.alloc_color('#800000')) win.draw_arc(gc, True, x, y+dy, w, h, (s+ewon)*64, elost*64) - gc.set_rgb_fg_color(colormap.alloc_color('#00ff00')) + gc.set_foreground(colormap.alloc_color('black')) + win.draw_arc(gc, False, x, y+dy, w, h, (s+ewon)*64, elost*64) + gc.set_foreground(colormap.alloc_color('#00ff00')) win.draw_arc(gc, True, x, y, w, h, s*64, ewon*64) - gc.set_rgb_fg_color(colormap.alloc_color('#ff0000')) + gc.set_foreground(colormap.alloc_color('black')) + win.draw_arc(gc, False, x, y, w, h, s*64, ewon*64) + gc.set_foreground(colormap.alloc_color('#ff0000')) win.draw_arc(gc, True, x, y, w, h, (s+ewon)*64, elost*64) + gc.set_foreground(colormap.alloc_color('black')) + win.draw_arc(gc, False, x, y, w, h, (s+ewon)*64, elost*64) else: - gc.set_rgb_fg_color(colormap.alloc_color('#7f7f7f')) + gc.set_foreground(colormap.alloc_color('#808080')) win.draw_arc(gc, True, x, y+dy, w, h, 0, 360*64) - gc.set_rgb_fg_color(colormap.alloc_color('#f0f0f0')) + gc.set_foreground(colormap.alloc_color('black')) + win.draw_arc(gc, False, x, y+dy, w, h, 0, 360*64) + gc.set_foreground(colormap.alloc_color('#f0f0f0')) win.draw_arc(gc, True, x, y, w, h, 0, 360*64) - gc.set_rgb_fg_color(colormap.alloc_color('#bfbfbf')) - pangolayout = drawing.create_pango_layout('No games') + gc.set_foreground(colormap.alloc_color('black')) + win.draw_arc(gc, False, x, y, w, h, 0, 360*64) + gc.set_foreground(colormap.alloc_color('#a0a0a0')) + pangolayout = drawing.create_pango_layout(_('No games')) ext = pangolayout.get_extents() tw, th = ext[1][2]/pango.SCALE, ext[1][3]/pango.SCALE - win.draw_layout( - gc, - x+w/2-tw/2, y+h/2-th/2, - pangolayout) + win.draw_layout(gc, x+w/2-tw/2, y+h/2-th/2, pangolayout) + + + def _createTop(self): + for n in ('top_10_time_treeview', + 'top_10_moves_treeview', + 'top_10_total_moves_treeview'): + self._createTopList(n) + + + def _updateTop(self, gameid): + if (not self.app.stats.games_stats.has_key(self.player) or + not self.app.stats.games_stats[self.player].has_key(gameid) or + not self.app.stats.games_stats[self.player][gameid].time_result.top): + return + + s = self.app.stats.games_stats[self.player][gameid] + + label = self.widgets_tree.get_widget('playing_time_minimum_label') + label.set_text(format_time(s.time_result.min)) + label = self.widgets_tree.get_widget('playing_time_maximum_label') + label.set_text(format_time(s.time_result.max)) + label = self.widgets_tree.get_widget('playing_time_average_label') + label.set_text(format_time(s.time_result.average)) + + label = self.widgets_tree.get_widget('moves_minimum_label') + label.set_text(str(s.moves_result.min)) + label = self.widgets_tree.get_widget('moves_maximum_label') + label.set_text(str(s.moves_result.max)) + label = self.widgets_tree.get_widget('moves_average_label') + label.set_text(str(round(s.moves_result.average, 2))) + + label = self.widgets_tree.get_widget('total_moves_minimum_label') + label.set_text(str(s.total_moves_result.min)) + label = self.widgets_tree.get_widget('total_moves_maximum_label') + label.set_text(str(s.total_moves_result.max)) + label = self.widgets_tree.get_widget('total_moves_average_label') + label.set_text(str(round(s.total_moves_result.average, 2))) + + for n, ss in ( + ('top_10_time_treeview', s.time_result.top), + ('top_10_moves_treeview', s.moves_result.top), + ('top_10_total_moves_treeview', s.total_moves_result.top)): + self._updateTopList(n, ss) + + + def _createTopList(self, tv_name): + treeview = self.widgets_tree.get_widget(tv_name) + store = gtk.ListStore(gobject.TYPE_INT, # N + gobject.TYPE_STRING, # number + gobject.TYPE_STRING, # started at + gobject.TYPE_STRING, # result + gobject.TYPE_STRING, # result + ) + treeview.set_model(store) + n = 0 + for label in ( + _('N'), + _('Game number'), + _('Started at'), + _('Result'), + ): + column = gtk.TreeViewColumn(label, gtk.CellRendererText(), text=n) + column.set_resizable(True) + ##column.set_sort_column_id(n) + treeview.append_column(column) + n += 1 + + + def _updateTopList(self, tv_name, top): + treeview = self.widgets_tree.get_widget(tv_name) + store = treeview.get_model() + store.clear() + row = 1 + for i in top: + t = time.strftime('%Y-%m-%d %H:%M', + time.localtime(i.game_start_time)) + if isinstance(i.value, float): + # time + r = format_time(i.value) + else: + # moves + r = str(i.value) + iter = store.append(None) + store.set(iter, 0, row, 1, i.game_number, 2, t, 3, r) + row += 1 def _createStatsList(self): treeview = self.widgets_tree.get_widget('all_games_treeview') n = 0 for label in ( - '', + _('Game'), _('Played'), _('Won'), _('Lost'), @@ -234,10 +434,11 @@ class Game_StatsDialog: gobject.TYPE_INT, # gameid ) sortable = gtk.TreeModelSort(store) - treeview.set_model(sortable) sortable.set_sort_func(4, self._cmpPlayingTime) sortable.set_sort_func(5, self._cmpMoves) sortable.set_sort_func(6, self._cmpPercent) + treeview.set_model(sortable) + treeview.set_rules_hint(True) return store @@ -265,6 +466,7 @@ class Game_StatsDialog: gobject.TYPE_INT, # gameid ) treeview.set_model(store) + treeview.set_rules_hint(True) return store @@ -300,15 +502,10 @@ class Game_StatsDialog: # ************************************************************************/ SingleGame_StatsDialog = Game_StatsDialog - -class AllGames_StatsDialog(MfxDialog): - pass - -class FullLog_StatsDialog(AllGames_StatsDialog): - pass - -class SessionLog_StatsDialog(FullLog_StatsDialog): - pass +AllGames_StatsDialog = Game_StatsDialog +FullLog_StatsDialog = Game_StatsDialog +SessionLog_StatsDialog = Game_StatsDialog +Top_StatsDialog = Game_StatsDialog # /*********************************************************************** @@ -334,32 +531,32 @@ class Status_StatsDialog(MfxMessageDialog): #MfxDialog if game.s.foundations: w2 = w2 + _('\nCards in Foundations: ') + str(n) # - date = time.strftime('%Y-%m-%d %H:%M', time.localtime(game.gstats.start_time)) - MfxMessageDialog.__init__(self, parent, title=_('Game status'), - text=game.getTitleName() + '\n' + - game.getGameNumber(format=1) + '\n' + - _('Playing time: ') + game.getTime() + '\n' + - _('Started at: ') + date + '\n\n'+ - _('Moves: ') + str(game.moves.index) + '\n' + - _('Undo moves: ') + str(stats.undo_moves) + '\n' + - _('Bookmark moves: ') + str(gstats.goto_bookmark_moves) + '\n' + - _('Demo moves: ') + str(stats.demo_moves) + '\n' + - _('Total player moves: ') + str(stats.player_moves) + '\n' + - _('Total moves in this game: ') + str(stats.total_moves) + '\n' + - _('Hints: ') + str(stats.hints) + '\n' + - '\n' + - w1 + w2, - strings=(_('&OK'), - (_('&Statistics...'), 101), - (TOP_TITLE+'...', 105), ), - image=game.app.gimages.logos[3], - image_side='left', image_padx=20, - padx=20, - ) + date = time.strftime('%Y-%m-%d %H:%M', + time.localtime(game.gstats.start_time)) + MfxMessageDialog.__init__( + self, parent, title=_('Game status'), + text=game.getTitleName() + '\n' + + game.getGameNumber(format=1) + '\n' + + _('Playing time: ') + game.getTime() + '\n' + + _('Started at: ') + date + '\n\n'+ + _('Moves: ') + str(game.moves.index) + '\n' + + _('Undo moves: ') + str(stats.undo_moves) + '\n' + + _('Bookmark moves: ') + str(gstats.goto_bookmark_moves) + '\n' + + _('Demo moves: ') + str(stats.demo_moves) + '\n' + + _('Total player moves: ') + str(stats.player_moves) + '\n' + + _('Total moves in this game: ') + str(stats.total_moves) + '\n' + + _('Hints: ') + str(stats.hints) + '\n' + + '\n' + + w1 + w2, + strings=(_('&OK'), + (_('&Statistics...'), 101), ), + image=game.app.gimages.logos[3], + image_side='left', image_padx=20, + padx=20, + ) + -class Top_StatsDialog(MfxDialog): - pass diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index f19d28dd..9f8fbc95 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -164,7 +164,9 @@ def createImage(width, height, fill, outline=None): # ************************************************************************/ def _wrap_b1_press(e): - return e.type == gdk.BUTTON_PRESS and e.button == 1 + return (e.type == gdk.BUTTON_PRESS and e.button == 1 and + not (e.state & gdk.CONTROL_MASK) and + not (e.state & gdk.SHIFT_MASK)) def _wrap_b1_double(e): return e.type == gdk._2BUTTON_PRESS and e.button == 1 @@ -179,7 +181,9 @@ def _wrap_b2_press(e): return e.type == gdk.BUTTON_PRESS and e.button == 2 def _wrap_b3_press(e): - return e.type == gdk.BUTTON_PRESS and e.button == 3 + return (e.type == gdk.BUTTON_PRESS and e.button == 3 and + not (e.state & gdk.CONTROL_MASK) and + not (e.state & gdk.SHIFT_MASK)) def _wrap_b3_control(e): return e.type == gdk.BUTTON_PRESS and e.button == 3 and (e.state & gdk.CONTROL_MASK) diff --git a/pysollib/stack.py b/pysollib/stack.py index 72d06e79..a43db16f 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -396,9 +396,9 @@ class Stack: assert self.is_visible and self.images.bottom is None img = self.getBottomImage() if img is not None: - self.images.bottom = MfxCanvasImage(self.canvas, self.x, self.y, - image=img, anchor=ANCHOR_NW) - self.images.bottom.addtag(self.group) + self.images.bottom = MfxCanvasImage(self.canvas,self.x, self.y, + image=img,anchor=ANCHOR_NW, + group=self.group) self.top_bottom = self.images.bottom # invisible stack bottom @@ -410,8 +410,8 @@ class Stack: self.items.bottom = MfxCanvasRectangle(self.canvas, self.x, self.y, self.x + images.CARDW, self.y + images.CARDH, - fill="", outline="", width=0) - self.items.bottom.addtag(self.group) + fill="", outline="", width=0, + group=self.group) self.top_bottom = self.items.bottom # sanity checks @@ -815,8 +815,9 @@ class Stack: card = self.cards[i] if not self.basicShallHighlightSameRank(card): return 0 - col = self.game.app.opt.highlight_samerank_colors - info = [ (self, card, card, col[1]) ] + col_1 = self.game.app.opt.colors['samerank_1'] + col_2 = self.game.app.opt.colors['samerank_2'] + info = [ (self, card, card, col_1) ] for s in self.game.allstacks: for c in s.cards: if c is card: continue @@ -824,9 +825,9 @@ class Stack: if c.rank != card.rank: continue # ask the target stack if s.basicShallHighlightSameRank(c): - info.append((s, c, c, col[3])) + info.append((s, c, c, col_2)) self.game.stats.highlight_samerank = self.game.stats.highlight_samerank + 1 - return self.game._highlightCards(info, self.game.app.opt.highlight_samerank_sleep) + return self.game._highlightCards(info, self.game.app.opt.timeouts['highlight_samerank']) def highlightMatchingCards(self, event): i = self._findCard(event) @@ -835,7 +836,8 @@ class Stack: card = self.cards[i] if not self.basicShallHighlightMatch(card): return 0 - col = self.game.app.opt.highlight_cards_colors + col_1 = self.game.app.opt.colors['cards_1'] + col_2 = self.game.app.opt.colors['cards_2'] c1 = c2 = card info = [] found = 0 @@ -857,12 +859,12 @@ class Stack: j = self.cards.index(c) if i - 1 == j: c1 = c; continue if i + 1 == j: c2 = c; continue - info.append((s, c, c, col[3])) + info.append((s, c, c, col_1)) if found: if info: self.game.stats.highlight_cards = self.game.stats.highlight_cards + 1 - info.append((self, c1, c2, col[1])) - return self.game._highlightCards(info, self.game.app.opt.highlight_cards_sleep) + info.append((self, c1, c2, col_2)) + return self.game._highlightCards(info, self.game.app.opt.timeouts['highlight_cards']) if not self.basicIsBlocked(): self.game.highlightNotMatching() return 0 @@ -886,7 +888,7 @@ class Stack: ##print self.cards[i] self.cards[i].item.tkraise() self.game.canvas.update_idletasks() - self.game.sleep(self.game.app.opt.raise_card_sleep) + self.game.sleep(self.game.app.opt.timeouts['raise_card']) if TOOLKIT == 'tk': self.cards[i].item.lower(self.cards[i+1].item) elif TOOLKIT == 'gtk': @@ -1064,8 +1066,8 @@ class Stack: drag.noshade_stacks = [ self ] drag.cards = self.getDragCards(i) drag.index = i - if TOOLKIT == 'gtk': - drag.stack.group.tkraise() + ##if TOOLKIT == 'gtk': + ## drag.stack.group.tkraise() images = game.app.images drag.shadows = self.createShadows(drag.cards) ##sx, sy = 0, 0 @@ -1227,7 +1229,8 @@ class Stack: if drag.shade_img: drag.shade_img.moveTo(sx, sy) else: - img = MfxCanvasImage(game.canvas, sx, sy, image=img, anchor=ANCHOR_NW) + img = MfxCanvasImage(game.canvas, sx, sy, + image=img, anchor=ANCHOR_NW) drag.shade_img = img # raise/lower the shade image to the correct stacking order if TOOLKIT == 'tk': @@ -1258,9 +1261,9 @@ class Stack: #self.game.canvas.update_idletasks() card = self.cards[-1] item = MfxCanvasImage(self.game.canvas, card.x, card.y, - image=img, anchor=ANCHOR_NW) + image=img, anchor=ANCHOR_NW, + group=self.group) #item.tkraise() - item.addtag(self.group) self.items.shade_item = item def _unshadeStack(self): @@ -1566,15 +1569,16 @@ class TalonStack(Stack, # add a redeal image above the bottom image img = (self.getRedealImages())[self.max_rounds != 1] if img is not None: - self.images.redeal = MfxCanvasImage(self.game.canvas, cx, cy, - image=img, anchor="center") self.images.redeal_img = img + self.images.redeal = MfxCanvasImage(self.game.canvas, + cx, cy, image=img, + anchor="center", + group=self.group) if TOOLKIT == 'tk': self.images.redeal.tkraise(self.top_bottom) elif TOOLKIT == 'gtk': ### FIXME pass - self.images.redeal.addtag(self.group) self.top_bottom = self.images.redeal if images.CARDH >= 90: cy, ca = self.y + images.CARDH - 4, "s" @@ -1585,16 +1589,16 @@ class TalonStack(Stack, if images.CARDW >= text_width+4 and ca: # add a redeal text above the bottom image if self.max_rounds != 1: + self.texts.redeal_str = "" images = self.game.app.images self.texts.redeal = MfxCanvasText(self.game.canvas, cx, cy, - anchor=ca, font=font) - self.texts.redeal_str = "" + anchor=ca, font=font, + group=self.group) if TOOLKIT == 'tk': self.texts.redeal.tkraise(self.top_bottom) elif TOOLKIT == 'gtk': ### FIXME pass - self.texts.redeal.addtag(self.group) self.top_bottom = self.texts.redeal def getBottomImage(self): diff --git a/pysollib/tk/colorsdialog.py b/pysollib/tk/colorsdialog.py index 9810c02c..e01f74ee 100644 --- a/pysollib/tk/colorsdialog.py +++ b/pysollib/tk/colorsdialog.py @@ -48,47 +48,43 @@ class ColorsDialog(MfxDialog): frame.pack(expand=True, fill='both', padx=5, pady=10) frame.columnconfigure(0, weight=1) - self.table_text_color_var = Tkinter.BooleanVar() - self.table_text_color_var.set(app.opt.table_text_color) - self.table_text_color_value_var = Tkinter.StringVar() - self.table_text_color_value_var.set(app.opt.table_text_color_value) - ##self.table_color_var = StringVar() - ##self.table_color_var.set(app.opt.table_color) - self.highlight_piles_colors_var = Tkinter.StringVar() - self.highlight_piles_colors_var.set(app.opt.highlight_piles_colors[1]) - self.highlight_cards_colors_1_var = Tkinter.StringVar() - self.highlight_cards_colors_1_var.set(app.opt.highlight_cards_colors[1]) - self.highlight_cards_colors_2_var = Tkinter.StringVar() - self.highlight_cards_colors_2_var.set(app.opt.highlight_cards_colors[3]) - self.highlight_samerank_colors_1_var = Tkinter.StringVar() - self.highlight_samerank_colors_1_var.set(app.opt.highlight_samerank_colors[1]) - self.highlight_samerank_colors_2_var = Tkinter.StringVar() - self.highlight_samerank_colors_2_var.set(app.opt.highlight_samerank_colors[3]) - self.hintarrow_color_var = Tkinter.StringVar() - self.hintarrow_color_var.set(app.opt.hintarrow_color) - self.highlight_not_matching_color_var = Tkinter.StringVar() - self.highlight_not_matching_color_var.set(app.opt.highlight_not_matching_color) + self.use_default_var = Tkinter.BooleanVar() + self.use_default_var.set(not app.opt.use_default_text_color) + self.text_var = Tkinter.StringVar() + self.text_var.set(app.opt.colors['text']) + self.piles_var = Tkinter.StringVar() + self.piles_var.set(app.opt.colors['piles']) + self.cards_1_var = Tkinter.StringVar() + self.cards_1_var.set(app.opt.colors['cards_1']) + self.cards_2_var = Tkinter.StringVar() + self.cards_2_var.set(app.opt.colors['cards_2']) + self.samerank_1_var = Tkinter.StringVar() + self.samerank_1_var.set(app.opt.colors['samerank_1']) + self.samerank_2_var = Tkinter.StringVar() + self.samerank_2_var.set(app.opt.colors['samerank_2']) + self.hintarrow_var = Tkinter.StringVar() + self.hintarrow_var.set(app.opt.colors['hintarrow']) + self.not_matching_var = Tkinter.StringVar() + self.not_matching_var.set(app.opt.colors['not_matching']) # - c = Tkinter.Checkbutton(frame, variable=self.table_text_color_var, + c = Tkinter.Checkbutton(frame, variable=self.use_default_var, text=_("Text foreground:"), anchor='w') c.grid(row=0, column=0, sticky='we') l = Tkinter.Label(frame, width=10, height=2, - bg=self.table_text_color_value_var.get(), - textvariable=self.table_text_color_value_var) + bg=self.text_var.get(), textvariable=self.text_var) l.grid(row=0, column=1, padx=5) b = Tkinter.Button(frame, text=_('Change...'), width=10, command=lambda l=l: self.selectColor(l)) b.grid(row=0, column=2) row = 1 for title, var in ( - ##('Table:', self.table_color_var), - (_('Highlight piles:'), self.highlight_piles_colors_var), - (_('Highlight cards 1:'), self.highlight_cards_colors_1_var), - (_('Highlight cards 2:'), self.highlight_cards_colors_2_var), - (_('Highlight same rank 1:'), self.highlight_samerank_colors_1_var), - (_('Highlight same rank 2:'), self.highlight_samerank_colors_2_var), - (_('Hint arrow:'), self.hintarrow_color_var), - (_('Highlight not matching:'), self.highlight_not_matching_color_var), + (_('Highlight piles:'), self.piles_var), + (_('Highlight cards 1:'), self.cards_1_var), + (_('Highlight cards 2:'), self.cards_2_var), + (_('Highlight same rank 1:'), self.samerank_1_var), + (_('Highlight same rank 2:'), self.samerank_2_var), + (_('Hint arrow:'), self.hintarrow_var), + (_('Highlight not matching:'), self.not_matching_var), ): Tkinter.Label(frame, text=title, anchor='w' ).grid(row=row, column=0, sticky='we') @@ -103,21 +99,15 @@ class ColorsDialog(MfxDialog): focus = self.createButtons(bottom_frame, kw) self.mainloop(focus, kw.timeout) # - self.table_text_color = self.table_text_color_var.get() - self.table_text_color_value = self.table_text_color_value_var.get() - ##self.table_color = self.table_color_var.get() - self.highlight_piles_colors = (None, - self.highlight_piles_colors_var.get()) - self.highlight_cards_colors = (None, - self.highlight_cards_colors_1_var.get(), - None, - self.highlight_cards_colors_2_var.get()) - self.highlight_samerank_colors = (None, - self.highlight_samerank_colors_1_var.get(), - None, - self.highlight_samerank_colors_2_var.get()) - self.hintarrow_color = self.hintarrow_color_var.get() - self.highlight_not_matching_color = self.highlight_not_matching_color_var.get() + self.use_default_color = not self.use_default_var.get() + self.text_color = self.text_var.get() + self.piles_color = self.piles_var.get() + self.cards_1_color = self.cards_1_var.get() + self.cards_2_color = self.cards_2_var.get() + self.samerank_1_color = self.samerank_1_var.get() + self.samerank_2_color = self.samerank_2_var.get() + self.hintarrow_color = self.hintarrow_var.get() + self.not_matching_color = self.not_matching_var.get() def selectColor(self, label): c = askcolor(master=self.top, initialcolor=label.cget('bg'), diff --git a/pysollib/tk/findcarddialog.py b/pysollib/tk/findcarddialog.py index fc2465b2..0ae5ad91 100644 --- a/pysollib/tk/findcarddialog.py +++ b/pysollib/tk/findcarddialog.py @@ -72,7 +72,7 @@ class FindCardDialog(Tkinter.Toplevel): bind(self, "", self.destroy) # ##self.normal_timeout = 400 # in milliseconds - self.normal_timeout = int(1000*game.app.opt.highlight_samerank_sleep) + self.normal_timeout = int(1000*game.app.opt.timeouts['highlight_samerank']) self.hidden_timeout = 200 self.timer = None diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 8357442e..bc8c951f 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -382,9 +382,9 @@ class PysolMenubar(PysolMenubarActions): menu.add_checkbutton(label=n_("Stick&y mouse"), variable=self.tkopt.sticky_mouse, command=self.mOptStickyMouse) menu.add_checkbutton(label=n_("Use mouse for undo/redo"), variable=self.tkopt.mouse_undo, command=self.mOptMouseUndo) menu.add_separator() - menu.add_command(label=n_("&Fonts..."), command=self.mOptFontsOptions) - menu.add_command(label=n_("&Colors..."), command=self.mOptColorsOptions) - menu.add_command(label=n_("Time&outs..."), command=self.mOptTimeoutsOptions) + menu.add_command(label=n_("&Fonts..."), command=self.mOptFonts) + menu.add_command(label=n_("&Colors..."), command=self.mOptColors) + menu.add_command(label=n_("Time&outs..."), command=self.mOptTimeouts) menu.add_separator() submenu = MfxMenu(menu, label=n_("&Toolbar")) createToolbarMenu(self, submenu) @@ -637,7 +637,7 @@ class PysolMenubar(PysolMenubarActions): self.mSelectGame, self.tkopt.gameid) def _addSelectAllGameSubMenu(self, games, menu, command, variable): - menu = MfxMenu(menu, label=n_("All games by name")) + menu = MfxMenu(menu, label=n_("&All games by name")) n, d = 0, self.__cb_max i = 0 while True: @@ -676,6 +676,12 @@ class PysolMenubar(PysolMenubarActions): # Select Game menu actions # + def mSelectGame(self, *args): + self._mSelectGame(self.tkopt.gameid.get()) + + def mSelectGamePopular(self, *args): + self._mSelectGame(self.tkopt.gameid_popular.get()) + def _mSelectGameDialog(self, d): if d.status == 0 and d.button == 0 and d.gameid != self.game.id: self.tkopt.gameid.set(d.gameid) @@ -890,6 +896,105 @@ class PysolMenubar(PysolMenubarActions): self.game.saveGame(filename) self.updateMenus() + def mOptAutoFaceUp(self, *args): + if self._cancelDrag(): return + self.app.opt.autofaceup = self.tkopt.autofaceup.get() + if self.app.opt.autofaceup: + self.game.autoPlay() + + def mOptAutoDrop(self, *args): + if self._cancelDrag(): return + self.app.opt.autodrop = self.tkopt.autodrop.get() + if self.app.opt.autodrop: + self.game.autoPlay() + + def mOptAutoDeal(self, *args): + if self._cancelDrag(): return + self.app.opt.autodeal = self.tkopt.autodeal.get() + if self.app.opt.autodeal: + self.game.autoPlay() + + def mOptQuickPlay(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.quickplay = self.tkopt.quickplay.get() + + def mOptEnableUndo(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.undo = self.tkopt.undo.get() + self.game.updateMenus() + + def mOptEnableBookmarks(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.bookmarks = self.tkopt.bookmarks.get() + self.game.updateMenus() + + def mOptEnableHint(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.hint = self.tkopt.hint.get() + self.game.updateMenus() + + def mOptEnableHighlightPiles(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_piles = self.tkopt.highlight_piles.get() + self.game.updateMenus() + + def mOptEnableHighlightCards(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_cards = self.tkopt.highlight_cards.get() + self.game.updateMenus() + + def mOptEnableHighlightSameRank(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_samerank = self.tkopt.highlight_samerank.get() + ##self.game.updateMenus() + + def mOptEnableHighlightNotMatching(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_not_matching = self.tkopt.highlight_not_matching.get() + ##self.game.updateMenus() + + def mOptAnimations(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.animations = self.tkopt.animations.get() + + def mOptShadow(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shadow = self.tkopt.shadow.get() + + def mOptShade(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shade = self.tkopt.shade.get() + + def mOptShrinkFaceDown(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shrink_face_down = self.tkopt.shrink_face_down.get() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def mOptShadeFilledStacks(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shade_filled_stacks = self.tkopt.shade_filled_stacks.get() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def mOptMahjonggShowRemoved(self, *args): + if self._cancelDrag(): return + self.app.opt.mahjongg_show_removed = self.tkopt.mahjongg_show_removed.get() + ##self.game.updateMenus() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def mOptShisenShowHint(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shisen_show_hint = self.tkopt.shisen_show_hint.get() + ##self.game.updateMenus() + +## def mOptSound(self, *args): +## if self._cancelDrag(break_pause=False): return +## self.app.opt.sound = self.tkopt.sound.get() +## if not self.app.opt.sound: +## self.app.audio.stopAll() + def mSelectCardsetDialog(self, *event): if self._cancelDrag(break_pause=False): return ##strings, default = ("&OK", "&Load", "&Cancel"), 0 @@ -957,7 +1062,7 @@ class PysolMenubar(PysolMenubarActions): if self._cancelDrag(break_pause=False): return key = self.app.tabletile_index if key <= 0: - key = self.app.opt.table_color.lower() + key = self.app.opt.colors['table'] ##.lower() d = SelectTileDialogWithPreview(self.top, app=self.app, title=_("Select table background"), manager=self.app.tabletile_manager, @@ -968,13 +1073,6 @@ class PysolMenubar(PysolMenubarActions): elif d.key > 0 and d.key != self.app.tabletile_index: self._mOptTableTile(d.key) -## def mOptTableColor(self, *event): -## if self._cancelDrag(break_pause=False): return -## c = tkColorChooser.askcolor(initialcolor=self.app.opt.table_color, -## title=_("Select table color")) -## if c and c[1]: -## self._mOptTableColor(c[1]) - def mOptToolbar(self, *event): ##if self._cancelDrag(break_pause=False): return self.setToolbarSide(self.tkopt.toolbar.get()) diff --git a/pysollib/tk/selecttile.py b/pysollib/tk/selecttile.py index d1aa55e3..e2982604 100644 --- a/pysollib/tk/selecttile.py +++ b/pysollib/tk/selecttile.py @@ -121,7 +121,7 @@ class SelectTileDialogWithPreview(MfxDialog): self.app = app self.manager = manager self.key = key - self.table_color = app.opt.table_color + self.table_color = app.opt.colors['table'] if self.TreeDataHolder_Class.data is None: self.TreeDataHolder_Class.data = self.TreeData_Class(manager, key) # diff --git a/pysollib/tk/timeoutsdialog.py b/pysollib/tk/timeoutsdialog.py index a2294147..bdb56b08 100644 --- a/pysollib/tk/timeoutsdialog.py +++ b/pysollib/tk/timeoutsdialog.py @@ -48,17 +48,17 @@ class TimeoutsDialog(MfxDialog): frame.columnconfigure(0, weight=1) self.demo_sleep_var = Tkinter.DoubleVar() - self.demo_sleep_var.set(app.opt.demo_sleep) + self.demo_sleep_var.set(app.opt.timeouts['demo']) self.hint_sleep_var = Tkinter.DoubleVar() - self.hint_sleep_var.set(app.opt.hint_sleep) + self.hint_sleep_var.set(app.opt.timeouts['hint']) self.raise_card_sleep_var = Tkinter.DoubleVar() - self.raise_card_sleep_var.set(app.opt.raise_card_sleep) + self.raise_card_sleep_var.set(app.opt.timeouts['raise_card']) self.highlight_piles_sleep_var = Tkinter.DoubleVar() - self.highlight_piles_sleep_var.set(app.opt.highlight_piles_sleep) + self.highlight_piles_sleep_var.set(app.opt.timeouts['highlight_piles']) self.highlight_cards_sleep_var = Tkinter.DoubleVar() - self.highlight_cards_sleep_var.set(app.opt.highlight_cards_sleep) + self.highlight_cards_sleep_var.set(app.opt.timeouts['highlight_cards']) self.highlight_samerank_sleep_var = Tkinter.DoubleVar() - self.highlight_samerank_sleep_var.set(app.opt.highlight_samerank_sleep) + self.highlight_samerank_sleep_var.set(app.opt.timeouts['highlight_samerank']) # #Tkinter.Label(frame, text='Set delays in seconds').grid(row=0, column=0, columnspan=2) row = 0 @@ -80,12 +80,12 @@ class TimeoutsDialog(MfxDialog): focus = self.createButtons(bottom_frame, kw) self.mainloop(focus, kw.timeout) # - self.demo_sleep = self.demo_sleep_var.get() - self.hint_sleep = self.hint_sleep_var.get() - self.raise_card_sleep = self.raise_card_sleep_var.get() - self.highlight_piles_sleep = self.highlight_piles_sleep_var.get() - self.highlight_cards_sleep = self.highlight_cards_sleep_var.get() - self.highlight_samerank_sleep = self.highlight_samerank_sleep_var.get() + self.demo_timeout = self.demo_sleep_var.get() + self.hint_timeout = self.hint_sleep_var.get() + self.raise_card_timeout = self.raise_card_sleep_var.get() + self.highlight_piles_timeout = self.highlight_piles_sleep_var.get() + self.highlight_cards_timeout = self.highlight_cards_sleep_var.get() + self.highlight_samerank_timeout = self.highlight_samerank_sleep_var.get() def initKw(self, kw): kw = KwStruct(kw, diff --git a/pysollib/tk/tkcanvas.py b/pysollib/tk/tkcanvas.py index c97a73c7..1b149a4e 100644 --- a/pysollib/tk/tkcanvas.py +++ b/pysollib/tk/tkcanvas.py @@ -77,6 +77,14 @@ class MfxCanvasGroup(Canvas.Group): return self.canvas.tk.splitlist(self._do("gettags")) class MfxCanvasImage(Canvas.ImageItem): + def __init__(self, canvas, *args, **kwargs): + group = None + if kwargs.has_key('group'): + group = kwargs['group'] + del kwargs['group'] + Canvas.ImageItem.__init__(self, canvas, *args, **kwargs) + if group: + self.addtag(group) def moveTo(self, x, y): c = self.coords() self.move(x - int(c[0]), y - int(c[1])) @@ -87,19 +95,33 @@ class MfxCanvasImage(Canvas.ImageItem): MfxCanvasLine = Canvas.Line -MfxCanvasRectangle = Canvas.Rectangle +class MfxCanvasRectangle(Canvas.Rectangle): + def __init__(self, canvas, *args, **kwargs): + group = None + if kwargs.has_key('group'): + group = kwargs['group'] + del kwargs['group'] + Canvas.Rectangle.__init__(self, canvas, *args, **kwargs) + if group: + self.addtag(group) class MfxCanvasText(Canvas.CanvasText): - def __init__(self, canvas, x, y, preview=-1, **kw): + def __init__(self, canvas, x, y, preview=-1, **kwargs): if preview < 0: preview = canvas.preview if preview > 1: return - if not kw.has_key("fill"): - kw["fill"] = canvas._text_color - apply(Canvas.CanvasText.__init__, (self, canvas, x, y), kw) + if not kwargs.has_key("fill"): + kwargs["fill"] = canvas._text_color + group = None + if kwargs.has_key('group'): + group = kwargs['group'] + del kwargs['group'] + Canvas.CanvasText.__init__(self, canvas, x, y, **kwargs) self.text_format = None canvas._text_items.append(self) + if group: + self.addtag(group) # /*********************************************************************** diff --git a/pysollib/tk/tkstats.py b/pysollib/tk/tkstats.py index 6bb4f433..0c699e56 100644 --- a/pysollib/tk/tkstats.py +++ b/pysollib/tk/tkstats.py @@ -790,9 +790,9 @@ class Top_StatsDialog(MfxDialog): frame.pack(expand=Tkinter.YES, fill=Tkinter.BOTH, padx=5, pady=10) frame.columnconfigure(0, weight=1) - if app.stats.games_stats.has_key(player) \ - and app.stats.games_stats[player].has_key(gameid) \ - and app.stats.games_stats[player][gameid].time_result.top: + if (app.stats.games_stats.has_key(player) and + app.stats.games_stats[player].has_key(gameid) and + app.stats.games_stats[player][gameid].time_result.top): Tkinter.Label(frame, text=_('Minimum')).grid(row=0, column=1) Tkinter.Label(frame, text=_('Maximum')).grid(row=0, column=2) diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 9ac6b9e4..a0f6a3c8 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -501,7 +501,8 @@ class MfxScrolledCanvas: assert tile.filename assert tile.basename if not force: - if i == app.tabletile_index and tile.color == app.opt.table_color: + if (i == app.tabletile_index and + tile.color == app.opt.colors['table']): return False # if not self.canvas.setTile(tile.filename, tile.stretch): @@ -517,10 +518,10 @@ class MfxScrolledCanvas: ##app.top.config(bg=app.top_bg) color = tile.text_color - if app.opt.table_text_color: - self.canvas.setTextColor(app.opt.table_text_color_value) - else: + if app.opt.use_default_text_color: self.canvas.setTextColor(color) + else: + self.canvas.setTextColor(app.opt.colors['text']) return True From 2c4402650b9369463cbbe616cef2dcbcd447c68c Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 21 Aug 2006 21:25:56 +0000 Subject: [PATCH 053/266] added data/pysolfc.glade git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@54 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- data/pysolfc.glade | 3094 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 3093 insertions(+), 1 deletion(-) mode change 120000 => 100644 data/pysolfc.glade diff --git a/data/pysolfc.glade b/data/pysolfc.glade deleted file mode 120000 index 2d4f6279..00000000 --- a/data/pysolfc.glade +++ /dev/null @@ -1 +0,0 @@ -../../../pysolfc/pysolfc.glade \ No newline at end of file diff --git a/data/pysolfc.glade b/data/pysolfc.glade new file mode 100644 index 00000000..a9443ba1 --- /dev/null +++ b/data/pysolfc.glade @@ -0,0 +1,3093 @@ + + + + + + + Game Statistics + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + True + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + True + True + True + GTK_POS_TOP + False + False + + + + True + 4 + 3 + False + 0 + 0 + + + + True + Game: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 4 + 4 + + + 0 + 1 + 0 + 1 + fill + + + + + + + 4 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 5 + 4 + False + 0 + 0 + + + + 50 + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 6 + 4 + + + 2 + 3 + 0 + 1 + fill + + + + + + + 50 + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 6 + 4 + + + 2 + 3 + 1 + 2 + fill + + + + + + + 50 + True + 0% + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 6 + 4 + + + 3 + 4 + 0 + 1 + fill + + + + + + + 50 + True + 0% + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 6 + 4 + + + 3 + 4 + 1 + 2 + fill + + + + + + + 50 + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 6 + 4 + + + 2 + 3 + 3 + 4 + fill + + + + + + + 80 + True + Won: + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 6 + 4 + + + 1 + 2 + 0 + 1 + fill + + + + + + + 80 + True + Total: + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 6 + 4 + + + 1 + 2 + 3 + 4 + fill + + + + + + + 100 + 80 + True + + + 0 + 1 + 0 + 4 + 10 + 10 + + + + + + 80 + True + Lost: + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 6 + 4 + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + + + 1 + 4 + 2 + 3 + 6 + fill + fill + + + + + + + + True + Current session + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 2 + 0 + + + label_item + + + + + 0 + 2 + 2 + 3 + 4 + + + + + + 4 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 5 + 4 + False + 0 + 0 + + + + 50 + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 6 + 4 + + + 2 + 3 + 0 + 1 + fill + + + + + + + 50 + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 6 + 4 + + + 2 + 3 + 1 + 2 + fill + + + + + + + 50 + True + 0% + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 6 + 4 + + + 3 + 4 + 0 + 1 + fill + + + + + + + 50 + True + 0% + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 6 + 4 + + + 3 + 4 + 1 + 2 + fill + + + + + + + 50 + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 6 + 4 + + + 2 + 3 + 3 + 4 + fill + + + + + + + 80 + True + Won: + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 6 + 4 + + + 1 + 2 + 0 + 1 + fill + + + + + + + 80 + True + Lost: + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 6 + 4 + + + 1 + 2 + 1 + 2 + fill + + + + + + + 80 + True + Total: + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 6 + 4 + + + 1 + 2 + 3 + 4 + fill + + + + + + + 100 + 80 + True + + + 0 + 1 + 0 + 4 + 10 + 10 + + + + + + True + + + 1 + 4 + 2 + 3 + 6 + fill + fill + + + + + + + + True + Total + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 2 + 0 + + + label_item + + + + + 0 + 2 + 1 + 2 + 4 + + + + + False + True + + + + + + True + Current game + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + tab + + + + + + True + 3 + 3 + False + 0 + 0 + + + + 4 + True + True + True + True + GTK_POS_TOP + False + False + + + + True + 3 + 3 + False + 0 + 0 + + + + True + 4 + 4 + False + 0 + 0 + + + + True + Playing time: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 4 + 4 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + 0:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 1 + 2 + 1 + 2 + fill + + + + + + + True + 0:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 2 + 3 + 1 + 2 + fill + + + + + + + True + 0:00 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 3 + 4 + 1 + 2 + fill + + + + + + + True + Moves: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 4 + 4 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 1 + 2 + 2 + 3 + fill + + + + + + + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 2 + 3 + 2 + 3 + fill + + + + + + + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 3 + 4 + 2 + 3 + fill + + + + + + + True + Total moves: + False + False + GTK_JUSTIFY_LEFT + False + False + 1 + 0.5 + 4 + 4 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 1 + 2 + 3 + 4 + fill + + + + + + + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 2 + 3 + 3 + 4 + fill + + + + + + + True + 0 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 3 + 4 + 3 + 4 + fill + + + + + + + True + Minimum + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 1 + 2 + 0 + 1 + + + + + + + True + Maximum + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 2 + 3 + 0 + 1 + + + + + + + True + Average + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 4 + + + 3 + 4 + 0 + 1 + + + + + + 1 + 2 + 1 + 2 + + + + + True + True + + + + + + True + Summary + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + False + True + + + + + + True + Playing time + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + False + True + + + + + + True + Moves + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + False + True + + + + + + True + Total moves + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + 0 + 2 + 1 + 2 + + + + + + True + Game: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 4 + + + 0 + 1 + 0 + 1 + fill + + + + + + False + True + + + + + + True + Top 10 + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + tab + + + + + + True + 3 + 3 + False + 0 + 0 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + 0 + 1 + 0 + 1 + + + + + False + True + + + + + + True + All games + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + tab + + + + + + True + 3 + 3 + False + 0 + 0 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + 0 + 1 + 0 + 1 + + + + + False + True + + + + + + True + Full log + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + tab + + + + + + True + 3 + 3 + False + 0 + 0 + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + 0 + 1 + 0 + 1 + + + + + False + True + + + + + + True + Session log + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + tab + + + + + 0 + True + True + + + + + + + + Set timeouts + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 4 + True + 6 + 3 + False + 0 + 4 + + + + True + Demo: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 4 + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + Hint: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 4 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Raise card: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 4 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + Highlight piles: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 4 + + + 0 + 1 + 3 + 4 + fill + + + + + + + True + Highlight cards: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 4 + + + 0 + 1 + 4 + 5 + fill + + + + + + + True + Highlight same rank: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 4 + + + 0 + 1 + 5 + 6 + fill + + + + + + + True + True + 1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 1 0.2 10 0.1 1 1 + + + + 2 + 3 + 5 + 6 + fill + + + + + + + True + True + 1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 1 0.2 10 0.1 1 1 + + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + True + 1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 1 0.2 10 0.1 1 1 + + + + 2 + 3 + 1 + 2 + fill + + + + + + + True + True + 1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 1 0.2 10 0.1 1 1 + + + + 2 + 3 + 2 + 3 + fill + + + + + + + True + True + 1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 1 0.2 10 0.1 1 1 + + + + 2 + 3 + 3 + 4 + fill + + + + + + + True + True + 1 + 1 + True + GTK_UPDATE_ALWAYS + False + False + 1 0.2 10 0.1 1 1 + + + + 2 + 3 + 4 + 5 + fill + + + + + + + 35 + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 1 0.2 10 0.1 1 1 + + + + 1 + 2 + 5 + 6 + fill + + + + + + 35 + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 1 0.2 10 0.1 1 1 + + + + 1 + 2 + 4 + 5 + fill + + + + + + 160 + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 1 0.2 10 0.1 1 1 + + + + 1 + 2 + 3 + 4 + fill + + + + + + 35 + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 1 0.2 10 0.1 1 1 + + + + 1 + 2 + 2 + 3 + fill + + + + + + 35 + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 1 0.2 10 0.1 1 1 + + + + 1 + 2 + 1 + 2 + fill + + + + + + 35 + True + True + False + GTK_POS_TOP + 1 + GTK_UPDATE_CONTINUOUS + False + 1 0.2 10 0.1 1 1 + + + + 1 + 2 + 0 + 1 + fill + + + + + 0 + True + True + + + + + + + + Set colors + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + 8 + 3 + False + 0 + 0 + + + + True + True + Text foreground: + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 1 + 0 + 1 + 4 + 4 + fill + + + + + + + True + Highlight piles: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + 4 + 4 + fill + + + + + + + True + Highlight cards 1: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + 4 + 4 + fill + + + + + + + True + Highlight cards 2: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + 4 + 4 + fill + + + + + + + True + Highlight same rank 1: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + 4 + 4 + fill + + + + + + + True + Highlight same rank 2: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 5 + 6 + 4 + 4 + fill + + + + + + + True + Hint arrow: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 6 + 7 + 4 + 4 + fill + + + + + + + True + Highlight not matching: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 7 + 8 + 4 + 4 + fill + + + + + + + True + #000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 0 + 1 + 4 + 4 + fill + + + + + + + True + #000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 1 + 2 + 4 + 4 + fill + + + + + + + True + #000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 2 + 3 + 4 + 4 + fill + + + + + + + True + #000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 3 + 4 + 4 + 4 + fill + + + + + + + True + #000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 5 + 6 + 4 + 4 + fill + + + + + + + True + #000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 4 + 5 + 4 + 4 + fill + + + + + + + True + #000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 6 + 7 + 4 + 4 + fill + + + + + + + True + #000000 + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 1 + 2 + 7 + 8 + 4 + 4 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-color + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-color + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 1 + 2 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-color + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 2 + 3 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-color + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 3 + 4 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-color + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 4 + 5 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-color + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 5 + 6 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-color + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 6 + 7 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-color + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 7 + 8 + fill + + + + + + 0 + True + True + + + + + + + From cd896971ad22b47df20f51d5a54e31e308dce6cf Mon Sep 17 00:00:00 2001 From: skomoroh Date: Tue, 22 Aug 2006 21:09:21 +0000 Subject: [PATCH 054/266] - removed pysollib/version.py; moved VERSION* constants to pysollib/settings.py + added data-files (images and glade-files) * GTK bindings: fonts-dialog * GTK bindings: fixed bug with lost connections git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@55 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- Makefile | 5 +- data/glade-translations | 71 + data/images/buttons/bluecurve/cancel.gif | Bin 0 -> 592 bytes data/images/buttons/bluecurve/ok.gif | Bin 0 -> 567 bytes data/images/cards/large/01c.gif | Bin 0 -> 816 bytes data/images/cards/large/01d.gif | Bin 0 -> 816 bytes data/images/cards/large/01h.gif | Bin 0 -> 816 bytes data/images/cards/large/01s.gif | Bin 0 -> 816 bytes data/images/cards/large/02c.gif | Bin 0 -> 816 bytes data/images/cards/large/02d.gif | Bin 0 -> 816 bytes data/images/cards/large/02h.gif | Bin 0 -> 816 bytes data/images/cards/large/02s.gif | Bin 0 -> 816 bytes data/images/cards/large/03c.gif | Bin 0 -> 816 bytes data/images/cards/large/03d.gif | Bin 0 -> 816 bytes data/images/cards/large/03h.gif | Bin 0 -> 816 bytes data/images/cards/large/03s.gif | Bin 0 -> 816 bytes data/images/cards/large/04c.gif | Bin 0 -> 816 bytes data/images/cards/large/04d.gif | Bin 0 -> 816 bytes data/images/cards/large/04h.gif | Bin 0 -> 816 bytes data/images/cards/large/04s.gif | Bin 0 -> 816 bytes data/images/cards/large/05c.gif | Bin 0 -> 816 bytes data/images/cards/large/05d.gif | Bin 0 -> 816 bytes data/images/cards/large/05h.gif | Bin 0 -> 816 bytes data/images/cards/large/05s.gif | Bin 0 -> 816 bytes data/images/cards/large/06c.gif | Bin 0 -> 816 bytes data/images/cards/large/06d.gif | Bin 0 -> 816 bytes data/images/cards/large/06h.gif | Bin 0 -> 816 bytes data/images/cards/large/06s.gif | Bin 0 -> 816 bytes data/images/cards/large/07c.gif | Bin 0 -> 816 bytes data/images/cards/large/07d.gif | Bin 0 -> 816 bytes data/images/cards/large/07h.gif | Bin 0 -> 816 bytes data/images/cards/large/07s.gif | Bin 0 -> 816 bytes data/images/cards/large/08c.gif | Bin 0 -> 816 bytes data/images/cards/large/08d.gif | Bin 0 -> 816 bytes data/images/cards/large/08h.gif | Bin 0 -> 816 bytes data/images/cards/large/08s.gif | Bin 0 -> 816 bytes data/images/cards/large/09c.gif | Bin 0 -> 816 bytes data/images/cards/large/09d.gif | Bin 0 -> 816 bytes data/images/cards/large/09h.gif | Bin 0 -> 816 bytes data/images/cards/large/09s.gif | Bin 0 -> 816 bytes data/images/cards/large/10c.gif | Bin 0 -> 816 bytes data/images/cards/large/10d.gif | Bin 0 -> 816 bytes data/images/cards/large/10h.gif | Bin 0 -> 816 bytes data/images/cards/large/10s.gif | Bin 0 -> 816 bytes data/images/cards/large/11c.gif | Bin 0 -> 816 bytes data/images/cards/large/11d.gif | Bin 0 -> 816 bytes data/images/cards/large/11h.gif | Bin 0 -> 816 bytes data/images/cards/large/11s.gif | Bin 0 -> 816 bytes data/images/cards/large/12c.gif | Bin 0 -> 816 bytes data/images/cards/large/12d.gif | Bin 0 -> 816 bytes data/images/cards/large/12h.gif | Bin 0 -> 816 bytes data/images/cards/large/12s.gif | Bin 0 -> 816 bytes data/images/cards/large/13c.gif | Bin 0 -> 816 bytes data/images/cards/large/13d.gif | Bin 0 -> 816 bytes data/images/cards/large/13h.gif | Bin 0 -> 816 bytes data/images/cards/large/13s.gif | Bin 0 -> 816 bytes data/images/cards/small/01c.gif | Bin 0 -> 415 bytes data/images/cards/small/01d.gif | Bin 0 -> 415 bytes data/images/cards/small/01h.gif | Bin 0 -> 415 bytes data/images/cards/small/01s.gif | Bin 0 -> 415 bytes data/images/cards/small/02c.gif | Bin 0 -> 415 bytes data/images/cards/small/02d.gif | Bin 0 -> 415 bytes data/images/cards/small/02h.gif | Bin 0 -> 415 bytes data/images/cards/small/02s.gif | Bin 0 -> 415 bytes data/images/cards/small/03c.gif | Bin 0 -> 415 bytes data/images/cards/small/03d.gif | Bin 0 -> 415 bytes data/images/cards/small/03h.gif | Bin 0 -> 415 bytes data/images/cards/small/03s.gif | Bin 0 -> 415 bytes data/images/cards/small/04c.gif | Bin 0 -> 415 bytes data/images/cards/small/04d.gif | Bin 0 -> 415 bytes data/images/cards/small/04h.gif | Bin 0 -> 415 bytes data/images/cards/small/04s.gif | Bin 0 -> 415 bytes data/images/cards/small/05c.gif | Bin 0 -> 415 bytes data/images/cards/small/05d.gif | Bin 0 -> 415 bytes data/images/cards/small/05h.gif | Bin 0 -> 415 bytes data/images/cards/small/05s.gif | Bin 0 -> 415 bytes data/images/cards/small/06c.gif | Bin 0 -> 415 bytes data/images/cards/small/06d.gif | Bin 0 -> 415 bytes data/images/cards/small/06h.gif | Bin 0 -> 415 bytes data/images/cards/small/06s.gif | Bin 0 -> 415 bytes data/images/cards/small/07c.gif | Bin 0 -> 415 bytes data/images/cards/small/07d.gif | Bin 0 -> 415 bytes data/images/cards/small/07h.gif | Bin 0 -> 415 bytes data/images/cards/small/07s.gif | Bin 0 -> 415 bytes data/images/cards/small/08c.gif | Bin 0 -> 415 bytes data/images/cards/small/08d.gif | Bin 0 -> 415 bytes data/images/cards/small/08h.gif | Bin 0 -> 415 bytes data/images/cards/small/08s.gif | Bin 0 -> 415 bytes data/images/cards/small/09c.gif | Bin 0 -> 415 bytes data/images/cards/small/09d.gif | Bin 0 -> 415 bytes data/images/cards/small/09h.gif | Bin 0 -> 415 bytes data/images/cards/small/09s.gif | Bin 0 -> 415 bytes data/images/cards/small/10c.gif | Bin 0 -> 415 bytes data/images/cards/small/10d.gif | Bin 0 -> 415 bytes data/images/cards/small/10h.gif | Bin 0 -> 415 bytes data/images/cards/small/10s.gif | Bin 0 -> 415 bytes data/images/cards/small/11c.gif | Bin 0 -> 415 bytes data/images/cards/small/11d.gif | Bin 0 -> 415 bytes data/images/cards/small/11h.gif | Bin 0 -> 415 bytes data/images/cards/small/11s.gif | Bin 0 -> 415 bytes data/images/cards/small/12c.gif | Bin 0 -> 415 bytes data/images/cards/small/12d.gif | Bin 0 -> 415 bytes data/images/cards/small/12h.gif | Bin 0 -> 415 bytes data/images/cards/small/12s.gif | Bin 0 -> 415 bytes data/images/cards/small/13c.gif | Bin 0 -> 415 bytes data/images/cards/small/13d.gif | Bin 0 -> 415 bytes data/images/cards/small/13h.gif | Bin 0 -> 415 bytes data/images/cards/small/13s.gif | Bin 0 -> 415 bytes data/images/demo/demo01.gif | Bin 0 -> 14700 bytes data/images/demo/demo02.gif | Bin 0 -> 16685 bytes data/images/demo/demo03.gif | Bin 0 -> 14805 bytes data/images/demo/demo04.gif | Bin 0 -> 13367 bytes data/images/demo/demo05.gif | Bin 0 -> 12885 bytes data/images/dialog/bluecurve/error.gif | Bin 0 -> 1597 bytes data/images/dialog/bluecurve/info.gif | Bin 0 -> 1642 bytes data/images/dialog/bluecurve/question.gif | Bin 0 -> 1777 bytes data/images/dialog/bluecurve/warning.gif | Bin 0 -> 1573 bytes data/images/dialog/default/error.gif | Bin 0 -> 276 bytes data/images/dialog/default/info.gif | Bin 0 -> 271 bytes data/images/dialog/default/question.gif | Bin 0 -> 292 bytes data/images/dialog/default/warning.gif | Bin 0 -> 297 bytes data/images/htmlviewer/disk.gif | Bin 0 -> 85 bytes data/images/logos/joker07_40_774.gif | Bin 0 -> 4849 bytes data/images/logos/joker07_50_774.gif | Bin 0 -> 7574 bytes data/images/logos/joker08_40_774.gif | Bin 0 -> 4998 bytes data/images/logos/joker08_50_774.gif | Bin 0 -> 7431 bytes data/images/logos/joker10_100.gif | Bin 0 -> 27061 bytes data/images/logos/joker11_100_774.gif | Bin 0 -> 14249 bytes data/images/misc/pysol01.png | Bin 0 -> 2696 bytes data/images/misc/pysol02.png | Bin 0 -> 8595 bytes data/images/noredeal.gif | Bin 0 -> 1695 bytes data/images/pause/pause01.gif | Bin 0 -> 7556 bytes data/images/pause/pause02.gif | Bin 0 -> 8251 bytes data/images/pause/pause03.gif | Bin 0 -> 7158 bytes data/images/redeal.gif | Bin 0 -> 1492 bytes data/images/selectgame.gif | Bin 0 -> 1295 bytes data/images/stats/barchart.gif | Bin 0 -> 5835 bytes data/images/stoplight.gif | Bin 0 -> 1533 bytes data/images/stopsign.gif | Bin 0 -> 1053 bytes .../toolbar/bluecurve/large/autodrop.gif | Bin 0 -> 1311 bytes data/images/toolbar/bluecurve/large/new.gif | Bin 0 -> 558 bytes data/images/toolbar/bluecurve/large/open.gif | Bin 0 -> 1377 bytes data/images/toolbar/bluecurve/large/pause.gif | Bin 0 -> 929 bytes data/images/toolbar/bluecurve/large/quit.gif | Bin 0 -> 1431 bytes data/images/toolbar/bluecurve/large/redo.gif | Bin 0 -> 751 bytes .../toolbar/bluecurve/large/restart.gif | Bin 0 -> 1289 bytes data/images/toolbar/bluecurve/large/rules.gif | Bin 0 -> 1517 bytes data/images/toolbar/bluecurve/large/save.gif | Bin 0 -> 1410 bytes .../toolbar/bluecurve/large/statistics.gif | Bin 0 -> 781 bytes data/images/toolbar/bluecurve/large/undo.gif | Bin 0 -> 716 bytes .../toolbar/bluecurve/small/autodrop.gif | Bin 0 -> 1115 bytes data/images/toolbar/bluecurve/small/new.gif | Bin 0 -> 458 bytes data/images/toolbar/bluecurve/small/open.gif | Bin 0 -> 727 bytes data/images/toolbar/bluecurve/small/pause.gif | Bin 0 -> 471 bytes data/images/toolbar/bluecurve/small/quit.gif | Bin 0 -> 771 bytes data/images/toolbar/bluecurve/small/redo.gif | Bin 0 -> 707 bytes .../toolbar/bluecurve/small/restart.gif | Bin 0 -> 773 bytes data/images/toolbar/bluecurve/small/rules.gif | Bin 0 -> 1234 bytes data/images/toolbar/bluecurve/small/save.gif | Bin 0 -> 754 bytes .../toolbar/bluecurve/small/statistics.gif | Bin 0 -> 682 bytes data/images/toolbar/bluecurve/small/undo.gif | Bin 0 -> 676 bytes .../toolbar/bluecurve/xlarge/autodrop.gif | Bin 0 -> 1765 bytes data/images/toolbar/bluecurve/xlarge/new.gif | Bin 0 -> 826 bytes data/images/toolbar/bluecurve/xlarge/open.gif | Bin 0 -> 1885 bytes .../images/toolbar/bluecurve/xlarge/pause.gif | Bin 0 -> 886 bytes data/images/toolbar/bluecurve/xlarge/quit.gif | Bin 0 -> 2004 bytes data/images/toolbar/bluecurve/xlarge/redo.gif | Bin 0 -> 1478 bytes .../toolbar/bluecurve/xlarge/restart.gif | Bin 0 -> 1712 bytes .../images/toolbar/bluecurve/xlarge/rules.gif | Bin 0 -> 2134 bytes data/images/toolbar/bluecurve/xlarge/save.gif | Bin 0 -> 1911 bytes .../toolbar/bluecurve/xlarge/statistics.gif | Bin 0 -> 1442 bytes data/images/toolbar/bluecurve/xlarge/undo.gif | Bin 0 -> 1336 bytes data/images/toolbar/crystal/README.ICONS | 1 + .../images/toolbar/crystal/large/autodrop.gif | Bin 0 -> 1040 bytes data/images/toolbar/crystal/large/new.gif | Bin 0 -> 534 bytes data/images/toolbar/crystal/large/open.gif | Bin 0 -> 1032 bytes data/images/toolbar/crystal/large/pause.gif | Bin 0 -> 929 bytes data/images/toolbar/crystal/large/quit.gif | Bin 0 -> 909 bytes data/images/toolbar/crystal/large/redo.gif | Bin 0 -> 751 bytes data/images/toolbar/crystal/large/restart.gif | Bin 0 -> 1025 bytes data/images/toolbar/crystal/large/rules.gif | Bin 0 -> 979 bytes data/images/toolbar/crystal/large/save.gif | Bin 0 -> 994 bytes .../toolbar/crystal/large/statistics.gif | Bin 0 -> 1119 bytes data/images/toolbar/crystal/large/undo.gif | Bin 0 -> 763 bytes .../images/toolbar/crystal/small/autodrop.gif | Bin 0 -> 764 bytes data/images/toolbar/crystal/small/new.gif | Bin 0 -> 289 bytes data/images/toolbar/crystal/small/open.gif | Bin 0 -> 759 bytes data/images/toolbar/crystal/small/pause.gif | Bin 0 -> 409 bytes data/images/toolbar/crystal/small/quit.gif | Bin 0 -> 476 bytes data/images/toolbar/crystal/small/redo.gif | Bin 0 -> 598 bytes data/images/toolbar/crystal/small/restart.gif | Bin 0 -> 714 bytes data/images/toolbar/crystal/small/rules.gif | Bin 0 -> 726 bytes data/images/toolbar/crystal/small/save.gif | Bin 0 -> 540 bytes .../toolbar/crystal/small/statistics.gif | Bin 0 -> 796 bytes data/images/toolbar/crystal/small/undo.gif | Bin 0 -> 599 bytes .../toolbar/default/empty-large/autodrop.gif | Bin 0 -> 175 bytes .../toolbar/default/empty-large/new.gif | Bin 0 -> 179 bytes .../toolbar/default/empty-large/open.gif | Bin 0 -> 181 bytes .../toolbar/default/empty-large/quit.gif | Bin 0 -> 175 bytes .../toolbar/default/empty-large/redo.gif | Bin 0 -> 180 bytes .../toolbar/default/empty-large/restart.gif | Bin 0 -> 210 bytes .../toolbar/default/empty-large/rules.gif | Bin 0 -> 190 bytes .../toolbar/default/empty-large/save.gif | Bin 0 -> 160 bytes .../default/empty-large/statistics.gif | Bin 0 -> 171 bytes .../toolbar/default/empty-large/undo.gif | Bin 0 -> 189 bytes .../images/toolbar/default/large/autodrop.gif | Bin 0 -> 929 bytes data/images/toolbar/default/large/new.gif | Bin 0 -> 546 bytes data/images/toolbar/default/large/open.gif | Bin 0 -> 929 bytes data/images/toolbar/default/large/pause.gif | Bin 0 -> 929 bytes data/images/toolbar/default/large/quit.gif | Bin 0 -> 1142 bytes data/images/toolbar/default/large/redo.gif | Bin 0 -> 1457 bytes data/images/toolbar/default/large/restart.gif | Bin 0 -> 1142 bytes data/images/toolbar/default/large/rules.gif | Bin 0 -> 929 bytes data/images/toolbar/default/large/save.gif | Bin 0 -> 772 bytes .../toolbar/default/large/statistics.gif | Bin 0 -> 659 bytes data/images/toolbar/default/large/undo.gif | Bin 0 -> 1142 bytes .../images/toolbar/default/small/autodrop.gif | Bin 0 -> 377 bytes data/images/toolbar/default/small/new.gif | Bin 0 -> 158 bytes data/images/toolbar/default/small/open.gif | Bin 0 -> 191 bytes data/images/toolbar/default/small/pause.gif | Bin 0 -> 409 bytes data/images/toolbar/default/small/quit.gif | Bin 0 -> 200 bytes data/images/toolbar/default/small/redo.gif | Bin 0 -> 167 bytes data/images/toolbar/default/small/restart.gif | Bin 0 -> 192 bytes data/images/toolbar/default/small/rules.gif | Bin 0 -> 227 bytes data/images/toolbar/default/small/save.gif | Bin 0 -> 276 bytes .../toolbar/default/small/statistics.gif | Bin 0 -> 169 bytes data/images/toolbar/default/small/undo.gif | Bin 0 -> 169 bytes data/images/tree/emptynode.gif | Bin 0 -> 135 bytes data/images/tree/folder.gif | Bin 0 -> 176 bytes data/images/tree/minusnode.gif | Bin 0 -> 102 bytes data/images/tree/node.gif | Bin 0 -> 129 bytes data/images/tree/openfolder.gif | Bin 0 -> 172 bytes data/images/tree/plusnode.gif | Bin 0 -> 107 bytes data/images/tree/python.gif | Bin 0 -> 153 bytes data/images/tree/tk.gif | Bin 0 -> 110 bytes data/images/wizard.gif | Bin 0 -> 1972 bytes data/images/wizardcards.gif | Bin 0 -> 1710 bytes data/pysol.ico | Bin 0 -> 2238 bytes data/pysol.xbm | 20 + data/pysol.xpm | 49 + data/pysolfc.glade | 1491 ++++++++++++++--- data/pysolfc.gladep | 10 + po/games.pot | 56 +- po/pysol.pot | 927 +++++----- po/ru_games.po | 69 +- po/ru_pysol.po | 841 +++++----- pysollib/actions.py | 16 +- pysollib/app.py | 13 +- pysollib/game.py | 7 +- pysollib/games/calculation.py | 6 +- pysollib/games/mahjongg/mahjongg.py | 38 +- pysollib/help.py | 29 +- pysollib/images.py | 1 - pysollib/main.py | 3 +- pysollib/pysolgtk/colorsdialog.py | 42 +- pysollib/pysolgtk/fontsdialog.py | 114 +- pysollib/pysolgtk/menubar.py | 10 +- pysollib/pysolgtk/progressbar.py | 14 +- pysollib/pysolgtk/selectgame.py | 4 +- pysollib/pysolgtk/timeoutsdialog.py | 1 - pysollib/pysolgtk/tkcanvas.py | 30 +- pysollib/pysolgtk/tkhtml.py | 8 +- pysollib/pysolgtk/tkstats.py | 1 + pysollib/pysolgtk/tkutil.py | 16 +- pysollib/pysolgtk/tkwrap.py | 3 +- pysollib/resource.py | 3 +- pysollib/settings.py | 18 +- pysollib/stack.py | 5 +- pysollib/stats.py | 2 +- pysollib/tk/menubar.py | 1 - pysollib/tk/selectgame.py | 4 +- pysollib/tk/tkhtml.py | 6 +- pysollib/tk/tkutil.py | 10 +- pysollib/util.py | 3 +- pysollib/version.py | 30 - scripts/create_iss.py | 2 +- setup.py | 2 +- 277 files changed, 2727 insertions(+), 1255 deletions(-) create mode 100644 data/glade-translations create mode 100644 data/images/buttons/bluecurve/cancel.gif create mode 100644 data/images/buttons/bluecurve/ok.gif create mode 100644 data/images/cards/large/01c.gif create mode 100644 data/images/cards/large/01d.gif create mode 100644 data/images/cards/large/01h.gif create mode 100644 data/images/cards/large/01s.gif create mode 100644 data/images/cards/large/02c.gif create mode 100644 data/images/cards/large/02d.gif create mode 100644 data/images/cards/large/02h.gif create mode 100644 data/images/cards/large/02s.gif create mode 100644 data/images/cards/large/03c.gif create mode 100644 data/images/cards/large/03d.gif create mode 100644 data/images/cards/large/03h.gif create mode 100644 data/images/cards/large/03s.gif create mode 100644 data/images/cards/large/04c.gif create mode 100644 data/images/cards/large/04d.gif create mode 100644 data/images/cards/large/04h.gif create mode 100644 data/images/cards/large/04s.gif create mode 100644 data/images/cards/large/05c.gif create mode 100644 data/images/cards/large/05d.gif create mode 100644 data/images/cards/large/05h.gif create mode 100644 data/images/cards/large/05s.gif create mode 100644 data/images/cards/large/06c.gif create mode 100644 data/images/cards/large/06d.gif create mode 100644 data/images/cards/large/06h.gif create mode 100644 data/images/cards/large/06s.gif create mode 100644 data/images/cards/large/07c.gif create mode 100644 data/images/cards/large/07d.gif create mode 100644 data/images/cards/large/07h.gif create mode 100644 data/images/cards/large/07s.gif create mode 100644 data/images/cards/large/08c.gif create mode 100644 data/images/cards/large/08d.gif create mode 100644 data/images/cards/large/08h.gif create mode 100644 data/images/cards/large/08s.gif create mode 100644 data/images/cards/large/09c.gif create mode 100644 data/images/cards/large/09d.gif create mode 100644 data/images/cards/large/09h.gif create mode 100644 data/images/cards/large/09s.gif create mode 100644 data/images/cards/large/10c.gif create mode 100644 data/images/cards/large/10d.gif create mode 100644 data/images/cards/large/10h.gif create mode 100644 data/images/cards/large/10s.gif create mode 100644 data/images/cards/large/11c.gif create mode 100644 data/images/cards/large/11d.gif create mode 100644 data/images/cards/large/11h.gif create mode 100644 data/images/cards/large/11s.gif create mode 100644 data/images/cards/large/12c.gif create mode 100644 data/images/cards/large/12d.gif create mode 100644 data/images/cards/large/12h.gif create mode 100644 data/images/cards/large/12s.gif create mode 100644 data/images/cards/large/13c.gif create mode 100644 data/images/cards/large/13d.gif create mode 100644 data/images/cards/large/13h.gif create mode 100644 data/images/cards/large/13s.gif create mode 100644 data/images/cards/small/01c.gif create mode 100644 data/images/cards/small/01d.gif create mode 100644 data/images/cards/small/01h.gif create mode 100644 data/images/cards/small/01s.gif create mode 100644 data/images/cards/small/02c.gif create mode 100644 data/images/cards/small/02d.gif create mode 100644 data/images/cards/small/02h.gif create mode 100644 data/images/cards/small/02s.gif create mode 100644 data/images/cards/small/03c.gif create mode 100644 data/images/cards/small/03d.gif create mode 100644 data/images/cards/small/03h.gif create mode 100644 data/images/cards/small/03s.gif create mode 100644 data/images/cards/small/04c.gif create mode 100644 data/images/cards/small/04d.gif create mode 100644 data/images/cards/small/04h.gif create mode 100644 data/images/cards/small/04s.gif create mode 100644 data/images/cards/small/05c.gif create mode 100644 data/images/cards/small/05d.gif create mode 100644 data/images/cards/small/05h.gif create mode 100644 data/images/cards/small/05s.gif create mode 100644 data/images/cards/small/06c.gif create mode 100644 data/images/cards/small/06d.gif create mode 100644 data/images/cards/small/06h.gif create mode 100644 data/images/cards/small/06s.gif create mode 100644 data/images/cards/small/07c.gif create mode 100644 data/images/cards/small/07d.gif create mode 100644 data/images/cards/small/07h.gif create mode 100644 data/images/cards/small/07s.gif create mode 100644 data/images/cards/small/08c.gif create mode 100644 data/images/cards/small/08d.gif create mode 100644 data/images/cards/small/08h.gif create mode 100644 data/images/cards/small/08s.gif create mode 100644 data/images/cards/small/09c.gif create mode 100644 data/images/cards/small/09d.gif create mode 100644 data/images/cards/small/09h.gif create mode 100644 data/images/cards/small/09s.gif create mode 100644 data/images/cards/small/10c.gif create mode 100644 data/images/cards/small/10d.gif create mode 100644 data/images/cards/small/10h.gif create mode 100644 data/images/cards/small/10s.gif create mode 100644 data/images/cards/small/11c.gif create mode 100644 data/images/cards/small/11d.gif create mode 100644 data/images/cards/small/11h.gif create mode 100644 data/images/cards/small/11s.gif create mode 100644 data/images/cards/small/12c.gif create mode 100644 data/images/cards/small/12d.gif create mode 100644 data/images/cards/small/12h.gif create mode 100644 data/images/cards/small/12s.gif create mode 100644 data/images/cards/small/13c.gif create mode 100644 data/images/cards/small/13d.gif create mode 100644 data/images/cards/small/13h.gif create mode 100644 data/images/cards/small/13s.gif create mode 100644 data/images/demo/demo01.gif create mode 100644 data/images/demo/demo02.gif create mode 100644 data/images/demo/demo03.gif create mode 100644 data/images/demo/demo04.gif create mode 100644 data/images/demo/demo05.gif create mode 100644 data/images/dialog/bluecurve/error.gif create mode 100644 data/images/dialog/bluecurve/info.gif create mode 100644 data/images/dialog/bluecurve/question.gif create mode 100644 data/images/dialog/bluecurve/warning.gif create mode 100644 data/images/dialog/default/error.gif create mode 100644 data/images/dialog/default/info.gif create mode 100644 data/images/dialog/default/question.gif create mode 100644 data/images/dialog/default/warning.gif create mode 100644 data/images/htmlviewer/disk.gif create mode 100644 data/images/logos/joker07_40_774.gif create mode 100644 data/images/logos/joker07_50_774.gif create mode 100644 data/images/logos/joker08_40_774.gif create mode 100644 data/images/logos/joker08_50_774.gif create mode 100644 data/images/logos/joker10_100.gif create mode 100644 data/images/logos/joker11_100_774.gif create mode 100644 data/images/misc/pysol01.png create mode 100644 data/images/misc/pysol02.png create mode 100644 data/images/noredeal.gif create mode 100644 data/images/pause/pause01.gif create mode 100644 data/images/pause/pause02.gif create mode 100644 data/images/pause/pause03.gif create mode 100644 data/images/redeal.gif create mode 100644 data/images/selectgame.gif create mode 100644 data/images/stats/barchart.gif create mode 100644 data/images/stoplight.gif create mode 100644 data/images/stopsign.gif create mode 100644 data/images/toolbar/bluecurve/large/autodrop.gif create mode 100644 data/images/toolbar/bluecurve/large/new.gif create mode 100644 data/images/toolbar/bluecurve/large/open.gif create mode 100644 data/images/toolbar/bluecurve/large/pause.gif create mode 100644 data/images/toolbar/bluecurve/large/quit.gif create mode 100644 data/images/toolbar/bluecurve/large/redo.gif create mode 100644 data/images/toolbar/bluecurve/large/restart.gif create mode 100644 data/images/toolbar/bluecurve/large/rules.gif create mode 100644 data/images/toolbar/bluecurve/large/save.gif create mode 100644 data/images/toolbar/bluecurve/large/statistics.gif create mode 100644 data/images/toolbar/bluecurve/large/undo.gif create mode 100644 data/images/toolbar/bluecurve/small/autodrop.gif create mode 100644 data/images/toolbar/bluecurve/small/new.gif create mode 100644 data/images/toolbar/bluecurve/small/open.gif create mode 100644 data/images/toolbar/bluecurve/small/pause.gif create mode 100644 data/images/toolbar/bluecurve/small/quit.gif create mode 100644 data/images/toolbar/bluecurve/small/redo.gif create mode 100644 data/images/toolbar/bluecurve/small/restart.gif create mode 100644 data/images/toolbar/bluecurve/small/rules.gif create mode 100644 data/images/toolbar/bluecurve/small/save.gif create mode 100644 data/images/toolbar/bluecurve/small/statistics.gif create mode 100644 data/images/toolbar/bluecurve/small/undo.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/autodrop.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/new.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/open.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/pause.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/quit.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/redo.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/restart.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/rules.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/save.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/statistics.gif create mode 100644 data/images/toolbar/bluecurve/xlarge/undo.gif create mode 100644 data/images/toolbar/crystal/README.ICONS create mode 100644 data/images/toolbar/crystal/large/autodrop.gif create mode 100644 data/images/toolbar/crystal/large/new.gif create mode 100644 data/images/toolbar/crystal/large/open.gif create mode 100644 data/images/toolbar/crystal/large/pause.gif create mode 100644 data/images/toolbar/crystal/large/quit.gif create mode 100644 data/images/toolbar/crystal/large/redo.gif create mode 100644 data/images/toolbar/crystal/large/restart.gif create mode 100644 data/images/toolbar/crystal/large/rules.gif create mode 100644 data/images/toolbar/crystal/large/save.gif create mode 100644 data/images/toolbar/crystal/large/statistics.gif create mode 100644 data/images/toolbar/crystal/large/undo.gif create mode 100644 data/images/toolbar/crystal/small/autodrop.gif create mode 100644 data/images/toolbar/crystal/small/new.gif create mode 100644 data/images/toolbar/crystal/small/open.gif create mode 100644 data/images/toolbar/crystal/small/pause.gif create mode 100644 data/images/toolbar/crystal/small/quit.gif create mode 100644 data/images/toolbar/crystal/small/redo.gif create mode 100644 data/images/toolbar/crystal/small/restart.gif create mode 100644 data/images/toolbar/crystal/small/rules.gif create mode 100644 data/images/toolbar/crystal/small/save.gif create mode 100644 data/images/toolbar/crystal/small/statistics.gif create mode 100644 data/images/toolbar/crystal/small/undo.gif create mode 100644 data/images/toolbar/default/empty-large/autodrop.gif create mode 100644 data/images/toolbar/default/empty-large/new.gif create mode 100644 data/images/toolbar/default/empty-large/open.gif create mode 100644 data/images/toolbar/default/empty-large/quit.gif create mode 100644 data/images/toolbar/default/empty-large/redo.gif create mode 100644 data/images/toolbar/default/empty-large/restart.gif create mode 100644 data/images/toolbar/default/empty-large/rules.gif create mode 100644 data/images/toolbar/default/empty-large/save.gif create mode 100644 data/images/toolbar/default/empty-large/statistics.gif create mode 100644 data/images/toolbar/default/empty-large/undo.gif create mode 100644 data/images/toolbar/default/large/autodrop.gif create mode 100644 data/images/toolbar/default/large/new.gif create mode 100644 data/images/toolbar/default/large/open.gif create mode 100644 data/images/toolbar/default/large/pause.gif create mode 100644 data/images/toolbar/default/large/quit.gif create mode 100644 data/images/toolbar/default/large/redo.gif create mode 100644 data/images/toolbar/default/large/restart.gif create mode 100644 data/images/toolbar/default/large/rules.gif create mode 100644 data/images/toolbar/default/large/save.gif create mode 100644 data/images/toolbar/default/large/statistics.gif create mode 100644 data/images/toolbar/default/large/undo.gif create mode 100644 data/images/toolbar/default/small/autodrop.gif create mode 100644 data/images/toolbar/default/small/new.gif create mode 100644 data/images/toolbar/default/small/open.gif create mode 100644 data/images/toolbar/default/small/pause.gif create mode 100644 data/images/toolbar/default/small/quit.gif create mode 100644 data/images/toolbar/default/small/redo.gif create mode 100644 data/images/toolbar/default/small/restart.gif create mode 100644 data/images/toolbar/default/small/rules.gif create mode 100644 data/images/toolbar/default/small/save.gif create mode 100644 data/images/toolbar/default/small/statistics.gif create mode 100644 data/images/toolbar/default/small/undo.gif create mode 100644 data/images/tree/emptynode.gif create mode 100644 data/images/tree/folder.gif create mode 100644 data/images/tree/minusnode.gif create mode 100644 data/images/tree/node.gif create mode 100644 data/images/tree/openfolder.gif create mode 100644 data/images/tree/plusnode.gif create mode 100644 data/images/tree/python.gif create mode 100644 data/images/tree/tk.gif create mode 100644 data/images/wizard.gif create mode 100644 data/images/wizardcards.gif create mode 100644 data/pysol.ico create mode 100644 data/pysol.xbm create mode 100644 data/pysol.xpm create mode 100644 data/pysolfc.gladep delete mode 100644 pysollib/version.py diff --git a/Makefile b/Makefile index 6c2531cb..2f182e32 100644 --- a/Makefile +++ b/Makefile @@ -27,8 +27,11 @@ rules: mv data/html-src/html data pot: - pygettext.py -k n_ -o po/pysol.pot $(PYSOLLIB_FILES) ./scripts/all_games.py gettext > po/games.pot + pygettext.py -k n_ -o po/pysol-1.pot $(PYSOLLIB_FILES) + xgettext -L C --keyword=N_ -o po/pysol-2.pot data/glade-translations + msgcat po/pysol-1.pot po/pysol-2.pot > po/pysol.pot + rm -f po/pysol-1.pot po/pysol-2.pot for lng in ru; do \ mv -f po/$${lng}_pysol.po po/$${lng}_pysol.old.po; \ msgmerge po/$${lng}_pysol.old.po po/pysol.pot > po/$${lng}_pysol.po; \ diff --git a/data/glade-translations b/data/glade-translations new file mode 100644 index 00000000..020d0e77 --- /dev/null +++ b/data/glade-translations @@ -0,0 +1,71 @@ +/* + * Translatable strings file generated by Glade. + * Add this file to your project's POTFILES.in. + * DO NOT compile it as part of your application. + */ + +gchar *s = N_("Game Statistics"); +gchar *s = N_("Game:"); +gchar *s = N_("Won:"); +gchar *s = N_("Total:"); +gchar *s = N_("Lost:"); +gchar *s = N_("Current session"); +gchar *s = N_("Won:"); +gchar *s = N_("Lost:"); +gchar *s = N_("Total:"); +gchar *s = N_("Total"); +gchar *s = N_("Current game"); +gchar *s = N_("Playing time:"); +gchar *s = N_("Moves:"); +gchar *s = N_("Total moves:"); +gchar *s = N_("Minimum"); +gchar *s = N_("Maximum"); +gchar *s = N_("Average"); +gchar *s = N_("Summary"); +gchar *s = N_("Playing time"); +gchar *s = N_("Moves"); +gchar *s = N_("Total moves"); +gchar *s = N_("Game:"); +gchar *s = N_("Top 10"); +gchar *s = N_("All games"); +gchar *s = N_("Full log"); +gchar *s = N_("Session log"); +gchar *s = N_("Set timeouts"); +gchar *s = N_("Demo:"); +gchar *s = N_("Hint:"); +gchar *s = N_("Raise card:"); +gchar *s = N_("Highlight piles:"); +gchar *s = N_("Highlight cards:"); +gchar *s = N_("Highlight same rank:"); +gchar *s = N_("Set colors"); +gchar *s = N_("Text foreground:"); +gchar *s = N_("Highlight piles:"); +gchar *s = N_("Highlight cards 1:"); +gchar *s = N_("Highlight cards 2:"); +gchar *s = N_("Highlight same rank 1:"); +gchar *s = N_("Highlight same rank 2:"); +gchar *s = N_("Hint arrow:"); +gchar *s = N_("Highlight not matching:"); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Set font"); +gchar *s = N_("HTML: "); +gchar *s = N_("Small: "); +gchar *s = N_("Fixed: "); +gchar *s = N_("Tableau default: "); +gchar *s = N_("Tableau fixed: "); +gchar *s = N_("Tableau small: "); +gchar *s = N_("Tableau large: "); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); +gchar *s = N_("Change..."); diff --git a/data/images/buttons/bluecurve/cancel.gif b/data/images/buttons/bluecurve/cancel.gif new file mode 100644 index 0000000000000000000000000000000000000000..808d3535f89f592b61d57ad8da278f8fa08f3640 GIT binary patch literal 592 zcmZ?wbhEHb6k!lyIL5#*dD`TZgt)BStlj%}w|2C~#>Z+)OK+;GoRX9%DIu|TpHAuk}{julKa7{E4&UBU6(QVc`W! z7Ay)4`Dkx<(9j^oQ2%jB;T>ZmS6-e+)>h9f%SSPJ=iub3=jP$%=ar245dodVh?b#!#~ z_IGgW8))em8W|az%xz~eH8VFfw6N5*vNl;_V{2q#XYXL;(8Tf4?Zlx8GL|(q3ZE8t lOjL5eA{rFHc#-=CT2S`DbGz$7CJCk0|4LR9C!c# literal 0 HcmV?d00001 diff --git a/data/images/buttons/bluecurve/ok.gif b/data/images/buttons/bluecurve/ok.gif new file mode 100644 index 0000000000000000000000000000000000000000..e4e6362184761b3258ec08a7e22b69cfab4f78eb GIT binary patch literal 567 zcmZ?wbhEHb6k!lyIL5$GQC(qbX1aU-ZdF~?>Uq@~ni@_nPF?G}CO(_M?ai5$n>Bgb zWFvc{y}$Nq?b8rlD#W6|ymsSSDQT(o_t$6L%M{usATW_Hr9Nfz&&_N{Sb6qva}{w) z%1iEfzsK~ZDeGw#wiZ?i8HujtxrQ&vP`qG`g>LSH7J{ZOwm?pYS9>#6o1onHlSU zte^OCqIS4;YHK7IkgIYPoBqM~AKQ@O+?BqgP!*R=I4VUm%R zlb2MO(yqupg^^uJSzbl8Lrq;mgHcmLOIt^ENjsyio|3+Sp^>o(cc+l4nVz|YrIoc> sm!P7Jt)88Qy~9*NR!0dZXBP`jEe8b-gT{KED^4diEIjPk$iQF?0JM8C5dZ)H literal 0 HcmV?d00001 diff --git a/data/images/cards/large/01c.gif b/data/images/cards/large/01c.gif new file mode 100644 index 0000000000000000000000000000000000000000..efe55528ef6ba00347b9e3b60fe592d01e1bd7f1 GIT binary patch literal 816 zcmchWJ#ND=427R85AG(QOGdW_iVPiOX-UzgQ-6-po5=CSe5Niz7Q2s>lfX`qv04Pm zq~6Cz`Qz(-_wxOONBorFN+}J)FplFiO%m&RIF`ns#Ir<_3p;)?mr=Fc%Gk#kcX7Gl zufv%9b!P0XzbfZt*01jr1zW9zvMiSBb94*BWxysOsJcQlGvFSmRXsx#0yq+s&HD?5 z$%K}Uc)d+2OcinpZBk>DVuPS51yZdZsFFp;lr3C>!IqsVh3yk#=;yi)b zipGPW=drL(AQ~^6f~&KVI;!7Sw&ph;7IT9NVUU7A)SW9X5a`fmV?;LghfI-L)2cHD p8=Zs>#D-!u7ojlisq53sZVg0CQ>A(P?^nTpVfC`<-P;{re*v()s?q=e literal 0 HcmV?d00001 diff --git a/data/images/cards/large/01d.gif b/data/images/cards/large/01d.gif new file mode 100644 index 0000000000000000000000000000000000000000..7442e1760d90e81f6f3541b69dbfa89628374863 GIT binary patch literal 816 zcmchWy-vh1499(*pauM zn==}HMU7m? znGQXP2}I)+siNS9JM_GY#yihQbBM-Su8VzxDaf1xVK8;#B^0Cgfv?!<4s;ctN|8d< p>C}3t6t=5$>M5uc#$PeLii$aPA@j`te--pEEM7Lf^QUvT`vFH(*m(c| literal 0 HcmV?d00001 diff --git a/data/images/cards/large/01h.gif b/data/images/cards/large/01h.gif new file mode 100644 index 0000000000000000000000000000000000000000..7e4245b0ddcc60cd1d4e03a8966cc9ddefbf6003 GIT binary patch literal 816 zcmd5*u};J=4E2dtI!31%x)xQ4fu&Lg5KGfoP&P(Z{^SDvkQ?}reiI8~NwJgOq4p3n zw^)Aidwzb+Jv`pu+`e4G1$^YdzW}h`zmMY>LYSsWAb{#C+iW0*YiVQ_&cZXmj=Sx$ zQ)mzP z>t&eTZDvTy-ISx4a(hj3P8A&6e95x*g>JOhjygka7Ad^A1x#}E*~6K7In8`5u~n7!~6 nwxdv!-0g)ZgfCrlJ>QXg3&Dcsa{TwLz<*(PvvDnN5Ab>g+jy&F literal 0 HcmV?d00001 diff --git a/data/images/cards/large/02c.gif b/data/images/cards/large/02c.gif new file mode 100644 index 0000000000000000000000000000000000000000..d815d101e68f040321a32afb469c25de7c2f4fbc GIT binary patch literal 816 zcmd6mu}*|Q5QhJSCBcq@f)WieS6EP3U~D*UqIaF8t#7iN_aImJAUuogh;Vy8- zTAIzy&dmSKzsvLPsd{+3#SK0q@aLR69zVLS>-&Bf1_=Sz-_{sJxRZ_KBJ5u|mv`}e ziReH?TbeKUEl94u%%p>@FUq-@t(QGT!Nv$E)CfVezuryO%3G F{s4KC%_#r? literal 0 HcmV?d00001 diff --git a/data/images/cards/large/02d.gif b/data/images/cards/large/02d.gif new file mode 100644 index 0000000000000000000000000000000000000000..b84eb53c0b38542b7303ad3cd096c7b513a6ac34 GIT binary patch literal 816 zcmchWJ#K?Q5QWDINKQGh#kNE!a*+nf1yLHnql9!R)8;0|_CZ|uAe_lflxE5NP#7G! z49#dpyYGGbc6ob$EuX(0;Q`Ju@D~7%$5Y?;A%tNVWCW1?M2iK)@Fb0_g}d+xu;p$! zEioO4sHJIvzlOA}u2<3_s;;)PSX9k5#UWbGjLa6M?qhcYBFFudS|O4>j)1ixDMUv} z(^6njhsLB7j*^waq`tVMSY^_!J&qPe;R;ElMC@=Q+7^ZD8a9+6s`MCzP&gfWWHE~( zN7*MUJ=QE{QMgQzQXZ;9t5GoQRpU7Q2sRM~!7*QG6T4uFg3N plhL9Sd6AZvLsANdUZXG>(Y|pZ)9u{-_p9K4VfM25oqycJ%P(UM*!2Ja literal 0 HcmV?d00001 diff --git a/data/images/cards/large/02h.gif b/data/images/cards/large/02h.gif new file mode 100644 index 0000000000000000000000000000000000000000..2f515dd6bad906e3f5de43b07d82a8afd4aea986 GIT binary patch literal 816 zcmcgryKaL(5L_!DIpx6>v_vR!k>;c;9Hrs0N}Mib+Wd*J`4AWR5WXo*l;+4jz!Ere z8Jg1$yEC)H@$&k-ef+qGJNSx$o&azgO9IAq{V46w~iK1}nRzPXxVA%z&OHpt&y}R;3rk3--f8PrF7Zx|0 K?)lp-JpBU8AJTXL literal 0 HcmV?d00001 diff --git a/data/images/cards/large/02s.gif b/data/images/cards/large/02s.gif new file mode 100644 index 0000000000000000000000000000000000000000..3caf6f3ffcb6ad2395c28b4aebeefeaa6d984d9a GIT binary patch literal 816 zcmcJOu~LLE5I{E&X1I7Ow*E=D<3q0SL--~e$0oSD2`Zdp zC(TZFHoGq`;oV}N$xVxIB%m^JOVo2M`ZB};Kvac{3e+YYhzLThRrR4|1O zvZZcpL@%Y~N{V)vUILa1q`DK#?DQ+Z?T&#u{&gE!5 zUsCFbXixJ6zim>e&NHdA)mb?=v(>VvDA@HvD9U24ev1Bpa5yNn3ushbAxw)}q61K< zx}ImU6pZ$B1CtfEV9=P!XIvMp*f50P>Rm~lstbhU&D9&Ql{&eP+66BV zMVlGyCJ5gdAB}-7pYcKhi5EOz0v$eDk$a`rab@^O!Ad?xQox%hiYc1T{>Q7}e_`>m K*}LZp+sBxgB5u`Py}D{L;Iz}Nt{QS2;jeUn>{2f4xr;hAiV&Eovom;(%@ zG@F^7{pL5{E>F*o)&1Ko+`wlH^m%~u`C}Lc@BKKAoC3(dqs<0lxZ{9p;mW@P94XpP zm)Q2!+RjcF_$z6T^|I3TQN1`$Vo^QUNm1n-l?Fo#r6_WCq(XFfU~RP`b4n+v<4S`Ki3KYZDW&9|J9KKrZUv$%&>dt>foMzDO60=u0@3tos~)HoUrM1~=(sYx kTG0k$elJoe&@>m7w6}60i);PwS3&>6>}AtCf4PQ-AMF&`djJ3c literal 0 HcmV?d00001 diff --git a/data/images/cards/large/03h.gif b/data/images/cards/large/03h.gif new file mode 100644 index 0000000000000000000000000000000000000000..e15b43e65dd7695efee8cef2ff38f61b8dff81a9 GIT binary patch literal 816 zcmcIjy-ve05Wb2;D&sjBvIbSC14|?iMJ)L_LD(2sd6Sy@K|1gtc_tRb;&5ljDoIf{ zx>)z=z8`;apPnCg_iwjw1D`4I&jB2dAHy&>=f-gq2%!813 zX)G#M@gWSUwkM|yVqTySeTtmamWV-Q&VA<~}C zgf3Qbz>fNyHAN++u&QFQO#nG|tU|=B_J00KA;gwL5M?6WN#~~!JSo1QfFVSyO)HZ& zVjHVyY}Wcoi!Ir&-(84yBWSFm^(n}UGB{O%MI$So?~e-~#EYFaV-+(xi~ZlL;Qzwn LW%E0KxrT=yeks!( literal 0 HcmV?d00001 diff --git a/data/images/cards/large/03s.gif b/data/images/cards/large/03s.gif new file mode 100644 index 0000000000000000000000000000000000000000..3685e57e410adb18b1dc385336a372436ea2291f GIT binary patch literal 816 zcmchWy-ve05P&bPBZV!4hm3$Ml!2i`ha#3ZJwdxMvhpTQ$%Ay@LGny2h$Z3f?0}pi zMzUCE-OuOG&g0=>d-rk!*YKVLect=i>1`N>aU7><;w^xyPn~6u!z~A#3#;*&aw#g( zCC45S_n0p5+a~(vJQI7}oRw2E-7I_Z1YIl!g|U!MkI^3x7LJiRA_;`*pcNKV1|)&- zZRYkkQqv4787~wXl|&mdvXkR7g~ht$@hjHU@^J%&DQVM+yEXR?DvaMDZiCR8S__5k zN~+UQHZ=<>)FsuacmuDqiVaY+E?x`Q1r-%Rn0QxwmLCX9xatV7o*`Q69byHpD~+5_ zAY88;bM_i!`3Mvq*#$8rDvX0##7HWO6%|l8R`I;M1& literal 0 HcmV?d00001 diff --git a/data/images/cards/large/04c.gif b/data/images/cards/large/04c.gif new file mode 100644 index 0000000000000000000000000000000000000000..1fcec84d16b9e3e0f41e0598638301d080ca2f5e GIT binary patch literal 816 zcmb`Gu}*|Q5QhH^OM=~+P+X~o7z+yu3yjT@o9NkHY3rM;kq5cL2jQ7)j14$5yGY>7 zRnkmmnVtWef8go)vAKV}#uYwu@DoBf96tKKABJHZM>zs6zpXLIaVv?`A{$<~ma}3R za_Wd^N6Ub}4k`HKO6sgXy3Wn4U-uLRTdahlESBmiI|WgNR#@%=wyK^WOe@(tP^)@^ zK)a)XL3wyTQ&iXpjAci>j;j=9;bIBfq{c)FI4#K#YV|;^sGLyTzy%mI+)OFTAQW7w zW^X4eoMDRJ4J0e7+Au_{WsgcqDr%lH4^*_Y?t)8^sr2A1%d1AjjN$Kyxe_ul(q7^DPXzq8p4a=4X5dg02y0_-`P zry-{U5p|RX_^U|!`n;14S$%e##j<*;DGu3uVias4b&uIa2-hYo5u#`VOA|tbz`Kq- zi7CA&9>?>d-3fmSB6L3Fqk?Jx>d3MryWD@EmmqST^677G-% zX!)FU8f;ihA*!ZOhy@qd;?N01*{rOzq!1+|IccfTZT0dBu`Ha`%%O&HAL%H*#)T+_ nI_c%(C;~+|KT;4W{i#S77jn|n+5h*e;D2HAviY6AT*Kopu!FZ0_;CQo3LQo2MuXO*W4r^2q`PYD;&KxGgaJ48{oiXm+6=P_A;$lJYcxg`_pUNRR5fj82k_<$k?h@CQ8 zR<*%i#Gg@!b>+qPuPlT@@@+$jAH-9Lw|^I-AW#1-#wcRTT>i(c;D2Ftv-zGsp2O`Y DO4!lv literal 0 HcmV?d00001 diff --git a/data/images/cards/large/04s.gif b/data/images/cards/large/04s.gif new file mode 100644 index 0000000000000000000000000000000000000000..1f53a577e6007b33ad7e9a12f3fabfb265cccca5 GIT binary patch literal 816 zcmb`GF;2uV5Jks|BZbaLE>Z%rs3=lU1kuFW5iA|$w%o+4%|W){AUP8aqDhz;JB1yz z6=|#)+4Gz3aX2b(R7f-UCmarXy=Irp`&+DQ4^-CsXlzy{t@;O`UQczo^qei(*v97O`iK9a=(Qn-|j)WX^D2yo!t zGG0>Zh^V1>fxkpL6!S{zl45q8&5~m3DIJpKq>;6SxO>>0fWS>#MJx(|Ee5ePB!y_R zikf<0Q-{W+6fV@z+V8BPP`J`ct~}z41|t-1YuJ0_7PWY56o?v=h^W>^@hlWhMUU)h z6ohh4Dm|9JQLNN@&EihYEQ)O=NHGL8d8Q>fwzbZw5LF(c_#R#%%5KF|3$=~;9#N=` oj-*lKRS3pTu(wj6uY}@9q!Sl1yVn1H75pzuUN*n;hjY030_3LIYybcN literal 0 HcmV?d00001 diff --git a/data/images/cards/large/05h.gif b/data/images/cards/large/05h.gif new file mode 100644 index 0000000000000000000000000000000000000000..b4ab65d5381f271aaeb42d8e2a3d5cafa2b2c669 GIT binary patch literal 816 zcmcJOzfQwI48~oNNM&?#L)KIg>cA2y1BfMmEC?GTD{s<+JV*x~B+tZxST5MUE7GNi zjV_kI*q?v4t`Cp*H@7cWu!D~j_~!tQ$M<=jopZ~why+l6C7TVTa4m_{!i9SVIB>R& zLrN17jT8s?O{7D6UP)8Zp0%@C(yl#aLb6>A@?#;M9}ecaW)V$+_!cNkC)g|^i`pm@rV}?4MC1~oFnhr^z7mm3^c0Bvt%qlN3_UROvST{P4$!PSa*q7W#xmXV@Dg=#H$s&yzFDRmi=qo)1 zH5LaE{VBRBx^2-_nIoxu%z0>(B_Rm}&8JE46iFb$ zMN830q6SK7FBC`YJ94Cxahbw4ik-1d9jh^g)q894Zo}GQ1;863R%&QP(n`@Yg-vF& zCR-6YXt#KlHn2}ttkK*c_GvAS?x_`}!|2nlcowz7yNHaN?EyANh}N?eB{aSBGM_-y z(R9oiEy(eiD3B?ZR`>=aspip0N&!Vnl|RWuAr^|LzWX0v1^o+)FPql#vVwZH+;U8(By$qT!Wud6g_f zOgkcKXc_R^CV6+7NjvLKuCthRYfW*m$;v3$V(C7u{(vaZDfO+#R^1iCwnhQpfl}QS zqRX>~h6V=Z;+<$KMdpeNfw9~Xr{xL--^fA=w@EF8;)or=mujJ{09sDjAoVb)SWGF< znwlEU)Mjs0lgQ@+bDY4WX`M)iOg>}j34(**>a4iH34%kxo6%HYfY7m2DBCoeADgvE7oi}N)Dq_D3dOuSoc)hi!T-YQWpnRd&T;<(CQHkI literal 0 HcmV?d00001 diff --git a/data/images/cards/large/06d.gif b/data/images/cards/large/06d.gif new file mode 100644 index 0000000000000000000000000000000000000000..6afc6931f5d55e2af1450e6f421b840c6a4465e7 GIT binary patch literal 816 zcmchWy-veG498uONM&?$!>vITVql5XA&4c{T99sxth`AtsXQHRE)6fV%6!eqWUQMgdA#oKrsTL^{ohFu~?+=;e61!5x<5=50&3ih^CI}Lhd zF{OxsrHLfdV_?k@!lW|}796Bno`N%_?i>O&WrK02a~cH2pk72ZwhwH1KAqOgmr*pi rQmBlMWDCi&(gxIuk%Cq}2*qi;7Zx%tXYaqSg8zltW%HfCT*Kop*d5pE literal 0 HcmV?d00001 diff --git a/data/images/cards/large/06h.gif b/data/images/cards/large/06h.gif new file mode 100644 index 0000000000000000000000000000000000000000..021073eed393c8bba78456e66a37fb8a1b09c2aa GIT binary patch literal 816 zcmd6mu};H442E5iNM&?#L)M@QF|b6sp@=1EEC?GTD{s6mxPtc-`0)Uz)7vl%-urPJMFJ>4lhq1RxRpd|;ljTF>^WP{ zLrOgnbu~JqpAF zk=1r?Xd?xi?Wi*x#ATvz4O^29B4bYwYHf9%t`s4pk8-hY<;)`lvPfOV3yK&a$TgC& zbt_^x3ha45$!w+JBb>#t6bkWRskGD1H{Ry0!iEh@!NHof~Fw}StL#m(k> I{(K4dUqn&SZvX%Q literal 0 HcmV?d00001 diff --git a/data/images/cards/large/06s.gif b/data/images/cards/large/06s.gif new file mode 100644 index 0000000000000000000000000000000000000000..ce3d111ce627fefe9e95f9b3693f27b9e56a78bf GIT binary patch literal 816 zcmd6mu};J=42B(=N@eSi;l_d@#K3R^LlH~MSx`1cR^FuP-Gkh~gY=nL5KD^f_zty) znCW6Ub$);T-99}()^~4La0wqd(9`$*e*Zp>V~lZ{CO!hV__D@84mX@|EoAYPYAGw` zA;%peb~q34+adPNX(jG#b8?-;Y_rtl4z^e{N^N1@U9&$RJPb;$NCIJlNr0|QNCGib z?xDj-q6SvdUMO7SCA%d@HZm?#&<)4!Gq!2NYD}TnUc6hgwpalWh@wu0)+8+y5KN1m zRkM>OU8oo)(+zA@(>5#}bS)+IQwR!9cg3?P1O-pH*%n}Zgb#T*J6y6(nvyqrfAuUqie?V{#wXp0w8g*9)?yr{F8&Imd zLiqcnKGMLT+`OA9EG3n|SWd)gyF!suF-h1$g9#KiND}zHW)PxCT9#DUdKgHt5Jf97 zu~NfsVieXjN1AUSMj>bvl)T61GzwElv3OV9l0pvV8)q$lFL#rZdn1O5`}P+xY^F{>{==V4i$&I}IOJTX#Rn7YU63Iw8SyWh3~feu?08$ATV zb*Amf^H77zBov0qmB5sC{Xp!Ta1Vn zd6-6Fgei1d48t^vg3-98WN{rFdWoV?vIJrkIV*IXEJ7fvg?vZkP`4uxm22a!G>Xqi jQN)1a%PGZKJX6?YSyvX4bpHRX;C~^x*?iAmZejNgGB(-G literal 0 HcmV?d00001 diff --git a/data/images/cards/large/07h.gif b/data/images/cards/large/07h.gif new file mode 100644 index 0000000000000000000000000000000000000000..81f6f3b5b4be955472554c107c50cbc85495df94 GIT binary patch literal 816 zcmb`Gu};G<5QeWJmCAUDhpa^r>cA2y1Bj(*PLOVlth`Ar{2(28kUSF$VoCXZwoB78 zlI7&z=l{MtJI~vv`-it%x}ncG;Twte`;TE5#&J9x4qhT!erK~8&FRiBd@fy$uS7en z7Sk{nCnCK}1N|k+Zhe_4E?Zw5hgr5h_w*IA#aW?HmZsI?>Il)DmQ@I5yMb8LPKw$W zQV6!Zk-lMDH(b_mQ3%_aO)q0^nN7+39x03zD-nnc(K6gTMI~h`&P0*XS)eej6B9C- zQ80`mhgqY?aiB}1ur16CJiSYzaHj2gse%aXIEox-;u@_7vj8DE$dFQaYi(X3R=y>q z^o%3{j+}*$4z%_gpKwpgUeE#VBKBY7a1E&D4zMU~pz%2({3ybtZwG@@p zqrej)wm3cDwHyquOBL^9mDLmGJ+b`IrJ-1K_7bv+F@3yS1R@e>^cWNk$sTCbF zxokFxsTD39TC{ls@1qrrhFxAuMfb!C!<;_vif0jsdPQPu!nJPz+Y!RA7`}$4tGvu7 t5PtN>fmrdCDU2F4wE_)Ou*`TUMLA7oD`v@m@+#k= literal 0 HcmV?d00001 diff --git a/data/images/cards/large/08c.gif b/data/images/cards/large/08c.gif new file mode 100644 index 0000000000000000000000000000000000000000..373ac362ff56d5aadf82a60f1f755f955c8e5386 GIT binary patch literal 816 zcmd6mzfQw25XL_@j?``*I4S9OLGny2h$Z3fY*LaU zX0lj!zCXYF&UxHE)VD8}xWIc3{z3?c!&}?7UDx$}FD~Hx(;9;uS7JykvhJB<*_w}! zoc2Vtq49y=oD}?NB<-y~N#|nLPismCJD)U)Z87eitUn+M?3DT@V6EL1V%C^@v0i~n zyDLOf%~l)g7?g+iQd=pkk1&=M@j9+haE8KIkx5$!1xH4h453mDR0?w)RzxLSfI-cZ z{h;7T6??5U`OY{-8#a(23TH~97|C~BTDmW*(nVa|mE;W&1>ynQb?6d_p@=0%El4*;R^Ft6JV*x~B+tZx7`Wg+K{N@< zNEXYVe4l@3Umo`N+neVrxPWYl%-S|L_7-Wf}BxgCW1??GPENn<9G&Ud;Jv&QV-{eppk zv2-G`l`zn6qU@^EO6j8Nq#b5awe-{p(Rwjx982N!Dfs5F)8sH@fp91hNDNRB;A@tZcba zaa;v=uC}Z!EPTy(q5H*3G}tQgO{x@PrWWjja8?JRQJCATa-s;^4-{cLvj4jk_!ky8 L8~6PAobG-AINH#~ literal 0 HcmV?d00001 diff --git a/data/images/cards/large/08s.gif b/data/images/cards/large/08s.gif new file mode 100644 index 0000000000000000000000000000000000000000..616d54d946d10c0d52bd38bc88bd88199570c890 GIT binary patch literal 816 zcmchWu};G<5Qfi*Bc+=M4_!eK>d+xV3_&aoJwe$RS$PwO=0Q5}AbBPh#Nu#wHX=z; zN3vLU&i8-!|HZRLK29qQ}@DRO+*ri zuFl#$25PEcE%HL4U4*$IM|LtUQ_u~8$=RkIkINKP$x9{P)!bXGP}jaiY@(qJwVqJu zWOnRH?-Vm-DS<<>qB3fO*riwu>9M-4HwJr~vf_Kc5R9820O}tI5SBHxov|{XKtN<6 yBw*bBlP6>Bl*`NtYg9BwO4(TP07^$NlgQ5mLK4%;|NkoJUs!zE6wC7p?!EzuQOlA5 literal 0 HcmV?d00001 diff --git a/data/images/cards/large/09c.gif b/data/images/cards/large/09c.gif new file mode 100644 index 0000000000000000000000000000000000000000..084ea6f2c2458c5d7bdb7a61bd7c631b0312bb49 GIT binary patch literal 816 zcmb`Gu};H45Jbn$SqfcBN++^V3W}6LG){7Y&{3x4PtGA9l7bKMH_;#(o7p+Xk{v{a zo7JxOcHWN9&o58whqpT{@R@;62;qGGsO!3Enzn7N1kAr(k|4vqCDw~cb6_vC=`dve z@yFktJpU36|VU6i{HN z%-(6H_f>8%{TJvUiaezwv6JsOTIxiKxcXLHDXK3R3cj1X11l~lh;0XvSF;rB3&cFK z*cAEmWt)*=pB_dDh0e>ZFU(YM4&Fa~87R&0XrZ{BFiBYtL)P0ODKva0#CM*hJ0**-+krd)k zn#NPlq6Qm2>}tKffO^0N7zzh1-BFOV|W1^@s6 literal 0 HcmV?d00001 diff --git a/data/images/cards/large/09h.gif b/data/images/cards/large/09h.gif new file mode 100644 index 0000000000000000000000000000000000000000..04291df259a3287220317dd1e54cfaee21f9235c GIT binary patch literal 816 zcmchWu};J=42FH8m5$MEhORwTh=HY21`tcrT2MAdR^H?Sd5{};kUkR&Vo9-++)3>r zM!H1)WB>l*q>oPzw|B2su!GMW`11gV!^bpD-uro;MFOb5v&{x_xRF3|;ljTF>^a&l zmz*3CjkH|gH<9+;c_z86J1b|itXq3ZhitoQ6x+hGdy4*mXz*RA%hplZN}~XwENU7x z+E!!LvP*z?t5rXeFD#;}PznQuGO8kC5m~gzZbG5Vh~!ifkxwQRoQb>_GZDFA7zL6w zq(eCu42c4rGBhgo6qh4~HEc~y6d5~0G-~)fRz)+6G2|6enBP(wbmpn)Z9wg7i!m&6=vU}7n z$3zyL6&&iLzNG+L?>1lx>{2pQ!fq{W-9s2|+7RKI*M$Z5wzc~Q50IcVn1jUeadc;|KnBgUpRQ#^zQit F_urMw#z_DG literal 0 HcmV?d00001 diff --git a/data/images/cards/large/10d.gif b/data/images/cards/large/10d.gif new file mode 100644 index 0000000000000000000000000000000000000000..4820eb10c5cec644ef5264220933582b352017c1 GIT binary patch literal 816 zcmd6mu};G<5QeWJk;-_92d^N67`jAaC}K(C6NHVCl{aZh9;5>gl4oK;3?%$#rzJ`0 zP8Q3*&;S4V>^wd_tnXg0>5@KT!uL(I+r77K+jU*v_bL%xd_{`|#kA6i*3wz`LbSnb zIUQnYM5L1GK!1s{$&V|giSncEFpKiJrzS+pSx|_jY5Fib4Pi^!aygDw2zHI(!p9b2 zO(FPA($cyPriKHPQq-AnWePB*Hak$5Ol)Clkz32ysK*6`$+VJ1*330K^+qdong8F8Hjhsaw|6gBbV(mE;rC6n+r77K+jU*v_bL%xd_}7j#dM>E_R?AROteL{ zK0ab;M5L1AgMJfbo1b<{6Xhr4FpKh~rzS+}MbHpS$LVABH$+y-E0TH-+B(iGToi)eBrP-FB{j3j7-gWSt#D-uhzzl2+zb@PN>-TKj3VP^pfDDl4V$5p z8G%@Z$-JqBT^PrJKTxn*!&6-*3Wl{CL}1S$8W-|FHir;N)!OUMCkRvtE~w%Nkpco0 zti6i+RVV~1XM^~;-$hbld5ACcJsNCE-9!*efNl>td0 zV5IC$cQY4NP(8EXRLu1^)}H&E~PZox#&D D;J?P; literal 0 HcmV?d00001 diff --git a/data/images/cards/large/11c.gif b/data/images/cards/large/11c.gif new file mode 100644 index 0000000000000000000000000000000000000000..ace224de6ae48e8a029eaf25896c4d0dac4f3ab1 GIT binary patch literal 816 zcmd6mJx;?w5QX2$YbkUoQvyPWg2Itf7}2cp2tt>VmYXb!50WAW@tM*fnlhXFe|)B?l6yVD0#9Y1xr||X4iuiLNRP$ zumbCvOv&#!?*t*Zx+}?3K!Ld7%d8(zA)XYXMDa1tP7qZi#RN&(QuApGiDV%;EOZmP m5Wh4lEJLOi3hq>m_hJ;9r$yDDfAUrEzcBf-*}KgJ9=`!C#Ln3O literal 0 HcmV?d00001 diff --git a/data/images/cards/large/11d.gif b/data/images/cards/large/11d.gif new file mode 100644 index 0000000000000000000000000000000000000000..ab0268931ea8a94d1508b099bfbda690f209e8c3 GIT binary patch literal 816 zcmchWu};G<5QeWJk;-_g2d|)tiKP-lt1fYJg0L~N@+P&&gLL3Q@=RS2LmlpX2I92p zNEYkP=l?$czC1lYt~YOYa0`bL_&WmZ_aA-VhY*HgkQBhpS23GG3HK66EnJ0HfE`Ek zd?~3TqL%Un&LwGAomNs;R42z-tf;1%(xI478fja|yQk<91bUaTBnV7Nr$`9`sciy_ z8dRo4k)nlNjVY{?=)oesM`M)2IB{f+=&=!PwZeEQkt9a35rv6Ki!Am>K_rzHMJ$6@ zaB?LbTD3xv&O@|I^i8~Hgs2rlr1kOC`}6Od%ggKY!{hrM+`>l={6v8L{?PY*jBywSkpOPKvc&>&xR*p~;VQlXY&ly_ zLr#H+I+_OfOQdaeUP&RV&f3{5tLC0EAzRJ{=~$RfAG1pk=xb&vY@ou*pb-Mebq>9C zSXy=&A&>#%$|IT*ad)IZZe$Tz^vG^XQPvd9C`zMJm^zTrN|Zibh4Dl#wR1yzLP4Ej zPjQ)2tW{*}pH+xiaA_WsDTE_|AS%SVm7V`WaJJ$Dil`8cKycL4c)Yn#HS z?!uECNxW+f>4TUiQ6w9Arxa@}8_iM!_g(rR)5_y2PCUis|852U3$vTe_k42=Pv5my B)29Fc literal 0 HcmV?d00001 diff --git a/data/images/cards/large/11s.gif b/data/images/cards/large/11s.gif new file mode 100644 index 0000000000000000000000000000000000000000..1475102e9cae5a5ae7e4b2062889736fb7f7f250 GIT binary patch literal 816 zcmcJOzfQwI4935ZixjpD89D;0m>7!05X5pJ7PK29D{pdD^B^5~kUSF$Vo9*i?w_Qn z8(B_1+5Ue1e0g2HRF5CGxWQKj{z3@b?Pu3@ecunmAXmWkk4q9{xRXF~k@oML%TYc) zGHQuvN#g^5T~hF;nbbOeQqIkspY{|5mrsOL7Grgb&Os#MN?8oaAW%n^vQQ+007pGH zO)!h{MuAB9z>YL=T&2jp$fsgcBN9sCJYUYEcMIvQR=7Y!l^R-c>m3ExIWwD^9Z_7^ z1~z*uuxw~;Ybm(y08!emWR?Sj;HDd3v4ePy5Hr;4qKxxJh`NRP<79Yhzm+18hGQ$- py;`9aJW`~XBd=`}cAQ(tICF1>G&@@P|Gf(S7bY*8*Yb9Wr(bxU&u;(# literal 0 HcmV?d00001 diff --git a/data/images/cards/large/12c.gif b/data/images/cards/large/12c.gif new file mode 100644 index 0000000000000000000000000000000000000000..757194e92d36cd4a79aafb5006589e51928778c6 GIT binary patch literal 816 zcmd6mJx;?w5QU%dT5`HAQlw0x2vMZig2IT#KO+boB`r5u3m+r}2l1I`5RJ{utZifm zQR8N{qvv_wys;mj9nSi@1AXE#K1l zkx)ZKCz>Dltw=tRQN)P=0sX|Gd9;>#oHLX5?xl$%QB5Q;TB&59buB$*cZKfVh77ZzVOXZO6q{Wmvx B$qoPj literal 0 HcmV?d00001 diff --git a/data/images/cards/large/12d.gif b/data/images/cards/large/12d.gif new file mode 100644 index 0000000000000000000000000000000000000000..66e43ecdff773493ac80fecba83a5676a4f07862 GIT binary patch literal 816 zcmchWu};G<5QeWJk;-_g2d_pE>cA4ILl8@9TTr%+th`B0`yd_qAbBPh#DK%y*%2hI z7|CMY`TYN%e>qRjkInt-E!@C+3G{sd9FM22>tc+3-*XGVd=|4AlyJud&%#xF0oYMB zA1|dpc<(oUyuhWV-?itH{!p}M$4RVcr<&|g%qK?47RK(m`U66l37|k=Fd1;2kQky0 z7O9FPsxUDL1-e`cA2yLlH}GPLOVlth`ALd5{h~NS=uWF_3V-ZGoC1 zX1ZAS=kEVMpWOT1-S+zFk}l{iC;fdA9S*OzB%obK5I_K)huh~o=C`+v!EDD$LXp11H#wN)$QWrq1y<-I&SDx9F%rA+8Th>7pSw+t}2nudXE4@h~20_7Fqe&)qGUl*~(i-oi z4&yq|Mhfj@C!JAGxFibWTXvn)QB3_sP@!b-}QT>lsq5p;1 L%hq@Pa85U0pg7M? literal 0 HcmV?d00001 diff --git a/data/images/cards/large/12s.gif b/data/images/cards/large/12s.gif new file mode 100644 index 0000000000000000000000000000000000000000..5245071c41fde41a46d477846f0941d6efcf1914 GIT binary patch literal 816 zcmd6mJx;?w5QU%PwPd<2T)0f4h>F4mg%OQ^Mi4qmT5hsde2^3z#Al*GG!FCD%a0vI zjhoS|X5af}W_|x~SKd5dVvE-V`Z?#0$CqIk#&JBIPCNoO?xE2)VcS6j2RNc&!s@y&5Udqy_C`j;W;@DNve1!_LpHpf*R57REIqK7oa^jX*yd-;YSZhQcW9}vo!qwZ|x`|}XC zLrc!yuzBgm4N*S?g26q!2B4n4(J303@s|M4pHUs$|sUCZMIZa)Bm CQ^}+N literal 0 HcmV?d00001 diff --git a/data/images/cards/large/13c.gif b/data/images/cards/large/13c.gif new file mode 100644 index 0000000000000000000000000000000000000000..7404c69dcb24bd796259fc19378ae8cb7d2d3a53 GIT binary patch literal 816 zcmchWF;2uV5JkT?j%2!&TLMCef+7V)5RJ2I!P0F>%S{aAAX{*doQVd}B>WkNKoV$4 zV~zbi^X89pcYj-5Kc3?hZ#nqI7!QZnwr#tv>-%1|fRhhv402pbAX;SI1GS9Ybjd># zLfD1rg5Nen^h;%EtY2JbGVA9#rGj;{La8jK)raVB2!|pT!g3X{)#?g?f#n4#wYow? zzp8hkBPg5qBZc)QY3PX8c7?+FF9~f@V}!!GRjrZ?u~ZM#3Ycd~E(imIik&42J)=_1 z-VRnoh)v@J1}iL%36YdMV`_zfs}ruyO71CyA?F!!v!THRVTH3o`BY>-AR4nt#z2?% zG?3&4`!rbVBy=Fw+Z3sk*_6T*Yiw9|+*FG1NSu^NDHdb>?^nTpVfM1=-TnwSpIQUT ASO5S3 literal 0 HcmV?d00001 diff --git a/data/images/cards/large/13d.gif b/data/images/cards/large/13d.gif new file mode 100644 index 0000000000000000000000000000000000000000..ac446382276aa39986e915b3bdde09a3f39bdd63 GIT binary patch literal 816 zcmchWu};G<5QeWJk;-_f2d_a0F|br(C}N3|6NHVCl{cwH9;5>gl4oK;3^?4KT~$uo zl`g0Ib^h0{?yicDv7U9771xG>HUI{}hV_lyE1F%)&)@1K4u6 z%u7iF5%rW8I3?1yIi94UXpWAvS<%crWka!?EsAR)-=4bj5Ejv6#-b277#CSmQ3&s< zwx__R1|ySF7?--0T^}fnvrf8uUh$#92!*j#$Avbsx04kb1)_+(h^S_f!aEj?iWb={ zQlK))q(#T)A_Ufov|@3sW)g)#+n$7wbJSm>@ATs%gz+L0?Gs5+?DL6Hd?yOcLcG(R or6`Qe??ou8`WD;6Bp*0`Au-qFspY?41^*XjFPq=_>m@w?0qG>xq5uE@ literal 0 HcmV?d00001 diff --git a/data/images/cards/large/13h.gif b/data/images/cards/large/13h.gif new file mode 100644 index 0000000000000000000000000000000000000000..d5558a465467bad74b9480e3b96383ee7a0e078d GIT binary patch literal 816 zcmd6mu}*|Q5QgU>BxgCW#kN=&3mXy&jSUME#qLU5-{dy(AXoSxJd=&F5S)L3Q#kFV z*~~vP|9m@H9v<&+Zl5pdg5F}%?~~|ocQVVONEOPaTm<`@(pxHV3i zf_+}F&DAA9c$ZX-^oeIS+W0b27{}VEBF}E1FwQz@%_Oqk3>3yDmFC7uMqgM3v*wD> zt_}4};hmxxC4|e7f)!1QQB>@46^1j=7h#@~NfRL0R@gxb>l!) zVO>L@mP1ZC^U%A2^<57L1L=`*n)mV~>rsg#ti zWI3IEe}4C!^ZfGEJ-prG8lM&T3nA?HABV$X7>02iSpxbz;d#3V~mircOu-5q#0F zY2cy;t+rPR>x~lLvmz@US17D^UfP!;(@I(hg>^;G=0>$!NNtq@=ADSTBxuK_6NTQ{ zEVkB^1c*#U-oP$PVR6ZK+q@PTNg?2RicQ{?%#t9Ck0iL|4pAtGW?L;`0WSo4UwKp{ZwC<+teJ8j)MsvjxUhiAX^Uz3$gAhg3$wP+>6l>G z>Sk~@Ccv#ga@+$4T0|g zBFKSBZ4E6Jv6NiBqBI=ng>J9#CD79(z2>o49nuf~Ic%05Tp^Sdhco}&WzwIuEmpAm E0lW%wnE(I) literal 0 HcmV?d00001 diff --git a/data/images/cards/small/01d.gif b/data/images/cards/small/01d.gif new file mode 100644 index 0000000000000000000000000000000000000000..ab3b5506e631a436a9b052002fcb73001ba24ca4 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE$`EXhRu9O)MggG6iU5#^s2W(L0cb@CScFR$ zEaK1s6zP!wDsJTjizqn&o#8eGC~~L;BBB7&?iHdDm;@G?q9M2dC<0at76Do+0JK67 zXbwaT&{7VdrL97$T0ma_)c~y!;Q$#3bjB2o!oVaakXKpI{H)5=f-b^@9ty;S3p+em Jp$u&XYXFimdW!%6 literal 0 HcmV?d00001 diff --git a/data/images/cards/small/01h.gif b/data/images/cards/small/01h.gif new file mode 100644 index 0000000000000000000000000000000000000000..12e3a888c585cb2d0db4fb32657563cc7a64142c GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE$`E9Zuv^HCfJH8i0zi=!Kt?C0u$m7@qycC} z2uP$ABq9;G$e{x$(gS21X#t671S&ZIo#8eGCIWPZ0?jv{V3Sg&@!zun3Sbg#%=Tkg68Q7l%Mrh;V?k3yG>t(I^Z|asqjk1t^E?XH~8i VbP*=>P#`8;*x|tnWoR>40|2uId>{Y- literal 0 HcmV?d00001 diff --git a/data/images/cards/small/01s.gif b/data/images/cards/small/01s.gif new file mode 100644 index 0000000000000000000000000000000000000000..7dc98781bc0dc113178eaa948c8c4885f9ee4256 GIT binary patch literal 415 zcma)&F%E)I42IkHkbq&ppb4A6z+fC0H7B}Gm8a1cSkk}1zYJ*Qrnlon7qZ8J7aQQyvfl(&t}h6KA& zr@_gP0FOf1<8FDO^@zl>St}-$C5u1^qL7kJw-**u9@3;&BAFo~35g^WOy>cOgpkFN zh=}Ei%*1R;UM#LG2lIHLAGv&mSOl`r*UB`fA`#@!tbcR#3ElfbMCxD7KYtm0-`X|{ G*t`K6baABs literal 0 HcmV?d00001 diff --git a/data/images/cards/small/02c.gif b/data/images/cards/small/02c.gif new file mode 100644 index 0000000000000000000000000000000000000000..29bc364c4064ab0781bcd0b3db59d5d34d7d3376 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqb2DGsnXQ0)yI!fGxOAQ47Juz^kuAS*gRA`B1% z9YB`y0Bv_@VF2q=JOC771KJLDAxM`3$YDSR#LYlU1rmTFAln5JfVzMNN(g|g06Pq< w9pa1zuo{SVH6Ea)P7Pqig#us`)mYH{EX?MDF2aN!3dDp9D?C`C3@rw003bVaS^xk5 literal 0 HcmV?d00001 diff --git a/data/images/cards/small/02d.gif b/data/images/cards/small/02d.gif new file mode 100644 index 0000000000000000000000000000000000000000..e16eced88efa8a729c2dc6f03328fbd837482e9e GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDNIa98ov0_C^6!ubvek5iVhfNCU_U37}oA zoDdO*4xmT~(Dp+u5D_H@pfj|9+7n?S3Lu98wHty(fR+j_0E#FB8DJ5RdjvpMfEXYV zkQE$2OIx98oIw5(;RsxGq=gftrqFO9*sCmPepcmbK^I{{4+Ubvg&iKOP=+>xH2|l2 Bd!+yX literal 0 HcmV?d00001 diff --git a/data/images/cards/small/02h.gif b/data/images/cards/small/02h.gif new file mode 100644 index 0000000000000000000000000000000000000000..43015f4196bd9582453b6b5a61b55b29f2ff9a35 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDT~!msU-QXmnq zn+1T5=K@I?COUzA!2xmxM9o65zeG3!7aaj>Ur}fP@hS_NpH;b9&_$Sl){`7A?C@ZP IGPD`20qa?OA^-pY literal 0 HcmV?d00001 diff --git a/data/images/cards/small/02s.gif b/data/images/cards/small/02s.gif new file mode 100644 index 0000000000000000000000000000000000000000..e302a20674df06013ef3bc7592637b9884dc2445 GIT binary patch literal 415 zcmb7=Jr06E5QS$E$!aJtXhJ7gP#6nJjSV40W8xv?2;N`|3y;8Yj5o5hQQyoi6m)L& z^3BhCJIB*uyK9!TpqC=NuRMtC?JGqdZJ2VMyw6-mX=zA#z7x}PTQtwxB+i`}t%gK( zrLITKhJ;Ykvd4`Z9p`l-#Ew^nE$&Rnl9EkBxL3%-3$q7Ez=9JpNjVtu*vuf&1qAMi w5D{3Y*j1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDNIa9ASu5qkyVc&kB$TCsd>XWQ9cFq9ZL( z5r+<-NQg#Y(jlmbk^|5gYEv`}6Ja6>Actv9Sz!PYQ3jeUxBw*L1`!bixkmtGsi+rN z1Z3b84xpv2LO{hpT_D9?A{;;uwt^I|C^Ue0l?Bbus$4DTB24I^Kuox>!-Eyd&}Og( E02J7L&Hw-a literal 0 HcmV?d00001 diff --git a/data/images/cards/small/03h.gif b/data/images/cards/small/03h.gif new file mode 100644 index 0000000000000000000000000000000000000000..4877ee5a4c845828d43cf3c3ebf33806e79a772d GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDT~!msUM3j zIsh$Y;{n?4(82)LrFZ}+qU18e0PI4LE(M^0f^0yO!6G0l5}*bOBmi{*t&o6N3UUuv vJJeE6unR%jVU{w26c-9Wgjmr0EX)S96(tmenb1Rlm~df*2P>4J#b6BpT@Z7< literal 0 HcmV?d00001 diff --git a/data/images/cards/small/04d.gif b/data/images/cards/small/04d.gif new file mode 100644 index 0000000000000000000000000000000000000000..6ccc0879ec0a267a0f5274f5c5c0bcbf09e2d3ee GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE$`E9ZFhr_R04Ope04Tx<6=?uk5h4+|=tv7x z#Gyk-RVzdzFzFCfM9Bf@47VN)!$g>f0?FQ65#-OkP9faqR;>&r|QLm=4Vx|7IYCN^iUusT-f2k K3T0?BSOWkU#C+5M literal 0 HcmV?d00001 diff --git a/data/images/cards/small/04h.gif b/data/images/cards/small/04h.gif new file mode 100644 index 0000000000000000000000000000000000000000..ae9637a96ca850b63e56f8c39093f9f2fa817389 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE%5afOE2pYj56Hkq0iei?fJKK|IE5i14L~bG zBm$GbA|NXqI)qfULNo#sK_YHI5hVwpGu(jMK_bc^D-?hZQ`Q2S3=#oZA-KS$lMAF6 zBm#D`0Lby8Alnn2z`o!J0EvLK8!iO;6ud<-|S(U2=U4#kbM6iA+ QgP3q(hX*T^q0L|o0GF?NhX4Qo literal 0 HcmV?d00001 diff --git a/data/images/cards/small/04s.gif b/data/images/cards/small/04s.gif new file mode 100644 index 0000000000000000000000000000000000000000..0695de74fec7fa2c0ec5c29a0050efc141dd9bab GIT binary patch literal 415 zcma)&F%E)I5JYzo$=6Uo(1cE)urL;s8XH24#)L!25xfBfg-7r>h8tPhsI&hAQ7V5m zdCSfWdpsRB+j2p3dNAR=^@E6?HZxhY7AkYHUNhxISw(Ewt(X?Kv~220ux!OB84~VB z-8bwH3CYM4pLV@cAWA!%^}Iradlf>4WC(R!r03`(hVdOF*+WP}ArTCH2hO^)M4X$N yIVnO-P$M*<$kL<_#Ym;mS13!vi|nI^-T$*P#6jxM6#{E`g@5ic?$6qa741H-U~t6% literal 0 HcmV?d00001 diff --git a/data/images/cards/small/05c.gif b/data/images/cards/small/05c.gif new file mode 100644 index 0000000000000000000000000000000000000000..868eae8552f4775e1fce6be1ac024bad9e1be4da GIT binary patch literal 415 zcmb7AF%H5o40J-NQq&&|yR`*=F6H_Z&D@DPCY=EA0UMnZsuC85NFd`*V?#5T_Yu)i z-HaIb5imAYntX!XDP#BSECd_wTw-GH4BoKBrA(DAu&TJBT;dETBr2z1sPdU{sjdk@ zO4q2uJeglgc}R|k!gE~030ZE_3n7@N%FfzDQSW9G`>ek&7|QYYUxweehGqfV4|Pv- A^Z)<= literal 0 HcmV?d00001 diff --git a/data/images/cards/small/05d.gif b/data/images/cards/small/05d.gif new file mode 100644 index 0000000000000000000000000000000000000000..a40396080c9ef11ca7e84b3e866786b0f5571510 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SI7(lkU7E-sYU@+uO6_;oKTSlAyqAq$wykC zA`Trws%}7$q(e{1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SI7*5MJ}zJs%kwT0~-ZYy+DjZEu6v-kp>}E zEuhIsU=ffN4jn?OZa_vNNCd=Ca_AHiRfCEsgRD>hISi=F5TpiVyWj$l2v9Ld1ng!3 zkmE&xQih36U|(@N`xpnF;cf!bFT0-Xp_!~$|6ST&Tv)q*a<1hgJS Q4Kd-u4i8o+Lz}@G0KwdPz5oCK literal 0 HcmV?d00001 diff --git a/data/images/cards/small/05s.gif b/data/images/cards/small/05s.gif new file mode 100644 index 0000000000000000000000000000000000000000..80aef8f8f5abd90e495f6f6fbcc1f269cdfc1879 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqclYCIeQAakJF8#sj3Tp%Vxv^zC$3bR2>W`Kw| z04)XE3Ls0>csf8LK==5}D1_)&V}bjb10uo(bt}w=oWdY?kQ^?o@L+{9v>2=b D$e(ch literal 0 HcmV?d00001 diff --git a/data/images/cards/small/06c.gif b/data/images/cards/small/06c.gif new file mode 100644 index 0000000000000000000000000000000000000000..9fe310e9e68fbe3cc2bbf915c9377d7380c553b0 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqb2DG33PIZ*8l9KvcmV3Qdc!3H`ta0;_QOlE)> z=m4}7EalL`0M?~=0H~b_s0Qppkdy+@KtZ4`h?{|y3M3qAVFc+CNC4`BS<1l-at}y5 yP=o{Mod!;@3qjg}&gcM%0NvvwQ78ZrVnOq>Fq;dy2*@2IhYKq_SfLCp25SI|+H?T` literal 0 HcmV?d00001 diff --git a/data/images/cards/small/06d.gif b/data/images/cards/small/06d.gif new file mode 100644 index 0000000000000000000000000000000000000000..d7e888b67b6ec06ee7c5125b97f5e5b8c46ff10e GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYJ~yF9ASu5qkyVc2-sv!s7Qm5susxPBP~!7 zhYlfCH=sz;A*hIwL#L3a+7u1LM3{&I&_HD^pvfQ+WuVD|3tT$6fV#jUf*|(@04)_1 z1=*f>2xy?!6pnyJF0Dd9#Xu3TzeG5I9&80EUQq~kqN*1Qnx9p-I literal 0 HcmV?d00001 diff --git a/data/images/cards/small/06h.gif b/data/images/cards/small/06h.gif new file mode 100644 index 0000000000000000000000000000000000000000..df524ccd51cb4d95bc417116bd761b49e3e9cb56 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYK6ffmsU670S?Num%9wXL`#3 literal 0 HcmV?d00001 diff --git a/data/images/cards/small/06s.gif b/data/images/cards/small/06s.gif new file mode 100644 index 0000000000000000000000000000000000000000..7cf6b27103da687174794d5ab696d443aef2d30b GIT binary patch literal 415 zcmb7=F%E)25JhJJ&0;7ZXhJ7gP#6nJjSV42W5OZi2;N`|3Xi~X3^%g0QUB~N6m)L& z^Jf3dpSfJm`$My)6}<%Eef5LL-kuQT(2gnB$@wg0n3jr!<5{t&yQ1k^KhCXiH&Y^p z((p$_Q$i>uA@{L%CF49WosGRxempmw$&eC5^{fhcxMB8$-C@BAnWShK!DTXogtxvG za3z``h8`;2yf*6~hQvC`M@beb56y!I6XdD8JNtpWac61B{4^3PILF_2nT=<)VoS## D-zsql literal 0 HcmV?d00001 diff --git a/data/images/cards/small/07c.gif b/data/images/cards/small/07c.gif new file mode 100644 index 0000000000000000000000000000000000000000..d54149768467f1d1c7f49c5d12eff09020162470 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqclYCIeQAakJF8#sj3TqHmyGctk=bZP)u(E$=+ zfEefiveX4=yF&{DSeN1fpa>h#cCZUUx)eYT12Q0P23jhR02Be)E|37!1vF3sWGN%q zVPNfQJ{%w`fVRW5tMPy=1=}uBC;&E5jRnom!fYUSAcul56M85R6E3XqV1+WY7_0#; CWpls) literal 0 HcmV?d00001 diff --git a/data/images/cards/small/07d.gif b/data/images/cards/small/07d.gif new file mode 100644 index 0000000000000000000000000000000000000000..fb9333f7f606e2daf7cc9441e9ae838189d3b66d GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SI7(lkU7E-sYU@+ubveFKoL%;NCU_UiNHli zTA(5h9YB#DjliTsP!S~upfj|lXc#8KL=->{bDOfl03@OeG+A%~Pz1;TiwJ_;BLK95 z3&;S8fDD|%0kRY%1r!1MON0aH!B&veibAjxRlQiy{H)5=f-b^@9ty;S3p+emp$u&X FYXJWPebxW~ literal 0 HcmV?d00001 diff --git a/data/images/cards/small/07h.gif b/data/images/cards/small/07h.gif new file mode 100644 index 0000000000000000000000000000000000000000..58e04478df4f3b7f5d3d886c804460e4edcf764b GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SI7*5MJ}zJs%kwT0~-ZYy?RyzEIQP}DGU*5 z09hdsm;@F9S>ezD6agwu1c|r-MU)(X&d>rfKqAT@D-=Ku14Dpw1-2ouPOV8u`d PG2y}v4^}8co530Yef@ih literal 0 HcmV?d00001 diff --git a/data/images/cards/small/07s.gif b/data/images/cards/small/07s.gif new file mode 100644 index 0000000000000000000000000000000000000000..90f452ee08afc000da200da80778f6e1ea28c99e GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqclYCIeQAakJF8#sj3TqM9IL$o_JfUM{Mi7-G! z96*-30Bv^yx(8&S;sKxt8;AjNAxK04IKo zKvn>42Qn1Emhyls1=~KO5UgKVjRo#!4u}XF$Q{U`Ak2gw3dDp9D?C`C3@rw00D!e{ A$N&HU literal 0 HcmV?d00001 diff --git a/data/images/cards/small/08c.gif b/data/images/cards/small/08c.gif new file mode 100644 index 0000000000000000000000000000000000000000..e719d46ed775800cc5685eb2287d58df766c44dd GIT binary patch literal 415 zcmb7AJr05}6n+IH#W0jq6E=Z?!8kZ-T!Y`3Re+ z=?%+#1d!s!$H_I9b(<5ym@z!+M8@hy2w1}gL#q_in*offydx4|x@kzN0*hs_8f|9` z6&)H%q(p}*49x`^@{sx%xvilS(~#t{PAQc7sQfA{6nTG^aqA=0 CYIBJI literal 0 HcmV?d00001 diff --git a/data/images/cards/small/08d.gif b/data/images/cards/small/08d.gif new file mode 100644 index 0000000000000000000000000000000000000000..a5df71f7e82427b1421157fb0b4ce9730c7257b9 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDNIa9ASu5qkyVc&kB$TCsd?CNL6c!MBt($ zEl?4M4k1;y5RJg3Lr@VV2cR?5rf3)@!bB8+1}bY!Sz!PYQ3jeUxWJ{8OVte`A_#Ji z0MH6SQ7^Cv&_J`(E3g@B5Iy1@Pt;Q)HD6{L7Yp#j9JENFgKj-_H literal 0 HcmV?d00001 diff --git a/data/images/cards/small/08h.gif b/data/images/cards/small/08h.gif new file mode 100644 index 0000000000000000000000000000000000000000..ff7b20bd8dc27411691d85891c58fca82500c6fc GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDT~!msU zscKD;2uuQtfUI!n5K?su(FjZgiMRnplpKK0Py;eRBFZ2u6o3v>)|#SW2oeF=F1Wy@ zlS>t-7$gFAvjEWXf}%hv!$c>rFE~KX5CUm8TnP4;2nWzTt%5-9D+&!DUS&b^vnp2$ Ux(E}{dXmG19UiPuhBkvW0BQnzQUCw| literal 0 HcmV?d00001 diff --git a/data/images/cards/small/08s.gif b/data/images/cards/small/08s.gif new file mode 100644 index 0000000000000000000000000000000000000000..46020572ae7f332100be82caafbd9e6ccf300efb GIT binary patch literal 415 zcmb7=u?~VT5QeV>NihtNYQiQkFc=3$jSC@0W73C^NAL|gF!%^Oj^T|QUDUg_FtB;k zpYMA2|Gmrgyg#%XSi_3}*4Gq@{OvOa9Ck#h5B#$daaL0ZVE$Eh2PpFb^%vpGY_fN=PKbU`e2Qn;A)b z8#*Qnl^TLE(ij&C58VxMF?5J6QDtOWMr2BPRDY*=ME>+=VM%bBh!d3K@4GCfvpTVb F;}2}QaFGB2 literal 0 HcmV?d00001 diff --git a/data/images/cards/small/09c.gif b/data/images/cards/small/09c.gif new file mode 100644 index 0000000000000000000000000000000000000000..500e35c1e4d27089dfb4d5d8ad9e15d5dd669347 GIT binary patch literal 415 zcma)2F%E)25ZvXEfT1{Zn$QUpR~QRQjSVqGW5Ofg3I2eB!YA+?1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDNIa9ASu5qkyVc&kB$TCsd?CNL6c!MBt($ zEl?4M4k1;y5RJg3Lr@VVhfX0;uO1DBFaFM1s8yv>IM-J1i425 zWT~hZSOjRG*AxzrrCdM;P!~wCmk0;QQjpY&LIaR$RWBAaKdW-Jpo=h}hXOI-!VV8s JC_|gU8UQKZejoq< literal 0 HcmV?d00001 diff --git a/data/images/cards/small/09h.gif b/data/images/cards/small/09h.gif new file mode 100644 index 0000000000000000000000000000000000000000..f0943d12d25185173ea0670993e03de562b03955 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDT~!msU zscKD;2uuQtfUI!n5K?su(FjZgiMRnplpH#RM7@C8K_bc^D-?hZ6IGj{VF(fd*)F&M znh|{70#yuzIy4%&yHk8Tqn&uI@mzakZW{)-$szN~tiKG}zaNXI= zNa8C+&2?f3#z)wNZn{VWIzlVK`aPWAf!BkK7k)(VCWP29K??pS%6CjNOZ!J zb>};uy+7=ht9nLLx-p@izR(o+n3*D4IMneJJtm3BH zXNJ=*LQ;)eU0mQ3dAUvGplU@8ggvsgLpd;+F0N;0zhZ;o(lq+GwVb*cC-1>W6h0x4 z9KljmW!h(kN*p1FPos0EQYI4!pU4v1YiFoTf^#f4K?yR5%o T2xoZ5H}%h7`ro&PW=`uDj>K_p literal 0 HcmV?d00001 diff --git a/data/images/cards/small/10d.gif b/data/images/cards/small/10d.gif new file mode 100644 index 0000000000000000000000000000000000000000..2d8276a4f3d5757d866050a7af7c532cb322cfb2 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SBOSnk`vGztsanpjRGKs;Ub`js2W(L0Vp+P zML?2ECzmi-#Gyk-)oqGI;6j&HPOylQ15h#09K%J2S|B0{K!+)N^#FB&MW$#7E&yr= znj;Yi76Cd#0O)u@RX33BKs7)Yas(`LX$6`Cv=k@;^p^-n;36PH)NP7JA;gJZENFgK X1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SBOSnl2a#_u$PYn(7;9kRjnQk!$nT5oWg2g zkp>}Ettl%4l8&^1M1Yn$bO@=sO_2y(cnBoYqYqTf)B4P zp;eXuOLZZQV}`;jtiz{$r_iP3fR9C%NT&cSMw|vdh2-iA44t$Fh7RNG9EA=)nXzWW TgZ29gKE|JS8Gp{|ixur&D_?K; literal 0 HcmV?d00001 diff --git a/data/images/cards/small/11c.gif b/data/images/cards/small/11c.gif new file mode 100644 index 0000000000000000000000000000000000000000..c74404840926c17d399a6a8d91277999a779309a GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqatDFFqLIZR;f4IE$*kjac-5vK-_6%ru37#YD< zIDjqfFi3Q2U=#$YQ9J+=;Q=zhE(D5z4ODXhGC(3gT>=RpE7(9%AYDKM1;CC+GLQpg y1qU<8g-`>5Rvc;oyRc9|0c-~gnxBQ)fOdclf_n_)AQTZ|!i5zctWbs)gEas}FLS{F literal 0 HcmV?d00001 diff --git a/data/images/cards/small/11d.gif b/data/images/cards/small/11d.gif new file mode 100644 index 0000000000000000000000000000000000000000..f27484a9f5e6d7a296882647589d8fde2d598be7 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE$}kaRj#dxIz(xVE2*_knHLyqn$chyKKoKrs zu!utkNJIjtxRnzuqT~Q_MhH;*p%#dU0@z_d?MYyfDH?(cz*YcV2o?caDgbu88&m{n zAP2|_K~azkfogyTig19f0J*0yFv$sI2Md~?Rk>QwMVNs4!A64&0x^gQ7j}5CLK)f& F)&ThjdGi1O literal 0 HcmV?d00001 diff --git a/data/images/cards/small/11h.gif b/data/images/cards/small/11h.gif new file mode 100644 index 0000000000000000000000000000000000000000..c90684d39dc5840de78c90f91027ff498ac5660b GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE$}rKTlS|mkM*?VIqX1ZBkxMJ5uo_sT0c6FB zfJH}IKq5d(9XdcFK*fhZB0U;`N)8}rgaD;LB5puuD1aRXlu81L0Id*Q020vxN`XW` zRtSI{4^j*i0U5{<02C1v1xf`bIe`om;Q+d)6|A^05a>jp5DS{0Rk>QwMVNs4Ne&lw Lc(6hl+6>kJ`%Zc8 literal 0 HcmV?d00001 diff --git a/data/images/cards/small/11s.gif b/data/images/cards/small/11s.gif new file mode 100644 index 0000000000000000000000000000000000000000..1603694dd9813deb348f4187d16f9c671bce945f GIT binary patch literal 415 zcma)&F%E)25JhJI&1xvtsEM6GL18Q`H8#W;jfsblBX|P}3y4SzKYMAducw#Sz=pze6 z46T;WM1V*!g9sC1l-8&by9o5TddH~US)Qq*WT;WQm|H_Dy3s%X(rdrfiv?|e;k$B6 literal 0 HcmV?d00001 diff --git a/data/images/cards/small/12c.gif b/data/images/cards/small/12c.gif new file mode 100644 index 0000000000000000000000000000000000000000..d61caafeac43342a34ee977166184d0b25a55b5a GIT binary patch literal 415 zcmb7AF%E)25ZnbcU@VTHiJf3UVJs*$HiQ_BiI4D};18~#;0Zj(@FPnbb@p-?L+4hT z+1Z)dJ)Mu+onF$M9!#jWEi~CPU?z_?g36q{*DO?NX^6eRHIqwQ=&p{E+%^7ch;TpZ zIUElW!YEW%(edoM36uQL7J{%vDibB5420QQly&4oN9oFNES&6KM^IiAnN0{J1sTds zVKZY(ETBBaNVY&$x`VQKX$VRToa4Mi5adP>lFT=iS}3qLOK5leSoVLv;LiB-FQe~U IU9+bB2LZ8jW&i*H literal 0 HcmV?d00001 diff --git a/data/images/cards/small/12d.gif b/data/images/cards/small/12d.gif new file mode 100644 index 0000000000000000000000000000000000000000..bce5b44d239fbe5e0976a392a7980642ed2348a9 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYKFl=kU3gCAOjl(RK0)6ah+!Z~)!Y$_X@CqcAYZ3FK84u%AJyp`Pbz YfimDCOfV^!2r=Qp4i8o+Lz}@G0H>yUmjD0& literal 0 HcmV?d00001 diff --git a/data/images/cards/small/12h.gif b/data/images/cards/small/12h.gif new file mode 100644 index 0000000000000000000000000000000000000000..d0c51f18c95a12448c42b6e18b659d00173d01d3 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYKFl=mrgEWFCPh@fsF#HUOgIt3td_{h1I|! z4MM7JK$909X#t4b6 zf(u+a1y#L5G{7Pt_XsRXv~mJX)+h{21bdYQ h>}O7peu(F}TA&QL2op>SCPGZOu)~8D%Ft%81^}t;dXfMD literal 0 HcmV?d00001 diff --git a/data/images/cards/small/12s.gif b/data/images/cards/small/12s.gif new file mode 100644 index 0000000000000000000000000000000000000000..794926aff240243f2dec741f925a3e34feb897d9 GIT binary patch literal 415 zcmb7=F%E)25JhJZ&0;9lpb4E|L18Sm)YuSXG$tOxJ%Tr&px_7`hj1fH8}-k!m`LYT zlQ%Pe{>=Gu+V0Gf7W5E=c-ugdK7Ap`qYYE8llPiSmE;8p&v(i6T5HpmL6o^Fo8 zm--$t8xlfEsvGNgcD#^LcC0m%PVi6!5i5fTVOQiRK}VSuewd_989+JKh8;3V&7^3CT;@5AB=;e#)S}~G5Lp(BY1;9FmMEpW4w{0i`rH&hRIGZ zudna5J)RERUA2Tc+!3f=QUub6j|d*DndLrs&snIF+yQ!i2PU@NRJS_PrURpF$Y9^< zH5d;W(8h06!akmiyHK05RqTwy6fV+%Z8!^2B61REC8ZY*W7eeCI+FBMHYA1(V;0NK z1k{Hlzs3VhtN=Go{enMI3rjiBSIFW*zVzzhCIi5XVpJpTCU1 JZ|%Se_HQ0Ab8r9v literal 0 HcmV?d00001 diff --git a/data/images/cards/small/13d.gif b/data/images/cards/small/13d.gif new file mode 100644 index 0000000000000000000000000000000000000000..8cedbb1cb64ede36d786d09ece9748aa5fa0ade2 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+myd*DBFG%A9*}{J0;*m;8ipW~Mb*F}4M3?W z5+J*{gux;X9YU&ZV5wG4u!xcaP_Y}x_CqZY5e1-jWspb`SY(QZ-~ym_Rk#Sy83I59 z1>qt<7jgtFa%lyc4ABMjmk0;QKp|nENMT@-6UeJ9Xnt1ZYC#uaLJtLE!i60ktWbtF GgEatJfO(<- literal 0 HcmV?d00001 diff --git a/data/images/cards/small/13h.gif b/data/images/cards/small/13h.gif new file mode 100644 index 0000000000000000000000000000000000000000..045609f23591151426ca8370f78bcde8c8eb8613 GIT binary patch literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+myd*DqDv>2FpvQ>uu(wOt4G6dkxMJ5uo_sT zK}c0=3Q+1u3rGZLsY8d5s#_0`aR?*=WGFdw3W>UbYzK*e7z#j#DT5eEAQ7OYf(w9F zsKP`*?hybwUJxb%@&!i#&{CkuAYD!%e~EB_3={$xSQrR&B2b70Xa};NRk>QwMVLVD SKvqLcxUj>670S?Num%8J$9bIq literal 0 HcmV?d00001 diff --git a/data/images/cards/small/13s.gif b/data/images/cards/small/13s.gif new file mode 100644 index 0000000000000000000000000000000000000000..b9a2689fb7fada99ff640b3d6e857bd4c4875933 GIT binary patch literal 415 zcma)&F%E)25JhKJB#W_FvYOBd6k8YzON|XNMq|PuEhLf15(*|+kd%oe4ab<1X;ua-c(;m_wcnY>IJ9qb46fkT7?6MNGVRam HiZvX5y1a4v literal 0 HcmV?d00001 diff --git a/data/images/demo/demo01.gif b/data/images/demo/demo01.gif new file mode 100644 index 0000000000000000000000000000000000000000..86f637f20d8bbc7aa3d4f2939b76852c8fcb40c8 GIT binary patch literal 14700 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 G@&5rnLNCk! literal 0 HcmV?d00001 diff --git a/data/images/demo/demo04.gif b/data/images/demo/demo04.gif new file mode 100644 index 0000000000000000000000000000000000000000..914b8cc8ccd424cedbdc428ad54bdc827f1ab7f3 GIT binary patch literal 13367 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 literal 0 HcmV?d00001 diff --git a/data/images/demo/demo05.gif b/data/images/demo/demo05.gif new file mode 100644 index 0000000000000000000000000000000000000000..f2e64a3a45e677edf6f36918df15d3310b6439cc GIT binary patch literal 12885 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 aam0x7--Zrq;qc`FO=;Ptszize&;LJT!g0d@ literal 0 HcmV?d00001 diff --git a/data/images/dialog/bluecurve/error.gif b/data/images/dialog/bluecurve/error.gif new file mode 100644 index 0000000000000000000000000000000000000000..162aab24f14801e853db548ea074717750baff0c GIT binary patch literal 1597 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 literal 0 HcmV?d00001 diff --git a/data/images/dialog/bluecurve/question.gif b/data/images/dialog/bluecurve/question.gif new file mode 100644 index 0000000000000000000000000000000000000000..67116154a9d5fc9da4674348dd478d6c20206831 GIT binary patch literal 1777 zcmd^;i&Gl~0*5ytJS`BQ6q;s$@CdMCMBrkjn1Lka5wSw9lhVipL3~`MQizrtqopCX zDcvfDN7ITKgq4O8nH2V%SaZEx*`^!1*NL*@#G9P%aXWR<9bI9kmuWLjdiC$P??3o` zzxi6)n)g4`TMbkLTL8f4^JVgSouO~Q29LWjBt&BbnURqZrdWoJ&G;hndIdB&8)jnq zKBK5Wq}6I^HVUI8$;Lty=MOWJj!ENy5t?y}ior=w$cKj~Vb6@)=kxn0hLbBb7|EK= zW{QjZLlLR0W){KBR>+OhCi4gzjgbrodwe?M$R3f1VxtOWv)k)024%1dMo=O|vRZu~ z&BX{hiba?a+jyAfj3zT0VcmXWeAXSIIfKEVY*rE!>q7h>2>L>l!32%NUZqA$u`vXv zJcvgot8rlz%f-+z?G4drh(yq^6>=QX8Av8tuhE$yhnJuuOq7ep!Kqh=ZDBe#Y;#CK5Rb5a zg3%g`3>W2MaVc0svoV5X(JW07PGcnJ!ynxt_Y#aqRG?65W?Wv6pLqCxhU9^Omj*lp zs(?rQ-UN^m2Og%1TUX}R-b={=yVqCdZ=MyFXq>I9@U8RtwZ`vSH&j9ypoGMglg|k= z#ghI(b)$8m{UfrfQdkDfC{8fH1T6c($mP0Up-{bhl@a_!BnMEi4B`@81W17~dYDn)}?a5`J~g#Hrq{b%a0 zrk(%|cF7uaJ0MSR7Tw?GwWgPJB3G7fE*`E_^e8Qomw&*f$~9>xHj9VukC1?M#>HW_qu)2vsSUCt6=Q*>ANDBrf*_Prh;gKP~%myu>G` z_6LS+1*cYu0;+@io0r9y zvQ5xO1O={}M?^{Hj(b{RBQtjU=ROuU@nsM`+C0u6#2`x?LNa7n*?5LRWrcm1cN z#D?{wN%_5ZzucOA&ACy2>3D}JS(pnTn&Gis*?jQ0j=19dQ=MhYaUnj06~-^h1ve@i zOShXUJNu8|MLnhN`Sin%HC6tLhw4Z3f?(F;s)OqJTj`JAn=2jk%kVKLJhsy!KGi;G z%lp3g{IRT3lckaW;n%$G%pSYGt?bNT(Q6fEe=Hd}J9eO{yt?5np7`DCjd)tmG%7na zuqk{}%2%WAybIJj>yjLyX-(BWhz3g*Dw>-9dfC_6>iFQ&>Xv{sk6z6#`FvN~XvVXf zH`5lM)uy7mH!WqkrWs^0@Ziw$S)Ns0s?58no-dc|M|KhB~tO&8|#v!clS;tw%O;yIr`l-Ch<@g7u-nN=X`4C-zE73BC+53 z!-n{R9Y%@tmyZ6rHwZVNlBqA2gDI7b9a(w1e_XvSUFgbg7VGOQHMpU@!CGML@g#it z@uCvn^P*krBd1*oR4{#2!7sDFK9D7N{rXB`0XVp{^*2Ms{OLShVRnM_VAY=|66L3N z0@4?pt3cc4o4nEg?oCx%iG}tRpe6n2jdN$sPF|bt=O+cDfWCb@IRX9lYKO48x-sGN tj-*QuG9`P2r^^F3tO>u}wWO|E60Qvb|7_Z}=HHo1dU}1$CJ+Dz{s+3F-KhWo literal 0 HcmV?d00001 diff --git a/data/images/dialog/bluecurve/warning.gif b/data/images/dialog/bluecurve/warning.gif new file mode 100644 index 0000000000000000000000000000000000000000..964e14d1aca91ca55ca9936c4e750d8db9b12173 GIT binary patch literal 1573 zcmeHG@l#TF0Dl+=5s{L<^d(P1)FSnWl#IETppvnTYj2Htq_1$XQ$vT_ zTUqnWyoOr1+{Q`WwPuS`G^njOWIL`{v0|Q?6}Q-Cj%(lM{)7Di`~3L%;q&?2=RTj! zTU3P`^%6(|J%k`Gmy5}HxEdx6Qacp~yzySAHsmGTE>kqz0D^gTo7U^Kgn||WX>eYu z4!CfNs*Xf#I4;f0gCjw0=zE;9=pxgWJTcelG!g`1x0Arn1Jha%HG{Cq)F20Ql-q`) zC_CyEV{#-CGT<6?#5n>&a1n=U$S8YAp@}1yCdfR~M7S(qI5I(2rNjv(ZeDG%4=Iqho7By+nhFaO7XZeZ14bQ&9a3FSZw z`1cbK3qUUyr!I<8(eYU#maSoT*Gro3DJPv?Xv)$G4;nT^uYvTfXacI!!HEvMAH&%%6qY{D>`X z@6`G6b1m-_zVV$1X@2{7tNhsgVuP^k(=+Vd-DEp7qh4OV_s^O8skNCmk}M}{kNg`J<(lt zmeo_HdXmzYe{SFtT3u}B)WB$B&t%zD(a6P`B^}waLb1!LqU~Qx?HRa3(b-AMa=c)5 z@Uou6feGIBx)v4HE8NgKTss+_97tFx9ocp<`)YD>1}nMjq7CghdRD+X}5X8$NE z-l|>2Qb9-Dob}!N6-x_Z4<^uqg?a^?d`Hs0JU2z#$3Jj8(bIsae4-NtK81%_z~S91 zwe&Vkq@B#vuc|MS2(vR94-I>mjYEBdNcKeLWc*=)zHLRl=vhX6?!03V)|&)z9ARn9 z%{)BCJpNi`k?^RV4ANW&I;;W@r&LtzS!o!xGSa1EP)j-x<)Ndh#|Nt&C5UcxYYFt_y0h(! z-10=Ny#jiaMt>_|BO^uf#h8IVZ+zSW8;b7u5;hMXqgS+c(ga=Jst3%t(~!$EQ1`@2 z7c~9k7h($ literal 0 HcmV?d00001 diff --git a/data/images/dialog/default/error.gif b/data/images/dialog/default/error.gif new file mode 100644 index 0000000000000000000000000000000000000000..b6049aba55d54f407d2d64aa7cf1ec57b6118fc0 GIT binary patch literal 276 zcmZ?wbhEHbRA5kG_{79e&%jV$U%!9<{{IXN|NjFCC{X;#!pOkD#GnJ>gVZuG-_+Qp z^Wno*PjMNGaK?aEWjYh7=|S#c-)`MTQhcCI*FY#c&0Nl|Uh14PT%TH-jRJK8qs5N*)F) zJ%*KxJPao^7*+~1oChir<-f{*T9%RF1jA`YZAJkNfydh1DT0EJ8DH~$_`>)}^s6=} GgEaud8Ank7 literal 0 HcmV?d00001 diff --git a/data/images/dialog/default/info.gif b/data/images/dialog/default/info.gif new file mode 100644 index 0000000000000000000000000000000000000000..c5e5a79a1a1c7b0991e51484ac4d697771329f32 GIT binary patch literal 271 zcmZ?wbhEHbRA5kG_{7Wr2LJ2p>-X>9|NsAg2p>o){$ycfU|?p@0f~UrGB97U*k$wS z!&Xmm8I{+J*|p7TeTN?#9x_<>SYb}{0X|1r9-RlAI*GS!8C)+Y|H*Q7a5m83t80G5 za6mw0y-tIJqC~>}S&R+_0x|ujIzXzXKZ4;&^${k8`^sVrKjk(u2rx&uhch$qGcy5c zAdiVT+})L#L4b?NHp5JZL4b!L!IeRfmtl!EgP;fl^C}i*20=NXyW*L*3mPzOXJFQ5 zJ|M_sz$I{iS&HEp{|O#J1|WS=lnF@j-#Eb_$-saA1Op2L|I-uO`Cp$9cz=T5fRn)* E00c-$v;Y7A literal 0 HcmV?d00001 diff --git a/data/images/dialog/default/question.gif b/data/images/dialog/default/question.gif new file mode 100644 index 0000000000000000000000000000000000000000..4e76f6d26c19b896842c7cce8ad18af4be9e0637 GIT binary patch literal 292 zcmZ?wbhEHbRA5kG_{7Wr2LJ2p>-X>9|NsAg2p>o){$ycfU|?p@0f~UrGBCfi*k$wS z!&Xmm8I{+J*|p7TeTN?#9x_<>SYb}{fpf|aINu1o`E!6tgfUw{BBi2{k^6!GPlUDL zBvS?h7UL8)OJ)v{rh`155(??e4G9Vhc*~fXCb=^Qr1)RoW{_my|8$#y Yg@OOa?Nj`Ja+?(jZZk`8GB8*J06*|doB#j- literal 0 HcmV?d00001 diff --git a/data/images/dialog/default/warning.gif b/data/images/dialog/default/warning.gif new file mode 100644 index 0000000000000000000000000000000000000000..b56bf69f8e85ef801c212a44a248cfb6eef700c1 GIT binary patch literal 297 zcmXAfF-XHu6h+_5Yb2yqTWtuULn^xXt<>#{gSZ$S3~oAU9Mh@Ug#_H(yJu9<@|Pfp zCIxYE(Mi`1fY9?246X}z=AIVnIMoCq-i=FX7xXnehvW$7PFeU zKs|na^I3g3Q!4aSy}Ko=@mf4GEp6V2Uf|-g+&0DYc6dPTlPm3eDKz{d-yaE$<&P<7 z9gn;B`KZ--1aYqJbeJycs_Q`=_L_>|1u?5O{2Bq9L5?nRVAHrpE^#@P(ROWMljtCz zEr$to2*?3eLdS$yE~6MHCa?k~v`Z4QJSJWYOvlvAIAJP5^7p(+QNj0=pi9`3a#zvO WAN&mZxtg{qqIE2dEzF%-2&=!{#ZS}# literal 0 HcmV?d00001 diff --git a/data/images/htmlviewer/disk.gif b/data/images/htmlviewer/disk.gif new file mode 100644 index 0000000000000000000000000000000000000000..5566e474e687472e1e5eac69720e13d3064dcb69 GIT binary patch literal 85 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 QPDFE0z4z)di)iQn08(OS1LbSER} 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 m^P_TN~`e4sDN{#m$*vfhQKIA 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 vL!4$0WG!BXFzO2YumwE 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 literal 0 HcmV?d00001 diff --git a/data/images/logos/joker11_100_774.gif b/data/images/logos/joker11_100_774.gif new file mode 100644 index 0000000000000000000000000000000000000000..1cad929d6ac58abea1a61164ba647204669d484d GIT binary patch literal 14249 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 Z0uLX1^9jh>EORLd!b2lNep@b9{2$dtWgGwi literal 0 HcmV?d00001 diff --git a/data/images/misc/pysol02.png b/data/images/misc/pysol02.png new file mode 100644 index 0000000000000000000000000000000000000000..2f962b00faac56c9a2318edfec4d9c87c4eea62b GIT binary patch literal 8595 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 J^-6xq{{dG^@df|@ literal 0 HcmV?d00001 diff --git a/data/images/noredeal.gif b/data/images/noredeal.gif new file mode 100644 index 0000000000000000000000000000000000000000..0d960df605c7c48d457abcfdb5ff0f1dc542d954 GIT binary patch literal 1695 zcmW+$Z%iBK8GrA+f4;NNoE-x;U^s{|2RP0_-Sp_J?ar9gAU4@8ognJEb3~_jN)tOH z6?}+vceW^Eh+GjuDBaklLX1{b=S?hPS`r<`5!TiXDs2kVka{0Bjc;QgCS{tm%b(CC$GJq*~rQp zIeFt=ZewM6V{L6KD{tjSw>CDuC}bWLMjzeHJi0gav@rT~F7s5Mdb(CPxR*ItoH|&} z9_mwvi`m1Kslx}k!%qr_TZQK<+2;>(&p#`C{h;vo&*q*yd2(L&|D*H24e7bJZr|j7 zbo*v*CY!tS9_aixh5!%;k#oX%n}B#JZRAstmix8MJH3z1ce}S{#v;L3l)d}=FMWOd z(E#?tUyq&iE?C0c@=raVH;rBB38p`t?F^+tT_fGJf1p43!LU0Nz0{rLFrp(I7~v?k zKjd3XpiTX~&B*|YH+FC%UYw1Dyg!TM6d&<*4F@o?F&rFm*U@0}4vn?)L2fvJy8LyJ zCVi0(ZpVRndh6$*)6aJ#yKz^0Z)4X^1Lg|%x|1l?#D@d((*mpEPG|Sxsv~p#cNjuX zTEKICK}8$K*LQ`#Rx~>L=A`f|t5S(1P8CV0x*5>`ccTT>+PLmPV?p5bv{(zDkq~lHhArr@XKLnfT@lLvujX z6%qLXd`~4JGn-{rKPW=>*6As$e^`P{%y^N$Uc({5iR;pP34n%YPHqfnZ_GpHyQeok z(nyFm#%H&MWL3k6Hje-02+)|JJ3EGTF^LeNTRSzYD4`7hof&_ZjFbp6oR=k4Ukbi{ zZPk`lg!B(ZR|SwoX>YKU5=}0F;oZ9>hhdeLTVGwZP{=Cfgu83p0BCUiY!8p8EDO3~ zriFgsQvlvq&A%LW26zdf`m7@zrDAD~Y$_QtY)o4!#21tU42uc6^Oa+OI-|Sg3LP~8 zg82<)52KSNLNKgq^=uEm`&DV;jpce7O7c~(&%9J^O7T@Lyu9vZQ`L+ zp?XXyficHF-*ZGy3>}{sX90HcR7II!%CsPBlq<}Y9e~ndQ>jpG$s-Fg$+G4Qr^?ST zG-<>e{yF4`0K ziGlPUHCapeOn^3+&oCgV#DtAT49$52c|Pd>sI+{#;@lY!|fV4>xsBUP9Y#i-;+RV*#whYts3D3V9Rp zY)f`r(COoYZ?ZQ48dAqP$LpJQdAA9O*f{~9UPb-Q9~h+j^lxlfRRJae=m&^HPyw(% b{yHg9o4FD@T}N0TI@Lc?C54s&_{RSLc;5?e literal 0 HcmV?d00001 diff --git a/data/images/pause/pause01.gif b/data/images/pause/pause01.gif new file mode 100644 index 0000000000000000000000000000000000000000..1a5f05ac30c149e976efa7bc360c53df698c40b7 GIT binary patch literal 7556 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 Ef2<*oK>z>% literal 0 HcmV?d00001 diff --git a/data/images/pause/pause02.gif b/data/images/pause/pause02.gif new file mode 100644 index 0000000000000000000000000000000000000000..cabaec076d8e72e0f28345e537dc7c5e8a795c48 GIT binary patch literal 8251 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 R_n_&2HcD>Kzi?C2zsh;?=| zb~4++eCit@ftUU>U2oT>9F$TB};EM!5)wC$l<_wZG$a^MvY8rLe z_&92uH;fymIc=D?;;HZ2+OoZEC)?UDX4~ho?MvD0liuE6CQp7nd~$Vic=-JA()8H% zv9Tx9ldF@{Pp@CQcI_G2{~Ut<$m!mlhq}lIhq?|N$sXw52ZDd|5P${{UZYwY69}vJ zxqM5wX0ZQfN(?`LYwCgc<=dCk#Rg1!Mk^MMbUf&YhteBH2l%Vvz8yg_`r`MvWpp94 zQGp^7yHUBv!+p4OR}HDJuGLfw^WB4kGB?ylf~2N;ofc44EW>G8>aUrb+ef}h<+eC>#Ft#$=_6?n>KA@H z)=Dg}r((uN`?qB7At6>^U~A{8xS+MN1zx3T3yeuCs|?A}6^54e70S!WdqDAAp0(Eb ziU#D1`s3R`*pi`~j8UA!NxO)(F58AvbX;##bZjB6r-?x&MkNQ3eamCNSri)Ib&8c( z!A9lv*B_*Xlp2m0TlHK8k&na`@tgN%Saw1gxXBrS)5jAQMrOMHSB3*TzQzB+3Ze& zI6|G76T-1hUz~f!CPp&Lw*Y*mD3$?@Q=-`?)UolnAZ1L;@zPQ5kr;(Tk|R8|Hrz7B zpM%7kkDW7WvCnQEG)%y8Jv*GN9y$XRoj{~va$GprWm+z!hr!$gbCGdyRH3S$oGFVE zF7PQ3A{Ydv5?W_7SEy9c&b*K_DtuKX(619tvYF6CoC1Jq=RrC*%b=fvD@p=&EP;m+ s=1$s_pQl9-A*YU3+d>Ef{pG{F8`!>cofc?S2D$mYURVAT0>CT(0%etwF#rGn literal 0 HcmV?d00001 diff --git a/data/images/selectgame.gif b/data/images/selectgame.gif new file mode 100644 index 0000000000000000000000000000000000000000..d2b8c3f2df2a1b0cdb575d5391612e8bd4ef9f14 GIT binary patch literal 1295 zcmW+$e@q*76#w3RufOlwqb;8LY!G(| z>Rl^kQE4zv#1WetA;cK}sAeK6TdtI4P1s^H=c)(dX(_m5-gjTEhjdI5}Rydi%mRXlbhk>)==^(I~6NUJx!!W0;%6h^P$3gth_Ka zbmRVyg^^O>i{#e#sjY0Pl$|fH&X)@dSFc_L|C{w+ou55+CPJM%6A2H8!e>td>pvI* zKqs*80Cvs<^0JtU_S$R4W^O&mMLIrhKqwbOq2ssD{m@dc<`D`>-?0%_Lq;N|P9EV1yX{%g`9Lje%i7E&4FMpUI zCG;1BWwmWC?bB3a{@5;LfQloPi`%?L6J)9&zy%I@J1;_=ZYdu-yk}_=0S#C!r`da6 zU}TMpv=^l&Wf_Hup*hU6A@0Yjmqf4Hd5YvPJ`&_Kj+@fX%4t83Y8by4H!x8iv^^G} zuENNn&DCxaX@mnboN=5FN_^yN%L)Tij3MZHI;(B#qJYeKiea#d;MW;I=EUFeXKa36 z<(LK;)R7}O=-x;}qC)8x5fo>by}Oio1T)>F&k~s-2A0|a&=C*{vJPZd~g<~86R`Wb+8ptCvdxz5^MAp)A?Y_w( zxCSxqh)(tk1x4^?8epbHIxgvDmWh4q=_Zx7xC!tLqxk2|=X3cCDj#N09la*(*S1Fv z#vtaQK!-G&y?tmEr19N30ClZvT=r-8<7gJ59unz*wkU@xY=Vd=r0iF9SGwu$%a1sS z&-E0=>nB7ertK&SFz;Stvaq6;MDCpsB^LKO_l>qqWKflMnETtHUl-uo=zU=k>IeQ< xk<*VS;obI)C?r}vOl;$bM>?jxI9V;lo#IE?dn@u*@vRYUTOMTPN2Euw??2O~vylJ* literal 0 HcmV?d00001 diff --git a/data/images/stats/barchart.gif b/data/images/stats/barchart.gif new file mode 100644 index 0000000000000000000000000000000000000000..af67fca7b0a25b29a372f285d14152e6972a9c80 GIT binary patch literal 5835 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 BMLz%l literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/large/autodrop.gif b/data/images/toolbar/bluecurve/large/autodrop.gif new file mode 100644 index 0000000000000000000000000000000000000000..42cf5ce19b453603274127329715415b33881542 GIT binary patch literal 1311 zcmbu8@oy4$7{+hc`W^iS30~V%FM6Y3FY}^A(V(IuEkoRx;znAgtde@|>g*PxsKhbD zlq%L!iA80REu>`)b8I7(OqLOI!K=MgrbOA~hq@7i1|wTY#*#}$wmSS9_Wb(h`6Qn= zdA7Z2+PG=20#P7O5kw|KSr;xA*+c-1L?QtTmWu(W4Gj;2D(|$bWx-Iem_p5Zw8}Ag z4<;7Fxm=D5f+}Y-P#_QpM57U%8n0HXPCJ$hftU*xQu-=~7LqzOi4Hr5V}3Y4KkxN= zJqFC8$Lu;#j>#+*OWaN>m1LSrbHjwyYOM*buoW*xpePVko^cywH6B#c8a@K_dVRtR z>?W$@$7@-)UZ)8<$x;lMbjmVsuEYqp$E{a_YD#IdSt1Oy7$`A6R1C;i)=QFDBAMXW zMjaJ-jYdt01!p;?;XKe_GFT1jpc}0Trc$bL#l(Uq?~^$k4mE{FqhXFwCS9N$B2yt? z(|~#wolAmp8l`EvlBCm4nc1W-CeWA%iaAr<56cNOJ_Owinu`N*&hIeeTCKLm;d}^` zqZsFIsL>8B(2{6A4k`(K#ETLHQ4WylAgBvyD8$yYN|zbxX*3%Kl^8ANYz$+sXQ7D# zb3Q!Ez&S6jQ9>aKl7668t800`$U~nAPdW&%$3+pC;DOaN~n@O%OkgGAUXvzt+lgzfA|E1&a=9eJy99e}l@?sN+WFC3mvh0ni@tY%(R=RI?YGV4d zTxI@3a&RU}zoIc&r_V++TTjO(U@Ns}eEkab(cQDB%s1QLmR|^#GN;b9c=;)|b4L%a zJ1apLjhwx1Y@x6G>@(hPSAOuz*u#s@9xX+cMkBJd=dRzlSs@vX&W=Q^o(MACw14!J zPeBjfB~DT~k;0-qcMk7b z_xl3o8`ZJ*UhT+T+R(dt&0y!fj5N7(f8gI`gZ#q{pEdn@q~ac-gS$=Z>f zO{=@kxDRa|=R2Rt#};f{et2(p^O0Q>6DyeQ%v-82Tbd1r4}FKS@_`GjCzpq$jA7RaiyRiEJc<0DuSFUB|!1S4=(p&pRE`D^flr@9v_jt)Z`Q+`zfy|UZ z%r5DAtZ`o21V&$8tuQhVPX3j_359R8`PL&uP$j-!Ge#V1yI@-X@sqtjsXj3pMz?Km dJJ`MAy!6lRcJtA}%GXz8@k;z#yiJa5{tp=9QZN7j literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/large/new.gif b/data/images/toolbar/bluecurve/large/new.gif new file mode 100644 index 0000000000000000000000000000000000000000..be3ed975a118ad8ce22239d1b529ade7bf83ebad GIT binary patch literal 558 zcmV+}0@3|PNk%w1VITk?0Hpu`U0+=Q005JglQlLq=H}+??CkUN^L%`KYHeymTSF00 z4{mmC{r&wpr8s5CXe*^C6=W02%F0G%MTXmqsPC~vv_l$r7reZ@NN7iznwnUzTPR2; zVq#)ML_~JcdY9#%Ou0;jh=n&9ST|v5VcOc-q@<*)tE(0l7M7Nl6B84=zq|kc z|NsC0A^8LW3IIO%fwF@KLRX@wLr#!MGF^5*0E#Pu;UA47ffwB#IU1De!5`E5?QNX z$&)Z*$e3Y*2FpG#Pc}4A!vstO8w_r|82L!2(RUGUT)@!*3(lh_2}HP%BZH141E8Ly wK@~>}qD8gt%#mZqMI~9qG9Z9s2L~QtjUcc>H^2Y{J)G#>%eSxJB0&HEJFJA?i2wiq literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/large/open.gif b/data/images/toolbar/bluecurve/large/open.gif new file mode 100644 index 0000000000000000000000000000000000000000..4a772482655a5013313fe2e85e8481bceab68ac1 GIT binary patch literal 1377 zcmd_p?{5 z8yhUmYr6D+9=Hbp3WdUKHX~jONs+~LnB`b0MG!utMx$|BmoZdGWZ`U*rb8eMHS&}z z6=yuo7M)H<}?I)-p_luynH9tiaN{mG~=$q{ak+vli~@@a#? zfZ-TNheQU>rI;9nv82~xs>$*QXaRF^j3*(a$KZ0bm>O$RLX3|hxZf7VJ^2I%K~O%; z(P&Rm&WDhYl#UjXcw?g>=r(7#P&5|B{5FAfr(*svfpP>?5NVsuCP_IdFS0n)Vq7L= zxMvAFWRai{rw~K)ag2)*#Vlhones_0&Eqs;Eo9?d*jY&684k$_DC)C@JRpNP(`=B0 z!8qk9h|w&MGGwr-YF@CXg~4r7AtNPmKHMX+p>WXg6vr_|DHlU+#e5=8dqgG}kD+o_ zz+otgTICc0!+uGOCZm3u@E0;dDh8+7r=u9uzs1sG2#0YNcNWDk;sH^w1@l=Gv`@~b zLvFL%2~v1a&Lud~Cl@kt$}5XuDM_$YD9yrhUgS6y@mSfPB>O-5_29W3Vt>VZ?-{eX47UeeQ-g;~0ti`=!PhN=xPvISp7F@XV z`H`aRk;52-ZPc~l~%WE)bx%KbVcrMq^ODM@sDTyY1{7C=5Aa$ z+PCuB&m+$CxTI8<-5SYE*X}!UvHN5?vOSewh$+?QW98DeGn>- zbyX-d#vx5#`S}~#ng@SH0u6Jfx`rE(=JvAJ$~(1cO~c$>gZ<-mf9Q9W7lg(84|m;B z7{6b79r!SCX@h?4oVlkCTXgSVJ+}OIUr@h89Ryl8x+7P$TcP8J@b{FlyLg+@F@9n{ zd};Pp#ozj}%F(7?p78LGua*Vi>(?Tcoes-V`&hGG>8&%at6K78&7RsyyK~Qrk+F_B zb3dCm6g%pR$yA_wH@)31NAsBgA*XsF}9da&ZWO65Iezfym?spdi5 t@L{lFIZ`)IsGTsA!nsQE!f)qqdQxE9El20%#@oL855Ju(YAb+O{{sr`F7f~X literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/large/pause.gif b/data/images/toolbar/bluecurve/large/pause.gif new file mode 100644 index 0000000000000000000000000000000000000000..8c3d83a7544e9af09da5ec40314efb6f53c3c482 GIT binary patch literal 929 zcmchVze>YU7{$Na=7NJ@q!;PX;kIP#P(dWY4!H$eqF|FZs7}(&JV7G(hk{z9Z&2t9 zwC|ub)Wx+^x;PgXm*Bl^k_!?<7eoHQ$NA1V_eWY*Q#Vd2Q20;*Ayg<7DwT?17?x!@ zj??XSUDxgPdV|4WG#X7NlOPD@^LZGCQ53-+ukxpY5U5ZUdmO{67hli#qOe+XVM{#_O6?(z z@Z)Cv`b;R%bWv>~9+5yNv64rKZW1~cN?wLXxTGW7iZZKHXzj7LvWgF4cl0}#K%}6X z{JyNq%aP*jv4nx;&h=xikVMe6U&6?wO7ZD}a6wAZvk7K`I&%mYq;pmLWjO#QzK{@E i8_Md^C*>j?;`D@zEVJH9xO|)c+Pu6<`oaAQ4!!_he4C{J literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/large/quit.gif b/data/images/toolbar/bluecurve/large/quit.gif new file mode 100644 index 0000000000000000000000000000000000000000..89515b04e195cd2975ad20fedddd703aa0876b50 GIT binary patch literal 1431 zcmds$0dEs!0ETb1E$xk!a?Ep_qosh{lF&ZW#M1&(pDqLnqF85N3l zq}w_;utFW}Y_MY8%CeCO4K&zjiA^^K&M`rW5?IJG2$_V0Wg|)g#?ARReEz}vym{7F z^A)S>4Uhr)1A-I^MJ_1;26fu0nVA{4$NhA2)Z_7xMkE!nWpi1Em6AQlSb)b-wG+T{ zNOs$ei9~{7n7E&r9FFvbcnndHB2$e-h@iM+qa-^6c#x13nYe@HTt2 zk^(N8X6y+s69@!28gsC4HXZ=HClvq;sl#vzu=v%hSG^(;c9UvY7xU3B0ek%5`pnbE z6h-BHaE}ZKf(v^{j^lz778ex=g7bo}FD#@Zww?gMFidtC69IN27fhv6ei5CVoMb74 zqChqwrepSjq=e%*$IuZkm5^;gH)CVeP677_Fo7eYjix9L#R!2xgHAl;CNK<5g#`z| z0F7khj--!bC@LHdyBsu4+c{Dl^U_8PCMh8q1bs5^7mXZi0jxF`e5^q+Vy4O`1c`s2OEUkm`NDF`#c!rWYgix#?KawZpNk8gN{{)u$`l_ouSz2hHK4@&n8NZdlzlK6Ur2 z4~zTvviWZintW$Ua}B`x(W2K6>=zCHe#t9@E9(I*-e2ddA0 zP*SvLyj-<(&+86pUqO4920b@oZkw;a(Wq|XyT`4o>MX&~<}DosZ%FUo-aYTd=zMzU zbLIC>RL_*$(+?97gJsiF=aY}uZ(F{{@>5y!h(2khzMI-mP;nblFR4>SezPyv2jP`R zx~DZS_}WKmtw2>bF4ye7)gdFrwcD$e(Hg5(YZ){Toz^_77mS}ACa;*}^R4Tt9qsyc z`ZMRfyY$V5rrI-}wfW2B{=swBm0xr>9n5Yz-=xxx^}O1Tf`aXr;IfGe138D@(pEYR WUT&{M%(adEu;%pCK#@ubt@#(j5tv{A literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/large/redo.gif b/data/images/toolbar/bluecurve/large/redo.gif new file mode 100644 index 0000000000000000000000000000000000000000..01ea4dcafc75467e69087bfc214e9a522dc2d55e GIT binary patch literal 751 zcmZ?wbhEHbRA5kGIL5%Rd;jjW8`nxnO9@J;X60rvFff$NJ*8>s6A%>8yY5QWf-|Px zDH@s@3zjU{aqe07#vArAHN3pM=9V^o!I3FBr6Dn?`!7A8u<@Et(QF}62^m?riPL61 zee?C!(~nmle>{Er&F)JtRvvxSyWwiqv=c5lb6Y!FW8-6^Vq(wUczogh`y)4AuRHN% z_U=2)YpzCj9|~;PGI`o$J!8v*S6?kSa9_dLW6q`%o6kI*zVl8@+YXn))vO#mcAg=X zb5E4cJd!`#{zyK(d?!fOAbBotJ~pOvC%qZUcvMudOq(w-O|KV&H1G?LaW#DN*Or0ILRxiR#aDLx)+%z%u;i&W9OA9oVKfG*+qUy6{Cnr zO17E7g%j#lTq;?3{`2?W`j*auGFs8?n=@yhef{yr-hKNL`uG3(^EW3q@9U4>Ji?M1 znwn~sKCLrW?>&CW*xdR*aX|4W3nLdpJ%bJ~G5$vR;39lftymql+|?e7)mZ4IVr3W(D0#y$)$6OX5S1OiB%0OQ?+;*3^o?2a!%8k z-ISI2F@am0p?O-_$4P=hP5KGjA~YO2PEMV6SmvOGz_QjEhQ1N3hKkH3lNyZD&MinZ z;%GSL&3j@=;=;7vy&?5pJRZu;XFGRwcyBqF@bCV}@T!hz&OrAE`X|{9U zhrUH$7p?xjy76se{)_yOhauM2t@)PmJGnS1#wc~2?Ar5t&z7HC3SSh)JdW|c@2zxJ znK6pd)XbE@hk>Do!Dp9`U8x-hKZm%Cc;)KKIiKe^-*wi#q07C4n>nAEX)hDQ83u+1 zhS>O69yK08EkPAcmAXrHf@cIPsw?y&^ek^%DqdCOy}--J!zg7b<@>-_=CTaKG6wk& zd6Sza3`Gn==0f&|?X|CK3tbdqFlN}je|JDo08c2d<|$3415E5P9AX6$oEe;AVG>5C zjfJy?86+8$n^YBdD{}gCGR$OP5oWd7Vwd?WlXDIyuQgxt#gxgfCo`lmSgo;%JriH~ zu!?arBQGzn_+*KID*+ms8jOxivb*KD>v*_|xmfgA_%{o%gs||R5a2$~&0Nj$e-sR8 z2q^w!VdMg)CLIPK0Obh=j(-e{oH8C8794Em5aweM01CAVaC1pGEO20CW@d5;;dsE% z#KI+Jkn!LFV@oePqss(?My6ISF};Kn9~_uZHL;r&ym)Ysxs_kRsY620aRHkUlNp!B z$Ht~kVGXMgkA+FB-C}xddm0`lJ#LUNO53p@@bIw^QS*W)7dAG#^UF)uGk9tlbO>-e zUgmpv@O$go4wrviDnTu;xRl)|e0VzX$ukEIy(u0$HmK-MKI-dX!RB(vlSeev)h2P# z41E!$*|jbcgMOZzq8uXjc}0@z!hUTwW}X9+o^oW~jAAReb4Zmbwn;##Wa3$Iws$Qq zdumQHr5*6>OsqQbZS{nf8KUO%p7$s|c2aiK4qr9pp)}i~nZ_Bbl>CC9dgV4T#_Z9! zY`T!mG&{l}G-~5lfn$aJI~8s?+7%o;=AY4$a3r;6tKh*}bKVEXID?idJQVCc7%(|G zEa#(JNO0{6SLwu<#CyIj35@N$B1g6y$|yV$C?Lr1>T*a%EW+V9tD?XOXYP{7z;@Zc zjv@zT<1HGFi$4rp;VN2sMUahWxvL0+WaW!Mcb4i06K3T29yuu2#u@qWkSIUr0eAU2 zgY6QNW^;xdmoNKt)mgTZFN9s>%+bX5v_`%XR|(xM7mqQQ>deqk2+L4tV9W7arK!Nk H$Y2csVN}3s literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/large/rules.gif b/data/images/toolbar/bluecurve/large/rules.gif new file mode 100644 index 0000000000000000000000000000000000000000..c6c6fa287919afa624b1a16c7b0146f1702a2e46 GIT binary patch literal 1517 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 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/small/autodrop.gif b/data/images/toolbar/bluecurve/small/autodrop.gif new file mode 100644 index 0000000000000000000000000000000000000000..0bce94e99f85a96ec9b28933986cb82eb2c8212b GIT binary patch literal 1115 zcmZ?wbhEHblwgoxc+S8uWlDEps&BZPX0)$)T}{!Vg){8*#5$wc&$NqO>yfzFBsM8T z&_ka$KR0#l#;L7b_4^$fFPBO`?UYJR zjF6X?fB*jd|NsB*-@mV~udkybcBxPN+nq_@@3hQpwbxVSe7;-d+Y!Z2yCq+(5WL+Y z8mP~*d-p~SO^y2c`XXO}kEct1+-_bu$z}ce^>Q)-rx)@5Jj(ZB5BH-5+*@%qxdUwFW8-7(?d@ZHrN5ulo?XMcZwAw?Wz2^wIdr8M zaw5ckoRF@)_*%=)pFh7ZobT;s)m>9~byXO4wXrQo zWKWNBvd~w&S|k4D0RQ$$th}5IR{9J(JJ{FdaC_@8$C+|IU&r})3+w5{tcRwtMj5l8 zE)zO2ll5Q^+ukaUHR;@rwnoK{+(BVm-* zvmo%WTeq}D(Tf`g7q|B}+BcZgK2&lOP;~A%QV@9LgrJJ&6dg{737(TT>d&$;{Fw5# zo8N7L%S5AAuY+1)Gt6>}SiPr7$j>=;VNPludl>lpFHi&UDZ!0_zZvo~+veERh1=+UE^0qPQYqH>`!GiS~;3pMrG z=~H&GN_nBYN`Q)B0Ds%V4juNb`t>t&)-MxQz|AVQqhvN(v=ue(D`QN{P z2?YtMCo<;0T5cO>6POriz20iio;{)|!ZJ;gIpsM`O--#Gt=da9)~;PERUuwjS$OBp zo$cGVU%Ys6@#4k2yu8WD$pJwDV&Yc3bfrz!uYsws62r-4c3GFLJ1_o;Yyyw5& literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/small/open.gif b/data/images/toolbar/bluecurve/small/open.gif new file mode 100644 index 0000000000000000000000000000000000000000..ac8b38efa2fe8b38a5c06667abe9b01c39886b8c GIT binary patch literal 727 zcmZ?wbhEHblwgoxIL5$GQC%S?CB(qMASEp|dD>)NUf#c7pZ>lz_syw^I_e4xOBR@#nSQ!3?ZeqATW02!rg#)5xoN9N-MM`D)$s{0j`lr0*!^&C z$G$z=u52kiy*g{ptmvK7qIXOW-ZCjHHa>R$zFkK)_TD+a?a_@xcQ5U`d4A8)Lp$s1 ztF}#w{PFJ2_nS)tf&vcCOF6lH#+O^`!aPk{J6e}FyUBrN**}1uxF8xV*kXUtf3SwCcyl=ib;-cXea+ z#kFN;R~4OJUSMx;vvFSSm6O{}F3p`&A82M~`sBftqYE?l%}UzT7m^=gA}1@$&(E(Q z$)~9xq$nezqAb6A|L*^^1d2ad7`Yhg8FYYA0E`g{1_t(j4fRdUEv;?s9i3g>?F@`e z6DBaT^fa@wvCo{z!8x^wYsO4&ZXRAPz7;E1@V5%EEfL%(BqS^%BD!Oz*py}g@y$XU zha@DAN=luOmJ;S_5s=}KmAiaJ{@OJKMI|LB0p%tE6)8nkHTCB&o@>0;(9}}VzW-28 zM^}&M2anLE0|yTY>;G$M7IZ$QlX%ETL1)>+8Euj#ER$9=GBp~uotUI~`@luE9nuz2 z83AUK7PrYr2NbzjII4Pp0=BC!7q1AEcWT=pRMF%y zak0}PFVQ5GRf5WLtg@PoDxH(odrj-udumC}M5CLMzl)zXEz!E@$eJ+gk z0;0J1oFi0QF`pHTh0`dYZ3+c^4Gatg5TjUI&oP{1T`@uO0N6@LaUpMJ3lPBsF^Vbc z!;}Xx9&be+KwQPWVy=)(3FFq_CXh206zeT1^D59=z~;{gaVcZREzJX#4YxE8LR`h} zXUxj>{7~jH2B3LBSH)PI1)A5eY^D&@gN+8k4aEx#f)!eUE&{6Yo51SJc&>Ak570oc h4-Nbz4>+=SXfj&>Wr02f1sISJV0b`-z;b1<1^_qS+Wr6l literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/small/quit.gif b/data/images/toolbar/bluecurve/small/quit.gif new file mode 100644 index 0000000000000000000000000000000000000000..d0dc32412bd728178277723df37b0ff84e29154a GIT binary patch literal 771 zcmZ?wbhEHblwgoxIL5$WYG%s7z>x3FRTd;z6DiS>DBqQ#)|aC-u|RKXiQ$xNJtsqf zS(RpUYpoYH+AV2uoKbG-X(mz?Cc2`-bxp6AudOsMFYn}Olb3h6Y@Fn`eMYF0nda{O zyEQa5=Fgx1{{4G>ef`#C#T~Q4_RNdgw;(3eRb~D9_5c6>x3{;q))PLkC@wxeeqMvq zmZ?E8KHBy5^-9vb>n8;tTR-dPyStBfRL#%T$j{GLkrSNL;`{CC>1SIrXNEB+1nRSM z@N#hSOG!)h_xHyK=q;$QezdjZe1}X&Ah)29EWdzMKv00Rr0Dz{_0?_eqT(uSY+N#O z2FhwS+&seP&!0C^<Ss1w(>KSx^u>gz_2?hrCe+~6b%`L5M z?H!#R3_ZPl{XOlBOw25-Z0sDI92{J1+>8q+O=aWY;pOA!=i?I)T*x>{h?QM{mtR;! zSa^--h86}faYhz4PF@KSNhv8w5kBet^)j+@@(PTK$0a0{lvPxel_ga#iK(fp%WG(I z@`)&^XnlSl^>k7F^OrBRHFb19hhzj?NSMc+S-DYg^kXv{c?6mg1;DBk_AMa+FmFG9a%I{S&LOMa^nS;N&Q+=-e_z(q9m;5 z%T}7P^E`9UB1Y!Ef`>;u`5n2w-`sJqp{Y$U(EUdBCzdV+?!Zg65sFV4n%NUYl8#6# zDzUW+1uvWN*Li7|X%35%M#2LH$=1UXG9ep^QuV`hBAGH2H#~Jcoxo|(6IoZVr@vU+>|{jMf%c|Q#S25SJ<%RCJL literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/small/redo.gif b/data/images/toolbar/bluecurve/small/redo.gif new file mode 100644 index 0000000000000000000000000000000000000000..c12718782a15a6a356e0e2662ed7145f889c7ebb GIT binary patch literal 707 zcmZ?wbhEHblwgoxIL5%RV95egGt;#j*JkBrS^A|)%B!_@w5B!8OX%67s-e>~b!GRu zt7_(60YL#3)fF0=8vFtRMy6I%7jN8o;rY}Zw~ObT(sxUgmXRr~s6KiA`omXWF5P~5 z=FZzg*IunV`FO&{YuQten1xozE30bj=v{yE@#u}$o6kI5b?niC{r6i|UyklM+pXGV7k#QW2}!Hw)%7nv^q_m=4bQ@5R!OrJ zOoN;pOFJ zU|=wdpW$1wLQu)xDLgxS&RN6oi5gywyu#9Eo-wSPJgSbl0z#rCi!OL%_l9IOOG-)K zeDXoX(EjO**WNyUuRne-Dyx!IGfuDUId|jn>aB-j<74$rEdNss6o0ZXaxv61=m1>^ zj1dV22KIjq^-aw!t!?ccon0*qj7;5K%q*;I6FL~#IXIc8wJ~yWbMWxa<>MC+6ciE` z5f$U_W)qhHI#@dCy?Uc=Y6CpK^d4gSLsnsV12qiGp9wMO;(0mI!R!5TtUn zNxQkl;^3sEF^jaKwj9~;&?#W5D*r6KtPQSRYt;%4HC+ZXc6C4>b+i7-ak;jmo)tnC*4;C60 zv);19<-*A4$G+peq}ZZ@$$+TZr#o3XNN7il&Wd%!a+uSWh|Gq0#&?y`lV6QpP*PA; zwo(~x79dt0Tb)^Z#&~VOYk9nP8XFoES`sKJC|z(|VY^;Yv`%rtZV@XGt+B0u$bJea z3CPXJ)!NmnwyJ2pW?i~kM6N(du|__KJO&;HYHeyvX-llzswkr*B%vS~b`}B(0vSOV zBt0V+B^DzyBLDyZ9C#TVBpf!EGdXiNU0+=bG72S_A`cf2DQzbUI0+6)3>IV*G=woq zjYnUWT|kIFDw-w(5(7O)JxhB@M~p=;rYqy~<02>`F{drG!?dE;phtN{LS;a9sdPfF zKYqx3WW8cJsx~H&BON0hPP0ois4#4|Y8W^dIH5HVG!7L}6aWAJA^8LW3IKlqEC2ui z02lxm000O6fPaF6goTEOh<^Zyh5-Tt0|W(s0|o?)f&d2y2?`4g4Fe7j1DFsI5)%{@ z6%!U07#SLv8yOrO9v&YY93UYgBM^xMBpD(lCLtgoCnzZ@D=div4<#)wFEAx4C^0fA zGc?mC88rd{Ha8zAGB`OpJ3NR3I6Xc;KsG@YLPI%3MQU7vAdC_# zFk#Z9loKCF2nBc|1PTu%QKU>6X#>)L0F-$7z!);(2w^F634j?68MyVpaYg_T7HHBOVYER_ zhhAesS{M)jVT}wnJ{SpT^FfK55G{thffGkgnlg+6+)%;{#T+4Y=oG1Ar&OW>cTlK^ zVIoC8JaY2*Sj5N%9X)&O;K9+N2%kPNF=6520}G8TeqKD;!V(h?C(;!0EGV(RO$`PH1}SN&fS`cZj#g7M)2!UA-TQZID=}Z*F8uw8 z*pCy;Ni#_b@P>*o_G@xaR_9uz$XO!HTqVQc=H|9@wcv~GA|=sW(_46N924>N zVCUyyl#%AEtE;=(ReaWpRmU8 z{&Hz#nHtwkFX3)MmJ$XAUS3{*eimN|wxiYpE^G|j40xoN88T$p=g4xb-MDt5DC;&G z@l}e%U*36bg6S|Vb8Ioi4q-7C0f&YL zMiwp+g@gr*8X5W6Wi&bz8k<;oq%0~J6q{N&MYJLc3K*T)m|6HUZX8(H+|IAy)FEKl zz zSPT=DJ6IKC{wqpsYW5IVt8OFYHXzqoR6K)NEoq{PWkBQ%*KC(C2|I5 zaocGL#)B8XOqk`?dyqN%(4Pe3G=_s_S$BR2I41MHXv~ej}R2^YB)KLB5V!OP31|v(fcf|*GSr$en4~3kW3@r*# z9Rh9=ks+x~teQMc_Z(yej9e6RZYFSW8lRc)Krv!xgNM=y-X~2;-3&!Xn|cl$Jk}p| z-~xwIhs7k0ya%?AI8-bx1Uy;YTsqrSWHS~pu}xmXpyiIe~U literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/small/save.gif b/data/images/toolbar/bluecurve/small/save.gif new file mode 100644 index 0000000000000000000000000000000000000000..31fcc983dced74878b84c0ce542a1f6366e6bbf9 GIT binary patch literal 754 zcmZ?wbhEHblwgoxIL5#b8z0NSz+h@-x_0B*(CCRlAxVptY~H>1^1>yDq7$dOdKC!? ziB6t2IXt?trg3>&*V@RaC>khH|@C!nmOXJbY6q`rwO z|NZ;-`Sa(^TMs6twv<-R@$@Tc>s(S&)|8rF>*|@iXvOt8i!QBRyQ{o*LviJr&YmTO z<*S|Dv*s>3v3|qe{L&RuW}WJtuso+|nVnN&X8z)amZj;r3$5&;dL|v7IcHl+*1Q>W z4mGx|u4`IZTD2rGeU6z`$f~u6PMx`7VUucUm+$OZ9hWl8*3P@7Yfn^sm$`*qdU{@P zM4zcuwv@D#x^_TBOq07;N=f;|$oMI>&D%mEYc5^7eQ)2hYmS7`iY22YeW$%*X+Z^i=m!D2N(;$ z7?EILVE@-p-_+dF+ScCD*}}ls+t)v#mx;NBk%fhojeYiNKWPGQdKqe(`WY|SSO^R zsdcQ0QB_@Cd#~(%q4Vp6HMDdd)-&p=>peev@Xk7YErU;A{Ekdm*n4E()z&MAG<^#neg`0&87U(T+^ z;zwaJyFi0u+`bUSl#Yvw**ZiFnVxVssCX_?3rs5DoLuWM%fj+e$pvAJpvf+cs;OQr zoU13O6ijO9+QS$iUZ=7$=;*1b+7ZiAZmv!}&8r^5apJdeLpSTLuq_!cAGw~Memo(> yVyDTB4@}yLM|y7Vnc4H)NMgYZ!{pT$8jLe8xnzBDX~Z-o5jGuuwcmoSs9Tv3vEozOj|ozH8eHq>%+f3u(UQ| zojh%_ye#wDrLKFnMF07k_v3~5i|eAhR_RW!=M4x7m{=_E`KH*1bE2Vk?6dpTe>@la z_E;>+kNe#z(MQKb-X0SziRM~8o!wH0g_oDN%AYGXK6dTKwNlbjveJC=ay+wov?{7A z&K`2&<6(%8v+bzhv9}esw`SAV;i#|Dx3||=w>JCheO-Nh`F(q9e!kW^vq)4;RqFm8 z%^%OLf4wz1xm&)s#o+UG_aDy{JZ;$C9hb|F;YbVNe0EW^zS`u=E!kt6g?8`Xy>Gk! zrz@gI)(XDdEwa3n@9K8xz0(8^Ef?%>ljzIhF;imcN#)7&;*=6#`cGe=_>+Z^i=m!D z2N(sw7?EILVE@-p-_+dF+ScCD+11L>-Ob3v+}Fv%$~L)$nVpe?lZ%^yk!MmL2QMGL zfS{1D2$Sdx4l!}TtrC(OX4ErCNejxzGVW>;6_%4%P-H(`&!MEOBB`o2Sxvo(iER?Q z#`OBxog5lXJgraFHSe`+X>-&w&#GtC`M{#9*TJLDWngHecSY;Wg22PadRd=x$Qm># zxA*aymwk|MSUIlo}bUNzHk=4c&vayNjs3@bOBu7Ca1LHIuHBQ!y2k-bN aGf#TJ>$HG1eVH3apVp34x9fol4AubBiaGWG literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/small/undo.gif b/data/images/toolbar/bluecurve/small/undo.gif new file mode 100644 index 0000000000000000000000000000000000000000..35fe78d38b69e267faafd21832efd2152d761813 GIT binary patch literal 676 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 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/xlarge/new.gif b/data/images/toolbar/bluecurve/xlarge/new.gif new file mode 100644 index 0000000000000000000000000000000000000000..54cf7bbe07b854ecd51d61353a2129e15dd1d7b2 GIT binary patch literal 826 zcmV-A1I7GDNk%w1VK4wN0Hpu`C@Cla0006C0W~%?=H}+??CkUN^Zot(v$L~JO-&sg z9l5!=YHDf(6ay7x6CR8ktE;O99t9wl9V4M1E-o$@ZWS}CF@DyApX#S&$Y?92C_6hl zcF}sM@3A|tI)>YfM6^R(TwG96P@trsot>S9h=q^fm0iPL9D*4O3kw<>8bU-ula`Z= zjEo2<2MRI?*Vos7e}5Ab6JTIqqobpAbacwf%EQCM7Z(?;v8`8ES0p4PU0+>zdwBo< z|NsC0A^8LW3IIO~W?yWed?+(0)3$m=|OUy%Fzesy1Z9F!p7B)e6a5;!j4HiHM7Hp#6iNS)W zom;^+Uc9i`!a|eqlA6ewG^<5m!B($ho(Doicu+Ye#mo~>MCjW2G3cEKT2Rmu@v^xs zDsbk644ZdY->giJoN$rfk%W97NB+$`Yyjaii!TJ;yt?xV7i1!IPNui@?-WpYDEeVq z1qufW7&mfJ@Av90T%dMA!T^HxMcTiApWp=w4H7)?LI^NGK*AV=EVtixG0Y}_3^Oc% z01Y*;2FZdLCS$`53t21x0Sy~)Mo5MW62Kt>AJ(u|cO<@NgM=TpfI|*X=+`211)ykP z1~`bw;*HGN_aO;7>_8(FHr_~pfidVH0}oRS(8ZKgW&ywoJy@aTmRxq}<(FWFNktF< EJB-v;QUCw| literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/xlarge/open.gif b/data/images/toolbar/bluecurve/xlarge/open.gif new file mode 100644 index 0000000000000000000000000000000000000000..7e48a65f25dc93ef2b0963a873996379eba57e9e GIT binary patch literal 1885 zcmb``|6h^^0>E)#WrXRGQ#1UMqNhemoSkUSBj6l5UdHUHczK*7V})r&rWXW06B{>pqa>csml#DZ$M3`vkQL!B}a$J(b#yTo$WKZkqcK^e@|AWsDpYr!u#hZ6i zP!!Z63WdR7s8p&%B5}D~kX8yoMg$2nSxlEj6A5|A*#xOn>T#MytT>INghY(62xN|!s8J5RkXsPtw<}d5asvxz1cd>own5Yo@;gH=Rbm`2 z>{eUUJhw>%Ew5a(ZuN4kB)e?@yYVnvQ za3r7HA;RT_oBsAMAu>~mXv7J0<2HmNue2>7kaSR5|s0L>~c>@#`IQWA+oC8vdhK9!j5 zv4F5gL!)NHev_D60Ec~kJ7|#8G-9e)+@xwCTC^f3BsZ%?WMZPnEJwUrqgvuLh#6kjQ z*lR$Lh+QjyLmsQuV%LfcO0HQAMBEy+hy<`{w2}f6kpKss1OmaK7ipv%tsH89Sf`7?WFhOCqLBUmvIeIx@wOUEU zL=(vMniY|dFO850hy4%)d7KuNr~rY(Y6(CllffqToBykfm&?#N)EiVD>KFfe0)<6T zZ&s#M3=LdAfqk1)Gc}|e@4#oW`zwa^6J1H0O8Vnh$RA_$=|Pc(=Mho+X6P!O!4cytkZ*^Ck#G1ZOODfymsoSjCKr{ zK+>e_i?sZZIB@aqC3I&?_x2OJV-6U1us?WO*zsN7uxW1glku)yxia0z+Lj*^^Lh7< z4puL5cV0*kH}Cnhf3PWWJJ%l(`Ux$+pKesYbn}~lgX7|zBt6o@XTNb8tw9Bef0<< zX^XVuB^yurk8J4oV{j_Td$wcCt_fo(`uPDfU4QL(Ci2sYblK}cMkS%XKfMi~(_h<_ zzo!>%TNZEN_8yUppx=_EoC!~^`=;gm^oE9NKu^fB7C3W(ih1RRZMnL(!jEnb-&|i^ zt3z*&uNg(<)zayhb+Q>iky9Z79I8rc-@>V=vU<7-h{%-fm_MzU&S&+y%L@jswoWF0 ze*32+LhpC&Q3UlB#kYH<6Bkl&Z{rtIizt=zD9lYdSNXxme~9q%_~|)y&Bs@ISfs+3 zh1A^r{ZA%Sj;_*t8#DZTu)bfmzUXXim5eo8+j?U@v#74IYWb#5m)?E23vuq%_vw|O z`0Pg`N!-*`)*X8nF>~i{mv8dt)?GX}CD+|EUEv;?J!EUgGpRi#7Fjl_xV2Tz(BQBge5of9O6 zA75K^URBH#PnR~ivd*^*!$I{ILs$TbmL^IL%h*MpMvV*RCG z+cQ%e$wlO@@!`?Tng!^qAO2dT>cZK!>o5s2?7`l3+O}tM^!qKb<)I$>t#;g>pCDg7 z8Q;!mr`(Hfo_f)dd*=Z|nuKSi`6+iQeto_O^Yh~?H~u~rnLF_-+J?!6<1-t7J~>dx zkm4uFj&0FP-wUMAFa0~?`Da_!JUV&&+|opjoWV#(F`@6C{5vzIw+0*3gnHKh}>{+EhCo6^;VU)9!the<4gK;Zg7W7k*&X AX8-^I literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/xlarge/pause.gif b/data/images/toolbar/bluecurve/xlarge/pause.gif new file mode 100644 index 0000000000000000000000000000000000000000..ef0794fcae7d50d45df0d818361ae1c17e066552 GIT binary patch literal 886 zcmV-+1Bv`cNk%w1VK4wN0LB0S0|NsO4-Xt193LMaARr(iAt4?f9vK-K6ciK=4h{zg z2LS;A2?+^7K|y(Wd3bnuc6N4gadBW^U{Fv{LPA0`G&C9-8W0c=Pft&ilar~bsj{-N zw6wG)CME_31{D<*mzS5v$H&>(+1}pX+S=N`zrSB!Uo9;y7Z(?qnVH<&+|10(oSd9> zb#+)+SS~Iu3kwUKot@?7<>uz*&d$!RuC9!XjBIRdR#sLoFE0%Z4WOW)?Ck9D@bJ~u z)uyJVhK7bPFfgK`qSx2gt*xz!ii)J9r0wnP*x1;$wY86rk5N%kySuxRl9EVBNR*V6 z;Nalt>FL(i){c&jEG#S&6BB}hg3-~@&CSiIsHljDh$tv10000*MMZyqf6L3u(9qBl z5)wQ-JeZi6iHV7Gb8}u^UMD9fT3T9ZX=!e5Zc0i@BqSs?H8odPS5i_^OiWBiM@J(g zBNi4GB_$;(DJc;V5&!@H|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0A^8LW3IKlqEC2ui z05AYB000O6fPaF6goTEOh>41ejE#IuXyJwZVW=S~9Cqm8haiS1 M;)o=c=wToLJ6G+Bpa1{> literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/xlarge/quit.gif b/data/images/toolbar/bluecurve/xlarge/quit.gif new file mode 100644 index 0000000000000000000000000000000000000000..d52725f60b4b8723c712c6c0e95b56f589b43311 GIT binary patch literal 2004 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 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/xlarge/rules.gif b/data/images/toolbar/bluecurve/xlarge/rules.gif new file mode 100644 index 0000000000000000000000000000000000000000..fc9e37d0ac16964aed0611ce2dd609e81b75afca GIT binary patch literal 2134 zcmWmD|65Y`0>JUZM?B&Yj(DUap_1a)NX^vHw0V&kDw&loZ)4@7X3odkc>ER?b4H+O zWN2E;tbBx;`7m=x#qF9g#U#TdW5$Zxyk^as^|;dVmb+K)?)yJ@{qRmn{DV9!NhDP zYKlh#hj1VC6QHa|b#*x0C0Dq6gpEk=yT=S^nd8GKkXIh0$|r**31Yi57Wp|ive3)TomJQ6ASKJN96PQqC&)2CggB9WAeY*jhI9tiD1J9 zgF%A9UI4T;qf1LmA^>{yJwl=Id?0LTQ`yaUd<5JqM(qNuBL-z)XkQdMV=iD9ZsG!;!Fk*i^X$ubMYu# zj}nCf*s5(e$GeM|u#5rNY$l7vnr>GLarj#qI&Z`0ryXJh7~3$jN-}T9O;JE5lbH=z z3I(uPV8)79i;-e75Tamd7FUSK+F)eTfSD699LKM-oo#%~p%9&8IL}#dyTd-KYv%%R z(|A)+EtwSH?d|PDT5M)!CNUniDl4>FZDwX>Fal<8;ZX?CM^K)g{-!tw881pz;qa(1 zwgGcyFc@WJWj3CNF$y+C0F4s0d`tl)Z33c4tbq8u%_-<)vweuG-~?o8YDw~AVe2UwO!od@`A61^jP~pAbjLJB;6`9S|JFw+U}xQdqfpms7Yz$hC|njJ)|kmvc1zsv5T2Ii%py8+l3{e6>h;&4_fwbncV2Sa7lha>p8RX z;faIO>=NlvM$N0;|7z&kQQ5t#k=eZNl(#s*yEbggy`bc#ln|AzJ8J*Uj=q#1By6Qx zh;P09_x%g^-i>RVE7jQ0=H=%n3-+~|gb9sT=bNsi*W&+d$pbFdHcjTRan&Eggk|yX zLF3Rs(Dx;p@%Z?Mwr#NwX*)QJzF7$aw7QQbcaCx+7O!-lb%gg|Nb(k_eja~7W%JI>^|xOg;k_@ z%G0w(zS1b7$5t<=RULbX;QTxnxrqE%hmsd!zD~c2 z#_3$skh3jGzG}mcL8l|F@}GIJxw#h*bAM?)0Vcl*=gsu%%$`?TAAs+?TIZ=4ze;W) zimId{ub8l8r$l>~{O*SBRi)0Zgan$&gVmAgzFr$67Y(^Spw?_)S1nNJt>;bkCFn+K zY8bz(9Nko~CrrogpSYTSd#Yg?M7VE+dJm+vzS8qzUPija4L>P&Pk7PaH1?@KxBPw- zyXe_fcX~k0Xvp(NS(bZ$^r_RoBoAMd9h?n3s)~dwJirYG6s_d2pLmWMk58T774rqn z>HYGi#GCrLq#xcqXkcI7Ew{w}y9=@=FvDsFXcZ+3qZ{sYA65Mr^61JA&MDFYy#9+L zp2v|FuOGzmD*a9>E*F&yY+wK5r4m7WTx7DGcxM0_V%WQM4Zg1fd$*EC(0540@AvZ3 z2<}pbT12FlNO&20f4U!VEAY*2&p~3jbF6OMFU!e4z4s2`{qBV=O^U^Vq}3<7@`h~4 z79Ed#ZJ_d{!TCRL1+LMg8fdFpl}{f;%SLupUOU|w)XK#?LMM~vxs z6xp{^<=m~oc14f)bvD=KjR5)TZYc|?SLWa2`zllUl~24>2M$SBk?2Fw=X+IS2W76M zBPpCH!th+lQ~EnX-RA?Ps!GbMRXJfN!iv>yn@_R*DfPF5KxDl)IRJk8(w+LtQ>pKX zeDossj<-*f@-Ed0(ua<@7wN#4yVVWI>Kebm2gl-wg-A`&Ubo=VhEIKXbkheYvZj<& zF`#zJDl(CZkIG36>XvNjfP*$o$cQ`2I1@?uWP&SQOPuxE#XS?VQcDSp$s^_Gg1s@% z($-B$w;@T~jnrP*=cznTAT{|VmVs}IrY=|>4f>BI$&(tS5G^h@39nGQ(Ng7}Kkch` v*~4>UO!0!i;o7i*UaSO7#(yn2mI85|%B9-^=wn^{Sjz*IWWtX?fD--(Ojc>` literal 0 HcmV?d00001 diff --git a/data/images/toolbar/bluecurve/xlarge/save.gif b/data/images/toolbar/bluecurve/xlarge/save.gif new file mode 100644 index 0000000000000000000000000000000000000000..9315de2b9898a7d1bee3aa65f1a082a877e5fa8c GIT binary patch literal 1911 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 nRF!)3beXF7^n^(#8AJOovUeCqK!e9*msqeUV literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/README.ICONS b/data/images/toolbar/crystal/README.ICONS new file mode 100644 index 00000000..92d58b7e --- /dev/null +++ b/data/images/toolbar/crystal/README.ICONS @@ -0,0 +1 @@ +Icons compliments of Crystal Icons 0.9 Icon Theme by Everaldo and crystal staff (www.everaldo.com) diff --git a/data/images/toolbar/crystal/large/autodrop.gif b/data/images/toolbar/crystal/large/autodrop.gif new file mode 100644 index 0000000000000000000000000000000000000000..84ca821597becd945b10b75a8c1059ee563dc305 GIT binary patch literal 1040 zcmV+r1n>JtNk%w1VITk?0OkMy0002KzRbV80DW!^rKP1xN=onV?~II$zrSm9b8{&v zDc|4UuBA0pR9LTy02vt>dqn{2>tFw@0JF2RW@cu$w}k!t?bg=T|K|Yz=RRIuFu%XQ znVFf)%*+rF5Ij6Qj`g=A>N!|I`5Y_xS$nAAo>Bn0N>dF|Nj8(pa9FqRn5)U_t#ke|1ZEZ$G2d0ClFdJgKP6&Ma@uVw-KqYy; zxPWIu%8oV#0Te)#0Dz1yz(8c<+^tPeaSxz*KW zn{@C0;297IMT!v*4;~zOu(m^6mkZ!hEeoZtnId_Q9Err?Z^kWxt2&`8#mo*h1r{ql z;-OWiX#hHWo62RbKq(e42S^er0f!D9{x~sVLgF;oNqEBV~$NMAs``ol+goi z9(ZKnhY&)PFoXANLzy{V!A1@? zKybi=h8*z20Ao1d02+KmaX<$bT#&#UV~i2P6KKHE$7?ViV!#5hRocMVq$5&YXGk>EG&Y#~;1? ze&No?uRs5<+jsl_|Nk%E|M~Fk|B(yNuHJut|M~Z2n~t5i_G;7a)6d`i+IHmb-qTOl zY&-Sl)6aYN-k-So=G@IUyH7s2`S=@9BLmHV;!hS<5e7vD9gqzmKQXZVKQO_-Nk^)m zb79d*8LN30G?*6}xagc+V=SfXuwoLU(#lk~9d}-`iZrsAJbfz3`_=A7pS6wLtjqI* zg^M}zYwGHQxtIl{xrDey3foJ{m{_LIU`d^v5yv6kCnzDo%fKErCx(@EzOX3s28m@W z>VpKtg_xLJBsWK{%q*9a+qG+-?|}fGas?rw!*a66)3)-R78X`Gd#?X-(bm)aT#s+v z7P{wkAfErt<0rS+UPQ+TeC3$G;N8IzRivx< z`i9fa9pCjbQYv0eKinPvVP|l_#&eD>-$jDnbewtQ*`pMG$tbd+(RYTF`?Qh*p~Mr$ zbBt{5UcNL=-dCvF>GY>^ii)=}YumS&tdQrymJFM+?w;DJyx5?(--rfL1 zw>)|5#l^*PmDM0&R6U6|m{_5TrA!vFvOA^8La6aaq!EC2ui z03ZM$000O7fPaF6goTEOh>41ejDJ(>~}GPvgmz5X)(1op8B6ZnGe-?wlOQ${ z6nZkS;FTd;6fVq%pn=B*94_P;3FHsOZCPY!RLGD_iU})XuFydf%LS7p2wq9J5}yw! zR(1q<@uO%QI7SpW!AWpM&{(pb)S^{ohZh1YvSxJ<ZULV8t3ab3y_MW6H7wNP?#*fw);0co>o6$blJomEnl+fW(_)1&3bHUO%}9uZyrCI}87=)i^&-FPwB3r37r9%v5KaGM7nn9$W-0O62@A7p6M z#1^Z#;f5Z1@PGsoLbPas1#?jF*dREB;73nekZ2-`JgCT`5HC6bz#I}CI6wzIjacGk zi7Br5qXm2THp+o1NYK*>Ir^|;iaxrC1rvA;qJR}ws^S9-3Cy4Y0}RX|LI!YB;a-t~ zDB#Cbw4k6T3I+5jh8S1?An2d~P+%Y-Gq9=XqKr1WD13z&AnBx(R%+>_q+}{cAOJh^ CQUB`z literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/large/pause.gif b/data/images/toolbar/crystal/large/pause.gif new file mode 100644 index 0000000000000000000000000000000000000000..8c3d83a7544e9af09da5ec40314efb6f53c3c482 GIT binary patch literal 929 zcmchVze>YU7{$Na=7NJ@q!;PX;kIP#P(dWY4!H$eqF|FZs7}(&JV7G(hk{z9Z&2t9 zwC|ub)Wx+^x;PgXm*Bl^k_!?<7eoHQ$NA1V_eWY*Q#Vd2Q20;*Ayg<7DwT?17?x!@ zj??XSUDxgPdV|4WG#X7NlOPD@^LZGCQ53-+ukxpY5U5ZUdmO{67hli#qOe+XVM{#_O6?(z z@Z)Cv`b;R%bWv>~9+5yNv64rKZW1~cN?wLXxTGW7iZZKHXzj7LvWgF4cl0}#K%}6X z{JyNq%aP*jv4nx;&h=xikVMe6U&6?wO7ZD}a6wAZvk7K`I&%mYq;pmLWjO#QzK{@E i8_Md^C*>j?;`D@zEVJH9xO|)c+Pu6<`oaAQ4!!_he4C{J literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/large/quit.gif b/data/images/toolbar/crystal/large/quit.gif new file mode 100644 index 0000000000000000000000000000000000000000..0e57a7473caafdceef5eef9ab9f4defc008e60fa GIT binary patch literal 909 zcmZ?wbhEHbRA5kGc*elc!@#g_-@da^QL|iJzB4fV|MKNN1H;v;SN|Iu|DQSY-`>4@ z85q7QDEzOeIAd)5KwSL)wQK)9JiZGEToD(4_wLEdc@lpFjV9=FGo!>;Bu= zya5V!cAjBic;@PQ^ytx&&w}H+(di1G= z#uXi%r%Fl>f$k9y_%AJe1E^g=;fk^GQyCecjSPbxDE?$&6=CpX&;hv=6ekSq{~J7; znp;}i+B;hHg?!dGng@RmaC?z$ds0DdkNO1%a%*1%$>hrk$}X8jhi+I zsMyS#vPe>3&)$9eB)9EoU&JMO{KUyql3XgH;%gSlIZ9bv6X3db>lT;YEh(e(7d^Wj zIdxu0DjQ0@c&8&}s4V&Z;f1Dd4_VGXcFO+^BR)uLyr19S$f?%h{pesrFQ0($pV=LX zj7Rt+)c$SexY*P#z&`0k!^H(Do~2TTH#STROlIRYmk>}$P;lX%XrS}r&P)B&)15jl zXJn#;S^R`OCeI33u<>OFi}PZ!qdOO^y1L3@PF|1HRu7KF+zAR2-qY5wEf3hq_mxYm zZQ}NVSND|~9+)(R{C*wwiAj5Yetde||3;m{t#Ub& zQ>W(phq3)Gyq6uKuyNsjV6w_fxX*Csp*jbv_#5$qO+02d6a>DjHYKpyYNRFxxx09r vY;mu7@UUIMYJs8#M_a<9PKG5blp5bQI&rYFZ(%spV{+|=Q+FE+6N5DXr7}x0 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/large/redo.gif b/data/images/toolbar/crystal/large/redo.gif new file mode 100644 index 0000000000000000000000000000000000000000..46b12e7cb64517d24751881be357eff984326472 GIT binary patch literal 751 zcmZ?wbhEHbRA5kGc*elM5X~@W*PMW!0EROR3^N(doH-M4A;98?h4D<|sh_77O)0u} z?;b-H15j!Gg}VLw_xo?~=bOuS=KmS-DdIxkh0^|~F|1{fTO-%@zir#+ZEKFMdGh2* z{@Q$oLWbQpcQagPNIR1zwShtBfDXf3hNx9hk@F*G-i-{f(7`^Y`S7{ugCPV`$mb5^%_iqlbfS zDMRV0Ovl~2`|j^!_`(pmCw%MWtwmRh7H?U+?c6q=Iv%-BIisCM$%~T%7X>c(xu9TG z!Ls}F;!i~KEa3qLOW~|S>;KmJ%k`hUdvfjmHU7o?(o3ZoHZufX53FBZfBMnsxTAix zm&+ILUHtz)(8VMG#h)y!A`Ar#Iv_ouIALJ_-%!xh+|t_C-qG3B-P7CGKVjme$z29< zxeki6X8HTsPBP$g_VvzlTkfV7zc?th-zq&_K~iYzwrwE^83DaEERiu9hYlY(#3?Q) zH#LPN%ZSZTT-?&oT;lo-39Ss1v`zsQrF3<54xMNYVRb=G(Rc4HSX2z!-JhsiXY<>$ zvO2Qnx2&-?Se9^5Og%=T$*F~-Nz1-TXMs7#F*aUfjsS;4f}E^Mv1TGp2OLf}Gbss2 zo{U(W>MgA!CUR)e5&5I7ayC8>4Bi4Iiw$ z>ZWQXl6he3>g(%Rtkx8KQSy|M&$ztmtD{2a4Ea8v1P+g+hs}3)m;3MdyK&3J7zQ&o z4mq0#EDWqQ%71x%W}J9r0GR;r{P01?L7lXnEpaU_x-Kct zDRbm=*Vosd=$~lAXd8JC)=(D37RTPlv$?ZeiCot9)&O(>i=vAFy#SQvlp4Mo zx9_((eK|jhKM=tXnar8x`Q;aU7vAgMGt4u3&U#7DNfosfd8c^*w*a%@vtZj`#Pr0A zwGTklKqAH>=H})LU<-V?e5KH(TG?8q>ZOO$hX$qwp2VIywK|c&kto$D zd!2g#%m6QRF9wGOG}kou{r3rS2??_aN7Y9?gFU|0z7fz70HpxW;m=NzPQ}Z`Y1nBW zj2~Z(UwYtrkFk%@_R+uazjEJlrt7BZ@9C%4r_$ZhNry=!yCe|35FoN3R^C>MtctbF zwa@O)p1_`btb7k_4~5``0A>I}-a;127D3BFukWuR&LN-Hpa1{=A^8La6aaq!EC2ui z03ZM$000O7fPaF6goTEOh=&DCby<#CD0FFwlz&=Y5CEDN7n+)Ea+QT69uN>Q1Su(d zdmkwTF`6A~qJK$u^i7unvG8E5fR|SS3f;vtf~tSi%LX zTL5DJW@Z5(A%a~k7d6=3YodvZ8+c*dahqWwgFjg=NZ7#`BNoOx3>XQllJErtI1npV zz!@WF&K7qDw2T=sfB||^0}Qw#wI0eU3lIiS8U=t119CUGI7d(J7NTL8$(Fu!jy*R%zuP4**aElO7`Sg%p~E(L@ArlnF-!O@yHd0yTWmWgm1r%aPfxw^@2ta|JZ`L9R5k4@0!=pGb-~*qA1Ofm%n=8HR literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/large/rules.gif b/data/images/toolbar/crystal/large/rules.gif new file mode 100644 index 0000000000000000000000000000000000000000..9c29b45086e9be845a647451b3bf6468ab1cb1b0 GIT binary patch literal 979 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 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/large/statistics.gif b/data/images/toolbar/crystal/large/statistics.gif new file mode 100644 index 0000000000000000000000000000000000000000..d3237d552a5ae38fd31eab0380659a714a87c4df GIT binary patch literal 1119 zcmV-l1fcszNk%w1VITk?0OkMy0045#W&jwR@z&0-x={cIy%*qw0JXKXAy%|+y6YyN zwSGD&|0faTlx01<|0%kLpnr@Qfj8ylZ3I0KNZRO(_ zbi!BwO~(K4c`wCpYd^{VD`LAatI~&#rqf+ms^t1Y-fJ^6X8-^HA^8La6aaq!EC2ui z03ZM$000O7fPaF6goT7N83-GOjE#jeY^tuVFt>}%Dhb{bkWfcU>*T;wS~zQBUj$v zS40V~bZ+Ku)E-ZBX{3WY0Z%?;^!4;?<4qjr=wMYrVa8+=1TP4Sg9s7g*n?WXU-v-v#If&fAYf zCuD}KsppDGlqx|eRl0)+0vA}goR~VariT$nbx!fYl`9byNs_pjN|k1`3^*!e#kjSr z4Ci}No48~_4_cyaAW;>eF9CA@g@ z&W8*+KmEXU_poU6I6ImgBmEbu$zNIh?oJq z5Ih8kgcUtlQAd(Y=vBiSHI%T$ks&6j-Wv!g(4+}B6kw(XA~cXj405dDCJZI4AYGC| zSfJh?Y#^Y50(m?@!kP3P`07nNo6q~~w la}c2Hvdj{I#sUPSLBkIyX`;ms2V|@5w%l^7g*$-&06POH{#O71 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/large/undo.gif b/data/images/toolbar/crystal/large/undo.gif new file mode 100644 index 0000000000000000000000000000000000000000..15558dbabd1f2e7c3a6333be2d614be69c4caf85 GIT binary patch literal 763 zcmb`E?N3qx9EE?PXrd-*&JxTk*&g)zBMOkTKT{c!toJ&*8T3c!P!PJogBKQtg z)KYZn$Pt+D3{(0pZQe0X+S`BKj*=#PC3+uz|xSe{7>apr@U9>T}WKIw| z8VW)fo*RaH;C8!NH7uvo=|MzmBHjuQMqp-ThOguYTnXq{?x5VD2-QO63nhPyXBaVX zt=xb+0f0lq0GM8x;5mQ-zzM0%sb;eowxM&agHy@LdzwePN#i&211kbaZ%Hr>9%I$x zD%FUJI7HlZZ(=%(Az?^{C5{h{6nTnoFLX_Hc|^=gX3m40^oewC6W2Izw5{1N4L12^ zvTwZu$8pbc|0U7Ce29CY7-DzYc0K_=TvS|BE0##>Wc6}ILt|5OOKY1_E@U53$+85& zf|K!TaTanaCK2iEDn^mu!v=rkqDH0Le_(t(X>hm|<lNWae>Pi+x@DXwYVI*{kxfFQ^R5?m(Q8`6j+XE1A0*63 zo}dEV0MAO69!j{B?0-9RmP8M1W3+#QwEA%7v>CwS)f$%9L`Gw1b>2N^+jo2ATkd<4 z5#LO(^vtGniY~{Z8n0gcM^m`~uu?I>$}T9?A&HuSd~1f@*%I=3yE~Sm9Zfr@&Rn99 uDlpM^t(+Xm)ygNMH3S05r#~}*47~*A%JL2!M>?F(u)8Y85zaJ#q;+6y>SHI-rheyL6eAl z|K|YI&R5LL%-__qv9BDNnW~71H4+jM%F1%%#|r<}0L{(Um5NUF;ks5< zU;qFA)z#i8C@4BQI@Z>{q@=U||1-S2$^ZWVot-4Mw!hih>q$vT2L}hqivYc$g6Qb& zq>^sy;%)!T0RQ>pii(PqkBOI;p|+-OqnmYfcznLTzRAqtyu8fu@%8`qIHRMZTU%T9 z=B&}v=d7%>b$5{8-{!2W$i~Lh>a_uxnVG)6k=WH>+01{YroWz-jkL71dwYB4=Jz2X zDfagGt*x!KwZz}b3az!h^z{7g#s|^S-Pe@>tf*BMFNh2`m|=J3cHorUx1T3W^ayU~fNNLo<9I2M0+N06_zvpEuaj zX_zzXhd~l$o{XtbA&3JPL70q4mt@wQE>Fso0kT667zYU;W$*woh{*#f%jns0=8TmJ zE)szOV`>i0l`LU!;X*_MC_;1;JbRK7$W9nW>eLC*PtliZDp{VvTBk&b7!DPY_!38n zm@Q{nxCAiMrVSYbi!vY(u_g)|8FFu^!O>v=4+x5o6j|Zrg^meM?l4$vgM*GHZW5hP uVJ8ooJs2Kj0ihyC9sv|+R8d3#%M}v~T#)#aAqAE`P&T}I5~_EiKma?EdTqr3 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/small/new.gif b/data/images/toolbar/crystal/small/new.gif new file mode 100644 index 0000000000000000000000000000000000000000..fa21599382faf9671ae01ada6f63bf02fb0a43bb GIT binary patch literal 289 zcmZ?wbhEHb6k`x$IKseCQqlVA?dMC^9vnP+xo6_y|NsAQ+J55Ok6#a;yghsI?#ItR zzJLFJ``(LpAHF|*{^9)PdneA^ym{x@y?gJkTz`D@+`S_wt^&0%;0B66Sy)AYR_TD0 zfb3*oows1BO$ujdb7Dl!YdcpR`L0h2tAC#|{%g@U=N!}HqkQe{iw+39>tTKJSb&$W z`vP;~Y1J1SjyWg)X>eeOe-S9?pmOg;`nARcpLZX{et0Z4{>M|PQ_Y&g$XLQr+T@a$ z%J=B`?{CUfz$rR^K7H?Lo~Y2Ew{ W+pBC=Ze{FYVmNW~)afQg25SH!afn>lG-cISh~s97-YI11EL+di;QF%K|7DHs8dB#YM$^po{{uVTtikbuyZ?l) z_IHTT<^2CjciJX6&`@jAUzq!oxcE?t_##im&e80!vC-=4`_Iqm5<9maVb>5X%LXaG zFl^hexafMd|2cj3+}-cL<^ROX>vfvvFiXmpuH=G?%@IP}W|{x0&H48B|9+(PB4O^~ z|NmE#`VcwOPk86O!07Mq{x@sa8CukezWgU()VB+%kKY}p4NYr z-n_itAUnX^-}WhM-n6vaBuc@buI2|ZwsWigG*8Qgvi832|NsC0A^8La6aaq!EC2ui z02Tli000O7fPaF6goTEOh>41S1#wzli-rp?b#-x(gKr3BUP@+hNQF%Tqyjf+e`PCg zUS>+K5|D!fIy!!SBt<_~7GABdN>*AFv$eQcE?ySBze*HlT2{q6T?lo{%f7BPGTm%) z;Iuk|b9HP_-dJ4E0y{R~ZHZQX?Z6U~&wJr=vjz9&6Tg=~ARfp9eiK z_?t53Ngjd|fYbm2LG51JN!0-%s0<%F0iU_^*`+Ve?-KTSNu00F0p zjSvk~zuX|Rp+g5Ye6Y|F)MP*xb7suEp+Y6Wk_B_-+&OSS(1Z!*dI=tEcmd)&c%leW pks-2$0+bPRNJ4-BfI%wMoH+xdHI3ItVk=OM5CLMzl)zXEz!E@$eJ+gk z0;0J1oFi0QF`pHTb-@y7>;X##rUnKJkQi$#pUi=s3noY&uzU_Qs`bbvhI6efky1eJ zoMJtN8-ASUTCeyqf{oH!Q07&@$94rM29h;c0^|b4xEjD*hONO2C43+yK<KPbrYij;kyY|1J;ARPlBL)WldwWl7YHk-2`Xeg(-`V*yJNtGy zx!a10r-X$58yl}>VAyJ4a0cieZS8eHk^evga011jEUY37W(+zY6(Bz`u>EwHUErZ3 z)!V|8ax!KXhkK%t@QSF_8tfu71xuA480?sQmv8bS-lVg6`8GzymrS{GlxDxSwQtHd zX6NDIWD#fK>}YB0;1QE>5?~S%k`|xFqORULO&nw!ZYDfL$i^D&@|o249+thEcxPC zW_uVOWiSp(iHJD3aq)2>@qU2`4;M~5$)@Y%rr5C1ty73ANo&Odqpq_WjtmUe08PZM AcK`qY literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/small/redo.gif b/data/images/toolbar/crystal/small/redo.gif new file mode 100644 index 0000000000000000000000000000000000000000..057f8a46f889705f819a016899142b6929150b39 GIT binary patch literal 598 zcmZ?wbhEHb6k`x$c*elM5Y5nkvfp8?1H*oX{nz$0%w(|oVKwvrOof>W8oMMbnhv#?PZ8x52oUkcDYqJ)^83y}3 z1{dF-7nmrp{_1*;jT{1H0>MWd?El*b>@X}HPY{L}Lc-x!Q`88LJ*q@77) z*v7E`?tZ@IybOyO?tQ<O0hX&-6NN zbCU0oFMm+3P^ciaP3qcTfv$o<%h3^$#u70kWXJ(#!cry8NGRJ<7`ycPS zpLSP1l-ouH@YIew*TK#ls&DuRpimVXs5azG4NawvypbLS%A8?@flZ91;A(%l2Dr{ zHWg%MU|<$B?PxLO(`6Uo=2m3a<(t^Sr0XSP!n%xAPfVJDsePe~vh}9ToAkJK*G^`T zG%_(!XA5Lw+_z7ZVSW>znys?AknF{aM#@+9UHO_#b#-imG%j6IwtZr&sXJeg-GP_u zlArz+-p{HQTI_;N%!hBP943X59d5NqMjiwEGQmx zV#+r~^<9p9^I~=^Nai>xd(j}KVv?_P1H09sX$s$yJNblc`)nM-G(wt`3)CN<@@+UR p+91g>>BZgd1U7BYDNzOuiHF&E*yc`RjJxt;Vv^?sUREXsYXB`7nd}Cnv|KrCQ28Of!{r`=P-=9B!zqt6N zsOT4I=`9QlKa7ok$He>uO1ZgxVqo~f&;RxQ{R1j0R}2g$3kdu#Eqxgq`)Tv$9RdQ^ zfF`J^yym;>9^j=Hr|CuxY z)6)L8wf$MU_K$3k%=#^19yN|B{jMInb#yXP)KaTE)fn|K`o7)z$kL z82%hN0<`PHh7Fq?9KN1E|G&C=uYkZZ0Rdn*ymxlK3k-qY-e0w~?|pop#>fA^ckhji z%yAW!>uPF0=FPjy#q~-{>)-qL?-dn+u3(@BQ2fclD#DP#paU`t6ekSq{~I!znp;}i z+S5Fhtt>6WloajSTRb(`4CP&1B*pxt6(?snv03PA`UVAsXsWsKs<$tW)d`RbvEHGn zqhqA7VG3KMt-jQbV><$DRTSKt(=;5ClZ|(D9GSep zyz9%0#xHCQ%uO{p3c*XVt_pFb{MisydXhCi!^wof`BS@aO!TRy%BUAC9in2!oeQ=` zur)L|=N)yqu{-tjJr3D7ZB|9Co)V%Rp&=Yaj9D5cc6~k@85s_=GO{1AyXT`Jz+epk DpHv$Y literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/small/save.gif b/data/images/toolbar/crystal/small/save.gif new file mode 100644 index 0000000000000000000000000000000000000000..380dcf8a84fbd9a4be2233c88460d4784cde34d8 GIT binary patch literal 540 zcmV+%0^|KhNk%w1VHN-u0M!5hH8pUVnaqWSt?caVW@eeCrKR59-ptI*x3{-XPlj=E zpS``>jEuHJLxKPQ|D2q~ySvEG&*kCa?|OQrtE|T{ zwzj}PKz!BJ=;r3~babjzRFHmtv7(~Iwzk!TgtnKL!`tZd*4Eba^!bgAyjoh6zP{Wx zHf~BvjKjmjdwZ<2v&T|WjiRE;b91JYl)h_gq}bT&@9+1dq_67g^g23s|Ns9000000 z00000A^8La6aYK`EC2ui02Tli000L6K%P)I5)6jOq>?A_2n3Jga`_;6R5gYIR+CPJ zFpr1f_>@#40-@wpPMjZyybOcUDg;rRS0hCfbAb*LHZ~;*1YQ#n5io**CwUqe2SWrJ zFmaD^Ya$CW5JDvnECeZ=atS317zHmv1QZl2C8!d45e+dYLMt=BDmE1+f_a`55E(oo zB_#1tgc5gDk>F-CN<(JAOsj9A`t)^ygV``FeN%OAuEOq=prB>ETGE! zB78Z(f#ZgX1PSWwThKroj~4r6q|kBW0}cr#Ry4psz(%fJurS!bkmAOT2pU+dU{Ioi znguI3DC04JMgj~NC}>!)K*c#Z6(K?}bST8Y3j{Q9=EQKO!HN(X*0mclAOnh{BXOG8 e5tNn8DOIl`7}=m~gB&mRC<%+zDLW)V0028iXy@7h literal 0 HcmV?d00001 diff --git a/data/images/toolbar/crystal/small/statistics.gif b/data/images/toolbar/crystal/small/statistics.gif new file mode 100644 index 0000000000000000000000000000000000000000..93a490869d1e0424fcdef66b79b099339fa7df0a GIT binary patch literal 796 zcmV+%1LOQhNk%w1VHN-u0OkMyK^;oWW&i-G|LMZ8r%)6SR=wqj4;s2Cai`pnrvTos zffh`ew2Er~MH*^(uQt2?|Mjsk#DIH7F_)ja*=1X>!Q(-d%=gOxHPUk(e^QBtm7OJ2 zv!0S7f!qIBN|KVT|NY|A)6?oRBvLwe+qz|D%>Na=xf6fa|7J61YExiPT4krp|JIKt z&HwJpumHXPQ6Oi=Nlx3t5dir}!L^{xVir>2njw3P(6tyuzyJUF*eGkmoap{eiO&CC zT8xaXC%fu;-T(EQ3&2|d5zLr%FI(Tqz6j<7|4lpp_{(yZ(mNw;dBF1j_rg(|7K?Y|Mx;KR{#H*e`iWF%>V!I zlsj~~%*>hpbUpoYHOA|NsC0A^8La6aaq!EC2ui z02Tli000O7fPaF6go9OJN`;Dw6<-KzJztB0QZAO36FosZoIMUwiV6Xvq;O0@C8;G~ z1PX*80YWTXv|JxdJY)~MPig^1gDz8CU2Vo~RdzgnV`C3c3R4V&0|reXI@vlCc0qo- z4^KvD(}DwN5J^qzd=A|uyE#uG3!O)f+|eQu2aY9sULrv<_(O#-Pk@*> zaKH+MB`NCEkpUSA3KUM3O!z}3Oqd%PGME8CqXIFPmZ_;^Yt891<2cE|lZ<9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfvLEsf92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{Z;XF!6n0WW2y2FTfzf!0y1n zV4%P#aey%a$YX3^EMSOXUf$rxD^;V79!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfvLQwf92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{c9*fQn=qI^`QUIT&~vnE4VI zBpBEZunK@FMhL~4z`(-LrmV-n!NAnO@PNtU0Z#*q0+`4Bpdp!|fFS{h8yFiH3JOYq MECuJ8K@1Gm0Fi(*tN;K2 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/empty-large/open.gif b/data/images/toolbar/default/empty-large/open.gif new file mode 100644 index 0000000000000000000000000000000000000000..213c32a949c79caa93755cf69d13fed930c4fde0 GIT binary patch literal 181 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfvK{mf92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{c9+nAIB?)WAq0tHJp!1IGmo z29^U177R=c%nA<1Kr9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfvLEsf92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{eWnn0YTSay(#=ZeXxrkY->? zV31*8bZA({sKCH>fKh;f1tG|=fl-2iv4ODwD9Ct#tzdy916ve>0KV`lYXFP7Fu4E# literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/empty-large/redo.gif b/data/images/toolbar/default/empty-large/redo.gif new file mode 100644 index 0000000000000000000000000000000000000000..8b892e0e8ff3ee769f09a631d6f0d24bae503522 GIT binary patch literal 180 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfvKXWf92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{XnRE(=az~5}+L18N|R~4FKLYGeQ6W literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/empty-large/restart.gif b/data/images/toolbar/default/empty-large/restart.gif new file mode 100644 index 0000000000000000000000000000000000000000..d3c90548990183f4765488c71fbf8e05c0b63fa9 GIT binary patch literal 210 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfoWP#|H{*E`4`XGa;tmuy*r0pxB|9A)!GOD5hYn9mK$34FE|uJ9Yp7 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/empty-large/rules.gif b/data/images/toolbar/default/empty-large/rules.gif new file mode 100644 index 0000000000000000000000000000000000000000..1586582e22c00065d72133aee930c002c7cdd6e5 GIT binary patch literal 190 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfvKsdf92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{XnRE~_^%@LXWzIKWWCz|p{1 zz`(-LcB|2B*W(5Wg2EGP{0}K-w1Q?hf0C`M74U7(q3Jh!q7zKbTxeu^3FeES} fI0yq36aaAog92j%Ljjnd5K!!({JAoSfx#L8#NIb+ literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/empty-large/save.gif b/data/images/toolbar/default/empty-large/save.gif new file mode 100644 index 0000000000000000000000000000000000000000..a489fcb091a404f4cb8a819ddf8acf3b0e016474 GIT binary patch literal 160 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfhnb@f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{c9+79U`obAU_7B!NMOp>6)t z?F=jo><$bC3<(VF@&_0=79!_`t{j1pD{zSNz8xP#K(`qfnfmlUb6OS(M74_>%=F%gCSuQUX%U zz?9$9zw-23{>5{)-0I$ZZ_jW3wnrY*o^>vJb!yu??&HD^iw`hLFfivdFeNaUF|eL> zV3x>WyQNwQ)Xmtyn81+2z;-~9lY@b;f%gD|0gwV3zkz{|f%yP~1p^a^N|@Nfkid|} Okl>(vxFd*x!5RQ^!!tbq literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/empty-large/undo.gif b/data/images/toolbar/default/empty-large/undo.gif new file mode 100644 index 0000000000000000000000000000000000000000..717e2f55376093e4d87eb916cb59c3361fc39d6b GIT binary patch literal 189 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfvK^lf92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{XnQ7z8FTaxgGTHZV9aNHQ=b zFt9K*Fi*~`2x8!9Xv_ri*c})O7<_;{#scg-1I7l11fUuLD0cYBQUGKoIAnfMd0ZL9 Hz+epkO9nKy literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/large/autodrop.gif b/data/images/toolbar/default/large/autodrop.gif new file mode 100644 index 0000000000000000000000000000000000000000..8365d49eacf64c0c516c5af40eb2b361dff5d621 GIT binary patch literal 929 zcma)4J#5oZ5PohPlm;6asY5Dxc&RMK!xM7R3o@cZ6HsVTT`3*1!<3b7*__ZS#Nnrc zsas@*u9ZEMF^UmU;uJ)^WUPoPu|io`TJAY^+OgJ?b^7k^ySwl1>3T_j_#7jQ{z?eG z#l^*3E|<^eOQlk!QmIy}wOXy&Z0_&x9~>MU9Ub-i{qcBwc6N4tetvm*$#QP|W&iOU zha^N;2CIpZ7nm*RRG0`whZCAcN-NOPuQA%AZ;KGd$h$x3@kjN0Kyjdp zHWgk85mkp8la&=2sgL;hZ>*cCkX90+Q?BrCk}C` zU;4WVH3BsW%4%ffkaR<_Y=q4zPS@GA^MXr!TWve$Ji@+1HUjO<3pQ=h16&z!OMMP~ zt;@|5&2Z%eDt!5&`HpgHO-d}oHc{8qMUPnb`QC5pJL>6OPJR)3pnm>2%+4hw~>VR@&)FZb)lc9|t&!md+Q-`!|b-2t&iX7^Krw$zx3R~N- z%nbAwx`^mzcDNS{(Cwwt%JQqL*a}C56tld5Ax4tZTW}r8L_?0- zHN(T?S`CRISGN-#W7k%avpykUc8rH)Eh@@d!qE!BCQt&9Y}jZ${Idvnv2tJo`!0I) EAGvj6}9 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/large/new.gif b/data/images/toolbar/default/large/new.gif new file mode 100644 index 0000000000000000000000000000000000000000..7bac4e04251ba388aa592b675a4b0b1b4342b08c GIT binary patch literal 546 zcmZ?wbhEHbRA5kGSjqqb`uh4778V{J9w8wisi~<|Z&6ieXXmv3 z*12=%E?qcn@3NMitEQ}3vu4NU)w_3XJGipr@VZHdH_be{W9jkzTTUF@{^azs7gu+j zIC0|AnFBYkoxOeQ#_KyrAKktB?!l?okFI@qbpGS>8&4iT`ttVi_fN0>{rmTyVxahw zg^`iLoSSuI=l zyK*VD-GR#()%T|De!s#oYu&ow_vI`}HKhp+c`RzpC8b5}DXcQ`-L*k|{Yk7W9^O*} zrq9rnml5XUW@DM>ykKFPj1V8&DyKCw3gjgvcsAQ_?blFOl#}J#v#&zqfbt=MW4YT- zsw*qYoy|U;a`L3wWrb_;Oy~1&T~t+7xp!{=E%j$FUS>aRf200ZMM>#H{Jtk&)t-O1 z$@%fj^`3-?=8c)f)A^6IvG3tg^Wj)CZ+A7Xyqn1K4@&!ZmCQ1F#M@*xw5q(b6wwq? z^6Yvl@hEzyV>8?I2Nqwl%k!Q&u+1_R&FML2y!8B3vs@*Ks!Pcp(>!z49*8=qdrfs% q?6q_j_u7cD6rL@=5~{VK4JDXN2?q{6py2?TCN>lbNj1f=rW|V6#7&^_K$FJU+d^cm ziUc zV1&^h3xXAku`4T&gnO=U!tAfo+`n>IdjEju)45!>P{@noo3*v-`ue+#jSrifAEo+Z zX(umzc`Y4@jmCDf`T6MR@c8)q$;pq?)6;glO&I&u_+K?eAq$!y80m>Ll30zG&WU6n zNXZm2KsfDU57){te8f1?lT#(g7-GC6pJIgi@y=e$K?>K)@78J;JGI@T4&mFlV$B(q zvH|5X-f01xq;IufIg!LISsM&0^(&Y8YgF)#U7FJMNmqEerD?(B!|E}@C@)2;B{417 zlY2mS7L+VqYkjHqHyN`pWa@^ZiPE`)dyKJ5)BEGZ?C|ms_lk|=*$B^kWh1mNwELU8 zh^)f0S(RhV4{uZb=NGpL1jiItc@0TTWvI z50J|@t2mE|j?kLBBP8EttT+M)%%ap$&#o89X|O8Wat&4-Fa!8rL*Y!zEqX%-UJu}q zZx|*fT2R=y&%J250KB#D{IunGie+=P$fUZqv*k3_Aso-jb^{p!E}Xhl!~ww`6zmsL bSZ~v(u!6^N&;QPD{M-klyaM^bq|uH4%3xjk literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/large/pause.gif b/data/images/toolbar/default/large/pause.gif new file mode 100644 index 0000000000000000000000000000000000000000..8c3d83a7544e9af09da5ec40314efb6f53c3c482 GIT binary patch literal 929 zcmchVze>YU7{$Na=7NJ@q!;PX;kIP#P(dWY4!H$eqF|FZs7}(&JV7G(hk{z9Z&2t9 zwC|ub)Wx+^x;PgXm*Bl^k_!?<7eoHQ$NA1V_eWY*Q#Vd2Q20;*Ayg<7DwT?17?x!@ zj??XSUDxgPdV|4WG#X7NlOPD@^LZGCQ53-+ukxpY5U5ZUdmO{67hli#qOe+XVM{#_O6?(z z@Z)Cv`b;R%bWv>~9+5yNv64rKZW1~cN?wLXxTGW7iZZKHXzj7LvWgF4cl0}#K%}6X z{JyNq%aP*jv4nx;&h=xikVMe6U&6?wO7ZD}a6wAZvk7K`I&%mYq;pmLWjO#QzK{@E i8_Md^C*>j?;`D@zEVJH9xO|)c+Pu6<`oaAQ4!!_he4C{J literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/large/quit.gif b/data/images/toolbar/default/large/quit.gif new file mode 100644 index 0000000000000000000000000000000000000000..1ee09f47d43098a598d79107c0f5b8cdd5d2faa8 GIT binary patch literal 1142 zcmb`GPi)gx7{KlPajg&qFAJTiqRvSyFj)?!WXOOurB-mm#v!dDQ3RTtG)Os6$rT)m zHcbgFOS{HRGnS34Qq|&UDhJS_F=-oO!VS>C0O9=+aDp^qyHpc7FbOoJ``n;S9JbTm z<>~3C?|a{SzwhhYCvv;u6ha|SX$006Ug!BYJzwsozkd6T?+)&~9N%;4-QLT|UhU}K z>hOW;v3IV&ccAt`qLw*yGn>3q82(Wi{yBf_r_$&zbLj`=iHDWq%7tR%;_R=N)YYZ) zzt=84`Qh89{{0{KmY+Y=|9pIZZFObs>FQdmWnA`uFV8aziXt=;FcKSYLa!3s8{(o2FQ|Gd2nD^44WY*aZad};d9Ab}Xi+vMzF@E| z$xu?Z1(PCb(V3j++vqEtiF9t5fZV&>(^>N? z!15nz5}}B5VQ*%$;@yBf@pLJ>rWn2)4ygrpT=a>F%HUB^wN>l#VNtzfUTU*=#K^hMuIS@+ zne(gtzo8>86Fo4mu{1moSYW5xe+^hb?e8$f*I6?{3ugpi!+Vt&Ia)j?b4gXu(PmY5ui3N43 z;PU|KxSfiP@LS;T{$_mV)ZQaO(=_kMHU>s`%BQDdr6{w}ki~$yL@i>%S z>j7pr7)wrBhtQ<_k1TvgDdsO?hAT1;$|cT!wk_EgJ<hHvR4VW?Ct*^rd3e7%qBRQ}D7w(G_ zAhH~qeBO|CHA#5PSW2`1>p`b3q&KqhY z?4cnVp(P$?ES{h*nPH~rrpp)YC|l*EmhE6t?CHXv;F1^UQ64Ve=AqEyp*qb+Yetx1 zi-+0NFta&{>Py^JmjzoaiL+RlWVbELt2y3zR)*8+4CgI5UVDqe7Uo7SDTv)zmbARa z=SWHT(TaqVb<$fJ9v|HJ;M9@3r|-Rf^x*a5uRp#q3~r$KlZBCy!J9z` z7pYiEh8->BMnsI0aO7t7UX>}i^16gs6b9#Nl8grMn+!89AT1j0+4+vBg8UxEp(J*MMVTaKuS|ZQCh(XI0#rdCG}Lm3WOUN_&l9}3K%?fWcfkTP|x!4OX^E2=(u=Dc(|E?7}KmV(r!fGaQ6hc*tz_Q(oY&wKU9TZ-U|neT3V(~ow{=6%H6wnx1N|e_1MzsS60uzv1#F{ z^$QBal+9{>CI59B_)K=CIFBO`+;gAPa)$WIJx{|-d04O@LR zYb%J7unR^sAWJKbbiAA#&^ILHvNnlT%u4=iUh?Fb{o3ZP0Upkol$-f}c84%F*ph8f1j zzy-AyWTtU(rQRgCT-a(xxSUj?sdS(UrvuDKY-_G&nL>F|4+V=Gbr5Dk-1!fp6lkb) zqy{%kBX0yOL_nT@`(Z|<#uQeVW8fa-g<(#4N+^;G9+LQZD?jOk*d@X>FO|vfO)71{CleZ2;9-Z9Ua#^9gs3nW!u0_ifrvRCfhj8!J49gm zfJqD%OsgfOG=x}p3ymcdRtPU)C`4!k1*`-QF#RSp%n4Z5q4)^l z31HL#!-s)^StZG8u1_D6N)Q9wF;Lf=G8{-Kuuz)N!3?+lDlqEcNfaDfz?=d1?p6f` FYXEOz-+ll9 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/large/rules.gif b/data/images/toolbar/default/large/rules.gif new file mode 100644 index 0000000000000000000000000000000000000000..ee2abcadb92dd636320598d0341963d35caa5b01 GIT binary patch literal 929 zcmZ?wbhEHbRA5kG_#)2$1OkS>(vEQwZkf_PC31n4DqiUd{^cqG#ir4fTFLzyDU&S| zn=SL_sAVtIEn8w)4mU~VHs5J)l{NR1RR^_|4R z@S*lTdmT)ikzu+c*ccUVK?a5&P($v2XN*Z>H~=z`kztXJf-nPI{hX;VHhY7>78$S_ zkS+#xK`5KO&Oyx48|r{shUu~pae1KO>?!AspxWgpxH1D>^1b!}*p}N{cwpL7_!)tY zhq|0W+!mq?=#qdf1`G^L5SK7aclC!^abWX53xSMONibjjfU7@9KiDVi0uMgf1hOy! zx$*~6Cknxw{=HFNK;ZOekd^WeGB3i#LE*yaV88+rzmRwpCJu5s&_H%jhyc~Y#UDUy z0h96<;Nplt2iXf(j|g;-Y4Q&Wr!EG$2WmLnDE1PmEg%OV8xFR;Li(G)0a&gJfK412E)3YjQJoI67{lo>H$j{ZOM`HGVNrTi z1?WAvA@Ib=a5eJ^EJ}g0@NkiD$e03)37|MqxG)|8`$7?H7HX)&y#aE1D}yxvl64j? literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/large/save.gif b/data/images/toolbar/default/large/save.gif new file mode 100644 index 0000000000000000000000000000000000000000..92c26bb44de74e3f11a0be36af28ccdf2be5464e GIT binary patch literal 772 zcmYL{L1@!Z7{|XfO*(BXJ;=yL4h<+IRAB)N&E}zvx?%88+MVL1wU^H9psa@;<67;I zC=)73sgMdC^iU8qo?C?ORw|UTV^7Vz37)*HzW35;4jqjBvU=1yv!UY3xH46&_@(Vb}nT0S_c55G+Ck$*+e1Lc|KBq31E>r9~F^0 z?0yg5L=@)|0Poj(?$p@wgh~YZ1e*4Q%+s$^!@TxwirXLxRz>TbA4U}yn}`y)!zOVz zDUmn*J(qnPKDo|deJc$DHG2b8e7o_9dxlh5**y&XOaN}?^&##?>u;v(`%A!T>_WUx z5h}B@q$bXca805SHSO%`V$GL@sK;$0E2Uo%%bL|D)RzjoOQ^C~o~frFq8g&G-}#?- zY%%d@q@MCQT^9ReBV3ebcv#k$0zUUhK8|YJD+T+Vg@@Hw9hZe*C#ntkqOIgN5mZQe z7Q1HlC_sB$a>!rB|3B*&Q>bEU(1Ak*9bo8K&2uFit*W+C04UmJKu;L56{qLU(C}{B z3TspK0BR&iCveut>T;*CF-*~4mefc93{7s=vRbB*?eq86X1*P0K$7ozM^ALB$T9!k zFhqeT+|Xr)OTNNXJS-e2cq=ih8^cTpOZA}(EaxYbMS zO{9Pf`M>$+hsURf{_Z6}fDa3@D%AHwt#CTkR?BwtX_NvBw^E1}^!bqUG3Wd*4=6mR zo2~;w*vI%9Be-p9JFFo_xlDR$87z$ySQ7UM7cIf;N<>b$ggt6bYe%A$40GqSAY#uJ zmKY@NmU_emHG_kIBS8@fV)+KC+bNc8+#p=>UNsJcD`M#V?8PuO&J3&Ze&>Bboi;xQ zEa6K9KYm6zkkrzQx$IhN;bw){QgguW!ufOwn2%tZM23LvwQT8{-wf0BbALbR^Pm0v H8{B^ZzYn;? literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/large/undo.gif b/data/images/toolbar/default/large/undo.gif new file mode 100644 index 0000000000000000000000000000000000000000..6b637b3644735a0fb19ebd1b78a1902eb4f06de8 GIT binary patch literal 1142 zcmZ?wbhEHbRA5kG_-fC<#Kgod$Iq!G#Ahobs3IY3Aj4y!Dr%v?@1!W@s4g6#DHdxc zo}e$0X{P9=t5$3wlj$H+?W>mUpk3r-QtWA77vND5A>Za9*BYie-CJ#HkYS65Wox*} zv@o-|Nvg}d)R%;sFN-r-o@lo%%XxXW)7CVvy+vUQb7MA^`Wz_#sk)F)%PF{$ycfWUyz@0kVNUQea?U`*+~}`|rR1*6k;eY9K*_Jjgl*um;9@RDJdg z2bvx~%o1Z@_<-&RhK9EO?TBe~b_%Kskw1i!XM#C<(57?0C1r_`pAqq)5a4_v{%z z%1oynW7b+4q#4ZVAygV*K93dXCI)`C2kZ?$%C`8knRq2i^|~$oxFE-A#dSWg++8My zk8e{JoY5$i_40^)gQ1{UUHY)63(WjLpI zEoq~}jH{^(41enEAAn<^;ef-$m5g=v49l-GWtuDyO=AF>0u3$uhJ*_aKskq{?#!7E zD>;}zp#_UMc?W@j6o&os4VO1Jnk=5kh!T?g4jLLjxd#(BcRDFu%wqiU7b)i0|0!^= zHQeW4kg?TGb!zsKBnFs;KzrF01c0H&pAexV)_pW-V+DgKFqoi81t`Y>3N&!ULI_YW zgWU_!2jhKb{)cR)h6oqJ6qIzwKf%HR97|AB{=hvCbi@M-6(l)ieewq$79hEr{|6!& z0n^q)1|&JSlYp_x0Cf6~ztiAOlm7rT6k-J<&_555t$_O)QxF<;sA-xA9xUpx8m+)! F4FDR$qMHB! literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/small/autodrop.gif b/data/images/toolbar/default/small/autodrop.gif new file mode 100644 index 0000000000000000000000000000000000000000..bd4a8dfc0942b703ff1c5b742e9dd09aa3a241a3 GIT binary patch literal 377 zcmZ?wbhEHb6k`x$_^QeP1d57^J|RxQF`g00e(_ns$$81=Alb#W?s2_^46n^x3?_0 z_w4%Pqr0BGy!-6+gO_igyt;Dw-M#Cdo<98b{pe+hI5JoR E07W}EQ5| kQD8wi1IL5oj1CM(7#Wy6m=qdRuu#)WR1fEE7G|&p0A(U7`Tzg` literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/small/open.gif b/data/images/toolbar/default/small/open.gif new file mode 100644 index 0000000000000000000000000000000000000000..5903f8019916c8c42b1575a09476080c3f69ece3 GIT binary patch literal 191 zcmZ?wbhEHb6k`x$_{7El1Pc}{IDGig`+G=a1;Fc)U*y7SNAlw>38mdN5pMv)68GmEGCh?lNl5^!}a zna*;=aN&Cv0Y<}F7alQ)a5OX)os?maX<$lFSi!~A)Sw{1V8g(2;DD3>3(Fmb2Z@pq n%s@fjh6uK+4GIb#>M5CLMzl)zXEz!E@$eJ+gk z0;0J1oFi0QF`pHTb-@y7>;X##rUnKJkQi$#pUi=s3noY&uzU_Qs`bbvhI6efky1eJ zoMJtN8-ASUTCeyqf{oH!Q07&@$94rM29h;c0^|b4xEjD*hONO2C43+yK<5wDMSO(Cr|F| z-@hNE4h$6k@ds1}=jSLC=jUXWBxV++GARCJVPs(7VbB3702#}`k~HC@=jy!{uh0Hw zO^_%%kTfrWeUAE$)-{}Y3`|G3GddL}F{m*nFm7UCYiWAe;Gx05-GI!~nb6Aapu%8y jfvthzfx~P8zAKCyTx1(M?{KpIYmjSdZfTVkWUvMRbtXZx literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/small/redo.gif b/data/images/toolbar/default/small/redo.gif new file mode 100644 index 0000000000000000000000000000000000000000..b0f1f03ee63c598a488df921a70408a7c37278d7 GIT binary patch literal 167 zcmZ?wbhEHb6k`x$_{7Qp0uBre4Gati7#RLD?BBm1C;$YC|M&wcgY$C~it}?aOA<4S zQW+F~vM@3*urla?q{uN$W_WPIg5`n1gT~C1a}DlkmrrbveEwZY MdHwD8-&q)}0n7<80{{R3 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/small/restart.gif b/data/images/toolbar/default/small/restart.gif new file mode 100644 index 0000000000000000000000000000000000000000..9350c8bd3e9be726f1fbc9e41649b8436b058f1e GIT binary patch literal 192 zcmZ?wbhEHb6k`x$_{7Qp0u2le4Gnkh-1-0i|Ni~^!9om*|M&wcgY$C~it}?aOA<4S zQW+F~vM@3*urla?RDiTIFc(Gay7SLK&tWy|CWb@R>`g2cDh3>a4pm|-6$iZ-1TL^P z@;ETG|KGvK!1UsQ4I_~HzyhWou!MnlaLR^}AH=f(t7NE`VPH`>T*@H8V8kc~B2^d! P#Ct_0Crq5c$zTltHsCW6 literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/small/rules.gif b/data/images/toolbar/default/small/rules.gif new file mode 100644 index 0000000000000000000000000000000000000000..84cc5cbdeb1022908b11fc8c13618347882902bd GIT binary patch literal 227 zcmZ?wbhEHb6k`x$_{7ct1`P}iKma2C|7ZCB|Ns8|`xXE32UG^<=O`5C=VX>7W)`I~ zDE?$&WME)t&;jWIX=h-bTCwZSzvCw|6DGH}$aZXLFBFK86ktn{xf8I5*Y)r|m3@kisQOvB&Q4G9nENWJ23@rR=K&~nSg8)mb41)p-OVoT81@7hZ P=PzHgY4a9#P6lfL_(DfB literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/small/save.gif b/data/images/toolbar/default/small/save.gif new file mode 100644 index 0000000000000000000000000000000000000000..8707b7499f1a046261ffe0604c083ab8322141b9 GIT binary patch literal 276 zcmZ?wbhEHb6k`x$_{_lo1_ulb3?d>T8W+|z`((v15yeymVsrRz)8>5do5nuHvUiG0GcbnCx27^0{EDYQZ3>IKP2M!qqrUq68hLTbS z#sf?O94-oVKpX1X+B<+$TLVKIh{wRr#?CgAl?})O@z|J{S=oRP%4KI_2JygLIVJ`W Un{6kEC*Ic}bN<4`i-HW+0NtZKQ2+n{ literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/small/statistics.gif b/data/images/toolbar/default/small/statistics.gif new file mode 100644 index 0000000000000000000000000000000000000000..7db06f8aabe7b4a4dade0ea8e867be9ea69cb986 GIT binary patch literal 169 zcmZ?wbhEHb6k`x$_{huv2LJyvFznyIU-2J*KxJ@#jzV#MPG(7BW>G4G;!hSv1_ovZ z9gsSZ76zvDIsGe7+dfe0;Jd)4$Lw5D%h0Uez-BPP=YZA$hfR)3+6Np?b*^Dx)-;}w X!gZiQg*2++KflC}bf=0y1_o;Y8z?r* literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/small/undo.gif b/data/images/toolbar/default/small/undo.gif new file mode 100644 index 0000000000000000000000000000000000000000..7045f29d9cd79a66814ee669f6591d9cec54942a GIT binary patch literal 169 zcmZ?wbhEHb6k`x$_{7Qp0uBre4Gati7#RLD?BBm1C;$YC|M&wcgY$C~it}?aOA<4S zQW+F~vM@3*urla?BZD;nK}#{< literal 0 HcmV?d00001 diff --git a/data/images/tree/emptynode.gif b/data/images/tree/emptynode.gif new file mode 100644 index 0000000000000000000000000000000000000000..a086505573406b70726ad93497512508efa3e529 GIT binary patch literal 135 zcmZ?wbh9u|6ky5F;5JbHe OWr%sPDrznRgEasKHYh{@ literal 0 HcmV?d00001 diff --git a/data/images/tree/openfolder.gif b/data/images/tree/openfolder.gif new file mode 100644 index 0000000000000000000000000000000000000000..4a3d97f04c641d9085e54312062b9aae6df28c0d GIT binary patch literal 172 zcmZ?wbhEHb6kyHeNnJl~)SlkpCHtDdqU10D{nDZ}y Hfx#L8AB73T!Vp$K|tXc3y+a;Lqfnw0TBl0R0bv z0Z6d}lMzp!!0rQ#5nKul>=GQDdl+<%i!+=NWZ-wOi#?>EvO(tUMg~R!hVvUeSQvVk MnKxLla4}c|0E|H#(EtDd literal 0 HcmV?d00001 diff --git a/data/images/wizard.gif b/data/images/wizard.gif new file mode 100644 index 0000000000000000000000000000000000000000..8c7c9d7beac92c21715a60853be551c3529a630b GIT binary patch literal 1972 zcmdT@?{8Dr8Gi3C`})WAy(z)DI1V`pt!uyoJ7ndCIPo>1w3E8Y?lLJKqUk1M6Pcp+ znz6;5vgz6v8s|sBO4*1eR+$A^0cn-1t{z%TcWtALu@Ai;HZ5vXa+#tPX{q8#(a1!E zcNib`H|#w}M~}{V&U@bHJmd5QJ#nLyjY%3mgkG*`9`@WmTSdw zt?}{iKK|rSpR9ehw)v0E#(c3c-)PjtMy=SWH5!i^w{G2fs^R~1?0C#4-uUM0d-{1NC;D!xrUt+> zb6;IRZ|8I30qJybMW!fn`Q@gC#My*<59;nVO&HMadlyM$7H*(D{$o)yk+0}>Ps1%L zrWU7Ole(76idxPv#cdV`5sC4<(8~_Vtn2*s^>CGF@hgNUW}3PqWa8R(iKg!9TYxwb1l1seFjB##+#F%&Qo56)CUnk&SFIq;8!yfLE$vfaK^0gT`o3P0y2=E(ivFA$GvdvnR`s^imH*p z^wBE6Z>2uqIVvj0-S^r`#zfDs3g8W5N3LH|D*SW7lE&S;UmtM9*0m~Wf2AaQVg)7c ziLK^qoENk#>9kZb@Z2D#oL;j&=VGh4%9h)OTA(HUTLUYsQyv#+Rl<2mCCJN{N(N4< zYPc%AaPO@W03(7ycJHWFu4gbm@RaPrWO|kr{=)7{PgQv-gzsc=OVAxXJ6er*%_%ww zGBSd;pqd+wb=D0}%*f91H+e$Q`e<)w$gX_w`Phdl!*vJNG< zxVuZu6VP(A!jIQ=e@G#{rOX7Bz;)ZQAKfNAC&M%19YhMbj9XH)q%dj^rDgYzOrpIc zGaMMqnL5?FZrHp_gk#eBr6Xk7Bij{Lt?NyGWa}3y9=DMdOBkj#)^=4SH;}D0N4O*d zTm_>yxSe4>`VQq!PuaW}{!}HK*9$b{3ASILgcFJ#ZOiUsawfiHz@A*i<3p5iRs*kG z;lH8i{vo4Rk}l$H*>+2zd&CMcS|I5SpaslDC0)!Zj|G2PriOsTqG%3j1U|!`{sX!8 zN1VcHYfXP)3mO#`jI3SMm=H4TLy)oE(MbIP5PJ=BHx!sw3BWJwO{-X(QF-HxN^D*! z*kX9wcmd!nqR17(bqqh5W<*7V3hK0)yiovd1;8hRZ`gXmok(bU`=Hg^y-hg1i7W+( z;_#n2Wdb0~%@d5RDU<9*)Z%G_a6Y5ER;_4kNSpA=)aIWx`g!@YpbuMhN@Mn*7j2^` e8}A+^^9%570Hz%>hWY=&C$lE|{+(w9==~40J!5$Q literal 0 HcmV?d00001 diff --git a/data/images/wizardcards.gif b/data/images/wizardcards.gif new file mode 100644 index 0000000000000000000000000000000000000000..489fc78bfec2f59e1506f16444dc08a085a205d3 GIT binary patch literal 1710 zcmdUt|8Emz9LGQRTv=!#cRtVU?K|X+T@py}M-cK8AuvMV1_44i;5fI_32rBZou&$eMNyO_Nd~tJVY!%- zMYk-5C6bpOmdl1(;0(YICtTTN%!Jc zi@*N#Yd&9ukdZVQA;fSKBTWoKZV*D?D?a_?-bhbZ@N!i5CmVoO@2*aB{-N!_8#c#A2@hu@bHU6eI@>eH6Ec*u)^3Fv*M+r!P3$Ok4F%y zD#pjHD^o*~zriE8gqEfgW7ZY#z1Y~WcGaqi`udiN4?#FJSlZb5c2i4J%WW-HRpVBn z=+lEmjo!7#s#@w>>Z?vLLc!vIU#j!C1XqhmIZjxuE35TpO9k6+Klb4D=x4@u+e22- z?pug|Jb07fleIDf;nIp%H;%R)rw`w}%C{~mT@55@*ik(HjDp$&CHtn-D|&+Fj}_Eh z>QS=bGcK4P;lh z8otArjF+k(?VHWc9-tYJWv#rmmpqV945Nl}+(bERrslA@T}t1|cr~zYaSvn4DFJ0!=}motHb5gS z$nsT6xE10CVkP|G?via~Pvz34;`_wK< z*no%6+7lh3MNm?z!muH1JibMrpLJ|;YnUtVD4;FYRLVxLhce2vmy9y;JY+421+Wyb zJ8^bmVb|seNA-%?2|1-u@XB=ctgRVGIj(m>`_jhllxiKDaw$507^s|cVxTT>s$~GW zbgOb+2Zr?`Lp=BHj@gMiU#e9ozVCH|pmIy<+8jTs0j%E%N};l#>E-9%fYTHH_lL8{ z-`Q~ut+R*ke}EId-l8}UXw z#RdtnKmr7tvO)q0B*X%V6$=(D5iIxwdcjn&F9nCp_ zh<=HQ;P^WVP|!$Akw{^t5P>F%k#O$svkSv87#SIX*=)w);UTS+h_$sf_I%)nadN582t-u-R+5TThlfKdmE!dD6!G!#I6gkc!NCD`c6N}LmxrRFA}lQ}p}M*n z^Yim)Y;45D!~{A!J8^b)hUDaA9334&uh%0ZBLf>78z?O;h1>1M;NT$I+S(8q8Ht#f z7$_79s8lNK@9!feB?Xz8nOIp_L4JNdEEWqE7Z))%H;1XIDR?{{jE#-K>-D0xwiW{e z1L*GVMn^{nT3T9getr&-NCdH1jEIN`NF)+OM@K^@lOZ-X7Q4HMHE_VzZ^YBe+( z4N_B6vA(_zolb|<)m0b_2BfE_BP%NlMxzlqIXTG9&Bg5OET*TYVKSL8IXQ`ff&z?> zkE5`#5Tm1`C@wC>@bECKRx5^vhG4hbQBqQZ{{DXS^z^{taG|$XX z<(;}leOU1MJvJaNj?u+-Ro?5nvf@)?qJ`~O?6e|3vM`SwaEcx9c$M^NsXWMOd}?>W zqavmBhD<<1g^J}#nerDap727d2_+=;g>b*iZE}Z1U+9>c+NnTs7#{ra(r~Mq_yx+F z2{F}LqU`H3GpQy8r?R<($5dh@k|G0D;55fm2dA{ZvC75yogWGL^rF z&2+9WU%fTfKP2^C->pppr}_asOl5a#YioC9LISCqy+2NBraH?)>j;rVZG+@%_YN6i9GAXX#J*?_lpHIWno$5K;}jhPxK8q*T&53VMZXMEp!W zkE2%5cUTjti4tt<7Q$Iw_2%0*RdqrhKj(0|1Rw4GJ3zgkVMfFZb132CQpPZsYKD2Q qW 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -138,7 +138,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -163,7 +163,7 @@ 50 True - 0% + False False GTK_JUSTIFY_LEFT @@ -188,7 +188,7 @@ 50 True - 0% + False False GTK_JUSTIFY_LEFT @@ -213,7 +213,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -391,7 +391,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -416,7 +416,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -441,7 +441,7 @@ 50 True - 0% + False False GTK_JUSTIFY_LEFT @@ -466,7 +466,7 @@ 50 True - 0% + False False GTK_JUSTIFY_LEFT @@ -491,7 +491,7 @@ 50 True - 0 + False False GTK_JUSTIFY_LEFT @@ -738,7 +738,7 @@ True - 0:00 + False False GTK_JUSTIFY_LEFT @@ -762,7 +762,7 @@ True - 0:00 + False False GTK_JUSTIFY_LEFT @@ -786,7 +786,7 @@ True - 0:00 + False False GTK_JUSTIFY_LEFT @@ -834,7 +834,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -858,7 +858,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -882,7 +882,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -930,7 +930,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -954,7 +954,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -978,7 +978,7 @@ True - 0 + False False GTK_JUSTIFY_LEFT @@ -1492,14 +1492,14 @@ Set timeouts GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER_ON_PARENT True True False True False False - GDK_WINDOW_TYPE_HINT_NORMAL + GDK_WINDOW_TYPE_HINT_DIALOG GDK_GRAVITY_NORTH_WEST True @@ -1985,7 +1985,7 @@ Set colors GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE + GTK_WIN_POS_CENTER_ON_PARENT True True False @@ -2043,6 +2043,7 @@ + 4 True 8 3 @@ -2256,214 +2257,6 @@ - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 0 - 1 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 1 - 2 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 2 - 3 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 3 - 4 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 5 - 6 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 4 - 5 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 6 - 7 - 4 - 4 - fill - - - - - - - True - #000000 - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 1 - 2 - 7 - 8 - 4 - 4 - fill - - - - True @@ -3079,6 +2872,1244 @@ + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 2 + 3 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 3 + 4 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 4 + 5 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 5 + 6 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 6 + 7 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 7 + 8 + fill + fill + + + + + + True + True + False + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + + + 1 + 2 + 0 + 1 + fill + fill + + + + + 0 + True + True + + + + + + + + Set font + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 4 + True + 7 + 3 + False + 0 + 0 + + + + True + HTML: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + 4 + 4 + fill + + + + + + + True + Small: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + 4 + 4 + fill + + + + + + + True + Fixed: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 2 + 3 + 4 + 4 + fill + + + + + + + True + Tableau default: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + 4 + 4 + fill + + + + + + + True + Tableau fixed: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + 4 + 4 + fill + + + + + + + True + Tableau small: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 6 + 7 + 4 + 4 + fill + + + + + + + True + Tableau large: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 5 + 6 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 0 + 1 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 1 + 2 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 2 + 3 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 3 + 4 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 4 + 5 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 5 + 6 + 4 + 4 + fill + + + + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 4 + 0 + + + 1 + 2 + 6 + 7 + 4 + 4 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 1 + 2 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 2 + 3 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 3 + 4 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 4 + 5 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 5 + 6 + fill + + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-select-font + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Change... + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 2 + 3 + 6 + 7 + fill + + + 0 diff --git a/data/pysolfc.gladep b/data/pysolfc.gladep new file mode 100644 index 00000000..70c22541 --- /dev/null +++ b/data/pysolfc.gladep @@ -0,0 +1,10 @@ + + + + + PySolFC + pysol + FALSE + TRUE + glade-translations + diff --git a/po/games.pot b/po/games.pot index d8839805..cbc25b17 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri Aug 11 02:15:03 2006\n" +"POT-Creation-Date: Tue Aug 22 21:32:47 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -48,6 +48,9 @@ msgstr "" msgid "Abacus" msgstr "" +msgid "Accordion" +msgstr "" + msgid "Aces High" msgstr "" @@ -123,6 +126,9 @@ msgstr "" msgid "Another Round" msgstr "" +msgid "Apophis" +msgstr "" + msgid "Appachan's Waterfall" msgstr "" @@ -204,6 +210,9 @@ msgstr "" msgid "Balarama" msgstr "" +msgid "Baroness" +msgstr "" + msgid "Bastille Day" msgstr "" @@ -462,6 +471,9 @@ msgstr "" msgid "Castle of Indolence" msgstr "" +msgid "Castles End" +msgstr "" + msgid "Castles in Spain" msgstr "" @@ -495,6 +507,9 @@ msgstr "" msgid "Chelicera" msgstr "" +msgid "Cheops" +msgstr "" + msgid "Chequers" msgstr "" @@ -570,6 +585,9 @@ msgstr "" msgid "Corkscrew" msgstr "" +msgid "Corner Card" +msgstr "" + msgid "Corner Suite" msgstr "" @@ -801,6 +819,9 @@ msgstr "" msgid "Doublets" msgstr "" +msgid "Doublets II" +msgstr "" + msgid "Dover" msgstr "" @@ -870,6 +891,9 @@ msgstr "" msgid "Eight Times Eight" msgstr "" +msgid "Eight by Eight" +msgstr "" + msgid "Elba" msgstr "" @@ -984,6 +1008,9 @@ msgstr "" msgid "Five Aces" msgstr "" +msgid "Five Piles" +msgstr "" + msgid "Five Pyramids" msgstr "" @@ -1335,6 +1362,9 @@ msgstr "" msgid "Idle Aces" msgstr "" +msgid "Idle Year" +msgstr "" + msgid "IloveU" msgstr "" @@ -1557,6 +1587,9 @@ msgstr "" msgid "Labyrinth" msgstr "" +msgid "Ladies Battle" +msgstr "" + msgid "Lady Betty" msgstr "" @@ -2277,6 +2310,9 @@ msgstr "" msgid "Mesh" msgstr "" +msgid "Methuselah" +msgstr "" + msgid "Midnight Oil" msgstr "" @@ -2601,6 +2637,9 @@ msgstr "" msgid "Phantom Blockade" msgstr "" +msgid "Pharaohs" +msgstr "" + msgid "Phoenix" msgstr "" @@ -2934,6 +2973,9 @@ msgstr "" msgid "Senate +" msgstr "" +msgid "Senior Wrangler" +msgstr "" + msgid "Serpent" msgstr "" @@ -3204,6 +3246,9 @@ msgstr "" msgid "Streets and Alleys" msgstr "" +msgid "Striptease" +msgstr "" + msgid "Stronghold" msgstr "" @@ -3363,12 +3408,18 @@ msgstr "" msgid "Tomb" msgstr "" +msgid "Toni" +msgstr "" + msgid "Totally Random-Made" msgstr "" msgid "Tournament" msgstr "" +msgid "Tower of Babel" +msgstr "" + msgid "Tower of Hanoy" msgstr "" @@ -3483,6 +3534,9 @@ msgstr "" msgid "Vamana" msgstr "" +msgid "Vanishing Cross" +msgstr "" + msgid "Varaha" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index ce48a38a..d04f0a27 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -1,11 +1,20 @@ +# #-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-# # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR ORGANIZATION # FIRST AUTHOR , YEAR. # +# #-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-# +# 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 "" +"#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Fri Aug 11 02:14:56 2006\n" +"POT-Creation-Date: Tue Aug 22 21:33:40 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -13,48 +22,55 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" "Generated-By: pygettext.py 1.5\n" +"#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2006-08-22 21:33+0400\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" - -#: pysollib/actions.py:360 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:358 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "" -#: pysollib/actions.py:373 pysollib/tk/menubar.py:699 -#: pysollib/tk/menubar.py:713 +#: pysollib/actions.py:371 pysollib/tk/menubar.py:704 +#: pysollib/tk/menubar.py:718 msgid "Select game" msgstr "" -#: pysollib/actions.py:396 +#: pysollib/actions.py:388 msgid "Invalid game number" msgstr "" -#: pysollib/actions.py:397 -msgid "" -"Invalid game number\n" +#: pysollib/actions.py:389 +msgid "Invalid game number\n" msgstr "" -#: pysollib/actions.py:414 +#: pysollib/actions.py:406 msgid "Select next game number" msgstr "" -#: pysollib/actions.py:423 pysollib/actions.py:433 +#: pysollib/actions.py:415 pysollib/actions.py:425 msgid "Select new game number" msgstr "" -#: pysollib/actions.py:424 +#: pysollib/actions.py:416 msgid "" "\n" "\n" "Enter new game number" msgstr "" -#: pysollib/actions.py:425 +#: pysollib/actions.py:417 msgid "&Next number" msgstr "" -#: pysollib/actions.py:425 pysollib/app.py:1143 pysollib/app.py:1155 -#: pysollib/game.py:904 pysollib/game.py:1828 pysollib/main.py:439 -#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:132 +#: pysollib/actions.py:417 pysollib/app.py:1150 pysollib/app.py:1162 +#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:439 +#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -70,12 +86,12 @@ msgstr "" msgid "&OK" msgstr "" -#: pysollib/actions.py:425 pysollib/app.py:1155 pysollib/game.py:904 -#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 -#: pysollib/game.py:1318 pysollib/tk/colorsdialog.py:132 +#: pysollib/actions.py:417 pysollib/app.py:1162 pysollib/game.py:925 +#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 +#: pysollib/game.py:1339 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 -#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:894 -#: pysollib/tk/menubar.py:896 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1000 +#: pysollib/tk/menubar.py:1002 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:170 @@ -83,128 +99,128 @@ msgstr "" msgid "&Cancel" msgstr "" -#: pysollib/actions.py:441 +#: pysollib/actions.py:433 msgid "Select random game" msgstr "" -#: pysollib/actions.py:477 +#: pysollib/actions.py:469 msgid "Select next game" msgstr "" -#: pysollib/actions.py:510 pysollib/tk/toolbar.py:211 +#: pysollib/actions.py:502 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "" -#: pysollib/actions.py:560 +#: pysollib/actions.py:552 msgid "Clear bookmarks" msgstr "" -#: pysollib/actions.py:561 +#: pysollib/actions.py:553 msgid "Clear all bookmarks ?" msgstr "" -#: pysollib/actions.py:571 +#: pysollib/actions.py:563 msgid "Restart game" msgstr "" -#: pysollib/actions.py:572 +#: pysollib/actions.py:564 msgid "Restart this game ?" msgstr "" -#: pysollib/actions.py:613 +#: pysollib/actions.py:605 msgid "" "Comments for %s:\n" "\n" msgstr "" -#: pysollib/actions.py:615 +#: pysollib/actions.py:607 msgid "Comments for " msgstr "" -#: pysollib/actions.py:633 pysollib/actions.py:669 +#: pysollib/actions.py:625 pysollib/actions.py:661 msgid "Error while writing to file" msgstr "" -#: pysollib/actions.py:636 pysollib/actions.py:672 +#: pysollib/actions.py:628 pysollib/actions.py:664 msgid " Info" msgstr "" -#: pysollib/actions.py:637 +#: pysollib/actions.py:629 msgid "" "Comments were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:654 +#: pysollib/actions.py:646 msgid "Demo statistics" msgstr "" -#: pysollib/actions.py:657 +#: pysollib/actions.py:649 msgid "Your statistics" msgstr "" -#: pysollib/actions.py:673 +#: pysollib/actions.py:665 msgid "" " were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:687 +#: pysollib/actions.py:679 msgid " Demo" msgstr "" -#: pysollib/actions.py:687 +#: pysollib/actions.py:679 msgid " Demo " msgstr "" -#: pysollib/actions.py:690 pysollib/actions.py:708 +#: pysollib/actions.py:682 pysollib/actions.py:700 msgid " for " msgstr "" -#: pysollib/actions.py:696 pysollib/actions.py:715 +#: pysollib/actions.py:688 pysollib/actions.py:707 msgid "Statistics for " msgstr "" -#: pysollib/actions.py:699 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:691 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "" -#: pysollib/actions.py:702 +#: pysollib/actions.py:694 msgid "Full log" msgstr "" -#: pysollib/actions.py:705 +#: pysollib/actions.py:697 msgid "Session log" msgstr "" -#: pysollib/actions.py:711 +#: pysollib/actions.py:703 msgid "Game Info" msgstr "" -#: pysollib/actions.py:720 +#: pysollib/actions.py:712 msgid "Full log for " msgstr "" -#: pysollib/actions.py:725 +#: pysollib/actions.py:717 msgid "Session log for " msgstr "" -#: pysollib/actions.py:730 +#: pysollib/actions.py:722 msgid "Reset all statistics" msgstr "" -#: pysollib/actions.py:731 +#: pysollib/actions.py:723 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" msgstr "" -#: pysollib/actions.py:737 +#: pysollib/actions.py:729 msgid "Reset game statistics" msgstr "" -#: pysollib/actions.py:738 +#: pysollib/actions.py:730 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -212,51 +228,51 @@ msgid "" "%s ?" msgstr "" -#: pysollib/actions.py:794 +#: pysollib/actions.py:785 msgid "Play demo" msgstr "" -#: pysollib/actions.py:805 +#: pysollib/actions.py:796 msgid "Set player options" msgstr "" -#: pysollib/actions.py:906 +#: pysollib/actions.py:810 msgid "Sound settings" msgstr "" -#: pysollib/actions.py:927 +#: pysollib/actions.py:819 msgid "Set colors" msgstr "" -#: pysollib/actions.py:946 +#: pysollib/actions.py:839 msgid "Set fonts" msgstr "" -#: pysollib/actions.py:955 +#: pysollib/actions.py:848 msgid "Set timeouts" msgstr "" -#: pysollib/app.py:87 +#: pysollib/app.py:86 msgid "Unknown" msgstr "" -#: pysollib/app.py:1005 +#: pysollib/app.py:1012 msgid "Loading %s %s..." msgstr "" -#: pysollib/app.py:1040 +#: pysollib/app.py:1047 msgid " load error" msgstr "" -#: pysollib/app.py:1041 +#: pysollib/app.py:1048 msgid "Error while loading " msgstr "" -#: pysollib/app.py:1135 +#: pysollib/app.py:1142 msgid "Incompatible " msgstr "" -#: pysollib/app.py:1137 +#: pysollib/app.py:1144 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -265,58 +281,57 @@ msgid "" "Please select a %s type %s.\n" msgstr "" -#: pysollib/app.py:1153 +#: pysollib/app.py:1160 msgid "Please select a %s type %s" msgstr "" -#: pysollib/game.py:823 pysollib/game.py:829 -msgid "" -"Player\n" +#: pysollib/game.py:844 pysollib/game.py:850 +msgid "Player\n" msgstr "" -#: pysollib/game.py:900 +#: pysollib/game.py:921 msgid "Discard current game ?" msgstr "" -#: pysollib/game.py:1244 +#: pysollib/game.py:1265 msgid "" "\n" "You have reached\n" "#%d in the %s of playing time" msgstr "" -#: pysollib/game.py:1247 +#: pysollib/game.py:1268 msgid "" "\n" "and #%d in the %s of moves" msgstr "" -#: pysollib/game.py:1249 +#: pysollib/game.py:1270 msgid "" "\n" "You have reached\n" "#%d in the %s of moves" msgstr "" -#: pysollib/game.py:1252 +#: pysollib/game.py:1273 msgid "" "\n" "and #%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1254 +#: pysollib/game.py:1275 msgid "" "\n" "You have reached\n" "#%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1281 pysollib/game.py:1297 +#: pysollib/game.py:1302 pysollib/game.py:1318 #: pysollib/tk/soundoptionsdialog.py:100 msgid "Game won" msgstr "" -#: pysollib/game.py:1282 +#: pysollib/game.py:1303 msgid "" "\n" "Congratulations, this\n" @@ -327,12 +342,12 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 -#: pysollib/game.py:1318 pysollib/tk/menubar.py:257 +#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 +#: pysollib/game.py:1339 pysollib/tk/menubar.py:256 msgid "&New game" msgstr "" -#: pysollib/game.py:1298 +#: pysollib/game.py:1319 msgid "" "\n" "Congratulations, you did it !\n" @@ -342,100 +357,100 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1310 pysollib/game.py:1316 +#: pysollib/game.py:1331 pysollib/game.py:1337 #: pysollib/tk/soundoptionsdialog.py:98 msgid "Game finished" msgstr "" -#: pysollib/game.py:1311 pysollib/game.py:1829 +#: pysollib/game.py:1332 pysollib/game.py:1862 msgid "" "\n" "Game finished\n" msgstr "" -#: pysollib/game.py:1317 +#: pysollib/game.py:1338 msgid "" "\n" "Game finished, but not without my help...\n" msgstr "" -#: pysollib/game.py:1318 +#: pysollib/game.py:1339 msgid "&Restart" msgstr "" -#: pysollib/game.py:1720 +#: pysollib/game.py:1753 msgid "Score %6d" msgstr "" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Cool" msgstr "" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Great" msgstr "" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Wow" msgstr "" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Yeah" msgstr "" -#: pysollib/game.py:1820 pysollib/game.py:1832 pysollib/game.py:1845 +#: pysollib/game.py:1853 pysollib/game.py:1865 pysollib/game.py:1878 msgid " Autopilot" msgstr "" -#: pysollib/game.py:1821 +#: pysollib/game.py:1854 msgid "" "\n" "Game solved in %d moves.\n" msgstr "" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&Hmm" msgstr "" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&Oh well" msgstr "" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&That's life" msgstr "" -#: pysollib/game.py:1846 +#: pysollib/game.py:1879 msgid "" "\n" "This won't come out...\n" msgstr "" -#: pysollib/game.py:2264 +#: pysollib/game.py:2298 msgid "Set bookmark" msgstr "" -#: pysollib/game.py:2265 +#: pysollib/game.py:2299 msgid "Replace existing bookmark %d ?" msgstr "" -#: pysollib/game.py:2287 +#: pysollib/game.py:2321 msgid "Goto bookmark" msgstr "" -#: pysollib/game.py:2288 +#: pysollib/game.py:2322 msgid "Goto bookmark %d ?" msgstr "" -#: pysollib/game.py:2319 +#: pysollib/game.py:2353 msgid "Open game" msgstr "" -#: pysollib/game.py:2330 pysollib/game.py:2339 pysollib/game.py:2344 +#: pysollib/game.py:2364 pysollib/game.py:2373 pysollib/game.py:2378 msgid "Load game error" msgstr "" -#: pysollib/game.py:2331 +#: pysollib/game.py:2365 msgid "" "Error while loading game.\n" "\n" @@ -443,22 +458,22 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2340 +#: pysollib/game.py:2374 msgid "Error while loading game" msgstr "" -#: pysollib/game.py:2345 +#: pysollib/game.py:2379 msgid "" "Internal error while loading game.\n" "\n" "Please report this bug." msgstr "" -#: pysollib/game.py:2370 +#: pysollib/game.py:2404 msgid "Save game error" msgstr "" -#: pysollib/game.py:2371 +#: pysollib/game.py:2405 msgid "Error while saving game" msgstr "" @@ -699,12 +714,12 @@ msgid "" msgstr "" #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1304 pysollib/util.py:81 +#: pysollib/stack.py:1326 pysollib/util.py:80 msgid "King" msgstr "" #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1303 pysollib/util.py:81 +#: pysollib/stack.py:1325 pysollib/util.py:80 msgid "Queen" msgstr "" @@ -721,11 +736,11 @@ msgid "X" msgstr "" #: pysollib/games/golf.py:114 pysollib/games/golf.py:300 -#: pysollib/stack.py:1915 +#: pysollib/stack.py:1980 msgid "Tableau. No building." msgstr "" -#: pysollib/games/golf.py:385 pysollib/stack.py:1848 +#: pysollib/games/golf.py:385 pysollib/stack.py:1913 msgid "Foundation. Build up regardless of suit." msgstr "" @@ -733,11 +748,11 @@ msgstr "" msgid "Balance $%d" msgstr "" -#: pysollib/games/klondike.py:419 +#: pysollib/games/klondike.py:439 msgid "Reserve. Only Kings are acceptable." msgstr "" -#: pysollib/games/larasgame.py:163 pysollib/stack.py:1525 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1542 msgid "Round %d" msgstr "" @@ -840,7 +855,7 @@ msgstr "" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1305 pysollib/util.py:80 +#: pysollib/stack.py:1327 pysollib/util.py:79 msgid "Ace" msgstr "" @@ -860,7 +875,7 @@ msgstr "" msgid "\tThis game: " msgstr "" -#: pysollib/games/tournament.py:245 +#: pysollib/games/tournament.py:226 msgid "Reserve. Build down by suit." msgstr "" @@ -1111,15 +1126,21 @@ msgid "Tan" msgstr "" #: pysollib/games/yukon.py:139 -msgid "Tableau. Build down in any suit but the same, can move any face-up cards regardless of sequence." +msgid "" +"Tableau. Build down in any suit but the same, can move any face-up cards " +"regardless of sequence." msgstr "" #: pysollib/games/yukon.py:198 -msgid "Tableau. Build up or down by suit, can move any face-up cards regardless of sequence." +msgid "" +"Tableau. Build up or down by suit, can move any face-up cards regardless of " +"sequence." msgstr "" #: pysollib/games/yukon.py:215 -msgid "Tableau. Build up or down by alternate color, can move any face-up cards regardless of sequence." +msgid "" +"Tableau. Build up or down by alternate color, can move any face-up cards " +"regardless of sequence." msgstr "" #: pysollib/games/yukon.py:317 @@ -1131,42 +1152,42 @@ msgid "" msgstr "" #: pysollib/games/yukon.py:639 -msgid "Tableau. Build down regardless of suit, can move any face-up cards regardless of sequence." +msgid "" +"Tableau. Build down regardless of suit, can move any face-up cards " +"regardless of sequence." msgstr "" -#: pysollib/help.py:64 -msgid "" -"A Python Solitaire Game Collection\n" +#: pysollib/help.py:63 +msgid "A Python Solitaire Game Collection\n" +msgstr "" + +#: pysollib/help.py:65 +msgid "A World Domination Project\n" msgstr "" #: pysollib/help.py:66 -msgid "" -"A World Domination Project\n" -msgstr "" - -#: pysollib/help.py:67 msgid "&Credits..." msgstr "" -#: pysollib/help.py:67 +#: pysollib/help.py:66 msgid "&Nice" msgstr "" -#: pysollib/help.py:69 +#: pysollib/help.py:68 msgid "&Enjoy" msgstr "" -#: pysollib/help.py:71 +#: pysollib/help.py:70 msgid "" "Version %s\n" "\n" msgstr "" -#: pysollib/help.py:72 +#: pysollib/help.py:71 msgid "About " msgstr "" -#: pysollib/help.py:73 +#: pysollib/help.py:72 msgid "" "PySol Fan Club edition\n" "%s%s\n" @@ -1183,11 +1204,11 @@ msgid "" "%s" msgstr "" -#: pysollib/help.py:102 +#: pysollib/help.py:101 msgid "Credits" msgstr "" -#: pysollib/help.py:103 +#: pysollib/help.py:102 msgid "" " credits go to:\n" "\n" @@ -1202,24 +1223,23 @@ msgid "" "for making this program possible" msgstr "" -#: pysollib/help.py:138 +#: pysollib/help.py:137 msgid " HTML Problem" msgstr "" -#: pysollib/help.py:139 -msgid "" -"Cannot find help document\n" +#: pysollib/help.py:138 +msgid "Cannot find help document\n" msgstr "" -#: pysollib/help.py:152 +#: pysollib/help.py:151 msgid " Help" msgstr "" -#: pysollib/main.py:68 pysollib/main.py:348 +#: pysollib/main.py:66 pysollib/main.py:348 msgid " installation error" msgstr "" -#: pysollib/main.py:69 +#: pysollib/main.py:67 msgid "" "No %ss were found !!!\n" "\n" @@ -1229,17 +1249,17 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:76 pysollib/main.py:356 pysollib/tk/menubar.py:276 +#: pysollib/main.py:74 pysollib/main.py:356 pysollib/tk/menubar.py:275 msgid "&Quit" msgstr "" -#: pysollib/main.py:98 +#: pysollib/main.py:96 msgid "" "%s: %s\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:135 +#: pysollib/main.py:133 msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" @@ -1253,13 +1273,13 @@ msgid "" " FILE - file name of a saved game\n" msgstr "" -#: pysollib/main.py:149 +#: pysollib/main.py:147 msgid "" "%s: too many files\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:153 +#: pysollib/main.py:151 msgid "" "%s: invalid file name\n" "try %s --help for more information" @@ -1298,469 +1318,486 @@ msgstr "" msgid "Welcome to " msgstr "" -#: pysollib/resource.py:243 +#: pysollib/resource.py:242 msgid "French type (52 cards)" msgstr "" -#: pysollib/resource.py:244 +#: pysollib/resource.py:243 msgid "Hanafuda type (48 cards)" msgstr "" -#: pysollib/resource.py:245 +#: pysollib/resource.py:244 msgid "Tarock type (78 cards)" msgstr "" -#: pysollib/resource.py:246 +#: pysollib/resource.py:245 msgid "Mahjongg type (42 tiles)" msgstr "" -#: pysollib/resource.py:247 +#: pysollib/resource.py:246 msgid "Hex A Deck type (68 cards)" msgstr "" -#: pysollib/resource.py:248 +#: pysollib/resource.py:247 msgid "Mughal Ganjifa type (96 cards)" msgstr "" -#: pysollib/resource.py:249 +#: pysollib/resource.py:248 msgid "Navagraha Ganjifa type (108 cards)" msgstr "" -#: pysollib/resource.py:250 +#: pysollib/resource.py:249 msgid "Dashavatara Ganjifa type (120 cards)" msgstr "" -#: pysollib/resource.py:251 +#: pysollib/resource.py:250 msgid "Trumps only type (variable cards)" msgstr "" -#: pysollib/resource.py:255 +#: pysollib/resource.py:254 msgid "French" msgstr "" -#: pysollib/resource.py:256 pysollib/resource.py:280 +#: pysollib/resource.py:255 pysollib/resource.py:279 msgid "Hanafuda" msgstr "" -#: pysollib/resource.py:257 pysollib/resource.py:296 +#: pysollib/resource.py:256 pysollib/resource.py:295 msgid "Tarock" msgstr "" -#: pysollib/resource.py:258 pysollib/resource.py:283 +#: pysollib/resource.py:257 pysollib/resource.py:282 msgid "Mahjongg" msgstr "" -#: pysollib/resource.py:259 pysollib/resource.py:281 +#: pysollib/resource.py:258 pysollib/resource.py:280 msgid "Hex A Deck" msgstr "" -#: pysollib/resource.py:260 +#: pysollib/resource.py:259 msgid "Mughal Ganjifa" msgstr "" -#: pysollib/resource.py:261 +#: pysollib/resource.py:260 msgid "Navagraha Ganjifa" msgstr "" -#: pysollib/resource.py:262 +#: pysollib/resource.py:261 msgid "Dashavatara Ganjifa" msgstr "" -#: pysollib/resource.py:263 +#: pysollib/resource.py:262 msgid "Trumps only" msgstr "" -#: pysollib/resource.py:268 +#: pysollib/resource.py:267 msgid "Adult" msgstr "" -#: pysollib/resource.py:269 +#: pysollib/resource.py:268 msgid "Animals" msgstr "" -#: pysollib/resource.py:270 +#: pysollib/resource.py:269 msgid "Anime" msgstr "" -#: pysollib/resource.py:271 +#: pysollib/resource.py:270 msgid "Art" msgstr "" -#: pysollib/resource.py:272 +#: pysollib/resource.py:271 msgid "Cartoons" msgstr "" -#: pysollib/resource.py:273 +#: pysollib/resource.py:272 msgid "Children" msgstr "" -#: pysollib/resource.py:274 +#: pysollib/resource.py:273 msgid "Classic look" msgstr "" -#: pysollib/resource.py:275 +#: pysollib/resource.py:274 msgid "Collectors" msgstr "" -#: pysollib/resource.py:276 +#: pysollib/resource.py:275 msgid "Computers" msgstr "" -#: pysollib/resource.py:277 +#: pysollib/resource.py:276 msgid "Engines" msgstr "" -#: pysollib/resource.py:278 +#: pysollib/resource.py:277 msgid "Fantasy" msgstr "" -#: pysollib/resource.py:279 +#: pysollib/resource.py:278 msgid "Ganjifa" msgstr "" -#: pysollib/resource.py:282 +#: pysollib/resource.py:281 msgid "Holiday" msgstr "" -#: pysollib/resource.py:284 +#: pysollib/resource.py:283 msgid "Movies" msgstr "" -#: pysollib/resource.py:285 +#: pysollib/resource.py:284 msgid "Matrix" msgstr "" -#: pysollib/resource.py:286 +#: pysollib/resource.py:285 msgid "Music" msgstr "" -#: pysollib/resource.py:287 +#: pysollib/resource.py:286 msgid "Nature" msgstr "" -#: pysollib/resource.py:288 +#: pysollib/resource.py:287 msgid "Operating Systems" msgstr "" -#: pysollib/resource.py:289 +#: pysollib/resource.py:288 msgid "People" msgstr "" -#: pysollib/resource.py:290 +#: pysollib/resource.py:289 msgid "Places" msgstr "" -#: pysollib/resource.py:291 +#: pysollib/resource.py:290 msgid "Plain" msgstr "" -#: pysollib/resource.py:292 +#: pysollib/resource.py:291 msgid "Products" msgstr "" -#: pysollib/resource.py:293 +#: pysollib/resource.py:292 msgid "Round cardsets" msgstr "" -#: pysollib/resource.py:294 +#: pysollib/resource.py:293 msgid "Science Fiction" msgstr "" -#: pysollib/resource.py:295 +#: pysollib/resource.py:294 msgid "Sports" msgstr "" -#: pysollib/resource.py:297 +#: pysollib/resource.py:296 msgid "Vehicels" msgstr "" -#: pysollib/resource.py:298 +#: pysollib/resource.py:297 msgid "Video Games" msgstr "" -#: pysollib/resource.py:303 +#: pysollib/resource.py:302 msgid "Australia" msgstr "" -#: pysollib/resource.py:304 +#: pysollib/resource.py:303 msgid "Austria" msgstr "" -#: pysollib/resource.py:305 +#: pysollib/resource.py:304 msgid "Belgium" msgstr "" -#: pysollib/resource.py:306 +#: pysollib/resource.py:305 msgid "Canada" msgstr "" -#: pysollib/resource.py:307 +#: pysollib/resource.py:306 msgid "China" msgstr "" -#: pysollib/resource.py:308 +#: pysollib/resource.py:307 msgid "Czech Republic" msgstr "" -#: pysollib/resource.py:309 +#: pysollib/resource.py:308 msgid "Denmark" msgstr "" -#: pysollib/resource.py:310 +#: pysollib/resource.py:309 msgid "England" msgstr "" -#: pysollib/resource.py:311 +#: pysollib/resource.py:310 msgid "France" msgstr "" -#: pysollib/resource.py:312 +#: pysollib/resource.py:311 msgid "Germany" msgstr "" -#: pysollib/resource.py:313 +#: pysollib/resource.py:312 msgid "Great Britain" msgstr "" -#: pysollib/resource.py:314 +#: pysollib/resource.py:313 msgid "Hungary" msgstr "" -#: pysollib/resource.py:315 +#: pysollib/resource.py:314 msgid "India" msgstr "" -#: pysollib/resource.py:316 +#: pysollib/resource.py:315 msgid "Italy" msgstr "" -#: pysollib/resource.py:317 +#: pysollib/resource.py:316 msgid "Japan" msgstr "" -#: pysollib/resource.py:318 +#: pysollib/resource.py:317 msgid "Netherlands" msgstr "" -#: pysollib/resource.py:319 +#: pysollib/resource.py:318 msgid "Russia" msgstr "" -#: pysollib/resource.py:320 +#: pysollib/resource.py:319 msgid "Spain" msgstr "" -#: pysollib/resource.py:321 +#: pysollib/resource.py:320 msgid "Sweden" msgstr "" -#: pysollib/resource.py:322 +#: pysollib/resource.py:321 msgid "Switzerland" msgstr "" -#: pysollib/resource.py:323 +#: pysollib/resource.py:322 msgid "USA" msgstr "" -#: pysollib/settings.py:47 +#: pysollib/settings.py:54 msgid "Top 10" msgstr "" -#: pysollib/stack.py:1299 +#: pysollib/stack.py:1321 msgid "Base card - %s." msgstr "" -#: pysollib/stack.py:1300 +#: pysollib/stack.py:1322 msgid "Empty row cannot be filled." msgstr "" -#: pysollib/stack.py:1301 +#: pysollib/stack.py:1323 msgid "any card" msgstr "" -#: pysollib/stack.py:1302 pysollib/util.py:81 +#: pysollib/stack.py:1324 pysollib/util.py:80 msgid "Jack" msgstr "" -#: pysollib/stack.py:1315 +#: pysollib/stack.py:1337 msgid "No cards" msgstr "" -#: pysollib/stack.py:1316 +#: pysollib/stack.py:1338 msgid "1 card" msgstr "" -#: pysollib/stack.py:1317 +#: pysollib/stack.py:1339 msgid " cards" msgstr "" -#: pysollib/stack.py:1534 pysollib/stack.py:1536 pysollib/stack.py:1567 +#: pysollib/stack.py:1551 pysollib/stack.py:1553 pysollib/stack.py:1589 msgid "Redeal" msgstr "" -#: pysollib/stack.py:1536 +#: pysollib/stack.py:1553 msgid "Stop" msgstr "" -#: pysollib/stack.py:1587 +#: pysollib/stack.py:1613 msgid "Variable redeals." msgstr "" -#: pysollib/stack.py:1588 +#: pysollib/stack.py:1614 msgid "Unlimited redeals." msgstr "" -#: pysollib/stack.py:1589 +#: pysollib/stack.py:1615 msgid "No redeals." msgstr "" -#: pysollib/stack.py:1590 +#: pysollib/stack.py:1616 msgid "One redeal." msgstr "" -#: pysollib/stack.py:1591 +#: pysollib/stack.py:1617 msgid " redeals." msgstr "" -#: pysollib/stack.py:1593 +#: pysollib/stack.py:1619 msgid "Talon." msgstr "" -#: pysollib/stack.py:1779 pysollib/stack.py:2229 +#: pysollib/stack.py:1844 pysollib/stack.py:2294 msgid "Reserve. No building." msgstr "" -#: pysollib/stack.py:1816 +#: pysollib/stack.py:1881 msgid "Foundation." msgstr "" -#: pysollib/stack.py:1832 +#: pysollib/stack.py:1897 msgid "Foundation. Build up by suit." msgstr "" -#: pysollib/stack.py:1833 +#: pysollib/stack.py:1898 msgid "Foundation. Build down by suit." msgstr "" -#: pysollib/stack.py:1834 pysollib/stack.py:1850 pysollib/stack.py:1872 +#: pysollib/stack.py:1899 pysollib/stack.py:1915 pysollib/stack.py:1937 msgid "Foundation. Build by same rank." msgstr "" -#: pysollib/stack.py:1849 +#: pysollib/stack.py:1914 msgid "Foundation. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1870 +#: pysollib/stack.py:1935 msgid "Foundation. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1871 +#: pysollib/stack.py:1936 msgid "Foundation. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1945 +#: pysollib/stack.py:2010 msgid "Tableau. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1946 +#: pysollib/stack.py:2011 msgid "Tableau. Build down by alternate color." msgstr "" -#: pysollib/stack.py:1947 pysollib/stack.py:1957 pysollib/stack.py:1966 -#: pysollib/stack.py:1975 pysollib/stack.py:1985 pysollib/stack.py:2008 -#: pysollib/stack.py:2018 +#: pysollib/stack.py:2012 pysollib/stack.py:2022 pysollib/stack.py:2031 +#: pysollib/stack.py:2040 pysollib/stack.py:2050 pysollib/stack.py:2073 +#: pysollib/stack.py:2083 msgid "Tableau. Build by same rank." msgstr "" -#: pysollib/stack.py:1955 +#: pysollib/stack.py:2020 msgid "Tableau. Build up by color." msgstr "" -#: pysollib/stack.py:1956 +#: pysollib/stack.py:2021 msgid "Tableau. Build down by color." msgstr "" -#: pysollib/stack.py:1964 +#: pysollib/stack.py:2029 msgid "Tableau. Build up by suit." msgstr "" -#: pysollib/stack.py:1965 +#: pysollib/stack.py:2030 msgid "Tableau. Build down by suit." msgstr "" -#: pysollib/stack.py:1973 +#: pysollib/stack.py:2038 msgid "Tableau. Build up regardless of suit." msgstr "" -#: pysollib/stack.py:1974 +#: pysollib/stack.py:2039 msgid "Tableau. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1983 +#: pysollib/stack.py:2048 msgid "Tableau. Build up in any suit but the same." msgstr "" -#: pysollib/stack.py:1984 +#: pysollib/stack.py:2049 msgid "Tableau. Build down in any suit but the same." msgstr "" -#: pysollib/stack.py:2006 -msgid "Tableau. Build up regardless of suit. Sequences of cards in alternate color can be moved as a unit." +#: pysollib/stack.py:2071 +msgid "" +"Tableau. Build up regardless of suit. Sequences of cards in alternate color " +"can be moved as a unit." msgstr "" -#: pysollib/stack.py:2007 -msgid "Tableau. Build down regardless of suit. Sequences of cards in alternate color can be moved as a unit." +#: pysollib/stack.py:2072 +msgid "" +"Tableau. Build down regardless of suit. Sequences of cards in alternate " +"color can be moved as a unit." msgstr "" -#: pysollib/stack.py:2016 -msgid "Tableau. Build up regardless of suit. Sequences of cards in the same suit can be moved as a unit." +#: pysollib/stack.py:2081 +msgid "" +"Tableau. Build up regardless of suit. Sequences of cards in the same suit " +"can be moved as a unit." msgstr "" -#: pysollib/stack.py:2017 -msgid "Tableau. Build down regardless of suit. Sequences of cards in the same suit can be moved as a unit." +#: pysollib/stack.py:2082 +msgid "" +"Tableau. Build down regardless of suit. Sequences of cards in the same suit " +"can be moved as a unit." msgstr "" -#: pysollib/stack.py:2039 -msgid "Tableau. Build up by alternate color, can move any face-up cards regardless of sequence." +#: pysollib/stack.py:2104 +msgid "" +"Tableau. Build up by alternate color, can move any face-up cards regardless " +"of sequence." msgstr "" -#: pysollib/stack.py:2040 -msgid "Tableau. Build down by alternate color, can move any face-up cards regardless of sequence." +#: pysollib/stack.py:2105 +msgid "" +"Tableau. Build down by alternate color, can move any face-up cards " +"regardless of sequence." msgstr "" -#: pysollib/stack.py:2041 pysollib/stack.py:2054 -msgid "Tableau. Build by same rank, can move any face-up cards regardless of sequence." +#: pysollib/stack.py:2106 pysollib/stack.py:2119 +msgid "" +"Tableau. Build by same rank, can move any face-up cards regardless of " +"sequence." msgstr "" -#: pysollib/stack.py:2052 -msgid "Tableau. Build up by suit, can move any face-up cards regardless of sequence." +#: pysollib/stack.py:2117 +msgid "" +"Tableau. Build up by suit, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:2053 -msgid "Tableau. Build down by suit, can move any face-up cards regardless of sequence." +#: pysollib/stack.py:2118 +msgid "" +"Tableau. Build down by suit, can move any face-up cards regardless of " +"sequence." msgstr "" -#: pysollib/stack.py:2086 +#: pysollib/stack.py:2151 msgid "Tableau. Build up or down by color." msgstr "" -#: pysollib/stack.py:2097 +#: pysollib/stack.py:2162 msgid "Tableau. Build up or down by alternate color." msgstr "" -#: pysollib/stack.py:2108 +#: pysollib/stack.py:2173 msgid "Tableau. Build up or down by suit." msgstr "" -#: pysollib/stack.py:2119 +#: pysollib/stack.py:2184 msgid "Tableau. Build up or down regardless of suit." msgstr "" -#: pysollib/stack.py:2130 +#: pysollib/stack.py:2195 msgid "Waste." msgstr "" -#: pysollib/stack.py:2230 +#: pysollib/stack.py:2295 msgid "Free cell." msgstr "" @@ -1780,7 +1817,7 @@ msgstr "" msgid "Lost" msgstr "" -#: pysollib/stats.py:122 pysollib/tk/statusbar.py:157 +#: pysollib/stats.py:122 pysollib/tk/statusbar.py:156 msgid "Playing time" msgstr "" @@ -1804,7 +1841,7 @@ msgstr "" msgid "Status" msgstr "" -#: pysollib/stats.py:162 pysollib/tk/statusbar.py:159 +#: pysollib/stats.py:162 pysollib/tk/statusbar.py:158 #: pysollib/tk/tkstats.py:735 msgid "Game number" msgstr "" @@ -1833,48 +1870,48 @@ msgstr "" msgid "Perfect" msgstr "" -#: pysollib/tk/colorsdialog.py:73 +#: pysollib/tk/colorsdialog.py:71 msgid "Text foreground:" msgstr "" -#: pysollib/tk/colorsdialog.py:79 pysollib/tk/colorsdialog.py:98 +#: pysollib/tk/colorsdialog.py:76 pysollib/tk/colorsdialog.py:94 #: pysollib/tk/fontsdialog.py:186 msgid "Change..." msgstr "" -#: pysollib/tk/colorsdialog.py:85 pysollib/tk/timeoutsdialog.py:68 +#: pysollib/tk/colorsdialog.py:81 pysollib/tk/timeoutsdialog.py:68 msgid "Highlight piles:" msgstr "" -#: pysollib/tk/colorsdialog.py:86 +#: pysollib/tk/colorsdialog.py:82 msgid "Highlight cards 1:" msgstr "" -#: pysollib/tk/colorsdialog.py:87 +#: pysollib/tk/colorsdialog.py:83 msgid "Highlight cards 2:" msgstr "" -#: pysollib/tk/colorsdialog.py:88 +#: pysollib/tk/colorsdialog.py:84 msgid "Highlight same rank 1:" msgstr "" -#: pysollib/tk/colorsdialog.py:89 +#: pysollib/tk/colorsdialog.py:85 msgid "Highlight same rank 2:" msgstr "" -#: pysollib/tk/colorsdialog.py:90 +#: pysollib/tk/colorsdialog.py:86 msgid "Hint arrow:" msgstr "" -#: pysollib/tk/colorsdialog.py:91 +#: pysollib/tk/colorsdialog.py:87 msgid "Highlight not matching:" msgstr "" -#: pysollib/tk/colorsdialog.py:124 +#: pysollib/tk/colorsdialog.py:114 msgid "Select color" msgstr "" -#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:329 +#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:328 msgid "Find card" msgstr "" @@ -1922,491 +1959,487 @@ msgstr "" msgid "Select font" msgstr "" -#: pysollib/tk/menubar.py:75 +#: pysollib/tk/menubar.py:74 msgid "Style" msgstr "" -#: pysollib/tk/menubar.py:84 +#: pysollib/tk/menubar.py:83 msgid "Relief" msgstr "" -#: pysollib/tk/menubar.py:85 +#: pysollib/tk/menubar.py:84 msgid "Flat" msgstr "" -#: pysollib/tk/menubar.py:89 +#: pysollib/tk/menubar.py:88 msgid "Raised" msgstr "" -#: pysollib/tk/menubar.py:94 +#: pysollib/tk/menubar.py:93 msgid "Compound" msgstr "" -#: pysollib/tk/menubar.py:100 +#: pysollib/tk/menubar.py:99 msgid "Hide" msgstr "" -#: pysollib/tk/menubar.py:103 +#: pysollib/tk/menubar.py:102 msgid "Top" msgstr "" -#: pysollib/tk/menubar.py:106 +#: pysollib/tk/menubar.py:105 msgid "Bottom" msgstr "" -#: pysollib/tk/menubar.py:109 +#: pysollib/tk/menubar.py:108 msgid "Left" msgstr "" -#: pysollib/tk/menubar.py:112 +#: pysollib/tk/menubar.py:111 msgid "Right" msgstr "" -#: pysollib/tk/menubar.py:116 +#: pysollib/tk/menubar.py:115 msgid "Small icons" msgstr "" -#: pysollib/tk/menubar.py:119 +#: pysollib/tk/menubar.py:118 msgid "Large icons" msgstr "" -#: pysollib/tk/menubar.py:125 +#: pysollib/tk/menubar.py:124 msgid "Customize toolbar" msgstr "" -#: pysollib/tk/menubar.py:256 +#: pysollib/tk/menubar.py:255 msgid "&File" msgstr "" -#: pysollib/tk/menubar.py:258 +#: pysollib/tk/menubar.py:257 msgid "R&ecent games" msgstr "" -#: pysollib/tk/menubar.py:260 +#: pysollib/tk/menubar.py:259 msgid "Select &random game" msgstr "" -#: pysollib/tk/menubar.py:261 +#: pysollib/tk/menubar.py:260 msgid "&All games" msgstr "" -#: pysollib/tk/menubar.py:262 +#: pysollib/tk/menubar.py:261 msgid "Games played and &won" msgstr "" -#: pysollib/tk/menubar.py:263 +#: pysollib/tk/menubar.py:262 msgid "Games played and ¬ won" msgstr "" -#: pysollib/tk/menubar.py:264 +#: pysollib/tk/menubar.py:263 msgid "Games not &played" msgstr "" -#: pysollib/tk/menubar.py:265 +#: pysollib/tk/menubar.py:264 msgid "Select game by nu&mber..." msgstr "" -#: pysollib/tk/menubar.py:267 +#: pysollib/tk/menubar.py:266 msgid "Fa&vorite games" msgstr "" -#: pysollib/tk/menubar.py:268 +#: pysollib/tk/menubar.py:267 msgid "A&dd to favorites" msgstr "" -#: pysollib/tk/menubar.py:269 +#: pysollib/tk/menubar.py:268 msgid "R&emove from favorites" msgstr "" -#: pysollib/tk/menubar.py:271 +#: pysollib/tk/menubar.py:270 msgid "&Open..." msgstr "" -#: pysollib/tk/menubar.py:272 +#: pysollib/tk/menubar.py:271 msgid "&Save" msgstr "" -#: pysollib/tk/menubar.py:273 +#: pysollib/tk/menubar.py:272 msgid "Save &as..." msgstr "" -#: pysollib/tk/menubar.py:275 +#: pysollib/tk/menubar.py:274 msgid "&Hold and quit" msgstr "" -#: pysollib/tk/menubar.py:280 pysollib/tk/selectgame.py:407 +#: pysollib/tk/menubar.py:279 pysollib/tk/selectgame.py:407 msgid "&Select" msgstr "" -#: pysollib/tk/menubar.py:285 +#: pysollib/tk/menubar.py:284 msgid "&Edit" msgstr "" -#: pysollib/tk/menubar.py:286 +#: pysollib/tk/menubar.py:285 msgid "&Undo" msgstr "" -#: pysollib/tk/menubar.py:287 +#: pysollib/tk/menubar.py:286 msgid "&Redo" msgstr "" -#: pysollib/tk/menubar.py:288 +#: pysollib/tk/menubar.py:287 msgid "Redo &all" msgstr "" -#: pysollib/tk/menubar.py:291 +#: pysollib/tk/menubar.py:290 msgid "&Set bookmark" msgstr "" -#: pysollib/tk/menubar.py:293 pysollib/tk/menubar.py:297 +#: pysollib/tk/menubar.py:292 pysollib/tk/menubar.py:296 msgid "Bookmark %d" msgstr "" -#: pysollib/tk/menubar.py:295 +#: pysollib/tk/menubar.py:294 msgid "Go&to bookmark" msgstr "" -#: pysollib/tk/menubar.py:300 +#: pysollib/tk/menubar.py:299 msgid "&Clear bookmarks" msgstr "" -#: pysollib/tk/menubar.py:303 -msgid "Restart &game" +#: pysollib/tk/menubar.py:302 pysollib/tk/toolbar.py:198 +msgid "Restart" msgstr "" -#: pysollib/tk/menubar.py:305 +#: pysollib/tk/menubar.py:304 msgid "&Game" msgstr "" -#: pysollib/tk/menubar.py:306 +#: pysollib/tk/menubar.py:305 msgid "&Deal cards" msgstr "" -#: pysollib/tk/menubar.py:307 +#: pysollib/tk/menubar.py:306 msgid "&Auto drop" msgstr "" -#: pysollib/tk/menubar.py:308 +#: pysollib/tk/menubar.py:307 msgid "&Pause" msgstr "" -#: pysollib/tk/menubar.py:311 +#: pysollib/tk/menubar.py:310 msgid "S&tatus..." msgstr "" -#: pysollib/tk/menubar.py:312 +#: pysollib/tk/menubar.py:311 msgid "&Comments..." msgstr "" -#: pysollib/tk/menubar.py:314 +#: pysollib/tk/menubar.py:313 msgid "&Statistics" msgstr "" -#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 +#: pysollib/tk/menubar.py:314 pysollib/tk/menubar.py:322 msgid "Current game..." msgstr "" -#: pysollib/tk/menubar.py:316 pysollib/tk/menubar.py:324 +#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 msgid "All games..." msgstr "" -#: pysollib/tk/menubar.py:318 +#: pysollib/tk/menubar.py:317 msgid "Session log..." msgstr "" -#: pysollib/tk/menubar.py:319 +#: pysollib/tk/menubar.py:318 msgid "Full log..." msgstr "" -#: pysollib/tk/menubar.py:322 +#: pysollib/tk/menubar.py:321 msgid "D&emo statistics" msgstr "" -#: pysollib/tk/menubar.py:326 +#: pysollib/tk/menubar.py:325 msgid "&Assist" msgstr "" -#: pysollib/tk/menubar.py:327 +#: pysollib/tk/menubar.py:326 msgid "&Hint" msgstr "" -#: pysollib/tk/menubar.py:328 +#: pysollib/tk/menubar.py:327 msgid "Highlight p&iles" msgstr "" -#: pysollib/tk/menubar.py:331 +#: pysollib/tk/menubar.py:330 msgid "&Demo" msgstr "" -#: pysollib/tk/menubar.py:332 +#: pysollib/tk/menubar.py:331 msgid "Demo (&all games)" msgstr "" -#: pysollib/tk/menubar.py:334 +#: pysollib/tk/menubar.py:333 msgid "Piles description" msgstr "" -#: pysollib/tk/menubar.py:338 +#: pysollib/tk/menubar.py:337 msgid "&Options" msgstr "" -#: pysollib/tk/menubar.py:339 +#: pysollib/tk/menubar.py:338 msgid "&Player options..." msgstr "" -#: pysollib/tk/menubar.py:340 +#: pysollib/tk/menubar.py:339 msgid "&Automatic play" msgstr "" -#: pysollib/tk/menubar.py:341 +#: pysollib/tk/menubar.py:340 msgid "Auto &face up" msgstr "" -#: pysollib/tk/menubar.py:342 +#: pysollib/tk/menubar.py:341 msgid "A&uto drop" msgstr "" -#: pysollib/tk/menubar.py:343 +#: pysollib/tk/menubar.py:342 msgid "Auto &deal" msgstr "" -#: pysollib/tk/menubar.py:345 +#: pysollib/tk/menubar.py:344 msgid "&Quick play" msgstr "" -#: pysollib/tk/menubar.py:346 +#: pysollib/tk/menubar.py:345 msgid "Assist &level" msgstr "" -#: pysollib/tk/menubar.py:347 +#: pysollib/tk/menubar.py:346 msgid "Enable &undo" msgstr "" -#: pysollib/tk/menubar.py:348 +#: pysollib/tk/menubar.py:347 msgid "Enable &bookmarks" msgstr "" -#: pysollib/tk/menubar.py:349 +#: pysollib/tk/menubar.py:348 msgid "Enable &hint" msgstr "" -#: pysollib/tk/menubar.py:350 +#: pysollib/tk/menubar.py:349 msgid "Enable highlight p&iles" msgstr "" -#: pysollib/tk/menubar.py:351 +#: pysollib/tk/menubar.py:350 msgid "Enable highlight &cards" msgstr "" -#: pysollib/tk/menubar.py:352 +#: pysollib/tk/menubar.py:351 msgid "Enable highlight same &rank" msgstr "" -#: pysollib/tk/menubar.py:353 +#: pysollib/tk/menubar.py:352 msgid "Highlight &no matching" msgstr "" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:354 msgid "&Show removed tiles (in Mahjongg games)" msgstr "" -#: pysollib/tk/menubar.py:356 +#: pysollib/tk/menubar.py:355 msgid "Show hint &arrow (in Shisen-Sho games)" msgstr "" -#: pysollib/tk/menubar.py:358 +#: pysollib/tk/menubar.py:357 msgid "&Sound..." msgstr "" -#: pysollib/tk/menubar.py:366 +#: pysollib/tk/menubar.py:365 msgid "Cards&et..." msgstr "" -#: pysollib/tk/menubar.py:367 +#: pysollib/tk/menubar.py:366 msgid "Table t&ile..." msgstr "" -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:368 msgid "Card &background" msgstr "" -#: pysollib/tk/menubar.py:370 +#: pysollib/tk/menubar.py:369 msgid "Card &view" msgstr "" -#: pysollib/tk/menubar.py:371 +#: pysollib/tk/menubar.py:370 msgid "Card shado&w" msgstr "" -#: pysollib/tk/menubar.py:372 +#: pysollib/tk/menubar.py:371 msgid "Shade &legal moves" msgstr "" -#: pysollib/tk/menubar.py:373 +#: pysollib/tk/menubar.py:372 msgid "&Negative cards bottom" msgstr "" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:373 msgid "Shrink face-down cards" msgstr "" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:374 msgid "Shade &filled stacks" msgstr "" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:375 msgid "A&nimations" msgstr "" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:376 msgid "&None" msgstr "" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:377 msgid "&Timer based" msgstr "" -#: pysollib/tk/menubar.py:379 +#: pysollib/tk/menubar.py:378 msgid "&Fast" msgstr "" -#: pysollib/tk/menubar.py:380 +#: pysollib/tk/menubar.py:379 msgid "&Slow" msgstr "" -#: pysollib/tk/menubar.py:381 +#: pysollib/tk/menubar.py:380 msgid "&Very slow" msgstr "" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:381 msgid "Stick&y mouse" msgstr "" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:382 msgid "Use mouse for undo/redo" msgstr "" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:384 msgid "&Fonts..." msgstr "" -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:385 msgid "&Colors..." msgstr "" -#: pysollib/tk/menubar.py:387 +#: pysollib/tk/menubar.py:386 msgid "Time&outs..." msgstr "" -#: pysollib/tk/menubar.py:389 +#: pysollib/tk/menubar.py:388 msgid "&Toolbar" msgstr "" -#: pysollib/tk/menubar.py:391 +#: pysollib/tk/menubar.py:390 msgid "Stat&usbar" msgstr "" -#: pysollib/tk/menubar.py:392 +#: pysollib/tk/menubar.py:391 msgid "Show &statusbar" msgstr "" -#: pysollib/tk/menubar.py:393 +#: pysollib/tk/menubar.py:392 msgid "Show &number of cards" msgstr "" -#: pysollib/tk/menubar.py:394 +#: pysollib/tk/menubar.py:393 msgid "Show &help bar" msgstr "" -#: pysollib/tk/menubar.py:395 +#: pysollib/tk/menubar.py:394 msgid "Save games &geometry" msgstr "" -#: pysollib/tk/menubar.py:396 +#: pysollib/tk/menubar.py:395 msgid "&Demo logo" msgstr "" -#: pysollib/tk/menubar.py:397 +#: pysollib/tk/menubar.py:396 msgid "Startup splash sc&reen" msgstr "" -#: pysollib/tk/menubar.py:403 +#: pysollib/tk/menubar.py:402 msgid "&Help" msgstr "" -#: pysollib/tk/menubar.py:404 +#: pysollib/tk/menubar.py:403 msgid "&Contents" msgstr "" -#: pysollib/tk/menubar.py:405 +#: pysollib/tk/menubar.py:404 msgid "&How to play" msgstr "" -#: pysollib/tk/menubar.py:406 +#: pysollib/tk/menubar.py:405 msgid "&Rules for this game" msgstr "" -#: pysollib/tk/menubar.py:407 +#: pysollib/tk/menubar.py:406 msgid "&License terms" msgstr "" -#: pysollib/tk/menubar.py:410 +#: pysollib/tk/menubar.py:409 msgid "&About " msgstr "" -#: pysollib/tk/menubar.py:522 +#: pysollib/tk/menubar.py:521 msgid "All &games..." msgstr "" -#: pysollib/tk/menubar.py:524 +#: pysollib/tk/menubar.py:523 msgid "Playable pre&view..." msgstr "" -#: pysollib/tk/menubar.py:573 +#: pysollib/tk/menubar.py:572 msgid "&Mahjongg games" msgstr "" -#: pysollib/tk/menubar.py:611 +#: pysollib/tk/menubar.py:610 msgid "&Popular games" msgstr "" -#: pysollib/tk/menubar.py:619 +#: pysollib/tk/menubar.py:618 msgid "&French games" msgstr "" -#: pysollib/tk/menubar.py:626 +#: pysollib/tk/menubar.py:625 msgid "&Oriental games" msgstr "" -#: pysollib/tk/menubar.py:634 +#: pysollib/tk/menubar.py:633 msgid "&Special games" msgstr "" -#: pysollib/tk/menubar.py:640 -msgid "All games by name" +#: pysollib/tk/menubar.py:639 +msgid "&All games by name" msgstr "" -#: pysollib/tk/menubar.py:894 pysollib/tk/menubar.py:896 +#: pysollib/tk/menubar.py:1000 pysollib/tk/menubar.py:1002 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "" -#: pysollib/tk/menubar.py:896 +#: pysollib/tk/menubar.py:1002 msgid "&Info..." msgstr "" -#: pysollib/tk/menubar.py:899 +#: pysollib/tk/menubar.py:1005 msgid "Select " msgstr "" -#: pysollib/tk/menubar.py:960 +#: pysollib/tk/menubar.py:1066 msgid "Select table background" msgstr "" -#: pysollib/tk/menubar.py:972 pysollib/tk/selecttile.py:177 -msgid "Select table color" -msgstr "" - #: pysollib/tk/playeroptionsdialog.py:112 msgid "" "\n" @@ -2788,6 +2821,10 @@ msgstr "" msgid "&Solid color..." msgstr "" +#: pysollib/tk/selecttile.py:177 +msgid "Select table color" +msgstr "" + #: pysollib/tk/soundoptionsdialog.py:75 msgid "Are You Sure" msgstr "" @@ -2894,11 +2931,11 @@ msgid "" "the next time you restart " msgstr "" -#: pysollib/tk/statusbar.py:158 +#: pysollib/tk/statusbar.py:157 msgid "Moves/Total moves" msgstr "" -#: pysollib/tk/statusbar.py:160 +#: pysollib/tk/statusbar.py:159 msgid "Games played: won/lost" msgstr "" @@ -2922,35 +2959,35 @@ msgstr "" msgid "Highlight same rank:" msgstr "" -#: pysollib/tk/tkconst.py:104 +#: pysollib/tk/tkconst.py:101 msgid "Icons only" msgstr "" -#: pysollib/tk/tkconst.py:105 +#: pysollib/tk/tkconst.py:102 msgid "Text below icons" msgstr "" -#: pysollib/tk/tkconst.py:106 +#: pysollib/tk/tkconst.py:103 msgid "Text beside icons" msgstr "" -#: pysollib/tk/tkconst.py:107 +#: pysollib/tk/tkconst.py:104 msgid "Text only" msgstr "" -#: pysollib/tk/tkhtml.py:251 +#: pysollib/tk/tkhtml.py:252 msgid "Index" msgstr "" -#: pysollib/tk/tkhtml.py:255 +#: pysollib/tk/tkhtml.py:256 msgid "Back" msgstr "" -#: pysollib/tk/tkhtml.py:259 +#: pysollib/tk/tkhtml.py:260 msgid "Forward" msgstr "" -#: pysollib/tk/tkhtml.py:263 +#: pysollib/tk/tkhtml.py:264 msgid "Close" msgstr "" @@ -2965,8 +3002,7 @@ msgid "" msgstr "" #: pysollib/tk/tkhtml.py:410 pysollib/tk/tkhtml.py:414 -msgid "" -"Unable to service request:\n" +msgid "Unable to service request:\n" msgstr "" #: pysollib/tk/tkstats.py:95 @@ -3007,8 +3043,7 @@ msgid "No entries for player " msgstr "" #: pysollib/tk/tkstats.py:642 -msgid "" -"No log entries for %s\n" +msgid "No log entries for %s\n" msgstr "" #: pysollib/tk/tkstats.py:647 @@ -3016,8 +3051,7 @@ msgid "Session &log..." msgstr "" #: pysollib/tk/tkstats.py:658 -msgid "" -"No current session log entries for %s\n" +msgid "No current session log entries for %s\n" msgstr "" #: pysollib/tk/tkstats.py:663 @@ -3136,10 +3170,6 @@ msgstr "" msgid "New" msgstr "" -#: pysollib/tk/toolbar.py:198 -msgid "Restart" -msgstr "" - #: pysollib/tk/toolbar.py:198 msgid "" "Restart the\n" @@ -3216,31 +3246,58 @@ msgstr "" msgid "Toolbar" msgstr "" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Club" msgstr "" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Diamond" msgstr "" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Heart" msgstr "" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Spade" msgstr "" -#: pysollib/util.py:77 +#: pysollib/util.py:76 msgid "black" msgstr "" -#: pysollib/util.py:77 +#: pysollib/util.py:76 msgid "red" msgstr "" -#: pysollib/util.py:102 +#: pysollib/util.py:101 msgid "cardset" msgstr "" +#: data/glade-translations:7 +msgid "Game Statistics" +msgstr "" + +#: data/glade-translations:8 data/glade-translations:28 +msgid "Game:" +msgstr "" + +#: data/glade-translations:17 +msgid "Current game" +msgstr "" + +#: data/glade-translations:24 +msgid "Summary" +msgstr "" + +#: data/glade-translations:27 +msgid "Total moves" +msgstr "" + +#: data/glade-translations:30 +msgid "All games" +msgstr "" + +#: data/glade-translations:57 +msgid "Set font" +msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 6832b0a2..47e9b83c 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri Aug 11 02:15:03 2006\n" +"POT-Creation-Date: Tue Aug 22 21:32:47 2006\n" "PO-Revision-Date: 2006-08-17 20:14+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" @@ -47,6 +47,10 @@ msgstr "8 x 8" msgid "Abacus" msgstr "Абак" +#, fuzzy +msgid "Accordion" +msgstr "Скорпион" + #, fuzzy msgid "Aces High" msgstr "Тузы вверх" @@ -123,6 +127,9 @@ msgstr "Anno Domini" msgid "Another Round" msgstr "Другой Раунд" +msgid "Apophis" +msgstr "" + msgid "Appachan's Waterfall" msgstr "Апачианский водопад" @@ -206,6 +213,10 @@ msgstr "Баланс" msgid "Balarama" msgstr "" +#, fuzzy +msgid "Baroness" +msgstr "Основа" + msgid "Bastille Day" msgstr "День Бастилии" @@ -469,6 +480,10 @@ msgstr "Горный Замок" msgid "Castle of Indolence" msgstr "Замок праздности" +#, fuzzy +msgid "Castles End" +msgstr "Замок" + msgid "Castles in Spain" msgstr "Воздушные замки" @@ -502,6 +517,9 @@ msgstr "Клетчатый" msgid "Chelicera" msgstr "Хелицера" +msgid "Cheops" +msgstr "" + msgid "Chequers" msgstr "Шахматный порядок" @@ -578,6 +596,10 @@ msgstr "Виток" msgid "Corkscrew" msgstr "Штопор" +#, fuzzy +msgid "Corner Card" +msgstr "Углы" + msgid "Corner Suite" msgstr "Угловые масти" @@ -813,6 +835,10 @@ msgstr "Двойная и расчёт" msgid "Doublets" msgstr "Дубликаты" +#, fuzzy +msgid "Doublets II" +msgstr "Дубликаты" + msgid "Dover" msgstr "Довер" @@ -882,6 +908,10 @@ msgstr "Восемь квадратов" msgid "Eight Times Eight" msgstr "Восемь раз по восемь" +#, fuzzy +msgid "Eight by Eight" +msgstr "Восемь раз по восемь" + msgid "Elba" msgstr "Ельба" @@ -1001,6 +1031,10 @@ msgstr "Маджонг Fish face" msgid "Five Aces" msgstr "Пять тузов" +#, fuzzy +msgid "Five Piles" +msgstr "Пять тузов" + msgid "Five Pyramids" msgstr "Пять пирамид" @@ -1359,6 +1393,10 @@ msgstr "Дурацкое удовольствие" msgid "Idle Aces" msgstr "Свободные тузы" +#, fuzzy +msgid "Idle Year" +msgstr "Свободные тузы" + msgid "IloveU" msgstr "IloveU" @@ -1598,6 +1636,10 @@ msgstr "La Parisienne" msgid "Labyrinth" msgstr "Лабиринт" +#, fuzzy +msgid "Ladies Battle" +msgstr "Последняя битва" + msgid "Lady Betty" msgstr "Леди Бетти" @@ -2324,6 +2366,9 @@ msgstr "Орнамент Мерлина" msgid "Mesh" msgstr "Западня" +msgid "Methuselah" +msgstr "" + msgid "Midnight Oil" msgstr "" @@ -2658,6 +2703,10 @@ msgstr "Настойчивость" msgid "Phantom Blockade" msgstr "Призрачная блокада" +#, fuzzy +msgid "Pharaohs" +msgstr "Патриархи" + msgid "Phoenix" msgstr "Феникс" @@ -2994,6 +3043,9 @@ msgstr "Сенат" msgid "Senate +" msgstr "Сенат +" +msgid "Senior Wrangler" +msgstr "" + msgid "Serpent" msgstr "Змея" @@ -3274,6 +3326,10 @@ msgstr "Улицы" msgid "Streets and Alleys" msgstr "Улицы и аллеи" +#, fuzzy +msgid "Striptease" +msgstr "Пласт" + msgid "Stronghold" msgstr "Твердыня" @@ -3438,6 +3494,9 @@ msgstr "Жаба" msgid "Tomb" msgstr "Гробница" +msgid "Toni" +msgstr "" + #, fuzzy msgid "Totally Random-Made" msgstr "Маджонг Totally Random-Made" @@ -3445,6 +3504,10 @@ msgstr "Маджонг Totally Random-Made" msgid "Tournament" msgstr "Турнир" +#, fuzzy +msgid "Tower of Babel" +msgstr "Ханойская башня" + msgid "Tower of Hanoy" msgstr "Ханойская башня" @@ -3561,6 +3624,10 @@ msgstr "" msgid "Vamana" msgstr "" +#, fuzzy +msgid "Vanishing Cross" +msgstr "Маджонг Крест" + #, fuzzy msgid "Varaha" msgstr "Марта" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index c0e251e9..7c1399a3 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri Aug 11 02:14:56 2006\n" -"PO-Revision-Date: 2006-08-20 17:42+0400\n" +"POT-Creation-Date: Tue Aug 22 21:33:40 2006\n" +"PO-Revision-Date: 2006-08-22 21:34+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -14,32 +14,32 @@ msgstr "" "Content-Transfer-Encoding: utf-8\n" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:360 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:358 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "Новая игра" -#: pysollib/actions.py:373 pysollib/tk/menubar.py:699 -#: pysollib/tk/menubar.py:713 +#: pysollib/actions.py:371 pysollib/tk/menubar.py:704 +#: pysollib/tk/menubar.py:718 msgid "Select game" msgstr "Выбрать игру" -#: pysollib/actions.py:396 +#: pysollib/actions.py:388 msgid "Invalid game number" msgstr "Неправильный номер игры" -#: pysollib/actions.py:397 +#: pysollib/actions.py:389 msgid "Invalid game number\n" msgstr "Неправильный номер игры\n" -#: pysollib/actions.py:414 +#: pysollib/actions.py:406 msgid "Select next game number" msgstr "Выберите номер следующей игры" -#: pysollib/actions.py:423 pysollib/actions.py:433 +#: pysollib/actions.py:415 pysollib/actions.py:425 msgid "Select new game number" msgstr "Выберите номер новой игры" -#: pysollib/actions.py:424 +#: pysollib/actions.py:416 msgid "" "\n" "\n" @@ -49,13 +49,13 @@ msgstr "" "\n" "Введите номер новой игры" -#: pysollib/actions.py:425 +#: pysollib/actions.py:417 msgid "&Next number" msgstr "&Следующий номер" -#: pysollib/actions.py:425 pysollib/app.py:1143 pysollib/app.py:1155 -#: pysollib/game.py:904 pysollib/game.py:1828 pysollib/main.py:439 -#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:132 +#: pysollib/actions.py:417 pysollib/app.py:1150 pysollib/app.py:1162 +#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:439 +#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -71,12 +71,12 @@ msgstr "&Следующий номер" msgid "&OK" msgstr "&ОК" -#: pysollib/actions.py:425 pysollib/app.py:1155 pysollib/game.py:904 -#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 -#: pysollib/game.py:1318 pysollib/tk/colorsdialog.py:132 +#: pysollib/actions.py:417 pysollib/app.py:1162 pysollib/game.py:925 +#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 +#: pysollib/game.py:1339 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 -#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:894 -#: pysollib/tk/menubar.py:896 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1000 +#: pysollib/tk/menubar.py:1002 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:170 @@ -84,35 +84,35 @@ msgstr "&ОК" msgid "&Cancel" msgstr "От&мена" -#: pysollib/actions.py:441 +#: pysollib/actions.py:433 msgid "Select random game" msgstr "Выбор случайной игры" -#: pysollib/actions.py:477 +#: pysollib/actions.py:469 msgid "Select next game" msgstr "Выбрать следующую игру" -#: pysollib/actions.py:510 pysollib/tk/toolbar.py:211 +#: pysollib/actions.py:502 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "Выйти из " -#: pysollib/actions.py:560 +#: pysollib/actions.py:552 msgid "Clear bookmarks" msgstr "Удалить закладки" -#: pysollib/actions.py:561 +#: pysollib/actions.py:553 msgid "Clear all bookmarks ?" msgstr "Удалить все закладки?" -#: pysollib/actions.py:571 +#: pysollib/actions.py:563 msgid "Restart game" msgstr "Начать игру с начала" -#: pysollib/actions.py:572 +#: pysollib/actions.py:564 msgid "Restart this game ?" msgstr "Начать игру с начала?" -#: pysollib/actions.py:613 +#: pysollib/actions.py:605 msgid "" "Comments for %s:\n" "\n" @@ -120,19 +120,19 @@ msgstr "" "Комментарий для %s:\n" "\n" -#: pysollib/actions.py:615 +#: pysollib/actions.py:607 msgid "Comments for " msgstr "Комментарий для " -#: pysollib/actions.py:633 pysollib/actions.py:669 +#: pysollib/actions.py:625 pysollib/actions.py:661 msgid "Error while writing to file" msgstr "Ошибка при записи в файл" -#: pysollib/actions.py:636 pysollib/actions.py:672 +#: pysollib/actions.py:628 pysollib/actions.py:664 msgid " Info" msgstr " Информация" -#: pysollib/actions.py:637 +#: pysollib/actions.py:629 msgid "" "Comments were appended to\n" "\n" @@ -140,15 +140,15 @@ msgstr "" "Комментарий добавлен в файл\n" "\n" -#: pysollib/actions.py:654 +#: pysollib/actions.py:646 msgid "Demo statistics" msgstr "Статистика демо" -#: pysollib/actions.py:657 +#: pysollib/actions.py:649 msgid "Your statistics" msgstr "Ваша статистика" -#: pysollib/actions.py:673 +#: pysollib/actions.py:665 msgid "" " were appended to\n" "\n" @@ -156,52 +156,52 @@ msgstr "" " добавлена в файл\n" "\n" -#: pysollib/actions.py:687 +#: pysollib/actions.py:679 msgid " Demo" msgstr " Демо" -#: pysollib/actions.py:687 +#: pysollib/actions.py:679 msgid " Demo " msgstr " Демо " -#: pysollib/actions.py:690 pysollib/actions.py:708 +#: pysollib/actions.py:682 pysollib/actions.py:700 msgid " for " msgstr " для " -#: pysollib/actions.py:696 pysollib/actions.py:715 +#: pysollib/actions.py:688 pysollib/actions.py:707 msgid "Statistics for " msgstr "Статистика игры " -#: pysollib/actions.py:699 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:691 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "Статистика" -#: pysollib/actions.py:702 +#: pysollib/actions.py:694 msgid "Full log" msgstr "Полный лог" -#: pysollib/actions.py:705 +#: pysollib/actions.py:697 msgid "Session log" msgstr "Лог сессии" -#: pysollib/actions.py:711 +#: pysollib/actions.py:703 msgid "Game Info" msgstr "Информация об игре" -#: pysollib/actions.py:720 +#: pysollib/actions.py:712 msgid "Full log for " msgstr "Полный лог для " -#: pysollib/actions.py:725 +#: pysollib/actions.py:717 msgid "Session log for " msgstr "Лог сессии для " -#: pysollib/actions.py:730 +#: pysollib/actions.py:722 msgid "Reset all statistics" msgstr "Очистить всю статистику" -#: pysollib/actions.py:731 +#: pysollib/actions.py:723 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" @@ -209,11 +209,11 @@ msgstr "" "Очистить всю статистику и лог для игрока\n" "%s?" -#: pysollib/actions.py:737 +#: pysollib/actions.py:729 msgid "Reset game statistics" msgstr "Очистить статистику игры" -#: pysollib/actions.py:738 +#: pysollib/actions.py:730 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -225,51 +225,51 @@ msgstr "" "и игры\n" "%s?" -#: pysollib/actions.py:794 +#: pysollib/actions.py:785 msgid "Play demo" msgstr "Показать демо" -#: pysollib/actions.py:805 +#: pysollib/actions.py:796 msgid "Set player options" msgstr "Установить настройки игрока" -#: pysollib/actions.py:906 +#: pysollib/actions.py:810 msgid "Sound settings" msgstr "Настройка звука" -#: pysollib/actions.py:927 +#: pysollib/actions.py:819 msgid "Set colors" msgstr "Настроить цвета" -#: pysollib/actions.py:946 +#: pysollib/actions.py:839 msgid "Set fonts" msgstr "Настроить шрифт" -#: pysollib/actions.py:955 +#: pysollib/actions.py:848 msgid "Set timeouts" msgstr "Настроить таймауты" -#: pysollib/app.py:87 +#: pysollib/app.py:86 msgid "Unknown" msgstr "Неизвестный" -#: pysollib/app.py:1005 +#: pysollib/app.py:1012 msgid "Loading %s %s..." msgstr "Загружается %s %s..." -#: pysollib/app.py:1040 +#: pysollib/app.py:1047 msgid " load error" msgstr " ошибка при загрузке" -#: pysollib/app.py:1041 +#: pysollib/app.py:1048 msgid "Error while loading " msgstr "Ошибка при загрузке" -#: pysollib/app.py:1135 +#: pysollib/app.py:1142 msgid "Incompatible " msgstr "Несовместимый " -#: pysollib/app.py:1137 +#: pysollib/app.py:1144 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -283,19 +283,19 @@ msgstr "" "\n" "Необходимо выбрать %s типа %s.\n" -#: pysollib/app.py:1153 +#: pysollib/app.py:1160 msgid "Please select a %s type %s" msgstr "Выберите %s типа %s" -#: pysollib/game.py:823 pysollib/game.py:829 +#: pysollib/game.py:844 pysollib/game.py:850 msgid "Player\n" msgstr "Игрок\n" -#: pysollib/game.py:900 +#: pysollib/game.py:921 msgid "Discard current game ?" msgstr "Завершить текущую игру?" -#: pysollib/game.py:1244 +#: pysollib/game.py:1265 msgid "" "\n" "You have reached\n" @@ -305,7 +305,7 @@ msgstr "" "Вы достигли\n" "#%d в %s игрового времени" -#: pysollib/game.py:1247 +#: pysollib/game.py:1268 msgid "" "\n" "and #%d in the %s of moves" @@ -313,7 +313,7 @@ msgstr "" "\n" "и #%d в %s количества ходов" -#: pysollib/game.py:1249 +#: pysollib/game.py:1270 msgid "" "\n" "You have reached\n" @@ -323,7 +323,7 @@ msgstr "" "Вы достигли\n" "#%d в %s количества ходов" -#: pysollib/game.py:1252 +#: pysollib/game.py:1273 msgid "" "\n" "and #%d in the %s of total moves" @@ -331,7 +331,7 @@ msgstr "" "\n" "и #%d в %s общего количества ходов" -#: pysollib/game.py:1254 +#: pysollib/game.py:1275 msgid "" "\n" "You have reached\n" @@ -341,12 +341,12 @@ msgstr "" "Вы достигли\n" "#%d в %s общего количества ходов" -#: pysollib/game.py:1281 pysollib/game.py:1297 +#: pysollib/game.py:1302 pysollib/game.py:1318 #: pysollib/tk/soundoptionsdialog.py:100 msgid "Game won" msgstr "Игра выиграна" -#: pysollib/game.py:1282 +#: pysollib/game.py:1303 msgid "" "\n" "Congratulations, this\n" @@ -365,12 +365,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1290 pysollib/game.py:1305 pysollib/game.py:1312 -#: pysollib/game.py:1318 pysollib/tk/menubar.py:257 +#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 +#: pysollib/game.py:1339 pysollib/tk/menubar.py:256 msgid "&New game" msgstr "&Новая игра" -#: pysollib/game.py:1298 +#: pysollib/game.py:1319 msgid "" "\n" "Congratulations, you did it !\n" @@ -387,12 +387,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1310 pysollib/game.py:1316 +#: pysollib/game.py:1331 pysollib/game.py:1337 #: pysollib/tk/soundoptionsdialog.py:98 msgid "Game finished" msgstr "Игра закончена" -#: pysollib/game.py:1311 pysollib/game.py:1829 +#: pysollib/game.py:1332 pysollib/game.py:1862 msgid "" "\n" "Game finished\n" @@ -400,7 +400,7 @@ msgstr "" "\n" "Игра закончена\n" -#: pysollib/game.py:1317 +#: pysollib/game.py:1338 msgid "" "\n" "Game finished, but not without my help...\n" @@ -408,35 +408,35 @@ msgstr "" "\n" "Игра закончена, но не без моей помощи...\n" -#: pysollib/game.py:1318 +#: pysollib/game.py:1339 msgid "&Restart" msgstr "&Начало" -#: pysollib/game.py:1720 +#: pysollib/game.py:1753 msgid "Score %6d" msgstr "Счет %6d" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Cool" msgstr "&Отлично" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Great" msgstr "&Эдорово" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Wow" msgstr "&Ура" -#: pysollib/game.py:1819 +#: pysollib/game.py:1852 msgid "&Yeah" msgstr "&Ага" -#: pysollib/game.py:1820 pysollib/game.py:1832 pysollib/game.py:1845 +#: pysollib/game.py:1853 pysollib/game.py:1865 pysollib/game.py:1878 msgid " Autopilot" msgstr " Автопилот" -#: pysollib/game.py:1821 +#: pysollib/game.py:1854 msgid "" "\n" "Game solved in %d moves.\n" @@ -444,19 +444,19 @@ msgstr "" "\n" "Игра решена за %d ходов\n" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&Hmm" msgstr "&Хмм" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&Oh well" msgstr "&Ох" -#: pysollib/game.py:1844 +#: pysollib/game.py:1877 msgid "&That's life" msgstr "&Такова жизнь" -#: pysollib/game.py:1846 +#: pysollib/game.py:1879 msgid "" "\n" "This won't come out...\n" @@ -464,31 +464,31 @@ msgstr "" "\n" "Не удалось...\n" -#: pysollib/game.py:2264 +#: pysollib/game.py:2298 msgid "Set bookmark" msgstr "Установить закладку" -#: pysollib/game.py:2265 +#: pysollib/game.py:2299 msgid "Replace existing bookmark %d ?" msgstr "Заменить существующую закладку %d ?" -#: pysollib/game.py:2287 +#: pysollib/game.py:2321 msgid "Goto bookmark" msgstr "Перейти к закладке" -#: pysollib/game.py:2288 +#: pysollib/game.py:2322 msgid "Goto bookmark %d ?" msgstr "Перейти к закладке %d ?" -#: pysollib/game.py:2319 +#: pysollib/game.py:2353 msgid "Open game" msgstr "Открыть игру" -#: pysollib/game.py:2330 pysollib/game.py:2339 pysollib/game.py:2344 +#: pysollib/game.py:2364 pysollib/game.py:2373 pysollib/game.py:2378 msgid "Load game error" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2331 +#: pysollib/game.py:2365 msgid "" "Error while loading game.\n" "\n" @@ -500,11 +500,11 @@ msgstr "" "Возможно повреждён файл,\n" "или ошибка в программе." -#: pysollib/game.py:2340 +#: pysollib/game.py:2374 msgid "Error while loading game" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2345 +#: pysollib/game.py:2379 msgid "" "Internal error while loading game.\n" "\n" @@ -514,11 +514,11 @@ msgstr "" "\n" "Пожалуйста сообщите об этой ошибке." -#: pysollib/game.py:2370 +#: pysollib/game.py:2404 msgid "Save game error" msgstr "Ошибка при сохранении игры" -#: pysollib/game.py:2371 +#: pysollib/game.py:2405 msgid "Error while saving game" msgstr "Ошибка при сохранении игры" @@ -763,12 +763,12 @@ msgstr "" "4: 8 Д 3 7 В 2 6 10 Т 5 9 К" #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1304 pysollib/util.py:81 +#: pysollib/stack.py:1326 pysollib/util.py:80 msgid "King" msgstr "Король" #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1303 pysollib/util.py:81 +#: pysollib/stack.py:1325 pysollib/util.py:80 msgid "Queen" msgstr "Королева" @@ -786,11 +786,11 @@ msgid "X" msgstr "Х" #: pysollib/games/golf.py:114 pysollib/games/golf.py:300 -#: pysollib/stack.py:1915 +#: pysollib/stack.py:1980 msgid "Tableau. No building." msgstr "Игровой стол. Без выкладывания." -#: pysollib/games/golf.py:385 pysollib/stack.py:1848 +#: pysollib/games/golf.py:385 pysollib/stack.py:1913 msgid "Foundation. Build up regardless of suit." msgstr "Базовая ячейка. Складывать по возрастанию не считаясь с мастью." @@ -798,11 +798,11 @@ msgstr "Базовая ячейка. Складывать по возраста msgid "Balance $%d" msgstr "Баланс $%d" -#: pysollib/games/klondike.py:419 +#: pysollib/games/klondike.py:439 msgid "Reserve. Only Kings are acceptable." msgstr "Резерв. Только для королей." -#: pysollib/games/larasgame.py:163 pysollib/stack.py:1525 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1542 msgid "Round %d" msgstr "Раунд %d" @@ -931,7 +931,7 @@ msgstr "Жезлы" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1305 pysollib/util.py:80 +#: pysollib/stack.py:1327 pysollib/util.py:79 msgid "Ace" msgstr "Туз" @@ -951,7 +951,7 @@ msgstr "Очков: Текущая раздача: " msgid "\tThis game: " msgstr " Эта игра: " -#: pysollib/games/tournament.py:245 +#: pysollib/games/tournament.py:226 msgid "Reserve. Build down by suit." msgstr "Резерв. Складывать по убыванию в соответствии с мастью." @@ -1245,27 +1245,27 @@ msgstr "" "Игровой стол. Складывать по убыванию не считаясь с мастью, можно перемещать " "любую серию открытых карт." -#: pysollib/help.py:64 +#: pysollib/help.py:63 msgid "A Python Solitaire Game Collection\n" msgstr "Коллекция питоновских пасьянсев\n" -#: pysollib/help.py:66 +#: pysollib/help.py:65 msgid "A World Domination Project\n" msgstr "Всемирный непревзойденный проект\n" -#: pysollib/help.py:67 +#: pysollib/help.py:66 msgid "&Credits..." msgstr "&Благодарности..." -#: pysollib/help.py:67 +#: pysollib/help.py:66 msgid "&Nice" msgstr "&Отлично" -#: pysollib/help.py:69 +#: pysollib/help.py:68 msgid "&Enjoy" msgstr "&Наслаждайтесь" -#: pysollib/help.py:71 +#: pysollib/help.py:70 msgid "" "Version %s\n" "\n" @@ -1273,11 +1273,11 @@ msgstr "" "Версия %s\n" "\n" -#: pysollib/help.py:72 +#: pysollib/help.py:71 msgid "About " msgstr "О программе " -#: pysollib/help.py:73 +#: pysollib/help.py:72 msgid "" "PySol Fan Club edition\n" "%s%s\n" @@ -1308,11 +1308,11 @@ msgstr "" "об этом приложении посетите сайт\n" "%s" -#: pysollib/help.py:102 +#: pysollib/help.py:101 msgid "Credits" msgstr "Благодарности" -#: pysollib/help.py:103 +#: pysollib/help.py:102 msgid "" " credits go to:\n" "\n" @@ -1327,23 +1327,23 @@ msgid "" "for making this program possible" msgstr "" -#: pysollib/help.py:138 +#: pysollib/help.py:137 msgid " HTML Problem" msgstr " проблема с HTML" -#: pysollib/help.py:139 +#: pysollib/help.py:138 msgid "Cannot find help document\n" msgstr "Не найден файл помощи\n" -#: pysollib/help.py:152 +#: pysollib/help.py:151 msgid " Help" msgstr " Помощь" -#: pysollib/main.py:68 pysollib/main.py:348 +#: pysollib/main.py:66 pysollib/main.py:348 msgid " installation error" msgstr " проблема с установкой" -#: pysollib/main.py:69 +#: pysollib/main.py:67 msgid "" "No %ss were found !!!\n" "\n" @@ -1353,11 +1353,11 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:76 pysollib/main.py:356 pysollib/tk/menubar.py:276 +#: pysollib/main.py:74 pysollib/main.py:356 pysollib/tk/menubar.py:275 msgid "&Quit" msgstr "В&ыход" -#: pysollib/main.py:98 +#: pysollib/main.py:96 msgid "" "%s: %s\n" "try %s --help for more information" @@ -1365,7 +1365,7 @@ msgstr "" "%s: %s\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:135 +#: pysollib/main.py:133 msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" @@ -1389,7 +1389,7 @@ msgstr "" "\n" " FILE - имя файла сохраненной игры\n" -#: pysollib/main.py:149 +#: pysollib/main.py:147 msgid "" "%s: too many files\n" "try %s --help for more information" @@ -1397,7 +1397,7 @@ msgstr "" "\"%s: слишком много файлов\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:153 +#: pysollib/main.py:151 msgid "" "%s: invalid file name\n" "try %s --help for more information" @@ -1441,414 +1441,414 @@ msgstr "" msgid "Welcome to " msgstr "Добро пожаловать в " -#: pysollib/resource.py:243 +#: pysollib/resource.py:242 msgid "French type (52 cards)" msgstr "Классические (52 карты)" -#: pysollib/resource.py:244 +#: pysollib/resource.py:243 msgid "Hanafuda type (48 cards)" msgstr "Ханафуда (48 карт)" -#: pysollib/resource.py:245 +#: pysollib/resource.py:244 msgid "Tarock type (78 cards)" msgstr "Таро (78 карт)" -#: pysollib/resource.py:246 +#: pysollib/resource.py:245 msgid "Mahjongg type (42 tiles)" msgstr "Маджонг (42 фишки)" -#: pysollib/resource.py:247 +#: pysollib/resource.py:246 msgid "Hex A Deck type (68 cards)" msgstr "Hex A Deck (68 карт)" -#: pysollib/resource.py:248 +#: pysollib/resource.py:247 msgid "Mughal Ganjifa type (96 cards)" msgstr "Мугал Ганджифа (96 карт)" -#: pysollib/resource.py:249 +#: pysollib/resource.py:248 msgid "Navagraha Ganjifa type (108 cards)" msgstr "Наваграха Ганджифа (108 карт)" -#: pysollib/resource.py:250 +#: pysollib/resource.py:249 msgid "Dashavatara Ganjifa type (120 cards)" msgstr "Дашаватара Ганджифа (120 карт)" -#: pysollib/resource.py:251 +#: pysollib/resource.py:250 msgid "Trumps only type (variable cards)" msgstr "Без мастей (переменное количество карт)" -#: pysollib/resource.py:255 +#: pysollib/resource.py:254 msgid "French" msgstr "Классические" -#: pysollib/resource.py:256 pysollib/resource.py:280 +#: pysollib/resource.py:255 pysollib/resource.py:279 msgid "Hanafuda" msgstr "Ханафуда" -#: pysollib/resource.py:257 pysollib/resource.py:296 +#: pysollib/resource.py:256 pysollib/resource.py:295 msgid "Tarock" msgstr "Таро" -#: pysollib/resource.py:258 pysollib/resource.py:283 +#: pysollib/resource.py:257 pysollib/resource.py:282 msgid "Mahjongg" msgstr "Маджонг" -#: pysollib/resource.py:259 pysollib/resource.py:281 +#: pysollib/resource.py:258 pysollib/resource.py:280 msgid "Hex A Deck" msgstr "Hex A Deck" -#: pysollib/resource.py:260 +#: pysollib/resource.py:259 msgid "Mughal Ganjifa" msgstr "Мугал Ганджифа" -#: pysollib/resource.py:261 +#: pysollib/resource.py:260 msgid "Navagraha Ganjifa" msgstr "Наваграха Ганджифа" -#: pysollib/resource.py:262 +#: pysollib/resource.py:261 msgid "Dashavatara Ganjifa" msgstr "Дашаватара Ганджифа" -#: pysollib/resource.py:263 +#: pysollib/resource.py:262 #, fuzzy msgid "Trumps only" msgstr "Козырь" -#: pysollib/resource.py:268 +#: pysollib/resource.py:267 msgid "Adult" msgstr "Для взрослых" -#: pysollib/resource.py:269 +#: pysollib/resource.py:268 msgid "Animals" msgstr "Животные" -#: pysollib/resource.py:270 +#: pysollib/resource.py:269 msgid "Anime" msgstr "Мультфильмы" -#: pysollib/resource.py:271 +#: pysollib/resource.py:270 msgid "Art" msgstr "Искусство" -#: pysollib/resource.py:272 +#: pysollib/resource.py:271 msgid "Cartoons" msgstr "Комиксы" -#: pysollib/resource.py:273 +#: pysollib/resource.py:272 msgid "Children" msgstr "Дети" -#: pysollib/resource.py:274 +#: pysollib/resource.py:273 msgid "Classic look" msgstr "Классический вид" -#: pysollib/resource.py:275 +#: pysollib/resource.py:274 msgid "Collectors" msgstr "Коллекционные" -#: pysollib/resource.py:276 +#: pysollib/resource.py:275 msgid "Computers" msgstr "Компьютеры" -#: pysollib/resource.py:277 +#: pysollib/resource.py:276 msgid "Engines" msgstr "Машины" -#: pysollib/resource.py:278 +#: pysollib/resource.py:277 msgid "Fantasy" msgstr "Фентези" -#: pysollib/resource.py:279 +#: pysollib/resource.py:278 msgid "Ganjifa" msgstr "Ганджифа" -#: pysollib/resource.py:282 +#: pysollib/resource.py:281 msgid "Holiday" msgstr "Праздники" -#: pysollib/resource.py:284 +#: pysollib/resource.py:283 msgid "Movies" msgstr "Фильмы" -#: pysollib/resource.py:285 +#: pysollib/resource.py:284 msgid "Matrix" msgstr "Мозаика" -#: pysollib/resource.py:286 +#: pysollib/resource.py:285 msgid "Music" msgstr "Музыка" -#: pysollib/resource.py:287 +#: pysollib/resource.py:286 msgid "Nature" msgstr "Природа" -#: pysollib/resource.py:288 +#: pysollib/resource.py:287 msgid "Operating Systems" msgstr "Операционные системы" -#: pysollib/resource.py:289 +#: pysollib/resource.py:288 msgid "People" msgstr "Люди" -#: pysollib/resource.py:290 +#: pysollib/resource.py:289 msgid "Places" msgstr "Дома" -#: pysollib/resource.py:291 +#: pysollib/resource.py:290 msgid "Plain" msgstr "Простые" -#: pysollib/resource.py:292 +#: pysollib/resource.py:291 msgid "Products" msgstr "Продукты" -#: pysollib/resource.py:293 +#: pysollib/resource.py:292 msgid "Round cardsets" msgstr "Закруглённые" -#: pysollib/resource.py:294 +#: pysollib/resource.py:293 msgid "Science Fiction" msgstr "Научная фантастика" -#: pysollib/resource.py:295 +#: pysollib/resource.py:294 msgid "Sports" msgstr "Спорт" -#: pysollib/resource.py:297 +#: pysollib/resource.py:296 msgid "Vehicels" msgstr "Транспортные средства" -#: pysollib/resource.py:298 +#: pysollib/resource.py:297 msgid "Video Games" msgstr "Видеоигры" -#: pysollib/resource.py:303 +#: pysollib/resource.py:302 msgid "Australia" msgstr "Австралия" -#: pysollib/resource.py:304 +#: pysollib/resource.py:303 msgid "Austria" msgstr "Австрия" -#: pysollib/resource.py:305 +#: pysollib/resource.py:304 msgid "Belgium" msgstr "Бельгия" -#: pysollib/resource.py:306 +#: pysollib/resource.py:305 msgid "Canada" msgstr "Канада" -#: pysollib/resource.py:307 +#: pysollib/resource.py:306 msgid "China" msgstr "Китай" -#: pysollib/resource.py:308 +#: pysollib/resource.py:307 msgid "Czech Republic" msgstr "Чехия" -#: pysollib/resource.py:309 +#: pysollib/resource.py:308 msgid "Denmark" msgstr "Дания" -#: pysollib/resource.py:310 +#: pysollib/resource.py:309 msgid "England" msgstr "Англия" -#: pysollib/resource.py:311 +#: pysollib/resource.py:310 msgid "France" msgstr "Франция" -#: pysollib/resource.py:312 +#: pysollib/resource.py:311 msgid "Germany" msgstr "Германия" -#: pysollib/resource.py:313 +#: pysollib/resource.py:312 msgid "Great Britain" msgstr "Великобритания" -#: pysollib/resource.py:314 +#: pysollib/resource.py:313 msgid "Hungary" msgstr "Венгрия" -#: pysollib/resource.py:315 +#: pysollib/resource.py:314 msgid "India" msgstr "Индия" -#: pysollib/resource.py:316 +#: pysollib/resource.py:315 msgid "Italy" msgstr "Италия" -#: pysollib/resource.py:317 +#: pysollib/resource.py:316 msgid "Japan" msgstr "Япония" -#: pysollib/resource.py:318 +#: pysollib/resource.py:317 msgid "Netherlands" msgstr "Голландия" -#: pysollib/resource.py:319 +#: pysollib/resource.py:318 msgid "Russia" msgstr "Россия" -#: pysollib/resource.py:320 +#: pysollib/resource.py:319 msgid "Spain" msgstr "Испания" -#: pysollib/resource.py:321 +#: pysollib/resource.py:320 msgid "Sweden" msgstr "Швеция" -#: pysollib/resource.py:322 +#: pysollib/resource.py:321 msgid "Switzerland" msgstr "Швейцария" -#: pysollib/resource.py:323 +#: pysollib/resource.py:322 msgid "USA" msgstr "США" -#: pysollib/settings.py:47 +#: pysollib/settings.py:54 msgid "Top 10" msgstr "Top 10" -#: pysollib/stack.py:1299 +#: pysollib/stack.py:1321 msgid "Base card - %s." msgstr "Базовая карта - %s." -#: pysollib/stack.py:1300 +#: pysollib/stack.py:1322 msgid "Empty row cannot be filled." msgstr "Пустой ряд не заполняется." -#: pysollib/stack.py:1301 +#: pysollib/stack.py:1323 msgid "any card" msgstr "любая карта" -#: pysollib/stack.py:1302 pysollib/util.py:81 +#: pysollib/stack.py:1324 pysollib/util.py:80 msgid "Jack" msgstr "Валет" -#: pysollib/stack.py:1315 +#: pysollib/stack.py:1337 msgid "No cards" msgstr "Нет карт" -#: pysollib/stack.py:1316 +#: pysollib/stack.py:1338 msgid "1 card" msgstr "1 карта" -#: pysollib/stack.py:1317 +#: pysollib/stack.py:1339 msgid " cards" msgstr " карт" -#: pysollib/stack.py:1534 pysollib/stack.py:1536 pysollib/stack.py:1567 +#: pysollib/stack.py:1551 pysollib/stack.py:1553 pysollib/stack.py:1589 msgid "Redeal" msgstr "Сдать" -#: pysollib/stack.py:1536 +#: pysollib/stack.py:1553 msgid "Stop" msgstr "Стоп" -#: pysollib/stack.py:1587 +#: pysollib/stack.py:1613 msgid "Variable redeals." msgstr "Переменное количество пересдач." -#: pysollib/stack.py:1588 +#: pysollib/stack.py:1614 msgid "Unlimited redeals." msgstr "Неограниченное количество пересдач." -#: pysollib/stack.py:1589 +#: pysollib/stack.py:1615 msgid "No redeals." msgstr "Без пересдачи." -#: pysollib/stack.py:1590 +#: pysollib/stack.py:1616 msgid "One redeal." msgstr "1 пересдача." -#: pysollib/stack.py:1591 +#: pysollib/stack.py:1617 msgid " redeals." msgstr " пересдачи." -#: pysollib/stack.py:1593 +#: pysollib/stack.py:1619 msgid "Talon." msgstr "Колода." -#: pysollib/stack.py:1779 pysollib/stack.py:2229 +#: pysollib/stack.py:1844 pysollib/stack.py:2294 msgid "Reserve. No building." msgstr "Резерв. Без выкладывания." -#: pysollib/stack.py:1816 +#: pysollib/stack.py:1881 msgid "Foundation." msgstr "Базовая ячейка" -#: pysollib/stack.py:1832 +#: pysollib/stack.py:1897 msgid "Foundation. Build up by suit." msgstr "Базовая ячейка. Складывать по возрастанию в соответствии с мастью." -#: pysollib/stack.py:1833 +#: pysollib/stack.py:1898 msgid "Foundation. Build down by suit." msgstr "Базовая ячейка. Складывать по убыванию в соответствии с мастью." -#: pysollib/stack.py:1834 pysollib/stack.py:1850 pysollib/stack.py:1872 +#: pysollib/stack.py:1899 pysollib/stack.py:1915 pysollib/stack.py:1937 msgid "Foundation. Build by same rank." msgstr "Базовая ячейка. Складывать в соответствии с достоинством." -#: pysollib/stack.py:1849 +#: pysollib/stack.py:1914 msgid "Foundation. Build down regardless of suit." msgstr "Базовая ячейка. Складывать не считаясь с мастью." -#: pysollib/stack.py:1870 +#: pysollib/stack.py:1935 msgid "Foundation. Build up by alternate color." msgstr "Базовая ячейка. Складывать по возрастанию чередуя цвет." -#: pysollib/stack.py:1871 +#: pysollib/stack.py:1936 msgid "Foundation. Build down by alternate color." msgstr "Базовая ячейка. Складывать по убыванию чередуя цвет." -#: pysollib/stack.py:1945 +#: pysollib/stack.py:2010 msgid "Tableau. Build up by alternate color." msgstr "Игровой стол. Складывать по возрастанию чередуя цвет." -#: pysollib/stack.py:1946 +#: pysollib/stack.py:2011 msgid "Tableau. Build down by alternate color." msgstr "Игровой стол. Складывать по убыванию чередуя цвет." -#: pysollib/stack.py:1947 pysollib/stack.py:1957 pysollib/stack.py:1966 -#: pysollib/stack.py:1975 pysollib/stack.py:1985 pysollib/stack.py:2008 -#: pysollib/stack.py:2018 +#: pysollib/stack.py:2012 pysollib/stack.py:2022 pysollib/stack.py:2031 +#: pysollib/stack.py:2040 pysollib/stack.py:2050 pysollib/stack.py:2073 +#: pysollib/stack.py:2083 msgid "Tableau. Build by same rank." msgstr "Игровой стол. Складывать в соответствии с достоинством." -#: pysollib/stack.py:1955 +#: pysollib/stack.py:2020 msgid "Tableau. Build up by color." msgstr "Игровой стол. Складывать по возрастанию в соответствии с цветом." -#: pysollib/stack.py:1956 +#: pysollib/stack.py:2021 msgid "Tableau. Build down by color." msgstr "Игровой стол. Складывать по убыванию в соответствии с цветом." -#: pysollib/stack.py:1964 +#: pysollib/stack.py:2029 msgid "Tableau. Build up by suit." msgstr "Игровой стол. Складывать по возрастанию в соответствии с мастью." -#: pysollib/stack.py:1965 +#: pysollib/stack.py:2030 msgid "Tableau. Build down by suit." msgstr "Игровой стол. Складывать по убыванию в соответствии с мастью." -#: pysollib/stack.py:1973 +#: pysollib/stack.py:2038 msgid "Tableau. Build up regardless of suit." msgstr "Игровой стол. Складывать по возрастанию не считаясь с мастью." -#: pysollib/stack.py:1974 +#: pysollib/stack.py:2039 msgid "Tableau. Build down regardless of suit." msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью." -#: pysollib/stack.py:1983 +#: pysollib/stack.py:2048 msgid "Tableau. Build up in any suit but the same." msgstr "Игровой стол. Складывать по возрастанию в любую масть кроме такой же." -#: pysollib/stack.py:1984 +#: pysollib/stack.py:2049 msgid "Tableau. Build down in any suit but the same." msgstr "Игровой стол. Складывать по убыванию в любую масть кроме такой же." -#: pysollib/stack.py:2006 +#: pysollib/stack.py:2071 msgid "" "Tableau. Build up regardless of suit. Sequences of cards in alternate color " "can be moved as a unit." @@ -1856,7 +1856,7 @@ msgstr "" "Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно " "перемещать серии карт чередующихся цветом." -#: pysollib/stack.py:2007 +#: pysollib/stack.py:2072 msgid "" "Tableau. Build down regardless of suit. Sequences of cards in alternate " "color can be moved as a unit." @@ -1864,7 +1864,7 @@ msgstr "" "Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать " "серии карт чередующихся цветом." -#: pysollib/stack.py:2016 +#: pysollib/stack.py:2081 msgid "" "Tableau. Build up regardless of suit. Sequences of cards in the same suit " "can be moved as a unit." @@ -1872,7 +1872,7 @@ msgstr "" "Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно " "перемещать серии карт одинаковой масти." -#: pysollib/stack.py:2017 +#: pysollib/stack.py:2082 msgid "" "Tableau. Build down regardless of suit. Sequences of cards in the same suit " "can be moved as a unit." @@ -1880,7 +1880,7 @@ msgstr "" "Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать " "серии карт одинаковой масти." -#: pysollib/stack.py:2039 +#: pysollib/stack.py:2104 msgid "" "Tableau. Build up by alternate color, can move any face-up cards regardless " "of sequence." @@ -1888,7 +1888,7 @@ msgstr "" "Игровой стол. Складывать по возрастанию чередуя цвет, можно перемещать любую " "серию открытых карт." -#: pysollib/stack.py:2040 +#: pysollib/stack.py:2105 msgid "" "Tableau. Build down by alternate color, can move any face-up cards " "regardless of sequence." @@ -1896,7 +1896,7 @@ msgstr "" "Игровой стол. Складывать по убыванию чередуя цвет, можно перемещать любую " "серию открытых карт." -#: pysollib/stack.py:2041 pysollib/stack.py:2054 +#: pysollib/stack.py:2106 pysollib/stack.py:2119 msgid "" "Tableau. Build by same rank, can move any face-up cards regardless of " "sequence." @@ -1904,14 +1904,14 @@ msgstr "" "Игровой стол. Складывать в соответствии с достоинством, можно перемещать " "любую серию открытых карт." -#: pysollib/stack.py:2052 +#: pysollib/stack.py:2117 msgid "" "Tableau. Build up by suit, can move any face-up cards regardless of sequence." msgstr "" "Игровой стол. Складывать по возрастанию в соответствии с мастью, можно " "перемещать любую серию открытых карт." -#: pysollib/stack.py:2053 +#: pysollib/stack.py:2118 msgid "" "Tableau. Build down by suit, can move any face-up cards regardless of " "sequence." @@ -1919,30 +1919,30 @@ msgstr "" "Игровой стол. Складывать по убыванию в соответствии с мастью, можно " "перемещать любую серию открытых карт." -#: pysollib/stack.py:2086 +#: pysollib/stack.py:2151 msgid "Tableau. Build up or down by color." msgstr "" "Игровой стол. Складывать по возрастанию или убыванию в соответствии с цветом." -#: pysollib/stack.py:2097 +#: pysollib/stack.py:2162 msgid "Tableau. Build up or down by alternate color." msgstr "Игровой стол. Складывать по возрастанию или убыванию чередуя цвет." -#: pysollib/stack.py:2108 +#: pysollib/stack.py:2173 msgid "Tableau. Build up or down by suit." msgstr "" "Игровой стол. Складывать по возрастанию или убыванию в соответствии с мастью." -#: pysollib/stack.py:2119 +#: pysollib/stack.py:2184 msgid "Tableau. Build up or down regardless of suit." msgstr "" "Игровой стол. Складывать по возрастанию или убыванию не считаясь с мастью." -#: pysollib/stack.py:2130 +#: pysollib/stack.py:2195 msgid "Waste." msgstr "Сброс." -#: pysollib/stack.py:2230 +#: pysollib/stack.py:2295 msgid "Free cell." msgstr "Свободная ячейка." @@ -1962,7 +1962,7 @@ msgstr "Выиграл" msgid "Lost" msgstr "Проиграл" -#: pysollib/stats.py:122 pysollib/tk/statusbar.py:157 +#: pysollib/stats.py:122 pysollib/tk/statusbar.py:156 msgid "Playing time" msgstr "Время игры" @@ -1986,7 +1986,7 @@ msgstr "Игра" msgid "Status" msgstr "Статус" -#: pysollib/stats.py:162 pysollib/tk/statusbar.py:159 +#: pysollib/stats.py:162 pysollib/tk/statusbar.py:158 #: pysollib/tk/tkstats.py:735 msgid "Game number" msgstr "Номер игры" @@ -2015,48 +2015,48 @@ msgstr "Не выиграл" msgid "Perfect" msgstr "Великолепная" -#: pysollib/tk/colorsdialog.py:73 +#: pysollib/tk/colorsdialog.py:71 msgid "Text foreground:" msgstr "Цвет текста:" -#: pysollib/tk/colorsdialog.py:79 pysollib/tk/colorsdialog.py:98 +#: pysollib/tk/colorsdialog.py:76 pysollib/tk/colorsdialog.py:94 #: pysollib/tk/fontsdialog.py:186 msgid "Change..." msgstr "Изменить..." -#: pysollib/tk/colorsdialog.py:85 pysollib/tk/timeoutsdialog.py:68 +#: pysollib/tk/colorsdialog.py:81 pysollib/tk/timeoutsdialog.py:68 msgid "Highlight piles:" msgstr "Подсветка групп:" -#: pysollib/tk/colorsdialog.py:86 +#: pysollib/tk/colorsdialog.py:82 msgid "Highlight cards 1:" msgstr "Подсветка карт 1:" -#: pysollib/tk/colorsdialog.py:87 +#: pysollib/tk/colorsdialog.py:83 msgid "Highlight cards 2:" msgstr "Подсветка карт 2:" -#: pysollib/tk/colorsdialog.py:88 +#: pysollib/tk/colorsdialog.py:84 msgid "Highlight same rank 1:" msgstr "Подсветка карт одного достоинства 1:" -#: pysollib/tk/colorsdialog.py:89 +#: pysollib/tk/colorsdialog.py:85 msgid "Highlight same rank 2:" msgstr "Подсветка карт одного достоинства 2:" -#: pysollib/tk/colorsdialog.py:90 +#: pysollib/tk/colorsdialog.py:86 msgid "Hint arrow:" msgstr "Стрелка подсказки:" -#: pysollib/tk/colorsdialog.py:91 +#: pysollib/tk/colorsdialog.py:87 msgid "Highlight not matching:" msgstr "Подсветка отсутствия совпадения:" -#: pysollib/tk/colorsdialog.py:124 +#: pysollib/tk/colorsdialog.py:114 msgid "Select color" msgstr "Выбрать цвет" -#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:329 +#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:328 msgid "Find card" msgstr "Найти карту" @@ -2104,491 +2104,487 @@ msgstr "Игровой стол маленький: " msgid "Select font" msgstr "Выбрать шрифт" -#: pysollib/tk/menubar.py:75 +#: pysollib/tk/menubar.py:74 msgid "Style" msgstr "Стиль" -#: pysollib/tk/menubar.py:84 +#: pysollib/tk/menubar.py:83 msgid "Relief" msgstr "Рельеф" -#: pysollib/tk/menubar.py:85 +#: pysollib/tk/menubar.py:84 msgid "Flat" msgstr "Плоский" -#: pysollib/tk/menubar.py:89 +#: pysollib/tk/menubar.py:88 msgid "Raised" msgstr "Выпуклый" -#: pysollib/tk/menubar.py:94 +#: pysollib/tk/menubar.py:93 msgid "Compound" msgstr "Компоновка" -#: pysollib/tk/menubar.py:100 +#: pysollib/tk/menubar.py:99 msgid "Hide" msgstr "Спрятать" -#: pysollib/tk/menubar.py:103 +#: pysollib/tk/menubar.py:102 msgid "Top" msgstr "Сверху" -#: pysollib/tk/menubar.py:106 +#: pysollib/tk/menubar.py:105 msgid "Bottom" msgstr "Внизу" -#: pysollib/tk/menubar.py:109 +#: pysollib/tk/menubar.py:108 msgid "Left" msgstr "Слева" -#: pysollib/tk/menubar.py:112 +#: pysollib/tk/menubar.py:111 msgid "Right" msgstr "Справа" -#: pysollib/tk/menubar.py:116 +#: pysollib/tk/menubar.py:115 msgid "Small icons" msgstr "Маленькие пиктограммы" -#: pysollib/tk/menubar.py:119 +#: pysollib/tk/menubar.py:118 msgid "Large icons" msgstr "Большие пиктограммы" -#: pysollib/tk/menubar.py:125 +#: pysollib/tk/menubar.py:124 msgid "Customize toolbar" msgstr "Настроить панель инструментов" -#: pysollib/tk/menubar.py:256 +#: pysollib/tk/menubar.py:255 msgid "&File" msgstr "&Файл" -#: pysollib/tk/menubar.py:258 +#: pysollib/tk/menubar.py:257 msgid "R&ecent games" msgstr "Выбрать н&едавнюю игру" -#: pysollib/tk/menubar.py:260 +#: pysollib/tk/menubar.py:259 msgid "Select &random game" msgstr "С&лучайная игра" -#: pysollib/tk/menubar.py:261 +#: pysollib/tk/menubar.py:260 msgid "&All games" msgstr "&Все игры" -#: pysollib/tk/menubar.py:262 +#: pysollib/tk/menubar.py:261 msgid "Games played and &won" msgstr "&Выигранные игры" -#: pysollib/tk/menubar.py:263 +#: pysollib/tk/menubar.py:262 msgid "Games played and ¬ won" msgstr "&Невыигранные игры" -#: pysollib/tk/menubar.py:264 +#: pysollib/tk/menubar.py:263 msgid "Games not &played" msgstr "Не&сыгранные игры" -#: pysollib/tk/menubar.py:265 +#: pysollib/tk/menubar.py:264 msgid "Select game by nu&mber..." msgstr "Выбрать игру по &номеру..." -#: pysollib/tk/menubar.py:267 +#: pysollib/tk/menubar.py:266 msgid "Fa&vorite games" msgstr "&Избранные игры" -#: pysollib/tk/menubar.py:268 +#: pysollib/tk/menubar.py:267 msgid "A&dd to favorites" msgstr "&Добавить в избранное" -#: pysollib/tk/menubar.py:269 +#: pysollib/tk/menubar.py:268 msgid "R&emove from favorites" msgstr "&Удалить из избранных" -#: pysollib/tk/menubar.py:271 +#: pysollib/tk/menubar.py:270 msgid "&Open..." msgstr "&Открыть..." -#: pysollib/tk/menubar.py:272 +#: pysollib/tk/menubar.py:271 msgid "&Save" msgstr "&Сохранить" -#: pysollib/tk/menubar.py:273 +#: pysollib/tk/menubar.py:272 msgid "Save &as..." msgstr "Сохранить &как..." -#: pysollib/tk/menubar.py:275 +#: pysollib/tk/menubar.py:274 msgid "&Hold and quit" msgstr "Со&храниться и выйти" -#: pysollib/tk/menubar.py:280 pysollib/tk/selectgame.py:407 +#: pysollib/tk/menubar.py:279 pysollib/tk/selectgame.py:407 msgid "&Select" msgstr "&Выбрать" -#: pysollib/tk/menubar.py:285 +#: pysollib/tk/menubar.py:284 msgid "&Edit" msgstr "Р&едактировать" -#: pysollib/tk/menubar.py:286 +#: pysollib/tk/menubar.py:285 msgid "&Undo" msgstr "&Отмена" -#: pysollib/tk/menubar.py:287 +#: pysollib/tk/menubar.py:286 msgid "&Redo" msgstr "&Повтор" -#: pysollib/tk/menubar.py:288 +#: pysollib/tk/menubar.py:287 msgid "Redo &all" msgstr "Вернуть все" -#: pysollib/tk/menubar.py:291 +#: pysollib/tk/menubar.py:290 msgid "&Set bookmark" msgstr "Установить &закладку" -#: pysollib/tk/menubar.py:293 pysollib/tk/menubar.py:297 +#: pysollib/tk/menubar.py:292 pysollib/tk/menubar.py:296 msgid "Bookmark %d" msgstr "Закладка %d" -#: pysollib/tk/menubar.py:295 +#: pysollib/tk/menubar.py:294 msgid "Go&to bookmark" msgstr "&Перейти к закладке" -#: pysollib/tk/menubar.py:300 +#: pysollib/tk/menubar.py:299 msgid "&Clear bookmarks" msgstr "О&чистить закладки" -#: pysollib/tk/menubar.py:303 -msgid "Restart &game" -msgstr "&Начать с начала" +#: pysollib/tk/menubar.py:302 pysollib/tk/toolbar.py:198 +msgid "Restart" +msgstr "Начало" -#: pysollib/tk/menubar.py:305 +#: pysollib/tk/menubar.py:304 msgid "&Game" msgstr "&Игра" -#: pysollib/tk/menubar.py:306 +#: pysollib/tk/menubar.py:305 msgid "&Deal cards" msgstr "&Сдать карты" -#: pysollib/tk/menubar.py:307 +#: pysollib/tk/menubar.py:306 msgid "&Auto drop" msgstr "С&бросить карты" -#: pysollib/tk/menubar.py:308 +#: pysollib/tk/menubar.py:307 msgid "&Pause" msgstr "&Пауза" -#: pysollib/tk/menubar.py:311 +#: pysollib/tk/menubar.py:310 msgid "S&tatus..." msgstr "С&татус" -#: pysollib/tk/menubar.py:312 +#: pysollib/tk/menubar.py:311 msgid "&Comments..." msgstr "&Комментарии..." -#: pysollib/tk/menubar.py:314 +#: pysollib/tk/menubar.py:313 msgid "&Statistics" msgstr "Ст&атистика" -#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 +#: pysollib/tk/menubar.py:314 pysollib/tk/menubar.py:322 msgid "Current game..." msgstr "Текущая игра..." -#: pysollib/tk/menubar.py:316 pysollib/tk/menubar.py:324 +#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 msgid "All games..." msgstr "Все игры..." -#: pysollib/tk/menubar.py:318 +#: pysollib/tk/menubar.py:317 msgid "Session log..." msgstr "Лог сессии..." -#: pysollib/tk/menubar.py:319 +#: pysollib/tk/menubar.py:318 msgid "Full log..." msgstr "Полный лог..." -#: pysollib/tk/menubar.py:322 +#: pysollib/tk/menubar.py:321 msgid "D&emo statistics" msgstr "Статистика демо" -#: pysollib/tk/menubar.py:326 +#: pysollib/tk/menubar.py:325 msgid "&Assist" msgstr "&Подсказка" -#: pysollib/tk/menubar.py:327 +#: pysollib/tk/menubar.py:326 msgid "&Hint" msgstr "Подсказать &ход" -#: pysollib/tk/menubar.py:328 +#: pysollib/tk/menubar.py:327 msgid "Highlight p&iles" msgstr "П&оказать группы" -#: pysollib/tk/menubar.py:331 +#: pysollib/tk/menubar.py:330 msgid "&Demo" msgstr "&Демо" -#: pysollib/tk/menubar.py:332 +#: pysollib/tk/menubar.py:331 msgid "Demo (&all games)" msgstr "Демо (&все игры)" -#: pysollib/tk/menubar.py:334 +#: pysollib/tk/menubar.py:333 msgid "Piles description" msgstr "Описания ячеек" -#: pysollib/tk/menubar.py:338 +#: pysollib/tk/menubar.py:337 msgid "&Options" msgstr "&Настройка" -#: pysollib/tk/menubar.py:339 +#: pysollib/tk/menubar.py:338 msgid "&Player options..." msgstr "Настройки &игрока..." -#: pysollib/tk/menubar.py:340 +#: pysollib/tk/menubar.py:339 msgid "&Automatic play" msgstr "Настройки &автоматической игры" -#: pysollib/tk/menubar.py:341 +#: pysollib/tk/menubar.py:340 msgid "Auto &face up" msgstr "Автоматически &переворачивать" -#: pysollib/tk/menubar.py:342 +#: pysollib/tk/menubar.py:341 msgid "A&uto drop" msgstr "А&втоматически сбрасывать карты" -#: pysollib/tk/menubar.py:343 +#: pysollib/tk/menubar.py:342 msgid "Auto &deal" msgstr "Автоматически &сдавать карты" -#: pysollib/tk/menubar.py:345 +#: pysollib/tk/menubar.py:344 msgid "&Quick play" msgstr "&Быстрая игра" -#: pysollib/tk/menubar.py:346 +#: pysollib/tk/menubar.py:345 msgid "Assist &level" msgstr "&Уровень подсказки" -#: pysollib/tk/menubar.py:347 +#: pysollib/tk/menubar.py:346 msgid "Enable &undo" msgstr "Разрешить &возврат хода" -#: pysollib/tk/menubar.py:348 +#: pysollib/tk/menubar.py:347 msgid "Enable &bookmarks" msgstr "Разрешить &закладки" -#: pysollib/tk/menubar.py:349 +#: pysollib/tk/menubar.py:348 msgid "Enable &hint" msgstr "Разрешить &подсказки" -#: pysollib/tk/menubar.py:350 +#: pysollib/tk/menubar.py:349 msgid "Enable highlight p&iles" msgstr "Разрешить показывать к&учи" -#: pysollib/tk/menubar.py:351 +#: pysollib/tk/menubar.py:350 msgid "Enable highlight &cards" msgstr "Разрешить показывать &карты" -#: pysollib/tk/menubar.py:352 +#: pysollib/tk/menubar.py:351 msgid "Enable highlight same &rank" msgstr "Разрешить показывать карты &одного достоинства" -#: pysollib/tk/menubar.py:353 +#: pysollib/tk/menubar.py:352 msgid "Highlight &no matching" msgstr "Подсветка отсутствия &совпадения" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:354 msgid "&Show removed tiles (in Mahjongg games)" msgstr "Показывать удаленные (в Маджонг)" -#: pysollib/tk/menubar.py:356 +#: pysollib/tk/menubar.py:355 msgid "Show hint &arrow (in Shisen-Sho games)" msgstr "Показывать стрелку (в Шисен-Сё)" -#: pysollib/tk/menubar.py:358 +#: pysollib/tk/menubar.py:357 msgid "&Sound..." msgstr "&Звук..." -#: pysollib/tk/menubar.py:366 +#: pysollib/tk/menubar.py:365 msgid "Cards&et..." msgstr "Коло&да..." -#: pysollib/tk/menubar.py:367 +#: pysollib/tk/menubar.py:366 msgid "Table t&ile..." msgstr "Игровой &стол..." -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:368 msgid "Card &background" msgstr "&Рубашка карты" -#: pysollib/tk/menubar.py:370 +#: pysollib/tk/menubar.py:369 msgid "Card &view" msgstr "&Вид карты" -#: pysollib/tk/menubar.py:371 +#: pysollib/tk/menubar.py:370 msgid "Card shado&w" msgstr "Тень карты" -#: pysollib/tk/menubar.py:372 +#: pysollib/tk/menubar.py:371 msgid "Shade &legal moves" msgstr "Подсвечивать &разрешенные ходы" -#: pysollib/tk/menubar.py:373 +#: pysollib/tk/menubar.py:372 msgid "&Negative cards bottom" msgstr "&Негативные контуры карты" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:373 msgid "Shrink face-down cards" msgstr "Сжимать закрытые карты" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:374 msgid "Shade &filled stacks" msgstr "Затемнять заполненные ячейки" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:375 msgid "A&nimations" msgstr "Анимаци&я" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:376 msgid "&None" msgstr "&Нет" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:377 msgid "&Timer based" msgstr "Базирующаяся на &таймере" -#: pysollib/tk/menubar.py:379 +#: pysollib/tk/menubar.py:378 msgid "&Fast" msgstr "&Быстрая" -#: pysollib/tk/menubar.py:380 +#: pysollib/tk/menubar.py:379 msgid "&Slow" msgstr "&Медленная" -#: pysollib/tk/menubar.py:381 +#: pysollib/tk/menubar.py:380 msgid "&Very slow" msgstr "&Очень медленная" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:381 msgid "Stick&y mouse" msgstr "&Липкая мышь" -#: pysollib/tk/menubar.py:383 +#: pysollib/tk/menubar.py:382 msgid "Use mouse for undo/redo" msgstr "Использовать мышь для вперед/назад" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:384 msgid "&Fonts..." msgstr "&Шрифты..." -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:385 msgid "&Colors..." msgstr "&Цвета..." -#: pysollib/tk/menubar.py:387 +#: pysollib/tk/menubar.py:386 msgid "Time&outs..." msgstr "Тайма&уты..." -#: pysollib/tk/menubar.py:389 +#: pysollib/tk/menubar.py:388 msgid "&Toolbar" msgstr "Панель и&нструментов" -#: pysollib/tk/menubar.py:391 +#: pysollib/tk/menubar.py:390 msgid "Stat&usbar" msgstr "Панель с&остояния" -#: pysollib/tk/menubar.py:392 +#: pysollib/tk/menubar.py:391 msgid "Show &statusbar" msgstr "Показывать панель состояния" -#: pysollib/tk/menubar.py:393 +#: pysollib/tk/menubar.py:392 msgid "Show &number of cards" msgstr "Показывать количество карт" -#: pysollib/tk/menubar.py:394 +#: pysollib/tk/menubar.py:393 msgid "Show &help bar" msgstr "Показывать панель помощи" -#: pysollib/tk/menubar.py:395 +#: pysollib/tk/menubar.py:394 msgid "Save games &geometry" msgstr "Сохранение &геометрии игры" -#: pysollib/tk/menubar.py:396 +#: pysollib/tk/menubar.py:395 msgid "&Demo logo" msgstr "Д&емо лого" -#: pysollib/tk/menubar.py:397 +#: pysollib/tk/menubar.py:396 msgid "Startup splash sc&reen" msgstr "О&кно запуска" -#: pysollib/tk/menubar.py:403 +#: pysollib/tk/menubar.py:402 msgid "&Help" msgstr "&Помощь" -#: pysollib/tk/menubar.py:404 +#: pysollib/tk/menubar.py:403 msgid "&Contents" msgstr "&Содержание" -#: pysollib/tk/menubar.py:405 +#: pysollib/tk/menubar.py:404 msgid "&How to play" msgstr "Как &играть" -#: pysollib/tk/menubar.py:406 +#: pysollib/tk/menubar.py:405 msgid "&Rules for this game" msgstr "&Правила текущей игры" -#: pysollib/tk/menubar.py:407 +#: pysollib/tk/menubar.py:406 msgid "&License terms" msgstr "&Лицензия" -#: pysollib/tk/menubar.py:410 +#: pysollib/tk/menubar.py:409 msgid "&About " msgstr "&О программе " -#: pysollib/tk/menubar.py:522 +#: pysollib/tk/menubar.py:521 msgid "All &games..." msgstr "&Все игры..." -#: pysollib/tk/menubar.py:524 +#: pysollib/tk/menubar.py:523 msgid "Playable pre&view..." msgstr "Играемый &предпросмотр..." -#: pysollib/tk/menubar.py:573 +#: pysollib/tk/menubar.py:572 msgid "&Mahjongg games" msgstr "Игры маджонг" -#: pysollib/tk/menubar.py:611 +#: pysollib/tk/menubar.py:610 msgid "&Popular games" msgstr "&Популярные игры" -#: pysollib/tk/menubar.py:619 +#: pysollib/tk/menubar.py:618 msgid "&French games" msgstr "&Классические игры" -#: pysollib/tk/menubar.py:626 +#: pysollib/tk/menubar.py:625 msgid "&Oriental games" msgstr "&Восточные игры" -#: pysollib/tk/menubar.py:634 +#: pysollib/tk/menubar.py:633 msgid "&Special games" msgstr "&Особые игры" -#: pysollib/tk/menubar.py:640 -msgid "All games by name" -msgstr "Все игры по имени" +#: pysollib/tk/menubar.py:639 +msgid "&All games by name" +msgstr "&Все игры по имени" -#: pysollib/tk/menubar.py:894 pysollib/tk/menubar.py:896 +#: pysollib/tk/menubar.py:1000 pysollib/tk/menubar.py:1002 #: pysollib/tk/selectcardset.py:240 msgid "&Load" msgstr "&Загрузить" -#: pysollib/tk/menubar.py:896 +#: pysollib/tk/menubar.py:1002 msgid "&Info..." msgstr "&Информация..." -#: pysollib/tk/menubar.py:899 +#: pysollib/tk/menubar.py:1005 msgid "Select " msgstr "Выбрать " -#: pysollib/tk/menubar.py:960 +#: pysollib/tk/menubar.py:1066 msgid "Select table background" msgstr "Выбрать фоновое изображение" -#: pysollib/tk/menubar.py:972 pysollib/tk/selecttile.py:177 -msgid "Select table color" -msgstr "Выбрать цвет" - #: pysollib/tk/playeroptionsdialog.py:112 msgid "" "\n" @@ -2972,6 +2968,10 @@ msgstr "Все фоновые изображения" msgid "&Solid color..." msgstr "М&онотонный цвет..." +#: pysollib/tk/selecttile.py:177 +msgid "Select table color" +msgstr "Выбрать цвет" + #: pysollib/tk/soundoptionsdialog.py:75 msgid "Are You Sure" msgstr "Вы уверены" @@ -3080,11 +3080,11 @@ msgstr "" "Изменения установок DirectX вступят в силу\n" "при следующем запуске " -#: pysollib/tk/statusbar.py:158 +#: pysollib/tk/statusbar.py:157 msgid "Moves/Total moves" msgstr "Ходов/Всего ходов" -#: pysollib/tk/statusbar.py:160 +#: pysollib/tk/statusbar.py:159 msgid "Games played: won/lost" msgstr "Игр: выиграно/проиграно" @@ -3108,35 +3108,35 @@ msgstr "Подсветка карты:" msgid "Highlight same rank:" msgstr "Подсветка одинаковых карт:" -#: pysollib/tk/tkconst.py:104 +#: pysollib/tk/tkconst.py:101 msgid "Icons only" msgstr "Только пиктограммы" -#: pysollib/tk/tkconst.py:105 +#: pysollib/tk/tkconst.py:102 msgid "Text below icons" msgstr "Текст под пиктограммами" -#: pysollib/tk/tkconst.py:106 +#: pysollib/tk/tkconst.py:103 msgid "Text beside icons" msgstr "Текст рядом с пиктограммами" -#: pysollib/tk/tkconst.py:107 +#: pysollib/tk/tkconst.py:104 msgid "Text only" msgstr "Только текст" -#: pysollib/tk/tkhtml.py:251 +#: pysollib/tk/tkhtml.py:252 msgid "Index" msgstr "Индекс" -#: pysollib/tk/tkhtml.py:255 +#: pysollib/tk/tkhtml.py:256 msgid "Back" msgstr "Назад" -#: pysollib/tk/tkhtml.py:259 +#: pysollib/tk/tkhtml.py:260 msgid "Forward" msgstr "Вперед" -#: pysollib/tk/tkhtml.py:263 +#: pysollib/tk/tkhtml.py:264 msgid "Close" msgstr "Закрыть" @@ -3333,10 +3333,6 @@ msgstr "TOP для текущей игры отсутствует" msgid "New" msgstr "Новая" -#: pysollib/tk/toolbar.py:198 -msgid "Restart" -msgstr "Начало" - #: pysollib/tk/toolbar.py:198 msgid "" "Restart the\n" @@ -3417,34 +3413,65 @@ msgstr "Установки игрока" msgid "Toolbar" msgstr "Панель инструментов" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Club" msgstr "Треф" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Diamond" msgstr "Буби" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Heart" msgstr "Черви" -#: pysollib/util.py:76 +#: pysollib/util.py:75 msgid "Spade" msgstr "Пики" -#: pysollib/util.py:77 +#: pysollib/util.py:76 msgid "black" msgstr "черный" -#: pysollib/util.py:77 +#: pysollib/util.py:76 msgid "red" msgstr "красный" -#: pysollib/util.py:102 +#: pysollib/util.py:101 msgid "cardset" msgstr "набор карт" +#: data/glade-translations:7 +msgid "Game Statistics" +msgstr "Статистика игры" + +#: data/glade-translations:8 data/glade-translations:28 +msgid "Game:" +msgstr "Игра:" + +#: data/glade-translations:17 +msgid "Current game" +msgstr "Текущая игра" + +#: data/glade-translations:24 +msgid "Summary" +msgstr "Сводка" + +#: data/glade-translations:27 +msgid "Total moves" +msgstr "Всего ходов" + +#: data/glade-translations:30 +msgid "All games" +msgstr "Все игры" + +#: data/glade-translations:57 +msgid "Set font" +msgstr "Настроить шрифт" + +#~ msgid "Restart &game" +#~ msgstr "&Начать с начала" + #~ msgid "Balance $%4d" #~ msgstr "Баланс $%4d" diff --git a/pysollib/actions.py b/pysollib/actions.py index 5a0b06c1..a91fa60d 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -1,4 +1,3 @@ -## -*- coding: utf-8 -*- ## vim:ts=4:et:nowrap ## ##---------------------------------------------------------------------------## @@ -42,7 +41,6 @@ import os, re, sys, string, time, types, locale from mfxutil import EnvError, SubclassResponsibility from mfxutil import Struct, destruct, openURL from pysolrandom import constructRandom -from version import VERSION from settings import PACKAGE, PACKAGE_URL from settings import TOP_TITLE from gamedb import GI @@ -68,7 +66,7 @@ from pysoltk import FontsDialog from pysoltk import EditTextDialog from pysoltk import TOOLBAR_BUTTONS from pysoltk import create_find_card_dialog, connect_game_find_card_dialog, destroy_find_card_dialog -from help import helpAbout, helpHTML +from help import help_about, help_html gettext = _ @@ -875,11 +873,11 @@ class PysolMenubarActions: def mHelp(self, *args): if self._cancelDrag(break_pause=False): return - helpHTML(self.app, "index.html", "html") + help_html(self.app, "index.html", "html") def mHelpHowToPlay(self, *args): if self._cancelDrag(break_pause=False): return - helpHTML(self.app, "howtoplay.html", "html") + help_html(self.app, "howtoplay.html", "html") def mHelpRules(self, *args): if self._cancelDrag(break_pause=False): return @@ -887,22 +885,22 @@ class PysolMenubarActions: return dir = os.path.join("html", "rules") ## FIXME: plugins - helpHTML(self.app, self.app.getGameRulesFilename(self.game.id), dir) + help_html(self.app, self.app.getGameRulesFilename(self.game.id), dir) def mHelpLicense(self, *args): if self._cancelDrag(break_pause=False): return - helpHTML(self.app, "license.html", "html") + help_html(self.app, "license.html", "html") def mHelpNews(self, *args): if self._cancelDrag(break_pause=False): return - helpHTML(self.app, "news.html", "html") + help_html(self.app, "news.html", "html") def mHelpWebSite(self, *args): openURL(PACKAGE_URL) def mHelpAbout(self, *args): if self._cancelDrag(break_pause=False): return - helpAbout(self.app) + help_about(self.app) # # misc diff --git a/pysollib/app.py b/pysollib/app.py index 0ebdd5eb..3af70717 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -45,8 +45,7 @@ from mfxutil import getusername, gethomedir, getprefdir, EnvError from mfxutil import latin1_to_ascii from util import Timer from util import CARDSET, IMAGE_EXTENSIONS -from version import VERSION, VERSION_TUPLE -from settings import PACKAGE, PACKAGE_URL +from settings import PACKAGE, PACKAGE_URL, VERSION, VERSION_TUPLE from resource import CSI, CardsetConfig, Cardset, CardsetManager from resource import Tile, TileManager from resource import Sample, SampleManager @@ -67,10 +66,10 @@ from pysoltk import PysolToolbar from pysoltk import PysolStatusbar, HelpStatusbar from pysoltk import SelectCardsetDialogWithPreview from pysoltk import SelectDialogTreeData -from pysoltk import tkHTMLViewer +from pysoltk import HTMLViewer from pysoltk import TOOLBAR_BUTTONS from pysoltk import destroy_find_card_dialog -from help import helpAbout, destroy_help +from help import help_about, destroy_help_html gettext = _ @@ -714,7 +713,7 @@ class Application: self.wm_withdraw() # destroy_find_card_dialog() - destroy_help() + destroy_help_html() # update options self.opt.last_gameid = id # save options @@ -792,7 +791,7 @@ class Application: self.nextgame.bookmark = None # splash screen if self.opt.splashscreen and self.splashscreen > 0: - status = helpAbout(self, timeout=20000, sound=0) + status = help_about(self, timeout=20000, sound=0) if status == 2: # timeout - start a demo if autoplay: self.nextgame.startdemo = 1 @@ -901,7 +900,7 @@ class Application: dir = os.path.join('images', 'htmlviewer') # fn = self.dataloader.findImage('disk', dir) - tkHTMLViewer.symbols_fn['disk'] = fn + HTMLViewer.symbols_fn['disk'] = fn def loadImages4(self): # load all remaining images diff --git a/pysollib/game.py b/pysollib/game.py index 3a1d7508..e3c10b05 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -45,8 +45,7 @@ from mfxutil import UnpicklingError, uclock, usleep from mfxutil import format_time from util import get_version_tuple, Timer from util import ACE, QUEEN, KING -from version import VERSION, VERSION_TUPLE -from settings import PACKAGE, TOOLKIT, TOP_TITLE +from settings import PACKAGE, TOOLKIT, TOP_TITLE, VERSION, VERSION_TUPLE from gamedb import GI from resource import CSI from pysolrandom import PysolRandom, LCRandom31 @@ -63,7 +62,7 @@ from move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove from move import AUpdateStackMove, AFlipAllMove, ASaveStateMove from move import ACloseStackMove, ASingleCardMove from hint import DefaultHint -from help import helpAbout +from help import help_about PLAY_TIME_TIMEOUT = 200 @@ -1891,7 +1890,7 @@ for %d moves. self.app.demo_counter = self.app.demo_counter + 1 if self.app.demo_counter % 3 == 0: if self.top.winfo_ismapped(): - status = helpAbout(self.app, timeout=10000) + status = help_about(self.app, timeout=10000) if self.demo and status == 2: # timeout in dialog - start another demo demo = self.demo diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index 8cfad24d..f4a82c92 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -41,7 +41,7 @@ from pysollib.stack import * from pysollib.game import Game from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint -from pysollib.pysoltk import MfxCanvasText, getTextWidth +from pysollib.pysoltk import MfxCanvasText, get_text_width # /*********************************************************************** # // @@ -127,8 +127,8 @@ class Calculation(Game): lines = help.split('\n') lines.sort(lambda a, b: cmp(len(a), len(b))) max_line = lines[-1] - text_width = getTextWidth(max_line, - font=self.app.getFont("canvas_fixed")) + text_width = get_text_width(max_line, + font=self.app.getFont("canvas_fixed")) return help, text_width def createGame(self): diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py index c994ce7d..379be556 100644 --- a/pysollib/games/mahjongg/mahjongg.py +++ b/pysollib/games/mahjongg/mahjongg.py @@ -40,6 +40,7 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.pysoltk import MfxCanvasText, MfxCanvasImage, bind, \ EVENT_HANDLED, ANCHOR_NW +from pysollib.settings import TOOLKIT def factorial(x): @@ -191,14 +192,20 @@ class Mahjongg_RowStack(OpenStack): def _position(self, card): OpenStack._position(self, card) # - rows = filter(lambda s: s.cards, self.game.s.rows[:self.id]) - if rows: - self.group.tkraise(rows[-1].group) - return - rows = filter(lambda s: s.cards, self.game.s.rows[self.id+1:]) - if rows: - self.group.lower(rows[0].group) - return + if TOOLKIT == 'tk': + rows = filter(lambda s: s.cards, self.game.s.rows[:self.id]) + if rows: + self.group.tkraise(rows[-1].group) + return + rows = filter(lambda s: s.cards, self.game.s.rows[self.id+1:]) + if rows: + self.group.lower(rows[0].group) + return + elif TOOLKIT == 'gtk': + # FIXME (this is very slow) + for s in self.game.s.rows[self.id+1:]: + s.group.tkraise() + # In Mahjongg games type there are a lot of stacks, so we optimize # and don't create bindings that are not used anyway. @@ -259,16 +266,16 @@ class Mahjongg_RowStack(OpenStack): img = drag.shade_img img.dtag(drag.shade_stack.group) img.moveTo(self.x, self.y) + img.addtag(self.group) else: img = game.app.images.getShade() if img is None: return 1 - img = MfxCanvasImage(game.canvas, self.x, self.y, - image=img, anchor=ANCHOR_NW) + img = MfxCanvasImage(game.canvas, self.x, self.y, image=img, + anchor=ANCHOR_NW, group=self.group) drag.shade_img = img # raise/lower the shade image to the correct stacking order img.tkraise(self.cards[-1].item) - img.addtag(self.group) drag.shade_stack = self return 1 @@ -462,8 +469,13 @@ class AbstractMahjonggGame(Game): x = l.XM+i*cardw y = l.YM+fdyy+j*cardh else: - x = -l.XS - y = l.YM+dyy + if TOOLKIT == 'tk': + x = -l.XS + y = l.YM+dyy + elif TOOLKIT == 'gtk': + # FIXME + x = self.width -l.XS + y = self.height - l.YS stack = Mahjongg_Foundation(x, y, self) if show_removed: stack.CARD_XOFFSET = dx diff --git a/pysollib/help.py b/pysollib/help.py index 28dfeca4..5a51aee5 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -41,11 +41,10 @@ import Tkinter # PySol imports from mfxutil import EnvError -from settings import PACKAGE, PACKAGE_URL, TOOLKIT -from version import VERSION, FC_VERSION -from pysoltk import makeHelpToplevel, wm_map, wm_set_icon +from settings import PACKAGE, PACKAGE_URL, TOOLKIT, VERSION, FC_VERSION +from pysoltk import make_help_toplevel, wm_map, wm_set_icon from pysoltk import MfxMessageDialog -from pysoltk import tkHTMLViewer +from pysoltk import HTMLViewer from gamedb import GAME_DB # /*********************************************************************** @@ -58,7 +57,7 @@ class AboutDialog(MfxMessageDialog): return top_frame, bottom_frame -def helpAbout(app, timeout=0, sound=1): +def help_about(app, timeout=0, sound=1): if sound: app.audio.playSample("about") t = _("A Python Solitaire Game Collection\n") @@ -87,18 +86,18 @@ For more information about this application visit strings=strings, default=0, separatorwidth=2) if d.status == 0 and d.button == 1: - helpCredits(app, sound=sound) + help_credits(app, sound=sound) return d.status -def helpCredits(app, timeout=0, sound=1): +def help_credits(app, timeout=0, sound=1): if sound: app.audio.playSample("credits") t = "" - if TOOLKIT == "tk": t = "Tcl/Tk, " - elif TOOLKIT == "gtk": t = "PyGTK, " - elif TOOLKIT == "kde": t = "pyKDE, " - elif TOOLKIT == "wx": t = "wxPython, " + if TOOLKIT == "tk" : t = "Tcl/Tk" + elif TOOLKIT == "gtk": t = "PyGTK" + elif TOOLKIT == "kde": t = "pyKDE" + elif TOOLKIT == "wx" : t = "wxPython" d = MfxMessageDialog(app.top, title=_("Credits"), timeout=timeout, text=PACKAGE+_(''' credits go to: @@ -123,7 +122,7 @@ for making this program possible''') % t, help_html_viewer = None help_html_index = None -def helpHTML(app, document, dir_, top=None): +def help_html(app, document, dir_, top=None): global help_html_viewer, help_html_index if not document: return None @@ -149,7 +148,7 @@ def helpHTML(app, document, dir_, top=None): viewer.display(doc, relpath=0) except: ##traceback.print_exc() - top = makeHelpToplevel(app, title=PACKAGE+_(" Help")) + top = make_help_toplevel(app, title=PACKAGE+_(" Help")) if top.winfo_screenwidth() < 800 or top.winfo_screenheight() < 600: #maximized = 1 top.wm_minsize(300, 150) @@ -160,14 +159,14 @@ def helpHTML(app, document, dir_, top=None): wm_set_icon(top, app.dataloader.findIcon()) except: pass - viewer = tkHTMLViewer(top, app, help_html_index) + viewer = HTMLViewer(top, app, help_html_index) viewer.display(doc) #wm_map(top, maximized=maximized) viewer.parent.tkraise() help_html_viewer = viewer return viewer -def destroy_help(): +def destroy_help_html(): try: help_html_viewer.destroy() except: diff --git a/pysollib/images.py b/pysollib/images.py index 091c0ff7..3a2995a4 100644 --- a/pysollib/images.py +++ b/pysollib/images.py @@ -38,7 +38,6 @@ import os, types # PySol imports -from version import VERSION, VERSION_TUPLE from mfxutil import Pickler, Unpickler, UnpicklingError from mfxutil import Struct, EnvError diff --git a/pysollib/main.py b/pysollib/main.py index 6f1dab6f..a4e1dcb8 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -43,8 +43,7 @@ import gettext # PySol imports from mfxutil import destruct, EnvError from util import CARDSET, DataLoader -from version import VERSION -from settings import PACKAGE, TOOLKIT +from settings import PACKAGE, TOOLKIT, VERSION from resource import Tile from gamedb import GI from app import Application diff --git a/pysollib/pysolgtk/colorsdialog.py b/pysollib/pysolgtk/colorsdialog.py index d7fefbbc..ac8e6818 100644 --- a/pysollib/pysolgtk/colorsdialog.py +++ b/pysollib/pysolgtk/colorsdialog.py @@ -40,15 +40,6 @@ gettext = _ class ColorsDialog: -## self.app.opt.table_text_color = d.table_text_color -## self.app.opt.table_text_color_value = d.table_text_color_value -## ##self.app.opt.table_color = d.table_color -## self.app.opt.highlight_piles_colors = d.highlight_piles_colors -## self.app.opt.highlight_cards_colors = d.highlight_cards_colors -## self.app.opt.highlight_samerank_colors = d.highlight_samerank_colors -## self.app.opt.hintarrow_color = d.hintarrow_color -## self.app.opt.highlight_not_matching_color = d.highlight_not_matching_color - def __init__(self, parent, title, app, **kw): glade_file = app.dataloader.findFile('pysolfc.glade') @@ -65,10 +56,9 @@ class ColorsDialog: 'not_matching', ) for n in keys: - label = self.widgets_tree.get_widget(n+'_label') - self._setColor(label, app.opt.colors[n]) + self._setColor(n, app.opt.colors[n]) button = self.widgets_tree.get_widget(n+'_button') - button.connect('clicked', self._changeColor, n, label) + button.connect('clicked', self._changeColor, n) checkbutton = self.widgets_tree.get_widget('use_default_checkbutton') checkbutton.set_active(not app.opt.use_default_text_color) @@ -78,7 +68,6 @@ class ColorsDialog: self.dialog = dialog dialog.set_title(title) dialog.set_transient_for(parent) - dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) self.status = -1 self.button = -1 @@ -95,16 +84,16 @@ class ColorsDialog: dialog.destroy() - def _setColor(self, label, color): - c = gdk.color_parse(color) - al = pango.AttrList() - al.insert(pango.AttrBackground(c.red, c.green, c.blue, 0, 10)) - label.set_attributes(al) + def _setColor(self, name, color): + label = self.widgets_tree.get_widget(name+'_label') + eventbox = self.widgets_tree.get_widget(name+'_eventbox') + eventbox.modify_bg(gtk.STATE_NORMAL, gdk.color_parse(color)) label.set_data('user_data', color) + label.set_text(color) - def _changeColor(self, w, name, label): - print '_changeColor', name + def _changeColor(self, w, name): + label = self.widgets_tree.get_widget(name+'_label') color = label.get_data('user_data') dialog = gtk.ColorSelectionDialog(_('Select color')) dialog.help_button.destroy() @@ -115,7 +104,7 @@ class ColorsDialog: if response == gtk.RESPONSE_OK: c = dialog.colorsel.get_current_color() c = '#%02x%02x%02x' % (c.red/256, c.green/256, c.blue/256) - self._setColor(label, c) + self._setColor(name, c) dialog.destroy() @@ -128,8 +117,17 @@ class ColorsDialog: 'label35', 'label36', 'label37', + 'label46', + 'label47', + 'label48', + 'label49', + 'label50', + 'label51', + 'label52', + 'label53', ): w = self.widgets_tree.get_widget(n) w.set_text(gettext(w.get_text())) - + w = self.widgets_tree.get_widget('use_default_checkbutton') + w.set_label(gettext(w.get_label())) diff --git a/pysollib/pysolgtk/fontsdialog.py b/pysollib/pysolgtk/fontsdialog.py index d99e4853..67211c8a 100644 --- a/pysollib/pysolgtk/fontsdialog.py +++ b/pysollib/pysolgtk/fontsdialog.py @@ -24,26 +24,128 @@ __all__ = ['FontsDialog'] # imports ## import os, sys ## import types -## import Tkinter -## import tkFont import gtk, gobject, pango import gtk.glade # PySol imports -## from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +from tkutil import create_pango_font_desc # Toolkit imports -## from tkconst import EVENT_HANDLED, EVENT_PROPAGATE -## from tkutil import bind +gettext = _ + # /*********************************************************************** # // # ************************************************************************/ class FontsDialog: + def __init__(self, parent, title, app, **kw): - pass + glade_file = app.dataloader.findFile('pysolfc.glade') + self.widgets_tree = gtk.glade.XML(glade_file) + + keys = ( + 'sans', + 'small', + 'fixed', + 'canvas_default', + 'canvas_fixed', + 'canvas_large', + 'canvas_small', + ) + + for n in keys: + font = app.opt.fonts[n] + self._setFont(n, font) + button = self.widgets_tree.get_widget(n+'_button') + button.connect('clicked', self._changeFont, n) + + self._translateLabels() + + dialog = self.widgets_tree.get_widget('fonts_dialog') + self.dialog = dialog + dialog.set_title(title) + dialog.set_transient_for(parent) + + self.status = -1 + self.button = -1 + self.fonts = {} + response = dialog.run() + if response == gtk.RESPONSE_OK: + self.status = 0 + self.button = 0 + for n in keys: + label = self.widgets_tree.get_widget(n+'_label') + font = label.get_data('user_data') + self.fonts[n] = font + + dialog.destroy() + + + def _setFont(self, name, font): + label = self.widgets_tree.get_widget(name+'_label') + font_desc = create_pango_font_desc(font) + label.modify_font(font_desc) + text = ' '.join([str(i) for i in font if not i in ('roman', 'normal')]) + label.set_text(text) + label.set_data('user_data', font) + + + def _changeFont(self, w, name): + label = self.widgets_tree.get_widget(name+'_label') + font = label.get_data('user_data') + dialog = gtk.FontSelectionDialog(_('Select color')) + dialog.set_transient_for(self.dialog) + dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) + font_name = font[0] + bi = [] + if 'bold' in font: + bi.append('bold') + if 'italic' in font: + bi.append('italic') + if bi: + bi = ' '.join(bi) + font_name += ', '+bi + font_name += ' '+str(font[1]) + dialog.fontsel.set_font_name(font_name) + response = dialog.run() + if response == gtk.RESPONSE_OK: + font = dialog.fontsel.get_font_name() + fd = pango.FontDescription(font) + family = fd.get_family() + size = fd.get_size()/pango.SCALE + style = (fd.get_style() == pango.STYLE_NORMAL + and 'roman' or 'italic') + weight = (fd.get_weight() == pango.WEIGHT_NORMAL + and 'normal' or 'bold') + font = (family, size, style, weight) + self._setFont(name, font) + + dialog.destroy() + + + def _translateLabels(self): + for n in ( + 'label54', + 'label55', + 'label56', + 'label57', + 'label58', + 'label59', + 'label60', + 'label69', + 'label70', + 'label71', + 'label72', + 'label73', + 'label74', + 'label75', + ): + w = self.widgets_tree.get_widget(n) + w.set_text(gettext(w.get_text())) + diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index ced06062..26f817af 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -196,12 +196,15 @@ class PysolMenubar(PysolMenubarActions): ('cardset', None, ltk2gtk('Cards&et...'), 'E', None, self.mSelectCardsetDialog), - ('timeouts', None, - ltk2gtk('Time&outs...'), None, - None, self.mOptTimeouts), + ('fonts', None, + ltk2gtk('&Fonts...'), None, + None, self.mOptFonts), ('colors', None, ltk2gtk('&Colors...'), None, None, self.mOptColors), + ('timeouts', None, + ltk2gtk('Time&outs...'), None, + None, self.mOptTimeouts), ('contents', None, ltk2gtk('&Contents'), 'F1', None, self.mHelp), @@ -375,6 +378,7 @@ class PysolMenubar(PysolMenubarActions): + diff --git a/pysollib/pysolgtk/progressbar.py b/pysollib/pysolgtk/progressbar.py index 82e8e6c3..378b45ee 100644 --- a/pysollib/pysolgtk/progressbar.py +++ b/pysollib/pysolgtk/progressbar.py @@ -95,13 +95,13 @@ class PysolProgressBar: im.set_property('xpad', 10) im.set_property('ypad', 5) # set icon - if app: - try: - name = app.dataloader.findFile('pysol.xpm') - bg = self.top.get_style().bg[gtk.STATE_NORMAL] - pixmap, mask = create_pixmap_from_xpm(self.top, bg, name) - self.top.set_icon(pixmap, mask) - except: pass +## if app: +## try: +## name = app.dataloader.findFile('pysol.xpm') +## bg = self.top.get_style().bg[gtk.STATE_NORMAL] +## pixmap, mask = create_pixmap_from_xpm(self.top, bg, name) +## self.top.set_icon(pixmap, mask) +## except: pass setTransient(self.top, parent) self.top.show() self.top.window.set_cursor(gdk.Cursor(gdk.WATCH)) diff --git a/pysollib/pysolgtk/selectgame.py b/pysollib/pysolgtk/selectgame.py index f297d209..741e9418 100644 --- a/pysollib/pysolgtk/selectgame.py +++ b/pysollib/pysolgtk/selectgame.py @@ -45,7 +45,7 @@ from pysollib.mfxutil import destruct, Struct, KwStruct from pysollib.mfxutil import kwdefault from pysollib.mfxutil import format_time from pysollib.gamedb import GI -from pysollib.help import helpHTML +from pysollib.help import help_html from pysollib.resource import CSI # Toolkit imports @@ -539,7 +539,7 @@ class SelectGameDialogWithPreview(MfxDialog): if not doc: return dir = os.path.join("html", "rules") - helpHTML(self.app, doc, dir, self) + help_html(self.app, doc, dir, self) return self.status = 0 diff --git a/pysollib/pysolgtk/timeoutsdialog.py b/pysollib/pysolgtk/timeoutsdialog.py index 4d98ef31..f7793228 100644 --- a/pysollib/pysolgtk/timeoutsdialog.py +++ b/pysollib/pysolgtk/timeoutsdialog.py @@ -79,7 +79,6 @@ class TimeoutsDialog: dialog = self.widgets_tree.get_widget('timeouts_dialog') dialog.set_title(title) dialog.set_transient_for(parent) - dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT) self.status = -1 self.button = -1 diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index 43ff8751..0769fdfc 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -52,13 +52,13 @@ import os, sys, types import gobject -import gtk +import gtk, pango from gtk import gdk import gnome.canvas TRUE, FALSE = True, False # toolkit imports -from tkutil import anchor_tk2gtk, loadImage, bind +from tkutil import anchor_tk2gtk, loadImage, bind, create_pango_font_desc # /*********************************************************************** @@ -147,7 +147,7 @@ class _CanvasItem: self._is_hidden = True def connect(self, signal, func, args): - ##print signal + #print '_CanvasItem.connect:', self, signal self._item.connect('event', func, args) @@ -252,7 +252,7 @@ class MfxCanvasText(_CanvasItem): kw['fill'] = canvas._text_color for k, v in kw.items(): self[k] = v - self.text_format = None + ##~ self.text_format = None canvas._text_items.append(self) self._item.show() @@ -260,7 +260,9 @@ class MfxCanvasText(_CanvasItem): if key == 'fill': self._item.set(fill_color=value) elif key == 'font': - self._item.set(font=value) + ##print 'set font:', value + font_desc = create_pango_font_desc(value) + self._item.set(font_desc=font_desc) elif key == 'text': self._item.set(text=value) else: @@ -300,19 +302,16 @@ class MfxCanvas(gnome.canvas.Canvas): self._text_color = '#000000' # gnome.canvas.Canvas.__init__(self) - style = self.get_style().copy() - if bg is not None: - c = self.get_colormap().alloc(bg) - style.bg[gtk.STATE_NORMAL] = c - self.set_style(style) self.top_bg = top.style.bg[gtk.STATE_NORMAL] + if bg is not None: + self.modify_bg(gtk.STATE_NORMAL, gdk.color_parse(bg)) - ## + # self.top = top self.xmargin, self.ymargin = 0, 0 self.connect('size-allocate', self._sizeAllocate) - self.connect('destroy', self.destroyEvent) + ##self.connect('destroy', self.destroyEvent) def __setattr__(self, name, value): @@ -363,9 +362,7 @@ class MfxCanvas(gnome.canvas.Canvas): height, width = -1, -1 for k, v in kw.items(): if k in ('background', 'bg'): - ##print 'configure: bg:', v - c = self.get_colormap().alloc_color(v) - self.style.bg[gtk.STATE_NORMAL] = c + self.modify_bg(gtk.STATE_NORMAL, gdk.color_parse(v)) elif k == 'cursor': if not self.window: self.realize() @@ -390,9 +387,6 @@ class MfxCanvas(gnome.canvas.Canvas): i._item.destroy() ##i._item = None self._all_items = [] - if 0: #self.__tileimage: - self.__tileimage.destroy() - self.__tileimage = None def hideAllItems(self): self._hidden_items = [] diff --git a/pysollib/pysolgtk/tkhtml.py b/pysollib/pysolgtk/tkhtml.py index 607463d5..463ff81d 100644 --- a/pysollib/pysolgtk/tkhtml.py +++ b/pysollib/pysolgtk/tkhtml.py @@ -33,7 +33,7 @@ ## ##---------------------------------------------------------------------------## -__all__ = ['tkHTMLViewer'] +__all__ = ['HTMLViewer'] # imports import os, sys, re, types @@ -70,7 +70,7 @@ class tkHTMLWriter(formatter.NullWriter): formatter.NullWriter.__init__(self) self.text = text # gtk.TextBuffer - self.viewer = viewer # tkHTMLViewer + self.viewer = viewer # HTMLViewer self.anchor = None self.anchor_mark = None @@ -197,7 +197,7 @@ class tkHTMLParser(htmllib.HTMLParser): # // # ************************************************************************/ -class tkHTMLViewer: +class HTMLViewer: symbols_fn = {} # filenames, loaded in Application.loadImages3 symbols_img = {} @@ -581,7 +581,7 @@ def tkhtml_main(args): table.show() top.add(table) top.table = table - viewer = tkHTMLViewer(top) + viewer = HTMLViewer(top) viewer.app = None viewer.display(url) top.connect('destroy', lambda w: gtk.main_quit()) diff --git a/pysollib/pysolgtk/tkstats.py b/pysollib/pysolgtk/tkstats.py index 9e02ee7a..28e2281d 100644 --- a/pysollib/pysolgtk/tkstats.py +++ b/pysollib/pysolgtk/tkstats.py @@ -168,6 +168,7 @@ class Game_StatsDialog: def _translateLabels(self): # mnemonic for n in ( + 'label0', 'label1', 'label2', 'label3', diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index 9f8fbc95..489f7a8a 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -253,8 +253,8 @@ def bind(widget, sequence, func, add=None): widget.connect(signal, _wrap_event, l) __bindings[k] = l + def unbind_destroy(widget): - return k = id(widget) if __bindings.has_key(k): ## FIXME @@ -282,12 +282,20 @@ def after_cancel(t): # // font # ************************************************************************/ -def getTextWidth(text, font=None, root=None): +def create_pango_font_desc(font): + font_desc = pango.FontDescription(font[0]+' '+str(font[1])) + if 'italic' in font: + font_desc.set_style(pango.STYLE_ITALIC) + if 'bold' in font: + font_desc.set_weight(pango.WEIGHT_BOLD) + return font_desc + + +def get_text_width(text, font=None, root=None): if root: - pango_font_desc = pango.FontDescription(font[0]+' '+str(font[1])) + pango_font_desc = create_pango_font_desc(font) pangolayout = root.create_pango_layout(text) width = pangolayout.get_pixel_extents()[1][2] return width return 0 - diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index 7813fcc1..b4fb77c7 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -50,7 +50,7 @@ from tkutil import makeToplevel, loadImage class TclError: pass -def makeHelpToplevel(parent, title=None, class_=None): +def make_help_toplevel(parent, title=None, class_=None): return makeToplevel(parent, title=title, class_=class_, gtkclass=_MfxToplevel) @@ -219,6 +219,7 @@ class _MfxToplevel(gtk.Window): pass def wm_iconbitmap(self, name): + print 'wm_iconbitmap:', name if name and name[0] == '@' and name[-4:] == '.xbm': name = name[1:-4] + '.xpm' bg = self.get_style().bg[gtk.STATE_NORMAL] diff --git a/pysollib/resource.py b/pysollib/resource.py index 038c67c6..12935e33 100644 --- a/pysollib/resource.py +++ b/pysollib/resource.py @@ -41,8 +41,7 @@ import sys, os, glob, operator, types # PySol imports from mfxutil import win32api from mfxutil import Struct, KwStruct, EnvError, latin1_to_ascii -from version import VERSION -from settings import PACKAGE +from settings import PACKAGE, VERSION # /*********************************************************************** diff --git a/pysollib/settings.py b/pysollib/settings.py index 70cb08f8..9841f870 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -24,9 +24,13 @@ import sys, os n_ = lambda x: x # -#PACKAGE = "PySolFC" -PACKAGE = "PySol" -PACKAGE_URL = "http://sourceforge.net/projects/pysolfc/" +#PACKAGE = 'PySolFC' +PACKAGE = 'PySol' +PACKAGE_URL = 'http://sourceforge.net/projects/pysolfc/' + +VERSION = '4.82' +FC_VERSION = '0.9.3' +VERSION_TUPLE = (4, 82) TOOLKIT = 'gtk' TOOLKIT = 'tk' @@ -34,18 +38,18 @@ TOOLKIT = 'tk' # data dirs DATA_DIRS = [] # you can add your extra directories here -if os.name == "posix": +if os.name == 'posix': DATA_DIRS = [ '/usr/share/PySolFC', '/usr/local/share/PySolFC', '/usr/games/PySolFC', '/usr/local/games/PySolFC', ] -if os.name == "nt": +if os.name == 'nt': pass -if os.name == "mac": +if os.name == 'mac': pass TOP_SIZE = 10 -TOP_TITLE = n_("Top 10") +TOP_TITLE = n_('Top 10') diff --git a/pysollib/stack.py b/pysollib/stack.py index a43db16f..d65103de 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -105,7 +105,7 @@ from pysoltk import bind, unbind_destroy from pysoltk import after, after_idle, after_cancel from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText from pysoltk import Card -from pysoltk import getTextWidth +from pysoltk import get_text_width from settings import TOOLKIT @@ -1585,7 +1585,8 @@ class TalonStack(Stack, else: ca = None font = self.game.app.getFont("canvas_default") - text_width = getTextWidth(_('Redeal'), font=font, root=self.game.canvas) + text_width = get_text_width(_('Redeal'), font=font, + root=self.game.canvas) if images.CARDW >= text_width+4 and ca: # add a redeal text above the bottom image if self.max_rounds != 1: diff --git a/pysollib/stats.py b/pysollib/stats.py index feb166bb..65b311db 100644 --- a/pysollib/stats.py +++ b/pysollib/stats.py @@ -40,7 +40,7 @@ import os, sys, time, types # PySol imports from mfxutil import SubclassResponsibility, Struct, destruct from mfxutil import format_time -from util import PACKAGE, VERSION +from settings import PACKAGE, VERSION from gamedb import GI diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index bc8c951f..55b906d0 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -43,7 +43,6 @@ import Tkinter, tkColorChooser, tkFileDialog # PySol imports from pysollib.mfxutil import destruct, Struct, kwdefault from pysollib.util import CARDSET -from pysollib.version import VERSION from pysollib.settings import PACKAGE from pysollib.settings import TOP_TITLE from pysollib.gamedb import GI diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index b291e678..5bbf2135 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -42,7 +42,7 @@ from UserList import UserList from pysollib.mfxutil import destruct, Struct, KwStruct from pysollib.mfxutil import format_time from pysollib.gamedb import GI -from pysollib.help import helpHTML +from pysollib.help import help_html from pysollib.resource import CSI # Toolkit imports @@ -286,7 +286,7 @@ class SelectGameDialog(MfxDialog): if not doc: return dir = os.path.join("html", "rules") - helpHTML(self.app, doc, dir, self.top) + help_html(self.app, doc, dir, self.top) return MfxDialog.mDone(self, button) diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 5761cda0..04f60a6a 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -33,7 +33,7 @@ ## ##---------------------------------------------------------------------------## -__all__ = ['tkHTMLViewer'] +__all__ = ['HTMLViewer'] # imports import os, sys, re, types @@ -228,7 +228,7 @@ class tkHTMLParser(htmllib.HTMLParser): # // # ************************************************************************/ -class tkHTMLViewer: +class HTMLViewer: symbols_fn = {} # filenames, loaded in Application.loadImages3 symbols_img = {} @@ -528,7 +528,7 @@ def tkhtml_main(args): url = os.path.join(os.pardir, os.pardir, "data", "html", "index.html") top = Tkinter.Tk() top.wm_minsize(400, 200) - viewer = tkHTMLViewer(top) + viewer = HTMLViewer(top) viewer.app = None viewer.display(url) top.mainloop() diff --git a/pysollib/tk/tkutil.py b/pysollib/tk/tkutil.py index e26d8730..399c2f58 100644 --- a/pysollib/tk/tkutil.py +++ b/pysollib/tk/tkutil.py @@ -40,7 +40,7 @@ __all__ = ['wm_withdraw', 'wm_get_geometry', #'setTransient', #'makeToplevel', - 'makeHelpToplevel', + 'make_help_toplevel', 'bind', 'unbind_destroy', 'after', @@ -51,7 +51,7 @@ __all__ = ['wm_withdraw', 'loadImage', #'fillImage', 'createImage', - 'getTextWidth', + 'get_text_width', ] # imports @@ -169,7 +169,7 @@ def makeToplevel(parent, title=None): window.wm_iconname(title) return window -def makeHelpToplevel(app, title=None): +def make_help_toplevel(app, title=None): # Create an independent Toplevel window. parent = app.top window = Tkinter.Tk(className=PACKAGE) @@ -192,8 +192,6 @@ def makeHelpToplevel(app, title=None): window.wm_iconname(title) return window -#makeHelpToplevel = makeToplevel - def __getWidgetXY(widget, parent, relx=None, rely=None, w_width=None, w_height=None): @@ -405,6 +403,6 @@ def createImage(width, height, fill, outline=None): # // font utils # ************************************************************************/ -def getTextWidth(text, font, root=None): +def get_text_width(text, font, root=None): return Font(root=root, font=font).measure(text) diff --git a/pysollib/util.py b/pysollib/util.py index 3ae41ec9..765bc55f 100644 --- a/pysollib/util.py +++ b/pysollib/util.py @@ -63,10 +63,9 @@ __all__ = ['SUITS', import sys, os, re, time, types # PySol imports -from version import VERSION, VERSION_TUPLE from mfxutil import Pickler, Unpickler, UnpicklingError from mfxutil import Struct, EnvError -from settings import DATA_DIRS, PACKAGE +from settings import DATA_DIRS, PACKAGE, VERSION, VERSION_TUPLE # /*********************************************************************** # // constants diff --git a/pysollib/version.py b/pysollib/version.py deleted file mode 100644 index 8eeca7e0..00000000 --- a/pysollib/version.py +++ /dev/null @@ -1,30 +0,0 @@ -##---------------------------------------------------------------------------## -## -## PySol -- a Python Solitaire game -## -## 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 2 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; see the file COPYING. -## If not, write to the Free Software Foundation, Inc., -## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -## -##---------------------------------------------------------------------------## - -VERSION = "4.82" -#VERSION_DATE = "20 Aug 2003" -VERSION_MAJOR = 4 -VERSION_MINOR = 82 -VERSION_TUPLE = (4, 82) - -FC_VERSION = "0.9.3" -#FC_VERSION_TUPLE = (0, 4, 0) - diff --git a/scripts/create_iss.py b/scripts/create_iss.py index 52d8db50..2a6a57c1 100755 --- a/scripts/create_iss.py +++ b/scripts/create_iss.py @@ -11,7 +11,7 @@ for root, dirs, files in os.walk('dist'): files_list.append(root) dirs_list.append(root) -execfile(os.path.join('pysollib', 'version.py')) +execfile(os.path.join('pysollib', 'settings.py')) prog_version = FC_VERSION out = open('setup.iss', 'w') diff --git a/setup.py b/setup.py index 0e35d451..0cb1bf94 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ import os from distutils.core import setup -from pysollib.version import FC_VERSION as VERSION +from pysollib.settings import FC_VERSION as VERSION if os.name == 'nt': import py2exe From a4a50fe867242c671aa3936d0de7ef27d59a8991 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 24 Aug 2006 21:26:24 +0000 Subject: [PATCH 055/266] + GTK bindings: sound-dialog git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@56 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- data/glade-translations | 5 + data/pysolfc.glade | 313 +++++++++++++++++++++++- pysollib/actions.py | 16 +- pysollib/pysolgtk/menubar.py | 34 ++- pysollib/pysolgtk/pysoltree.py | 6 +- pysollib/pysolgtk/selecttile.py | 17 +- pysollib/pysolgtk/soundoptionsdialog.py | 129 +++++++++- pysollib/pysolgtk/tkcanvas.py | 12 +- pysollib/pysolgtk/tkutil.py | 4 +- pysollib/tk/menubar.py | 27 +- pysollib/tk/selecttile.py | 2 +- 11 files changed, 496 insertions(+), 69 deletions(-) diff --git a/data/glade-translations b/data/glade-translations index 020d0e77..0d636dd9 100644 --- a/data/glade-translations +++ b/data/glade-translations @@ -69,3 +69,8 @@ gchar *s = N_("Change..."); gchar *s = N_("Change..."); gchar *s = N_("Change..."); gchar *s = N_("Change..."); +gchar *s = N_("Sound settings"); +gchar *s = N_("Sound enabled"); +gchar *s = N_("Sample volume:"); +gchar *s = N_("Music volume:"); +gchar *s = N_("Enable samles"); diff --git a/data/pysolfc.glade b/data/pysolfc.glade index cd69eb3d..39103dba 100644 --- a/data/pysolfc.glade +++ b/data/pysolfc.glade @@ -1850,7 +1850,7 @@ 1 GTK_UPDATE_CONTINUOUS False - 1 0.2 10 0.1 1 1 + 1 0.2 10 0.1 1 0 @@ -1872,7 +1872,7 @@ 1 GTK_UPDATE_CONTINUOUS False - 1 0.2 10 0.1 1 1 + 1 0.2 10 0.1 1 0 @@ -1894,7 +1894,7 @@ 1 GTK_UPDATE_CONTINUOUS False - 1 0.2 10 0.1 1 1 + 1 0.2 10 0.1 1 0 @@ -1916,7 +1916,7 @@ 1 GTK_UPDATE_CONTINUOUS False - 1 0.2 10 0.1 1 1 + 1 0.2 10 0.1 1 0 @@ -1938,7 +1938,7 @@ 1 GTK_UPDATE_CONTINUOUS False - 1 0.2 10 0.1 1 1 + 1 0.2 10 0.1 1 0 @@ -1960,7 +1960,7 @@ 1 GTK_UPDATE_CONTINUOUS False - 1 0.2 10 0.1 1 1 + 1 0.2 10 0.1 1 0 @@ -4121,4 +4121,305 @@ + + Sound settings + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER_ON_PARENT + True + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_DIALOG + GDK_GRAVITY_NORTH_WEST + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + True + -6 + + + + + + True + True + True + gtk-apply + True + GTK_RELIEF_NORMAL + True + -10 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + True + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + 4 + 3 + False + 0 + 0 + + + + 4 + True + True + Sound enabled + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 3 + 0 + 1 + fill + + + + + + + True + Sample volume: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 4 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + Music volume: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 4 + 4 + + + 0 + 1 + 2 + 3 + fill + + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 0 128 1 10 10 + + + + 2 + 3 + 1 + 2 + fill + + + + + + + 120 + True + True + False + GTK_POS_TOP + 0 + GTK_UPDATE_CONTINUOUS + False + 0 0 128 1 10 0 + + + + 1 + 2 + 2 + 3 + 4 + fill + + + + + + 120 + True + True + False + GTK_POS_TOP + 0 + GTK_UPDATE_CONTINUOUS + False + 0 0 128 1 10 0 + + + + 1 + 2 + 1 + 2 + 4 + fill + + + + + + True + True + 1 + 0 + True + GTK_UPDATE_ALWAYS + False + False + 1 0 128 1 10 10 + + + + 2 + 3 + 2 + 3 + fill + + + + + + + 4 + True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + 10 + 2 + False + 0 + 0 + + + + + + True + Enable samles + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + + + + 0 + 3 + 3 + 4 + fill + + + + + 0 + True + True + + + + + + diff --git a/pysollib/actions.py b/pysollib/actions.py index a91fa60d..2fd02925 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -58,7 +58,6 @@ from pysoltk import MfxMessageDialog, MfxSimpleEntry from pysoltk import MfxExceptionDialog from pysoltk import MfxRadioMenuItem, MfxCheckMenuItem, StringVar from pysoltk import PlayerOptionsDialog -from pysoltk import SoundOptionsDialog #from pysoltk import HintOptionsDialog from pysoltk import TimeoutsDialog from pysoltk import ColorsDialog @@ -805,15 +804,20 @@ class PysolMenubarActions: self.game.updateStatus(player=self.app.opt.player) self.game.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.game.id)) - def mOptSoundDialog(self, *args): - if self._cancelDrag(break_pause=False): return - d = SoundOptionsDialog(self.top, _("Sound settings"), self.app) - self.tkopt.sound.set(self.app.opt.sound) - ## def mOptIrregularPiles(self, *args): ## if self._cancelDrag(): return ## self.app.opt.irregular_piles = self.tkopt.irregular_piles.get() + def _mOptTableTile(self, i): + if self.app.setTile(i): + self.tkopt.tabletile.set(i) + + def _mOptTableColor(self, color): + tile = self.app.tabletile_manager.get(0) + tile.color = color + if self.app.setTile(0): + self.tkopt.tabletile.set(0) + def mOptColors(self, *args): if self._cancelDrag(break_pause=False): return d = ColorsDialog(self.top, _("Set colors"), self.app) diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 26f817af..f833c920 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -44,6 +44,7 @@ from pysollib.settings import PACKAGE # toolkit imports from tkutil import setTransient from tkutil import color_tk2gtk, color_gtk2tk +from soundoptionsdialog import SoundOptionsDialog from selectcardset import SelectCardsetDialogWithPreview from selecttile import SelectTileDialogWithPreview @@ -190,12 +191,15 @@ class PysolMenubar(PysolMenubarActions): ('playeroptions', None, ltk2gtk('&Player options...'), None, None,self.mOptPlayerOptions), - ('tabletile', None, - ltk2gtk('Table t&ile...'), None, - None,self.mOptTableTile), + ('sound', None, + ltk2gtk('&Sound...'), None, + None, self.mOptSoundDialog), ('cardset', None, ltk2gtk('Cards&et...'), 'E', None, self.mSelectCardsetDialog), + ('tabletile', None, + ltk2gtk('Table t&ile...'), None, + None, self.mOptTableTile), ('fonts', None, ltk2gtk('&Fonts...'), None, None, self.mOptFonts), @@ -360,8 +364,9 @@ class PysolMenubar(PysolMenubarActions): - + + @@ -431,6 +436,10 @@ class PysolMenubar(PysolMenubarActions): menu = ui_manager.get_widget('/menubar/select').get_submenu() self._createSelectMenu(games, menu) + if self.app.audio.audiodev is None: + item = ui_manager.get_widget('/menubar/options/sound') + item.set_sensitive(False) + menubar = ui_manager.get_widget('/menubar') return menubar @@ -751,6 +760,11 @@ class PysolMenubar(PysolMenubarActions): self.game.quitGame(d.gameid, random=d.random) + def mOptSoundDialog(self, *args): + if self._cancelDrag(break_pause=False): return + d = SoundOptionsDialog(self.top, _('Sound settings'), self.app) + + def mOptTableTile(self, *args): if self._cancelDrag(break_pause=False): return key = self.app.tabletile_index @@ -762,11 +776,15 @@ class PysolMenubar(PysolMenubarActions): key=key) if d.status == 0 and d.button in (0, 1): if type(d.key) is str: - tile = self.app.tabletile_manager.get(0) - tile.color = color - self.app.setTile(0) + self._mOptTableColor(d.key) elif d.key > 0 and d.key != self.app.tabletile_index: - self.app.setTile(i) + self._mOptTableTile(d.key) +## if type(d.key) is str: +## tile = self.app.tabletile_manager.get(0) +## tile.color = d.color +## self.app.setTile(0) +## elif d.key > 0 and d.key != self.app.tabletile_index: +## self.app.setTile(i) def mSelectCardsetDialog(self, *event): diff --git a/pysollib/pysolgtk/pysoltree.py b/pysollib/pysolgtk/pysoltree.py index eea69282..430eb945 100644 --- a/pysollib/pysolgtk/pysoltree.py +++ b/pysollib/pysolgtk/pysoltree.py @@ -83,11 +83,11 @@ class PysolTreeView: selection = self.treeview.get_selection() ##selection.select_path(self._selected_row) ##selection.unselect_all() - gtk.idle_add(selection.select_path, self._selected_row) + gobject.idle_add(selection.select_path, self._selected_row) if self._vadjustment_position is not None: ##self.sw_vadjustment.set_value(self._vadjustment_position) - gtk.idle_add(self.sw_vadjustment.set_value, - self._vadjustment_position) + gobject.idle_add(self.sw_vadjustment.set_value, + self._vadjustment_position) def _saveExpandedRows(self): diff --git a/pysollib/pysolgtk/selecttile.py b/pysollib/pysolgtk/selecttile.py index 08c52d6b..4c6fa3f9 100644 --- a/pysollib/pysolgtk/selecttile.py +++ b/pysollib/pysolgtk/selecttile.py @@ -146,18 +146,17 @@ class SelectTileDialogWithPreview(MfxDialog): ##canvas.deleteAllItems() if type(key) is str: # solid color + canvas.setTile(self.app, 0, force=True) canvas.config(bg=key) - canvas.setBackgroundImage(None) - canvas.setTextColor(None) + ##canvas.setTextColor(None) self.preview_key = key - self.colors['table'] = key + self.table_color = key else: # image - tile = self.manager.get(key) - if tile: - if self.preview.setTile(self.app, key): - return - self.preview_key = -1 + if self.preview.setTile(self.app, key): + self.preview_key = key + else: + self.preview_key = -1 def initKw(self, kw): @@ -206,7 +205,7 @@ class SelectTileDialogWithPreview(MfxDialog): self.key = self.preview_key self.status = 0 self.button = b - self.hide() + ##self.hide() self.quit() diff --git a/pysollib/pysolgtk/soundoptionsdialog.py b/pysollib/pysolgtk/soundoptionsdialog.py index 572b6a20..619b428f 100644 --- a/pysollib/pysolgtk/soundoptionsdialog.py +++ b/pysollib/pysolgtk/soundoptionsdialog.py @@ -1,13 +1,7 @@ -## vim:ts=4:et:nowrap -## ##---------------------------------------------------------------------------## ## ## PySol -- a Python Solitaire game ## -## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer -## ## 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 2 of the License, or @@ -23,28 +17,139 @@ ## If not, write to the Free Software Foundation, Inc., ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -## Markus F.X.J. Oberhumer -## -## http://wildsau.idv.uni-linz.ac.at/mfx/pysol.html -## ##---------------------------------------------------------------------------## # imports import os, sys import gtk +from gtk import glade # PySol imports # Toolkit imports from tkwidget import MfxDialog +gettext = _ + # /*********************************************************************** # // # ************************************************************************/ -class SoundOptionsDialog(MfxDialog): +class SoundOptionsDialog: def __init__(self, parent, title, app, **kw): - pass + saved_opt = app.opt.copy() + + glade_file = app.dataloader.findFile('pysolfc.glade') + self.widgets_tree = gtk.glade.XML(glade_file) + + keys = [ + ('areyousure', _('Are You Sure')), + + ('deal', _('Deal')), + ('dealwaste', _('Deal waste')), + + ('turnwaste', _('Turn waste')), + ('startdrag', _('Start drag')), + + ('drop', _('Drop')), + ('droppair', _('Drop pair')), + ('autodrop', _('Auto drop')), + + ('flip', _('Flip')), + ('autoflip', _('Auto flip')), + ('move', _('Move')), + ('nomove', _('No move')), + + ('undo', _('Undo')), + ('redo', _('Redo')), + + ('autopilotlost', _('Autopilot lost')), + ('autopilotwon', _('Autopilot won')), + + ('gamefinished', _('Game finished')), + ('gamelost', _('Game lost')), + ('gamewon', _('Game won')), + ('gameperfect', _('Perfect game')), + ] + + table = self.widgets_tree.get_widget('samples_table') + samples_checkbuttons = {} + row = 0 + col = 0 + for n, t in keys: + check = gtk.CheckButton(t) + check.show() + check.set_active(app.opt.sound_samples[n]) + samples_checkbuttons[n] = check + table.attach(check, + col, col+1, row, row+1, + gtk.FILL|gtk.EXPAND, gtk.FILL, + 4, 4) + if col == 1: + col = 0 + row += 1 + else: + col = 1 + + w = self.widgets_tree.get_widget('enable_checkbutton') + w.set_active(app.opt.sound) + dic = {} + for n in 'sample', 'music': + def callback(w, n=n): + sp = self.widgets_tree.get_widget(n+'_spinbutton') + sc = self.widgets_tree.get_widget(n+'_scale') + sp.set_value(sc.get_value()) + dic[n+'_scale_value_changed'] = callback + def callback(w, n=n): + sp = self.widgets_tree.get_widget(n+'_spinbutton') + sc = self.widgets_tree.get_widget(n+'_scale') + sc.set_value(sp.get_value()) + dic[n+'_spinbutton_value_changed'] = callback + self.widgets_tree.signal_autoconnect(dic) + w = self.widgets_tree.get_widget('sample_spinbutton') + w.set_value(app.opt.sound_sample_volume) + w = self.widgets_tree.get_widget('music_spinbutton') + w.set_value(app.opt.sound_music_volume) + + self._translateLabels() + + dialog = self.widgets_tree.get_widget('sounds_dialog') + dialog.set_title(title) + dialog.set_transient_for(parent) + + while True: # for `apply' + response = dialog.run() + if response in (gtk.RESPONSE_OK, gtk.RESPONSE_APPLY): + w = self.widgets_tree.get_widget('enable_checkbutton') + app.opt.sound = w.get_active() + w = self.widgets_tree.get_widget('sample_spinbutton') + app.opt.soun_sample_volume = w.get_value() + w = self.widgets_tree.get_widget('music_spinbutton') + app.opt.sound_music_volume = w.get_value() + for n, t in keys: + w = samples_checkbuttons[n] + app.opt.sound_samples[n] = w.get_active() + else: + app.opt = saved_opt + if app.audio: + app.audio.updateSettings() + if response == gtk.RESPONSE_APPLY: + app.audio.playSample('drop', priority=1000) + if response != gtk.RESPONSE_APPLY: + dialog.destroy() + break + + + def _translateLabels(self): + for n in ( + 'label76', + 'label77', + 'label78', + ): + w = self.widgets_tree.get_widget(n) + w.set_text(gettext(w.get_text())) + w = self.widgets_tree.get_widget('enable_checkbutton') + w.set_label(gettext(w.get_label())) diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index 0769fdfc..da2dd8ff 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -302,7 +302,9 @@ class MfxCanvas(gnome.canvas.Canvas): self._text_color = '#000000' # gnome.canvas.Canvas.__init__(self) - self.top_bg = top.style.bg[gtk.STATE_NORMAL] + c = top.style.bg[gtk.STATE_NORMAL] + c = '#%02x%02x%02x' % (c.red/256, c.green/256, c.blue/256) + self.top_bg = c if bg is not None: self.modify_bg(gtk.STATE_NORMAL, gdk.color_parse(bg)) @@ -419,8 +421,8 @@ class MfxCanvas(gnome.canvas.Canvas): # PySol extension - set a tiled background image def setTile(self, app, i, force=False): + ##print 'setTile:', i tile = app.tabletile_manager.get(i) - ##print 'setTile', i, tile if tile is None or tile.error: return False if i == 0: @@ -439,9 +441,7 @@ class MfxCanvas(gnome.canvas.Canvas): # self._tile = tile if i == 0: - if self.__tileimage: - self.__tileimage.destroy() - self.__tileimage = None + self.setBackgroundImage(None) self.configure(bg=tile.color) ##app.top.config(bg=tile.color) color = None @@ -473,7 +473,7 @@ class MfxCanvas(gnome.canvas.Canvas): self.realize() ##return False - gtk.idle_add(self.setBackgroundImage, filename, stretch) + gobject.idle_add(self.setBackgroundImage, filename, stretch) def setBackgroundImage(self, filename, stretch=False): diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index 489f7a8a..c695c833 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -266,7 +266,7 @@ def unbind_destroy(widget): # ************************************************************************/ def after(widget, ms, func, *args): - timer = gtk.timeout_add(ms, func, *args) + timer = gobject.timeout_add(ms, func, *args) return timer def after_idle(widget, func, *args): @@ -275,7 +275,7 @@ def after_idle(widget, func, *args): def after_cancel(t): if t is not None: - gtk.timeout_remove(t) + gobject.source_remove(t) # /*********************************************************************** diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 55b906d0..6b49aa47 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -37,7 +37,7 @@ __all__ = ['PysolMenubar'] # imports -import math, os, re, types +import math, os, re import Tkinter, tkColorChooser, tkFileDialog # PySol imports @@ -53,8 +53,8 @@ from pysollib.pysolaudio import pysolsoundserver from tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS from tkutil import bind, after_idle from selectgame import SelectGameDialog, SelectGameDialogWithPreview +from soundoptionsdialog import SoundOptionsDialog from selectcardset import SelectCardsetDialogWithPreview -from selectcardset import SelectCardsetByTypeDialogWithPreview from selecttile import SelectTileDialogWithPreview #from toolbar import TOOLBAR_BUTTONS @@ -895,6 +895,11 @@ class PysolMenubar(PysolMenubarActions): self.game.saveGame(filename) self.updateMenus() + def mOptSoundDialog(self, *args): + if self._cancelDrag(break_pause=False): return + d = SoundOptionsDialog(self.top, _("Sound settings"), self.app) + self.tkopt.sound.set(self.app.opt.sound) + def mOptAutoFaceUp(self, *args): if self._cancelDrag(): return self.app.opt.autofaceup = self.tkopt.autofaceup.get() @@ -1036,19 +1041,9 @@ class PysolMenubar(PysolMenubarActions): def mOptChangeCardback(self, *event): self._mOptCardback(self.app.cardset.backindex + 1) - def _mOptTableTile(self, i): - if self.app.setTile(i): - self.tkopt.tabletile.set(i) - - def _mOptTableColor(self, color): - tile = self.app.tabletile_manager.get(0) - tile.color = color - if self.app.setTile(0): - self.tkopt.tabletile.set(0) - - def mOptTableTile(self, *event): - if self._cancelDrag(break_pause=False): return - self._mOptTableTile(self.tkopt.tabletile.get()) +## def mOptTableTile(self, *event): +## if self._cancelDrag(break_pause=False): return +## self._mOptTableTile(self.tkopt.tabletile.get()) def mOptChangeTableTile(self, *event): if self._cancelDrag(break_pause=False): return @@ -1067,7 +1062,7 @@ class PysolMenubar(PysolMenubarActions): manager=self.app.tabletile_manager, key=key) if d.status == 0 and d.button in (0, 1): - if type(d.key) is types.StringType: + if type(d.key) is str: self._mOptTableColor(d.key) elif d.key > 0 and d.key != self.app.tabletile_index: self._mOptTableTile(d.key) diff --git a/pysollib/tk/selecttile.py b/pysollib/tk/selecttile.py index e2982604..1ebfde57 100644 --- a/pysollib/tk/selecttile.py +++ b/pysollib/tk/selecttile.py @@ -190,7 +190,7 @@ class SelectTileDialogWithPreview(MfxDialog): return canvas = self.preview.canvas canvas.deleteAllItems() - if type(key) in types.StringTypes: + if type(key) in str: # solid color canvas.config(bg=key) canvas.setTile(None) From 3e054b2ff2ecaf7b7a0e32b5f6b48c9e5561c918 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 25 Aug 2006 21:27:33 +0000 Subject: [PATCH 056/266] * little reorganization: move some func. from pysollib/actions.py to pysollib/tk/menubar.py * bug fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@57 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- MANIFEST.in | 5 +- pysollib/actions.py | 130 +---------------------------------- pysollib/pysolgtk/menubar.py | 36 +++++++--- pysollib/pysolgtk/tkwrap.py | 48 ------------- pysollib/tk/menubar.py | 128 +++++++++++++++++++++++++++++++++- pysollib/tk/selecttile.py | 2 +- setup.py | 2 + 7 files changed, 161 insertions(+), 190 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 9f12a899..2298846d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,7 +4,7 @@ ## include pysol setup.py setup.cfg MANIFEST.in Makefile COPYING README #recursive-include pysollib *.py -include pysollib/*.py pysollib/tk/*.py +include pysollib/*.py pysollib/tk/*.py pysollib/pysolgtk/*.py include pysollib/games/*.py pysollib/games/special/*.py include pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py include docs/* @@ -28,7 +28,8 @@ graft data/cardset-tuxedo graft data/cardset-vienna-2k graft data/html graft data/html-src -graft data/images +#graft data/images +recursive-include data/images *.gif *.png #graft data/music #graft data/plugins graft data/sound diff --git a/pysollib/actions.py b/pysollib/actions.py index 2fd02925..282c1e2a 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -56,7 +56,6 @@ from pysoltk import GameInfoDialog from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE from pysoltk import MfxMessageDialog, MfxSimpleEntry from pysoltk import MfxExceptionDialog -from pysoltk import MfxRadioMenuItem, MfxCheckMenuItem, StringVar from pysoltk import PlayerOptionsDialog #from pysoltk import HintOptionsDialog from pysoltk import TimeoutsDialog @@ -64,7 +63,7 @@ from pysoltk import ColorsDialog from pysoltk import FontsDialog from pysoltk import EditTextDialog from pysoltk import TOOLBAR_BUTTONS -from pysoltk import create_find_card_dialog, connect_game_find_card_dialog, destroy_find_card_dialog +from pysoltk import create_find_card_dialog from help import help_about, help_html gettext = _ @@ -98,106 +97,9 @@ class PysolMenubarActions: rules = 0, pause = 0, ) - # structure to convert menu-options to Toolkit variables - self.tkopt = Struct( - gameid = MfxRadioMenuItem(self), - gameid_popular = MfxRadioMenuItem(self), - comment = MfxCheckMenuItem(self), - autofaceup = MfxCheckMenuItem(self), - autodrop = MfxCheckMenuItem(self), - autodeal = MfxCheckMenuItem(self), - quickplay = MfxCheckMenuItem(self), - undo = MfxCheckMenuItem(self), - bookmarks = MfxCheckMenuItem(self), - hint = MfxCheckMenuItem(self), - highlight_piles = MfxCheckMenuItem(self), - highlight_cards = MfxCheckMenuItem(self), - highlight_samerank = MfxCheckMenuItem(self), - highlight_not_matching = MfxCheckMenuItem(self), - mahjongg_show_removed = MfxCheckMenuItem(self), - shisen_show_hint = MfxCheckMenuItem(self), - sound = MfxCheckMenuItem(self), - cardback = MfxRadioMenuItem(self), - tabletile = MfxRadioMenuItem(self), - animations = MfxRadioMenuItem(self), - shadow = MfxCheckMenuItem(self), - shade = MfxCheckMenuItem(self), - shade_filled_stacks = MfxCheckMenuItem(self), - shrink_face_down = MfxCheckMenuItem(self), - toolbar = MfxRadioMenuItem(self), - toolbar_style = StringVar(), - toolbar_relief = StringVar(), - toolbar_compound = StringVar(), - toolbar_size = MfxRadioMenuItem(self), - statusbar = MfxCheckMenuItem(self), - num_cards = MfxCheckMenuItem(self), - helpbar = MfxCheckMenuItem(self), - save_games_geometry = MfxCheckMenuItem(self), - splashscreen = MfxCheckMenuItem(self), - demo_logo = MfxCheckMenuItem(self), - sticky_mouse = MfxCheckMenuItem(self), - mouse_undo = MfxCheckMenuItem(self), - negative_bottom = MfxCheckMenuItem(self), - pause = MfxCheckMenuItem(self), - toolbar_vars = {}, - ) - - for w in TOOLBAR_BUTTONS: - self.tkopt.toolbar_vars[w] = MfxCheckMenuItem(self) - def connectGame(self, game): self.game = game - if game is None: - return - assert self.app is game.app - tkopt, opt = self.tkopt, self.app.opt - # set state of the menu items - tkopt.gameid.set(game.id) - tkopt.gameid_popular.set(game.id) - tkopt.comment.set(bool(game.gsaveinfo.comment)) - tkopt.autofaceup.set(opt.autofaceup) - tkopt.autodrop.set(opt.autodrop) - tkopt.autodeal.set(opt.autodeal) - tkopt.quickplay.set(opt.quickplay) - tkopt.undo.set(opt.undo) - tkopt.hint.set(opt.hint) - tkopt.bookmarks.set(opt.bookmarks) - tkopt.highlight_piles.set(opt.highlight_piles) - tkopt.highlight_cards.set(opt.highlight_cards) - tkopt.highlight_samerank.set(opt.highlight_samerank) - tkopt.highlight_not_matching.set(opt.highlight_not_matching) - tkopt.shrink_face_down.set(opt.shrink_face_down) - tkopt.shade_filled_stacks.set(opt.shade_filled_stacks) - tkopt.mahjongg_show_removed.set(opt.mahjongg_show_removed) - tkopt.shisen_show_hint.set(opt.shisen_show_hint) - tkopt.sound.set(opt.sound) - tkopt.cardback.set(self.app.cardset.backindex) - tkopt.tabletile.set(self.app.tabletile_index) - tkopt.animations.set(opt.animations) - tkopt.shadow.set(opt.shadow) - tkopt.shade.set(opt.shade) - tkopt.toolbar.set(opt.toolbar) - tkopt.toolbar_style.set(opt.toolbar_style) - tkopt.toolbar_relief.set(opt.toolbar_relief) - tkopt.toolbar_compound.set(opt.toolbar_compound) - tkopt.toolbar_size.set(opt.toolbar_size) - tkopt.toolbar_relief.set(opt.toolbar_relief) - tkopt.statusbar.set(opt.statusbar) - tkopt.num_cards.set(opt.num_cards) - tkopt.helpbar.set(opt.helpbar) - tkopt.save_games_geometry.set(opt.save_games_geometry) - tkopt.demo_logo.set(opt.demo_logo) - tkopt.splashscreen.set(opt.splashscreen) - tkopt.sticky_mouse.set(opt.sticky_mouse) - tkopt.mouse_undo.set(opt.mouse_undo) - tkopt.negative_bottom.set(opt.negative_bottom) - for w in TOOLBAR_BUTTONS: - tkopt.toolbar_vars[w].set(opt.toolbar_vars[w]) - if game.canFindCard(): - connect_game_find_card_dialog(game) - else: - destroy_find_card_dialog() # will get called after connectGame() def updateRecentGamesMenu(self, gameids): @@ -328,9 +230,6 @@ class PysolMenubarActions: self.setToolbarState(ms.autodrop, "autodrop") self.setToolbarState(ms.pause, "pause") self.setToolbarState(ms.rules, "rules") - # - self.tkopt.comment.set(bool(self.game.gsaveinfo.comment)) - self.tkopt.pause.set(self.game.pause) # update menu items and toolbar def updateMenus(self): @@ -368,9 +267,6 @@ class PysolMenubarActions: return if self.changed(): if not self.game.areYouSure(_("Select game")): - # restore radiobutton settings - self.tkopt.gameid.set(self.game.id) - self.tkopt.gameid_popular.set(self.game.id) return self.game.endGame() self.game.quitGame(id, random=random) @@ -626,15 +522,9 @@ class PysolMenubarActions: if fd: fd.close() d = MfxMessageDialog(self.top, title=PACKAGE+_(" Info"), bitmap="info", text=_("Comments were appended to\n\n") + fn) - self.tkopt.comment.set(bool(game.gsaveinfo.comment)) + self._setCommentMenu(bool(game.gsaveinfo.comment)) - def mPause(self, *args): - if not self.game.pause: - if self._cancelDrag(): return - self.game.doPause() - self.tkopt.pause.set(self.game.pause) - # # Game menu - statistics # @@ -804,20 +694,6 @@ class PysolMenubarActions: self.game.updateStatus(player=self.app.opt.player) self.game.updateStatus(stats=self.app.stats.getStats(self.app.opt.player, self.game.id)) -## def mOptIrregularPiles(self, *args): -## if self._cancelDrag(): return -## self.app.opt.irregular_piles = self.tkopt.irregular_piles.get() - - def _mOptTableTile(self, i): - if self.app.setTile(i): - self.tkopt.tabletile.set(i) - - def _mOptTableColor(self, color): - tile = self.app.tabletile_manager.get(0) - tile.color = color - if self.app.setTile(0): - self.tkopt.tabletile.set(0) - def mOptColors(self, *args): if self._cancelDrag(break_pause=False): return d = ColorsDialog(self.top, _("Set colors"), self.app) @@ -836,7 +712,7 @@ class PysolMenubarActions: # if (text_color != self.app.opt.colors['text'] or use_default_text_color != self.app.opt.use_default_text_color): - self.app.setTile(self.tkopt.tabletile.get(), 1) + self.app.setTile(self.app.opt.tabletile_index) def mOptFonts(self, *args): if self._cancelDrag(break_pause=False): return diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index f833c920..e7dfb021 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -47,8 +47,8 @@ from tkutil import color_tk2gtk, color_gtk2tk from soundoptionsdialog import SoundOptionsDialog from selectcardset import SelectCardsetDialogWithPreview from selecttile import SelectTileDialogWithPreview - from selectgame import SelectGameDialogWithPreview +from findcarddialog import connect_game_find_card_dialog, destroy_find_card_dialog gettext = _ @@ -76,6 +76,19 @@ class PysolMenubar(PysolMenubarActions): 0, 0); menubar.show() + def connectGame(self, game): + self.game = game + if game is None: + return + assert self.app is game.app +## tkopt, opt = self.tkopt, self.app.opt +## tkopt.gameid.set(game.id) +## tkopt.gameid_popular.set(game.id) +## tkopt.comment.set(bool(game.gsaveinfo.comment)) + if game.canFindCard(): + connect_game_find_card_dialog(game) + else: + destroy_find_card_dialog() # # create menubar @@ -759,6 +772,10 @@ class PysolMenubar(PysolMenubarActions): self.game.endGame() self.game.quitGame(d.gameid, random=d.random) + def mPause(self, *args): + if not self.game.pause: + if self._cancelDrag(): return + self.game.doPause() def mOptSoundDialog(self, *args): if self._cancelDrag(break_pause=False): return @@ -776,15 +793,11 @@ class PysolMenubar(PysolMenubarActions): key=key) if d.status == 0 and d.button in (0, 1): if type(d.key) is str: - self._mOptTableColor(d.key) + tile = self.app.tabletile_manager.get(0) + tile.color = d.key + self.app.setTile(0) elif d.key > 0 and d.key != self.app.tabletile_index: - self._mOptTableTile(d.key) -## if type(d.key) is str: -## tile = self.app.tabletile_manager.get(0) -## tile.color = d.color -## self.app.setTile(0) -## elif d.key > 0 and d.key != self.app.tabletile_index: -## self.app.setTile(i) + self.app.setTile(d.key) def mSelectCardsetDialog(self, *event): @@ -845,3 +858,8 @@ class PysolMenubar(PysolMenubarActions): def updateAll(self, *event): self.app.canvas.updateAll() + + def _setCommentMenu(self, v): + # FIXME + pass + diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index b4fb77c7..3b8ef444 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -54,54 +54,6 @@ def make_help_toplevel(parent, title=None, class_=None): return makeToplevel(parent, title=title, class_=class_, gtkclass=_MfxToplevel) -class MfxCheckMenuItem: - def __init__(self, menubar, path=None): - self.menubar = menubar - self.path = path - self.value = None - def get(self): - ##print 'MfxCheckMenuItem.get:', self.path - if self.path is None: return 0 - w = self.menubar.menus.get_widget(self.path) - return w.active - def set(self, value): - ##print 'MfxCheckMenuItem.set:', value, self.path - if self.path is None: return - if not value or value == 'false': value = 0 - assert type(value) is types.IntType and 0 <= value <= 1 - self.value = value - w = self.menubar.menus.get_widget(self.path) - w.set_active(value) - #print self.path, value, w, w.active - - -class MfxRadioMenuItem(MfxCheckMenuItem): - def get(self): - ##print 'MfxRadioMenuItem.get:', self.path, self.value - if self.path is None: return 0 - w = self.menubar.menus.get_widget(self.path) - #from pprint import pprint - #pprint(dir(w)) - #print 'widget:', w - #print w.active - #print w.__dict__ - return self.value - def set(self, value): - ##print 'MfxRadioMenuItem.set:', value, self.path - if self.path is None: return - if not value or value == 'false': value = 0 - assert type(value) is types.IntType and 0 <= value - self.value = value - #w = self.menubar.menus.get_widget(self.path) - #w.set_active(value) - #print self.path, value #, w, w.active - - -class StringVar: - def set(self, v): - pass - - # /*********************************************************************** # // A toplevel window. # ************************************************************************/ diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 6b49aa47..b063cff6 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -56,6 +56,8 @@ from selectgame import SelectGameDialog, SelectGameDialogWithPreview from soundoptionsdialog import SoundOptionsDialog from selectcardset import SelectCardsetDialogWithPreview from selecttile import SelectTileDialogWithPreview +from findcarddialog import connect_game_find_card_dialog, destroy_find_card_dialog +from tkwrap import MfxRadioMenuItem, MfxCheckMenuItem, StringVar #from toolbar import TOOLBAR_BUTTONS from tkconst import TOOLBAR_BUTTONS @@ -197,6 +199,8 @@ class MfxMenu(MfxMenubar): class PysolMenubar(PysolMenubarActions): def __init__(self, app, top, progress=None): PysolMenubarActions.__init__(self, app, top) + self._createTkOpt() + self._setOptions() # init columnbreak self.__cb_max = int(self.top.winfo_screenheight()/23) ## sh = self.top.winfo_screenheight() @@ -217,6 +221,110 @@ class PysolMenubar(PysolMenubarActions): self.updateBackgroundImagesMenu() self.top.config(menu=self.__menubar) + def _createTkOpt(self): + # structure to convert menu-options to Toolkit variables + self.tkopt = Struct( + gameid = MfxRadioMenuItem(self), + gameid_popular = MfxRadioMenuItem(self), + comment = MfxCheckMenuItem(self), + autofaceup = MfxCheckMenuItem(self), + autodrop = MfxCheckMenuItem(self), + autodeal = MfxCheckMenuItem(self), + quickplay = MfxCheckMenuItem(self), + undo = MfxCheckMenuItem(self), + bookmarks = MfxCheckMenuItem(self), + hint = MfxCheckMenuItem(self), + highlight_piles = MfxCheckMenuItem(self), + highlight_cards = MfxCheckMenuItem(self), + highlight_samerank = MfxCheckMenuItem(self), + highlight_not_matching = MfxCheckMenuItem(self), + mahjongg_show_removed = MfxCheckMenuItem(self), + shisen_show_hint = MfxCheckMenuItem(self), + sound = MfxCheckMenuItem(self), + cardback = MfxRadioMenuItem(self), + tabletile = MfxRadioMenuItem(self), + animations = MfxRadioMenuItem(self), + shadow = MfxCheckMenuItem(self), + shade = MfxCheckMenuItem(self), + shade_filled_stacks = MfxCheckMenuItem(self), + shrink_face_down = MfxCheckMenuItem(self), + toolbar = MfxRadioMenuItem(self), + toolbar_style = StringVar(), + toolbar_relief = StringVar(), + toolbar_compound = StringVar(), + toolbar_size = MfxRadioMenuItem(self), + statusbar = MfxCheckMenuItem(self), + num_cards = MfxCheckMenuItem(self), + helpbar = MfxCheckMenuItem(self), + save_games_geometry = MfxCheckMenuItem(self), + splashscreen = MfxCheckMenuItem(self), + demo_logo = MfxCheckMenuItem(self), + sticky_mouse = MfxCheckMenuItem(self), + mouse_undo = MfxCheckMenuItem(self), + negative_bottom = MfxCheckMenuItem(self), + pause = MfxCheckMenuItem(self), + toolbar_vars = {}, + ) + for w in TOOLBAR_BUTTONS: + self.tkopt.toolbar_vars[w] = MfxCheckMenuItem(self) + + def _setOptions(self): + tkopt, opt = self.tkopt, self.app.opt + # set state of the menu items + tkopt.autofaceup.set(opt.autofaceup) + tkopt.autodrop.set(opt.autodrop) + tkopt.autodeal.set(opt.autodeal) + tkopt.quickplay.set(opt.quickplay) + tkopt.undo.set(opt.undo) + tkopt.hint.set(opt.hint) + tkopt.bookmarks.set(opt.bookmarks) + tkopt.highlight_piles.set(opt.highlight_piles) + tkopt.highlight_cards.set(opt.highlight_cards) + tkopt.highlight_samerank.set(opt.highlight_samerank) + tkopt.highlight_not_matching.set(opt.highlight_not_matching) + tkopt.shrink_face_down.set(opt.shrink_face_down) + tkopt.shade_filled_stacks.set(opt.shade_filled_stacks) + tkopt.mahjongg_show_removed.set(opt.mahjongg_show_removed) + tkopt.shisen_show_hint.set(opt.shisen_show_hint) + tkopt.sound.set(opt.sound) + tkopt.cardback.set(self.app.cardset.backindex) + tkopt.tabletile.set(self.app.tabletile_index) + tkopt.animations.set(opt.animations) + tkopt.shadow.set(opt.shadow) + tkopt.shade.set(opt.shade) + tkopt.toolbar.set(opt.toolbar) + tkopt.toolbar_style.set(opt.toolbar_style) + tkopt.toolbar_relief.set(opt.toolbar_relief) + tkopt.toolbar_compound.set(opt.toolbar_compound) + tkopt.toolbar_size.set(opt.toolbar_size) + tkopt.toolbar_relief.set(opt.toolbar_relief) + tkopt.statusbar.set(opt.statusbar) + tkopt.num_cards.set(opt.num_cards) + tkopt.helpbar.set(opt.helpbar) + tkopt.save_games_geometry.set(opt.save_games_geometry) + tkopt.demo_logo.set(opt.demo_logo) + tkopt.splashscreen.set(opt.splashscreen) + tkopt.sticky_mouse.set(opt.sticky_mouse) + tkopt.mouse_undo.set(opt.mouse_undo) + tkopt.negative_bottom.set(opt.negative_bottom) + for w in TOOLBAR_BUTTONS: + tkopt.toolbar_vars[w].set(opt.toolbar_vars[w]) + + def connectGame(self, game): + self.game = game + if game is None: + return + assert self.app is game.app + tkopt, opt = self.tkopt, self.app.opt + tkopt.gameid.set(game.id) + tkopt.gameid_popular.set(game.id) + tkopt.comment.set(bool(game.gsaveinfo.comment)) + tkopt.pause.set(self.game.pause) + if game.canFindCard(): + connect_game_find_card_dialog(game) + else: + destroy_find_card_dialog() + # create a GTK-like path def _addPath(self, path, menu, index, submenu): if not self.__menupath.has_key(path): @@ -828,6 +936,9 @@ class PysolMenubar(PysolMenubarActions): w = getattr(self.app.toolbar, path + "_button") w["state"] = s + def _setCommentMenu(self, v): + self.tkopt.comment.set(v) + # # menu actions @@ -895,6 +1006,12 @@ class PysolMenubar(PysolMenubarActions): self.game.saveGame(filename) self.updateMenus() + def mPause(self, *args): + if not self.game.pause: + if self._cancelDrag(): return + self.game.doPause() + self.tkopt.pause.set(self.game.pause) + def mOptSoundDialog(self, *args): if self._cancelDrag(break_pause=False): return d = SoundOptionsDialog(self.top, _("Sound settings"), self.app) @@ -1050,7 +1167,8 @@ class PysolMenubar(PysolMenubarActions): n = self.app.tabletile_manager.len() if n >= 2: i = (self.tkopt.tabletile.get() + 1) % n - self._mOptTableTile(i) + if self.app.setTile(i): + self.tkopt.tabletile.set(i) def mSelectTileDialog(self, *event): if self._cancelDrag(break_pause=False): return @@ -1063,9 +1181,13 @@ class PysolMenubar(PysolMenubarActions): key=key) if d.status == 0 and d.button in (0, 1): if type(d.key) is str: - self._mOptTableColor(d.key) + tile = self.app.tabletile_manager.get(0) + tile.color = d.key + if self.app.setTile(0): + self.tkopt.tabletile.set(0) elif d.key > 0 and d.key != self.app.tabletile_index: - self._mOptTableTile(d.key) + if self.app.setTile(d.key): + self.tkopt.tabletile.set(d.key) def mOptToolbar(self, *event): ##if self._cancelDrag(break_pause=False): return diff --git a/pysollib/tk/selecttile.py b/pysollib/tk/selecttile.py index 1ebfde57..ef2a9093 100644 --- a/pysollib/tk/selecttile.py +++ b/pysollib/tk/selecttile.py @@ -190,7 +190,7 @@ class SelectTileDialogWithPreview(MfxDialog): return canvas = self.preview.canvas canvas.deleteAllItems() - if type(key) in str: + if type(key) is str: # solid color canvas.config(bg=key) canvas.setTile(None) diff --git a/setup.py b/setup.py index 0cb1bf94..bca3e377 100644 --- a/setup.py +++ b/setup.py @@ -56,6 +56,7 @@ kw = { 'scripts' : ['pysol'], 'packages' : ['pysollib', 'pysollib.tk', + 'pysollib.pysolgtk', 'pysollib.games', 'pysollib.games.special', 'pysollib.games.ultra', @@ -66,5 +67,6 @@ kw = { if os.name == 'nt': kw['windows'] = [{'script': 'pysol', 'icon_resources': [(1, "data/pysol.ico")], }] + kw['packages'].remove('pysollib.pysolgtk') setup(**kw) From 5d479316e3e1a95570ee6feba9e9238a625135af Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 27 Aug 2006 21:13:54 +0000 Subject: [PATCH 057/266] + version 0.9.3 * bug fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@58 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/actions.py | 8 ++++++-- pysollib/gamedb.py | 1 + pysollib/games/spider.py | 2 +- pysollib/help.py | 1 + pysollib/pysolgtk/menubar.py | 3 +++ pysollib/tk/findcarddialog.py | 1 + pysollib/tk/menubar.py | 3 +++ 7 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pysollib/actions.py b/pysollib/actions.py index 282c1e2a..0358bbc8 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -121,7 +121,11 @@ class PysolMenubarActions: return self.game is None or self.game._finishDrag() def _cancelDrag(self, break_pause=True): - return self.game is None or self.game._cancelDrag(break_pause=break_pause) + if self.game is None: + return True + ret = self.game._cancelDrag(break_pause=break_pause) + self._setPauseMenu(self.game.pause) + return ret def changed(self, *args, **kw): assert self.game is not None @@ -712,7 +716,7 @@ class PysolMenubarActions: # if (text_color != self.app.opt.colors['text'] or use_default_text_color != self.app.opt.use_default_text_color): - self.app.setTile(self.app.opt.tabletile_index) + self.app.setTile(self.app.tabletile_index) def mOptFonts(self, *args): if self._cancelDrag(break_pause=False): return diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index f0e65251..86a848ea 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -336,6 +336,7 @@ class GI: ('fc-0.9.0', tuple(range(323, 421))), ('fc-0.9.1', tuple(range(421, 441))), ('fc-0.9.2', tuple(range(441, 466))), + ('fc-0.9.3', tuple(range(466, 661))), ) # deprecated - the correct way is to or a GI.GT_XXX flag diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index ad39692c..385fba7c 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -855,7 +855,7 @@ class Applegate(Game): def getHighlightPilesStacks(self): return () - shallHighlightMatch = Game._shallHighlightMatch_RKW + shallHighlightMatch = Game._shallHighlightMatch_SSW # /*********************************************************************** diff --git a/pysollib/help.py b/pysollib/help.py index 5a51aee5..afedc1c3 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -162,6 +162,7 @@ def help_html(app, document, dir_, top=None): viewer = HTMLViewer(top, app, help_html_index) viewer.display(doc) #wm_map(top, maximized=maximized) + viewer.parent.wm_deiconify() viewer.parent.tkraise() help_html_viewer = viewer return viewer diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index e7dfb021..13739572 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -863,3 +863,6 @@ class PysolMenubar(PysolMenubarActions): # FIXME pass + def _setPauseMenu(self, v): + # FIXME + pass diff --git a/pysollib/tk/findcarddialog.py b/pysollib/tk/findcarddialog.py index 0ae5ad91..cf55a000 100644 --- a/pysollib/tk/findcarddialog.py +++ b/pysollib/tk/findcarddialog.py @@ -196,6 +196,7 @@ find_card_dialog = None def create_find_card_dialog(parent, game, dir): global find_card_dialog try: + find_card_dialog.wm_deiconify() find_card_dialog.tkraise() except: ##traceback.print_exc() diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index b063cff6..d3e7d520 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -939,6 +939,9 @@ class PysolMenubar(PysolMenubarActions): def _setCommentMenu(self, v): self.tkopt.comment.set(v) + def _setPauseMenu(self, v): + self.tkopt.pause.set(v) + # # menu actions From 58704aa73af1db2922c08114f0b53a5d0db44f10 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 28 Aug 2006 21:23:52 +0000 Subject: [PATCH 058/266] * fixed game Q.C. git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@60 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/games/klondike.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 58d1c2ce..155845a5 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -899,21 +899,20 @@ class Q_C_(Klondike): return 0 def fillAll(self): - # rows - for r in self.s.rows: - if self.fillOne(r): - self.fillAll() - return - # waste + # fill if not self.s.waste.cards and self.s.talon.cards: self.s.talon.dealCards() - if self.fillOne(self.s.waste): - self.fillAll() - - def fillStack(self, stack): - if stack in self.s.rows: + for stack in self.s.rows: if not stack.cards and self.s.waste.cards: self.s.waste.moveMove(1, stack) + # move to foundations + if self.fillOne(self.s.waste): + self.fillAll() + for stack in self.s.rows: + if self.fillOne(stack): + self.fillAll() + + def fillStack(self, stack): self.fillAll() shallHighlightMatch = Game._shallHighlightMatch_SS From 55d12b88420318faa62ffaabe58263526fb6d9e5 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 31 Aug 2006 21:15:51 +0000 Subject: [PATCH 059/266] * added support ossaudiodev git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@61 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 2 +- pysollib/main.py | 7 ++-- pysollib/pysolaudio.py | 80 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 85 insertions(+), 4 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index e3c10b05..82f5f17b 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -878,10 +878,10 @@ class Game: # def playSample(self, name, priority=0, loop=0): + ##print "Game.playSample:", name, priority, loop if self.app.opt.sound_samples.has_key(name) and \ not self.app.opt.sound_samples[name]: return 0 - ##print "playSample:", name, priority, loop if self.app.audio: return self.app.audio.playSample(name, priority=priority, loop=loop) return 0 diff --git a/pysollib/main.py b/pysollib/main.py index a4e1dcb8..6b133fa5 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -48,7 +48,7 @@ from resource import Tile from gamedb import GI from app import Application from pysolaudio import thread, pysolsoundserver -from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient, Win32AudioClient +from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient, Win32AudioClient, OSSAudioClient # Toolkit imports from pysoltk import tkversion, wm_withdraw, wm_set_icon, loadImage @@ -243,6 +243,8 @@ def pysol_init(app, args): app.audio = PysolSoundServerModuleClient() elif os.name == "nt": app.audio = Win32AudioClient() + elif os.name == 'posix': + app.audio = OSSAudioClient() if app.audio: app.audio.startServer() if app.audio.server is None: @@ -418,7 +420,8 @@ Please check your %s installation. app.wm_withdraw() # warn about audio problems - if not opts["nosound"] and os.name == "posix" and pysolsoundserver is None: + if (not opts["nosound"] and os.name == "posix" and + not app.audio and pysolsoundserver is None): if 1 and app.opt.sound and re.search(r"linux", sys.platform, re.I): warn_pysolsoundserver = 1 if thread is None: diff --git a/pysollib/pysolaudio.py b/pysollib/pysolaudio.py index acab3e95..35527353 100644 --- a/pysollib/pysolaudio.py +++ b/pysollib/pysolaudio.py @@ -39,6 +39,8 @@ import os, re, string, sys, time, types import traceback import thread +from threading import Thread + try: import pysolsoundserver except ImportError: @@ -101,6 +103,7 @@ class AbstractAudioClient: self.stopMusic() def playSample(self, name, priority=0, loop=0, volume=-1): + ##print 'AbstractAudioClient.playSample', name if self.audiodev is None or not self.app or not self.app.opt.sound: return 0 if priority <= self.sample_priority and self.sample_loop: @@ -301,7 +304,7 @@ class Win32AudioClient(AbstractAudioClient): def startServer(self): # use the built-in winsound module try: - import winsound #keep# + import winsound self.audiodev = winsound del winsound self.server = 0 # success - see also tk/menubar.py @@ -329,3 +332,78 @@ class Win32AudioClient(AbstractAudioClient): a.PlaySound(None, flags) +# /*********************************************************************** +# // OSS audio +# ************************************************************************/ + +class OSSAudioClient(AbstractAudioClient): + + def startServer(self): + try: + import ossaudiodev, wave + self.server = 0 # success - see also tk/menubar.py + self.audiodev = ossaudiodev #.open('w') + except: + if traceback: traceback.print_exc() + self.server = None + self.audiodev = None + + + def _playSample(self, filename, priority, loop, volume): + ##print '_playSample:', filename, loop + if loop: + self._play_loop = True + th = Thread(target=self._playLoop, args=(filename, priority)) + th.start() + return 1 + th = Thread(target=self._play, args=(filename, priority)) + th.start() + return 1 + + def _playLoop(self, filename, priority): + ##print '_playLoop:', filename + try: + import ossaudiodev, wave + #audiodev = self.audiodev + audiodev = ossaudiodev.open('w') + w = wave.open(filename) + fmt = ossaudiodev.AFMT_U8 + #fmt = ossaudiodev.AFMT_S8 + nch = w.getnchannels() + rate = w.getframerate() + frames = w.readframes(w.getnframes()) + #audiodev.nonblock() + audiodev.setparameters(fmt, nch, rate) + while self._play_loop: + audiodev.write(frames) + audiodev.reset() + audiodev.close() + #self.audiodev = ossaudiodev.open('w') + return 1 + except: + if traceback: traceback.print_exc() + return 0 + + def _play(self, filename, priority): + ##print '_play:', filename + try: + import ossaudiodev, wave + #audiodev = self.audiodev + audiodev = ossaudiodev.open('w') + audiodev.nonblock() + w = wave.open(filename) + fmt = ossaudiodev.AFMT_U8 + #fmt = ossaudiodev.AFMT_S8 + nch = w.getnchannels() + rate = w.getframerate() + frames = w.readframes(w.getnframes()) + audiodev.setparameters(fmt, nch, rate) + audiodev.write(frames) + return 1 + except: + if traceback: traceback.print_exc() + return 0 + + def _stopSamples(self): + self._play_loop = False + From 1da7c2d96ab0455e12b94cc4cbf8ea48bdc15678 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 1 Sep 2006 21:16:26 +0000 Subject: [PATCH 060/266] * improved support ossaudiodev git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@62 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/pysolaudio.py | 150 +++++++++++++++++++++++++---------------- 1 file changed, 93 insertions(+), 57 deletions(-) diff --git a/pysollib/pysolaudio.py b/pysollib/pysolaudio.py index 35527353..2867784b 100644 --- a/pysollib/pysolaudio.py +++ b/pysollib/pysolaudio.py @@ -35,11 +35,14 @@ # imports -import os, re, string, sys, time, types +import os, sys import traceback -import thread -from threading import Thread +try: + import thread + from threading import Thread +except ImportError: + thread = None try: import pysolsoundserver @@ -57,7 +60,6 @@ class AbstractAudioClient: self.audiodev = None self.connected = 0 self.app = None - self.file_cache = {} self.sample_priority = -1 self.sample_loop = 0 self.music_priority = -1 @@ -336,13 +338,94 @@ class Win32AudioClient(AbstractAudioClient): # // OSS audio # ************************************************************************/ +#import wave, ossaudiodev + +class OSSAudioServer: + + def __init__(self, pipe): + import ossaudiodev + self.pipe = pipe + #self.audiodev = ossaudiodev.open('w') + + def mainLoop(self): + while True: + s = os.read(self.pipe, 256) + ss = s.split('\0', 2) + if not ss[0]: + os._exit(0) + if ss[0] == 'break': + self._play_loop = False + continue + filename, loop = ss[0], int(ss[1]) + if loop: + self._play_loop = True + th = Thread(target=self.playLoop, args=(filename,)) + th.start() + else: + self.play(filename) + + def _getParameters(self, filename): + import ossaudiodev, wave + w = wave.open(filename) + fmt = ossaudiodev.AFMT_U8 + nch = w.getnchannels() + rate = w.getframerate() + frames = w.readframes(w.getnframes()) + return (frames, fmt, nch, rate) + + def playLoop(self, filename, priority=None): + ##print '_playLoop:', filename + import ossaudiodev, wave + try: + #audiodev = self.audiodev + audiodev = ossaudiodev.open('w') + #audiodev.nonblock() + frames, fmt, nch, rate = self._getParameters(filename) + audiodev.setparameters(fmt, nch, rate) + while self._play_loop: + audiodev.write(frames) + audiodev.reset() + #audiodev.close() + #self.audiodev = ossaudiodev.open('w') + return 1 + except: + if traceback: traceback.print_exc() + return 0 + + def play(self, filename, priority=None): + ##print '_play:', filename + import ossaudiodev, wave + try: + #audiodev = self.audiodev + audiodev = ossaudiodev.open('w') + #audiodev.nonblock() + frames, fmt, nch, rate = self._getParameters(filename) + audiodev.setparameters(fmt, nch, rate) + audiodev.write(frames) + #audiodev.close() + #self.audiodev = ossaudiodev.open('w') + return 1 + except: + if traceback: traceback.print_exc() + return 0 + + class OSSAudioClient(AbstractAudioClient): + def __init__(self): + AbstractAudioClient.__init__(self) + def startServer(self): try: import ossaudiodev, wave self.server = 0 # success - see also tk/menubar.py - self.audiodev = ossaudiodev #.open('w') + self.audiodev = ossaudiodev + pin, pout = os.pipe() + self.pout = pout + server = OSSAudioServer(pin) + pid = os.fork() + if pid == 0: + server.mainLoop() except: if traceback: traceback.print_exc() self.server = None @@ -351,59 +434,12 @@ class OSSAudioClient(AbstractAudioClient): def _playSample(self, filename, priority, loop, volume): ##print '_playSample:', filename, loop - if loop: - self._play_loop = True - th = Thread(target=self._playLoop, args=(filename, priority)) - th.start() - return 1 - th = Thread(target=self._play, args=(filename, priority)) - th.start() + os.write(self.pout, '%s\0%s\0' % (filename, loop)) return 1 - def _playLoop(self, filename, priority): - ##print '_playLoop:', filename - try: - import ossaudiodev, wave - #audiodev = self.audiodev - audiodev = ossaudiodev.open('w') - w = wave.open(filename) - fmt = ossaudiodev.AFMT_U8 - #fmt = ossaudiodev.AFMT_S8 - nch = w.getnchannels() - rate = w.getframerate() - frames = w.readframes(w.getnframes()) - #audiodev.nonblock() - audiodev.setparameters(fmt, nch, rate) - while self._play_loop: - audiodev.write(frames) - audiodev.reset() - audiodev.close() - #self.audiodev = ossaudiodev.open('w') - return 1 - except: - if traceback: traceback.print_exc() - return 0 - - def _play(self, filename, priority): - ##print '_play:', filename - try: - import ossaudiodev, wave - #audiodev = self.audiodev - audiodev = ossaudiodev.open('w') - audiodev.nonblock() - w = wave.open(filename) - fmt = ossaudiodev.AFMT_U8 - #fmt = ossaudiodev.AFMT_S8 - nch = w.getnchannels() - rate = w.getframerate() - frames = w.readframes(w.getnframes()) - audiodev.setparameters(fmt, nch, rate) - audiodev.write(frames) - return 1 - except: - if traceback: traceback.print_exc() - return 0 - def _stopSamples(self): - self._play_loop = False + os.write(self.pout, 'break\0\0') + + def _destroy(self): + os.write(self.pout, '\0\0') From 2131e61d2d16000bd969f915ff9c6ae061314e6e Mon Sep 17 00:00:00 2001 From: skomoroh Date: Tue, 5 Sep 2006 21:28:19 +0000 Subject: [PATCH 061/266] * added support pygame (sound) git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@63 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- MANIFEST.in | 27 +-- pysollib/app.py | 2 +- pysollib/main.py | 48 +++-- pysollib/pysolaudio.py | 299 ++++++++++++++++++++++++------ pysollib/pysolgtk/menubar.py | 2 +- pysollib/settings.py | 2 +- pysollib/tk/menubar.py | 9 +- pysollib/tk/soundoptionsdialog.py | 2 +- 8 files changed, 292 insertions(+), 99 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 2298846d..4b3ed1a1 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,13 +7,26 @@ include pysol setup.py setup.cfg MANIFEST.in Makefile COPYING README include pysollib/*.py pysollib/tk/*.py pysollib/pysolgtk/*.py include pysollib/games/*.py pysollib/games/special/*.py include pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py -include docs/* -include po/* include scripts/build.bat scripts/create_iss.py scripts/mahjongg_utils.py include scripts/all_games.py scripts/cardset_viewer.py ## ## data ## +include docs/* +graft data/html +graft data/html-src +#graft data/images +recursive-include data/images *.gif *.png +#graft data/music +#graft data/plugins +graft data/sound +graft data/tiles +include data/pysol.xbm data/pysol.xpm data/pysol.ico +include po/* +graft locale +## +## cardsets +## graft data/cardset-2000 graft data/cardset-crystal-mahjongg graft data/cardset-dashavatara-ganjifa @@ -26,13 +39,3 @@ graft data/cardset-oxymoron graft data/cardset-standard graft data/cardset-tuxedo graft data/cardset-vienna-2k -graft data/html -graft data/html-src -#graft data/images -recursive-include data/images *.gif *.png -#graft data/music -#graft data/plugins -graft data/sound -graft data/tiles -include data/pysol.xbm data/pysol.xpm data/pysol.ico -graft locale diff --git a/pysollib/app.py b/pysollib/app.py index 3af70717..03427760 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -1675,7 +1675,7 @@ Please select a %s type %s. except: pass ##print dirs - ext_re = re.compile(r"\.((it)|(mod)|(mp3)|(pym)|(s3m)|(xm))$", re.I) + ext_re = re.compile(self.audio.EXTENTIONS) self.initResource(manager, dirs, ext_re, Music) diff --git a/pysollib/main.py b/pysollib/main.py index 6b133fa5..9fa6ceac 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -48,7 +48,8 @@ from resource import Tile from gamedb import GI from app import Application from pysolaudio import thread, pysolsoundserver -from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient, Win32AudioClient, OSSAudioClient +from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient +from pysolaudio import Win32AudioClient, OSSAudioClient, PyGameAudioClient # Toolkit imports from pysoltk import tkversion, wm_withdraw, wm_set_icon, loadImage @@ -91,6 +92,7 @@ def parse_option(argv): "noplugins", "nosound", "debug=", + "sound-mod=", "help"]) except getopt.GetoptError, err: print _("%s: %s\ntry %s --help for more information") \ @@ -105,6 +107,7 @@ def parse_option(argv): "french-only": False, "noplugins": False, "nosound": False, + "sound-mod": None, "debug": 0, } for i in optlist: @@ -126,6 +129,9 @@ def parse_option(argv): opts["noplugins"] = True elif i[0] == "--nosound": opts["nosound"] = True + elif i[0] == "--sound-mod": + assert i[1] in ('pss', 'pygame', 'oss', 'win') + opts["sound-mod"] = i[1] elif i[0] in ("-D", "--debug"): opts["debug"] = i[1] @@ -237,23 +243,27 @@ def pysol_init(app, args): warn_pysolsoundserver = 0 app.audio = None if not opts["nosound"]: - if os.name == "nt" and app.opt.sound_mode == 0: - app.audio = Win32AudioClient() - elif pysolsoundserver: - app.audio = PysolSoundServerModuleClient() - elif os.name == "nt": - app.audio = Win32AudioClient() - elif os.name == 'posix': - app.audio = OSSAudioClient() - if app.audio: - app.audio.startServer() - if app.audio.server is None: - if os.name == "nt" and not isinstance(app.audio, Win32AudioClient): - app.audio.destroy() - app.audio = Win32AudioClient() - app.audio.startServer() - else: - app.audio = AbstractAudioClient() + if opts['sound-mod']: + d = {'pss': PysolSoundServerModuleClient, + 'pygame': PyGameAudioClient, + 'oss': OSSAudioClient, + 'win': Win32AudioClient} + c = d[opts['sound-mod']] + app.audio = c() + else: + for c in (PysolSoundServerModuleClient, + PyGameAudioClient, + OSSAudioClient, + Win32AudioClient, + AbstractAudioClient): + try: + app.audio = c() + except: + pass + else: + # success + break + app.audio.startServer() # update sound_mode if isinstance(app.audio, PysolSoundServerModuleClient): app.opt.sound_mode = 1 @@ -394,7 +404,7 @@ Please check your %s installation. app.audio.connectServer(app) if app.audio.audiodev is None: app.opt.sound = 0 - if not opts["nosound"] and pysolsoundserver and not app.audio.connected: + if not opts["nosound"] and not opts['sound-mod'] and pysolsoundserver and not app.audio.connected: print PACKAGE + ": could not connect to pysolsoundserver, sound disabled." warn_pysolsoundserver = 1 app.audio.updateSettings() diff --git a/pysollib/pysolaudio.py b/pysollib/pysolaudio.py index 2867784b..b18953f8 100644 --- a/pysollib/pysolaudio.py +++ b/pysollib/pysolaudio.py @@ -35,7 +35,7 @@ # imports -import os, sys +import os, sys, time import traceback try: @@ -55,6 +55,12 @@ except ImportError: # ************************************************************************/ class AbstractAudioClient: + + EXTENTIONS = r"\.((it)|(mod)|(mp3)|(pym)|(s3m)|(xm))$" + + CAN_PLAY_SOUND = False + CAN_PLAY_MUSIC = False + def __init__(self): self.server = None self.audiodev = None @@ -100,10 +106,6 @@ class AbstractAudioClient: # high-level interface # - def stopAll(self): - self.stopSamples() - self.stopMusic() - def playSample(self, name, priority=0, loop=0, volume=-1): ##print 'AbstractAudioClient.playSample', name if self.audiodev is None or not self.app or not self.app.opt.sound: @@ -142,33 +144,6 @@ class AbstractAudioClient: self.sample_priority = -1 self.sample_loop = 0 - def playMusic(self, basename, priority=0, loop=0, volume=-1): - if self.audiodev is None or not self.app or not self.app.opt.sound: - return 0 - if priority <= self.music_priority and self.music_loop: - return 0 - obj = self.app.music_manager.getByBasename(basename) - if not obj or not obj.absname: - return 0 - try: - if self._playMusic(obj.absname, priority, loop, volume): - self.music_priority = priority - self.music_loop = loop - return 1 - except: - if traceback: traceback.print_exc() - return 0 - - def stopMusic(self): - if self.audiodev is None: - return - try: - self._stopMusic() - except: - if traceback: traceback.print_exc() - self.music_priority = -1 - self.music_loop = 0 - # # subclass - core implementation # @@ -188,12 +163,6 @@ class AbstractAudioClient: def _stopSamplesLoop(self): self._stopSamples() - def _playMusic(self, name, priority, loop, volume): - return 0 - - def _stopMusic(self): - pass - # # subclass - extensions # @@ -216,6 +185,14 @@ class AbstractAudioClient: # ************************************************************************/ class PysolSoundServerModuleClient(AbstractAudioClient): + + CAN_PLAY_SOUND = True + CAN_PLAY_MUSIC = True + + def __init__(self): + import pysolsoundserver + AbstractAudioClient.__init__(self) + def startServer(self): # use the module try: @@ -257,13 +234,6 @@ class PysolSoundServerModuleClient(AbstractAudioClient): def _stopSamplesLoop(self): self.cmd("stopwavloop") - def _playMusic(self, filename, priority, loop, volume): - self.cmd("playmus '%s' %d %d %d %d" % (filename, -1, priority, loop, volume)) - return 1 - - def _stopMusic(self): - self.cmd("stopmus") - def getMusicInfo(self): if self.audiodev: return self.audiodev.getMusicInfo() @@ -303,12 +273,19 @@ class PysolSoundServerModuleClient(AbstractAudioClient): # ************************************************************************/ class Win32AudioClient(AbstractAudioClient): + + CAN_PLAY_SOUND = True + CAN_PLAY_MUSIC = False + + def __init__(self): + import winsound + AbstractAudioClient.__init__(self) + def startServer(self): # use the built-in winsound module try: import winsound self.audiodev = winsound - del winsound self.server = 0 # success - see also tk/menubar.py except: self.server = None @@ -338,31 +315,32 @@ class Win32AudioClient(AbstractAudioClient): # // OSS audio # ************************************************************************/ -#import wave, ossaudiodev - class OSSAudioServer: def __init__(self, pipe): - import ossaudiodev self.pipe = pipe + #import ossaudiodev #self.audiodev = ossaudiodev.open('w') + self.sound_priority = -1 + self._busy = False def mainLoop(self): while True: s = os.read(self.pipe, 256) - ss = s.split('\0', 2) + ss = s.split('\0') if not ss[0]: os._exit(0) if ss[0] == 'break': self._play_loop = False continue - filename, loop = ss[0], int(ss[1]) + filename, priority, loop = ss[0], int(ss[1]), int(ss[2]) if loop: self._play_loop = True th = Thread(target=self.playLoop, args=(filename,)) th.start() else: - self.play(filename) + if not self._busy: + self.play(filename, priority) def _getParameters(self, filename): import ossaudiodev, wave @@ -392,10 +370,11 @@ class OSSAudioServer: if traceback: traceback.print_exc() return 0 - def play(self, filename, priority=None): + def play(self, filename, priority): ##print '_play:', filename import ossaudiodev, wave try: + self._busy = True #audiodev = self.audiodev audiodev = ossaudiodev.open('w') #audiodev.nonblock() @@ -404,15 +383,22 @@ class OSSAudioServer: audiodev.write(frames) #audiodev.close() #self.audiodev = ossaudiodev.open('w') + self.sound_priority = priority + self._busy = False return 1 except: if traceback: traceback.print_exc() + self._busy = False return 0 class OSSAudioClient(AbstractAudioClient): + CAN_PLAY_SOUND = True + CAN_PLAY_MUSIC = False + def __init__(self): + import ossaudiodev, wave AbstractAudioClient.__init__(self) def startServer(self): @@ -434,12 +420,213 @@ class OSSAudioClient(AbstractAudioClient): def _playSample(self, filename, priority, loop, volume): ##print '_playSample:', filename, loop - os.write(self.pout, '%s\0%s\0' % (filename, loop)) + os.write(self.pout, '%s\0%s\0%s\0' % (filename, priority, loop)) return 1 def _stopSamples(self): - os.write(self.pout, 'break\0\0') + os.write(self.pout, 'break\0\0\0') def _destroy(self): - os.write(self.pout, '\0\0') + os.write(self.pout, '\0\0\0') + +# /*********************************************************************** +# // PyMedia (http://pymedia.org/) +# ************************************************************************/ + +class PyMediaAudioClient(AbstractAudioClient): + + CAN_PLAY_SOUND = True + CAN_PLAY_MUSIC = True + + def __init__(self): + import pymedia, wave + AbstractAudioClient.__init__(self) + + def startServer(self): + try: + import pymedia, wave + self.server = 1 # success - see also tk/menubar.py + self.audiodev = pymedia + self.splayer = pymedia.Player() + self.splayer.start() + self.mplayer = pymedia.Player() + self.mplayer.start() + except: + if traceback: traceback.print_exc() + self.server = None + self.audiodev = None + + + def _playSample(self, filename, priority, loop, volume): + print '_playSample:', filename, loop + self.splayer.setLoops(loop) + self.splayer.startPlayback(filename) + return 1 + + def _stopSamples(self): + self.splayer.stopPlayback() + + + def _playMusicLoop(self, music_list): + while True: + if not self.play_music: + break + for m in music_list: + if not self.play_music: + break + if m.absname.endswith('.mp3'): + print m.absname, m.volume + self.mplayer.startPlayback(m.absname) + while self.mplayer and self.mplayer.isPlaying() and self.play_music: + time.sleep(0.1) + if self.mplayer: + self.mplayer.stopPlayback() + + + def playContinuousMusic(self, music_list): + print 'playContinuousMusic' + if self.audiodev is None or not self.app: + return + self.play_music = True + th = Thread(target=self._playMusicLoop, args=(music_list,)) + th.start() + + def updateSettings(self): + if self.audiodev is None or not self.app: + return + s, m = 0, 0 + if self.app.opt.sound: + s = self.app.opt.sound_sample_volume*512 + s = min(65535, s) + s = max(0, s) + m = self.app.opt.sound_music_volume*512 + m = min(65535, m) + m = max(0, m) + print 'updateSettings:', s, m + try: + pass + self.splayer.setVolume(s) + self.mplayer.setVolume(m) + except: + if traceback: traceback.print_exc() + + +# /*********************************************************************** +# // PyGame +# ************************************************************************/ + +class PyGameAudioClient(AbstractAudioClient): + + EXTENTIONS = r'\.((ogg)|(mp3)|(it)|(mod)|(s3m)|(xm)|(mid))$' + if os.name == 'nt': # without mp3 + EXTENTIONS = r'\.((ogg)|(it)|(mod)|(s3m)|(xm)|(mid))$' + + CAN_PLAY_SOUND = True + CAN_PLAY_MUSIC = True + + def __init__(self): + import pygame.mixer, pygame.time + AbstractAudioClient.__init__(self) + + def startServer(self): + try: + import pygame.mixer, pygame.time + self.server = 0 # success - see also tk/menubar.py + self.audiodev = pygame.mixer + self.mixer = pygame.mixer + self.mixer.init() + self.music = self.mixer.music + self.time = pygame.time + self.sound = None + self.sound_channel = None + self.sound_priority = -1 + except: + if traceback: traceback.print_exc() + self.server = None + self.audiodev = None + + def _playSample(self, filename, priority, loop, volume): + ##print '_playSample:', filename, priority, loop, volume + if self.sound_channel and self.sound_channel.get_busy(): + if self.sound_priority >= priority: + return 0 + else: + self.sound.stop() + vol = self.app.opt.sound_sample_volume/128.0 + try: + self.sound = self.mixer.Sound(filename) + self.sound.set_volume(vol) + self.sound_channel = self.sound.play(loop) + self.sound_priority = priority + except: + if traceback: traceback.print_exc() + pass + return 1 + + def _stopSamples(self): + if self.sound: + self.sound.stop() + self.sound = None + self.sound_channel = None + + def _playMusicLoop(self): + ##print '_playMusicLoop' + music_list = self.music_list + if not music_list: + return + while True: + if not self.music: + break + for m in music_list: + if not self.music: + break + vol = self.app.opt.sound_music_volume/128.0 + try: + self.music.load(m.absname) + self.music.set_volume(vol) + self.music.play() + while self.music and self.music.get_busy(): + self.time.wait(200) + if self.time: + self.time.wait(300) + except: + if traceback: traceback.print_exc() + self.time.wait(1000) + + def playContinuousMusic(self, music_list): + ##print 'playContinuousMusic' + self.music_list = music_list + #if self.audiodev is None or not self.app: + # return + if not music_list: + return + th = Thread(target=self._playMusicLoop) + th.start() + + def _destroy(self): + try: + self.mixer.stop() + self.mixer.quit() + self.music = None + except: + if traceback: traceback.print_exc() + pass + + def updateSettings(self): + if not self.app.opt.sound or self.app.opt.sound_music_volume == 0: + if self.music: + self.music.stop() + self.music = None + else: + if not self.music: + self.music = self.mixer.music + th = Thread(target=self._playMusicLoop) + th.start() + else: + vol = self.app.opt.sound_music_volume/128.0 + self.music.set_volume(vol) + + def playNextMusic(self): + if self.music: + self.music.stop() diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 13739572..79b859d1 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -449,7 +449,7 @@ class PysolMenubar(PysolMenubarActions): menu = ui_manager.get_widget('/menubar/select').get_submenu() self._createSelectMenu(games, menu) - if self.app.audio.audiodev is None: + if not self.app.audio.CAN_PLAY_SOUND: item = ui_manager.get_widget('/menubar/options/sound') item.set_sensitive(False) diff --git a/pysollib/settings.py b/pysollib/settings.py index 9841f870..99f148a3 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -29,7 +29,7 @@ PACKAGE = 'PySol' PACKAGE_URL = 'http://sourceforge.net/projects/pysolfc/' VERSION = '4.82' -FC_VERSION = '0.9.3' +FC_VERSION = '0.9.4' VERSION_TUPLE = (4, 82) TOOLKIT = 'gtk' diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index d3e7d520..b7303f45 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -47,7 +47,6 @@ from pysollib.settings import PACKAGE from pysollib.settings import TOP_TITLE from pysollib.gamedb import GI from pysollib.actions import PysolMenubarActions -from pysollib.pysolaudio import pysolsoundserver # toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS @@ -463,7 +462,7 @@ class PysolMenubar(PysolMenubarActions): submenu.add_checkbutton(label=n_("Show hint &arrow (in Shisen-Sho games)"), variable=self.tkopt.shisen_show_hint, command=self.mOptShisenShowHint) menu.add_separator() label = n_("&Sound...") - if self.app.audio.audiodev is None: + if not self.app.audio.CAN_PLAY_SOUND: menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSoundDialog, state=Tkinter.DISABLED) else: menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSoundDialog) @@ -1113,12 +1112,6 @@ class PysolMenubar(PysolMenubarActions): self.app.opt.shisen_show_hint = self.tkopt.shisen_show_hint.get() ##self.game.updateMenus() -## def mOptSound(self, *args): -## if self._cancelDrag(break_pause=False): return -## self.app.opt.sound = self.tkopt.sound.get() -## if not self.app.opt.sound: -## self.app.audio.stopAll() - def mSelectCardsetDialog(self, *event): if self._cancelDrag(break_pause=False): return ##strings, default = ("&OK", "&Load", "&Cancel"), 0 diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index bc3d2f67..ea2ea49a 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -118,7 +118,7 @@ class SoundOptionsDialog(MfxDialog): command=self.mOptSoundDirectX, anchor='w') w.grid(row=row, column=0, columnspan=2, sticky='ew') # - if pysolsoundserver and app.startup_opt.sound_mode > 0: + if app.audio.CAN_PLAY_MUSIC: # and app.startup_opt.sound_mode > 0: row += 1 w = Tkinter.Label(frame, text=_('Sample volume:')) w.grid(row=row, column=0, sticky='w') From 2822406ab5ffae11ff9fb35fae3140b712ec100e Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 6 Sep 2006 21:26:48 +0000 Subject: [PATCH 062/266] - removed PyMediaAudioClient git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@64 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/main.py | 8 +++- pysollib/pysolaudio.py | 94 +++--------------------------------------- 2 files changed, 13 insertions(+), 89 deletions(-) diff --git a/pysollib/main.py b/pysollib/main.py index 9fa6ceac..48e73d19 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -138,14 +138,18 @@ def parse_option(argv): if opts["help"]: print _("""Usage: %s [OPTIONS] [FILE] -g --game=GAMENAME start game GAMENAME + -i --gameid=GAMEID + --french-only --fg --foreground=COLOR foreground color --bg --background=COLOR background color --fn --font=FONT default font + --sound-mod=MOD --nosound disable sound support --noplugins disable load plugins -h --help display this help and exit FILE - file name of a saved game + MOD - one of following: pss(default), pygame, oss, win """) % prog_name return None @@ -242,7 +246,9 @@ def pysol_init(app, args): warn_thread = 0 warn_pysolsoundserver = 0 app.audio = None - if not opts["nosound"]: + if opts["nosound"]: + app.audio = AbstractAudioClient() + else: if opts['sound-mod']: d = {'pss': PysolSoundServerModuleClient, 'pygame': PyGameAudioClient, diff --git a/pysollib/pysolaudio.py b/pysollib/pysolaudio.py index b18953f8..bff63107 100644 --- a/pysollib/pysolaudio.py +++ b/pysollib/pysolaudio.py @@ -72,7 +72,10 @@ class AbstractAudioClient: self.music_loop = 0 def __del__(self): - self.destroy() + try: + self.destroy() + except: + pass # start server - set self.server on success (may also set self.audiodev) def startServer(self): @@ -92,11 +95,7 @@ class AbstractAudioClient: # disconnect and stop server def destroy(self): - if self.audiodev is not None: - try: - self._destroy() - except: - pass + self._destroy() self.server = None self.audiodev = None self.connected = 0 @@ -430,88 +429,6 @@ class OSSAudioClient(AbstractAudioClient): os.write(self.pout, '\0\0\0') -# /*********************************************************************** -# // PyMedia (http://pymedia.org/) -# ************************************************************************/ - -class PyMediaAudioClient(AbstractAudioClient): - - CAN_PLAY_SOUND = True - CAN_PLAY_MUSIC = True - - def __init__(self): - import pymedia, wave - AbstractAudioClient.__init__(self) - - def startServer(self): - try: - import pymedia, wave - self.server = 1 # success - see also tk/menubar.py - self.audiodev = pymedia - self.splayer = pymedia.Player() - self.splayer.start() - self.mplayer = pymedia.Player() - self.mplayer.start() - except: - if traceback: traceback.print_exc() - self.server = None - self.audiodev = None - - - def _playSample(self, filename, priority, loop, volume): - print '_playSample:', filename, loop - self.splayer.setLoops(loop) - self.splayer.startPlayback(filename) - return 1 - - def _stopSamples(self): - self.splayer.stopPlayback() - - - def _playMusicLoop(self, music_list): - while True: - if not self.play_music: - break - for m in music_list: - if not self.play_music: - break - if m.absname.endswith('.mp3'): - print m.absname, m.volume - self.mplayer.startPlayback(m.absname) - while self.mplayer and self.mplayer.isPlaying() and self.play_music: - time.sleep(0.1) - if self.mplayer: - self.mplayer.stopPlayback() - - - def playContinuousMusic(self, music_list): - print 'playContinuousMusic' - if self.audiodev is None or not self.app: - return - self.play_music = True - th = Thread(target=self._playMusicLoop, args=(music_list,)) - th.start() - - def updateSettings(self): - if self.audiodev is None or not self.app: - return - s, m = 0, 0 - if self.app.opt.sound: - s = self.app.opt.sound_sample_volume*512 - s = min(65535, s) - s = max(0, s) - m = self.app.opt.sound_music_volume*512 - m = min(65535, m) - m = max(0, m) - print 'updateSettings:', s, m - try: - pass - self.splayer.setVolume(s) - self.mplayer.setVolume(m) - except: - if traceback: traceback.print_exc() - - # /*********************************************************************** # // PyGame # ************************************************************************/ @@ -630,3 +547,4 @@ class PyGameAudioClient(AbstractAudioClient): def playNextMusic(self): if self.music: self.music.stop() + From 08ced9f908bfced3db75f53bf754d80ef82bff96 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 7 Sep 2006 22:57:07 +0000 Subject: [PATCH 063/266] - improved sound support git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@65 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- MANIFEST.in | 30 +++++++++++--- README | 12 ++++-- pysollib/main.py | 4 +- pysollib/pysolaudio.py | 91 +++++++++++++++++------------------------- scripts/build.bat | 4 ++ setup.cfg | 1 + setup.py | 4 +- 7 files changed, 81 insertions(+), 65 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 4b3ed1a1..6fca5c92 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ +# -*- mode: sh -*- ## MANIFEST.in for PySolFC ## ## code @@ -9,23 +10,42 @@ include pysollib/games/*.py pysollib/games/special/*.py include pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py include scripts/build.bat scripts/create_iss.py scripts/mahjongg_utils.py include scripts/all_games.py scripts/cardset_viewer.py +#graft data/plugins ## -## data +## data - docs ## include docs/* graft data/html graft data/html-src +## +## data - images +## #graft data/images recursive-include data/images *.gif *.png -#graft data/music -#graft data/plugins -graft data/sound graft data/tiles include data/pysol.xbm data/pysol.xpm data/pysol.ico +## +## data - sound +## +#graft data/music +#include data/music/Astral_Dreams.COPYRIGHT +#include data/music/Astral_Dreams.it +include data/music/Bye_For_Now.COPYRIGHT +include data/music/Bye_For_Now.s3m +#include data/music/Past_and_Future.COPYRIGHT +#include data/music/Past_and_Future.it +include data/music/Ranger_Song.COPYRIGHT +include data/music/Ranger_Song.s3m +include data/music/Subsequential.COPYRIGHT +include data/music/Subsequential.mod +graft data/sound +## +## data - i18n +## include po/* graft locale ## -## cardsets +## data - cardsets ## graft data/cardset-2000 graft data/cardset-crystal-mahjongg diff --git a/README b/README index 5096417b..09c16afb 100644 --- a/README +++ b/README @@ -7,9 +7,15 @@ Requirements. - Python (2.3 or later) - Tkinter -- PySol-Sound-Server: http://www.pysol.org/ (not necessarily) -- PIL (Python Image Library): http://www.pythonware.com/products/pil (not necessarily) -- Freecell Solver: http://vipe.technion.ac.il/~shlomif/freecell-solver/ (not necessarily) + +** for sound support (not necessarily) ** +- PySol-Sound-Server: http://www.pysol.org/ +or +- PyGame: http://www.pygame.org/ + +** other modules (not necessarily) ** +- PIL (Python Image Library): http://www.pythonware.com/products/pil +- Freecell Solver: http://vipe.technion.ac.il/~shlomif/freecell-solver/ Installation. diff --git a/pysollib/main.py b/pysollib/main.py index 48e73d19..6638024b 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -408,14 +408,14 @@ Please check your %s installation. # init audio 2) app.audio.connectServer(app) - if app.audio.audiodev is None: + if not app.audio.CAN_PLAY_SOUND: app.opt.sound = 0 if not opts["nosound"] and not opts['sound-mod'] and pysolsoundserver and not app.audio.connected: print PACKAGE + ": could not connect to pysolsoundserver, sound disabled." warn_pysolsoundserver = 1 app.audio.updateSettings() # start up the background music - if app.audio.audiodev: + if app.audio.CAN_PLAY_MUSIC: music = app.music_manager.getAll() if music: app.music_playlist = list(music)[:] diff --git a/pysollib/pysolaudio.py b/pysollib/pysolaudio.py index bff63107..7ca18fd2 100644 --- a/pysollib/pysolaudio.py +++ b/pysollib/pysolaudio.py @@ -56,7 +56,7 @@ except ImportError: class AbstractAudioClient: - EXTENTIONS = r"\.((it)|(mod)|(mp3)|(pym)|(s3m)|(xm))$" + EXTENTIONS = r"\.((wav)|(it)|(mod)|(mp3)|(pym)|(s3m)|(xm))$" CAN_PLAY_SOUND = False CAN_PLAY_MUSIC = False @@ -72,10 +72,7 @@ class AbstractAudioClient: self.music_loop = 0 def __del__(self): - try: - self.destroy() - except: - pass + self.destroy() # start server - set self.server on success (may also set self.audiodev) def startServer(self): @@ -95,7 +92,8 @@ class AbstractAudioClient: # disconnect and stop server def destroy(self): - self._destroy() + if self.audiodev: + self._destroy() self.server = None self.audiodev = None self.connected = 0 @@ -189,15 +187,15 @@ class PysolSoundServerModuleClient(AbstractAudioClient): CAN_PLAY_MUSIC = True def __init__(self): - import pysolsoundserver AbstractAudioClient.__init__(self) + import pysolsoundserver def startServer(self): # use the module try: self.audiodev = pysolsoundserver self.audiodev.init() - self.server = 1 # success - see also tk/menubar.py + self.server = 1 except: if traceback: traceback.print_exc() self.server = None @@ -277,18 +275,12 @@ class Win32AudioClient(AbstractAudioClient): CAN_PLAY_MUSIC = False def __init__(self): - import winsound AbstractAudioClient.__init__(self) + import winsound + self.audiodev = winsound def startServer(self): - # use the built-in winsound module - try: - import winsound - self.audiodev = winsound - self.server = 0 # success - see also tk/menubar.py - except: - self.server = None - self.audiodev = None + pass def _playSample(self, filename, priority, loop, volume): a = self.audiodev @@ -397,25 +389,21 @@ class OSSAudioClient(AbstractAudioClient): CAN_PLAY_MUSIC = False def __init__(self): - import ossaudiodev, wave AbstractAudioClient.__init__(self) - - def startServer(self): try: import ossaudiodev, wave - self.server = 0 # success - see also tk/menubar.py - self.audiodev = ossaudiodev - pin, pout = os.pipe() - self.pout = pout - server = OSSAudioServer(pin) - pid = os.fork() - if pid == 0: - server.mainLoop() except: if traceback: traceback.print_exc() - self.server = None - self.audiodev = None + raise + self.audiodev = ossaudiodev + def startServer(self): + pin, pout = os.pipe() + self.pout = pout + server = OSSAudioServer(pin) + pid = os.fork() + if pid == 0: + server.mainLoop() def _playSample(self, filename, priority, loop, volume): ##print '_playSample:', filename, loop @@ -435,33 +423,32 @@ class OSSAudioClient(AbstractAudioClient): class PyGameAudioClient(AbstractAudioClient): - EXTENTIONS = r'\.((ogg)|(mp3)|(it)|(mod)|(s3m)|(xm)|(mid))$' - if os.name == 'nt': # without mp3 - EXTENTIONS = r'\.((ogg)|(it)|(mod)|(s3m)|(xm)|(mid))$' + EXTENTIONS = r'\.((ogg)|(mp3)|(wav)|(it)|(mod)|(s3m)|(xm)|(mid))$' CAN_PLAY_SOUND = True CAN_PLAY_MUSIC = True def __init__(self): - import pygame.mixer, pygame.time AbstractAudioClient.__init__(self) - - def startServer(self): try: import pygame.mixer, pygame.time - self.server = 0 # success - see also tk/menubar.py - self.audiodev = pygame.mixer + if os.name == 'nt': + # for py2exe + import pygame.base, pygame.rwobject, pygame.mixer_music self.mixer = pygame.mixer self.mixer.init() self.music = self.mixer.music self.time = pygame.time - self.sound = None - self.sound_channel = None - self.sound_priority = -1 except: - if traceback: traceback.print_exc() - self.server = None - self.audiodev = None + ##if traceback: traceback.print_exc() + raise + self.audiodev = self.mixer + self.sound = None + self.sound_channel = None + self.sound_priority = -1 + + def startServer(self): + pass def _playSample(self, filename, priority, loop, volume): ##print '_playSample:', filename, priority, loop, volume @@ -475,10 +462,10 @@ class PyGameAudioClient(AbstractAudioClient): self.sound = self.mixer.Sound(filename) self.sound.set_volume(vol) self.sound_channel = self.sound.play(loop) - self.sound_priority = priority except: if traceback: traceback.print_exc() pass + self.sound_priority = priority return 1 def _stopSamples(self): @@ -511,6 +498,11 @@ class PyGameAudioClient(AbstractAudioClient): if traceback: traceback.print_exc() self.time.wait(1000) + def _destroy(self): + self.mixer.stop() + self.mixer.quit() + self.music = None + def playContinuousMusic(self, music_list): ##print 'playContinuousMusic' self.music_list = music_list @@ -521,15 +513,6 @@ class PyGameAudioClient(AbstractAudioClient): th = Thread(target=self._playMusicLoop) th.start() - def _destroy(self): - try: - self.mixer.stop() - self.mixer.quit() - self.music = None - except: - if traceback: traceback.print_exc() - pass - def updateSettings(self): if not self.app.opt.sound or self.app.opt.sound_music_volume == 0: if self.music: diff --git a/scripts/build.bat b/scripts/build.bat index 3b1f4879..50ff6bfb 100755 --- a/scripts/build.bat +++ b/scripts/build.bat @@ -5,6 +5,10 @@ rm -rf dist mkdir dist cp -r locale dist cp fc-solve.exe dist +cp smpeg.dll dist +cp ogg.dll dist +cp vorbis.dll dist +cp vorbisfile.dll dist python setup.py py2exe python scripts\create_iss.py "d:\Program Files\Inno Setup 5\ISCC.exe" setup.iss diff --git a/setup.cfg b/setup.cfg index ea699b17..0ebc5083 100644 --- a/setup.cfg +++ b/setup.cfg @@ -6,3 +6,4 @@ force_manifest = 1 release = 1 doc_files = COPYING README use_bzip2 = 1 +group = Amusements/Games diff --git a/setup.py b/setup.py index bca3e377..7b418d89 100644 --- a/setup.py +++ b/setup.py @@ -21,9 +21,11 @@ datas = [ 'tiles', 'toolbar', ] -for s in open('MANIFEST.in'): +for s in file('MANIFEST.in'): if s.startswith('graft data/cardset-'): datas.append(s[11:].strip()) + elif s.startswith('include data/music/'): + datas.append(s[19:].strip()) data_files = [] for d in datas: for root, dirs, files in os.walk(os.path.join('data', d)): From 7faf866e258b249b96c1de6e6375477bbc26e012 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 10 Sep 2006 21:08:17 +0000 Subject: [PATCH 064/266] + new mouse option: `point-n-click' git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@66 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- MANIFEST.in | 12 +-- pysollib/app.py | 2 +- pysollib/games/pushpin.py | 4 +- pysollib/games/ultra/matrix.py | 2 +- pysollib/images.py | 5 ++ pysollib/pysolaudio.py | 2 +- pysollib/pysolgtk/menubar.py | 23 ++++- pysollib/pysolgtk/tkcanvas.py | 2 + pysollib/pysolgtk/tkconst.py | 5 +- pysollib/stack.py | 151 +++++++++++++++++++++++++++------ pysollib/tk/menubar.py | 16 ++-- pysollib/tk/tkcanvas.py | 9 +- pysollib/tk/tkconst.py | 6 +- scripts/build.bat | 8 +- setup.py | 18 ++-- 15 files changed, 205 insertions(+), 60 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 6fca5c92..5c619d34 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -30,14 +30,14 @@ include data/pysol.xbm data/pysol.xpm data/pysol.ico #graft data/music #include data/music/Astral_Dreams.COPYRIGHT #include data/music/Astral_Dreams.it -include data/music/Bye_For_Now.COPYRIGHT -include data/music/Bye_For_Now.s3m +#include data/music/Bye_For_Now.COPYRIGHT +#include data/music/Bye_For_Now.s3m #include data/music/Past_and_Future.COPYRIGHT #include data/music/Past_and_Future.it -include data/music/Ranger_Song.COPYRIGHT -include data/music/Ranger_Song.s3m -include data/music/Subsequential.COPYRIGHT -include data/music/Subsequential.mod +#include data/music/Ranger_Song.COPYRIGHT +#include data/music/Ranger_Song.s3m +#include data/music/Subsequential.COPYRIGHT +#include data/music/Subsequential.mod graft data/sound ## ## data - i18n diff --git a/pysollib/app.py b/pysollib/app.py index 03427760..d1621159 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -200,7 +200,7 @@ class Options: self.games_geometry = {} # saved games geometry (gameid: (width, height)) # self.splashscreen = True - self.sticky_mouse = False + self.mouse_type = 'drag-n-drop' # or 'sticky-mouse' or 'point-n-click' self.mouse_undo = False # use mouse for undo/redo self.negative_bottom = False self.randomize_place = False diff --git a/pysollib/games/pushpin.py b/pysollib/games/pushpin.py index f0710104..2f9d521e 100644 --- a/pysollib/games/pushpin.py +++ b/pysollib/games/pushpin.py @@ -64,7 +64,7 @@ class PushPin_Talon(DealRowTalonStack): return self.dealRowAvail(rows=[r], sound=sound) return self.dealRowAvail(rows=[self.game.s.rows[0]], sound=sound) def getBottomImage(self): - return None + return self.game.app.images.getBlankBottom() class PushPin_RowStack(ReserveStack): @@ -119,7 +119,7 @@ class PushPin_RowStack(ReserveStack): game.leaveState(old_state) def getBottomImage(self): - return None + return self.game.app.images.getBlankBottom() class PushPin(Game): diff --git a/pysollib/games/ultra/matrix.py b/pysollib/games/ultra/matrix.py index b20304aa..b36ce233 100644 --- a/pysollib/games/ultra/matrix.py +++ b/pysollib/games/ultra/matrix.py @@ -103,7 +103,7 @@ class Matrix_RowStack(OpenStack): bind(self.group, "", self._Stack__controlclickEventHandler) def getBottomImage(self): - return None + return self.game.app.images.getBlankBottom() def blockMap(self): ncards = self.game.gameinfo.ncards diff --git a/pysollib/images.py b/pysollib/images.py index 3a2995a4..264a21ac 100644 --- a/pysollib/images.py +++ b/pysollib/images.py @@ -86,6 +86,7 @@ class Images: self._bottom = [] self._bottom_negative = [] self._bottom_positive = [] + self._blank_bottom = None self._letter = [] self._letter_negative = [] self._letter_positive = [] @@ -139,6 +140,7 @@ class Images: if bottom is None: bottom = createImage(self.CARDW, self.CARDH, fill=None, outline="#ffffff") self._letter_negative.append(bottom) + self._blank_bottom = createImage(self.CARDW, self.CARDH, fill=None, outline=None) def load(self, app, progress=None, fast=0): ##fast = 1 @@ -240,6 +242,9 @@ class Images: def getReserveBottom(self): return self._bottom[0] + def getBlankBottom(self): + return self._blank_bottom + def getSuitBottom(self, suit=-1): assert type(suit) is types.IntType if suit == -1: return self._bottom[1] # any suit diff --git a/pysollib/pysolaudio.py b/pysollib/pysolaudio.py index 7ca18fd2..3363c625 100644 --- a/pysollib/pysolaudio.py +++ b/pysollib/pysolaudio.py @@ -495,7 +495,7 @@ class PyGameAudioClient(AbstractAudioClient): if self.time: self.time.wait(300) except: - if traceback: traceback.print_exc() + ##if traceback: traceback.print_exc() self.time.wait(1000) def _destroy(self): diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 79b859d1..1e0beb51 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -156,6 +156,7 @@ class PysolMenubar(PysolMenubarActions): ('assistlevel', None, ltk2gtk('Assist &level')), ('automaticplay', None, ltk2gtk('&Automatic play')), ('animations', None, ltk2gtk('A&nimations')), + ('mouse', None, ltk2gtk('&Mouse')), ('cardview', None, ltk2gtk('Card &view')), ('toolbar', None, ltk2gtk('&Toolbar')), ('statusbar', None, ltk2gtk('Stat&usbar')), @@ -269,7 +270,6 @@ class PysolMenubar(PysolMenubarActions): ('Shade &legal moves', '', 'shade', False), ('Shrink face-down cards', '', 'shrink_face_down', True), ('Shade &filled stacks', '', 'shade_filled_stacks', True), - ('Stick&y mouse', '', 'sticky_mouse', False), ('Show &number of cards', '', 'num_cards', False), ('&Demo logo', '', 'demo_logo', False), ('Startup splash sc&reen', '', 'splashscreen', False), @@ -293,6 +293,11 @@ class PysolMenubar(PysolMenubarActions): ('animationslow', None, ltk2gtk('&Slow'), None, None, 3), ('animationveryslow', None, ltk2gtk('&Very slow'), None, None, 4), ) + mouse_entries = ( + ('draganddrop', None, ltk2gtk('&Drag-and-Drop'), None, None, 0), + ('pointandclick', None, ltk2gtk('&Point-and-Click'), None, None, 1), + ('stickymouse', None, ltk2gtk('&Sticky mouse'), None, None, 2), + ) toolbar_side_entries = ( ('toolbarhide', None, ltk2gtk('Hide'), None, None, 0), ('toolbartop', None, ltk2gtk('Top'), None, None, 1), @@ -394,7 +399,11 @@ class PysolMenubar(PysolMenubarActions): - + + + + + @@ -434,6 +443,10 @@ class PysolMenubar(PysolMenubarActions): action_group.add_radio_actions(animations_entries, self.app.opt.animations, self.mOptAnimations) + t = ['drag-n-drop', 'point-n-click', 'sticky-mouse'].index(self.app.opt.mouse_type) + action_group.add_radio_actions(mouse_entries, + t, + self.mOptMouseType) action_group.add_radio_actions(toolbar_side_entries, self.app.opt.toolbar, self.mOptToolbar) @@ -837,6 +850,12 @@ class PysolMenubar(PysolMenubarActions): self.app.opt.animations = w1.get_current_value() + def mOptMouseType(self, w1, w2): + v = w1.get_current_value() + t = ('drag-n-drop', 'point-n-click', 'sticky-mouse')[v] + self.app.opt.mouse_type = t + + def mOptToolbar(self, w1, w2): if self._cancelDrag(break_pause=False): return side = w1.get_current_value() diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index da2dd8ff..839370fe 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -368,6 +368,8 @@ class MfxCanvas(gnome.canvas.Canvas): elif k == 'cursor': if not self.window: self.realize() + if v == '': + v = gdk.LEFT_PTR self.window.set_cursor(gdk.Cursor(v)) elif k == 'height': height = v diff --git a/pysollib/pysolgtk/tkconst.py b/pysollib/pysolgtk/tkconst.py index d7a36b1e..b0a78d70 100644 --- a/pysollib/pysolgtk/tkconst.py +++ b/pysollib/pysolgtk/tkconst.py @@ -48,8 +48,9 @@ tkversion = (0, 0, 0, 0) EVENT_HANDLED = 1 EVENT_PROPAGATE = 0 -CURSOR_DRAG = gdk.HAND1 -CURSOR_WATCH = gdk.WATCH +CURSOR_DRAG = gdk.HAND1 +CURSOR_WATCH = gdk.WATCH +CURSOR_UP_ARROW = gdk.SB_UP_ARROW TOOLBAR_BUTTONS = ( "new", diff --git a/pysollib/stack.py b/pysollib/stack.py index d65103de..117feda7 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -100,10 +100,10 @@ from util import ACE, KING, SUITS from util import ANY_SUIT, ANY_COLOR, ANY_RANK, NO_RANK from util import NO_REDEAL, UNLIMITED_REDEALS, VARIABLE_REDEALS from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE -from pysoltk import CURSOR_DRAG, ANCHOR_NW, ANCHOR_SE +from pysoltk import CURSOR_DRAG, CURSOR_UP_ARROW, ANCHOR_NW, ANCHOR_SE from pysoltk import bind, unbind_destroy from pysoltk import after, after_idle, after_cancel -from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText +from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText, MfxCanvasLine from pysoltk import Card from pysoltk import get_text_width from settings import TOOLKIT @@ -315,6 +315,7 @@ class Stack: view.is_open = -1 view.can_hide_cards = -1 view.max_shadow_cards = -1 + view.cursor_changed = False def destruct(self): # help breaking circular references @@ -396,8 +397,8 @@ class Stack: assert self.is_visible and self.images.bottom is None img = self.getBottomImage() if img is not None: - self.images.bottom = MfxCanvasImage(self.canvas,self.x, self.y, - image=img,anchor=ANCHOR_NW, + self.images.bottom = MfxCanvasImage(self.canvas, self.x, self.y, + image=img, anchor=ANCHOR_NW, group=self.group) self.top_bottom = self.images.bottom @@ -697,7 +698,7 @@ class Stack: # def getBottomImage(self): - return None + return self.game.app.images.getBlankBottom() def getPositionFor(self, card): model, view = self, self @@ -920,7 +921,8 @@ class Stack: if drag.cards: if sound: self.game.playSample("nomove") - self.moveCardsBackHandler(event, drag) + if not self.game.app.opt.mouse_type == 'point-n-click': + self.moveCardsBackHandler(event, drag) def moveCardsBackHandler(self, event, drag): for card in drag.cards: @@ -950,17 +952,17 @@ class Stack: return EVENT_HANDLED def __clickEventHandler(self, event): - if self.game.app.opt.sticky_mouse: + if self.game.app.opt.mouse_type == 'drag-n-drop': + cancel_drag = 1 + start_drag = 1 + handler = self.clickHandler + else: # sticky-mouse or point-n-click cancel_drag = 0 start_drag = not self.game.drag.stack if start_drag: handler = self.clickHandler else: handler = self.finishDrag - else: - cancel_drag = 1 - start_drag = 1 - handler = self.clickHandler return self.__defaultClickEventHandler(event, handler, start_drag, cancel_drag) def __doubleclickEventHandler(self, event): @@ -986,8 +988,11 @@ class Stack: return EVENT_PROPAGATE if self.game.demo: self.game.stopDemo(event) - if self.game.busy: return EVENT_HANDLED - if not self.game.app.opt.sticky_mouse and TOOLKIT == 'tk': + if self.game.busy: + return EVENT_HANDLED + if self.game.app.opt.mouse_type == 'point-n-click': + return EVENT_HANDLED + if self.game.app.opt.mouse_type == 'drag-n-drop' and TOOLKIT == 'tk': # use a timer to update the drag # this allows us to skip redraws on slow machines drag = self.game.drag @@ -1003,14 +1008,21 @@ class Stack: if self.game.demo: self.game.stopDemo(event) self.game.interruptSleep() - if self.game.busy: return EVENT_HANDLED - if not self.game.app.opt.sticky_mouse: + if self.game.busy: + return EVENT_HANDLED + if self.game.app.opt.mouse_type == 'drag-n-drop': self.keepDrag(event) self.finishDrag(event) return EVENT_HANDLED def __enterEventHandler(self, event): - if not self.game.drag.stack: + if self.game.drag.stack: + if self.game.app.opt.mouse_type == 'point-n-click': + if self.acceptsCards(self.game.drag.stack, + self.game.drag.cards): + self.game.canvas.config(cursor=CURSOR_UP_ARROW) + self.cursor_changed = True + else: after_idle(self.canvas, self.game.showHelp, 'help', self.getHelp(), ##+' '+self.getBaseCard(), 'info', self.getNumCards()) @@ -1019,8 +1031,11 @@ class Stack: def __leaveEventHandler(self, event): if not self.game.drag.stack: after_idle(self.canvas, self.game.showHelp) - if not self.game.app.opt.sticky_mouse: + if self.game.app.opt.mouse_type == 'drag-n-drop': return EVENT_HANDLED + if self.cursor_changed: + self.game.canvas.config(cursor='') + self.cursor_changed = False drag_stack = self.game.drag.stack if self is drag_stack: x, y = event.x, event.y @@ -1066,6 +1081,9 @@ class Stack: drag.noshade_stacks = [ self ] drag.cards = self.getDragCards(i) drag.index = i + if self.game.app.opt.mouse_type == 'point-n-click': + self._markCards(drag) + return ##if TOOLKIT == 'gtk': ## drag.stack.group.tkraise() images = game.app.images @@ -1073,7 +1091,7 @@ class Stack: ##sx, sy = 0, 0 sx, sy = -images.SHADOW_XOFFSET, -images.SHADOW_YOFFSET dx, dy = 0, 0 - if game.app.opt.sticky_mouse: + if game.app.opt.mouse_type == 'sticky-mouse': # return cards under mouse dx = event.x - (x_offset+images.CARDW+sx) - game.canvas.xmargin dy = event.y - (y_offset+images.CARDH+sy) - game.canvas.ymargin @@ -1271,6 +1289,79 @@ class Stack: self.items.shade_item.delete() self.items.shade_item = None + + def _markCards(self, drag): + cards = drag.cards + drag.stack.group.tkraise() + # + x0, y0 = self.getPositionFor(cards[0]) + x1, y1 = self.getPositionFor(cards[-1]) + x1 = x1 + self.game.app.images.CARDW + y1 = y1 + self.game.app.images.CARDH + xx0, yy0 = x0, y0 + w, h = x1-x0, y1-y0 + m = max(w, h) + # + Image = None + if TOOLKIT == 'tk': + try: + import Image, ImageTk + from ImageDraw import ImageDraw + except ImportError: + pass + ##Image = None + if TOOLKIT == 'gtk' or not Image: + color = self.game.app.opt.colors['cards_1'] + r = MfxCanvasRectangle(self.canvas, xx0, yy0, xx0+w, yy0+h, + fill="", outline=color, width=4, + group=self.group) + drag.shadows.append(r) +## l = MfxCanvasLine(self.canvas, xx0, yy0, xx0+w, yy0+h, +## fill=color, width=4) +## drag.shadows.append(l) +## l = MfxCanvasLine(self.canvas, xx0, yy0+h, xx0+w, yy0, +## fill=color, width=4) +## drag.shadows.append(l) + return + # + mask = Image.new('RGBA', (w, h)) + for c in cards: + x, y = self.getPositionFor(c) + x, y = x-xx0, y-yy0 + im = c.item._image._pil_image + mask.paste(im, (x, y), im) + # + shade = Image.new('RGBA', (w, h)) + draw = ImageDraw(shade, 'RGBA') + color = 'black' + d = 8 +## y0, y1 = 0, h +## for x0 in range(-m, m, d): +## x1 = x0+h +## draw.line((x0, y0, x1, y1), fill=color, width=1) +## draw.line((x1, y0, x0, y1), fill=color, width=1) + for i in xrange(0, m, d): + x0, x1 = i, m + y0, y1 = 0, m-i + draw.line((x0, y0, x1, y1), fill=color, width=1) + x0, x1 = 0, m-i + y0, y1 = i, m + draw.line((x0, y0, x1, y1), fill=color, width=1) + x0, x1 = m-i, 0 + y0, y1 = 0, m-i + draw.line((x0, y0, x1, y1), fill=color, width=1) + x0, x1 = m, i + y0, y1 = i, m + draw.line((x0, y0, x1, y1), fill=color, width=1) + + sh2 = Image.composite(shade, mask, mask) + tkshade = ImageTk.PhotoImage(sh2) + im = MfxCanvasImage(self.game.canvas, xx0, yy0, + image=tkshade, anchor=ANCHOR_NW, + group=self.group) + drag.shadows.append(im) + + def _stopDrag(self): drag = self.game.drag after_cancel(drag.timer) @@ -1294,8 +1385,11 @@ class Stack: drag = self.game.drag.copy() self._stopDrag() if drag.cards: - assert drag.stack is self - self.releaseHandler(event, drag) + if self.game.app.opt.mouse_type == 'point-n-click': + self.releaseHandler(event, drag) + else: + assert drag.stack is self + self.releaseHandler(event, drag) # cancel a drag operation def cancelDrag(self, event=None): @@ -1771,7 +1865,10 @@ class OpenStack(Stack): return 0 def dragMove(self, drag, stack, sound=1): - self.playMoveMove(len(drag.cards), stack, frames=0, sound=sound) + if self.game.app.opt.mouse_type == 'point-n-click': + self.playMoveMove(len(drag.cards), stack, sound=sound) + else: + self.playMoveMove(len(drag.cards), stack, frames=0, sound=sound) def releaseHandler(self, event, drag, sound=1): cards = drag.cards @@ -1784,15 +1881,21 @@ class OpenStack(Stack): return ##print dx, dy # get destination stack - stack = self.game.getClosestStack(cards[0], self) + if self.game.app.opt.mouse_type == 'point-n-click': + from_stack = drag.stack + to_stack = self + else: + from_stack = self + to_stack = self.game.getClosestStack(cards[0], self) # move cards - if not stack or stack is self or not stack.acceptsCards(self, cards): + if (not to_stack or from_stack is to_stack or + not to_stack.acceptsCards(from_stack, cards)): # move cards back to their origin stack Stack.releaseHandler(self, event, drag, sound=sound) else: # this code actually moves the cards to the new stack ##self.playMoveMove(len(cards), stack, frames=0, sound=sound) - self.dragMove(drag, stack, sound=sound) + from_stack.dragMove(drag, to_stack, sound=sound) def quickPlayHandler(self, event, from_stacks=None, to_stacks=None): # from_stacks and to_stacks are meant for possible diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index b7303f45..cbd315f9 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -258,7 +258,7 @@ class PysolMenubar(PysolMenubarActions): save_games_geometry = MfxCheckMenuItem(self), splashscreen = MfxCheckMenuItem(self), demo_logo = MfxCheckMenuItem(self), - sticky_mouse = MfxCheckMenuItem(self), + mouse_type = StringVar(), mouse_undo = MfxCheckMenuItem(self), negative_bottom = MfxCheckMenuItem(self), pause = MfxCheckMenuItem(self), @@ -303,7 +303,7 @@ class PysolMenubar(PysolMenubarActions): tkopt.save_games_geometry.set(opt.save_games_geometry) tkopt.demo_logo.set(opt.demo_logo) tkopt.splashscreen.set(opt.splashscreen) - tkopt.sticky_mouse.set(opt.sticky_mouse) + tkopt.mouse_type.set(opt.mouse_type) tkopt.mouse_undo.set(opt.mouse_undo) tkopt.negative_bottom.set(opt.negative_bottom) for w in TOOLBAR_BUTTONS: @@ -485,8 +485,12 @@ class PysolMenubar(PysolMenubarActions): submenu.add_radiobutton(label=n_("&Fast"), variable=self.tkopt.animations, value=1, command=self.mOptAnimations) submenu.add_radiobutton(label=n_("&Slow"), variable=self.tkopt.animations, value=3, command=self.mOptAnimations) submenu.add_radiobutton(label=n_("&Very slow"), variable=self.tkopt.animations, value=4, command=self.mOptAnimations) - menu.add_checkbutton(label=n_("Stick&y mouse"), variable=self.tkopt.sticky_mouse, command=self.mOptStickyMouse) - menu.add_checkbutton(label=n_("Use mouse for undo/redo"), variable=self.tkopt.mouse_undo, command=self.mOptMouseUndo) + submenu = MfxMenu(menu, label=n_("&Mouse")) + submenu.add_radiobutton(label=n_("&Drag-and-Drop"), variable=self.tkopt.mouse_type, value='drag-n-drop', command=self.mOptMouseType) + submenu.add_radiobutton(label=n_("&Point-and-Click"), variable=self.tkopt.mouse_type, value='point-n-click', command=self.mOptMouseType) + submenu.add_radiobutton(label=n_("&Sticky mouse"), variable=self.tkopt.mouse_type, value='sticky-mouse', command=self.mOptMouseType) + submenu.add_separator() + submenu.add_checkbutton(label=n_("Use mouse for undo/redo"), variable=self.tkopt.mouse_undo, command=self.mOptMouseUndo) menu.add_separator() menu.add_command(label=n_("&Fonts..."), command=self.mOptFonts) menu.add_command(label=n_("&Colors..."), command=self.mOptColors) @@ -1242,9 +1246,9 @@ class PysolMenubar(PysolMenubarActions): if self._cancelDrag(break_pause=False): return self.app.opt.splashscreen = self.tkopt.splashscreen.get() - def mOptStickyMouse(self, *event): + def mOptMouseType(self, *event): if self._cancelDrag(break_pause=False): return - self.app.opt.sticky_mouse = self.tkopt.sticky_mouse.get() + self.app.opt.mouse_type = self.tkopt.mouse_type.get() def mOptMouseUndo(self, *event): if self._cancelDrag(break_pause=False): return diff --git a/pysollib/tk/tkcanvas.py b/pysollib/tk/tkcanvas.py index 1b149a4e..855c35f8 100644 --- a/pysollib/tk/tkcanvas.py +++ b/pysollib/tk/tkcanvas.py @@ -82,6 +82,8 @@ class MfxCanvasImage(Canvas.ImageItem): if kwargs.has_key('group'): group = kwargs['group'] del kwargs['group'] + if kwargs.has_key('image'): + self._image = kwargs['image'] Canvas.ImageItem.__init__(self, canvas, *args, **kwargs) if group: self.addtag(group) @@ -262,7 +264,8 @@ class MfxCanvas(Tkinter.Canvas): ## for i in range(len(stack.cards)): ## if stack.cards[i].item.id in current: ## return i - x, y = event.x-self.xmargin, event.y-self.ymargin + x = event.x-self.xmargin+self.xview()[0]*int(self.cget('width')) + y = event.y-self.ymargin+self.yview()[0]*int(self.cget('height')) ##x, y = event.x, event.y items = list(self.find_overlapping(x,y,x,y)) items.reverse() @@ -334,8 +337,8 @@ class MfxCanvas(Tkinter.Canvas): ##ch = max(int(self.cget("height")), self.winfo_height()) ch = self.winfo_height() ###print iw, ih, cw, ch - x = (cw - iw) / 2 - y = (ch - ih) / 2 + x = (cw-iw)/2-self.xmargin+self.xview()[0]*int(self.cget('width')) + y = (ch-ih)/2-self.ymargin+self.yview()[0]*int(self.cget('height')) id = self._x_create("image", x, y, image=image, anchor="nw") self.tk.call(self._w, "raise", id) self.__tops.append(id) diff --git a/pysollib/tk/tkconst.py b/pysollib/tk/tkconst.py index f5fefcb1..fdd01cb1 100644 --- a/pysollib/tk/tkconst.py +++ b/pysollib/tk/tkconst.py @@ -39,6 +39,7 @@ __all__ = ['tkversion', 'EVENT_PROPAGATE', 'CURSOR_DRAG', 'CURSOR_WATCH', + 'CURSOR_UP_ARROW', 'ANCHOR_CENTER', 'ANCHOR_N', 'ANCHOR_NW', @@ -81,8 +82,9 @@ TK_DASH_PATCH = 0 EVENT_HANDLED = "break" EVENT_PROPAGATE = None -CURSOR_DRAG = "hand1" -CURSOR_WATCH = "watch" +CURSOR_DRAG = "hand1" +CURSOR_WATCH = "watch" +CURSOR_UP_ARROW = 'sb_up_arrow' ANCHOR_CENTER = Tkinter.CENTER ANCHOR_N = Tkinter.N diff --git a/scripts/build.bat b/scripts/build.bat index 50ff6bfb..cc9ed4cf 100755 --- a/scripts/build.bat +++ b/scripts/build.bat @@ -5,11 +5,11 @@ rm -rf dist mkdir dist cp -r locale dist cp fc-solve.exe dist -cp smpeg.dll dist -cp ogg.dll dist -cp vorbis.dll dist -cp vorbisfile.dll dist +cp smpeg.dll ogg.dll vorbis.dll vorbisfile.dll dist python setup.py py2exe +cp -r data\music dist\data +rem rm -rf dist\tcl\tcl8.4\encoding +rem rm -rf dist\tcl\tk8.4\demos dist\tcl\tk8.4\images python scripts\create_iss.py "d:\Program Files\Inno Setup 5\ISCC.exe" setup.iss pause diff --git a/setup.py b/setup.py index 7b418d89..e10c2ae1 100644 --- a/setup.py +++ b/setup.py @@ -24,28 +24,34 @@ datas = [ for s in file('MANIFEST.in'): if s.startswith('graft data/cardset-'): datas.append(s[11:].strip()) - elif s.startswith('include data/music/'): - datas.append(s[19:].strip()) + data_files = [] + for d in datas: for root, dirs, files in os.walk(os.path.join('data', d)): + if root.find('.svn') >= 0: + continue if files: #files = map(lambda f: os.path.join(root, f), files) files = [os.path.join(root, f) for f in files] data_files.append((os.path.join(data_dir, root[5:]), files)) + if os.name == 'posix': data_files.append(('share/pixmaps', ['data/pysol.xbm', 'data/pysol.xpm'])) for l in ('ru', 'ru_RU'): data_files.append(('share/locale/%s/LC_MESSAGES' % l, ['locale/%s/LC_MESSAGES/pysol.mo' % l])) -long_description = """\ +##from pprint import pprint; pprint(data_files) + +long_description = '''\ PySol is a solitaire card game. Its features include support for many different games, very nice look and feel, multiple cardsets and backgrounds, unlimited undo & redo, load & save games, player statistics, hint system, demo games, support for user written plug-ins, -integrated HTML help browser, and it's free Open Source software. -""" +integrated HTML help browser, and it\'s free Open Source software. +''' + kw = { 'name' : 'PySolFC', 'version' : VERSION, @@ -68,7 +74,7 @@ kw = { if os.name == 'nt': kw['windows'] = [{'script': 'pysol', - 'icon_resources': [(1, "data/pysol.ico")], }] + 'icon_resources': [(1, 'data/pysol.ico')], }] kw['packages'].remove('pysollib.pysolgtk') setup(**kw) From 6bedd163e829ae3cbc0ca746e00497d8ab1bb3c2 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 11 Sep 2006 21:37:08 +0000 Subject: [PATCH 065/266] * improved gtk bindings git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@67 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/pysolgtk/menubar.py | 4 ++++ pysollib/pysolgtk/tkcanvas.py | 29 +++++++++++++++-------------- pysollib/pysolgtk/tkutil.py | 13 +++++++++++-- 3 files changed, 30 insertions(+), 16 deletions(-) diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 1e0beb51..42c5447b 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -271,6 +271,7 @@ class PysolMenubar(PysolMenubarActions): ('Shrink face-down cards', '', 'shrink_face_down', True), ('Shade &filled stacks', '', 'shade_filled_stacks', True), ('Show &number of cards', '', 'num_cards', False), + ('Use mouse for undo/redo', '', 'mouse_undo', False), ('&Demo logo', '', 'demo_logo', False), ('Startup splash sc&reen', '', 'splashscreen', False), ('&Show removed tiles (in Mahjongg games)', '', 'mahjongg_show_removed', True), @@ -403,6 +404,8 @@ class PysolMenubar(PysolMenubarActions): + + @@ -489,6 +492,7 @@ class PysolMenubar(PysolMenubarActions): return submenu def _addGamesMenuItem(self, menu, gi, short_name=False): + if not gi: return if short_name: label = gi.short_name else: diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index 839370fe..cf780a72 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -51,11 +51,12 @@ # imports import os, sys, types -import gobject -import gtk, pango -from gtk import gdk -import gnome.canvas -TRUE, FALSE = True, False +import gobject, gtk +gdk = gtk.gdk +try: + import gnomecanvas +except ImportError: + import gnome.canvas as gnomecanvas # toolkit imports from tkutil import anchor_tk2gtk, loadImage, bind, create_pango_font_desc @@ -155,7 +156,7 @@ class _CanvasItem: class MfxCanvasGroup(_CanvasItem): def __init__(self, canvas): _CanvasItem.__init__(self, canvas) - self._item = canvas.root().add(gnome.canvas.CanvasGroup, x=0, y=0) + self._item = canvas.root().add(gnomecanvas.CanvasGroup, x=0, y=0) class MfxCanvasImage(_CanvasItem): @@ -169,7 +170,7 @@ class MfxCanvasImage(_CanvasItem): group = group._item else: group = canvas.root() - self._item = group.add(gnome.canvas.CanvasPixbuf, + self._item = group.add(gnomecanvas.CanvasPixbuf, x=x, y=y, pixbuf=image.pixbuf, width=image.width(), @@ -207,7 +208,7 @@ class MfxCanvasLine(_CanvasItem): group = kw['group']._item else: group = canvas.root() - self._item = group.add(gnome.canvas.CanvasLine, + self._item = group.add(gnomecanvas.CanvasLine, points=points, **kwargs) self._item.show() @@ -226,7 +227,7 @@ class MfxCanvasRectangle(_CanvasItem): group = group._item else: group = canvas.root() - self._item = group.add(gnome.canvas.CanvasRect, **kw) + self._item = group.add(gnomecanvas.CanvasRect, **kw) self._item.show() @@ -246,7 +247,7 @@ class MfxCanvasText(_CanvasItem): del kw['group'] else: group = canvas.root() - self._item = group.add(gnome.canvas.CanvasText, + self._item = group.add(gnomecanvas.CanvasText, x=x, y=y, anchor=anchor) if not kw.has_key('fill'): kw['fill'] = canvas._text_color @@ -284,7 +285,7 @@ class MfxCanvasText(_CanvasItem): # // canvas # ************************************************************************/ -class MfxCanvas(gnome.canvas.Canvas): +class MfxCanvas(gnomecanvas.Canvas): def __init__(self, top, bg=None, highlightthickness=0): self.preview = 0 # Tkinter compat @@ -301,7 +302,7 @@ class MfxCanvas(gnome.canvas.Canvas): # friend MfxCanvasText self._text_color = '#000000' # - gnome.canvas.Canvas.__init__(self) + gnomecanvas.Canvas.__init__(self) c = top.style.bg[gtk.STATE_NORMAL] c = '#%02x%02x%02x' % (c.red/256, c.green/256, c.blue/256) self.top_bg = c @@ -513,7 +514,7 @@ class MfxCanvas(gnome.canvas.Canvas): x += w y += h - w = self.root().add(gnome.canvas.CanvasPixbuf, + w = self.root().add(gnomecanvas.CanvasPixbuf, pixbuf=bg_pixbuf, x=0-dx, y=0-dy) w.lower_to_bottom() self.__tileimage = w @@ -534,7 +535,7 @@ class MfxCanvas(gnome.canvas.Canvas): x, y = (w-iw)/2, (h-ih)/2 dx, dy = self.world_to_window(0, 0) dx, dy = int(dx), int(dy) - self.__topimage = self.root().add(gnome.canvas.CanvasPixbuf, + self.__topimage = self.root().add(gnomecanvas.CanvasPixbuf, pixbuf=pixbuf, x=x-dx, y=y-dy) diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index c695c833..162c2f31 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -115,7 +115,6 @@ def color_gtk2tk(col): # ************************************************************************/ - class _PysolPixmap: def __init__(self, file=None, pixbuf=None, width=0, height=0, fill=None, outline=None): @@ -126,6 +125,16 @@ class _PysolPixmap: else: self.pixbuf = gdk.Pixbuf(gdk.COLORSPACE_RGB, True, 8, width, height) + if fill: + c = gdk.color_parse(fill) + c = '%02x%02x%02xffL' % (c.red, c.green, c.blue) + self.pixbuf.fill(int(c, 16)) + else: + self.pixbuf.fill(0) + if outline: + # FIXME + pass + def clone(self): pixbuf = self.pixbuf.copy() @@ -241,7 +250,7 @@ def _wrap_event(widget, event, l): def bind(widget, sequence, func, add=None): wrap = _wrap_handlers.get(sequence) if not wrap: - print "NOT BOUND:", sequence + ##print "NOT BOUND:", sequence return wrap, signal = wrap # From 27fe3c93b4f0f32df1f7d09c13483f27797021e3 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 17 Sep 2006 23:45:11 +0000 Subject: [PATCH 066/266] + added x-shadow * bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@68 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- data/images/buttons/bluecurve/cancel.gif | Bin 592 -> 592 bytes data/images/buttons/bluecurve/ok.gif | Bin 567 -> 567 bytes data/images/cards/large/01c.gif | Bin 816 -> 223 bytes data/images/cards/large/01d.gif | Bin 816 -> 220 bytes data/images/cards/large/01h.gif | Bin 816 -> 236 bytes data/images/cards/large/01s.gif | Bin 816 -> 223 bytes data/images/cards/large/02c.gif | Bin 816 -> 229 bytes data/images/cards/large/02d.gif | Bin 816 -> 216 bytes data/images/cards/large/02h.gif | Bin 816 -> 233 bytes data/images/cards/large/02s.gif | Bin 816 -> 232 bytes data/images/cards/large/03c.gif | Bin 816 -> 227 bytes data/images/cards/large/03d.gif | Bin 816 -> 215 bytes data/images/cards/large/03h.gif | Bin 816 -> 232 bytes data/images/cards/large/03s.gif | Bin 816 -> 231 bytes data/images/cards/large/04c.gif | Bin 816 -> 224 bytes data/images/cards/large/04d.gif | Bin 816 -> 217 bytes data/images/cards/large/04h.gif | Bin 816 -> 232 bytes data/images/cards/large/04s.gif | Bin 816 -> 228 bytes data/images/cards/large/05c.gif | Bin 816 -> 224 bytes data/images/cards/large/05d.gif | Bin 816 -> 217 bytes data/images/cards/large/05h.gif | Bin 816 -> 230 bytes data/images/cards/large/05s.gif | Bin 816 -> 228 bytes data/images/cards/large/06c.gif | Bin 816 -> 230 bytes data/images/cards/large/06d.gif | Bin 816 -> 220 bytes data/images/cards/large/06h.gif | Bin 816 -> 237 bytes data/images/cards/large/06s.gif | Bin 816 -> 231 bytes data/images/cards/large/07c.gif | Bin 816 -> 224 bytes data/images/cards/large/07d.gif | Bin 816 -> 215 bytes data/images/cards/large/07h.gif | Bin 816 -> 232 bytes data/images/cards/large/07s.gif | Bin 816 -> 226 bytes data/images/cards/large/08c.gif | Bin 816 -> 230 bytes data/images/cards/large/08d.gif | Bin 816 -> 214 bytes data/images/cards/large/08h.gif | Bin 816 -> 235 bytes data/images/cards/large/08s.gif | Bin 816 -> 231 bytes data/images/cards/large/09c.gif | Bin 816 -> 227 bytes data/images/cards/large/09d.gif | Bin 816 -> 221 bytes data/images/cards/large/09h.gif | Bin 816 -> 237 bytes data/images/cards/large/09s.gif | Bin 816 -> 228 bytes data/images/cards/large/10c.gif | Bin 816 -> 245 bytes data/images/cards/large/10d.gif | Bin 816 -> 232 bytes data/images/cards/large/10h.gif | Bin 816 -> 244 bytes data/images/cards/large/10s.gif | Bin 816 -> 250 bytes data/images/cards/large/11c.gif | Bin 816 -> 211 bytes data/images/cards/large/11d.gif | Bin 816 -> 210 bytes data/images/cards/large/11h.gif | Bin 816 -> 227 bytes data/images/cards/large/11s.gif | Bin 816 -> 217 bytes data/images/cards/large/12c.gif | Bin 816 -> 240 bytes data/images/cards/large/12d.gif | Bin 816 -> 220 bytes data/images/cards/large/12h.gif | Bin 816 -> 236 bytes data/images/cards/large/12s.gif | Bin 816 -> 240 bytes data/images/cards/large/13c.gif | Bin 816 -> 227 bytes data/images/cards/large/13d.gif | Bin 816 -> 218 bytes data/images/cards/large/13h.gif | Bin 816 -> 231 bytes data/images/cards/large/13s.gif | Bin 816 -> 227 bytes data/images/cards/small/01c.gif | Bin 415 -> 127 bytes data/images/cards/small/01d.gif | Bin 415 -> 138 bytes data/images/cards/small/01h.gif | Bin 415 -> 136 bytes data/images/cards/small/01s.gif | Bin 415 -> 127 bytes data/images/cards/small/02c.gif | Bin 415 -> 125 bytes data/images/cards/small/02d.gif | Bin 415 -> 132 bytes data/images/cards/small/02h.gif | Bin 415 -> 132 bytes data/images/cards/small/02s.gif | Bin 415 -> 124 bytes data/images/cards/small/03c.gif | Bin 415 -> 125 bytes data/images/cards/small/03d.gif | Bin 415 -> 132 bytes data/images/cards/small/03h.gif | Bin 415 -> 133 bytes data/images/cards/small/03s.gif | Bin 415 -> 125 bytes data/images/cards/small/04c.gif | Bin 415 -> 126 bytes data/images/cards/small/04d.gif | Bin 415 -> 132 bytes data/images/cards/small/04h.gif | Bin 415 -> 133 bytes data/images/cards/small/04s.gif | Bin 415 -> 126 bytes data/images/cards/small/05c.gif | Bin 415 -> 123 bytes data/images/cards/small/05d.gif | Bin 415 -> 130 bytes data/images/cards/small/05h.gif | Bin 415 -> 132 bytes data/images/cards/small/05s.gif | Bin 415 -> 123 bytes data/images/cards/small/06c.gif | Bin 415 -> 125 bytes data/images/cards/small/06d.gif | Bin 415 -> 130 bytes data/images/cards/small/06h.gif | Bin 415 -> 132 bytes data/images/cards/small/06s.gif | Bin 415 -> 125 bytes data/images/cards/small/07c.gif | Bin 415 -> 122 bytes data/images/cards/small/07d.gif | Bin 415 -> 131 bytes data/images/cards/small/07h.gif | Bin 415 -> 132 bytes data/images/cards/small/07s.gif | Bin 415 -> 124 bytes data/images/cards/small/08c.gif | Bin 415 -> 126 bytes data/images/cards/small/08d.gif | Bin 415 -> 132 bytes data/images/cards/small/08h.gif | Bin 415 -> 133 bytes data/images/cards/small/08s.gif | Bin 415 -> 126 bytes data/images/cards/small/09c.gif | Bin 415 -> 125 bytes data/images/cards/small/09d.gif | Bin 415 -> 132 bytes data/images/cards/small/09h.gif | Bin 415 -> 132 bytes data/images/cards/small/09s.gif | Bin 415 -> 124 bytes data/images/cards/small/10c.gif | Bin 415 -> 132 bytes data/images/cards/small/10d.gif | Bin 415 -> 139 bytes data/images/cards/small/10h.gif | Bin 415 -> 141 bytes data/images/cards/small/10s.gif | Bin 415 -> 131 bytes data/images/cards/small/11c.gif | Bin 415 -> 122 bytes data/images/cards/small/11d.gif | Bin 415 -> 132 bytes data/images/cards/small/11h.gif | Bin 415 -> 132 bytes data/images/cards/small/11s.gif | Bin 415 -> 124 bytes data/images/cards/small/12c.gif | Bin 415 -> 129 bytes data/images/cards/small/12d.gif | Bin 415 -> 136 bytes data/images/cards/small/12h.gif | Bin 415 -> 137 bytes data/images/cards/small/12s.gif | Bin 415 -> 127 bytes data/images/cards/small/13c.gif | Bin 415 -> 129 bytes data/images/cards/small/13d.gif | Bin 415 -> 139 bytes data/images/cards/small/13h.gif | Bin 415 -> 136 bytes data/images/cards/small/13s.gif | Bin 415 -> 128 bytes data/images/demo/demo01.gif | Bin 14700 -> 10600 bytes data/images/demo/demo02.gif | Bin 16685 -> 12500 bytes data/images/demo/demo03.gif | Bin 14805 -> 11302 bytes data/images/demo/demo04.gif | Bin 13367 -> 10050 bytes data/images/demo/demo05.gif | Bin 12885 -> 8989 bytes data/images/dialog/bluecurve/error.gif | Bin 1597 -> 1597 bytes data/images/dialog/bluecurve/info.gif | Bin 1642 -> 1642 bytes data/images/dialog/bluecurve/question.gif | Bin 1777 -> 1777 bytes data/images/dialog/bluecurve/warning.gif | Bin 1573 -> 1573 bytes data/images/dialog/default/error.gif | Bin 276 -> 230 bytes data/images/dialog/default/info.gif | Bin 271 -> 226 bytes data/images/dialog/default/question.gif | Bin 292 -> 234 bytes data/images/dialog/default/warning.gif | Bin 297 -> 223 bytes data/images/htmlviewer/disk.gif | Bin 85 -> 85 bytes data/images/logos/joker07_40_774.gif | Bin 4849 -> 2773 bytes data/images/logos/joker07_50_774.gif | Bin 7574 -> 4366 bytes data/images/logos/joker08_40_774.gif | Bin 4998 -> 2763 bytes data/images/logos/joker08_50_774.gif | Bin 7431 -> 4163 bytes data/images/logos/joker10_100.gif | Bin 27061 -> 16734 bytes data/images/logos/joker11_100_774.gif | Bin 14249 -> 8279 bytes data/images/noredeal.gif | Bin 1695 -> 1400 bytes data/images/pause/pause01.gif | Bin 7556 -> 7556 bytes data/images/pause/pause02.gif | Bin 8251 -> 8251 bytes data/images/pause/pause03.gif | Bin 7158 -> 7158 bytes data/images/redeal.gif | Bin 1492 -> 1079 bytes data/images/selectgame.gif | Bin 1295 -> 1064 bytes data/images/stats/barchart.gif | Bin 5835 -> 3133 bytes data/images/stoplight.gif | Bin 1533 -> 1307 bytes data/images/stopsign.gif | Bin 1053 -> 808 bytes .../toolbar/bluecurve/large/autodrop.gif | Bin 1311 -> 1311 bytes data/images/toolbar/bluecurve/large/new.gif | Bin 558 -> 558 bytes data/images/toolbar/bluecurve/large/open.gif | Bin 1377 -> 1377 bytes data/images/toolbar/bluecurve/large/pause.gif | Bin 929 -> 316 bytes data/images/toolbar/bluecurve/large/quit.gif | Bin 1431 -> 1431 bytes data/images/toolbar/bluecurve/large/redo.gif | Bin 751 -> 751 bytes .../toolbar/bluecurve/large/restart.gif | Bin 1289 -> 1289 bytes data/images/toolbar/bluecurve/large/rules.gif | Bin 1517 -> 1517 bytes data/images/toolbar/bluecurve/large/save.gif | Bin 1410 -> 1410 bytes .../toolbar/bluecurve/large/statistics.gif | Bin 781 -> 781 bytes data/images/toolbar/bluecurve/large/undo.gif | Bin 716 -> 716 bytes .../toolbar/bluecurve/small/autodrop.gif | Bin 1115 -> 1115 bytes data/images/toolbar/bluecurve/small/new.gif | Bin 458 -> 458 bytes data/images/toolbar/bluecurve/small/open.gif | Bin 727 -> 727 bytes data/images/toolbar/bluecurve/small/pause.gif | Bin 471 -> 196 bytes data/images/toolbar/bluecurve/small/quit.gif | Bin 771 -> 771 bytes data/images/toolbar/bluecurve/small/redo.gif | Bin 707 -> 707 bytes .../toolbar/bluecurve/small/restart.gif | Bin 773 -> 773 bytes data/images/toolbar/bluecurve/small/rules.gif | Bin 1234 -> 1234 bytes data/images/toolbar/bluecurve/small/save.gif | Bin 754 -> 754 bytes .../toolbar/bluecurve/small/statistics.gif | Bin 682 -> 682 bytes data/images/toolbar/bluecurve/small/undo.gif | Bin 676 -> 676 bytes .../toolbar/bluecurve/xlarge/autodrop.gif | Bin 1765 -> 1765 bytes data/images/toolbar/bluecurve/xlarge/new.gif | Bin 826 -> 826 bytes data/images/toolbar/bluecurve/xlarge/open.gif | Bin 1885 -> 1885 bytes .../images/toolbar/bluecurve/xlarge/pause.gif | Bin 886 -> 886 bytes data/images/toolbar/bluecurve/xlarge/quit.gif | Bin 2004 -> 2002 bytes data/images/toolbar/bluecurve/xlarge/redo.gif | Bin 1478 -> 1478 bytes .../toolbar/bluecurve/xlarge/restart.gif | Bin 1712 -> 1712 bytes .../images/toolbar/bluecurve/xlarge/rules.gif | Bin 2134 -> 2134 bytes data/images/toolbar/bluecurve/xlarge/save.gif | Bin 1911 -> 1911 bytes .../toolbar/bluecurve/xlarge/statistics.gif | Bin 1442 -> 1442 bytes data/images/toolbar/bluecurve/xlarge/undo.gif | Bin 1336 -> 1336 bytes .../images/toolbar/crystal/large/autodrop.gif | Bin 1040 -> 1040 bytes data/images/toolbar/crystal/large/new.gif | Bin 534 -> 426 bytes data/images/toolbar/crystal/large/open.gif | Bin 1032 -> 1032 bytes data/images/toolbar/crystal/large/pause.gif | Bin 929 -> 316 bytes data/images/toolbar/crystal/large/quit.gif | Bin 909 -> 909 bytes data/images/toolbar/crystal/large/redo.gif | Bin 751 -> 751 bytes data/images/toolbar/crystal/large/restart.gif | Bin 1025 -> 1025 bytes data/images/toolbar/crystal/large/rules.gif | Bin 979 -> 979 bytes data/images/toolbar/crystal/large/save.gif | Bin 994 -> 994 bytes .../toolbar/crystal/large/statistics.gif | Bin 1119 -> 1119 bytes data/images/toolbar/crystal/large/undo.gif | Bin 763 -> 763 bytes .../images/toolbar/crystal/small/autodrop.gif | Bin 764 -> 764 bytes data/images/toolbar/crystal/small/new.gif | Bin 289 -> 289 bytes data/images/toolbar/crystal/small/open.gif | Bin 759 -> 759 bytes data/images/toolbar/crystal/small/pause.gif | Bin 409 -> 193 bytes data/images/toolbar/crystal/small/quit.gif | Bin 476 -> 476 bytes data/images/toolbar/crystal/small/redo.gif | Bin 598 -> 598 bytes data/images/toolbar/crystal/small/restart.gif | Bin 714 -> 714 bytes data/images/toolbar/crystal/small/rules.gif | Bin 726 -> 726 bytes data/images/toolbar/crystal/small/save.gif | Bin 540 -> 540 bytes .../toolbar/crystal/small/statistics.gif | Bin 796 -> 796 bytes data/images/toolbar/crystal/small/undo.gif | Bin 599 -> 393 bytes .../toolbar/default/empty-large/autodrop.gif | Bin 175 -> 135 bytes .../toolbar/default/empty-large/new.gif | Bin 179 -> 137 bytes .../toolbar/default/empty-large/open.gif | Bin 181 -> 141 bytes .../toolbar/default/empty-large/quit.gif | Bin 175 -> 138 bytes .../toolbar/default/empty-large/redo.gif | Bin 180 -> 142 bytes .../toolbar/default/empty-large/restart.gif | Bin 210 -> 153 bytes .../toolbar/default/empty-large/rules.gif | Bin 190 -> 144 bytes .../toolbar/default/empty-large/save.gif | Bin 160 -> 135 bytes .../default/empty-large/statistics.gif | Bin 171 -> 138 bytes .../toolbar/default/empty-large/undo.gif | Bin 189 -> 145 bytes .../images/toolbar/default/large/autodrop.gif | Bin 929 -> 500 bytes data/images/toolbar/default/large/new.gif | Bin 546 -> 546 bytes data/images/toolbar/default/large/open.gif | Bin 929 -> 470 bytes data/images/toolbar/default/large/pause.gif | Bin 929 -> 316 bytes data/images/toolbar/default/large/quit.gif | Bin 1142 -> 740 bytes data/images/toolbar/default/large/redo.gif | Bin 1457 -> 559 bytes data/images/toolbar/default/large/restart.gif | Bin 1142 -> 595 bytes data/images/toolbar/default/large/rules.gif | Bin 929 -> 362 bytes data/images/toolbar/default/large/save.gif | Bin 772 -> 360 bytes .../toolbar/default/large/statistics.gif | Bin 659 -> 207 bytes data/images/toolbar/default/large/undo.gif | Bin 1142 -> 562 bytes .../images/toolbar/default/small/autodrop.gif | Bin 377 -> 367 bytes data/images/toolbar/default/small/new.gif | Bin 158 -> 144 bytes data/images/toolbar/default/small/open.gif | Bin 191 -> 164 bytes data/images/toolbar/default/small/pause.gif | Bin 409 -> 193 bytes data/images/toolbar/default/small/quit.gif | Bin 200 -> 185 bytes data/images/toolbar/default/small/redo.gif | Bin 167 -> 152 bytes data/images/toolbar/default/small/restart.gif | Bin 192 -> 160 bytes data/images/toolbar/default/small/rules.gif | Bin 227 -> 189 bytes data/images/toolbar/default/small/save.gif | Bin 276 -> 206 bytes .../toolbar/default/small/statistics.gif | Bin 169 -> 143 bytes data/images/toolbar/default/small/undo.gif | Bin 169 -> 155 bytes data/images/tree/emptynode.gif | Bin 135 -> 106 bytes data/images/tree/folder.gif | Bin 176 -> 139 bytes data/images/tree/minusnode.gif | Bin 102 -> 94 bytes data/images/tree/node.gif | Bin 129 -> 105 bytes data/images/tree/openfolder.gif | Bin 172 -> 144 bytes data/images/tree/plusnode.gif | Bin 107 -> 98 bytes data/images/tree/python.gif | Bin 153 -> 138 bytes data/images/tree/tk.gif | Bin 110 -> 91 bytes data/images/wizard.gif | Bin 1972 -> 1584 bytes data/images/wizardcards.gif | Bin 1710 -> 1381 bytes po/ru_games.po | 14 ++-- pysollib/games/pyramid.py | 3 +- pysollib/images.py | 29 ++++++-- pysollib/main.py | 6 +- pysollib/stack.py | 63 ++++++++---------- pysollib/tk/selectcardset.py | 1 + pysollib/tk/selecttile.py | 1 + pysollib/tk/tkcanvas.py | 7 +- pysollib/tk/tkutil.py | 7 +- 241 files changed, 70 insertions(+), 61 deletions(-) diff --git a/data/images/buttons/bluecurve/cancel.gif b/data/images/buttons/bluecurve/cancel.gif index 808d3535f89f592b61d57ad8da278f8fa08f3640..eadf3b3e715c6a8e6a3b4f2c6bab835d8013b294 100644 GIT binary patch delta 231 zcmcb>a)E{0-P6s&GEsy hZS5VMUEMwH42(?7%`B`;oeXU39GqM}llL=D1OWXo6Wjm* delta 231 zcmcb>a)E{0-P6s&GEsy^wxtWEPsgr??or9CBe)4|Ci2&AAuc-h4 diff --git a/data/images/buttons/bluecurve/ok.gif b/data/images/buttons/bluecurve/ok.gif index e4e6362184761b3258ec08a7e22b69cfab4f78eb..8438d93d83e6b40cd2fe5bfdef21f274659a8b25 100644 GIT binary patch delta 238 zcmdnavYmz7-P6s&GEsy{A+CCog7f T=XK?|;&fue!o!Y@3=Gx)Ku-{< delta 238 zcmdnavYmz7-P6s&GEsy3X*A2*=+%0Kq3Pf;aB~50D26Vt~F!F%z({lpEuv3Ft)~OAOVT87{b(86$TYQgOtK zxJj;fBUQE3f}Y>tSh{_%yUXzmaz{ZefDM9EgmG>TJ8xiqiD`^qY(tQddQ@#FPETPd rIcyzgoMC%$NHi5KqFbt;uQGeFowOvgwtBfqyIH+q3WmaX1PK5;&=yii literal 816 zcmchWJ#ND=427R85AG(QOGdW_iVPiOX-UzgQ-6-po5=CSe5Niz7Q2s>lfX`qv04Pm zq~6Cz`Qz(-_wxOONBorFN+}J)FplFiO%m&RIF`ns#Ir<_3p;)?mr=Fc%Gk#kcX7Gl zufv%9b!P0XzbfZt*01jr1zW9zvMiSBb94*BWxysOsJcQlGvFSmRXsx#0yq+s&HD?5 z$%K}Uc)d+2OcinpZBk>DVuPS51yZdZsFFp;lr3C>!IqsVh3yk#=;yi)b zipGPW=drL(AQ~^6f~&KVI;!7Sw&ph;7IT9NVUU7A)SW9X5a`fmV?;LghfI-L)2cHD p8=Zs>#D-!u7ojlisq53sZVg0CQ>A(P?^nTpVfC`<-P;{re*v()s?q=e diff --git a/data/images/cards/large/01d.gif b/data/images/cards/large/01d.gif index 7442e1760d90e81f6f3541b69dbfa89628374863..62b4eac5b9a19a0cc8dddf4defda90f47cc552fa 100644 GIT binary patch delta 186 zcmV;r07d_>2HXJ*M@dFFIbkLMA^`FLkqj(3X*A2*=+{1OkoOK`{C?Kt|BB3^F|+NQfaSHG|}FIV^Uf$-orFyhx$hFBjR{TEgft zCYkf1)0Y{}>VDHLFyifLe4FuI6?%6USYm1xgM1fGS{`{>Z5l~IYjZdsi#vf7j!}{& oIxv`6Iu$KW1gND1Hmh-*u86T4u(N=+RJgLbrV0_iz!C`nJ4IYkY5)KL literal 816 zcmchWy-vh1499(*pauM zn==}HMU7m? znGQXP2}I)+siNS9JM_GY#yihQbBM-Su8VzxDaf1xVK8;#B^0Cgfv?!<4s;ctN|8d< p>C}3t6t=5$>M5uc#$PeLii$aPA@j`te--pEEM7Lf^QUvT`vFH(*m(c| diff --git a/data/images/cards/large/01h.gif b/data/images/cards/large/01h.gif index 7e4245b0ddcc60cd1d4e03a8966cc9ddefbf6003..edbfc1ac476cfd34367f3ef1210e8cd816ad85a4 100644 GIT binary patch delta 202 zcmV;*05$)x2J8V0M@dFFIbkLMA^`FLkqj(3X*A2*=+{1cEjM!BFiz6hOoK{dhbdFo~H7ikBy{IAvO#P)l_?y~!2cNt4H zl52QUo}Y3cn-oD$rEDarH#tBwlYd20w0p3*8@s%kzpueHzQZiV#x}+T016S$&=Ls% EJA?sPiU0rr literal 816 zcmd5*u};J=4E2dtI!31%x)xQ4fu&Lg5KGfoP&P(Z{^SDvkQ?}reiI8~NwJgOq4p3n zw^)Aidwzb+Jv`pu+`e4G1$^YdzW}h`zmMY>LYSsWAb{#C+iW0*YiVQ_&cZXmj=Sx$ z3X*A2*=+%0D(*bnP6K1T#bkE5j(*}4s-;~V`P+lwPR<`jzcNctpWGr|=cVKirjDHw}c1bxwlzxwYlO7C1Tb70> rgJYX`08>UZVQG~EU8sVtGI+2kva^`BRJggiw7eS%eZj&D1PK5;Apuh? literal 816 zcmchWziz}J48{#)pc_(_jA@ao8*YHGT-Bvh|2#(DBpff6XX;YjLe4g1AXnYkEXaxd zeLvgeQ)mzP z>t&eTZDvTy-ISx4a(hj3P8A&6e95x*g>JOhjygka7Ad^A1x#}E*~6K7In8`5u~n7!~6 nwxdv!-0g)ZgfCrlJ>QXg3&Dcsa{TwLz<*(PvvDnN5Ab>g+jy&F diff --git a/data/images/cards/large/02c.gif b/data/images/cards/large/02c.gif index d815d101e68f040321a32afb469c25de7c2f4fbc..7b4088fa1d9dc5d3cb37dd1da8874a77ce72acaf 100644 GIT binary patch delta 195 zcmV;!06hP&2IT<^M@dFFIbkLMA^`FLkqj(3X*A2*=+XEP^*Mg9i(M8=$jm^fto_Aa~259-yQpK)F$$jwr@yMP`wmrl!c#BApfB zLKrM7rI;2uvN%>|1mN{f|ME3r7JYs!aA`1u4R0AYc85j)bCHX2dlzH_R+w>yc}o;7 xXjnC!Vgi;IY^Rh{K|rB2Fl>`Ff3zleww$>#ox8feKE1%T!zc=g$bAI~06SymQ-=Tm literal 816 zcmd6mu}*|Q5QhJSCBcq@f)WieS6EP3U~D*UqIaF8t#7iN_aImJAUuogh;Vy8- zTAIzy&dmSKzsvLPsd{+3#SK0q@aLR69zVLS>-&Bf1_=Sz-_{sJxRZ_KBJ5u|mv`}e ziReH?TbeKUEl94u%%p>@FUq-@t(QGT!Nv$E)CfVezuryO%3G F{s4KC%_#r? diff --git a/data/images/cards/large/02d.gif b/data/images/cards/large/02d.gif index b84eb53c0b38542b7303ad3cd096c7b513a6ac34..28021f0ee57efd86acd05b125f6848c2a5eb3431 100644 GIT binary patch delta 182 zcmV;n07?I_2G{`%M@dFFIbkLMA^`FLkqj(3X*A2*=+n1i?UG@IBz7011E*5^e$y&Ilr2jL6Opr)zeind!2Ma%QO6rI^d}76Zwr zc+IrTC_puPjd|bNmASa9!KE=;V;g1`aTj)1ixDMUv} z(^6njhsLB7j*^waq`tVMSY^_!J&qPe;R;ElMC@=Q+7^ZD8a9+6s`MCzP&gfWWHE~( zN7*MUJ=QE{QMgQzQXZ;9t5GoQRpU7Q2sRM~!7*QG6T4uFg3N plhL9Sd6AZvLsANdUZXG>(Y|pZ)9u{-_p9K4VfM25oqycJ%P(UM*!2Ja diff --git a/data/images/cards/large/02h.gif b/data/images/cards/large/02h.gif index 2f515dd6bad906e3f5de43b07d82a8afd4aea986..5b73170bef0c759ade1b5d0187b9cb421358ecc5 100644 GIT binary patch delta 199 zcmV;&0671!2I&C|M@dFFIbkLMA^`FLkqj(3X*A2*=+n1i_FExK8mo6aaGrVt_pYGI)UnC^v!ShN}{)RbRyk4M;24u(&zYL@nYp zj@(It)nm(yg8Tm9SS_oZSzqv0Y#CHXfO>lxbvtl}h<#5QOIaIyXpkLLla!AlNR4tb zm0e$Ui=UuGkOHKAB%uUFJf!vG2q%*_%B06Pk6 BRyqIx literal 816 zcmcgryKaL(5L_!DIpx6>v_vR!k>;c;9Hrs0N}Mib+Wd*J`4AWR5WXo*l;+4jz!Ere z8Jg1$yEC)H@$&k-ef+qGJNSx$o&azgO9IAq{V46w~iK1}nRzPXxVA%z&OHpt&y}R;3rk3--f8PrF7Zx|0 K?)lp-JpBU8AJTXL diff --git a/data/images/cards/large/02s.gif b/data/images/cards/large/02s.gif index 3caf6f3ffcb6ad2395c28b4aebeefeaa6d984d9a..780fe8b8d8bfdf2399307cfd093f8022a60843a1 100644 GIT binary patch delta 198 zcmV;%06G7#2Iv6{M@dFFIbkLMA^`FLkqj(3X*A2*=+XECNXam;l^7&n-|3S^&9QP6PaTU_`=DGjI$*#>#SvsXnf#>_yp&0Kk_S z3wiOH(G@iTW^Q2AzG%f=htI_oWEM?zdTSXzfP`j-e;GG^1c?k)d}nEZbB%!uL{mU9 zn=n30OB-^BV{8JOoSjdKKch59u#~fLnYUrOGP%68zeT~X!&t=|3U$iM3k3-PJ24_v AFaQ7m literal 816 zcmcJOu~LLE5I{E&X1I7Ow*E=D<3q0SL--~e$0oSD2`Zdp zC(TZFHoGq`;oV}N$xVxIB%m^JOVo2M`ZB};Kvac{3e+YYhzLThRrR4|1O zvZ3X*A2*=+nEP{70g9qOMoMy+!Z2%ZRE*LmEK*&oJ=xjhSMk?xY)i8&S-mw!DSBSwy zTA7Sq1YZj=!jrn?LJOU%zgq?^dry6208JHwR)k)LcnyGnk9JrTT4zN}L}rM71c#O^ vTb+|q6mc1AhhrB3O?fmdooKI%vm~OmZMe3&HMhL5zg@ve3W>&h1qlE<@nlfd literal 816 zcmd6mu};G<5QhJ_j#Rb`89D}Jp$rTi7>ZcpL@%Y~N{V)vUILa1q`DK#?DQ+Z?T&#u{&gE!5 zUsCFbXixJ6zim>e&NHdA)mb?=v(>VvDA@HvD9U24ev1Bpa5yNn3ushbAxw)}q61K< zx}ImU6pZ$B1CtfEV9=P!XIvMp*f50P>Rm~lstbhU&D9&Ql{&eP+66BV zMVlGyCJ5gdAB}-7pYcKhi5EOz0v$eDk$a`rab@^O!Ad?xQox%hiYc1T{>Q7}e_`>m K*}LZp+3X*A2*=+n1i?UG@O=j&U=4r~`aC!xhsBxgB5u`Py}D{L;Iz}Nt{QS2;jeUn>{2f4xr;hAiV&Eovom;(%@ zG@F^7{pL5{E>F*o)&1Ko+`wlH^m%~u`C}Lc@BKKAoC3(dqs<0lxZ{9p;mW@P94XpP zm)Q2!+RjcF_$z6T^|I3TQN1`$Vo^QUNm1n-l?Fo#r6_WCq(XFfU~RP`b4n+v<4S`Ki3KYZDW&9|J9KKrZUv$%&>dt>foMzDO60=u0@3tos~)HoUrM1~=(sYx kTG0k$elJoe&@>m7w6}60i);PwS3&>6>}AtCf4PQ-AMF&`djJ3c diff --git a/data/images/cards/large/03h.gif b/data/images/cards/large/03h.gif index e15b43e65dd7695efee8cef2ff38f61b8dff81a9..4920f36b201997a9b5cbde0f9ca9e4425cd14574 100644 GIT binary patch delta 198 zcmV;%06G7#2Iv6{M@dFFIbkLMA^`FLkqj(3X*A2*=+n1i_FExK8mo6aaI(1u(!KAsM{Dj)bDch{F-8RbS;vkyfzauyd&42`u5X z)iUb_&R?~dP0p+)z=z8`;apPnCg_iwjw1D`4I&jB2dAHy&>=f-gq2%!813 zX)G#M@gWSUwkM|yVqTySeTtmamWV-Q&VA<~}C zgf3Qbz>fNyHAN++u&QFQO#nG|tU|=B_J00KA;gwL5M?6WN#~~!JSo1QfFVSyO)HZ& zVjHVyY}Wcoi!Ir&-(84yBWSFm^(n}UGB{O%MI$So?~e-~#EYFaV-+(xi~ZlL;Qzwn LW%E0KxrT=yeks!( diff --git a/data/images/cards/large/03s.gif b/data/images/cards/large/03s.gif index 3685e57e410adb18b1dc385336a372436ea2291f..aacdc7cd56734085381e576819528dc7ea467aec 100644 GIT binary patch delta 197 zcmV;$06PD$2Im0`M@dFFIbkLMA^`FLkqj(3X*A2*=+nECNXa*d5@WU!caj0CK|4Z!rWFEk&PZ;21c26e))K$f2H? zhk;F-UypTXX#k)XgsYBWLqIg4Jq)ffh_iUQGN!z*zeK^p!&k){3XIBj1qlE<#syW} literal 816 zcmchWy-ve05P&bPBZV!4hm3$Ml!2i`ha#3ZJwdxMvhpTQ$%Ay@LGny2h$Z3f?0}pi zMzUCE-OuOG&g0=>d-rk!*YKVLect=i>1`N>aU7><;w^xyPn~6u!z~A#3#;*&aw#g( zCC45S_n0p5+a~(vJQI7}oRw2E-7I_Z1YIl!g|U!MkI^3x7LJiRA_;`*pcNKV1|)&- zZRYkkQqv4787~wXl|&mdvXkR7g~ht$@hjHU@^J%&DQVM+yEXR?DvaMDZiCR8S__5k zN~+UQHZ=<>)FsuacmuDqiVaY+E?x`Q1r-%Rn0QxwmLCX9xatV7o*`Q69byHpD~+5_ zAY88;bM_i!`3Mvq*#$8rDvX0##7HWO6%|l8R`I;M1& diff --git a/data/images/cards/large/04c.gif b/data/images/cards/large/04c.gif index 1fcec84d16b9e3e0f41e0598638301d080ca2f5e..e10c90d7fa34d3b8e1750aa3c8b9872bc111075e 100644 GIT binary patch delta 190 zcmV;v073t-2H*h3X*A2*=+{2|&;d%;4FCKu*JJ_%;C05cN=Ma7zrtnGr@WQzY_gDfXxroKR(+vX!-?w@~ literal 816 zcmb`Gu}*|Q5QhH^OM=~+P+X~o7z+yu3yjT@o9NkHY3rM;kq5cL2jQ7)j14$5yGY>7 zRnkmmnVtWef8go)vAKV}#uYwu@DoBf96tKKABJHZM>zs6zpXLIaVv?`A{$<~ma}3R za_Wd^N6Ub}4k`HKO6sgXy3Wn4U-uLRTdahlESBmiI|WgNR#@%=wyK^WOe@(tP^)@^ zK)a)XL3wyTQ&iXpjAci>j;j=9;bIBfq{c)FI4#K#YV|;^sGLyTzy%mI+)OFTAQW7w zW^X4eoMDRJ4J0e7+Au_{WsgcqD;Kl{xB*+tGzhurMvIkCyL={X630; z>3X*A2*=-C1p;l^gn)km5}*^n4T#0sP*col2F1V;w8Z#+8E8~WWj3?h=oDj%IxXQe zs%r7MFX=d$eG|Ol@#xwbykE3oV;3+r%lH4^*_Y?t)8^sr2A1%d1AjjN$Kyxe_ul(q7^DPXzq8p4a=4X5dg02y0_-`P zry-{U5p|RX_^U|!`n;14S$%e##j<*;DGu3uVias4b&uIa2-hYo5u#`VOA|tbz`Kq- zi7CA&9>?>d-3fmSB6L3Fqk?Jx>d3MryWD@EmmqST^677G-% zX!)FU8f;ihA*!ZOhy@qd;?N01*{rOzq!1+|IccfTZT0dBu`Ha`%%O&HAL%H*#)T+_ nI_c%(C;~+|KT;4W{i#S77jn|n+5h*e;D2HAviY6AT*Kop3X*A2*=-C1p+n%!BFiz6rdx(U4T3vGI+5Ocmf}#$g4i9$>vZ4wP3$st%jPrfzJVP zrdp<;&uR?YvV2P`v!ed;#$skTdlpo7e_MlTf^>z3a)~%;M`w3&W?vbESsRBH0-kd* z8Az0kV@4f2qokOo9g!YRiZldHRu!FZ0_;CQo3LQo2MuXO*W4r^2q`PYD;&KxGgaJ48{oiXm+6=P_A;$lJYcxg`_pUNRR5fj82k_<$k?h@CQ8 zR<*%i#Gg@!b>+qPuPlT@@@+$jAH-9Lw|^I-AW#1-#wcRTT>i(c;D2Ftv-zGsp2O`Y DO4!lv diff --git a/data/images/cards/large/04s.gif b/data/images/cards/large/04s.gif index 1f53a577e6007b33ad7e9a12f3fabfb265cccca5..98626312f6da6d0d6578386bdbb59e3d1af8a623 100644 GIT binary patch delta 194 zcmV;z06qV(2IK(@M@dFFIbkLMA^`FLkqj(3X*A2*=+{2|!SjKo{hmpUz_=EQXoik=V=NfSG|~0BT~CNQ?AAMOiP5>@5Q5g1;4< z@UkVFD>ES!PG(?cxpk#oe;d&RI0JeVN_BHAfIkF6NQQM{Fc4`|Wm9KY0fqt=Sd2g| wo|qbhUVx%Wh!=)pr&p;lMRqiFvoEH#Ubr&1x)w#fiNH+4APR@a#{~%hJ9WrXW&i*H literal 816 zcmb`GF;2uV5Jks|BZbaLE>Z%rs3=lU1kuFW5iA|$w%o+4%|W){AUP8aqDhz;JB1yz z6=|#)+4G3X*A2*)2B0Kpw}12cFq2hZ`_05A)I0QdkMFEePNSd4Bx89IFm4Mp z09*;;THc6Hiu@(Fav>f=zL8mZ4Rjhhc!4cZ1ceo5Uu#5z7JXb6aRWM*Vn`G>Y+_m| sR8W9_7;09b7C8ioDl=m=k+3A7vP`uyw6|fpw!BWhAPR@Wc?AgoJHy#Z&j0`b literal 816 zcmd6mu}*|Q6h-fZA;At4iY?V_%oY|D78siWUUcm&ZT*wkT|Q(BKZI|xF*e|PZ$=EP zv6f~slMDCU`-aD-hwAS28drEv!H@U;czo;oei(*v9OVeO{Itd(#f@x4i)46VE$_1V zl2S)RTbeKU?U1}XRZ?f&$?Nz3aX2b(R7f-UCmarXy=Irp`&+DQ4^;Kl{xB*+tGzhurMvIkCyL={X630; z>3X*A2*)2B1cHFmmVMu%011G($XkgLRf7 lF_C?sE;B!pJS>B$WUMl)u8Ogpv$VCXw-CsXlzy{t@;O`UQczo^qei(*v97O`iK9a=(Qn-|j)WX^D2yo!t zGG0>Zh^V1>fxkpL6!S{zl45q8&5~m3DIJpKq>;6SxO>>0fWS>#MJx(|Ee5ePB!y_R zikf<0Q-{W+6fV@z+V8BPP`J`ct~}z41|t-1YuJ0_7PWY56o?v=h^W>^@hlWhMUU)h z6ohh4Dm|9JQLNN@&EihYEQ)O=NHGL8d8Q>fwzbZw5LF(c_#R#%%5KF|3$=~;9#N=` oj-*lKRS3pTu(wj6uY}@9q!Sl1yVn1H75pzuUN*n;hjY030_3LIYybcN diff --git a/data/images/cards/large/05h.gif b/data/images/cards/large/05h.gif index b4ab65d5381f271aaeb42d8e2a3d5cafa2b2c669..adbea6a327e8be81f70e1a0b72c8145f1f115300 100644 GIT binary patch delta 196 zcmV;#06YJ%2Ic__M@dFFIbkLMA^`FLkqj(3X*A2*)2B1cHEL!#z~Jzz<`)-FQYJA?PClFt?oLr%MJ1R;8t=$$F35=LHP?W-m5D z*K9?LElDK187^1Lb0?HSu2juKbs9Qq7fe}!f*FJvhenBt7>tWnkdYLHlZ}raHkdmv y9X*zAdstT=r=4$pYJD^WGe(84EUUDtw=%Z5D7(C*zaYNBwZt0=5y{FD2>?5(Ayhm7 literal 816 zcmcJOzfQwI48~oNNM&?#L)KIg>cA2y1BfMmEC?GTD{s<+JV*x~B+tZxST5MUE7GNi zjV_kI*q?v4t`Cp*H@7cWu!D~j_~!tQ$M<=jopZ~why+l6C7TVTa4m_{!i9SVIB>R& zLrN17jT8s?O{7D6UP)8Zp0%@C(yl#aLb6>A@?#;M9}ecaW)V$+_!cNkC)g|^i`pm@rV}?4MC1~oFnhr^z7mm3^c0Bvt%qlN3_UROvST{P4$!PSa*q7W#xmXV@Dg=#H$s&yzFDRmi=qo)1 zH5LaE{VBRB3X*A2*)2B0Kpy9B!D>|UCnn{2n0dK4n(xfE(6Da`CE3Pk148I!FdD`fVRkGF_6&k zV%#kg7B{z=@sm%D7Vun5#-ML#6mfG_W*tHmgKC9uZi!wMSPW5;Yke1gkdIzMag2>E wKZ1Nrj!trBff$3Irm8znD>G*_m$WjawspC;yFI-_zaFr`01A7@Y6S@ZI|Xo4K>z>% literal 816 zcmd6mJ5Izv42C^qB4xWlnj$5j6{4Wnf+C0}4-1x#l6G%0Vdo%QaFCpd2GJz=F)NfT zq9)DAj_3F1-^tVSV|Bl~hAa5Ufu0b;;qX2T!#Ix9G;s>x^2-_nIoxu%z0>(B_Rm}&8JE46iFb$ zMN830q6SK7FBC`YJ94Cxahbw4ik-1d9jh^g)q894Zo}GQ1;863R%&QP(n`@Yg-vF& zCR-6YXt#KlHn2}ttkK*c_GvAS?x_`}!|2nlcowz7yNHaN?EyANh}N?eB{aSBGM_-y z(R9oiEy(eiD3B?ZR`>=aspip0N&!Vnl|RWuAr^|LzWX0v1^o+)FPql#vVw3X*A2*=+nEP^*MgEs?#0HCvL^ftrGEf>h49-yQ}ND%~(jwq&deP)qcDbaC!h8JDS z4b2cP$`u$|m?jh>yo(%=OW~mwdn{sqUvXlCiHC(Pf&?jRJOFoZdWernEq4QSn_(C) yRG2<9ftO2?6xHc}V> literal 816 zcmd6mu}*|Q5QhJiCBcq@!V(QJS6EP3U~Cp|qS#s5`X&qBgIwW*@Ju$w2ArAYj=&jf zX(qcn`~Tm}EKkpm)!o}QuJ9RyKkxm1|IzpTFbv~3$`)|>ZH+;U8(By$qT!Wud6g_f zOgkcKXc_R^CV6+7NjvLKuCthRYfW*m$;v3$V(C7u{(vaZDfO+#R^1iCwnhQpfl}QS zqRX>~h6V=Z;+<$KMdpeNfw9~Xr{xL--^fA=w@EF8;)or=mujJ{09sDjAoVb)SWGF< znwlEU)Mjs0lgQ@+bDY4WX`M)iOg>}j34(**>a4iH34%kxo6%HYfY7m2DBCoeADgvE7oi}N)Dq_D3dOuSoc)hi!T-YQWpnRd&T;<(CQHkI diff --git a/data/images/cards/large/06d.gif b/data/images/cards/large/06d.gif index 6afc6931f5d55e2af1450e6f421b840c6a4465e7..03d5c42d6afc3d90e2817b4577d1314a663ada8f 100644 GIT binary patch delta 186 zcmV;r07d_>2HXJ*M@dFFIbkLMA^`FLkqj(3X*A2*=+n1i?UGGk%K!5&(141q2>k&;!F&keY!~2O3_S6evcj%vCYi4!7$?SuI^H znoKr>(^obd(_Drt@~%5hxmU(rRCH%}c1v4if`e~;hln_ei+luragKXyjUShoPe+s` ooGv{AQjsw>N;?)as-3N0uQi0RuCzR}wyU_gED907z!C`nJFeGGJpcdz literal 816 zcmchWy-veG498uONM&?$!>vITVql5XA&4c{T99sxth`AtsXQHRE)6fV%6!eqWUQMgdA#oKrsTL^{ohFu~?+=;e61!5x<5=50&3ih^CI}Lhd zF{OxsrHLfdV_?k@!lW|}796Bno`N%_?i>O&WrK02a~cH2pk72ZwhwH1KAqOgmr*pi rQmBlMWDCi&(gxIuk%Cq}2*qi;7Zx%tXYaqSg8zltW%HfCT*Kop*d5pE diff --git a/data/images/cards/large/06h.gif b/data/images/cards/large/06h.gif index 021073eed393c8bba78456e66a37fb8a1b09c2aa..46832e595bd0788ebb2ace8ecff2167568d7215b 100644 GIT binary patch delta 203 zcmV;+05t!w2JHb1M@dFFIbkLMA^`FLkqj(3X*A2*=+n1i_FExK8mo6d;4UVSqgXGI)XAbOC|ohN}{)RbK^$t4J%@u(&zAbSYno zczxcMEp0P0!ydxL1joh7!vG2q(9seJ F06TBjTekoJ literal 816 zcmd6mu};H442E5iNM&?#L)M@QF|b6sp@=1EEC?GTD{s6mxPtc-`0)Uz)7vl%-urPJMFJ>4lhq1RxRpd|;ljTF>^WP{ zLrOgnbu~JqpAF zk=1r?Xd?xi?Wi*x#ATvz4O^29B4bYwYHf9%t`s4pk8-hY<;)`lvPfOV3yK&a$TgC& zbt_^x3ha45$!w+JBb>#t6bkWRskGD1H{Ry0!iEh@!NHof~Fw}StL#m(k> I{(K4dUqn&SZvX%Q diff --git a/data/images/cards/large/06s.gif b/data/images/cards/large/06s.gif index ce3d111ce627fefe9e95f9b3693f27b9e56a78bf..626ff93fb3415a9176480727c76a605a49da2c4f 100644 GIT binary patch delta 197 zcmV;$06PD$2Im0`M@dFFIbkLMA^`FLkqj(3X*A2*=+nECNXaXb|w8U!VrG+;V}O=C>Gvij^Nl;KU3ZgD0j`wOk)r6qGf-+#=x% ztkI=>BY<>e4e-^~aK^TbBc$GWa(;Y3DNK2H7Ib75hk0#_gGN|!Sa^GkjZFkXoST<0 z7gCZ>WuTKei5Z7&rWH3y07^8Op`Wv~w?w%zrMs=ZV!$3V!nnnX3W&V~lZ{CO!hV__D@84mX@|EoAYPYAGw` zA;%peb~q34+adPNX(jG#b8?-;Y_rtl4z^e{N^N1@U9&$RJPb;$NCIJlNr0|QNCGib z?xDj-q6SvdUMO7SCA%d@HZm?#&<)4!Gq!2NYD}TnUc6hgwpalWh@wu0)+8+y5KN1m zRkM>OU8oo)(+zA@(>5#}bS)+IQwR!9cg3?P1O-pH*%n}Zgb#T*J6y6(nvyqrfAuU3X*A2*)4n1f9SPp55RXT|)o@U;soN@c1YmDLNvmxiMaV0qfM^tmYg%ZxFDo2+54> zLTZ^2vY2yZ5w5s7b;6u#*IJZJdkhydS!FDOgKd5lS!`xt00Urzj1-PzYldfeh#7_{ sByN45WFKm!U00|yi=>t`qO44^Cb6`mw>7W1t-PteM+%9qie?V{#wXp0w8g*9)?yr{F8&Imd zLiqcnKGMLT+`OA9EG3n|SWd)gyF!suF-h1$g9#KiND}zHW)PxCT9#DUdKgHt5Jf97 zu~NfsVieXjN1AUSMj>bvl)T61GzwElv3OV9l0p3X*A2*)2B+_yjsGz(z3+$TW#T>?BpK-a<5j27Z<*%{!H8)$`js|JxE?NN%ce!(d5 z7Ck;YF*79*OL3p!>N>e?PiF*F8fIT~7BhfMf`nmzY#M+!g%^i`9&d~oh$DMhjfp)V jKAxb4d61(Oai^rJPplrPuCT1KsvV8)q$lFL#rZdn1O5`}P+xY^F{>{==V4i$&I}IOJTX#Rn7YU63Iw8SyWh3~feu?08$ATV zb*Amf^H77zBov0qmB5sC{Xp!Ta1Vn zd6-6Fgei1d48t^vg3-98WN{rFdWoV?vIJrkIV*IXEJ7fvg?vZkP`4uxm22a!G>Xqi jQN)1a%PGZKJX6?YSyvX4bpHRX;C~^x*?iAmZejNgGB(-G diff --git a/data/images/cards/large/07h.gif b/data/images/cards/large/07h.gif index 81f6f3b5b4be955472554c107c50cbc85495df94..64e47db8046d45a7657a397cc18a176061130e05 100644 GIT binary patch delta 198 zcmV;%06G7#2Iv6{M@dFFIbkLMA^`FLkqj(3X*A2xmiF!9ku2*pSy0UjTT)=>j~9@JCnlT1XiofA( zk*qmW((19MO6FNj+(XhksOFG+>R68FU_mI+T@Vks3=e zo17PkB0iy_kcu7wB##xOHfxr9u`{t7uD2k$x+uK8vcMj;!YseVhYAtP%n}IzJ8nr= A`~Uy| literal 816 zcmb`Gu};G<5QeWJmCAUDhpa^r>cA2y1Bj(*PLOVlth`Ar{2(28kUSF$VoCXZwoB78 zlI7&z=l{MtJI~vv`-it%x}ncG;Twte`;TE5#&J9x4qhT!erK~8&FRiBd@fy$uS7en z7Sk{nCnCK}1N|k+Zhe_4E?Zw5hgr5h_w*IA#aW?HmZsI?>Il)DmQ@I5yMb8LPKw$W zQV6!Zk-lMDH(b_mQ3%_aO)q0^nN7+39x03zD-nnc(K6gTMI~h`&P0*XS)eej6B9C- zQ80`mhgqY?aiB}1ur16CJiSYzaHj2gse%aXIEox-;u@_7vj8DE$dFQaYi(X3R=y>q zM@dFFIbkLMA^`FLkqj(3X*A2*)4n1T_g@w-*37k4-=j06V`$aI?EKjl|5rF#t6!!JlUOi1M!Aj4@ITi;ov> z1mLaA2-@%32DWg@l<^#ZXVvp)SbIuNe{g{nNqb9v89!}+4Nz2tj%=1kKR8K@jTo9M uI)-+Jpgs(pm7j<-o)<~1sjxb-GNQDjw>7r81aG{(ySV@ggT-?N2>?43$5k`{ literal 816 zcmd6mzfQw25XR50Bc)pg4;c%pPzQz%3`HzXdxCUhWaUj9=!10NLGny2h{fUlI73pz zOcv`-=kI>^o%3{j+}*$4z%_gpKwpgUeE#VBKBY7a1E&D4zMU~pz%2({3ybtZwG@@p zqrej)wm3cDwHyquOBL^9mDLmGJ+b`IrJ-1K_7bv+F@3yS1R@e>^cWNk$sTCbF zxokFxsTD39TC{ls@1qrrhFxAuMfb!C!<;_vif0jsdPQPu!nJPz+Y!RA7`}$4tGvu7 t5PtN>fmrdCDU2F4wE_)Ou*`TUMLA7oD`v@m@+#k= diff --git a/data/images/cards/large/08c.gif b/data/images/cards/large/08c.gif index 373ac362ff56d5aadf82a60f1f755f955c8e5386..8eb313268f6a3d55b37dff77b946c6dc307bf681 100644 GIT binary patch delta 196 zcmV;#06YJ%2Ic__M@dFFIbkLMA^`FLkqj(3X*A2*=+nEP^*Mg9qP%03esyHF_HWMmPW_9U$c;G$TNw7^*b;z)q!ABhPCQ3U-0Z zZ6RcjzZjs|B91JOm03G&v3L7h6>>v>ehhFIOip=*hk#rxfonVfb(M&ZR)GX!1402W yosfuCk(;8Kq-_9vNlUArG?`zdDzvefw>74@D7(D4zrDdezQa}ujmdrm2>?5Z%u_)C literal 816 zcmd6mzfQw25XL_@j?``*I4S9OLGny2h$Z3fY*LaU zX0lj!zCXYF&UxHE)VD8}xWIc3{z3?c!&}?7UDx$}FD~Hx(;9;uS7JykvhJB<*_w}! zoc2Vtq49y=oD}?NB<-y~N#|nLPismCJD)U)Z87eitUn+M?3DT@V6EL1V%C^@v0i~n zyDLOf%~l)g7?g+iQd=pkk1&=M@j9+haE8KIkx5$!1xH4h453mDR0?w)RzxLSfI-cZ z{h;7T6??5U`OY{-8#a(23TH~97|C~BTDmW*(nVa|mE;W&1>^i{xB*+tGzhurMvIkCyL={X630; z>3X*A2*=+n1i?UG@Qnw8Pk;o#;3&t=uU5PylbOL!2WncL!{`r3MOiCY?UuXwBC}BN zcnPJPH2=Gm}QWXF+DjS iQhz%Hb$O$td#7!xOsuW0m9VR_kF<0O5xKe&2>?5j4^t}u literal 816 zcmchWzfQwI48~oNNM&?$!>ynQb?6d_p@=0%El4*;R^Ft6JV*x~B+tZx7`Wg+K{N@< zNEXYVe4l@3Umo`N+neVrxPWYl%-S|L_7-Wf}3X*A2*=+n1i_FExK8mo6aaI>1q2shkDv@*U^q&&QZxn#)};k{#df9Hu<<#(Os8OR zn2b4pz3MF6+(k3vR$payytVOmEM;_o1XXH!dxKO~NJ(*tihp1`Vv&+`lo^LkLX%!J z9ZHv5i<*TNJfozarxtG;rG`g5jx>T9R<^6UGO@g#zcs$WyTq`@Aj8N23K7oF5(xl1 DNYYvh literal 816 zcmcJOu}*|Q5QgU>BxgCW1??GPENn<9G&Ud;Jv&QV-{eppk zv2-G`l`zn6qU@^EO6j8Nq#b5awe-{p(Rwjx982N!Dfs5F)8sH@fp91hNDNRB;A@tZcba zaa;v=uC}Z!EPTy(q5H*3G}tQgO{x@PrWWjja8?JRQJCATa-s;^4-{cLvj4jk_!ky8 L8~6PAobG-AINH#~ diff --git a/data/images/cards/large/08s.gif b/data/images/cards/large/08s.gif index 616d54d946d10c0d52bd38bc88bd88199570c890..24cee08b03350d1c0a65b16146e6c45828089eac 100644 GIT binary patch delta 197 zcmV;$06PD$2Im0`M@dFFIbkLMA^`FLkqj(3X*A2*=+nECNXa*c}9bTn8Aa@h-rDZ^$Tuj+W4jFmMc>7%9|JeOysn))97#d@nGd zpz5r2BY<;-4EP1na7H#v0oE^Nd2x6>b!rxVf^A|LNlO)pd5Z)vT3l9fR)m`^enmtu z1fF}NlzdTBb9|N>iIba%hJQ4vV5lm#v#+^EyE3M|y1-z<9=N~&3WCbY1qlEd+xV3_&aoJwe$RS$PwO=0Q5}AbBPh#Nu#wHX=z; zN3vLU&i8-!|HZRLK29qQ}@DRO+*ri zuFl#$25PEcE%HL4U4*$IM|LtUQ_u~8$=RkIkINKP$x9{P)!bXGP}jaiY@(qJwVqJu zWOnRH?-Vm-DS<<>qB3fO*riwu>9M-4HwJr~vf_Kc5R9820O}tI5SBHxov|{XKtN<6 yBw*bBlP6>Bl*`NtYg9BwO4(TP07^$NlgQ5mLK4%;|NkoJUs!zE6wC7p?!EzuQOlA5 diff --git a/data/images/cards/large/09c.gif b/data/images/cards/large/09c.gif index 084ea6f2c2458c5d7bdb7a61bd7c631b0312bb49..f90c6a3696c20c7e37e9dd1617bc6058b56c772b 100644 GIT binary patch delta 193 zcmV;y06zb)2IBz?M@dFFIbkLMA^`FLkqj(3X*A2*=+nEP{70g9qP%03esyF^DJtMmPX&9w6l@yFktJpU36|VU6i{HN z%-(6H_f>8%{TJvUiaezwv6JsOTIxiKxcXLHDXK3R3cj1X11l~lh;0XvSF;rB3&cFK z*cAEmWt)*=3X*A2*=+n1i>)S){Nt#011G(2?&8>=T{?MfJmWc@Y{i$7AO=${pGG0t@P6Meo@$p zIBYhf*_3U(-NwMyPdd|{rWm^!WnNZ%8E%1QgoPObH)BOr9y4l>Y?X@^N>Lw|m=%pC pb37G31V*APeRFa=lcyK0uA`~3ud}qWw_v$%yLJi@z`+s;06WCPRZIW? literal 816 zcmchWu};H442E5iNM$s+;nq|UVqmGnP{fi;Ex2xsth`CD&4YB{LGny2h=By#7pb}g zbtKElmhb;R+n1N!^XBpW7FO_?1AjjNr_)E*b$#Ct!yqYu@;h5BAcuPiq!zCFH-J4y z%k;>pB_dDh0e>ZFU(YM4&Fa~87R&0XrZ{BFiBYtL)P0ODKva0#CM*hJ0**-+krd)k zn#NPlq6Qm2>}tKffO^0N7zzh1-BFOV|W1^@s6 diff --git a/data/images/cards/large/09h.gif b/data/images/cards/large/09h.gif index 04291df259a3287220317dd1e54cfaee21f9235c..bcb2694c90f2b961dd9961e60dddbb582cadd852 100644 GIT binary patch delta 203 zcmV;+05t!w2JHb1M@dFFIbkLMA^`FLkqj(3X*A2*=+n1i_FExK8mo6d;4c5q!U55ZJ@OZURCeTDd6$(kqfRycn~Vt5|t~eZQ2k zy4($8!4>tGjXA%Q^5T|YexuWQe_VBbcNA7~dwgwGQ$QF@Vv37IWRPQ%lor zM!H1)WB>l*q>oPzw|B2su!GMW`11gV!^bpD-uro;MFOb5v&{x_xRF3|;ljTF>^a&l zmz*3CjkH|gH<9+;c_z86J1b|itXq3ZhitoQ6x+hGdy4*mXz*RA%hplZN}~XwENU7x z+E!!LvP*z?t5rXeFD#;}PznQuGO8kC5m~gzZbG5Vh~!ifkxwQRoQb>_GZDFA7zL6w zq(eCu42c4rGBhgo6qh4~HEc~y6d5~0G-~)3X*A2*=+nECNXa*c}9bTn8Aa@h-rDZ^$Tuj+W4jFmMc>7%9|JeF(E#))97#T)}8U zs~ZWXqvLS9@vZ=Ksq!3fu8@Oe7C?IdPJUrx41$D(7gGX(6?!;9R*r~YErUfw1efRz)+6G2|6enBP(wbmpn)Z9wg7i!m&6=vU}7n z$3zyL6&H>{xB*+tGzhurMvIkCyL={X630; z>3X*A2*+Ow2$itl*uV^))B?x~1OPn;5rwP_DLR2KaDjlDECBHc1W+y34VJLWn!%4N zniy*N8cU2&dk*OqNBmDdev+FUcM*GNYjsG2X@yR7e`bjeRed*ye~>nlY=B5_KUzvY zl7^0>f&)hZopEPbTYz7ZV@zl~TvHf%UO|~qUOK8ObFX=?F*7u3$0o+fe9SVj&a%&&iLzNG+L?>1lx>{2pQ!fq{W-9s2|+7RKI*M$Z5wzc~Q50IcVn1jUeadc;|KnBgUpRQ#^zQit F_urMw#z_DG diff --git a/data/images/cards/large/10d.gif b/data/images/cards/large/10d.gif index 4820eb10c5cec644ef5264220933582b352017c1..f4db9d68b74d48de662fafed50c7d1c03c66ab44 100644 GIT binary patch delta 198 zcmV;%06G7#2Iv6{M@dFFIbkLMA^`FLkqj(3X*A2*+O=2$c}rGz(a}L1nk=1W3POKu8$ymKkC#NeNbugyO|%1yQq5@O4YOV literal 816 zcmd6mu};G<5QeWJk;-_92d^N67`jAaC}K(C6NHVCl{aZh9;5>gl4oK;3?%$#rzJ`0 zP8Q3*&;S4V>^wd_tnXg0>5@KT!uL(I+r77K+jU*v_bL%xd_{`|#kA6i*3wz`LbSnb zIUQnYM5L1GK!1s{$&V|giSncEFpKiJrzS+pSx|_jY5Fib4Pi^!aygDw2zHI(!p9b2 zO(FPA($cyPriKHPQq-AnWePB*Hak$5Ol)Clkz32ysK*6`$+VJ1*330K^+qd3X*A2*+O=2$c}r*02v1UjT?n{VKa%FgYX$j~8Rp$!qGE0RnbfkrI{K>~;+90xVFl zl01%{kyEvpjdi2r*)Ww3HQ&E^a(qQ^6lsBZPh>TpuGe$!jr`^l*b#%%7o3h%+G$( MC<+nR*b)fong8F8Hjhsaw|6gBbV(mE;rC6n+r77K+jU*v_bL%xd_}7j#dM>E_R?AROteL{ zK0ab;M5L1AgMJfbo1b<{6Xhr4FpKh~rzS+}MbHpS$LVABH$+y-E0TH-+B(iGToi)eBrP-FB{j3j7-gWSt#D-uhzzl2+zb@PN>-TKj3VP^pfDDl4V$5p z8G%@Z$-JqBT^PrJKTxn*!&6-*3Wl{CL}1S$8W-|FHir;N)!OUMCkRvtE~w%Nkpco0 zti6i+RVV~1XM^~;-$hbld5ACc3X*A2*+Ow2$itl8wps8K?M*9{4&Ns?Z^TM2|B@mh%qjdASNM5F$$@cY2%5~?waU| z*g?LexZ7h%7ika8&U9#9$Gr1#dJzqNcuyf5bc1krK!AupR*PVbcRY{;l8acCO^0$r zKYUK3V{V3mU00b@R-B!2Pev@RcUonRJYG|@tEyR!PdWiQb}E0Itu$%MGPcaW&py%8 S(;hR`uh?!1lil3~2>?4q=U`3% literal 816 zcmchWu};J=42GT7mBLn}4jlm@CWZJsNCE-9!*efNl>td0 zV5IC$cQY4NP(8EXRLu1^)}H&E~PZox#&D D;J?P; diff --git a/data/images/cards/large/11c.gif b/data/images/cards/large/11c.gif index ace224de6ae48e8a029eaf25896c4d0dac4f3ab1..f300907a603b4e6ddb01a253b8a4a6976a063daf 100644 GIT binary patch delta 177 zcmV;i08am~2GaoyM@dFFIbkLMA^`FLkqj(3X*A2*=+{1dN~!%;4FCMPTRfZ2%zT(UEK}8%~r`$~;CfyoOPFr3e@}VGjdrWg}xt zdCEdpD{I2m{cd;ZP&NC~`f34Z3tM&Lo1tCOv+ud1;u3V60|1qlEVmYXb!50WAW@tM*fnlhXFe|)B?l6yVD0#9Y1xr||X4iuiLNRP$ zumbCvOv&#!?*t*Zx+}?3K!Ld7%d8(zA)XYXMDa1tP7qZi#RN&(QuApGiDV%;EOZmP m5Wh4lEJLOi3hq>m_hJ;9r$yDDfAUrEzcBf-*}KgJ9=`!C#Ln3O diff --git a/data/images/cards/large/11d.gif b/data/images/cards/large/11d.gif index ab0268931ea8a94d1508b099bfbda690f209e8c3..28bbd2db5dde0691b42d64f7c19c4e86b57c7e46 100644 GIT binary patch delta 176 zcmV;h08jt02GRixM@dFFIbkLMA^`FLkqj(3X*A2*=+{1b9GO_N{+EPY+iaWO6k?hu9h9j3A|knQ`U`?(aTWqkLWBZxKzMazjX)%XKaVjm0gRU}Fo-xC ej5`%QqJ4y=X{br6tE^G3udpZz5w*4w2>?4`zD;KU literal 816 zcmchWu};G<5QeWJk;-_g2d|)tiKP-lt1fYJg0L~N@+P&&gLL3Q@=RS2LmlpX2I92p zNEYkP=l?$czC1lYt~YOYa0`bL_&WmZ_aA-VhY*HgkQBhpS23GG3HK66EnJ0HfE`Ek zd?~3TqL%Un&LwGAomNs;R42z-tf;1%(xI478fja|yQk<91bUaTBnV7Nr$`9`sciy_ z8dRo4k)nlNjVY{?=)oesM`M)2IB{f+=&=!PwZeEQkt9a35rv6Ki!Am>K_rzHMJ$6@ zaB?LbTD3xv&O@|I^i8~Hgs2rlr1kO3X*A2*=+{1bBcA_)zfyAI5gmQG~!AAsHM3I=G7V}HP^Ee@lna;6ib{R}vfPoi6dPii2hj4dNg&=Pg0&9?nIgJ)DMv4|J vJe!=9YnLLJP8b1}pDQqat2A}8CPcKew>6}>D7(D4zrDdA3K7P~5(xl128>gJ literal 816 zcmcJOzfQwI48~oNNM&?$Lsn45#B$ONAeQ{GAZ#63d6S-c57MCzl4oK;EEnu^C{2pG zk;U>C`}6Od%ggKY!{hrM+`>l={6v8L{?PY*jBywSkpOPKvc&>&xR*p~;VQlXY&ly_ zLr#H+I+_OfOQdaeUP&RV&f3{5tLC0EAzRJ{=~$RfAG1pk=xb&vY@ou*pb-Mebq>9C zSXy=&A&>#%$|IT*ad)IZZe$Tz^vG^XQPvd9C`zMJm^zTrN|Zibh4Dl#wR1yzLP4Ej zPjQ)2tW{*}pH+xiaA_WsDTE_|AS%SVm7V`WaJJ$Dil`8cKycL4c)Yn#HS z?!uECNxW+f>4TUiQ6w9Arxa@}8_iM!_g(rR)5_y2PCUis|852U3$vTe_k42=Pv5my B)29Fc diff --git a/data/images/cards/large/11s.gif b/data/images/cards/large/11s.gif index 1475102e9cae5a5ae7e4b2062889736fb7f7f250..40d3a205a6e715d5655f9fcd33b7a8fc3ebec6f4 100644 GIT binary patch delta 183 zcmV;o07(C^2H61&M@dFFIbkLMA^`FLkqj(;Kl{xB*+tGzhurMvIkCyL={X630; z>3X*A2*=+{1dQMTB)ag7^a=F9XNGNzFtb(_{4_hybz|8v%Cpf-7Q} zw}DANyX(by{Iqbu$~co%M?dpxdvseAWpZCqVRbr#7fL}xH%o1GL}Gk>c6C0Nd4h@} lZ2?y_pj-@}F_)yJt39nUnXj6%HL7!05X5pJ7PK29D{pdD^B^5~kUSF$Vo9*i?w_Qn z8(B_1+5Ue1e0g2HRF5CGxWQKj{z3@b?Pu3@ecunmAXmWkk4q9{xRXF~k@oML%TYc) zGHQuvN#g^5T~hF;nbbOeQqIkspY{|5mrsOL7Grgb&Os#MN?8oaAW%n^vQQ+007pGH zO)!h{MuAB9z>YL=T&2jp$fsgcBN9sCJYUYEcMIvQR=7Y!l^R-c>m3ExIWwD^9Z_7^ z1~z*uuxw~;Ybm(y08!emWR?Sj;HDd3v4ePy5Hr;4qKxxJh`NRP<79Yhzm+18hGQ$- py;`9aJW`~XBd=`}cAQ(tICF1>G&@@P|Gf(S7bY*8*Yb9Wr(bxU&u;(# diff --git a/data/images/cards/large/12c.gif b/data/images/cards/large/12c.gif index 757194e92d36cd4a79aafb5006589e51928778c6..7e27980c07375092d21ee8a36a03b49f833f2158 100644 GIT binary patch delta 206 zcmV;<05Sit2Jit4M@dFFIbkLMA^`FLkqj(3X*A2*)2REWtN0g9qaPL1)+KZ2*^B;D$UpK+Q@3kejg{(91%&Fk&ECOP4Ut5P9Ls zc$;KQfn{;@%B5P)k@!^$=;7pf4Sallc4~owa(s0;hlnkZePogqOgw!KUVCzdngnM# z15*K@UvrZIZ=QUnr5A4u0zw(DjYp+#OEiZVuU0C)x~;)7tive9#)HW|$jh6~C<>3$ IfdvTwJ4v2f-2eap literal 816 zcmd6mJx;?w5QU%dT5`HAQlw0x2vMZig2IT#KO+boB`r5u3m+r}2l1I`5RJ{utZifm zQR8N{qvv_wys;mj9nSi@1AXE#K1l zkx)ZKCz>Dltw=tRQN)P=0sX|Gd9;>#oHLX5?xl$%QB5Q;TB&59buB$*cZKfVh77ZzVOXZO6q{Wmvx B$qoPj diff --git a/data/images/cards/large/12d.gif b/data/images/cards/large/12d.gif index 66e43ecdff773493ac80fecba83a5676a4f07862..b3c8b6ccd62015df1ddd324ca19f9a6b50fb2b95 100644 GIT binary patch delta 186 zcmV;r07d_>2HXJ*M@dFFIbkLMA^`FLkqj(3X*A2*=+X1Oko0_nm(M65t}h5pF=Fr*#_~gPlRo2^w0O&mTtG3s6zk3KqNVPB&qS zFN-m|!I!b|>V99CUUt0RgVUXBWo}=0X>5UlXJ~slh!{m=i+_3=eM^QukRni*7hIMl oIxL1+Jz6v{kf1sz!C`nJ2bvga{vGU literal 816 zcmchWu};G<5QeWJk;-_g2d_pE>cA4ILl8@9TTr%+th`B0`yd_qAbBPh#DK%y*%2hI z7|CMY`TYN%e>qRjkInt-E!@C+3G{sd9FM22>tc+3-*XGVd=|4AlyJud&%#xF0oYMB zA1|dpc<(oUyuhWV-?itH{!p}M$4RVcr<&|g%qK?47RK(m`U66l37|k=Fd1;2kQky0 z7O9FPsxUDL1-e`3X*A2*=+X1cEl)L$wDz4D5ExU4A?Q5-0>*1USO&NhC_EOiL>{wP3&1%a&R6g27^^ zxtFY*(OR`TTK2uG!OEB&HQxhG7hHXIcX@hp6oW<w9V33h!IdvFNcp!;2 zSA2{ZNSASv0-YZ_rl*x*AAmKWSDlnGFt%MZEVR6zza}%mfyA@M$H>6S8wwH6&=Ls% EJF&M~8UO$Q literal 816 zcmd6mu};G<5QeWJk;-_Dhpa{w>cA2yLlH}GPLOVlth`ALd5{h~NS=uWF_3V-ZGoC1 zX1ZAS=kEVMpWOT1-S+zFk}l{iC;fdA9S*OzB%obK5I_K)huh~o=C`+v!EDD$LXp11H#wN)$QWrq1y<-I&SDx9F%rA+8Th>7pSw+t}2nudXE4@h~20_7Fqe&)qGUl*~(i-oi z4&yq|Mhfj@C!JAGxFibWTXvn)QB3_sP@!b-}QT>lsq5p;1 L%hq@Pa85U0pg7M? diff --git a/data/images/cards/large/12s.gif b/data/images/cards/large/12s.gif index 5245071c41fde41a46d477846f0941d6efcf1914..2ff4026dfa760a51dfe54f96eb382b208b00a8d0 100644 GIT binary patch delta 206 zcmV;<05Sit2Jit4M@dFFIbkLMA^`FLkqj(3X*A2*)2REP+e{7!C-Z03hdS-2yjWM~EvbE5h82GH?t)Pu7pHxMHdgZ!gOQT)UVg zL~LoH7eEU*Vjf@MWnzWiu(#_?6>5BJWp{u>7EFAJe}_PU6pMU%T8C$K6?0u?R)?24 zWra*RQ3RuYdqYfxhh(Ud4gzr)iF4mg%OQ^Mi4qmT5hsde2^3z#Al*GG!FCD%a0vI zjhoS|X5af}W_|x~SKd5dVvE-V`Z?#0$CqIk#&JBIPCNoO?xE2)VcS6j2RNc&!s@y&5Udqy_C`j;W;@DNve1!_LpHpf*R57REIqK7oa^jX*yd-;YSZhQcW9}vo!qwZ|x`|}XC zLrc!yuzBgm4N*S?g26q!2B4n4(J303@s|M4pHUs$|sUCZMIZa)Bm CQ^}+N diff --git a/data/images/cards/large/13c.gif b/data/images/cards/large/13c.gif index 7404c69dcb24bd796259fc19378ae8cb7d2d3a53..85178f235b6a772291c1ffa40db9bded43d3d3eb 100644 GIT binary patch delta 193 zcmV;y06zb)2IBz?M@dFFIbkLMA^`FLkqj(3X*A2*+RB1WTX|%;3SH8G+aEZ2%aK0H8xXK*$RR2X#P`NFf1ol>(N{46)a>%S{aAAX{*doQVd}B>WkNKoV$4 zV~zbi^X89pcYj-5Kc3?hZ#nqI7!QZnwr#tv>-%1|fRhhv402pbAX;SI1GS9Ybjd># zLfD1rg5Nen^h;%EtY2JbGVA9#rGj;{La8jK)raVB2!|pT!g3X{)#?g?f#n4#wYow? zzp8hkBPg5qBZc)QY3PX8c7?+FF9~f@V}!!GRjrZ?u~ZM#3Ycd~E(imIik&42J)=_1 z-VRnoh)v@J1}iL%36YdMV`_zfs}ruyO71CyA?F!!v!THRVTH3o`BY>-AR4nt#z2?% zG?3&4`!rbVBy=Fw+Z3sk*_6T*Yiw9|+*FG1NSu^NDHdb>?^nTpVfM1=-TnwSpIQUT ASO5S3 diff --git a/data/images/cards/large/13d.gif b/data/images/cards/large/13d.gif index ac446382276aa39986e915b3bdde09a3f39bdd63..d932186be734b6b778c03eba391eb6daad186029 100644 GIT binary patch delta 184 zcmV;p07w6@2HF7(M@dFFIbkLMA^`FLkqj(3X*A2*+O=-1tpbuuk}$011H62?7ESu137*fSCbq;OPmW7io^VXl7DiBCdGj22dkB9v8 mJ1m`dn>#Iz0;r(`GpmuVL$FM;oV19xg1CGN5xu?=2>?6xpiU_O literal 816 zcmchWu};G<5QeWJk;-_f2d_a0F|br(C}N3|6NHVCl{cwH9;5>gl4oK;3^?4KT~$uo zl`g0Ib^h0{?yicDv7U9771xG>HUI{}hV_lyE1F%)&)@1K4u6 z%u7iF5%rW8I3?1yIi94UXpWAvS<%crWka!?EsAR)-=4bj5Ejv6#-b277#CSmQ3&s< zwx__R1|ySF7?--0T^}fnvrf8uUh$#92!*j#$Avbsx04kb1)_+(h^S_f!aEj?iWb={ zQlK))q(#T)A_Ufov|@3sW)g)#+n$7wbJSm>@ATs%gz+L0?Gs5+?DL6Hd?yOcLcG(R or6`Qe??ou8`WD;6Bp*0`Au-qFspY?41^*XjFPq=_>m@w?0qG>xq5uE@ diff --git a/data/images/cards/large/13h.gif b/data/images/cards/large/13h.gif index d5558a465467bad74b9480e3b96383ee7a0e078d..beab17cad618fecec9b60d273295648d5667e9d8 100644 GIT binary patch delta 197 zcmV;$06PD$2Im0`M@dFFIbkLMA^`FLkqj(3X*A2*+O=-1vPB_fYWx9|oo)6n{A%ur~x?bb^4u63qpSR$+yBJyNXT+=Yw1gwJEA zSt?zht?4HYvwR2R?yKCcw{X2kc3N9%7CBRNZ-az;Z5eeqi;Qbk9aWJag%vu0JD8a; za%CPol6Zz!QHULVple^OG%ZyEvow>oGMcy^GrLW`B)Y)A!>z?A3K7c75(xl12u4=Q literal 816 zcmd6mu}*|Q5QgU>BxgCW#kN=&3mXy&jSUME#qLU5-{dy(AXoSxJd=&F5S)L3Q#kFV z*~~vP|9m@H9v<&+Zl5pdg5F}%?~~|ocQVVONEOPaTm<`@(pxHV3i zf_+}F&DAA9c$ZX-^oeIS+W0b27{}VEBF}E1FwQz@%_Oqk3>3yDmFC7uMqgM3v*wD> zt_}4};hmxxC4|e7f)!1QQB>@46^1j=7h#@~NfRL0R@gxb>l!) zVO>L3X*A2*+RB1WVunB!7jo3Qo84SvUd!F@wt$F&tcH;24066;6=)u%fUmKyqnGM!Y{T zAt%OgBLH+(-T1;`cm~FNkEfvw0vAnvWNUN`hJ<&9c}*8@3sjMQM~H_QO*%sant-1y vID%Jde}7{ggodS-EUGRonoXiKn6xHAwx78@yS%+mzgNK^3Vp`L1qlE<91&4Z literal 816 zcmchWzfQw25XL_zj%2nB88QMwObi_uf>@mP1ZC^U%A2^<57L1L=`*n)mV~>rsg#ti zWI3IEe}4C!^ZfGEJ-prG8lM&T3nA?HABV$X7>02iSpxbz;d#3V~mircOu-5q#0F zY2cy;t+rPR>x~lLvmz@US17D^UfP!;(@I(hg>^;G=0>$!NNtq@=ADSTBxuK_6NTQ{ zEVkB^1c*#U-oP$PVR6ZK+q@PTNg?2RicQ{?%#t9Ck0iL|4pAtGW?L;`0WSo4UwKp{ZwC<+teJ8j)MsvjxUhiAX^Uz3$gAhg3$wP+>6l>G z>Sk~@Ccv#ga@+$4T0|g zBFKSBZ4E6Jv6NiBqBI=ng>J9#CD79(z2>o49nuf~Ic%05Tp^Sdhco}&WzwIuEmpAm E0lW%wnE(I) diff --git a/data/images/cards/small/01d.gif b/data/images/cards/small/01d.gif index ab3b5506e631a436a9b052002fcb73001ba24ca4..45c7553453197095f3170f516439e00383a805d0 100644 GIT binary patch delta 115 zcmV-(0F3{i1Bw9*M@dFFIbk0F6#(%7kqjVSTO5w5%U}YdoV1E#vxa#4*?nR-1zKQM zq?A@DssgUivM&tElvzXfo!dofzn^498`_FEj&9lXF@vm9$w*aJuh9tUHSE%Q-lxce VJX_Lg3cGzY!&Qcc{q86L06W1fGtmG5 literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE$`EXhRu9O)MggG6iU5#^s2W(L0cb@CScFR$ zEaK1s6zP!wDsJTjizqn&o#8eGC~~L;BBB7&?iHdDm;@G?q9M2dC<0at76Do+0JK67 zXbwaT&{7VdrL97$T0ma_)c~y!;Q$#3bjB2o!oVaakXKpI{H)5=f-b^@9ty;S3p+em Jp$u&XYXFimdW!%6 diff --git a/data/images/cards/small/01h.gif b/data/images/cards/small/01h.gif index 12e3a888c585cb2d0db4fb32657563cc7a64142c..9575ccccd86cd2261a37e647f4f30eaefc70c03f 100644 GIT binary patch delta 113 zcmV-%0FM8k1Bd|(M@dFFIbk0F6#(%7kqjVQSsae3%U}YdoV1E#vxa#4*?nR-1yz7T zs40;W`>t{txvBuGv)lqFUfQjC6j%-?1o=vlqwr{(6{Sk%Yf7tLw?PYOs5>IPOVP(> TCa2Hkbq4Kj85;DuqW}Oq>KQMg literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE$`E9Zuv^HCfJH8i0zi=!Kt?C0u$m7@qycC} z2uP$ABq9;G$e{x$(gS21X#t671S&ZIo#8eGCIWPZ0?jv{V3Sg&@!zun3Sbg#%=Tkg68Q7l%Mrh;V?k3yG>t(I^Z|asqjk1t^E?XH~8i VbP*=>P#`8;*x|tnWoR>40|2uId>{Y- diff --git a/data/images/cards/small/01s.gif b/data/images/cards/small/01s.gif index 7dc98781bc0dc113178eaa948c8c4885f9ee4256..ffeec7ef660f9e3c60e8994698c7bc037285f9f7 100644 GIT binary patch delta 103 zcmV-t0GR)u1Ah!hNk%w1VIKe$0Pz5k3?Nfb6ppFOU;(3?w1#7|hIsqgePRe|q;y6= zmQ?8lQ;WRHG0K27s^Sf9fcYMqKk#;vLArGmpW^2X6f Js}F(#06TNZEP?<4 literal 415 zcma)&F%E)I42IkHkbq&ppb4A6z+fC0H7B}Gm8a1cSkk}1zYJ*Qrnlon7qZ8J7aQQyvfl(&t}h6KA& zr@_gP0FOf1<8FDO^@zl>St}-$C5u1^qL7kJw-**u9@3;&BAFo~35g^WOy>cOgpkFN zh=}Ei%*1R;UM#LG2lIHLAGv&mSOl`r*UB`fA`#@!tbcR#3ElfbMCxD7KYtm0-`X|{ G*t`K6baABs diff --git a/data/images/cards/small/02c.gif b/data/images/cards/small/02c.gif index 29bc364c4064ab0781bcd0b3db59d5d34d7d3376..2462c47dd321a42cc8505bf2653ad14b3f887a68 100644 GIT binary patch delta 101 zcmV-r0Gj`w1APofNk%w1VIKe$0Pz5k3?NZX6ppFOU;(3?w1#7|hIsqgePS4qAfTD( zRVA5Ow#d6uHHTvGb;nWz+x37wo=s*H7K=Y-X~?nco+sthC>lAlwk@~$^<2Xo1M$od H6aWA_Ot&l` literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqb2DGsnXQ0)yI!fGxOAQ47Juz^kuAS*gRA`B1% z9YB`y0Bv_@VF2q=JOC771KJLDAxM`3$YDSR#LYlU1rmTFAln5JfVzMNN(g|g06Pq< w9pa1zuo{SVH6Ea)P7Pqig#us`)mYH{EX?MDF2aN!3dDp9D?C`C3@rw003bVaS^xk5 diff --git a/data/images/cards/small/02d.gif b/data/images/cards/small/02d.gif index e16eced88efa8a729c2dc6f03328fbd837482e9e..8979c9d263975b7a61e54bdcdfdb5a75bb89966b 100644 GIT binary patch delta 109 zcmV-z0FwWo1B3w#M@dFFIbk0F6#(%7kqjVMRUD3~%U}YdoV1E#vxa#4*?nRd1wm$N zq;Rs8nObW}!LSTiZE4@s?2`0)zg%rHv=xuFWM#HP5}!s|P#U9Rqe3pID)IosTCx~y P#-%rohWmXO6aWA_X3;IN literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDNIa98ov0_C^6!ubvek5iVhfNCU_U37}oA zoDdO*4xmT~(Dp+u5D_H@pfj|9+7n?S3Lu98wHty(fR+j_0E#FB8DJ5RdjvpMfEXYV zkQE$2OIx98oIw5(;RsxGq=gftrqFO9*sCmPepcmbK^I{{4+Ubvg&iKOP=+>xH2|l2 Bd!+yX diff --git a/data/images/cards/small/02h.gif b/data/images/cards/small/02h.gif index 43015f4196bd9582453b6b5a61b55b29f2ff9a35..0de445b485947174c2c0c0c1801b83418a564d5d 100644 GIT binary patch delta 109 zcmV-z0FwWo1B3w#M@dFFIbk0F6#(%7kqjVMRUD3~%U}YdoV1E#vxa#4*?nRd1;J#V zLTZsKq^{{~R&H6+vkh3WzN6e;5?~C}qa0 literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDT~!msU-QXmnq zn+1T5=K@I?COUzA!2xmxM9o65zeG3!7aaj>Ur}fP@hS_NpH;b9&_$Sl){`7A?C@ZP IGPD`20qa?OA^-pY diff --git a/data/images/cards/small/02s.gif b/data/images/cards/small/02s.gif index e302a20674df06013ef3bc7592637b9884dc2445..bb9d0b6abe1d72b5a8e1b00ebeadb7c33cde320b 100644 GIT binary patch delta 100 zcmV-q0Gt1x1AGieNk%w1VIKe$0Pz5k3?NWV6ppFOU;(3?w1#7|hIsqgePS4qAfTD( zWtnGNC7H`nOS^(L6X%kDX#j(^U1L`~9bdoN4~3zr5V+LPO5 G002AZ4k?xZ literal 415 zcmb7=Jr06E5QS$E$!aJtXhJ7gP#6nJjSV40W8xv?2;N`|3y;8Yj5o5hQQyoi6m)L& z^3BhCJIB*uyK9!TpqC=NuRMtC?JGqdZJ2VMyw6-mX=zA#z7x}PTQtwxB+i`}t%gK( zrLITKhJ;Ykvd4`Z9p`l-#Ew^nE$&Rnl9EkBxL3%-3$q7Ez=9JpNjVtu*vuf&1qAMi w5D{3Y*jnAa>%~e9;f^KI<%B#7vq=MSoKN40dW4ET+3nTq>4L4}m!XI* H3JL%_eatR^ literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqb2DGsnXQ0)yI!fGxOAQ47Juz^kuAS*gRA`B1% z9YB`y0Bv_@VF2q=JOC770@@CCAxM`3$YE?gGazmTS}KqL5&=pHBmi{*4U`Z7Ii4Bh x9}{BaSOv literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDNIa9ASu5qkyVc&kB$TCsd>XWQ9cFq9ZL( z5r+<-NQg#Y(jlmbk^|5gYEv`}6Ja6>Actv9Sz!PYQ3jeUxBw*L1`!bixkmtGsi+rN z1Z3b84xpv2LO{hpT_D9?A{;;uwt^I|C^Ue0l?Bbus$4DTB24I^Kuox>!-Eyd&}Og( E02J7L&Hw-a diff --git a/data/images/cards/small/03h.gif b/data/images/cards/small/03h.gif index 4877ee5a4c845828d43cf3c3ebf33806e79a772d..879e8fab56862b078309b1150c3121345d20425d 100644 GIT binary patch delta 110 zcmV-!0FnQn1BC$$M@dFFIbk0F6#(%7kqjVNRveD0%U}YdoV1E#vxa#4*?nRd1;J#V zLTZsKq^{{~R&H6+vkh3WzN6e~5?~C}s~nB3B;_az@_bKL#-)P7w8*NDE4hiT&hbWU Q7M9aZ_Sw*g%N+#(JK1P5EdT%j literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDT~!msUzD1*Wti}^E|pplnPX5EQC*)53b{f0f=@x=g4 I0|f;DJ9bJe;Q#;t literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqatDFKiM3j zIsh$Y;{n?4(82)LrFZ}+qU18e0PI4LE(M^0f^0yO!6G0l5}*bOBmi{*t&o6N3UUuv vJJeE6unR%jVU{w26c-9Wgjmr0EX)S96(tmenb1Rlm~df*2P>4J#b6BpT@Z7< diff --git a/data/images/cards/small/04d.gif b/data/images/cards/small/04d.gif index 6ccc0879ec0a267a0f5274f5c5c0bcbf09e2d3ee..9b770670abb39f25f2eddd5a37ad6f6ce18f8af8 100644 GIT binary patch delta 109 zcmV-z0FwWo1B3w#M@dFFIbk0F6#(%7kqjVMRUD3~%U}YdoV1E#vxa#4*?nR-1yx{b zWQ0;^o2?MczBDD9>1@ANF4*;Yl~qbO^x*&{C2#m+o|?9p)a7y(ucgy2DhkWOV6tay P2659xL*os16aWA_cTFyV literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE$`E9ZFhr_R04Ope04Tx<6=?uk5h4+|=tv7x z#Gyk-RVzdzFzFCfM9Bf@47VN)!$g>f0?FQ65#-OkP9faqR;>&r|QLm=4Vx|7IYCN^iUusT-f2k K3T0?BSOWkU#C+5M diff --git a/data/images/cards/small/04h.gif b/data/images/cards/small/04h.gif index ae9637a96ca850b63e56f8c39093f9f2fa817389..7c04ada6133988861ea75c3929c531e88c5e393e 100644 GIT binary patch delta 110 zcmV-!0FnQn1BC$$M@dFFIbk0F6#(%7kqjVNRveD0%U}YdoV1E#vxa#4*?nR-1yX=Q zs9BLws;)8&0u?>atz8PNpIhxHrXMh8aj}d+qeLk@>5@DmF-o;KV;k4&wylZA-f`CK QDWk<}jiUjN9|i>gJ0B1%>Hq)$ literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE%5afOE2pYj56Hkq0iei?fJKK|IE5i14L~bG zBm$GbA|NXqI)qfULNo#sK_YHI5hVwpGu(jMK_bc^D-?hZQ`Q2S3=#oZA-KS$lMAF6 zBm#D`0Lby8Alnn2z`o!J0EvLK8!iO;6ud<-|S(U2=U4#kbM6iA+ QgP3q(hX*T^q0L|o0GF?NhX4Qo diff --git a/data/images/cards/small/04s.gif b/data/images/cards/small/04s.gif index 0695de74fec7fa2c0ec5c29a0050efc141dd9bab..06b34e68488a49bbb34380f75f4136a22d5970af 100644 GIT binary patch delta 102 zcmV-s0Ga=v1AYugNk%w1VIKe$0Pz5k3?NcZ6ppFOU;(3?w1#7|hIsqgePRe&Bz1Ct zxn}9rf`}VOYpo_MddW+5YSkL4;LJuu;cOD(^3`kJrobgHq)$ literal 415 zcma)&F%E)I5JYzo$=6Uo(1cE)urL;s8XH24#)L!25xfBfg-7r>h8tPhsI&hAQ7V5m zdCSfWdpsRB+j2p3dNAR=^@E6?HZxhY7AkYHUNhxISw(Ewt(X?Kv~220ux!OB84~VB z-8bwH3CYM4pLV@cAWA!%^}Iradlf>4WC(R!r03`(hVdOF*+WP}ArTCH2hO^)M4X$N yIVnO-P$M*<$kL<_#Ym;mS13!vi|nI^-T$*P#6jxM6#{E`g@5ic?$6qa741H-U~t6% diff --git a/data/images/cards/small/05c.gif b/data/images/cards/small/05c.gif index 868eae8552f4775e1fce6be1ac024bad9e1be4da..955c8d730d298ae2509352cb1eef37d57fcac783 100644 GIT binary patch delta 99 zcmV-p0G$7y1A7cdNk%w1VIKe$0Pz5k3?NTT6ppFOU;(3?w1#7|hIsqgePYNV7D=Ii zmSiexo~tycD~6V!+SF0bq4jL1-R0){C4Vv)C|Ch1iP2b9gq32c+l{t61+xsja!*hI F06PJ_D+~Yt literal 415 zcmb7AF%H5o40J-NQq&&|yR`*=F6H_Z&D@DPCY=EA0UMnZsuC85NFd`*V?#5T_Yu)i z-HaIb5imAYntX!XDP#BSECd_wTw-GH4BoKBrA(DAu&TJBT;dETBr2z1sPdU{sjdk@ zO4q2uJeglgc}R|k!gE~030ZE_3n7@N%FfzDQSW9G`>ek&7|QYYUxweehGqfV4|Pv- A^Z)<= diff --git a/data/images/cards/small/05d.gif b/data/images/cards/small/05d.gif index a40396080c9ef11ca7e84b3e866786b0f5571510..641782b4735b6da9ed5b774783ef1a784b803964 100644 GIT binary patch delta 107 zcmV-x0F?iq1A+kzM@dFFIbk0F6#(%7kqjVKQyh+|%U}YdoV1E#vxa#4*?nRN1!hp0 z8!4dH=~`?&!Kw_@seMy(-{PGrtVm2a^yN|#B<@wSWo9J`Oj86lX~d=IQ~W-~o-i5Y NJ1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SI7(lkU7E-sYU@+uO6_;oKTSlAyqAq$wykC zA`Trws%}7$q(e{4@I-Rmgxo|qml}+V(4T!ODxmK`pd-;r(r1G~r_IfmCs)Td`sZA|ND)P9(nK3zf P7K76}L*os16aWA_Y!WUL literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SI7*5MJ}zJs%kwT0~-ZYy+DjZEu6v-kp>}E zEuhIsU=ffN4jn?OZa_vNNCd=Ca_AHiRfCEsgRD>hISi=F5TpiVyWj$l2v9Ld1ng!3 zkmE&xQih36U|(@N`xpnF;cf!bFT0-Xp_!~$|6ST&Tv)q*a<1hgJS Q4Kd-u4i8o+Lz}@G0KwdPz5oCK diff --git a/data/images/cards/small/05s.gif b/data/images/cards/small/05s.gif index 80aef8f8f5abd90e495f6f6fbcc1f269cdfc1879..9158e864db12c82ec9c8a0005f93f49841991bd6 100644 GIT binary patch delta 99 zcmV-p0G$7y1A7cdNk%w1VIKe$0Pz5k3?NTT6ppFOU;(3?w1#7|hIsqgePYNV7D=JN zhJvf~o~8_D3k|nT)pGgnI{g@_SS`}f885!vWz|#KmO;_8SF(<%S{}Ds1=|eCa#BzL F06P^PE9L+I literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqclYCIeQAakJF8#sj3Tp%Vxv^zC$3bR2>W`Kw| z04)XE3Ls0>csf8LK==5}D1_)&V}bjb10uo(bt}w=oWdY?kQ^?o@L+{9v>2=b D$e(ch diff --git a/data/images/cards/small/06c.gif b/data/images/cards/small/06c.gif index 9fe310e9e68fbe3cc2bbf915c9377d7380c553b0..7ae073f21e9c7fb7ceb730fb00850a4c5764f30d 100644 GIT binary patch delta 101 zcmV-r0Gj`w1APofNk%w1VIKe$0Pz5k3?NZX6ppFOU;(3?w1#7|hIsqgePSq)C7_vC zmau4i*{D2sYEXWw(*>nE(uzY}bLosErO|1t78T93pD8!@^?1V^L+{)Z H6aWA_Ks78E literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqb2DG33PIZ*8l9KvcmV3Qdc!3H`ta0;_QOlE)> z=m4}7EalL`0M?~=0H~b_s0Qppkdy+@KtZ4`h?{|y3M3qAVFc+CNC4`BS<1l-at}y5 yP=o{Mod!;@3qjg}&gcM%0NvvwQ78ZrVnOq>Fq;dy2*@2IhYKq_SfLCp25SI|+H?T` diff --git a/data/images/cards/small/06d.gif b/data/images/cards/small/06d.gif index d7e888b67b6ec06ee7c5125b97f5e5b8c46ff10e..b99f0eb66bb1113a717c4c4ad410b0a35b54a08b 100644 GIT binary patch delta 107 zcmV-x0F?iq1A+kzM@dFFIbk0F6#(%7kqjVKQyh+|%U}YdoV1E#vxa#4*?nRt1wmzQ zBy^%?Ypw9~zM1USX(jKhUgH61tOzhj!3k!^nMCOX-iD1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYJ~yF9ASu5qkyVc2-sv!s7Qm5susxPBP~!7 zhYlfCH=sz;A*hIwL#L3a+7u1LM3{&I&_HD^pvfQ+WuVD|3tT$6fV#jUf*|(@04)_1 z1=*f>2xy?!6pnyJF0Dd9#Xu3TzeG5I9&80EUQq~kqN*1Qnx9p-I diff --git a/data/images/cards/small/06h.gif b/data/images/cards/small/06h.gif index df524ccd51cb4d95bc417116bd761b49e3e9cb56..7882667ff805298e86df573934a0454437d18f26 100644 GIT binary patch delta 109 zcmV-z0FwWo1B3w#M@dFFIbk0F6#(%7kqjVMRUD3~%U}YdoV1E#vxa#4*?nRt1wm;- z=2?;Iw8m=-z?3Z0HjK}d>x=YQzgp=f>{)=wWGurJ5S`QFuByU1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYK6ffmsU670S?Num%9wXL`#3 diff --git a/data/images/cards/small/06s.gif b/data/images/cards/small/06s.gif index 7cf6b27103da687174794d5ab696d443aef2d30b..9246d052f8fa29e42d36554a055e5d052034e7c6 100644 GIT binary patch delta 101 zcmV-r0Gj`w1APofNk%w1VIKe$0Pz5k3?NZX6ppFOU;(3?w1#7|hIsqgePSq)C7_vC zie_eOB`(a(a`mbWPOm=K=v{g(T2T0^MUIr@4>*iAk-}xwDgvso+0V8+1$(~YrQwKX H2nql@JKrpD literal 415 zcmb7=F%E)25JhJJ&0;7ZXhJ7gP#6nJjSV42W5OZi2;N`|3Xi~X3^%g0QUB~N6m)L& z^Jf3dpSfJm`$My)6}<%Eef5LL-kuQT(2gnB$@wg0n3jr!<5{t&yQ1k^KhCXiH&Y^p z((p$_Q$i>uA@{L%CF49WosGRxempmw$&eC5^{fhcxMB8$-C@BAnWShK!DTXogtxvG za3z``h8`;2yf*6~hQvC`M@beb56y!I6XdD8JNtpWac61B{4^3PILF_2nT=<)VoS## D-zsql diff --git a/data/images/cards/small/07c.gif b/data/images/cards/small/07c.gif index d54149768467f1d1c7f49c5d12eff09020162470..e371393c8345b14529bed54bbb4e03129dad3d60 100644 GIT binary patch delta 98 zcmV-o0G!Gu1|(#e!OYrB%@TD=;zn=Ci@?HYdMpP&E$ EJD%q&YybcN literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqclYCIeQAakJF8#sj3TqHmyGctk=bZP)u(E$=+ zfEefiveX4=yF&{DSeN1fpa>h#cCZUUx)eYT12Q0P23jhR02Be)E|37!1vF3sWGN%q zVPNfQJ{%w`fVRW5tMPy=1=}uBC;&E5jRnom!fYUSAcul56M85R6E3XqV1+WY7_0#; CWpls) diff --git a/data/images/cards/small/07d.gif b/data/images/cards/small/07d.gif index fb9333f7f606e2daf7cc9441e9ae838189d3b66d..1d0befa09ff699864926cd82fd6515ba1bcdbb6f 100644 GIT binary patch delta 108 zcmV-y0F(cp1A_q!M@dFFIbk0F6#(%7kqjVLR2+_}%U}YdoV1E#vxa#4*?nRN1!hp0 z8!4bIb-ETC$z^PVKsw>)yn{)6u?p=~BdRF0T#E=4!f=_UrC1FPGs~>#d;A);VokU# OIiop-hWqU(002A9MJ#0i literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SI7(lkU7E-sYU@+ubveFKoL%;NCU_UiNHli zTA(5h9YB#DjliTsP!S~upfj|lXc#8KL=->{bDOfl03@OeG+A%~Pz1;TiwJ_;BLK95 z3&;S8fDD|%0kRY%1r!1MON0aH!B&veibAjxRlQiy{H)5=f-b^@9ty;S3p+emp$u&X FYXJWPebxW~ diff --git a/data/images/cards/small/07h.gif b/data/images/cards/small/07h.gif index 58e04478df4f3b7f5d3d886c804460e4edcf764b..4ee570da0e5dfe252b73dddbbd47a38edd2e8eca 100644 GIT binary patch delta 109 zcmV-z0FwWo1B3w#M@dFFIbk0F6#(%7kqjVMRUD3~%U}YdoV1E#vxa#4*?nRN1!f?f zrD>4@`bOuhQm!o1b9KkL&awe2upg~8q!d>=q>^}aPL`>fG?fWvZq(|gC%T5e$uZgN P0iz?1hWmXO6aWA_Y;!Kr literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SI7*5MJ}zJs%kwT0~-ZYy?RyzEIQP}DGU*5 z09hdsm;@F9S>ezD6agwu1c|r-MU)(X&d>rfKqAT@D-=Ku14Dpw1-2ouPOV8u`d PG2y}v4^}8co530Yef@ih diff --git a/data/images/cards/small/07s.gif b/data/images/cards/small/07s.gif index 90f452ee08afc000da200da80778f6e1ea28c99e..ef83bb6d81233810229ec8a30ef48e6bc4b4b89b 100644 GIT binary patch delta 100 zcmV-q0Gt1x1AGieNk%w1VIKe$0Pz5k3?NWV6ppFOU;(3?w1#7|hIsqgePYNV7D=H1 zcdi*4xuDrrvb5A`%Gh^2Yw&i#-i(NA{4UES^9g%`G|`yzMe~Wa)$P#h>4IYhrCBK` G0028>kS?wO literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqclYCIeQAakJF8#sj3TqM9IL$o_JfUM{Mi7-G! z96*-30Bv^yx(8&S;sKxt8;AjNAxK04IKo zKvn>42Qn1Emhyls1=~KO5UgKVjRo#!4u}XF$Q{U`Ak2gw3dDp9D?C`C3@rw00D!e{ A$N&HU diff --git a/data/images/cards/small/08c.gif b/data/images/cards/small/08c.gif index e719d46ed775800cc5685eb2287d58df766c44dd..d5d9a11131f438edf502a18d04f73ba3e2d18b7e 100644 GIT binary patch delta 102 zcmV-s0Ga=v1AYugNk%w1VIKe$0Pz5k3?NcZ6ppFOU;(3?w1#7|hIsqgePS4qAfTD( zRVA6qwaB}cv4rI{zH@zJy8Ldw1_j3A375xVvYB%BN>k;@;=)!%TJC7;y@ofzF~|T+ I0|f;DJMlL!0RR91 literal 415 zcmb7AJr05}6n+IH#W0jq6E=Z?!8kZ-T!Y`3Re+ z=?%+#1d!s!$H_I9b(<5ym@z!+M8@hy2w1}gL#q_in*offydx4|x@kzN0*hs_8f|9` z6&)H%q(p}*49x`^@{sx%xvilS(~#t{PAQc7sQfA{6nTG^aqA=0 CYIBJI diff --git a/data/images/cards/small/08d.gif b/data/images/cards/small/08d.gif index a5df71f7e82427b1421157fb0b4ce9730c7257b9..42e008d6bbaf02510ec2497a54fe7dcb1c60a490 100644 GIT binary patch delta 109 zcmV-z0FwWo1B3w#M@dFFIbk0F6#(%7kqjVMRUD3~%U}YdoV1E#vxa#4*?nRd1%YL5 zq;Rs7nPzL-mT+9nP|e=3wdzTHz8qjevk`F;ol99XB6rBBbV#i-DZ#Bxbrg-lVo$Jq PMQhILrlA3kI|=|hinuPZ literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDNIa9ASu5qkyVc&kB$TCsd?CNL6c!MBt($ zEl?4M4k1;y5RJg3Lr@VV2cR?5rf3)@!bB8+1}bY!Sz!PYQ3jeUxWJ{8OVte`A_#Ji z0MH6SQ7^Cv&_J`(E3g@B5Iy1@Pt;Q)HD6{L7Yp#j9JENFgKj-_H diff --git a/data/images/cards/small/08h.gif b/data/images/cards/small/08h.gif index ff7b20bd8dc27411691d85891c58fca82500c6fc..736c58df1a11b3422976a781ba5ea59c71e2bba3 100644 GIT binary patch delta 110 zcmV-!0FnQn1BC$$M@dFFIbk0F6#(%7kqjVNRveD0%U}YdoV1E#vxa#4*?nRd1;J#V zLTZsKq^{{~R<0V;v<;wesbf)GGE}hDli-v`p6|t+Wo|!XZJI1qjT_>X@1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDT~!msU zscKD;2uuQtfUI!n5K?su(FjZgiMRnplpKK0Py;eRBFZ2u6o3v>)|#SW2oeF=F1Wy@ zlS>t-7$gFAvjEWXf}%hv!$c>rFE~KX5CUm8TnP4;2nWzTt%5-9D+&!DUS&b^vnp2$ Ux(E}{dXmG19UiPuhBkvW0BQnzQUCw| diff --git a/data/images/cards/small/08s.gif b/data/images/cards/small/08s.gif index 46020572ae7f332100be82caafbd9e6ccf300efb..389ef8a3caba9a62c4a5a9dfe8800af34801b62c 100644 GIT binary patch delta 102 zcmV-s0Ga=v1AYugNk%w1VIKe$0Pz5k3?NcZ6ppFOU;(3?w1#7|hIsqgePS4qAfTD( zWtk_)RY|7C=Pa+1+vG4?YUqN$p>W7Su8cxT4M@beE=Ve^y2DNihtNYQiQkFc=3$jSC@0W73C^NAL|gF!%^Oj^T|QUDUg_FtB;k zpYMA2|Gmrgyg#%XSi_3}*4Gq@{OvOa9Ck#h5B#$daaL0ZVE$Eh2PpFb^%vpGY_fN=PKbU`e2Qn;A)b z8#*Qnl^TLE(ij&C58VxMF?5J6QDtOWMr2BPRDY*=ME>+=VM%bBh!d3K@4GCfvpTVb F;}2}QaFGB2 diff --git a/data/images/cards/small/09c.gif b/data/images/cards/small/09c.gif index 500e35c1e4d27089dfb4d5d8ad9e15d5dd669347..e5b2fa333ba6daa0abe6635caf454270b7eb21fe 100644 GIT binary patch delta 101 zcmV-r0Gj`w1APofNk%w1VIKe$0Pz5k3?NZX6ppFOU;(3?w1#7|hIsqgePS4qAfTD( zRVA6qwaB}cv4rI{zOz2p=v{=fQjlV@@rF#K@a9ZCpFrt}mNbgC*{#g`>4KNzlp%-? H3JL%_>Paxw literal 415 zcma)2F%E)25ZvXEfT1{Zn$QUpR~QRQjSVqGW5Ofg3I2eB!YA+?1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDNIa9ASu5qkyVc&kB$TCsd?CNL6c!MBt($ zEl?4M4k1;y5RJg3Lr@VVhfX0;uO1DBFaFM1s8yv>IM-J1i425 zWT~hZSOjRG*AxzrrCdM;P!~wCmk0;QQjpY&LIaR$RWBAaKdW-Jpo=h}hXOI-!VV8s JC_|gU8UQKZejoq< diff --git a/data/images/cards/small/09h.gif b/data/images/cards/small/09h.gif index f0943d12d25185173ea0670993e03de562b03955..d2573e95d87219a8870a93934a7cb3c2caf8ce37 100644 GIT binary patch delta 109 zcmV-z0FwWo1B3w#M@dFFIbk0F6#(%7kqjVMRUD3~%U}YdoV1E#vxa#4*?nRd1;J#V zLTZsKq^{{~R<0V;v<;wesbf)YKcKGFL)DBso+SorIxEoV5=nhlhe=@OiWQBz;*F~u PMr+P$kf8yOI|=|hUNJ4l literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYDT~!msU zscKD;2uuQtfUI!n5K?su(FjZgiMRnplpH#RM7@C8K_bc^D-?hZ6IGj{VF(fd*)F&M z|a literal 415 zcma)&u?~VT5QeWU5-<#yYQiQkbTAH%8W%!{#-tA+kKh|HF!%^Oj`58gUDUg_kig_k zf4=M8|M$+9)BaGeVFfP+SYJ~pvbV<=aM%*1KJd>nh|{70#yuzIy4%&yHk8Tqn&uI@mzakZW{)-$szN~tiKG}zaNXI= zNa8C+&2?f3#z)wNZn{VWIzlVK`aPWAf!BkK7k)(VCWP29K??pS%6CjNOZ!J zb>};uy+7=ht9nLLx-p@izR(o+n3*D4IMneJJtm3BH zXNJ=*LQ;)eU0mQ3dAUvGplU@8ggvsgLpd;+F0N;0zhZ;o(lq+GwVb*cC-1>W6h0x4 z9KljmW!h(kN*p1FPos0EQYI4!pU4v1YiFoTf^#f4K?yR5%o T2xoZ5H}%h7`ro&PW=`uDj>K_p diff --git a/data/images/cards/small/10d.gif b/data/images/cards/small/10d.gif index 2d8276a4f3d5757d866050a7af7c532cb322cfb2..38c5c1b021b0c42fb4b2f0e9363610cca8a1e634 100644 GIT binary patch delta 116 zcmV-)0E_>h1B(F+M@dFFIbk0F6#(%7kqjVTTpW(6%U}YdoV1E#vxa#4*?nRN1yW#A zs70>jd!i`_OmjL5vP_YBgaht)65kCr92RRQATmkhFr7$Yl4hgkuGnTZ=IWNh;TUTw W^7zu3HM`<|i{&gs1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SBOSnk`vGztsanpjRGKs;Ub`js2W(L0Vp+P zML?2ECzmi-#Gyk-)oqGI;6j&HPOylQ15h#09K%J2S|B0{K!+)N^#FB&MW$#7E&yr= znj;Yi76Cd#0O)u@RX33BKs7)Yas(`LX$6`Cv=k@;^p^-n;36PH)NP7JA;gJZENFgK X1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+SBOSnl2a#_u$PYn(7;9kRjnQk!$nT5oWg2g zkp>}Ettl%4l8&^1M1Yn$bO@=sO_2y(cnBoYqY%U}VcoV12xvxa#4*?nTjNhAkk zWSCxHTb*zVUx+0~w64UpTLLyHxnQax`^`#7rBcU4zCcjn@k*@SP+8T_lfZpNUh-&c O?xr`6rn@0100287k}k{u literal 415 zcmb7=u?@m75Jk@+L;qTf)B4P zp;eXuOLZZQV}`;jtiz{$r_iP3fR9C%NT&cSMw|vdh2-iA44t$Fh7RNG9EA=)nXzWW TgZ29gKE|JS8Gp{|ixur&D_?K; diff --git a/data/images/cards/small/11c.gif b/data/images/cards/small/11c.gif index c74404840926c17d399a6a8d91277999a779309a..63d58f509a2a695f0d39d30d7c793ba78c391035 100644 GIT binary patch delta 98 zcmV-o0GHGUOQ2gY1LG-CoK2*tr;5RvZDY1 EJGu@lO8@`> literal 415 zcmZ?wbhEHblxGlS_{hir1pmPR$WZ*r!pO+L#GnHb1<5lo{S)C3P;h8qU}R!}GPrzZ z7$hEQ;S^SbGMJUnMHpdHFg1*V=pqatDFFqLIZR;f4IE$*kjac-5vK-_6%ru37#YD< zIDjqfFi3Q2U=#$YQ9J+=;Q=zhE(D5z4ODXhGC(3gT>=RpE7(9%AYDKM1;CC+GLQpg y1qU<8g-`>5Rvc;oyRc9|0c-~gnxBQ)fOdclf_n_)AQTZ|!i5zctWbs)gEas}FLS{F diff --git a/data/images/cards/small/11d.gif b/data/images/cards/small/11d.gif index f27484a9f5e6d7a296882647589d8fde2d598be7..87a6a070914a35db79e9ada382f72e160f95403f 100644 GIT binary patch delta 109 zcmV-z0FwWo1B3w#M@dFFIbk0F6#(%7kqjVMRUD3~%U}YdoV1E#vxa#4*?nR-1*UaY zWQm%A3S=+ky3{Jod2LI0q=WEyz8I=B>~V~hpfCwy(wfBRRNw?Ei?meB@)LojVokVg PMQ_e(j-dgMI|=|hn7A*J literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE$}kaRj#dxIz(xVE2*_knHLyqn$chyKKoKrs zu!utkNJIjtxRnzuqT~Q_MhH;*p%#dU0@z_d?MYyfDH?(cz*YcV2o?caDgbu88&m{n zAP2|_K~azkfogyTig19f0J*0yFv$sI2Md~?Rk>QwMVNs4!A64&0x^gQ7j}5CLK)f& F)&ThjdGi1O diff --git a/data/images/cards/small/11h.gif b/data/images/cards/small/11h.gif index c90684d39dc5840de78c90f91027ff498ac5660b..5869651224717da1e1509436c8c7960622387d56 100644 GIT binary patch delta 109 zcmV-z0FwWo1B3w#M@dFFIbk0F6#(%7kqjVMRUD3~%U}YdoV1E#vxa#4*?nR-1*T*M zP)d;{n#QN(qOi=;K&D1`4BA1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYE$}rKTlS|mkM*?VIqX1ZBkxMJ5uo_sT0c6FB zfJH}IKq5d(9XdcFK*fhZB0U;`N)8}rgaD;LB5puuD1aRXlu81L0Id*Q020vxN`XW` zRtSI{4^j*i0U5{<02C1v1xf`bIe`om;Q+d)6|A^05a>jp5DS{0Rk>QwMVNs4Ne&lw Lc(6hl+6>kJ`%Zc8 diff --git a/data/images/cards/small/11s.gif b/data/images/cards/small/11s.gif index 1603694dd9813deb348f4187d16f9c671bce945f..603a48049bcbf54ce486237c3880466cabb62939 100644 GIT binary patch delta 100 zcmV-q0Gt1x1AGieNk%w1VIKe$0Pz5k3?NWV6ppFOU;(3?w1#7|hIsqgePRfbktw04 zrE);_QVAPZ^{Lo5ST6FON;P(^i?C6G9T`cUQFwWwro}37Gt-H-#ck7zy@El8p?N4M G002AnKq|KY literal 415 zcma)&F%E)25JhJI&1xvtsEM6GL18Q`H8#W;jfsblBX|P}3y4SzKYMAducw#Sz=pze6 z46T;WM1V*!g9sC1l-8&by9o5TddH~US)Qq*WT;WQm|H_Dy3s%X(rdrfiv?|e;k$B6 diff --git a/data/images/cards/small/12c.gif b/data/images/cards/small/12c.gif index d61caafeac43342a34ee977166184d0b25a55b5a..23fc782a662a48e16d3d9717dc53690a32a87885 100644 GIT binary patch delta 106 zcmV-w0G0or1AzeyM@dFFIbk0F6#(%7kqjVJQWTD<%U}VcoV12xvxa#4*?nRdB^C(+ zproc~*>Y6OAtz1C^`*XKeyKH5teKEOEE#tgA8yG4!dA+ebmx+qDle>P`u%jnRlFT=iS}3qLOK5leSoVLv;LiB-FQe~U IU9+bB2LZ8jW&i*H diff --git a/data/images/cards/small/12d.gif b/data/images/cards/small/12d.gif index bce5b44d239fbe5e0976a392a7980642ed2348a9..0d1c64583dfd2b5eb486cf4090723ac9df26faa6 100644 GIT binary patch delta 113 zcmV-%0FM8k1Bd|(M@dFFIbk0F6#(%7kqjVQSsae3%U}YdoV1E#vxa#4*?nRd1!j<$ z7Ac@*b-ExR$!{Io9DUb#t|RGMCE!USq{xiNNOEFh&U{d4j>3w1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYKFl=kU3gCAOjl(RK0)6ah+!Z~)!Y$_X@CqcAYZ3FK84u%AJyp`Pbz YfimDCOfV^!2r=Qp4i8o+Lz}@G0H>yUmjD0& diff --git a/data/images/cards/small/12h.gif b/data/images/cards/small/12h.gif index d0c51f18c95a12448c42b6e18b659d00173d01d3..e5f9b1028fbab3a84cb5c162c6d99de4e8f73fb4 100644 GIT binary patch delta 114 zcmV-&0FD2j1Bn3)M@dFFIbk0F6#(%7kqjVRS{#n4%U}YdoV1E#vxa#4*?nRd1!gdv zkO~5+gs$gowlEdbv|Zw|UXzewx8IJp@)>88p>jzSx_U1dt2w16aZzOHn(9g|K~aQc U)}YgtH5>chI2!c&VNd`7J8~p3;Q#;t literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(EYMYKFl=mrgEWFCPh@fsF#HUOgIt3td_{h1I|! z4MM7JK$909X#t4b6 zf(u+a1y#L5G{7Pt_XsRXv~mJX)+h{21bdYQ h>}O7peu(F}TA&QL2op>SCPGZOu)~8D%Ft%81^}t;dXfMD diff --git a/data/images/cards/small/12s.gif b/data/images/cards/small/12s.gif index 794926aff240243f2dec741f925a3e34feb897d9..185acebaa01581e3ae6427ece1fa7631a81d6a09 100644 GIT binary patch delta 103 zcmV-t0GR)u1Ah!hNk%w1VIKe$0Pz5k3?Nfb6ppFOU;(3?w1#7|hIsqgePS3T76}5N zq*5r`a&G!^@imu9Mc%T#aNT^kOT*X89g#!jF|{hej8rI%Xv@^9*ArIc1&_XBYgyx1 JsvCj=06UR@EoT4# literal 415 zcmb7=F%E)25JhJZ&0;9lpb4E|L18Sm)YuSXG$tOxJ%Tr&px_7`hj1fH8}-k!m`LYT zlQ%Pe{>=Gu+V0Gf7W5E=c-ugdK7Ap`qYYE8llPiSmE;8p&v(i6T5HpmL6o^Fo8 zm--$t8xlfEsvGNgcD#^LcC0m%PVi6!5i5fTVOQiRK}VSuewd_989+JKh8;3V&fMDs+_BZH MaWvNKgP;HaJ3=TiBme*a literal 415 zcma)2F%E)I3~dn!7>7^3CT;@5AB=;e#)S}~G5Lp(BY1;9FmMEpW4w{0i`rH&hRIGZ zudna5J)RERUA2Tc+!3f=QUub6j|d*DndLrs&snIF+yQ!i2PU@NRJS_PrURpF$Y9^< zH5d;W(8h06!akmiyHK05RqTwy6fV+%Z8!^2B61REC8ZY*W7eeCI+FBMHYA1(V;0NK z1k{Hlzs3VhtN=Go{enMI3rjiBSIFW*zVzzhCIi5XVpJpTCU1 JZ|%Se_HQ0Ab8r9v diff --git a/data/images/cards/small/13d.gif b/data/images/cards/small/13d.gif index 8cedbb1cb64ede36d786d09ece9748aa5fa0ade2..30c92f9d1bfd9debd1d809ce42b21676683fb64b 100644 GIT binary patch delta 116 zcmV-)0E_>h1B(F+M@dFFIbk0F6#(%7kqjVTTpW(6%U}YdoV1E#vxa#4*?nRt1ZH_w zDMgl1V417b!mcXM95BH)mCJ#665T5(jMQ#Dq>M&{wTp@Gjk3IIEpM>2f? literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+myd*DBFG%A9*}{J0;*m;8ipW~Mb*F}4M3?W z5+J*{gux;X9YU&ZV5wG4u!xcaP_Y}x_CqZY5e1-jWspb`SY(QZ-~ym_Rk#Sy83I59 z1>qt<7jgtFa%lyc4ABMjmk0;QKp|nENMT@-6UeJ9Xnt1ZYC#uaLJtLE!i60ktWbtF GgEatJfO(<- diff --git a/data/images/cards/small/13h.gif b/data/images/cards/small/13h.gif index 045609f23591151426ca8370f78bcde8c8eb8613..262e6616967cd633ab3646c68a713eb6822cd0e1 100644 GIT binary patch delta 113 zcmV-%0FM8k1Bd|(M@dFFIbk0F6#(%7kqjVQSsae3%U}YdoV1E#vxa#4*?nRt1ZH_g zW&o`eS*p@XyAsUCb4`Q5#LDe>sR&L8B))z#U6Qv1wkptQb4uw|aMxspWV7wQOwk8s TCa2Hkwc4$5H0Jcfpa1|nE3Put literal 415 zcmZ?wbhEHblxGlS_{hWn1pk2u3>1H|FfuYQGw6UsLGlbt|717>6dW2D7@1h048AEE zfs0%^g;c$u3|1#}5k{C4ObwGFx(I`+myd*DqDv>2FpvQ>uu(wOt4G6dkxMJ5uo_sT zK}c0=3Q+1u3rGZLsY8d5s#_0`aR?*=WGFdw3W>UbYzK*e7z#j#DT5eEAQ7OYf(w9F zsKP`*?hybwUJxb%@&!i#&{CkuAYD!%e~EB_3={$xSQrR&B2b70Xa};NRk>QwMVLVD SKvqLcxUj>670S?Num%8J$9bIq diff --git a/data/images/cards/small/13s.gif b/data/images/cards/small/13s.gif index b9a2689fb7fada99ff640b3d6e857bd4c4875933..ac26326fd0711298f4fa8c962d3d2b346dca13fd 100644 GIT binary patch delta 105 zcmV-v0G9us1AqYxM@dFFIbk0F6#(%7kqjVIQ524;%U}VcoV12xvxa#4*?nSoVMs-S z02r;P`?8mn&@eZ@HI=3Xi89G-{z}y2&vmlKM4W7pJ0gO&V~wv2 LGCbD|K>+|e`E4!s literal 415 zcma)&F%E)25JhKJB#W_FvYOBd6k8YzON|XNMq|PuEhLf15(*|+kd%oe4ab<1X;ua-c(;m_wcnY>IJ9qb46fkT7?6MNGVRam HiZvX5y1a4v diff --git a/data/images/demo/demo01.gif b/data/images/demo/demo01.gif index 86f637f20d8bbc7aa3d4f2939b76852c8fcb40c8..21de89f208479ffd952018d4606120e80b653de1 100644 GIT binary patch delta 9811 zcmWOA2_q8>0|4ONhmB@#LvznPN3&3Eu7-}0grd!@&=jI%v&}JAa}UX!sVGO~=$a#u z)JQo>xsr5E*Xym`eBbjko{uM2ecA%SFcky7i+H4%0aj)QIK0ekt?U%)@tjNi^6N;f z#lgbEkL)g!S+nG{n1~p^t3Gwh&BG%%uTEWO4CJWX{&x9R!H%n!4?2$HCK^|s)K+;- zU6^a!e>b4h$in~nVLvOTrfo>e!a%l?*}gr;aoZDD9~Xk*2dlb9cNZ5GUyZAN_q67@ zpkR;X7gFTIJT`D3@llD17hi4k;@;c0K31QfX+NwMU~}MP(s<&Fy?46T6NQGkA67dn zh(|65rhNULo%`v-bm#HY@AGim6FwIG*bF3l`Ca|i8nJLD8(n!bR=FphzvYdlUF4|W zW@SXr;oZ!><^D<|A*F6O31QSM4tbvZZO#FvJ4jFIe0J{W^?S;|}YZUdbFaZTxPAkOVt1Ay_&^_nQ)(5lXo;@>p@K%)F@gG^0K(kxBRtw9|2}qaRYq>cy`O_xlDW_#EH1%enHZQG^YFoy}k3# zT2kk}9ngKsr)eOs)lXEHc)Q2DUD}I>@u7JZt<8El`eptnY4eGLma^%2oFWyX)!hbG z-tzrgTE+cHWhdWA<^B<~{#E?5Ema@6A;y1>E@tcJ(;zzcRPVKqQGiRfeF{nMN^uxx z6?S7b!z|2O=Nl#jN)BE3p0jyKbR4v@p%UJDxnW@ z?Z(q{B|X{N%e(Jay`m^6eyq{o#9L=uMb&abi#Y&g2~a~__ndtnQ1{BE94251Z;5uV zQsCwy%0d(jRv*C@Le$=f+|*3R=Y6E?c!jqj7!IcEx`#yR-x;%5knB2XVpofBOQ3>t zq8FSisl)qY^=&<@vkpW>DT&`_Myap6{~-fWOjbDbzfOoEycTNm*gVzNUk?-{16I-6 zRbr1lJLj927m>VX+>g&RClGS?4eRFFr=Ww9W~wHlz?y_{x5gDvMQ~*}j_s>EWKJB$ zI@|-E?-gg*1?cXLZqidK5kv4z09rfETeTbT$Y%0~PA&mTUZKDpjKK;)2&U1N-0AR@ zf8|f4@^Fz9S7X1zP1N;-enpXZ5U<`2Zy%3~@YHHl#8Qe);!G{%uRINY-KmCs>r81e zaWfunb57<)+Fw-6r|Gl73UQ2MNMID#{v&o`E-%w=QRd#%tDaRVloj+2N81z?KD(f^ zbm<mI*&Rr`;~Ice1pwtD)F(jZm*wTqkcg1o2-bmk+xBaM)e4sCqPhP#?cw z=*+i@VW7f+a`c_B{s!nJ;#{!lDa9)x%X)KdL)LrL#NT93vFtFBz;frY3yaM>t(Qbt zQ#Mzg^*Dq4?qu}I;le|I64q->QdW#k{>pn|6sk4ZJ!E@LcQ$OJPPK=YVWg~r*pUo{ zUqZMOXTvq}Hi?GSdfFyIB4>>gc0ePAN2a|++q@n6F3BfJBhBvVf!rV=nBr-O`jgBT zl~g7WK%hXv*nkYtW2#c$wAacbT0vM#$l0u@!OaNWyn{O6`a}O--6K_=>0g6s&*I%p zlE?EtlWBH8#@ubVlc+FRB<{JtyVVizoZWvG3|P}Gmd)ccC;k1^ie+52ghoN&pYPj= zArO7ZV5tc<)M~c*5>Hf=cc^($^)?=M;i7lJt4D4&?2?5cyO!CaSl_iHYno+e3CA*~ zg6fnRDVF+(cBHd1ur)B-Mm0hhq;O$Nj>X8}J2AC_xpPUSyqj+b5WU{a->xXY@Chv4 z!(U74HdRC!0@6f7Rg^C;sJ3H^%^&;R2!_7N`S2``y^8J;^$3oh34jN?y3djz?o%khK>d3q*{g9}mHlNPEj3Y|Gm3vYw<^UL1#7 z5+{v--osAsMjmjtX=KNGR8Gv0ciWJ>WBG}iTT+^NTS=ecdoC?W!*CZ0th+7cl!Ow#BlwBA((jS~@Gw(_ZlSxpqwf7^)IuNK&k@H1F?Iq&|^tm8EDWYye9<}Dw+BYzL_A7h_XCyzXR zZjexS+h$uLYw&S8??MQFajbLN%}Uv_F+lH+seiny_E+i0F&_u*_tTJ@S6j{U-Ysm= zdb6?huNXm_r!qACruUp#$U9LIA!6T5P7yr}l0zxpIWW9>qOGw{|DrFCU=V^lucM3& zZ}1r!B@dy692k|XXMWEAt5MWC%!HP{h6n{?0b-7ldb+%M1%K+H;?FQ~k7C%avzx}Q zid65sH|%Mz--dxyi?6xPDwZ>MS*bOi3=Lhz<$=1_^GnwN^wwCq}+WR~Q$k z)ezGn{t4;ApV~EnZgr)R5H4L)=#3<_8B@MQPm7<4aRH%wq(FBDG?9g1DkAb^F*hg( znk*IZ%_4RlKKmBL4(y6;Au^YUYL_JrTuy`lkhb*B?S$&lx1_i~E@_GhsOP6LJEd58 zkk%Rn?Mz5^CE#1z(2G$ZQ*c9hX6jBtRoc&@^0Wh#?~op?mS?&5X;hUCxo)ZUDR<=SiTppqu8#9i zAzLb!flx;n%azLzIYQ*&4Ro0*+?@!XesCVp=4wQTL;(<@WX;HqR^nBNn>wX!e z(uga-%PIMC&?z|IgX64;=oiln+1ME(Mo+;4BjkOco7$c1O;SwRSZ+=JN>xM2r2krF6_ z_)x;-=0QU*ur2eU=Wi+me=kF)quP*w@V(dC43yl1+CTVPyhW<&H)dYQ-03XiITs}~0` z=i-o;(beUh%0f)>0d?A!h@_UacmvWchwG!dzF^=1z63@nY1UFfC1KCgl z(qc6w-LFhfB#Jp^)gzVD$bkhi+SPKQXkidO5N-;DNaouK z9`Y(&HcRy+s_imBjtMQdXwQyQbB=L0sqxMoc7`}pEC z)e|ObO-O%a9UgUCSo2DzI#`7m%7y=QWQ!Du05e7S$El+)q(~l!oMA>pob7_NVNc>w zcQN>fGI&mC&&yHpOd^Ob=`m?XJ|RXDQqZa)Dkruhri{QbEMy2CWRbqh=Ec$fGEm<} z|8KPS@mBWHoE@)* z>l`U?ybQYw6Y7vH|3s)0--D7!lL)pn*7zU$nDoH{Vd`}9slD8cP6u*2v;D#C;@ob#9T0%3%1pkX( zVzl^6qf>~3<-|e|1LV&_TziS7h;@~8U9JamEEB4R%2f#I=IdSx%}2IfxdS`OO8jpX z+d)C&>f{0D5g;c@FsHkHX2`5Bt)GRKipim;daC_~{qP7i_MKr|O9#XRHDxri%T%d~ z7*pdjrriy57Y88*fvOn5m_*+*ejw7^Ol#!4$VBzr{J>LuEcI1hXcW>srx7US&yf`P z^rl$p;GcmycM4pD7uvv6Zye{@`zz1l6|kH9y4wH*oe@S$!Yano79}H?pjcisz%m{+ zL|2|?$xrR14TaUgYz$26#h@GKOS+w zT**_|Uo#=M69=*P2bx zw!I=N>X|p^UaqKiwfCQgGC-ZJSWz{4iUW0Lk%nhsKP>>p^UyRplAs7#ay_cBeij~& zGQZMp@ct?5tCCcb&iVvZ{hZGh2>^nXXHLK21(_Cs((^0ws;fJgJ{;Sd0oA^^7CHuW zV4r-i%pygG2vkC$y^)|(gh&=~s||HWf-*kzD5+1Q=ir{0@4o%s=;>$Nt38#~c&O-K2r3PG2lFsX znS5DcmHT8h}S~frvOshg^#1x00B6pV=VSz+xrhf`4d=Owl&HF zS-1O$l6AB03(5z!PWaS=M@B3Z@cL{zZ*7mlRF{IPfs}vVLp~Bbipqv3T?M=<1t#4P zRtexC*W@~+AKf;clQYT5HbX{~emB4M&sN51XT$)N?VpX<>8P9s`s%&wS^>+uUanfy zE=c;nZI8-(z)U8rMJDRK2X+Uu zr(@}Q%W{luBq8cvI)b!3ggm+Sse7))pEw6f|KV6GpK@aCI3u?27j}U!ze7(BXr7tI z+J=7u^sA8*rpc#Yv<;SR0M&tR6nHr%%Q$`Id!xzWhJU>hK*vug#Xfy9NBQm7`KzU- z#8?s>ZK)vIlp$V!`S1JT-~0dwv-X_sbrgTsSDy{`-5C|I|2$yu;_D;327e&;*<`s{ zE;rflkAn4KIvpYa3p8<~S2bGm4usN&BqV~I(3}tIH{#}Xf>KL{&u?{znFavx_ z@+tOOUXYegPId%o6=S%{;TXj|;ELr{Ool#f0YN3~4# z@nZ$Jx1<`@yEoGm_48|@*87*5Q07}SV(S_|1Xk_Jw-g*RL>;nXGfu*K~}6I)XK}tnEoKTd4j$8HDvZ>xqfw(aUNQMVR|SqzTA9!j*0CS z9XmWwc^)wLEFfy?-i6%*GqzDpvF0~zD$1@nycj$(@K=+Wr8X~3l)K)9TM{lE*LP63 zBLM59){R>7oq7!PD<~6BQJa=%aofO76CQ@K3#`+yJ)#d*tHe zN~3GYSN$!OyV;H172y88E6h=HP$3q=>an({7t znr*6_j4KP*Ecqnfca3La@J96g0Gp^vu>M#P@0_|gFeD~U@YT#+GRi`)t?Mi94n%({ z3qAwHgA~FDi%7!7wrzu$c20k`UJ`2o!er+GXwV$DTYxWeEav2VcivY#?f#x+N2Q!L z7SYp3<1_9URMGYEr(xe==(>+0Ow;c9p2UOpxs3WkpSoi*tuW5WqbF1BK<^BmwwU1} z^wb3zwe~jr`08cmoP#%ayQF7K@^&?GE4ghM-EhQwRlU1q`!SD|s^gE=L8xHI*cjLs zJz{@)7Hphfy0B+^1J*A*{-zp`oZOEh&5G;g#apy`<+Qa(8G`47Q^ zpU(tp{|=9*etYORld`J-j)SNio!oZs(T#^smzs{(;(immKL}q&*q6r`JSp|4$pO|?C{YJfa@c%z;^>=kx$DZ_$pS8UzkV63J)1;?zT?TmBvpUhZ2*R z0x@zdTPJz|lf=!9pb5|HydYA*Me(<703FUrAr?jB@=Jy1Q`zxUM)y>|@UlQ5jZ>>| zuokc}vPI96m}$GJr{H*3POW>@(=171M%rMaz%LglUl@6YBxj#Wj$Vg5JeTD z752j*AO|$v#?s;s%agrPQT!#X5zJPd?r%^t;yle54{&t_WXD1WG%k)aO;|s#7)uv0 zIs@roC57ofu)?FZvteHq4?hKypHIbWGy19@Xr1hrMbl~n@ ztrfOrglj03;Afxm-k{)=(~#w4Pj2w?I%@hD53glSJVFi?u4cn*y%e)gru5~UFBw|w z7<%l052lRbYwrRU)oVAPi46z(f#C1j?IdrH?_SI(J%D0(T$ zw3QvIbiC=T98YVqzM|-H&gX03-#dCa*VxRl<1ci#BsGIG#P*_{tIF~^+x5-Ehm}c^ zkqb}g0&-KI%C(PPD#Gal+HoeJU2o@Af0~C`d`E(hKequ;8}?BZ^gLvLR!(W(?$ffX zrL(fZ+9Lq9n}3B_q`YibEn2vTWo6D0Eq(RH2Hj|)ZgyeL5Pb8mE+c5LHb2&GfUQwp z3L^$R%klcypmOb%`;9<55821~vs?}SzLY?Ct@cv|H1E*9n;Uyc{s%DUDIcrmLyPt< z$KqbfhRpe9|1U8#BSC1a^~W_kB8Dei^FRJ0*~LIXnJQ>))+B4y`e_HZDV0t#0RJgZ z^{n*Ysg5ByK-LYfg&QcM4*R+7Wluo!R{Bdjqzkz;rM!R^IlC?iG=bzzIi*~r^`dR) zL|0#aERCnW@u_-Wn^!dt{}tbU5@=WZY{!rF@06?OVqw1zludGDF2R3+ebD_n`edl7 zk+(Ck4EQ`2P_JTtulXcZb70w-Z92QEN!3bJ zgAPk-@+Ev@Cn}Og3Bm9fgXIs<5uS8CrIj(L-6YyMq5053a68{nhuL7NPchc#Kup3G zJVRvCgB#cg2Q>g=xCz0o9pUIsDsY5(ji zcAoo~`A=_rVZ=5zn7t<615RLJ8EwyF-4W##(}HU6Eejxy%g zde!mw0$hYo&$-1BNCQVO1K9nnzWcKrU~$4(auD{PC9U|vJV977&9_yg>ETycipxVE_rTx2U)KXv!N-`I)`Ffn9DY)aJ$lU=iB0F5>-&optuy& z3^k{jXBti2)m&uj2orZ_+Sm=)PTsad!#Csc?1n$Tv5V;gpM3Pw`kfv8ZTh-_0rMGL zm)8ecaO?AX0?-BM3BZ^>o>n!X7K-nw4Sa zKIx9c0IOr^E{pHA>_nIP2+$MYtk0&bB1^k;}KckJz>l5`==do`pgOlL158v^F~Ea{K3?qd&zD;>bMqWF{SDI4$~%f`nrMD_HuX-bM>)I1j`Yznfsh%6sUFn%+877nxJGO5*bor zfTD#tt)6(BZ*9wvV>p9yxV8%Povz(4P9(#*3b~*k$*)FkZdqc@oES zsba@LkL@)}@)?YZH_dGRrl&XMx1^Ygb55PiNt$&NSa%R|3}5v@-NhJE2yd5O?jCdn z$$#v)CvN}8(G&jHSxfdNC&dn{kk#poaOoX2>w8NdGafoYyg3CbF4+g8_o?^jj}Fua z`DW0`&b!;TSDNY7t^?S=2cuJQ`dH2Jk0y|Cx_%wl`f|_x+w5EWq+kOx0F=nhCp=BB z*ey}a@S;PPI*b2%UkeFrC)BBTY2_!Hml^&$-22@K{$JbDzbM?=zH?PlpJvxxoTq)O z8R0_wDUM?5pqyh*S;i}Apa1CoZoZ2Q>?Lf}b+cs*XG}@X-=_3;RtWSQxCVk!kcA-5 zt9)$UUE}!(8ys+R)9%yd8Ar(W26~?o7E0hcB%4UL-wPl>U#Dy-J0t)1vUrR+nzK;* zj`zghr0h+yw>ngAn+N^)gx8!0m2PmKbnvQcoq-w$L|ygnBlcb!~-OFr6pqs!X6HY&b%!xAw z%=#Jw)P8bC5{j=)SG9t^lBm2AW*_i;rD!hG@WO!i*r2k`UFeJkKQ{s0x{JDU2NKcP z8OlUE9JJizKvbQf6xqwZQq9$}&n2Y1IXMB=^gvHYu?9e`ClZ~Xv-Fb^;Q9???-L^ck7lE;3M zFZ!&4)$p&>n@_L*%6&ZpS`T?ulzmH}h^VyHB#?pl_ScW+UN}j*unV=Ba~~~0yYS#uJS2oD*@uCU2pTto4ikjwTi??x)z!(} ze!Iz4dTR)Vpc2&f`d1_7Kgr9!WC%5ir$+>aF3f~1aI{H4=15^vUm<>_urZ*r$y;fu zHs3-#`eROj!}I;fx45lf!ba)8Z-YNQSNs#s^Ynk^nSR%5I-QMs!VIu3Q$yo64e!2) z_0=|S|T{ddmPSOsxYHsY;5-H;sJlpu5gk8@^f|~y={5+?DkH){* z07QRR;x&fMX&-$!ty0_`<`tnspuDO}&b3p_ez*Yo5gy`{8gev&Kl}hhhAnC>g#AN% zGjJKax74;^|Gm{*hc;ekJnDQKWY-L|yjMN{S*0gyqUJ}jayIWVa{0q5 z;^wCkJ<{^K+B`MZa=Hdc{xA3Dxm+f+T&n!yc!$Lzb;s`Hx86D;T-1tS#IJr~KJI5l z6E-^mRvnv$Y6xs~px1fof{h+X%2JUDI_l2q*SbQITkpj!k39J4`&c xfWcEkI3~VW&0oRqYRX>#mixFydatY&k=_@lWh*1Viy8q`br1$p%>e)${|8D^{E`3w literal 14700 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 literal 14805 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 G@&5rnLNCk! diff --git a/data/images/demo/demo04.gif b/data/images/demo/demo04.gif index 914b8cc8ccd424cedbdc428ad54bdc827f1ab7f3..4557ef4d6742c4a276c92ec432a80f214704a82c 100644 GIT binary patch delta 9195 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
  • + img = self.viewer.symbols_img.get('disk') + if img: + self.text.image_create(index='insert', image=img, + padx=0, pady=0) + else: + self.write('*') + else: + self.write(data) + self.write(' ') + + def send_paragraph(self, blankline): + self.write('\n' * blankline) + + def send_line_break(self): + self.write('\n') + + def send_hor_rule(self, *args): + width = int(int(self.text["width"]) * 0.9) + self.write("_" * width) + self.write("\n") + + def send_literal_data(self, data): + self.write(data) + + def send_flowing_data(self, data): + self.write(data) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class tkHTMLParser(htmllib.HTMLParser): + def anchor_bgn(self, href, name, type): + self.formatter.flush_softspace() + htmllib.HTMLParser.anchor_bgn(self, href, name, type) + self.formatter.writer.anchor_bgn(href, name, type) + + def anchor_end(self): + if self.anchor: + self.anchor = None + self.formatter.writer.anchor_end() + + def do_dt(self, attrs): + self.formatter.end_paragraph(1) + self.ddpop() + + def handle_image(self, src, alt, ismap, align, width, height): + self.formatter.writer.viewer.showImage(src, alt, ismap, align, width, height) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class HTMLViewer: + symbols_fn = {} # filenames, loaded in Application.loadImages3 + symbols_img = {} + + def __init__(self, parent, app=None, home=None): + self.parent = parent + self.app = app + self.home = home + self.url = None + self.history = Struct( + list = [], + index = 0, + ) + self.visited_urls = [] + self.images = {} # need to keep a reference because of garbage collection + self.defcursor = parent["cursor"] + ##self.defcursor = 'xterm' + self.handcursor = "hand2" + + # create buttons + button_width = 8 + self.homeButton = Tkinter.Button(parent, text=_("Index"), + width=button_width, + command=self.goHome) + self.homeButton.grid(row=0, column=0, sticky='w') + self.backButton = Tkinter.Button(parent, text=_("Back"), + width=button_width, + command=self.goBack) + self.backButton.grid(row=0, column=1, sticky='w') + self.forwardButton = Tkinter.Button(parent, text=_("Forward"), + width=button_width, + command=self.goForward) + self.forwardButton.grid(row=0, column=2, sticky='w') + self.closeButton = Tkinter.Button(parent, text=_("Close"), + width=button_width, + command=self.destroy) + self.closeButton.grid(row=0, column=3, sticky='e') + + # create text widget + text_frame = Tkinter.Frame(parent) + text_frame.grid(row=1, column=0, columnspan=4, sticky='nsew') + vbar = Tkinter.Scrollbar(text_frame) + vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y) + self.text = Tkinter.Text(text_frame, + fg='black', bg='white', + bd=1, relief='sunken', + cursor=self.defcursor, + wrap='word', padx=20, pady=20) + self.text.pack(side=Tkinter.LEFT, fill=Tkinter.BOTH, expand=1) + self.text["yscrollcommand"] = vbar.set + vbar["command"] = self.text.yview + + # statusbar + self.statusbar = HtmlStatusbar(parent, row=2, column=0, columnspan=4) + + parent.columnconfigure(2, weight=1) + parent.rowconfigure(1, weight=1) + + # load images + for name, fn in self.symbols_fn.items(): + self.symbols_img[name] = self.getImage(fn) + + self.initBindings() + + def initBindings(self): + w = self.parent + bind(w, "WM_DELETE_WINDOW", self.destroy) + bind(w, "", self.destroy) + bind(w, "", self.page_up) + bind(w, "", self.page_down) + bind(w, "", self.unit_up) + bind(w, "", self.unit_down) + bind(w, "", self.scroll_top) + bind(w, "", self.scroll_top) + bind(w, "", self.scroll_bottom) + bind(w, "", self.goBack) + + def destroy(self, *event): + unbind_destroy(self.parent) + try: + self.parent.wm_withdraw() + except: pass + try: + self.parent.destroy() + except: pass + self.parent = None + + def _yview(self, *args): + apply(self.text.yview, args, {}) + return 'break' + + def page_up(self, *event): + return self._yview('scroll', -1, 'page') + def page_down(self, *event): + return self._yview('scroll', 1, 'page') + def unit_up(self, *event): + return self._yview('scroll', -1, 'unit') + def unit_down(self, *event): + return self._yview('scroll', 1, 'unit') + def scroll_top(self, *event): + return self._yview('moveto', 0) + def scroll_bottom(self, *event): + return self._yview('moveto', 1) + + # locate a file relative to the current self.url + def basejoin(self, url, baseurl=None, relpath=1): + if baseurl is None: + baseurl = self.url + if 0: + import urllib + url = urllib.pathname2url(url) + if relpath and self.url: + url = urllib.basejoin(baseurl, url) + else: + url = os.path.normpath(url) + if relpath and baseurl and not os.path.isabs(url): + h1, t1 = os.path.split(url) + h2, t2 = os.path.split(baseurl) + if cmp(h1, h2) != 0: + url = os.path.join(h2, h1, t1) + url = os.path.normpath(url) + return url + + def normurl(self, url, with_protocol=True): + for p in REMOTE_PROTOCOLS: + if url.startswith(p): + break + else: + url = self.basejoin(url) + if with_protocol: + if os.name == 'nt': + url = url.replace('\\', '/') + url = 'file://'+url + return url + + def openfile(self, url): + if url[-1:] == "/" or os.path.isdir(url): + url = os.path.join(url, "index.html") + url = os.path.normpath(url) + return open(url, "rb"), url + + def display(self, url, add=1, relpath=1, xview=0, yview=0): + # for some reason we have to stop the PySol demo + # (is this a multithread problem with Tkinter ?) + if self.app and self.app.game: + self.app.game.stopDemo() + ##self.app.game._cancelDrag() + ##pass + + # ftp: and http: would work if we use urllib, but this widget is + # far too limited to display anything but our documentation... + for p in REMOTE_PROTOCOLS: + if url.startswith(p): + if not openURL(url): + self.errorDialog(PACKAGE + _('''HTML limitation: +The %s protocol is not supported yet. + +Please use your standard web browser +to open the following URL: +%s +''') % (p, url)) + return + + # locate the file relative to the current url + url = self.basejoin(url, relpath=relpath) + + # read the file + try: + file = None + if 0: + import urllib + file = urllib.urlopen(url) + else: + file, url = self.openfile(url) + data = file.read() + file.close() + file = None + except Exception, ex: + if file: file.close() + self.errorDialog(_("Unable to service request:\n") + url + "\n\n" + str(ex)) + return + except: + if file: file.close() + self.errorDialog(_("Unable to service request:\n") + url) + return + + self.url = url + if self.home is None: + self.home = self.url + if add: + self.addHistory(self.url, xview=xview, yview=yview) + + ##print self.history.index, self.history.list + if self.history.index > 1: + self.backButton.config(state="normal") + else: + self.backButton.config(state="disabled") + if self.history.index < len(self.history.list): + self.forwardButton.config(state="normal") + else: + self.forwardButton.config(state="disabled") + + old_c1, old_c2 = self.defcursor, self.handcursor + self.defcursor = self.handcursor = "watch" + self.text.config(cursor=self.defcursor) + self.text.update_idletasks() + ##self.frame.config(cursor=self.defcursor) + ##self.frame.update_idletasks() + self.text.config(state="normal") + self.text.delete("1.0", "end") + ##self.images = {} + writer = tkHTMLWriter(self.text, self, self.app) + fmt = formatter.AbstractFormatter(writer) + parser = tkHTMLParser(fmt) + parser.feed(data) + parser.close() + self.text.config(state="disabled") + if 0.0 <= xview <= 1.0: + self.text.xview_moveto(xview) + if 0.0 <= yview <= 1.0: + self.text.yview_moveto(yview) + self.parent.wm_title(parser.title) + self.parent.wm_iconname(parser.title) + self.defcursor, self.handcursor = old_c1, old_c2 + self.text.config(cursor=self.defcursor) + ##self.frame.config(cursor=self.defcursor) + + def addHistory(self, url, xview=0, yview=0): + if not url in self.visited_urls: + self.visited_urls.append(url) + if self.history.index > 0: + u, xv, yv = self.history.list[self.history.index-1] + if cmp(u, url) == 0: + self.updateHistoryXYView() + return + del self.history.list[self.history.index : ] + self.history.list.append((url, xview, yview)) + self.history.index = self.history.index + 1 + + def updateHistoryXYView(self): + if self.history.index > 0: + url, xview, yview = self.history.list[self.history.index-1] + xview = self.text.xview()[0] + yview = self.text.yview()[0] + self.history.list[self.history.index-1] = (url, xview, yview) + + def goBack(self, *event): + if self.history.index > 1: + self.updateHistoryXYView() + self.history.index = self.history.index - 1 + url, xview, yview = self.history.list[self.history.index-1] + self.display(url, add=0, relpath=0, xview=xview, yview=yview) + + def goForward(self, *event): + if self.history.index < len(self.history.list): + self.updateHistoryXYView() + url, xview, yview = self.history.list[self.history.index] + self.history.index = self.history.index + 1 + self.display(url, add=0, relpath=0, xview=xview, yview=yview) + + def goHome(self, *event): + if self.home and cmp(self.home, self.url) != 0: + self.updateHistoryXYView() + self.display(self.home, relpath=0) + + def errorDialog(self, msg): + d = MfxMessageDialog(self.parent, title=PACKAGE+" HTML Problem", + text=msg, bitmap="warning", + strings=(_("&OK"),), default=0) + + def getImage(self, fn): + if self.images.has_key(fn): + return self.images[fn] + try: + img = Tkinter.PhotoImage(master=self.parent, file=fn) + except: + img = None + self.images[fn] = img + return img + + def showImage(self, src, alt, ismap, align, width, height): + url = self.basejoin(src) + img = self.getImage(url) + if img: + self.text.image_create(index="insert", image=img, padx=0, pady=0) + + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +def tkhtml_main(args): + try: + url = args[1] + except: + url = os.path.join(os.pardir, os.pardir, "data", "html", "index.html") + top = Tkinter.Tk() + top.wm_minsize(400, 200) + viewer = HTMLViewer(top) + viewer.app = None + viewer.display(url) + top.mainloop() + return 0 + +if __name__ == "__main__": + sys.exit(tkhtml_main(sys.argv)) + + diff --git a/pysollib/tile/tkstats.py b/pysollib/tile/tkstats.py new file mode 100644 index 00000000..48b3e640 --- /dev/null +++ b/pysollib/tile/tkstats.py @@ -0,0 +1,867 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['SingleGame_StatsDialog', + 'AllGames_StatsDialog', + 'FullLog_StatsDialog', + 'SessionLog_StatsDialog', + 'Status_StatsDialog', + 'Top_StatsDialog'] + +# imports +import os, string, sys, types +import time +import Tile as Tkinter +import tkFont + +# PySol imports +from pysollib.mfxutil import destruct, Struct, kwdefault, KwStruct +from pysollib.mfxutil import format_time +##from pysollib.util import * +from pysollib.stats import PysolStatsFormatter +from pysollib.settings import TOP_TITLE + +# Toolkit imports +from tkutil import bind, unbind_destroy, loadImage +from tkwidget import MfxDialog, MfxMessageDialog +from tkwidget import MfxScrolledCanvas + +gettext = _ + + +# FIXME - this file a quick hack and needs a rewrite + +# /*********************************************************************** +# // +# ************************************************************************/ + +class SingleGame_StatsDialog(MfxDialog): + def __init__(self, parent, title, app, player, gameid, **kw): + self.app = app + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.top_frame = top_frame + self.createBitmaps(top_frame, kw) + # + self.player = player or _("Demo games") + self.top.wm_minsize(200, 200) + self.button = kw.default + # + ##createChart = self.create3DBarChart + createChart = self.createPieChart + ##createChart = self.createSimpleChart +## if parent.winfo_screenwidth() < 800 or parent.winfo_screenheight() < 600: +## createChart = self.createPieChart +## createChart = self.createSimpleChart + # + self.font = self.app.getFont("default") + self.tk_font = tkFont.Font(self.top, self.font) + self.font_metrics = self.tk_font.metrics() + self._calc_tabs() + # + won, lost = app.stats.getStats(player, gameid) + createChart(app, won, lost, _("Total")) + won, lost = app.stats.getSessionStats(player, gameid) + createChart(app, won, lost, _("Current session")) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + # + # helpers + # + + def _calc_tabs(self): + # + font = self.tk_font + t0 = 160 + t = '' + for i in (_("Won:"), + _("Lost:"), + _("Total:")): + if len(i) > len(t): + t = i + t1 = font.measure(t) +## t1 = max(font.measure(_("Won:")), +## font.measure(_("Lost:")), +## font.measure(_("Total:"))) + t1 += 10 + ##t2 = font.measure('99999')+10 + t2 = 45 + ##t3 = font.measure('100%')+10 + t3 = 45 + tx = (t0, t0+t1+t2, t0+t1+t2+t3) + # + ls = self.font_metrics['linespace'] + ls += 5 + ls = max(ls, 20) + ty = (ls, 2*ls, 3*ls+15, 3*ls+25) + # + self.tab_x, self.tab_y = tx, ty + + def _getPwon(self, won, lost): + pwon, plost = 0.0, 0.0 + if won + lost > 0: + pwon = float(won) / (won + lost) + pwon = min(max(pwon, 0.00001), 0.99999) + plost = 1.0 - pwon + return pwon, plost + + def _createChartInit(self, text): + w, h = self.tab_x[-1]+20, self.tab_y[-1]+20 + c = Tkinter.Canvas(self.top_frame, width=w, height=h) + c.pack(side=Tkinter.TOP, fill=Tkinter.BOTH, expand=0, padx=20, pady=10) + self.canvas = c + ##self.fg = c.cget("insertbackground") + self.fg = c.option_get('foreground', '') or c.cget("insertbackground") + # + c.create_rectangle(2, 7, w, h, fill="", outline="#7f7f7f") + l = Tkinter.Label(c, text=text, font=self.font, bd=0, padx=3, pady=1) + dy = int(self.font_metrics['ascent']) - 10 + dy = dy/2 + c.create_window(20, -dy, window=l, anchor="nw") + + def _createChartTexts(self, tx, ty, won, lost): + c, tfont, fg = self.canvas, self.font, self.fg + pwon, plost = self._getPwon(won, lost) + # + x = tx[0] + dy = int(self.font_metrics['ascent']) - 10 + dy = dy/2 + c.create_text(x, ty[0]-dy, text=_("Won:"), anchor="nw", font=tfont, fill=fg) + c.create_text(x, ty[1]-dy, text=_("Lost:"), anchor="nw", font=tfont, fill=fg) + c.create_text(x, ty[2]-dy, text=_("Total:"), anchor="nw", font=tfont, fill=fg) + x = tx[1] - 16 + c.create_text(x, ty[0]-dy, text="%d" % won, anchor="ne", font=tfont, fill=fg) + c.create_text(x, ty[1]-dy, text="%d" % lost, anchor="ne", font=tfont, fill=fg) + c.create_text(x, ty[2]-dy, text="%d" % (won + lost), anchor="ne", font=tfont, fill=fg) + y = ty[2] - 11 + c.create_line(tx[0], y, x, y, fill=fg) + if won + lost > 0: + x = tx[2] + pw = int(round(100.0 * pwon)) + c.create_text(x, ty[0]-dy, text="%d%%" % pw, anchor="ne", font=tfont, fill=fg) + c.create_text(x, ty[1]-dy, text="%d%%" % (100-pw), anchor="ne", font=tfont, fill=fg) + + +## def _createChart3DBar(self, canvas, perc, x, y, p, col): +## if perc < 0.005: +## return +## # translate and scale +## p = list(p[:]) +## for i in (0, 1, 2, 3): +## p[i] = (x + p[i][0], y + p[i][1]) +## j = i + 4 +## dx = int(round(p[j][0] * perc)) +## dy = int(round(p[j][1] * perc)) +## p[j] = (p[i][0] + dx, p[i][1] + dy) +## # draw rects +## def draw_rect(a, b, c, d, col, canvas=canvas, p=p): +## points = (p[a][0], p[a][1], p[b][0], p[b][1], +## p[c][0], p[c][1], p[d][0], p[d][1]) +## canvas.create_polygon(points, fill=col) +## draw_rect(0, 1, 5, 4, col[0]) +## draw_rect(1, 2, 6, 5, col[1]) +## draw_rect(4, 5, 6, 7, col[2]) +## # draw lines +## def draw_line(a, b, canvas=canvas, p=p): +## ##print a, b, p[a], p[b] +## canvas.create_line(p[a][0], p[a][1], p[b][0], p[b][1]) +## draw_line(0, 1) +## draw_line(1, 2) +## draw_line(0, 4) +## draw_line(1, 5) +## draw_line(2, 6) +## ###draw_line(3, 7) ## test +## draw_line(4, 5) +## draw_line(5, 6) +## draw_line(6, 7) +## draw_line(7, 4) + + + # + # charts + # + +## def createSimpleChart(self, app, won, lost, text): +## #c, tfont, fg = self._createChartInit(frame, 300, 100, text) +## self._createChartInit(300, 100, text) +## c, tfont, fg = self.canvas, self.font, self.fg +## # +## tx = (90, 180, 210) +## ty = (21, 41, 75) +## self._createChartTexts(tx, ty, won, lost) + +## def create3DBarChart(self, app, won, lost, text): +## image = app.gimages.stats[0] +## iw, ih = image.width(), image.height() +## #c, tfont, fg = self._createChartInit(frame, iw+160, ih, text) +## self._createChartInit(iw+160, ih, text) +## c, tfont, fg = self.canvas, self.font, self.fg +## pwon, plost = self._getPwon(won, lost) +## # +## tx = (iw+20, iw+110, iw+140) +## yy = ih/2 ## + 7 +## ty = (yy+21-46, yy+41-46, yy+75-46) +## # +## c.create_image(0, 7, image=image, anchor="nw") +## # +## p = ((0, 0), (44, 6), (62, -9), (20, -14), +## (-3, -118), (-1, -120), (-1, -114), (-4, -112)) +## col = ("#00ff00", "#008200", "#00c300") +## self._createChart3DBar(c, pwon, 102, 145+7, p, col) +## p = ((0, 0), (49, 6), (61, -10), (15, -15), +## (1, -123), (3, -126), (4, -120), (1, -118)) +## col = ("#ff0000", "#860400", "#c70400") +## self._createChart3DBar(c, plost, 216, 159+7, p, col) +## # +## self._createChartTexts(tx, ty, won, lost) +## c.create_text(tx[0], ty[0]-48, text=self.player, anchor="nw", font=tfont, fill=fg) + + def createPieChart(self, app, won, lost, text): + #c, tfont, fg = self._createChartInit(frame, 300, 100, text) + # + self._createChartInit(text) + c, tfont, fg = self.canvas, self.font, self.fg + pwon, plost = self._getPwon(won, lost) + # + #tx = (160, 250, 280) + #ty = (21, 41, 75) + # + tx, ty = self.tab_x, self.tab_y + if won + lost > 0: + ##s, ewon, elost = 90.0, -360.0 * pwon, -360.0 * plost + s, ewon, elost = 0.0, 360.0 * pwon, 360.0 * plost + c.create_arc(20, 25+9, 110, 75+9, fill="#007f00", start=s, extent=ewon) + c.create_arc(20, 25+9, 110, 75+9, fill="#7f0000", start=s+ewon, extent=elost) + c.create_arc(20, 25, 110, 75, fill="#00ff00", start=s, extent=ewon) + c.create_arc(20, 25, 110, 75, fill="#ff0000", start=s+ewon, extent=elost) + x, y = tx[0] - 25, ty[0] + c.create_rectangle(x, y, x+10, y+10, fill="#00ff00") + y = ty[1] + c.create_rectangle(x, y, x+10, y+10, fill="#ff0000") + else: + c.create_oval(20, 25+10, 110, 75+10, fill="#7f7f7f") + c.create_oval(20, 25, 110, 75, fill="#f0f0f0") + c.create_text(65, 50, text=_("No games"), anchor="center", font=tfont, fill="#bfbfbf") + # + self._createChartTexts(tx, ty, won, lost) + + # + # + # + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), + (_("&All games..."), 102), + (TOP_TITLE+"...", 105), + (_("&Reset..."), 302)), default=0, + image=self.app.gimages.logos[5], + padx=10, pady=10, + ) + return MfxDialog.initKw(self, kw) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class CanvasWriter(PysolStatsFormatter.StringWriter): + def __init__(self, canvas, parent_window, font, w, h): + self.canvas = canvas + self.parent_window = parent_window + ##self.fg = canvas.cget("insertbackground") + self.fg = canvas.option_get('foreground', '') or canvas.cget("insertbackground") + self.font = font + self.w = w + self.h = h + self.x = self.y = 0 + self.gameid = None + self.gamenumber = None + self.canvas.config(yscrollincrement=h) + self._tabs = None + + def _addItem(self, id): + self.canvas.dialog.nodes[id] = (self.gameid, self.gamenumber) + + def p(self, s): + if self.y > 16000: + return + h1, h2 = 0, 0 + while s and s[0] == "\n": + s = s[1:] + h1 = h1 + self.h + while s and s[-1] == "\n": + s = s[:-1] + h2 = h2 + self.h + self.y = self.y + h1 + if s: + id = self.canvas.create_text(self.x, self.y, text=s, anchor="nw", + font=self.font, fill=self.fg) + self._addItem(id) + self.y = self.y + h2 + + def pheader(self, s): + pass + + def _calc_tabs(self, arg): + tw = 15*self.w + ##tw = 160 + self._tabs = [tw] + font = tkFont.Font(self.canvas, self.font) + for t in arg[1:]: + tw = font.measure(t)+20 + self._tabs.append(tw) + self._tabs.append(10) + + def pstats(self, *args, **kwargs): + gameid=kwargs.get('gameid', None) + header = False + if self._tabs is None: + # header + header = True + self._calc_tabs(args) + self.gameid = 'header' + self.gamenumber = None +## if False: +## sort_by = ( 'name', 'played', 'won', 'lost', +## 'time', 'moves', 'percent', ) +## frame = Tkinter.Frame(self.canvas) +## i = 0 +## for t in args: +## w = self._tabs[i] +## if i == 0: +## w += 10 +## b = Tkinter.Button(frame, text=t) +## b.grid(row=0, column=i, sticky='ew') +## b.bind('<1>', lambda e, f=self.parent_window.rearrange, s=sort_by[i]: f(s)) +## frame.columnconfigure(i, minsize=w) +## i += 1 +## self.canvas.create_window(0, 0, window=frame, anchor='nw') +## self.y += 20 +## return +## if False: +## i = 0 +## x = 0 +## for t in args: +## w = self._tabs[i] +## h = 18 +## anchor = 'ne' +## y = 0 +## self.canvas.create_rectangle(x+2, y, x+w, y+h, width=1, +## fill="#00ff00", outline="#000000") +## x += w +## self.canvas.create_text(x-3, y+3, text=t, anchor=anchor) +## i += 1 +## self.y += 20 +## return + + else: + self.gameid = gameid + self.gamenumber = None + if self.y > 16000: + return + x, y = 1, self.y + p = self._pstats_text + t1, t2, t3, t4, t5, t6, t7 = args + h = 0 + if not header: t1=gettext(t1) # game name + + for var, text, anchor, tab in ( + ('name', t1, 'nw', self._tabs[0]+self._tabs[1]), + ('played', t2, 'ne', self._tabs[2]), + ('won', t3, 'ne', self._tabs[3]), + ('lost', t4, 'ne', self._tabs[4]), + ('time', t5, 'ne', self._tabs[5]), + ('moves', t6, 'ne', self._tabs[6]), + ('percent', t7, 'ne', self._tabs[7]), ): + if header: self.gamenumber=var + h = max(h, p(x, y, anchor=anchor, text=text)) + x += tab + + self.pstats_perc(x, y, t7) + self.y += h + self.gameid = None + return + +## h = max(h, p(x, y, anchor="nw", text=t1)) +## if header: self.gamenumber='played' +## x += self._tabs[0]+self._tabs[1] +## h = max(h, p(x, y, anchor="ne", text=t2)) +## if header: self.gamenumber='won' +## x += self._tabs[2] +## h = max(h, p(x, y, anchor="ne", text=t3)) +## if header: self.gamenumber='lost' +## x += self._tabs[3] +## h = max(h, p(x, y, anchor="ne", text=t4)) +## if header: self.gamenumber='time' +## x += self._tabs[4] +## h = max(h, p(x, y, anchor="ne", text=t5)) +## if header: self.gamenumber='moves' +## x += self._tabs[5] +## h = max(h, p(x, y, anchor="ne", text=t6)) +## if header: self.gamenumber='percent' +## x += self._tabs[6] +## h = max(h, p(x, y, anchor="ne", text=t7)) +## x += self._tabs[7] +## self.pstats_perc(x, y, t7) +## self.y += h +## self.gameid = None + + def _pstats_text(self, x, y, **kw): + kwdefault(kw, font=self.font, fill=self.fg) + id = apply(self.canvas.create_text, (x, y), kw) + self._addItem(id) + return self.h + ##bbox = self.canvas.bbox(id) + ##return bbox[3] - bbox[1] + + def pstats_perc(self, x, y, t): + if not (t and "0" <= t[0] <= "9"): + return + perc = int(round(float(str(t)))) + if perc < 1: + return + rx, ry, rw, rh = x, y+1, 2 + 8*10, self.h-5 + if 1: + w = int(round(rw*perc/100.0)) + if 1 and w < 1: + return + if w > 0: + w = max(3, w) + w = min(rw - 2, w) + id = self.canvas.create_rectangle(rx, ry, rx+w, ry+rh, width=1, + fill="#00ff00", outline="#000000") + if w < rw: + id = self.canvas.create_rectangle(rx+w, ry, rx+rw, ry+rh, width=1, + fill="#ff0000", outline="#000000") + return + ##fill = "#ffffff" + ##fill = self.canvas["bg"] + fill = None + id = self.canvas.create_rectangle(rx, ry, rx+rw, ry+rh, width=1, + fill=fill, outline="#808080") + if 1: + rx, rw = rx + 1, rw - 1 + ry, rh = ry + 1, rh - 1 + w = int(round(rw*perc/100.0)) + if w > 0: + id = self.canvas.create_rectangle(rx, ry, rx+w, ry+rh, width=0, + fill="#00ff00", outline="") + if w < rw: + id = self.canvas.create_rectangle(rx+w, ry, rx+rw, ry+rh, width=0, + fill="#ff0000", outline="") + return + p = 1.0 + ix = rx + 2 + for i in (1, 11, 21, 31, 41, 51, 61, 71, 81, 91): + if perc < i: + break + ##c = "#ff8040" + r, g, b = 255, 128*p, 64*p + c = "#%02x%02x%02x" % (int(r), int(g), int(b)) + id = self.canvas.create_rectangle(ix, ry+2, ix+6, ry+rh-2, width=0, + fill=c, outline=c) + ix = ix + 8 + p = max(0.0, p - 0.1) + + def plog(self, gamename, gamenumber, date, status, gameid=-1, won=-1): + if gameid > 0 and "0" <= gamenumber[0:1] <= "9": + self.gameid = gameid + self.gamenumber = gamenumber + self.p("%-25s %-20s %17s %s\n" % (gamename, gamenumber, date, status)) + self.gameid = None + self.gamenumber = None + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class AllGames_StatsDialogScrolledCanvas(MfxScrolledCanvas): + pass + + +class AllGames_StatsDialog(MfxDialog): + # for font "canvas_fixed" + #CHAR_W, CHAR_H = 7, 16 + #if os.name == "mac": CHAR_W = 6 + # + YVIEW = 0 + FONT_TYPE = "default" + + def __init__(self, parent, title, app, player, **kw): + lines = 25 + #if parent and parent.winfo_screenheight() < 600: + # lines = 20 + # + self.font = app.getFont(self.FONT_TYPE) + font = tkFont.Font(parent, self.font) + self.font_metrics = font.metrics() + self.CHAR_H = self.font_metrics['linespace'] + self.CHAR_W = font.measure('M') + self.app = app + # + self.player = player + self.title = title + self.sort_by = 'name' + # + kwdefault(kw, width=self.CHAR_W*64, height=lines*self.CHAR_H) + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.top.wm_minsize(200, 200) + self.button = kw.default + # + self.sc = AllGames_StatsDialogScrolledCanvas(top_frame, + width=kw.width, height=kw.height) + self.sc.pack(fill=Tkinter.BOTH, expand=1, padx=kw.padx, pady=kw.pady) + # + self.nodes = {} + self.canvas = self.sc.canvas + self.canvas.dialog = self + bind(self.canvas, "<1>", self.singleClick) + self.fillCanvas(player, title) + bbox = self.canvas.bbox("all") + ##print bbox + ##self.canvas.config(scrollregion=bbox) + dx, dy = 4, 0 + self.canvas.config(scrollregion=(-dx,-dy,bbox[2]+dx,bbox[3]+dy)) + self.canvas.xview_moveto(-dx) + self.canvas.yview_moveto(self.YVIEW) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), + (_("&Save to file"), 202), + (_("&Reset all..."), 301),), + default=0, + resizable=1, + padx=10, pady=10, + #width=900, + ) + return MfxDialog.initKw(self, kw) + + def destroy(self): + self.app = None + self.canvas.dialog = None + self.nodes = {} + self.sc.destroy() + MfxDialog.destroy(self) + + def rearrange(self, sort_by): + if self.sort_by == sort_by: return + self.sort_by = sort_by + self.fillCanvas(self.player, self.title) + + def singleClick(self, event=None): + id = self.canvas.find_withtag(Tkinter.CURRENT) + if not id: + return + ##print id, self.nodes.get(id[0]) + gameid, gamenumber = self.nodes.get(id[0], (None, None)) + if gameid == 'header': + if self.sort_by == gamenumber: return + self.sort_by = gamenumber + self.fillCanvas(self.player, self.title) + return + ## FIXME / TODO + return + if gameid and gamenumber: + print gameid, gamenumber + elif gameid: + print gameid + + # + # + # + + def fillCanvas(self, player, header): + self.canvas.delete('all') + self.nodes = {} + a = PysolStatsFormatter(self.app) + #print 'CHAR_W:', self.CHAR_W + writer = CanvasWriter(self.canvas, self, + self.font, self.CHAR_W, self.CHAR_H) + if not a.writeStats(writer, player, header, sort_by=self.sort_by): + writer.p(_("No entries for player ") + player + "\n") + destruct(writer) + destruct(a) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class FullLog_StatsDialog(AllGames_StatsDialog): + YVIEW = 1 + FONT_TYPE = "fixed" + + def fillCanvas(self, player, header): + a = PysolStatsFormatter(self.app) + writer = CanvasWriter(self.canvas, self, self.font, self.CHAR_W, self.CHAR_H) + if not a.writeFullLog(writer, player, header): + writer.p(_("No log entries for %s\n") % player) + destruct(a) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), (_("Session &log..."), 104), (_("&Save to file"), 203)), default=0, + width=76*self.CHAR_W, + ) + return AllGames_StatsDialog.initKw(self, kw) + + +class SessionLog_StatsDialog(FullLog_StatsDialog): + def fillCanvas(self, player, header): + a = PysolStatsFormatter(self.app) + writer = CanvasWriter(self.canvas, self, self.font, self.CHAR_W, self.CHAR_H) + if not a.writeSessionLog(writer, player, header): + writer.p(_("No current session log entries for %s\n") % player) + destruct(a) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), (_("&Full log..."), 103), (_("&Save to file"), 204)), default=0, + ) + return FullLog_StatsDialog.initKw(self, kw) + +# /*********************************************************************** +# // +# ************************************************************************/ + +class Status_StatsDialog(MfxMessageDialog): + def __init__(self, parent, game): + stats, gstats = game.stats, game.gstats + w1 = w2 = "" + n = 0 + for s in game.s.foundations: + n = n + len(s.cards) + w1 = (_("Highlight piles: ") + str(stats.highlight_piles) + "\n" + + _("Highlight cards: ") + str(stats.highlight_cards) + "\n" + + _("Highlight same rank: ") + str(stats.highlight_samerank) + "\n") + if game.s.talon: + if game.gameinfo.redeals != 0: + w2 = w2 + _("\nRedeals: ") + str(game.s.talon.round - 1) + w2 = w2 + _("\nCards in Talon: ") + str(len(game.s.talon.cards)) + if game.s.waste and game.s.waste not in game.s.foundations: + w2 = w2 + _("\nCards in Waste: ") + str(len(game.s.waste.cards)) + if game.s.foundations: + w2 = w2 + _("\nCards in Foundations: ") + str(n) + # + date = time.strftime("%Y-%m-%d %H:%M", time.localtime(game.gstats.start_time)) + MfxMessageDialog.__init__(self, parent, title=_("Game status"), + text=game.getTitleName() + "\n" + + game.getGameNumber(format=1) + "\n" + + _("Playing time: ") + game.getTime() + "\n" + + _("Started at: ") + date + "\n\n"+ + _("Moves: ") + str(game.moves.index) + "\n" + + _("Undo moves: ") + str(stats.undo_moves) + "\n" + + _("Bookmark moves: ") + str(gstats.goto_bookmark_moves) + "\n" + + _("Demo moves: ") + str(stats.demo_moves) + "\n" + + _("Total player moves: ") + str(stats.player_moves) + "\n" + + _("Total moves in this game: ") + str(stats.total_moves) + "\n" + + _("Hints: ") + str(stats.hints) + "\n" + + "\n" + + w1 + w2, + strings=(_("&OK"), + (_("&Statistics..."), 101), + (TOP_TITLE+"...", 105), ), + image=game.app.gimages.logos[3], + image_side="left", image_padx=20, + padx=20, + ) + +# /*********************************************************************** +# // +# ************************************************************************/ + +class _TopDialog(MfxDialog): + def __init__(self, parent, title, top, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + cnf = {'master': top_frame, + 'highlightthickness': 1, + 'highlightbackground': 'black', + } + frame = apply(Tkinter.Frame, (), cnf) + frame.pack(expand=Tkinter.YES, fill=Tkinter.BOTH, padx=10, pady=10) + frame.columnconfigure(0, weight=1) + cnf['master'] = frame + cnf['text'] = _('N') + l = apply(Tkinter.Label, (), cnf) + l.grid(row=0, column=0, sticky='ew') + cnf['text'] = _('Game number') + l = apply(Tkinter.Label, (), cnf) + l.grid(row=0, column=1, sticky='ew') + cnf['text'] = _('Started at') + l = apply(Tkinter.Label, (), cnf) + l.grid(row=0, column=2, sticky='ew') + cnf['text'] = _('Result') + l = apply(Tkinter.Label, (), cnf) + l.grid(row=0, column=3, sticky='ew') + + row = 1 + for i in top: + # N + cnf['text'] = str(row) + l = apply(Tkinter.Label, (), cnf) + l.grid(row=row, column=0, sticky='ew') + # Game number + cnf['text'] = '#'+str(i.game_number) + l = apply(Tkinter.Label, (), cnf) + l.grid(row=row, column=1, sticky='ew') + # Start time + t = time.strftime('%Y-%m-%d %H:%M', time.localtime(i.game_start_time)) + cnf['text'] = t + l = apply(Tkinter.Label, (), cnf) + l.grid(row=row, column=2, sticky='ew') + # Result + if isinstance(i.value, float): + # time + s = format_time(i.value) + else: + # moves + s = str(i.value) + cnf['text'] = s + l = apply(Tkinter.Label, (), cnf) + l.grid(row=row, column=3, sticky='ew') + row += 1 + + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + + def initKw(self, kw): + kw = KwStruct(kw, strings=(_('&OK'),), default=0, separatorwidth=2) + return MfxDialog.initKw(self, kw) + + +class Top_StatsDialog(MfxDialog): + def __init__(self, parent, title, app, player, gameid, **kw): + self.app = app + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + frame = Tkinter.Frame(top_frame) + frame.pack(expand=Tkinter.YES, fill=Tkinter.BOTH, padx=5, pady=10) + frame.columnconfigure(0, weight=1) + + if (app.stats.games_stats.has_key(player) and + app.stats.games_stats[player].has_key(gameid) and + app.stats.games_stats[player][gameid].time_result.top): + + Tkinter.Label(frame, text=_('Minimum')).grid(row=0, column=1) + Tkinter.Label(frame, text=_('Maximum')).grid(row=0, column=2) + Tkinter.Label(frame, text=_('Average')).grid(row=0, column=3) + ##Tkinter.Label(frame, text=_('Total')).grid(row=0, column=4) + + s = app.stats.games_stats[player][gameid] + row = 1 + ll = [ + (_('Playing time:'), + format_time(s.time_result.min), + format_time(s.time_result.max), + format_time(s.time_result.average), + format_time(s.time_result.total), + s.time_result.top, + ), + (_('Moves:'), + s.moves_result.min, + s.moves_result.max, + round(s.moves_result.average, 2), + s.moves_result.total, + s.moves_result.top, + ), + (_('Total moves:'), + s.total_moves_result.min, + s.total_moves_result.max, + round(s.total_moves_result.average, 2), + s.total_moves_result.total, + s.total_moves_result.top, + ), + ] +## if s.score_result.min: +## ll.append(('Score:', +## s.score_result.min, +## s.score_result.max, +## round(s.score_result.average, 2), +## s.score_result.top, +## )) +## if s.score_casino_result.min: +## ll.append(('Casino Score:', +## s.score_casino_result.min, +## s.score_casino_result.max, +## round(s.score_casino_result.average, 2), )) + for l, min, max, avr, tot, top in ll: + Tkinter.Label(frame, text=l).grid(row=row, column=0) + Tkinter.Label(frame, text=str(min)).grid(row=row, column=1) + Tkinter.Label(frame, text=str(max)).grid(row=row, column=2) + Tkinter.Label(frame, text=str(avr)).grid(row=row, column=3) + ##Tkinter.Label(frame, text=str(tot)).grid(row=row, column=4) + b = Tkinter.Button(frame, text=TOP_TITLE+' ...', width=10, + command=lambda top=top: self.showTop(top)) + b.grid(row=row, column=5) + row += 1 + else: + Tkinter.Label(frame, text=_('No TOP for this game')).pack() + + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + def showTop(self, top): + #print top + d = _TopDialog(self.top, TOP_TITLE, top) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_('&OK'),), + default=0, + image=self.app.gimages.logos[4], + separatorwidth=2, + ) + return MfxDialog.initKw(self, kw) diff --git a/pysollib/tile/tktree.py b/pysollib/tile/tktree.py new file mode 100644 index 00000000..fe65d7f5 --- /dev/null +++ b/pysollib/tile/tktree.py @@ -0,0 +1,423 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +# imports +import os, string, types +import Tile as Tkinter + +# Toolkit imports +from tkutil import bind +from tkwidget import MfxScrolledCanvas + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxTreeBaseNode: + def __init__(self, tree, parent_node, text, key): + self.tree = tree + self.parent_node = parent_node + self.text = text + self.key = key + # state + self.selected = 0 + self.subnodes = None + # canvas item ids + self.symbol_id = None + self.text_id = None + self.textrect_id = None + + def registerKey(self): + if self.key is not None: + l = self.tree.keys.get(self.key, []) + l.append(self) + self.tree.keys[self.key] = l + + def whoami(self): + if self.parent_node is None: + return (self.text, ) + else: + return self.parent_node.whoami() + (self.text, ) + + def draw(self, x, y, lastx=None, lasty=None): + canvas, style = self.tree.canvas, self.tree.style + topleftx = x + style.distx + toplefty = y - style.height / 2 #+++ + # draw the horizontal line + if lastx is not None: + canvas.create_line(x, y, topleftx, y, stipple=style.linestyle, fill=style.linecolor) + # draw myself - ugly, ugly... + self.selected = 0 + self.symbol_id = -1 + self.drawSymbol(topleftx, toplefty) + linestart = style.distx + style.width + 5 + self.text_id = -1 + self.drawText(x + linestart, y) + return x, y, x, y + style.disty + + # + # + # + + def drawText(self, x, y): + canvas, style = self.tree.canvas, self.tree.style + if self.selected: + fg, bg = style.text_selected_fg, style.text_selected_bg + else: + fg, bg = style.text_normal_fg, style.text_normal_bg + # + if self.tree.nodes.get(self.text_id) is self: + canvas.itemconfig(self.text_id, fill=fg) + else: + # note: I don't use Label + canvas.create_window here + # because it doesn't propagate events to the canvas + # and has some other re-display annoyances + ##print 'style.font:', style.font + self.text_id = canvas.create_text(x+1, y, text=self.text, + anchor="w", justify="left", + font=style.font, + fill=fg) + self.tree.nodes[self.text_id] = self + # + if self.tree.nodes.get(self.textrect_id) is self: + try: + # _tkinter.TclError: unknown option "-fill" ??? + canvas.itemconfig(self.textrect_id, fill=bg) + except Tkinter.TclError: + pass + elif self.selected: + b = canvas.bbox(self.text_id) + self.textrect_id = canvas.create_rectangle(b[0]-1, b[1]-1, b[2]+1, b[3]+1, + fill=bg, outline="") + canvas.tag_lower(self.textrect_id, self.text_id) + self.tree.nodes[self.textrect_id] = self + + def updateText(self): + if self.tree.nodes.get(self.text_id) is self: + self.drawText(-1, -1) + + # + # + # + + def drawSymbol(self, x, y, **kw): + canvas, style = self.tree.canvas, self.tree.style + color = kw.get("color") + if color is None: + if self.selected: + color = "darkgreen" + else: + color = "green" + # note: rectangle outline is one pixel + if self.tree.nodes.get(self.symbol_id) is self: + canvas.itemconfig(self.symbol_id, fill=color) + else: + self.symbol_id = canvas.create_rectangle( + x+1, y+1, x + style.width, y + style.height, fill=color) + self.tree.nodes[self.symbol_id] = self + + def updateSymbol(self): + if self.tree.nodes.get(self.symbol_id) is self: + self.drawSymbol(-1, -1) + + +# /*********************************************************************** +# // Terminal and non-terminal nodes +# ************************************************************************/ + +class MfxTreeLeaf(MfxTreeBaseNode): + def drawText(self, x, y): + if self.text_id < 0: + self.registerKey() + MfxTreeBaseNode.drawText(self, x, y) + + +class MfxTreeNode(MfxTreeBaseNode): + def __init__(self, tree, parent_node, text, key, expanded=0): + MfxTreeBaseNode.__init__(self, tree, parent_node, text, key) + self.expanded = expanded + + def drawChildren(self, x, y, lastx, lasty): + # get subnodes + self.subnodes = self.tree.getContents(self) + # draw subnodes + lx, ly = lastx, lasty + nx, ny = x, y + for node in self.subnodes: + # update tree + node.tree = self.tree + # draw node + lx, ly, nx, ny = node.draw(nx, ny, lx, ly) + # draw the vertical line + if self.subnodes: + style = self.tree.style + dy = (style.disty-style.width)/2 + y = y-style.disty/2-dy + self.tree.canvas.create_line(x, y, nx, ly, + stipple=style.linestyle, + fill=style.linecolor) + return ny + + + def draw(self, x, y, ilastx=None, ilasty=None): + # draw myself + lx, ly, nx, ny = MfxTreeBaseNode.draw(self, x, y, ilastx, ilasty) + if self.expanded: + style = self.tree.style + childx = nx + style.distx + style.width / 2 + childy = ny + clastx = nx + style.distx + style.width / 2 + clasty = ly + style.height /2 + ny = self.drawChildren(childx, childy, clastx, clasty) + return lx, ly, x, ny + + # + # + # + + def drawSymbol(self, x, y, **kw): + color = kw.get("color") + if color is None: + if self.expanded: + color = "red" + else: + color = "pink" + MfxTreeBaseNode.drawSymbol(self, x, y, color=color) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxTreeInCanvas(MfxScrolledCanvas): + class Style: + def __init__(self): + self.distx = 16 + self.disty = 18 + self.width = 16 # width of symbol + self.height = 16 # height of symbol + self.originx = 0 + self.originy = 0 + self.text_normal_fg = "black" + self.text_normal_bg = "white" + self.text_selected_fg = "white" + self.text_selected_bg = "#00008b" # "darkblue" + self.font = None + self.linestyle = "gray50" + self.linecolor = "black" + if os.name == "nt": + self.linestyle = "" # Tk bug ? + self.linecolor = "gray50" + + def __init__(self, parent, rootnodes, **kw): + kw['bd'] = 0 + kw['bg'] = 'white' + apply(MfxScrolledCanvas.__init__, (self, parent,), kw) + # + self.rootnodes = rootnodes + self.updateNodesWithTree(self.rootnodes, self) + self.selection_key = None + self.nodes = {} + self.keys = {} + # + self.style = self.Style() + ##self.style.text_normal_fg = self.canvas.cget("insertbackground") + self.style.text_normal_fg = self.canvas.option_get('foreground', '') or self.canvas.cget("insertbackground") + self.style.text_normal_bg = self.canvas.option_get('background', self.canvas.cget("background")) + # + bind(self.canvas, "", self.singleClick) + bind(self.canvas, "", self.doubleClick) + ##bind(self.canvas, "", xxx) + self.pack(fill=Tkinter.BOTH, expand=1) + + def destroy(self): + for node in self.keys.get(self.selection_key, []): + node.selected = 0 + MfxScrolledCanvas.destroy(self) + + def findNode(self, event=None): + id = self.canvas.find_withtag(Tkinter.CURRENT) + if id: + return self.nodes.get(id[0]) + return None + + # + # draw nodes + # + + def draw(self): + nx, ny = self.style.originx, self.style.originy + # Account for initial offsets, see topleft[xy] in BaseNode.draw(). + # We do this so that our bounding box always starts at (0,0) + # and the yscrollincrement works nicely. + nx = nx - self.style.distx + ny = ny + self.style.height / 2 + for node in self.rootnodes: + # update tree + node.tree = self + # draw + try: + lx, ly, nx, ny = node.draw(nx, ny, None, None) + except Tkinter.TclError: + # FIXME: Tk bug ??? + raise + # set scroll region + bbox = self.canvas.bbox("all") + ##self.canvas.config(scrollregion=bbox) + self.canvas.config(scrollregion=(0,0,bbox[2],bbox[3])) + self.canvas.config(yscrollincrement=self.style.disty) + + def clear(self): + self.nodes = {} + self.keys = {} + self.canvas.delete("all") + + def redraw(self): + oldcur = self.canvas["cursor"] + self.canvas["cursor"] = "watch" + self.canvas.update_idletasks() + self.clear() + self.draw() + self.updateSelection(self.selection_key) + self.canvas["cursor"] = oldcur + + # + # + # + + def getContents(self, node): + # Overload this, supposed to return a list of subnodes of node. + pass + + def singleClick(self, event=None): + # Overload this if you want to know when a node is clicked on. + pass + + def doubleClick(self, event=None): + # Overload this if you want to know when a node is d-clicked on. + self.singleClick(event) + + # + # + # + + def updateSelection(self, key): + l1 = self.keys.get(self.selection_key, []) + l2 = self.keys.get(key, []) + for node in l1: + if node.selected and not node in l2: + node.selected = 0 + node.updateSymbol() + node.updateText() + for node in l2: + if not node.selected: + node.selected = 1 + node.updateSymbol() + node.updateText() + self.selection_key = key + + def updateNodesWithTree(self, nodes, tree): + for node in nodes: + node.tree = tree + if node.subnodes: + self.updateNodesWithTree(node.subnodes, tree) + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +class DirectoryBrowser(MfxTreeInCanvas): + def __init__(self, parent, dirs): + nodes = [] + if type(dirs) is types.StringType: + dirs = (dirs,) + for dir in dirs: + self.addNode(nodes, None, dir, dir) + # note: best results if height is a multiple of style.disty + MfxTreeInCanvas.__init__(self, parent, nodes, height=25*18) + self.draw() + + def addNode(self, list, node, filename, text): + try: + if os.path.isdir(filename): + list.append(MfxTreeNode(self, node, text, key=filename)) + else: + list.append(MfxTreeLeaf(self, node, text, key=filename)) + except EnvironmentError: + pass + + def getContents(self, node): + # use cached values + if node.subnodes is not None: + return node.subnodes + # + dir = node.key + print "Getting %s" % dir + try: + filenames = os.listdir(dir) + filenames.sort() + except EnvironmentError: + return () + contents = [] + for filename in filenames: + self.addNode(contents, node, os.path.join(dir, filename), filename) + ##print "gotten" + return contents + + def singleClick(self, event=None): + node = self.findNode(event) + if not node: + return + print "Clicked node %s %s" % (node.text, node.key) + if isinstance(node, MfxTreeLeaf): + self.updateSelection(key=node.key) + elif isinstance(node, MfxTreeNode): + node.expanded = not node.expanded + self.redraw() + return "break" + + +if __name__ == "__main__": + tk = Tkinter.Tk() + if os.name == "nt": + app = DirectoryBrowser(tk, ("c:\\", "c:\\windows")) + else: + app = DirectoryBrowser(tk, ("/", "/home")) + tk.mainloop() + + diff --git a/pysollib/tile/tkutil.py b/pysollib/tile/tkutil.py new file mode 100644 index 00000000..6321d0de --- /dev/null +++ b/pysollib/tile/tkutil.py @@ -0,0 +1,410 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['wm_withdraw', + 'wm_deiconify', + 'wm_map', + 'wm_set_icon', + 'wm_get_geometry', + #'setTransient', + #'makeToplevel', + 'make_help_toplevel', + 'bind', + 'unbind_destroy', + 'after', + 'after_idle', + 'after_cancel', + #'makeImage', + 'copyImage', + 'loadImage', + #'fillImage', + 'createImage', + 'get_text_width', + ] + +# imports +import sys, os, re +import traceback +import Tile as Tkinter +from tkFont import Font +try: + # PIL + import Image + import ImageTk +except ImportError: + Image = None + +# Toolkit imports +from tkconst import tkversion +from pysollib.settings import PACKAGE +from pysollib.settings import TILE_THEME + + +# /*********************************************************************** +# // window manager util +# ************************************************************************/ + +def wm_withdraw(window): + window.wm_withdraw() + +def wm_deiconify(window): + need_fix = os.name == "nt" and tkversion < (8, 3, 0, 0) + if need_fix: + # FIXME: This is needed so the window pops up on top on Windows. + try: + window.wm_iconify() + window.update_idletasks() + except Tkinter.TclError: + # wm_iconify() may fail if the window is transient + pass + window.wm_deiconify() + +def wm_map(window, maximized=0): + if window.wm_state() != "iconic": + if maximized and os.name == "nt": + window.wm_state("zoomed") + else: + wm_deiconify(window) + +def wm_set_icon(window, filename): + if not filename: + return + if os.name == "posix": + window.wm_iconbitmap("@" + filename) + window.wm_iconmask("@" + filename) + +__wm_get_geometry_re = re.compile(r"^(\d+)x(\d+)\+([\-]?\d+)\+([\-]?\d+)$") + +def wm_get_geometry(window): + g = window.wm_geometry() + m = __wm_get_geometry_re.search(g) + if not m: + raise Tkinter.TclError, "invalid geometry " + str(g) + l = map(int, m.groups()) + if window.wm_state() == "zoomed": + # workaround as Tk returns the "unzoomed" origin + l[2] = l[3] = 0 + return l + + +# /*********************************************************************** +# // window util +# ************************************************************************/ + +def setTransient(window, parent, relx=None, rely=None, expose=1): + # Make an existing toplevel window transient for a parent. + # + # The window must exist but should not yet have been placed; in + # other words, this should be called after creating all the + # subwidget but before letting the user interact. + + # remain invisible while we figure out the geometry + window.wm_withdraw() + window.wm_group(parent) + need_fix = os.name == "nt" and tkversion < (8, 3, 0, 0) + if need_fix: + # FIXME: This is needed to avoid ugly frames on Windows. + window.wm_geometry("+%d+%d" % (-10000, -10000)) + if expose and parent is not None: + # FIXME: This is needed so the window pops up on top on Windows. + window.wm_iconify() + if parent and parent.wm_state() != "withdrawn": + window.wm_transient(parent) + # actualize geometry information + window.update_idletasks() + # show + x, y = __getWidgetXY(window, parent, relx=relx, rely=rely) + if need_fix: + if expose: + wm_deiconify(window) + window.wm_geometry("+%d+%d" % (x, y)) + else: + window.wm_geometry("+%d+%d" % (x, y)) + if expose: + window.wm_deiconify() + +def makeToplevel(parent, title=None): + # Create a Toplevel window. + # + # This is a shortcut for a Toplevel() instantiation plus calls to + # set the title and icon name of the window. + window = Tkinter.Toplevel(parent) #, class_=PACKAGE) + ##window.wm_group(parent) + ##window.wm_command("") + if os.name == "posix": + window.wm_command("/bin/true") + ##window.wm_protocol("WM_SAVE_YOURSELF", None) + if title: + window.wm_title(title) + window.wm_iconname(title) + return window + +def make_help_toplevel(app, title=None): + # Create an independent Toplevel window. + parent = app.top + window = Tkinter.Tk(className=PACKAGE) + window.tk.call('package', 'require', 'tile') + if TILE_THEME: + ##window.tk.call('style', 'theme', 'use', TILE_THEME) + style = Tkinter.Style(window) + style.theme_use(TILE_THEME) + font = parent.option_get('font', '') + if font: + window.option_add('*font', font) + fg, bg = app.top_palette + if bg: + window.tk_setPalette(bg) + if fg: + window.option_add('*foreground', fg) + window.option_add('*selectBackground', '#00008b', 50) + window.option_add('*selectForeground', 'white', 50) + if os.name == "posix": + window.option_add('*Scrollbar.elementBorderWidth', '1', 60) + window.option_add('*Scrollbar.borderWidth', '1', 60) + + if title: + window.wm_title(title) + window.wm_iconname(title) + return window + + +def __getWidgetXY(widget, parent, relx=None, rely=None, + w_width=None, w_height=None): + min_width, min_height = widget.wm_minsize() + if w_width is None: + w_width = max(min_width, widget.winfo_reqwidth()) + if w_height is None: + w_height = max(min_height, widget.winfo_reqheight()) + s_width = widget.winfo_screenwidth() + s_height = widget.winfo_screenheight() + m_x = m_y = 0 + m_width, m_height = s_width, s_height + if parent and parent.winfo_ismapped(): + ##print parent.wm_geometry() + ##print parent.winfo_geometry(), parent.winfo_x(), parent.winfo_y(), parent.winfo_rootx(), parent.winfo_rooty(), parent.winfo_vrootx(), parent.winfo_vrooty() + m_x = m_y = None + if os.name == "nt": + try: + m_width, m_height, m_x, m_y = wm_get_geometry(parent) + except: + pass + if m_x is None: + m_x = parent.winfo_x() + m_y = parent.winfo_y() + m_width = parent.winfo_width() + m_height = parent.winfo_height() + if relx is None: relx = 0.5 + if rely is None: rely = 0.3 + else: + if relx is None: relx = 0.5 + if rely is None: rely = 0.5 + m_x = max(m_x, 0) + m_y = max(m_y, 0) + else: + if relx is None: relx = 0.5 + if rely is None: rely = 0.3 + x = m_x + int((m_width - w_width) * relx) + y = m_y + int((m_height - w_height) * rely) + ##print x, y, w_width, w_height, m_x, m_y, m_width, m_height + # make sure the widget is fully on screen + if x < 0: x = 0 + elif x + w_width + 32 > s_width: x = max(0, (s_width - w_width) / 2) + if y < 0: y = 0 + elif y + w_height + 32 > s_height: y = max(0, (s_height - w_height) / 2) + return x, y + + +# /*********************************************************************** +# // bind wrapper - Tkinter doesn't properly delete all bindings +# ************************************************************************/ + +__mfx_bindings = {} +__mfx_wm_protocols = ("WM_DELETE_WINDOW", "WM_TAKE_FOCUS", "WM_SAVE_YOURSELF") + +def bind(widget, sequence, func, add=None): + assert callable(func) + if sequence in __mfx_wm_protocols: + funcid = widget._register(func) + widget.tk.call("wm", "protocol", widget._w, sequence, funcid) + elif add is None: + funcid = widget.bind(sequence, func) + else: + ##add = add and "+" or "" + funcid = widget.bind(sequence, func, add) + k = id(widget) + if __mfx_bindings.has_key(k): + __mfx_bindings[k].append((sequence, funcid)) + else: + __mfx_bindings[k] = [(sequence, funcid)] + +def unbind_destroy(widget): + if widget is None: + return + k = id(widget) + if __mfx_bindings.has_key(k): + for sequence, funcid in __mfx_bindings[k]: + ##print widget, sequence, funcid + try: + if sequence in __mfx_wm_protocols: + widget.tk.call("wm", "protocol", widget._w, sequence, "") + ##widget.deletecommand(funcid) + else: + widget.unbind(sequence, funcid) + except Tkinter.TclError: + pass + del __mfx_bindings[k] + ##for k in __mfx_bindings.keys(): print __mfx_bindings[k] + ##print len(__mfx_bindings.keys()) + + +# /*********************************************************************** +# // timer wrapper - Tkinter doesn't properly delete all commands +# ************************************************************************/ + +def after(widget, ms, func, *args): + timer = apply(widget.after, (ms, func) + args) + command = widget._tclCommands[-1] + return (timer, command, widget) + +def after_idle(widget, func, *args): + return apply(after, (widget, "idle", func) + args) + +def after_cancel(t): + if t is not None: + t[2].after_cancel(t[0]) + try: + t[2].deletecommand(t[1]) + except Tkinter.TclError: + pass + + +# /*********************************************************************** +# // image handling +# ************************************************************************/ + +if Image: + class PIL_Image(ImageTk.PhotoImage): + def __init__(self, file): + im = Image.open(file).convert('RGBA') + ImageTk.PhotoImage.__init__(self, im) + self._pil_image = im + def subsample(self, r): + im = self._pil_image + w, h = im.size + w, h = int(float(w)/r), int(float(h)/r) + im = ImageTk.PhotoImage(im.resize((w, h))) + return im + + +def makeImage(file=None, data=None, dither=None, alpha=None): + kw = {} + if data is None: + assert file is not None + kw["file"] = file + else: + #assert data is not None + kw["data"] = data + if Image: + # use PIL + if file: + im = PIL_Image(file) + return im + # fromstring(mode, size, data, decoder_name='raw', *args) + else: + return Tkinter.PhotoImage(data=data) + return apply(Tkinter.PhotoImage, (), kw) + +loadImage = makeImage + +def copyImage(image, x, y, width, height): + if Image: + if isinstance(image, PIL_Image): + return ImageTk.PhotoImage(image._pil_image.crop((x, y, x+width, y+height))) + dest = Tkinter.PhotoImage(width=width, height=height) + assert dest.width() == width + assert dest.height() == height + dest.blank() + image.tk.call(dest, "copy", image.name, "-from", x, y, x+width, y+height) + assert dest.width() == width + assert dest.height() == height + return dest + +def fillImage(image, fill, outline=None): + if not fill and not outline: + return + width = image.width() + height = image.height() + ow = 1 # outline width + if width <= 2*ow or height <= 2*ow: + fill = fill or outline + outline = None + if not outline: + f = (fill,) * width + f = (f,) * height + assert len(f) == height + image.put(f) + elif not fill: + l = ((outline,) * width,) + for y in range(0, ow): + image.put(l, (0, y)) + for y in range(height-ow, height): + image.put(l, (0, y)) + p = ((outline,) * ow,) + for y in range(ow, height-ow): + image.put(p, (0, y)) + image.put(p, (width-ow, y)) + else: + l1 = (outline,) * width + l2 = (outline,) * ow + (fill,) * (width-2*ow) + (outline,) * ow + f = (l1,) * ow + (l2,) * (height-2*ow) + (l1,) * ow + assert len(f) == height + image.put(f) + +def createImage(width, height, fill, outline=None): + image = Tkinter.PhotoImage(width=width, height=height) + assert image.width() == width + assert image.height() == height + image.blank() + fillImage(image, fill, outline) + return image + + +# /*********************************************************************** +# // font utils +# ************************************************************************/ + +def get_text_width(text, font, root=None): + return Font(root=root, font=font).measure(text) + diff --git a/pysollib/tile/tkwidget.py b/pysollib/tile/tkwidget.py new file mode 100644 index 00000000..28f12246 --- /dev/null +++ b/pysollib/tile/tkwidget.py @@ -0,0 +1,722 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['MfxMessageDialog', + 'MfxExceptionDialog', + 'MfxSimpleEntry', + 'MfxTooltip', + 'MfxScrolledCanvas', + 'StackDesc', + ] + +# imports +import os, sys, time, types +import Tile as Tkinter +import traceback + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct +from pysollib.mfxutil import win32api + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkutil import after, after_idle, after_cancel +from tkutil import bind, unbind_destroy +from tkutil import makeToplevel, setTransient +from tkcanvas import MfxCanvas + + +# /*********************************************************************** +# // abstract base class for the dialogs in this module +# ************************************************************************/ + +class MfxDialog: # ex. _ToplevelDialog + img = {} + button_img = {} + def __init__(self, parent, title="", resizable=0, default=-1): + self.parent = parent + self.status = 0 + self.button = default + self.timer = None + self.buttons = [] + self.accel_keys = {} + self.top = makeToplevel(parent, title=title) + self.top.wm_resizable(resizable, resizable) + ##w, h = self.top.winfo_screenwidth(), self.top.winfo_screenheight() + ##self.top.wm_maxsize(w-4, h-32) + bind(self.top, "WM_DELETE_WINDOW", self.wmDeleteWindow) + # + + def mainloop(self, focus=None, timeout=0, transient=True): + bind(self.top, "", self.mCancel) + bind(self.top, '', self.altKeyEvent) # for accelerators + if focus is not None: + focus.focus() + if transient: + setTransient(self.top, self.parent) + try: + self.top.grab_set() + except Tkinter.TclError: + if traceback: traceback.print_exc() + pass + if timeout > 0: + self.timer = after(self.top, timeout, self.mTimeout) + try: self.top.mainloop() + except SystemExit: + pass + self.destroy() + + def destroy(self): + after_cancel(self.timer) + unbind_destroy(self.top) + try: + self.top.wm_withdraw() + except: + if traceback: traceback.print_exc() + pass + try: + self.top.destroy() + except: + if traceback: traceback.print_exc() + pass + #destruct(self.top) + if 1 and self.parent: # ??? + try: + ##self.parent.update_idletasks() + # FIXME: why do we need this under Windows ? + if hasattr(self.parent, "busyUpdate"): + self.parent.busyUpdate() + else: + self.parent.update() + except: + if traceback: traceback.print_exc() + pass + self.top = None + self.parent = None + + def wmDeleteWindow(self, *event): + self.status = 1 + raise SystemExit + ##return EVENT_HANDLED + + def mCancel(self, *event): + self.status = 1 + raise SystemExit + + def mTimeout(self, *event): + self.status = 2 + raise SystemExit + + def mDone(self, button): + self.button = button + raise SystemExit + + def altKeyEvent(self, event): + key = event.char + key = unicode(key, 'utf-8') + key = key.lower() + button = self.accel_keys.get(key) + if not button is None: + self.mDone(button) + + + def initKw(self, kw): + kw = KwStruct(kw, + timeout=0, resizable=0, + text="", justify="center", + strings=(_("&OK"),), + default=0, + width=0, + padx=20, pady=20, + bitmap=None, bitmap_side="left", + bitmap_padx=10, bitmap_pady=20, + image=None, image_side="left", + image_padx=10, image_pady=20, + ) + # default to separator if more than one button + sw = 2 * (len(kw.strings) > 1) + kwdefault(kw.__dict__, separatorwidth=sw) + return kw + + def createFrames(self, kw): + bottom_frame = Tkinter.Frame(self.top) + bottom_frame.pack(side='bottom', fill='both', expand=0, ipadx=3, ipady=3) + if kw.separatorwidth > 0: + separator = Tkinter.Separator(self.top) + separator.pack(side='bottom', fill='x', pady=kw.separatorwidth/2) + top_frame = Tkinter.Frame(self.top) + top_frame.pack(side='top', fill='both', expand=1) + return top_frame, bottom_frame + + def createBitmaps(self, frame, kw): + if kw.bitmap: ## in ("error", "info", "question", "warning") + img = self.img.get(kw.bitmap) + b = Tkinter.Label(frame, image=img) + b.pack(side=kw.bitmap_side, padx=kw.bitmap_padx, pady=kw.bitmap_pady) + elif kw.image: + b = Tkinter.Label(frame, image=kw.image) + b.pack(side=kw.image_side, padx=kw.image_padx, pady=kw.image_pady) + + def createButtons(self, frame, kw): + button = column = -1 + padx, pady = kw.get("buttonpadx", 10), kw.get("buttonpady", 10) + focus = None + max_len = 0 + for s in kw.strings: + if type(s) is types.TupleType: + s = s[0] + if s: + ##s = re.sub(r"[\s\.\,]", "", s) + #if os.name == 'posix': + # s = s.replace('...', '.') + s = s.replace('&', '') + max_len = max(max_len, len(s)) + ##print s, len(s) + if max_len > 12 and os.name == 'posix': button_width = max_len + elif max_len > 9 : button_width = max_len+1 + elif max_len > 6 : button_width = max_len+2 + else : button_width = 8 + #print 'button_width =', button_width + # + # + for s in kw.strings: + xbutton = button = button + 1 + if type(s) is types.TupleType: + assert len(s) == 2 + button = int(s[1]) + s = s[0] + if s is None: + continue + accel_indx = s.find('&') + s = s.replace('&', '') + if button < 0: + b = Tkinter.Button(frame, text=s, state="disabled") + button = xbutton + else: + b = Tkinter.Button(frame, text=s, default="normal", + command=(lambda self=self, button=button: self.mDone(button))) + if button == kw.default: + focus = b + focus.config(default="active") + self.buttons.append(b) + # + b.config(width=button_width) + if accel_indx >= 0: + # key accelerator + b.config(underline=accel_indx) + key = s[accel_indx] + self.accel_keys[key.lower()] = button + # +## img = None +## if self.button_img: +## img = self.button_img.get(s) +## b.config(compound='left', image=img) + column += 1 + b.grid(column=column, row=0, sticky="nse", padx=padx, pady=pady) + if focus is not None: + l = (lambda event=None, self=self, button=kw.default: self.mDone(button)) + bind(self.top, "", l) + bind(self.top, "", l) + # left justify + ##frame.columnconfigure(0, weight=1) + return focus + + +# /*********************************************************************** +# // replacement for the tk_dialog script +# ************************************************************************/ + +class MfxMessageDialog(MfxDialog): + def __init__(self, parent, title, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.button = kw.default + msg = Tkinter.Label(top_frame, text=kw.text, justify=kw.justify, + width=kw.width) + msg.pack(fill=Tkinter.BOTH, expand=1, padx=kw.padx, pady=kw.pady) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxExceptionDialog(MfxMessageDialog): + def __init__(self, parent, ex, title="Error", **kw): + kw = KwStruct(kw, bitmap="error") + text = kw.get("text", "") + if not text.endswith("\n"): + text = text + "\n" + text = text + "\n" + if isinstance(ex, EnvironmentError) and ex.filename is not None: + t = "[Errno %s] %s:\n%s" % (ex.errno, ex.strerror, repr(ex.filename)) + else: + t = str(ex) + kw.text = text + unicode(t, errors='replace') + apply(MfxMessageDialog.__init__, (self, parent, title), kw.getKw()) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxSimpleEntry(MfxDialog): + def __init__(self, parent, title, label, value, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.value = value + if label: + label = Tkinter.Label(top_frame, text=label, takefocus=0) + label.pack(pady=5) + w = kw.get("e_width", 0) # width in characters + self.var = Tkinter.Entry(top_frame, exportselection=1, width=w) + self.var.insert(0, value) + self.var.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + # + focus = self.createButtons(bottom_frame, kw) + focus = self.var + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), _("&Cancel")), default=0, + separatorwidth = 0, + ) + return MfxDialog.initKw(self, kw) + + def mDone(self, button): + self.button = button + self.value = self.var.get() + raise SystemExit + + +# /*********************************************************************** +# // a simple tooltip +# ************************************************************************/ + +class MfxTooltip: + last_leave_time = 0 + + def __init__(self, widget): + # private vars + self.widget = widget + self.text = None + self.timer = None + self.cancel_timer = None + self.tooltip = None + self.label = None + self.bindings = [] + self.bindings.append(self.widget.bind("", self._enter)) + self.bindings.append(self.widget.bind("", self._leave)) + self.bindings.append(self.widget.bind("", self._leave)) + # user overrideable settings + self.timeout = 800 # milliseconds + self.cancel_timeout = 5000 + self.leave_timeout = 400 + self.relief = 'solid' + self.justify = 'left' + self.fg = "#000000" + self.bg = "#ffffe0" + self.xoffset = 0 + self.yoffset = 4 + + def setText(self, text): + self.text = text + + def _unbind(self): + if self.bindings and self.widget: + self.widget.unbind("", self.bindings[0]) + self.widget.unbind("", self.bindings[1]) + self.widget.unbind("", self.bindings[2]) + self.bindings = [] + + def destroy(self): + self._unbind() + self._leave() + + def _enter(self, *event): + after_cancel(self.timer) + after_cancel(self.cancel_timer) + self.cancel_timer = None + if time.time() - MfxTooltip.last_leave_time < self.leave_timeout/1000.: + self._showTip() + else: + self.timer = after(self.widget, self.timeout, self._showTip) + + def _leave(self, *event): + after_cancel(self.timer) + after_cancel(self.cancel_timer) + self.timer = self.cancel_timer = None + if self.tooltip: + self.label.destroy() + destruct(self.label) + self.label = None + self.tooltip.destroy() + destruct(self.tooltip) + self.tooltip = None + MfxTooltip.last_leave_time = time.time() + + def _showTip(self): + self.timer = None + if self.tooltip or not self.text: + return +## if isinstance(self.widget, (Tkinter.Button, Tkinter.Checkbutton)): +## if self.widget["state"] == Tkinter.DISABLED: +## return + import Tkinter # not Tile + ##x = self.widget.winfo_rootx() + x = self.widget.winfo_pointerx() + y = self.widget.winfo_rooty() + self.widget.winfo_height() + x += self.xoffset + y += self.yoffset + self.tooltip = Tkinter.Toplevel() + self.tooltip.wm_iconify() + self.tooltip.wm_overrideredirect(1) + self.tooltip.wm_protocol("WM_DELETE_WINDOW", self.destroy) + self.label = Tkinter.Label(self.tooltip, text=self.text, + relief=self.relief, justify=self.justify, + fg=self.fg, bg=self.bg, bd=1, takefocus=0) + self.label.pack(ipadx=1, ipady=1) + self.tooltip.wm_geometry("%+d%+d" % (x, y)) + self.tooltip.wm_deiconify() + self.cancel_timer = after(self.widget, self.cancel_timeout, self._leave) + ##self.tooltip.tkraise() + + +# /*********************************************************************** +# // A canvas widget with scrollbars and some useful bindings. +# ************************************************************************/ + +class MfxScrolledCanvas: + def __init__(self, parent, hbar=2, vbar=2, **kw): + kwdefault(kw, highlightthickness=0, bd=1, relief='sunken') + self.parent = parent + self.createFrame(kw) + self.canvas = None + self.hbar = None + self.hbar_mode = hbar + self.vbar = None + self.vbar_mode = vbar + self.hbar_show = 0 + self.vbar_show = 0 + self.resize_pending = 0 + self.timer = None + self.createCanvas(kw) + self.frame.grid_rowconfigure(0, weight=1) + self.frame.grid_columnconfigure(0, weight=1) + if hbar: + if hbar == 3: + w = 21 + if win32api: + w = win32api.GetSystemMetrics(3) # SM_CYHSCROLL + self.frame.grid_rowconfigure(1, minsize=w) + self.createHbar() + if not vbar: + bind(self.hbar, "", self._mapBar) + self.bindHbar() + if vbar: + if vbar == 3: + w = 21 + if win32api: + w = win32api.GetSystemMetrics(2) # SM_CXVSCROLL + self.frame.grid_columnconfigure(1, minsize=w) + self.createVbar() + bind(self.vbar, "", self._mapBar) + self.bindVbar() + ###self.canvas.focus_set() + + # + # + # + + def destroy(self): + after_cancel(self.timer) + self.timer = None + self.unbind_all() + self.canvas.destroy() + self.frame.destroy() + + def pack(self, **kw): + apply(self.frame.pack, (), kw) + + def grid(self, **kw): + apply(self.frame.grid, (), kw) + + # + # + # + + def setTile(self, app, i, force=False): + tile = app.tabletile_manager.get(i) + if tile is None or tile.error: + return False + ##print i, tile + if i == 0: + assert tile.color + assert tile.filename is None + else: + assert tile.color is None + assert tile.filename + assert tile.basename + if not force: + if (i == app.tabletile_index and + tile.color == app.opt.colors['table']): + return False + # + if not self.canvas.setTile(tile.filename, tile.stretch): + tile.error = True + return False + + if i == 0: + self.canvas.config(bg=tile.color) + ##app.top.config(bg=tile.color) + color = None + else: + self.canvas.config(bg=app.top_bg) + ##app.top.config(bg=app.top_bg) + color = tile.text_color + + if app.opt.use_default_text_color: + self.canvas.setTextColor(color) + else: + self.canvas.setTextColor(app.opt.colors['text']) + + return True + + # + # + # + + def unbind_all(self): + unbind_destroy(self.hbar) + unbind_destroy(self.vbar) + unbind_destroy(self.canvas) + unbind_destroy(self.frame) + + def createFrame(self, kw): + width = kw.get("width") + height = kw.get("height") + self.frame = Tkinter.Frame(self.parent, width=width, height=height, bg=None) + + def createCanvas(self, kw): + #self.canvas = apply(Tkinter.Canvas, (self.frame,), kw) + self.canvas = apply(MfxCanvas, (self.frame,), kw) + self.canvas.grid(row=0, column=0, sticky="news") + def createHbar(self): + self.hbar = Tkinter.Scrollbar(self.frame, name="hbar", + takefocus=0, orient="horizontal") + self.canvas["xscrollcommand"] = self._setHbar + self.hbar["command"] = self.canvas.xview + def createVbar(self): + self.vbar = Tkinter.Scrollbar(self.frame, name="vbar", takefocus=0) + self.canvas["yscrollcommand"] = self._setVbar + self.vbar["command"] = self.canvas.yview + def bindHbar(self, w=None): + if w is None: + w = self.canvas + bind(w, "", self.unit_left) + bind(w, "", self.unit_right) + def bindVbar(self, w=None): + if w is None: + w = self.canvas + bind(w, "", self.page_up) + bind(w, "", self.page_down) + bind(w, "", self.unit_up) + bind(w, "", self.unit_down) + bind(w, "", self.scroll_top) + bind(w, "", self.scroll_top) + bind(w, "", self.scroll_bottom) + # mousewheel support + if os.name == 'posix': + bind(w, '<4>', self.mouse_wheel_up) + bind(w, '<5>', self.mouse_wheel_down) + # don't work on Linux + #bind(w, '', self.mouse_wheel) + + + def mouse_wheel(self, *args): + print 'MfxScrolledCanvas.mouse_wheel', args + + def _mapBar(self, event): + # see: autoscroll.tcl, http://mini.net/cgi-bin/wikit/950.html + top = event.widget.winfo_toplevel() + g = top.wm_geometry() + if self.resize_pending: + self.resize_pending = 0 + self.canvas.update() + self.canvas.update_idletasks() + top.wm_geometry(g) + + def _setHbar(self, *args): + ##apply(self.hbar.set, args) + self.canvas.update() + apply(self.hbar.set, self.canvas.xview()) + self.showHbar() + ##self.hbar.update_idletasks() + def _setVbar(self, *args): + ##apply(self.vbar.set, args) + self.canvas.update() + apply(self.vbar.set, self.canvas.yview()) + self.showVbar() + ##self.vbar.update_idletasks() + + def showHbar(self, show=-1): + if not self.hbar: + return 0 + if show < 0: + show = self.hbar_mode + if show > 1: + if not self.canvas.winfo_ismapped(): + return 0 + ##self.canvas.update() + view = self.canvas.xview() + show = abs(view[0]) > 0.0001 or abs(view[1] - 1.0) > 0.0001 + if show == self.hbar_show: + return 0 + if show: + self.hbar.grid(row=1, column=0, sticky="we") + else: + self.hbar.grid_forget() + self.hbar_show = show + return 1 + + def showVbar(self, show=-1): + if not self.vbar: + return 0 + if show < 0: + show = self.vbar_mode + if show > 1: + if not self.canvas.winfo_ismapped(): + return 0 + ##self.canvas.update() + view = self.canvas.yview() + show = abs(view[0]) > 0.0001 or abs(view[1] - 1.0) > 0.0001 + if show == self.vbar_show: + return 0 + if show: + self.vbar.grid(row=0, column=1, sticky="ns") + else: + self.vbar.grid_forget() + self.vbar_show = show + return 1 + + def _xview(self, *args): + if self.hbar_show: apply(self.canvas.xview, args, {}) + return 'break' + def _yview(self, *args): + if self.vbar_show: apply(self.canvas.yview, args, {}) + return 'break' + + def page_up(self, *event): + return self._yview('scroll', -1, 'page') + def page_down(self, *event): + return self._yview('scroll', 1, 'page') + def unit_up(self, *event): + return self._yview('scroll', -1, 'unit') + def unit_down(self, *event): + return self._yview('scroll', 1, 'unit') + def mouse_wheel_up(self, *event): + return self._yview('scroll', -5, 'unit') + def mouse_wheel_down(self, *event): + return self._yview('scroll', 5, 'unit') + def page_left(self, *event): + return self._xview('scroll', -1, 'page') + def page_right(self, *event): + return self._xview('scroll', 1, 'page') + def unit_left(self, *event): + return self._xview('scroll', -1, 'unit') + def unit_right(self, *event): + return self._xview('scroll', 1, 'unit') + def scroll_top(self, *event): + return self._yview('moveto', 0) + def scroll_bottom(self, *event): + return self._yview('moveto', 1) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class StackDesc: + + def __init__(self, game, stack): + self.game = game + self.stack = stack + self.canvas = game.canvas + self.bindings = [] + + import Tkinter # not Tile + + font = game.app.getFont('canvas_small') + ##print self.app.cardset.CARDW, self.app.images.CARDW + cardw = game.app.images.CARDW + x, y = stack.x+cardw/2, stack.y + text = stack.getHelp()+'\n'+stack.getBaseCard() + text = text.strip() + if text: + frame = Tkinter.Frame(self.canvas, highlightthickness=1, + highlightbackground='black') + self.frame = frame + label = Tkinter.Message(frame, font=font, text=text, width=cardw-8, + fg='#000000', bg='#ffffe0', bd=1) + label.pack() + self.label = label + self.id = self.canvas.create_window(x, y, window=frame, anchor='n') + self.bindings.append(label.bind('', self._buttonPressEvent)) + ##self.bindings.append(label.bind('', self._enterEvent)) + else: + self.id = None + + def _buttonPressEvent(self, *event): + ##self.game.deleteStackDesc() + self.frame.tkraise() + + def _enterEvent(self, *event): + self.frame.tkraise() + + def delete(self): + if self.id: + self.canvas.delete(self.id) + for b in self.bindings: + self.label.unbind('', b) + diff --git a/pysollib/tile/tkwrap.py b/pysollib/tile/tkwrap.py new file mode 100644 index 00000000..7f73d0a0 --- /dev/null +++ b/pysollib/tile/tkwrap.py @@ -0,0 +1,197 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['TclError', + 'MfxCheckMenuItem', + 'MfxRadioMenuItem', + 'StringVar', + 'MfxRoot'] + +# imports +import os, sys, time, types +from Tkinter import TclError +import Tile as Tkinter + +# PySol imports +from pysollib.mfxutil import destruct, Struct +from pysollib.settings import TILE_THEME +from tkutil import after_idle +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE + +# /*********************************************************************** +# // menubar +# ************************************************************************/ + +class MfxCheckMenuItem(Tkinter.BooleanVar): + def __init__(self, menubar, path=None): + Tkinter.BooleanVar.__init__(self) + def set(self, value): + if not value or value == "false": value = 0 + ##print value, type(value) + ##assert type(value) is types.IntType and 0 <= value <= 1 + Tkinter.BooleanVar.set(self, value) + + +class MfxRadioMenuItem(Tkinter.IntVar): + def __init__(self, menubar, path=None): + Tkinter.IntVar.__init__(self) + def set(self, value): + ##assert type(value) is types.IntType and 0 <= value + Tkinter.IntVar.set(self, value) + + +## BooleanVar = Tkinter.BooleanVar +## IntVar = Tkinter.IntVar + +StringVar = Tkinter.StringVar + + +# /*********************************************************************** +# // Wrapper class for Tk. +# // Required so that a Game will get properly destroyed. +# ************************************************************************/ + +class MfxRoot(Tkinter.Tk): + def __init__(self, **kw): + apply(Tkinter.Tk.__init__, (self,), kw) + self.tk.call("package", "require", "tile") + if TILE_THEME: + ##self.tk.call('style', 'theme', 'use', TILE_THEME) + style = Tkinter.Style(self) + style.theme_use(TILE_THEME) + self.app = None + # for interruptible sleep + #self.sleep_var = Tkinter.IntVar(self) + #self.sleep_var.set(0) + self.sleep_var = 0 + self.after_id = None + ##self.bind('', self._sleepEvent, add=True) + + def connectApp(self, app): + self.app = app + + # sometimes an update() is needed under Windows, whereas + # under Unix an update_idletasks() would be enough... + def busyUpdate(self): + game = None + if self.app: game = self.app.game + if not game: + self.update() + else: + old_busy = game.busy + game.busy = 1 + if game.canvas: + game.canvas.update() + self.update() + game.busy = old_busy + + def mainquit(self): + self.after_idle(self.quit) + + def screenshot(self, filename): + ##print 'MfxRoot.screenshot not yet implemented' + pass + + def setCursor(self, cursor): + if 0: + ## FIXME: this causes ugly resizes ! + Tkinter.Tk.config(self, cursor=cursor) + elif 0: + ## and this is even worse + ##print self.children + for v in self.children.values(): + v.config(cursor=cursor) + else: + pass + + # + # sleep + # + + def sleep(self, seconds): + #time.sleep(seconds) + self.after(int(seconds*1000)) + return + print 'sleep', seconds + timeout = int(seconds*1000) + self.sleep_var = 0 + while timeout > 0: + self.update() + self.update_idletasks() + if self.sleep_var: + break + self.after(100) + timeout -= 100 + print 'finish sleep' + return + if self.after_id: + self.after_cancel(self.after_id) + self.after_id = self.after(int(seconds*1000), self._sleepEvent) + self.sleep_var.set(1) + self.update() + self.wait_variable(self.sleep_var) + if self.after_id: + self.after_cancel(self.after_id) + self.after_id = None + print 'finish sleep' + + def _sleepEvent(self, *args): + return + print '_sleepEvent', args + self.interruptSleep() + return EVENT_PROPAGATE + + def interruptSleep(self): + return + print 'interruptSleep' + self.update() + self.update_idletasks() + self.sleep_var = 1 + #self.sleep_var.set(0) + #self.after_idle(self.sleep_var.set, 0) + + # + # + # + + def update(self): + Tkinter.Tk.update(self) + + def wmDeleteWindow(self): + if self.app and self.app.menubar: + self.app.menubar.mQuit() + else: + ##self.after_idle(self.quit) + pass diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py new file mode 100644 index 00000000..63607770 --- /dev/null +++ b/pysollib/tile/toolbar.py @@ -0,0 +1,607 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PysolToolbar'] #, 'TOOLBAR_BUTTONS'] + +# imports +import os, sys, types +import traceback +import Tile as Tkinter +try: + # PIL + import Image, ImageTk +except ImportError: + Image = None + +# PySol imports +from pysollib.mfxutil import destruct +from pysollib.util import IMAGE_EXTENSIONS +from pysollib.settings import PACKAGE +from pysollib.actions import PysolToolbarActions + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import MfxTooltip +from menubar import createToolbarMenu, MfxMenu + +gettext = _ +n_ = lambda x: x + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class AbstractToolbarButton: + def __init__(self, parent, toolbar, toolbar_name, position): + self.toolbar = toolbar + self.toolbar_name = toolbar_name + self.position = position + self.visible = False + + def show(self, orient, force=False): + if self.visible and not force: + return + self.visible = True + padx, pady = 2, 2 + if orient == Tkinter.HORIZONTAL: + self.grid(row=0, + column=self.position, + ipadx=padx, ipady=pady, + sticky='nsew') + else: + self.grid(row=self.position, + column=0, + ipadx=padx, ipady=pady, + sticky='nsew') + + def hide(self): + if not self.visible: return + self.visible = False + self.grid_forget() + + +class ToolbarCheckbutton(AbstractToolbarButton, Tkinter.Checkbutton): + def __init__(self, parent, toolbar, toolbar_name, position, **kwargs): + kwargs['style'] = 'Toolbutton' + Tkinter.Checkbutton.__init__(self, parent, **kwargs) + AbstractToolbarButton.__init__(self, parent, toolbar, toolbar_name, position) + + +class ToolbarButton(AbstractToolbarButton, Tkinter.Button): + def __init__(self, parent, toolbar, toolbar_name, position, **kwargs): + kwargs['style'] = 'Toolbutton' + Tkinter.Button.__init__(self, parent, **kwargs) + AbstractToolbarButton.__init__(self, parent, toolbar, toolbar_name, position) + +class ToolbarSeparator(Tkinter.Separator): + def __init__(self, parent, toolbar, position, **kwargs): + kwargs['orient'] = 'vertical' + Tkinter.Separator.__init__(self, parent, **kwargs) + self.toolbar = toolbar + self.position = position + self.visible = False + def show(self, orient, force=False): + if self.visible and not force: + return + self.visible = True + padx = 4 + pady = 4 + if orient == Tkinter.HORIZONTAL: + self.config(orient='vertical') + self.grid(row=0, + column=self.position, + padx=padx, pady=pady, + sticky='nsew') + else: + self.config(orient='horizontal') + self.grid(row=self.position, + column=0, + padx=pady, pady=padx, + sticky='nsew') + def hide(self): + if not self.visible: return + self.visible = False + self.grid_forget() + +class ToolbarSeparator__(Tkinter.Frame): + def __init__(self, parent, toolbar, position, **kwargs): + Tkinter.Frame.__init__(self, parent, **kwargs) + self.toolbar = toolbar + self.position = position + self.visible = False + def show(self, orient, force=False): + if self.visible and not force: + return + self.visible = True + width = 4 + height = 4 + padx = 6 + pady = 6 + if orient == Tkinter.HORIZONTAL: + self.config(width=width, height=height) + self.grid(row=0, + column=self.position, + padx=padx, pady=pady, + sticky='ns') + else: + self.config(width=height, height=width) + self.grid(row=self.position, + column=0, + padx=pady, pady=padx, + sticky='ew') + def hide(self): + if not self.visible: return + self.visible = False + self.grid_forget() + +class ToolbarFlatSeparator(ToolbarSeparator): + pass + +class ToolbarLabel(Tkinter.Message): + def __init__(self, parent, toolbar, toolbar_name, position, **kwargs): + Tkinter.Message.__init__(self, parent, **kwargs) + self.toolbar = toolbar + self.toolbar_name = toolbar_name + self.position = position + self.visible = False + def show(self, orient, force=False): + if self.visible and not force: + return + self.visible = True + padx = 4 + pady = 4 + if orient == Tkinter.HORIZONTAL: + self.grid(row=0, + column=self.position, + padx=padx, pady=pady, + sticky='nsew') + else: + self.grid(row=self.position, + column=0, + padx=padx, pady=pady, + sticky='nsew') + def hide(self): + if not self.visible: return + self.visible = False + self.grid_forget() + + +# /*********************************************************************** +# // Note: Applications should call show/hide after constructor. +# ************************************************************************/ + +class PysolToolbar(PysolToolbarActions): + + def __init__(self, top, dir, size=0, relief=Tkinter.FLAT, + compound=Tkinter.NONE): + + PysolToolbarActions.__init__(self) + + self.top = top + self._setRelief(relief) + self.side = -1 + self._tooltips = [] + self._widgets = [] + self.dir = dir + self.size = size + self.compound = compound + self.orient=Tkinter.HORIZONTAL + self.label_padx = 4 + self.label_pady = 4 + self.button_pad = 2 + # + self.frame = Tkinter.Frame(top) #, class_='Toolbar') + # + for l, f, t in ( + (n_("New"), self.mNewGame, _("New game")), + (n_("Restart"), self.mRestart, _("Restart the\ncurrent game")), + (None, None, None), + (n_("Open"), self.mOpen, _("Open a\nsaved game")), + (n_("Save"), self.mSave, _("Save game")), + (None, None, None), + (n_("Undo"), self.mUndo, _("Undo last move")), + (n_("Redo"), self.mRedo, _("Redo last move")), + (n_("Autodrop"), self.mDrop, _("Auto drop cards")), + (n_("Pause"), self.mPause, _("Pause game")), + (None, None, None), + (n_("Statistics"), self.mPlayerStats, _("View statistics")), + (n_("Rules"), self.mHelpRules, _("Rules for this game")), + (None, None, None), + (n_("Quit"), self.mQuit, _("Quit ")+PACKAGE), + ): + if l is None: + sep = self._createSeparator() + sep.bind("<1>", self.clickHandler) + sep.bind("<3>", self.rightclickHandler) + elif l == 'Pause': + self._createButton(l, f, check=True, tooltip=t) + else: + self._createButton(l, f, tooltip=t) + + #~sep = self._createFlatSeparator() + #~sep.bind("<1>", self.clickHandler) + #~sep.bind("<3>", self.rightclickHandler) + position=len(self._widgets) + self.frame.rowconfigure(position, weight=1) + self.frame.columnconfigure(position, weight=1) + # + self._createLabel("player", label=n_('Player'), + tooltip=_("Player options")) + # + self.player_label.bind("<1>",self.mOptPlayerOptions) + ##self.player_label.bind("<3>",self.mOptPlayerOptions) + self.popup = None + self.frame.bind("<1>", self.clickHandler) + self.frame.bind("<3>", self.rightclickHandler) + # + self.setCompound(compound, force=True) + # Change the look of the frame to match the platform look + # (see also setRelief) + if os.name == 'posix': + #self.frame.config(bd=0, highlightthickness=1) + #~self.frame.config(bd=1, relief=self.frame_relief, highlightthickness=0) + pass + elif os.name == "nt": + self.frame.config(bd=2, relief=self.frame_relief, padx=2, pady=2) + #self._createSeparator(width=4, side=Tkinter.LEFT, relief=Tkinter.FLAT) + #self._createSeparator(width=4, side=Tkinter.RIGHT, relief=Tkinter.FLAT) + else: + self.frame.config(bd=0, highlightthickness=1) + + def config(self, w, v): + if w == 'player': + # label + if v: + self.player_label.show(orient=self.orient) + else: + self.player_label.hide() + else: + # button + widget = getattr(self, w+'_button') + position = widget.position + if v: + widget.show(orient=self.orient) + else: + widget.hide() + # + prev_visible = None + for w in self._widgets: + if w.__class__ is ToolbarSeparator: + if prev_visible is None or prev_visible.__class__ is ToolbarSeparator: + w.hide() + else: + w.show(orient=self.orient) + elif w.__class__ is ToolbarFlatSeparator: + if prev_visible.__class__ is ToolbarSeparator: + prev_visible.hide() + if w.visible: + prev_visible = w + + def _setRelief(self, relief): + if type(relief) is types.IntType: + relief = ('raised', 'flat')[relief] + elif relief in ('raised', 'flat'): + pass + else: + relief = 'flat' + self.button_relief = relief + if relief == 'raised': + self.frame_relief = 'flat' + self.separator_relief = 'flat' + if os.name == 'nt': + self.frame_relief = 'groove' + else: + self.frame_relief = 'raised' + self.separator_relief = 'sunken' #'raised' + if os.name == 'nt': + self.frame_relief = 'groove' + self.separator_relief = 'groove' + return relief + + # util + def _loadImage(self, name): + file = os.path.join(self.dir, name) + image = None + for ext in IMAGE_EXTENSIONS: + file = os.path.join(self.dir, name+ext) + if os.path.isfile(file): + if Image: + image = ImageTk.PhotoImage(Image.open(file)) + else: + image = Tkinter.PhotoImage(file=file) + break + return image + + def _createSeparator(self): + position=len(self._widgets) + sep = ToolbarSeparator(self.frame, + position=position, + toolbar=self, + bd=1, + highlightthickness=1, + width=4, + takefocus=0, + relief=self.separator_relief) + sep.show(orient=self.orient) + self._widgets.append(sep) + return sep + + def _createFlatSeparator(self): + position=len(self._widgets) + sep = ToolbarFlatSeparator(self.frame, + position=position, + toolbar=self, + bd=1, + highlightthickness=1, + width=5, + takefocus=0, + relief='flat') + sep.show(orient=self.orient) + self.frame.rowconfigure(position, weight=1) + self.frame.columnconfigure(position, weight=1) + self._widgets.append(sep) + return sep + + def _createButton(self, label, command, check=False, tooltip=None): + name = label.lower() + image = self._loadImage(name) + position = len(self._widgets) + bd = self.button_relief == 'flat' and 1 or 2 + kw = { + 'position' : position, + 'toolbar' : self, + 'toolbar_name' : name, + 'command' : command, + 'takefocus' : 0, + 'text' : gettext(label), + 'bd' : bd, + 'relief' : self.button_relief, + 'padx' : self.button_pad, + 'pady' : self.button_pad + } + if Tkinter.TkVersion >= 8.4: + kw['overrelief'] = 'raised' + if image: + kw['image'] = image + if check: + if Tkinter.TkVersion >= 8.4: + kw['offrelief'] = self.button_relief + kw['indicatoron'] = False + kw['selectcolor'] = '' + button = ToolbarCheckbutton(self.frame, **kw) + else: + button = ToolbarButton(self.frame, **kw) + button.show(orient=self.orient) + setattr(self, name + "_image", image) + setattr(self, name + "_button", button) + self._widgets.append(button) + if tooltip: + b = MfxTooltip(button) + self._tooltips.append(b) + b.setText(tooltip) + return button + + def _createLabel(self, name, label=None, tooltip=None): + aspect = (400, 300) [self.getSize() != 0] + position = len(self._widgets)+1 + label = ToolbarLabel(self.frame, + position=position, + toolbar=self, + toolbar_name=name, + relief="ridge", + justify="center", + aspect=aspect) + label.show(orient=self.orient) + setattr(self, name + "_label", label) + self._widgets.append(label) + if tooltip: + b = MfxTooltip(label) + self._tooltips.append(b) + b.setText(tooltip) + return label + + def _busy(self): + if not self.side or not self.game or not self.menubar: + return 1 + self.game.stopDemo() + self.game.interruptSleep() + return self.game.busy + + + # + # public methods + # + + def show(self, side=1, resize=1): + if self.side == side: + return 0 + if resize: + self.top.wm_geometry("") # cancel user-specified geometry + if not side: + # hide + self.frame.grid_forget() + else: + # show + pack_func = self.frame.grid_configure + + if side == 1: + # top + pack_func(row=0, column=1, sticky='ew') + elif side == 2: + # bottom + pack_func(row=2, column=1, sticky='ew') + elif side == 3: + # left + pack_func(row=1, column=0, sticky='ns') + else: + # right + pack_func(row=1, column=2, sticky='ns') + # set orient + orient = side in (1, 2) and Tkinter.HORIZONTAL or Tkinter.VERTICAL + self._setOrient(orient) + self.side = side + return 1 + + def hide(self, resize=1): + self.show(0, resize) + + def destroy(self): + for w in self._tooltips: + if w: w.destroy() + self._tooltips = [] + for w in self._widgets: + if w: w.destroy() + self._widgets = [] + + def setCursor(self, cursor): + if self.side: + self.frame.config(cursor=cursor) + self.frame.update_idletasks() + + def connectGame(self, game, menubar): + PysolToolbarActions.connectGame(self, game, menubar) + if self.popup: + self.popup.destroy() + destruct(self.popup) + self.popup = None + if menubar: + tkopt = menubar.tkopt + self.pause_button.config(variable=tkopt.pause) + self.popup = MfxMenu(master=None, label=n_('Toolbar'), tearoff=0) + createToolbarMenu(menubar, self.popup) + + def updateText(self, **kw): + for name in kw.keys(): + label = getattr(self, name + "_label") + label["text"] = kw[name] + + def updateImages(self, dir, size): + if dir == self.dir and size == self.size: + return 0 + if not os.path.isdir(dir): + return 0 + old_dir, old_size = self.dir, self.size + self.dir, self.size = dir, size + data = [] + try: + for w in self._widgets: + if not isinstance(w, (ToolbarButton, ToolbarCheckbutton)): + continue + name = w.toolbar_name + image = self._loadImage(name) + data.append((name, w, image)) + except: + self.dir, self.size = old_dir, old_size + return 0 + l = self.player_label + aspect = (400, 300) [size != 0] + l.config(aspect=aspect) + for name, w, image in data: + w.config(image=image) + setattr(self, name + "_image", image) + self.setCompound(self.compound, force=True) + return 1 + + def setRelief(self, relief): + if self.button_relief == relief: + return False + self._setRelief(relief) + self.frame.config(relief=self.frame_relief) + for w in self._widgets: + bd = relief == 'flat' and 1 or 2 + if isinstance(w, ToolbarButton): + w.config(relief=self.button_relief, bd=bd) + elif isinstance(w, ToolbarCheckbutton): + w.config(relief=self.button_relief, bd=bd) + if Tkinter.TkVersion >= 8.4: + w.config(offrelief=self.button_relief) + elif w.__class__ is ToolbarSeparator: # not ToolbarFlatSeparator + w.config(relief=self.separator_relief) + return True + + def setCompound(self, compound, force=False): + if Tkinter.TkVersion < 8.4: + return False + if not force and self.compound == compound: + return False + for w in self._widgets: + if not isinstance(w, (ToolbarButton, ToolbarCheckbutton)): + continue + if compound == 'text': + w.config(compound='none', image='') + else: + image = getattr(self, w.toolbar_name+'_image') + w.config(compound=compound, image=image) + self.compound = compound + return True + + def _setOrient(self, orient='horizontal', force=False): + if not force and self.orient == orient: + return False + for w in self._widgets: + if w.visible: + w.show(orient=orient, force=True) + self.orient = orient + return True + + # + # Mouse event handlers + # + + def clickHandler(self, event): + if self._busy(): return EVENT_HANDLED + return EVENT_HANDLED + + def rightclickHandler(self, event): + if self._busy(): return EVENT_HANDLED + if self.popup: + ##print event.x, event.y, event.x_root, event.y_root, event.__dict__ + self.popup.tk_popup(event.x_root, event.y_root) + return EVENT_HANDLED + + def middleclickHandler(self, event): + if self._busy(): return EVENT_HANDLED + if 1 <= self.side <= 2: + self.menubar.setToolbarSide(3 - self.side) + return EVENT_HANDLED + + def getSize(self): + if self.compound == 'text': + return 0 + size = self.size + comp = int(self.compound in (Tkinter.TOP, Tkinter.BOTTOM)) + return int((size+comp) != 0) + diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 776570da..e2587f11 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -430,8 +430,7 @@ class MfxTooltip: class MfxScrolledCanvas: def __init__(self, parent, hbar=2, vbar=2, **kw): - bg = kw.get("bg", parent.cget("bg")) - kwdefault(kw, bg=bg, highlightthickness=0, bd=1, relief='sunken') + kwdefault(kw, highlightthickness=0, bd=1, relief='sunken') self.parent = parent self.createFrame(kw) self.canvas = None @@ -452,7 +451,7 @@ class MfxScrolledCanvas: if win32api: w = win32api.GetSystemMetrics(3) # SM_CYHSCROLL self.frame.grid_rowconfigure(1, minsize=w) - self.createHbar(bg) + self.createHbar() if not vbar: bind(self.hbar, "", self._mapBar) self.bindHbar() @@ -462,7 +461,7 @@ class MfxScrolledCanvas: if win32api: w = win32api.GetSystemMetrics(2) # SM_CXVSCROLL self.frame.grid_columnconfigure(1, minsize=w) - self.createVbar(bg) + self.createVbar() bind(self.vbar, "", self._mapBar) self.bindVbar() ###self.canvas.focus_set() @@ -544,12 +543,13 @@ class MfxScrolledCanvas: #self.canvas = apply(Tkinter.Canvas, (self.frame,), kw) self.canvas = apply(MfxCanvas, (self.frame,), kw) self.canvas.grid(row=0, column=0, sticky="news") - def createHbar(self, bg): - self.hbar = Tkinter.Scrollbar(self.frame, name="hbar", bg=bg, takefocus=0, orient="horizontal") + def createHbar(self): + self.hbar = Tkinter.Scrollbar(self.frame, name="hbar", + takefocus=0, orient="horizontal") self.canvas["xscrollcommand"] = self._setHbar self.hbar["command"] = self.canvas.xview - def createVbar(self, bg): - self.vbar = Tkinter.Scrollbar(self.frame, name="vbar", bg=bg, takefocus=0) + def createVbar(self): + self.vbar = Tkinter.Scrollbar(self.frame, name="vbar", takefocus=0) self.canvas["yscrollcommand"] = self._setVbar self.vbar["command"] = self.canvas.yview def bindHbar(self, w=None): diff --git a/setup.py b/setup.py index e10c2ae1..2c4c6475 100644 --- a/setup.py +++ b/setup.py @@ -64,6 +64,7 @@ kw = { 'scripts' : ['pysol'], 'packages' : ['pysollib', 'pysollib.tk', + 'pysollib.tile', 'pysollib.pysolgtk', 'pysollib.games', 'pysollib.games.special', From 7bd3fa04c4fb67b575a394a196f64b03d63b4e52 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 5 Oct 2006 21:16:11 +0000 Subject: [PATCH 076/266] + improved tile support git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@78 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/ru_pysol.po | 8 ++--- pysollib/main.py | 33 ++++++++++++++++----- pysollib/settings.py | 2 +- pysollib/tile/Tile.py | 5 +++- pysollib/tile/fontsdialog.py | 12 ++++---- pysollib/tile/progressbar.py | 6 ++-- pysollib/tile/soundoptionsdialog.py | 10 ++++--- pysollib/tile/timeoutsdialog.py | 4 ++- pysollib/tile/tkhtml.py | 2 +- pysollib/tile/tktree.py | 4 +-- pysollib/tile/tkutil.py | 9 +++--- pysollib/tile/tkwidget.py | 46 +++++++++++++++++++++++++++++ pysollib/tile/tkwrap.py | 2 +- pysollib/tile/toolbar.py | 2 +- pysollib/tk/soundoptionsdialog.py | 4 +-- pysollib/tk/tkhtml.py | 2 +- 16 files changed, 111 insertions(+), 40 deletions(-) diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 3d5358e4..082f7a96 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" "POT-Creation-Date: Thu Sep 21 15:57:22 2006\n" -"PO-Revision-Date: 2006-09-26 15:53+0400\n" +"PO-Revision-Date: 2006-10-05 16:31+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -3016,7 +3016,7 @@ msgstr "Выкладывание на сброс" #: pysollib/tk/soundoptionsdialog.py:80 msgid "Turn waste" -msgstr "Переворачивание сброса" +msgstr "Перелистывание сброса" #: pysollib/tk/soundoptionsdialog.py:81 msgid "Start drag" @@ -3024,11 +3024,11 @@ msgstr "Начало перемещения" #: pysollib/tk/soundoptionsdialog.py:83 msgid "Drop" -msgstr "Сбрасывание карты" +msgstr "Сброс карты" #: pysollib/tk/soundoptionsdialog.py:84 msgid "Drop pair" -msgstr "Сбрасывание двух карт" +msgstr "Сброс двух карт" #: pysollib/tk/soundoptionsdialog.py:85 msgid "Auto drop" diff --git a/pysollib/main.py b/pysollib/main.py index 7785c46c..fe7fe883 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -88,6 +88,7 @@ def parse_option(argv): "fg=", "foreground=", "bg=", "background=", "fn=", "font=", + "tile-theme=", "french-only", "noplugins", "nosound", @@ -104,6 +105,7 @@ def parse_option(argv): "fg": None, "bg": None, "fn": None, + "tile-theme": None, "french-only": False, "noplugins": False, "nosound": False, @@ -123,6 +125,8 @@ def parse_option(argv): opts["bg"] = i[1] elif i[0] in ("--fn", "--font"): opts["fn"] = i[1] + elif i[0] == "--tile-theme": + opts["tile-theme"] = i[1] elif i[0] == "--french-only": opts["french-only"] = True elif i[0] == "--noplugins": @@ -209,6 +213,9 @@ def pysol_init(app, args): app.debug = int(opts['debug']) except: print >> sys.stderr, 'invalid argument for debug' + if opts['tile-theme']: + import settings + settings.TILE_THEME = opts['tile-theme'] # init games database import games @@ -323,14 +330,6 @@ def pysol_init(app, args): app.top_palette[0] = fg # - if USE_TILE: # for tile - top.option_add('*Toolbar.relief', 'groove') - top.option_add('*Toolbar.borderWidth', 2) - top.option_add('*Toolbar.Button.Pad', 2) - top.option_add('*Toolbar.Button.default', 'disabled') - top.option_add('*Toolbar*takeFocus', 1) - top.option_add('*Tree.background', 'red') - if os.name == "posix": # Unix/X11 top.option_add('*Entry.background', 'white', 60) top.option_add('*Entry.foreground', 'black', 60) @@ -370,6 +369,24 @@ def pysol_init(app, args): else: app.opt.fonts["default"] = None + if USE_TILE: # for tile + ##top.option_add('*Toolbar.relief', 'groove') + ##top.option_add('*Toolbar.relief', 'raised') + top.option_add('*Toolbar.borderWidth', 1) + top.option_add('*Toolbar.Button.Pad', 2) + top.option_add('*Toolbar.Button.default', 'disabled') + top.option_add('*Toolbar*takeFocus', 0) + # + from settings import TILE_THEME + if TILE_THEME: + if font: + top.tk.call('style', 'configure', '.', '-font', font) + else: + font = top.tk.call('style', 'lookup', TILE_THEME, '-font') + top.option_add('*font', font) + bg = top.tk.call('style', 'lookup', TILE_THEME, '-background') + top.tk_setPalette(bg) + # check games if len(app.gdb.getGamesIdSortedByName()) == 0: app.wm_withdraw() diff --git a/pysollib/settings.py b/pysollib/settings.py index 23f26216..3824d2ca 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -34,7 +34,7 @@ VERSION_TUPLE = (4, 82) TOOLKIT = 'tk' # or 'gtk' USE_TILE = False -TILE_THEME = 'clam' #'default' # name of tile's theme +TILE_THEME = 'default' # name of tile's theme # data dirs DATA_DIRS = [] diff --git a/pysollib/tile/Tile.py b/pysollib/tile/Tile.py index bcd9534b..0ff0b8be 100644 --- a/pysollib/tile/Tile.py +++ b/pysollib/tile/Tile.py @@ -177,7 +177,7 @@ class Label(Widget, Tkinter.Label): class Frame(Widget, Tkinter.Frame): def __init__(self, master=None, cnf={}, **kw): - for opt in ('bd', 'highlightthickness',): + for opt in ('bd', 'highlightbackground', 'highlightthickness',): if kw.has_key(opt): del kw[opt] Widget.__init__(self, master, "ttk::frame", cnf, kw) @@ -185,6 +185,9 @@ class Frame(Widget, Tkinter.Frame): class LabelFrame(Widget, Tkinter.Frame): def __init__(self, master=None, cnf={}, **kw): + for opt in ('padx', 'pady',): + if kw.has_key(opt): + del kw[opt] Widget.__init__(self, master, "ttk::labelframe", cnf, kw) diff --git a/pysollib/tile/fontsdialog.py b/pysollib/tile/fontsdialog.py index 63a31233..bd11fa97 100644 --- a/pysollib/tile/fontsdialog.py +++ b/pysollib/tile/fontsdialog.py @@ -34,6 +34,8 @@ from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct from tkconst import EVENT_HANDLED, EVENT_PROPAGATE from tkwidget import MfxDialog from tkutil import bind +from tkwidget import PysolScale + # /*********************************************************************** # // @@ -73,9 +75,12 @@ class FontChooserDialog(MfxDialog): #self.family_var = Tkinter.StringVar() self.weight_var = Tkinter.BooleanVar() + self.weight_var.set(self.font_weight == 'bold') self.slant_var = Tkinter.BooleanVar() + self.slant_var.set(self.font_slant == 'italic') self.size_var = Tkinter.IntVar() - + self.size_var.set(self.font_size) + # frame = Tkinter.Frame(top_frame) frame.pack(expand=True, fill='both', padx=5, pady=10) frame.columnconfigure(0, weight=1) @@ -100,15 +105,12 @@ class FontChooserDialog(MfxDialog): variable=self.slant_var) cb2.grid(row=3, column=0, columnspan=2, sticky='we') - sc = Tkinter.Scale(frame, from_=6, to=40, resolution=1, + sc = PysolScale(frame, from_=6, to=40, resolution=1, #label='Size', orient='horizontal', command=self.fontupdate, variable=self.size_var) sc.grid(row=4, column=0, columnspan=2, sticky='news') # - self.size_var.set(self.font_size) - self.weight_var.set(self.font_weight == 'bold') - self.slant_var.set(self.font_slant == 'italic') font_families = list(tkFont.families()) font_families.sort() selected = -1 diff --git a/pysollib/tile/progressbar.py b/pysollib/tile/progressbar.py index 1dd57c15..cb01eaaf 100644 --- a/pysollib/tile/progressbar.py +++ b/pysollib/tile/progressbar.py @@ -56,14 +56,12 @@ class PysolProgressBar: self.top = makeToplevel(parent, title=title) self.top.wm_protocol("WM_DELETE_WINDOW", self.wmDeleteWindow) self.top.wm_group(parent) - self.top.wm_geometry('400x120') - self.top.wm_minsize(400, 120) self.top.wm_resizable(0, 0) self.top.config(cursor="watch") # self.frame = Tkinter.Frame(self.top, relief=Tkinter.FLAT, bd=0, takefocus=0) - self.progress = Tkinter.Progressbar(self.frame, maximum=100) + self.progress = Tkinter.Progressbar(self.frame, maximum=100, length=250) ##style = Tkinter.Style(self.progress) ##style.configure('TProgressbar', background=color) if images: @@ -73,7 +71,7 @@ class PysolProgressBar: self.f2 = Tkinter.Label(self.frame, image=images[1]) self.f2.pack(side='left', ipadx=8, ipady=4) else: - self.progress.grid(expand='yes', fill='x') + self.progress.pack(expand='yes', fill='x') self.frame.pack(expand='yes', fill='both') if app: try: diff --git a/pysollib/tile/soundoptionsdialog.py b/pysollib/tile/soundoptionsdialog.py index 5cd2557f..c8666c60 100644 --- a/pysollib/tile/soundoptionsdialog.py +++ b/pysollib/tile/soundoptionsdialog.py @@ -48,6 +48,8 @@ from pysollib.pysolaudio import pysolsoundserver # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE from tkwidget import MfxDialog, MfxMessageDialog +from tkwidget import PysolScale + # /*********************************************************************** # // @@ -121,16 +123,16 @@ class SoundOptionsDialog(MfxDialog): if app.audio.CAN_PLAY_MUSIC: # and app.startup_opt.sound_mode > 0: row += 1 w = Tkinter.Label(frame, text=_('Sample volume:')) - w.grid(row=row, column=0, sticky='w') - w = Tkinter.Scale(frame, from_=0, to=128, resolution=1, + w.grid(row=row, column=0, sticky='ew') + w = PysolScale(frame, from_=0, to=128, resolution=1, orient='horizontal', takefocus=0, length="3i", #label=_('Sample volume'), variable=self.sample_volume) w.grid(row=row, column=1, sticky='w', padx=5) row += 1 w = Tkinter.Label(frame, text=_('Music volume:')) - w.grid(row=row, column=0, sticky='w', padx=5) - w = Tkinter.Scale(frame, from_=0, to=128, resolution=1, + w.grid(row=row, column=0, sticky='ew', padx=5) + w = PysolScale(frame, from_=0, to=128, resolution=1, orient='horizontal', takefocus=0, length="3i", #label=_('Music volume'), variable=self.music_volume) diff --git a/pysollib/tile/timeoutsdialog.py b/pysollib/tile/timeoutsdialog.py index 89399b42..8aa8aa59 100644 --- a/pysollib/tile/timeoutsdialog.py +++ b/pysollib/tile/timeoutsdialog.py @@ -31,6 +31,8 @@ from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE from tkwidget import MfxDialog +from tkwidget import PysolScale + # /*********************************************************************** # // @@ -71,7 +73,7 @@ class TimeoutsDialog(MfxDialog): ): Tkinter.Label(frame, text=title, anchor='w' ).grid(row=row, column=0, sticky='we') - widget = Tkinter.Scale(frame, from_=0.2, to=9.9, + widget = PysolScale(frame, from_=0.2, to=9.9, value=var.get(), resolution=0.1, orient='horizontal', length="3i", variable=var, takefocus=0) widget.grid(row=row, column=1) diff --git a/pysollib/tile/tkhtml.py b/pysollib/tile/tkhtml.py index 6a63c27a..60a081e2 100644 --- a/pysollib/tile/tkhtml.py +++ b/pysollib/tile/tkhtml.py @@ -275,7 +275,7 @@ class HTMLViewer: fg='black', bg='white', bd=1, relief='sunken', cursor=self.defcursor, - wrap='word', padx=20, pady=20) + wrap='word', padx=10) self.text.pack(side=Tkinter.LEFT, fill=Tkinter.BOTH, expand=1) self.text["yscrollcommand"] = vbar.set vbar["command"] = self.text.yview diff --git a/pysollib/tile/tktree.py b/pysollib/tile/tktree.py index fe65d7f5..35599f68 100644 --- a/pysollib/tile/tktree.py +++ b/pysollib/tile/tktree.py @@ -255,8 +255,8 @@ class MfxTreeInCanvas(MfxScrolledCanvas): # self.style = self.Style() ##self.style.text_normal_fg = self.canvas.cget("insertbackground") - self.style.text_normal_fg = self.canvas.option_get('foreground', '') or self.canvas.cget("insertbackground") - self.style.text_normal_bg = self.canvas.option_get('background', self.canvas.cget("background")) + #self.style.text_normal_fg = self.canvas.option_get('foreground', '') or self.canvas.cget("insertbackground") + #self.style.text_normal_bg = self.canvas.option_get('background', self.canvas.cget("background")) # bind(self.canvas, "", self.singleClick) bind(self.canvas, "", self.doubleClick) diff --git a/pysollib/tile/tkutil.py b/pysollib/tile/tkutil.py index 6321d0de..48224b27 100644 --- a/pysollib/tile/tkutil.py +++ b/pysollib/tile/tkutil.py @@ -69,7 +69,6 @@ except ImportError: # Toolkit imports from tkconst import tkversion from pysollib.settings import PACKAGE -from pysollib.settings import TILE_THEME # /*********************************************************************** @@ -176,10 +175,13 @@ def make_help_toplevel(app, title=None): parent = app.top window = Tkinter.Tk(className=PACKAGE) window.tk.call('package', 'require', 'tile') + from pysollib.settings import TILE_THEME if TILE_THEME: ##window.tk.call('style', 'theme', 'use', TILE_THEME) style = Tkinter.Style(window) style.theme_use(TILE_THEME) + bg = window.tk.call('style', 'lookup', TILE_THEME, '-background') + window.tk_setPalette(bg) font = parent.option_get('font', '') if font: window.option_add('*font', font) @@ -202,11 +204,10 @@ def make_help_toplevel(app, title=None): def __getWidgetXY(widget, parent, relx=None, rely=None, w_width=None, w_height=None): - min_width, min_height = widget.wm_minsize() if w_width is None: - w_width = max(min_width, widget.winfo_reqwidth()) + w_width = widget.winfo_reqwidth() if w_height is None: - w_height = max(min_height, widget.winfo_reqheight()) + w_height = widget.winfo_reqheight() s_width = widget.winfo_screenwidth() s_height = widget.winfo_screenheight() m_x = m_y = 0 diff --git a/pysollib/tile/tkwidget.py b/pysollib/tile/tkwidget.py index 28f12246..e8641f55 100644 --- a/pysollib/tile/tkwidget.py +++ b/pysollib/tile/tkwidget.py @@ -720,3 +720,49 @@ class StackDesc: for b in self.bindings: self.label.unbind('', b) + +# /*********************************************************************** +# // +# ************************************************************************/ + +class PysolScale: + def __init__(self, parent, **kw): + if kw.has_key('resolution'): + self.resolution = kw['resolution'] + else: + self.resolution = 1 + if kw.has_key('command'): + self.command = kw['command'] + else: + self.command = None + self.frame = Tkinter.Frame(parent) + + self.label = Tkinter.Label(self.frame) + self.label.pack() + + kw['command'] = self._scale_command + self.scale = Tkinter.Scale(self.frame, **kw) + self.scale.pack(expand=True, fill='both') + + if kw.has_key('value'): + self.label.configure(text=self._round(kw['value'])) + elif kw.has_key('variable'): + self.label.configure(text=self._round(kw['variable'].get())) + + def _round(self, value): + return int(float(value)/self.resolution)*self.resolution + + def _scale_command(self, value): + self.label.configure(text=self._round(value)) + if self.command: + self.command(value) + + def pack(self, **kw): + self.frame.pack(**kw) + def grid(self, **kw): + self.frame.grid(**kw) + + def configure(self, **kw): + self.scale.configure(**kw) + config = configure + diff --git a/pysollib/tile/tkwrap.py b/pysollib/tile/tkwrap.py index 7f73d0a0..692f63d3 100644 --- a/pysollib/tile/tkwrap.py +++ b/pysollib/tile/tkwrap.py @@ -46,7 +46,6 @@ import Tile as Tkinter # PySol imports from pysollib.mfxutil import destruct, Struct -from pysollib.settings import TILE_THEME from tkutil import after_idle from tkconst import EVENT_HANDLED, EVENT_PROPAGATE @@ -87,6 +86,7 @@ class MfxRoot(Tkinter.Tk): def __init__(self, **kw): apply(Tkinter.Tk.__init__, (self,), kw) self.tk.call("package", "require", "tile") + from pysollib.settings import TILE_THEME if TILE_THEME: ##self.tk.call('style', 'theme', 'use', TILE_THEME) style = Tkinter.Style(self) diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py index 63607770..468a4461 100644 --- a/pysollib/tile/toolbar.py +++ b/pysollib/tile/toolbar.py @@ -223,7 +223,7 @@ class PysolToolbar(PysolToolbarActions): self.label_pady = 4 self.button_pad = 2 # - self.frame = Tkinter.Frame(top) #, class_='Toolbar') + self.frame = Tkinter.Frame(top, class_='Toolbar') # for l, f, t in ( (n_("New"), self.mNewGame, _("New game")), diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index ea2ea49a..19f7247e 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -121,12 +121,12 @@ class SoundOptionsDialog(MfxDialog): if app.audio.CAN_PLAY_MUSIC: # and app.startup_opt.sound_mode > 0: row += 1 w = Tkinter.Label(frame, text=_('Sample volume:')) - w.grid(row=row, column=0, sticky='w') + w.grid(row=row, column=0, sticky='ew') w = Tkinter.Scale(frame, from_=0, to=128, resolution=1, orient='horizontal', takefocus=0, length="3i", #label=_('Sample volume'), variable=self.sample_volume) - w.grid(row=row, column=1, sticky='w', padx=5) + w.grid(row=row, column=1, sticky='ew', padx=5) row += 1 w = Tkinter.Label(frame, text=_('Music volume:')) w.grid(row=row, column=0, sticky='w', padx=5) diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 0f8bdcbe..d5be640d 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -275,7 +275,7 @@ class HTMLViewer: fg='black', bg='white', bd=1, relief='sunken', cursor=self.defcursor, - wrap='word', padx=20, pady=20) + wrap='word', padx=10) self.text.pack(side=Tkinter.LEFT, fill=Tkinter.BOTH, expand=1) self.text["yscrollcommand"] = vbar.set vbar["command"] = self.text.yview From 76dcd2d1ae3e2751cb310ec8ab46f903f42edd8f Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 6 Oct 2006 21:22:09 +0000 Subject: [PATCH 077/266] + improved tile support git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@79 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- MANIFEST.in | 1 + pysollib/main.py | 14 +++++++++----- pysollib/tile/tkutil.py | 37 ++++++++++++++++++++++++++++++------- pysollib/tile/tkwrap.py | 12 ++++++------ pysollib/tile/toolbar.py | 6 +++++- 5 files changed, 51 insertions(+), 19 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 479e3134..da71a05a 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -17,6 +17,7 @@ include scripts/all_games.py scripts/cardset_viewer.py include docs/* graft data/html graft data/html-src +graft data/themes ## ## data - images ## diff --git a/pysollib/main.py b/pysollib/main.py index fe7fe883..908e31a8 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -213,9 +213,6 @@ def pysol_init(app, args): app.debug = int(opts['debug']) except: print >> sys.stderr, 'invalid argument for debug' - if opts['tile-theme']: - import settings - settings.TILE_THEME = opts['tile-theme'] # init games database import games @@ -245,8 +242,15 @@ def pysol_init(app, args): app.top_bg = top.cget("bg") app.top_palette = [None, None] # [fg, bg] app.top_cursor = top.cget("cursor") - - # print some debug info + if USE_TILE: + import settings + if opts['tile-theme']: + settings.TILE_THEME = opts['tile-theme'] + from pysoltk import load_theme + try: + load_theme(app, top, settings.TILE_THEME) + except Exception, err: + print >> sys.stderr, 'ERROR: set theme:', err # load options app.loadOptions() diff --git a/pysollib/tile/tkutil.py b/pysollib/tile/tkutil.py index 48224b27..ace112bc 100644 --- a/pysollib/tile/tkutil.py +++ b/pysollib/tile/tkutil.py @@ -52,6 +52,7 @@ __all__ = ['wm_withdraw', #'fillImage', 'createImage', 'get_text_width', + 'load_theme', ] # imports @@ -174,14 +175,9 @@ def make_help_toplevel(app, title=None): # Create an independent Toplevel window. parent = app.top window = Tkinter.Tk(className=PACKAGE) - window.tk.call('package', 'require', 'tile') from pysollib.settings import TILE_THEME if TILE_THEME: - ##window.tk.call('style', 'theme', 'use', TILE_THEME) - style = Tkinter.Style(window) - style.theme_use(TILE_THEME) - bg = window.tk.call('style', 'lookup', TILE_THEME, '-background') - window.tk_setPalette(bg) + load_theme(app, window, TILE_THEME) font = parent.option_get('font', '') if font: window.option_add('*font', font) @@ -195,7 +191,6 @@ def make_help_toplevel(app, title=None): if os.name == "posix": window.option_add('*Scrollbar.elementBorderWidth', '1', 60) window.option_add('*Scrollbar.borderWidth', '1', 60) - if title: window.wm_title(title) window.wm_iconname(title) @@ -409,3 +404,31 @@ def createImage(width, height, fill, outline=None): def get_text_width(text, font, root=None): return Font(root=root, font=font).measure(text) + +# /*********************************************************************** +# // +# ************************************************************************/ + +def load_theme(app, top, theme): + top.tk.call("package", "require", "tile") + # load available themes + d = os.path.join(app.dataloader.dir, 'themes') + if os.path.isdir(d): + top.tk.call('lappend', 'auto_path', d) + for t in os.listdir(d): + #top.tk.call('tile::setTheme', t) + try: + top.tk.call('package', 'require', 'tile::theme::'+t) + ##print 'load theme:', t + except: + traceback.print_exc() + pass + # set theme + if theme: + top.tk.call('style', 'theme', 'use', theme) + bg = top.tk.call('style', 'lookup', '.', '-background') + top.tk_setPalette(bg) + bg = top.tk.call('style', 'lookup', '.', '-background', 'active') + top.option_add('*Menu.activeBackground', bg) + + diff --git a/pysollib/tile/tkwrap.py b/pysollib/tile/tkwrap.py index 692f63d3..1ffdfc19 100644 --- a/pysollib/tile/tkwrap.py +++ b/pysollib/tile/tkwrap.py @@ -85,12 +85,12 @@ StringVar = Tkinter.StringVar class MfxRoot(Tkinter.Tk): def __init__(self, **kw): apply(Tkinter.Tk.__init__, (self,), kw) - self.tk.call("package", "require", "tile") - from pysollib.settings import TILE_THEME - if TILE_THEME: - ##self.tk.call('style', 'theme', 'use', TILE_THEME) - style = Tkinter.Style(self) - style.theme_use(TILE_THEME) +## self.tk.call("package", "require", "tile") +## from pysollib.settings import TILE_THEME +## if TILE_THEME: +## ##self.tk.call('style', 'theme', 'use', TILE_THEME) +## style = Tkinter.Style(self) +## style.theme_use(TILE_THEME) self.app = None # for interruptible sleep #self.sleep_var = Tkinter.IntVar(self) diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py index 468a4461..c2f61553 100644 --- a/pysollib/tile/toolbar.py +++ b/pysollib/tile/toolbar.py @@ -38,6 +38,7 @@ __all__ = ['PysolToolbar'] #, 'TOOLBAR_BUTTONS'] # imports import os, sys, types import traceback +import Tkinter as Tk import Tile as Tkinter try: # PIL @@ -223,7 +224,8 @@ class PysolToolbar(PysolToolbarActions): self.label_pady = 4 self.button_pad = 2 # - self.frame = Tkinter.Frame(top, class_='Toolbar') + #self.frame = Tkinter.Frame(top, class_='Toolbar') + self.frame = Tk.Frame(top) # for l, f, t in ( (n_("New"), self.mNewGame, _("New game")), @@ -273,6 +275,7 @@ class PysolToolbar(PysolToolbarActions): if os.name == 'posix': #self.frame.config(bd=0, highlightthickness=1) #~self.frame.config(bd=1, relief=self.frame_relief, highlightthickness=0) + self.frame.config(bd=1, relief='raised', highlightthickness=0) pass elif os.name == "nt": self.frame.config(bd=2, relief=self.frame_relief, padx=2, pady=2) @@ -536,6 +539,7 @@ class PysolToolbar(PysolToolbarActions): return 1 def setRelief(self, relief): + return True if self.button_relief == relief: return False self._setRelief(relief) From e401d6a28e2d34b2a1c0e88f1511e6729f762aec Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 7 Oct 2006 21:13:04 +0000 Subject: [PATCH 078/266] * improved tile support * misc. bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@80 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/games.pot | 26 ++- po/pysol.pot | 106 +++++------ po/ru_games.po | 30 +++- po/ru_pysol.po | 104 +++++------ pysollib/games/bakersdozen.py | 13 +- pysollib/main.py | 35 ++-- pysollib/tile/Tile.py | 15 +- pysollib/tile/statusbar.py | 7 +- pysollib/tile/tkhtml.py | 1 + pysollib/tile/tkstats.py | 327 ++++++++++------------------------ pysollib/tile/tkutil.py | 7 + 11 files changed, 289 insertions(+), 382 deletions(-) diff --git a/po/games.pot b/po/games.pot index a75bbdcd..ce537ad9 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Thu Sep 21 15:56:22 2006\n" +"POT-Creation-Date: Sat Oct 7 20:02:33 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -576,6 +576,9 @@ msgstr "" msgid "Congress" msgstr "" +msgid "Constitution" +msgstr "" + msgid "Contradance" msgstr "" @@ -723,6 +726,9 @@ msgstr "" msgid "Dojouji's Game Doubled" msgstr "" +msgid "Dolphin" +msgstr "" + msgid "Doorway" msgstr "" @@ -738,6 +744,9 @@ msgstr "" msgid "Double Cockroach" msgstr "" +msgid "Double Dolphin" +msgstr "" + msgid "Double Dot" msgstr "" @@ -3132,6 +3141,9 @@ msgstr "" msgid "Spanish Patience" msgstr "" +msgid "Spanish Patience II" +msgstr "" + msgid "Sphere" msgstr "" @@ -3342,6 +3354,12 @@ msgstr "" msgid "The Great Wall" msgstr "" +msgid "The Last Monarch" +msgstr "" + +msgid "The Last Monarch II" +msgstr "" + msgid "The Little Corporal" msgstr "" @@ -3354,9 +3372,6 @@ msgstr "" msgid "The Wish (open)" msgstr "" -msgid "The last Monarch" -msgstr "" - msgid "Theater" msgstr "" @@ -3669,6 +3684,9 @@ msgstr "" msgid "Zeus" msgstr "" +msgid "Zigzag Course" +msgstr "" + msgid "Zodiac" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index 8434726c..df025155 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Thu Sep 21 15:57:22 2006\n" +"POT-Creation-Date: Sat Oct 7 20:03:30 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-09-21 15:57+0400\n" +"POT-Creation-Date: 2006-10-07 20:03+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -69,8 +69,8 @@ msgid "&Next number" msgstr "" #: pysollib/actions.py:316 pysollib/app.py:1150 pysollib/app.py:1162 -#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:460 -#: pysollib/main.py:468 pysollib/tk/colorsdialog.py:122 +#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:478 +#: pysollib/main.py:486 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -422,31 +422,31 @@ msgid "" "This won't come out...\n" msgstr "" -#: pysollib/game.py:2298 +#: pysollib/game.py:2291 msgid "Set bookmark" msgstr "" -#: pysollib/game.py:2299 +#: pysollib/game.py:2292 msgid "Replace existing bookmark %d ?" msgstr "" -#: pysollib/game.py:2321 +#: pysollib/game.py:2314 msgid "Goto bookmark" msgstr "" -#: pysollib/game.py:2322 +#: pysollib/game.py:2315 msgid "Goto bookmark %d ?" msgstr "" -#: pysollib/game.py:2353 +#: pysollib/game.py:2346 msgid "Open game" msgstr "" -#: pysollib/game.py:2364 pysollib/game.py:2373 pysollib/game.py:2378 +#: pysollib/game.py:2357 pysollib/game.py:2366 pysollib/game.py:2371 msgid "Load game error" msgstr "" -#: pysollib/game.py:2365 +#: pysollib/game.py:2358 msgid "" "Error while loading game.\n" "\n" @@ -454,22 +454,22 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2374 +#: pysollib/game.py:2367 msgid "Error while loading game" msgstr "" -#: pysollib/game.py:2379 +#: pysollib/game.py:2372 msgid "" "Internal error while loading game.\n" "\n" "Please report this bug." msgstr "" -#: pysollib/game.py:2404 +#: pysollib/game.py:2397 msgid "Save game error" msgstr "" -#: pysollib/game.py:2405 +#: pysollib/game.py:2398 msgid "Error while saving game" msgstr "" @@ -683,7 +683,7 @@ msgstr "" #: pysollib/games/auldlangsyne.py:158 pysollib/games/calculation.py:104 #: pysollib/games/numerica.py:90 pysollib/games/numerica.py:272 -#: pysollib/games/numerica.py:639 pysollib/games/numerica.py:743 +#: pysollib/games/numerica.py:639 pysollib/games/numerica.py:752 msgid "Tableau. Build regardless of rank and suit." msgstr "" @@ -710,12 +710,12 @@ msgid "" msgstr "" #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1410 pysollib/util.py:80 +#: pysollib/stack.py:1409 pysollib/util.py:80 msgid "King" msgstr "" #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1409 pysollib/util.py:80 +#: pysollib/stack.py:1408 pysollib/util.py:80 msgid "Queen" msgstr "" @@ -744,11 +744,15 @@ msgstr "" msgid "Balance $%d" msgstr "" -#: pysollib/games/klondike.py:439 +#: pysollib/games/klondike.py:172 pysollib/stack.py:2115 +msgid "Tableau. Build down by color." +msgstr "" + +#: pysollib/games/klondike.py:441 msgid "Reserve. Only Kings are acceptable." msgstr "" -#: pysollib/games/larasgame.py:163 pysollib/stack.py:1626 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1625 msgid "Round %d" msgstr "" @@ -851,7 +855,7 @@ msgstr "" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1411 pysollib/util.py:79 +#: pysollib/stack.py:1410 pysollib/util.py:79 msgid "Ace" msgstr "" @@ -1231,7 +1235,7 @@ msgstr "" msgid " Help" msgstr "" -#: pysollib/main.py:67 pysollib/main.py:368 +#: pysollib/main.py:67 pysollib/main.py:386 msgid " installation error" msgstr "" @@ -1245,17 +1249,17 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:75 pysollib/main.py:376 pysollib/tk/menubar.py:382 +#: pysollib/main.py:75 pysollib/main.py:394 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "" -#: pysollib/main.py:98 +#: pysollib/main.py:99 msgid "" "%s: %s\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:139 +#: pysollib/main.py:143 msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" @@ -1273,19 +1277,19 @@ msgid "" " MOD - one of following: pss(default), pygame, oss, win\n" msgstr "" -#: pysollib/main.py:157 +#: pysollib/main.py:161 msgid "" "%s: too many files\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:161 +#: pysollib/main.py:165 msgid "" "%s: invalid file name\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:369 +#: pysollib/main.py:387 msgid "" "\n" "No games were found !!!\n" @@ -1296,25 +1300,25 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:455 pysollib/main.py:463 +#: pysollib/main.py:473 pysollib/main.py:481 msgid " installation problem" msgstr "" -#: pysollib/main.py:456 +#: pysollib/main.py:474 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:464 +#: pysollib/main.py:482 msgid "" "The pysolsoundserver module was not found.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:471 +#: pysollib/main.py:489 msgid "Welcome to " msgstr "" @@ -1582,71 +1586,71 @@ msgstr "" msgid "USA" msgstr "" -#: pysollib/settings.py:54 data/glade-translations:29 +#: pysollib/settings.py:55 data/glade-translations:29 msgid "Top 10" msgstr "" -#: pysollib/stack.py:1405 +#: pysollib/stack.py:1404 msgid "Base card - %s." msgstr "" -#: pysollib/stack.py:1406 +#: pysollib/stack.py:1405 msgid "Empty row cannot be filled." msgstr "" -#: pysollib/stack.py:1407 +#: pysollib/stack.py:1406 msgid "any card" msgstr "" -#: pysollib/stack.py:1408 pysollib/util.py:80 +#: pysollib/stack.py:1407 pysollib/util.py:80 msgid "Jack" msgstr "" -#: pysollib/stack.py:1421 +#: pysollib/stack.py:1420 msgid "No cards" msgstr "" -#: pysollib/stack.py:1422 +#: pysollib/stack.py:1421 msgid "1 card" msgstr "" -#: pysollib/stack.py:1423 +#: pysollib/stack.py:1422 msgid " cards" msgstr "" -#: pysollib/stack.py:1635 pysollib/stack.py:1637 pysollib/stack.py:1673 +#: pysollib/stack.py:1634 pysollib/stack.py:1636 pysollib/stack.py:1672 msgid "Redeal" msgstr "" -#: pysollib/stack.py:1637 +#: pysollib/stack.py:1636 msgid "Stop" msgstr "" -#: pysollib/stack.py:1698 +#: pysollib/stack.py:1697 msgid "Variable redeals." msgstr "" -#: pysollib/stack.py:1699 +#: pysollib/stack.py:1698 msgid "Unlimited redeals." msgstr "" -#: pysollib/stack.py:1700 +#: pysollib/stack.py:1699 msgid "No redeals." msgstr "" -#: pysollib/stack.py:1701 +#: pysollib/stack.py:1700 msgid "One redeal." msgstr "" -#: pysollib/stack.py:1702 +#: pysollib/stack.py:1701 msgid " redeals." msgstr "" -#: pysollib/stack.py:1704 +#: pysollib/stack.py:1703 msgid "Talon." msgstr "" -#: pysollib/stack.py:1938 pysollib/stack.py:2388 +#: pysollib/stack.py:1937 pysollib/stack.py:2388 msgid "Reserve. No building." msgstr "" @@ -1696,10 +1700,6 @@ msgstr "" msgid "Tableau. Build up by color." msgstr "" -#: pysollib/stack.py:2115 -msgid "Tableau. Build down by color." -msgstr "" - #: pysollib/stack.py:2123 msgid "Tableau. Build up by suit." msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 3558ae23..a8361fb1 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Thu Sep 21 15:56:22 2006\n" -"PO-Revision-Date: 2006-09-30 18:19+0400\n" +"POT-Creation-Date: Sat Oct 7 20:02:33 2006\n" +"PO-Revision-Date: 2006-10-07 20:10+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -580,6 +580,9 @@ msgstr "Конус" msgid "Congress" msgstr "Конгресс" +msgid "Constitution" +msgstr "Конституция" + msgid "Contradance" msgstr "Контрданс" @@ -728,6 +731,9 @@ msgstr "" msgid "Dojouji's Game Doubled" msgstr "" +msgid "Dolphin" +msgstr "Дельфин" + msgid "Doorway" msgstr "Вход" @@ -743,6 +749,9 @@ msgstr "Двойной Кенфилд" msgid "Double Cockroach" msgstr "Двойной таракан" +msgid "Double Dolphin" +msgstr "Двойной Дельфин" + msgid "Double Dot" msgstr "Двоеточие" @@ -3185,6 +3194,9 @@ msgstr "Промежутки и тузы" msgid "Spanish Patience" msgstr "Испанский пасьянс" +msgid "Spanish Patience II" +msgstr "Испанский пасьянс II" + msgid "Sphere" msgstr "Сфера" @@ -3402,6 +3414,14 @@ msgstr "Сад" msgid "The Great Wall" msgstr "Великая Стена" +#, fuzzy +msgid "The Last Monarch" +msgstr "Последний Монарх" + +#, fuzzy +msgid "The Last Monarch II" +msgstr "Последний Монарх" + msgid "The Little Corporal" msgstr "Маленький Капрал" @@ -3414,9 +3434,6 @@ msgstr "Желание" msgid "The Wish (open)" msgstr "Желание (открытое)" -msgid "The last Monarch" -msgstr "Последний Монарх" - msgid "Theater" msgstr "Театр" @@ -3745,6 +3762,9 @@ msgstr "Церлин (3 колоды)" msgid "Zeus" msgstr "Зевс" +msgid "Zigzag Course" +msgstr "" + msgid "Zodiac" msgstr "Зодиак" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 082f7a96..16810ff2 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Thu Sep 21 15:57:22 2006\n" +"POT-Creation-Date: Sat Oct 7 20:03:30 2006\n" "PO-Revision-Date: 2006-10-05 16:31+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" @@ -54,8 +54,8 @@ msgid "&Next number" msgstr "&Следующий номер" #: pysollib/actions.py:316 pysollib/app.py:1150 pysollib/app.py:1162 -#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:460 -#: pysollib/main.py:468 pysollib/tk/colorsdialog.py:122 +#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:478 +#: pysollib/main.py:486 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -460,31 +460,31 @@ msgstr "" "\n" "Не удалось...\n" -#: pysollib/game.py:2298 +#: pysollib/game.py:2291 msgid "Set bookmark" msgstr "Установить закладку" -#: pysollib/game.py:2299 +#: pysollib/game.py:2292 msgid "Replace existing bookmark %d ?" msgstr "Заменить существующую закладку %d ?" -#: pysollib/game.py:2321 +#: pysollib/game.py:2314 msgid "Goto bookmark" msgstr "Перейти к закладке" -#: pysollib/game.py:2322 +#: pysollib/game.py:2315 msgid "Goto bookmark %d ?" msgstr "Перейти к закладке %d ?" -#: pysollib/game.py:2353 +#: pysollib/game.py:2346 msgid "Open game" msgstr "Открыть игру" -#: pysollib/game.py:2364 pysollib/game.py:2373 pysollib/game.py:2378 +#: pysollib/game.py:2357 pysollib/game.py:2366 pysollib/game.py:2371 msgid "Load game error" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2365 +#: pysollib/game.py:2358 msgid "" "Error while loading game.\n" "\n" @@ -496,11 +496,11 @@ msgstr "" "Возможно повреждён файл,\n" "или ошибка в программе." -#: pysollib/game.py:2374 +#: pysollib/game.py:2367 msgid "Error while loading game" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2379 +#: pysollib/game.py:2372 msgid "" "Internal error while loading game.\n" "\n" @@ -510,11 +510,11 @@ msgstr "" "\n" "Пожалуйста сообщите об этой ошибке." -#: pysollib/game.py:2404 +#: pysollib/game.py:2397 msgid "Save game error" msgstr "Ошибка при сохранении игры" -#: pysollib/game.py:2405 +#: pysollib/game.py:2398 msgid "Error while saving game" msgstr "Ошибка при сохранении игры" @@ -728,7 +728,7 @@ msgstr "Пазлы" #: pysollib/games/auldlangsyne.py:158 pysollib/games/calculation.py:104 #: pysollib/games/numerica.py:90 pysollib/games/numerica.py:272 -#: pysollib/games/numerica.py:639 pysollib/games/numerica.py:743 +#: pysollib/games/numerica.py:639 pysollib/games/numerica.py:752 msgid "Tableau. Build regardless of rank and suit." msgstr "Игровой стол. Складывать не считаясь с мастью и достоинством." @@ -759,12 +759,12 @@ msgstr "" "4: 8 Д 3 7 В 2 6 10 Т 5 9 К" #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1410 pysollib/util.py:80 +#: pysollib/stack.py:1409 pysollib/util.py:80 msgid "King" msgstr "Король" #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1409 pysollib/util.py:80 +#: pysollib/stack.py:1408 pysollib/util.py:80 msgid "Queen" msgstr "Королева" @@ -794,11 +794,15 @@ msgstr "Базовая ячейка. Складывать по возраста msgid "Balance $%d" msgstr "Баланс $%d" -#: pysollib/games/klondike.py:439 +#: pysollib/games/klondike.py:172 pysollib/stack.py:2115 +msgid "Tableau. Build down by color." +msgstr "Игровой стол. Складывать по убыванию в соответствии с цветом." + +#: pysollib/games/klondike.py:441 msgid "Reserve. Only Kings are acceptable." msgstr "Резерв. Только для королей." -#: pysollib/games/larasgame.py:163 pysollib/stack.py:1626 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1625 msgid "Round %d" msgstr "Раунд %d" @@ -927,7 +931,7 @@ msgstr "Жезлы" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1411 pysollib/util.py:79 +#: pysollib/stack.py:1410 pysollib/util.py:79 msgid "Ace" msgstr "Туз" @@ -1335,7 +1339,7 @@ msgstr "Не найден файл помощи\n" msgid " Help" msgstr " Помощь" -#: pysollib/main.py:67 pysollib/main.py:368 +#: pysollib/main.py:67 pysollib/main.py:386 msgid " installation error" msgstr " проблема с установкой" @@ -1349,11 +1353,11 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:75 pysollib/main.py:376 pysollib/tk/menubar.py:382 +#: pysollib/main.py:75 pysollib/main.py:394 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "В&ыход" -#: pysollib/main.py:98 +#: pysollib/main.py:99 msgid "" "%s: %s\n" "try %s --help for more information" @@ -1361,7 +1365,7 @@ msgstr "" "%s: %s\n" "попробуйте %s --help для получения более подробной информации" -#: pysollib/main.py:139 +#: pysollib/main.py:143 #, fuzzy msgid "" "Usage: %s [OPTIONS] [FILE]\n" @@ -1390,7 +1394,7 @@ msgstr "" "\n" " FILE - имя файла сохранённой игры\n" -#: pysollib/main.py:157 +#: pysollib/main.py:161 msgid "" "%s: too many files\n" "try %s --help for more information" @@ -1398,7 +1402,7 @@ msgstr "" "\"%s: слишком много файлов\n" "попробуйте %s --help для получения более подробной информации" -#: pysollib/main.py:161 +#: pysollib/main.py:165 msgid "" "%s: invalid file name\n" "try %s --help for more information" @@ -1406,7 +1410,7 @@ msgstr "" "%s: неправильное имя файла\n" "попробуйте %s --help для получения более подробной информации" -#: pysollib/main.py:369 +#: pysollib/main.py:387 msgid "" "\n" "No games were found !!!\n" @@ -1417,18 +1421,18 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:455 pysollib/main.py:463 +#: pysollib/main.py:473 pysollib/main.py:481 msgid " installation problem" msgstr "" -#: pysollib/main.py:456 +#: pysollib/main.py:474 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:464 +#: pysollib/main.py:482 msgid "" "The pysolsoundserver module was not found.\n" "\n" @@ -1438,7 +1442,7 @@ msgstr "" "\n" "Звук и фоновая музыка будут недоступны" -#: pysollib/main.py:471 +#: pysollib/main.py:489 msgid "Welcome to " msgstr "Добро пожаловать в " @@ -1707,71 +1711,71 @@ msgstr "Швейцария" msgid "USA" msgstr "США" -#: pysollib/settings.py:54 data/glade-translations:29 +#: pysollib/settings.py:55 data/glade-translations:29 msgid "Top 10" msgstr "Top 10" -#: pysollib/stack.py:1405 +#: pysollib/stack.py:1404 msgid "Base card - %s." msgstr "Базовая карта - %s." -#: pysollib/stack.py:1406 +#: pysollib/stack.py:1405 msgid "Empty row cannot be filled." msgstr "Пустой ряд не заполняется." -#: pysollib/stack.py:1407 +#: pysollib/stack.py:1406 msgid "any card" msgstr "любая карта" -#: pysollib/stack.py:1408 pysollib/util.py:80 +#: pysollib/stack.py:1407 pysollib/util.py:80 msgid "Jack" msgstr "Валет" -#: pysollib/stack.py:1421 +#: pysollib/stack.py:1420 msgid "No cards" msgstr "Нет карт" -#: pysollib/stack.py:1422 +#: pysollib/stack.py:1421 msgid "1 card" msgstr "1 карта" -#: pysollib/stack.py:1423 +#: pysollib/stack.py:1422 msgid " cards" msgstr " карт" -#: pysollib/stack.py:1635 pysollib/stack.py:1637 pysollib/stack.py:1673 +#: pysollib/stack.py:1634 pysollib/stack.py:1636 pysollib/stack.py:1672 msgid "Redeal" msgstr "Сдать" -#: pysollib/stack.py:1637 +#: pysollib/stack.py:1636 msgid "Stop" msgstr "Стоп" -#: pysollib/stack.py:1698 +#: pysollib/stack.py:1697 msgid "Variable redeals." msgstr "Переменное количество пересдач." -#: pysollib/stack.py:1699 +#: pysollib/stack.py:1698 msgid "Unlimited redeals." msgstr "Неограниченное количество пересдач." -#: pysollib/stack.py:1700 +#: pysollib/stack.py:1699 msgid "No redeals." msgstr "Без пересдачи." -#: pysollib/stack.py:1701 +#: pysollib/stack.py:1700 msgid "One redeal." msgstr "1 пересдача." -#: pysollib/stack.py:1702 +#: pysollib/stack.py:1701 msgid " redeals." msgstr " пересдачи." -#: pysollib/stack.py:1704 +#: pysollib/stack.py:1703 msgid "Talon." msgstr "Колода." -#: pysollib/stack.py:1938 pysollib/stack.py:2388 +#: pysollib/stack.py:1937 pysollib/stack.py:2388 msgid "Reserve. No building." msgstr "Резерв. Без выкладывания." @@ -1821,10 +1825,6 @@ msgstr "Игровой стол. Складывать в соответстви msgid "Tableau. Build up by color." msgstr "Игровой стол. Складывать по возрастанию в соответствии с цветом." -#: pysollib/stack.py:2115 -msgid "Tableau. Build down by color." -msgstr "Игровой стол. Складывать по убыванию в соответствии с цветом." - #: pysollib/stack.py:2123 msgid "Tableau. Build up by suit." msgstr "Игровой стол. Складывать по возрастанию в соответствии с мастью." diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py index 3f8142f7..9feb0269 100644 --- a/pysollib/games/bakersdozen.py +++ b/pysollib/games/bakersdozen.py @@ -143,18 +143,21 @@ class BakersDozen(CastlesInSpain): # /*********************************************************************** # // Spanish Patience +# // Portuguese Solitaire # ************************************************************************/ class SpanishPatience(BakersDozen): Foundation_Class = AC_FoundationStack -# /*********************************************************************** -# // Portuguese Solitaire -# ************************************************************************/ - class PortugueseSolitaire(BakersDozen): RowStack_Class = StackWrapper(RK_RowStack, base_rank=KING) + def _shuffleHook(self, cards): + return cards + + +class SpanishPatienceII(PortugueseSolitaire): + RowStack_Class = RK_RowStack # /*********************************************************************** @@ -347,3 +350,5 @@ registerGame(GameInfo(369, RippleFan, "Ripple Fan", GI.GT_BAKERS_DOZEN, 1, -1, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(515, Indefatigable, "Indefatigable", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 2, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(664, SpanishPatienceII, "Spanish Patience II", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/main.py b/pysollib/main.py index 908e31a8..ccb8b807 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -242,15 +242,6 @@ def pysol_init(app, args): app.top_bg = top.cget("bg") app.top_palette = [None, None] # [fg, bg] app.top_cursor = top.cget("cursor") - if USE_TILE: - import settings - if opts['tile-theme']: - settings.TILE_THEME = opts['tile-theme'] - from pysoltk import load_theme - try: - load_theme(app, top, settings.TILE_THEME) - except Exception, err: - print >> sys.stderr, 'ERROR: set theme:', err # load options app.loadOptions() @@ -374,22 +365,20 @@ def pysol_init(app, args): app.opt.fonts["default"] = None if USE_TILE: # for tile + from pysoltk import load_theme + import settings + if opts['tile-theme']: + settings.TILE_THEME = opts['tile-theme'] + try: + load_theme(app, top, settings.TILE_THEME) + except Exception, err: + print >> sys.stderr, 'ERROR: set theme:', err ##top.option_add('*Toolbar.relief', 'groove') ##top.option_add('*Toolbar.relief', 'raised') - top.option_add('*Toolbar.borderWidth', 1) - top.option_add('*Toolbar.Button.Pad', 2) - top.option_add('*Toolbar.Button.default', 'disabled') - top.option_add('*Toolbar*takeFocus', 0) - # - from settings import TILE_THEME - if TILE_THEME: - if font: - top.tk.call('style', 'configure', '.', '-font', font) - else: - font = top.tk.call('style', 'lookup', TILE_THEME, '-font') - top.option_add('*font', font) - bg = top.tk.call('style', 'lookup', TILE_THEME, '-background') - top.tk_setPalette(bg) + ##top.option_add('*Toolbar.borderWidth', 1) + ##top.option_add('*Toolbar.Button.Pad', 2) + ##top.option_add('*Toolbar.Button.default', 'disabled') + ##top.option_add('*Toolbar*takeFocus', 0) # check games if len(app.gdb.getGamesIdSortedByName()) == 0: diff --git a/pysollib/tile/Tile.py b/pysollib/tile/Tile.py index 0ff0b8be..440d83b1 100644 --- a/pysollib/tile/Tile.py +++ b/pysollib/tile/Tile.py @@ -23,6 +23,10 @@ TkVersion = Tkinter.TkVersion TclError = Tkinter.TclError +# internal +_flatten = Tkinter._flatten + + class Style: def __init__(self, master): self.tk = master.tk @@ -84,7 +88,7 @@ class Style: for k, v in cnf.items(): if v is not None: if k[-1] == '_': k = k[:-1] - res = res + ('-'+k, v) + res = res + ('-'+k, str(v)) return res def configure(self, style, **kw): @@ -372,7 +376,7 @@ class Treeview(Widget, Tkinter.Listbox): The width of the column in pixels. Default is something reasonable, probably 200 or so. """ - pass + return self.tk.call((self._w, 'column', column) + self._options(kw)) def delete(self, items): """Deletes each of the items and all of their descendants. @@ -413,7 +417,7 @@ class Treeview(Widget, Tkinter.Listbox): -command script A script to evaluate when the heading label is pressed. """ - pass + return self.tk.call((self._w, 'heading', column) + self._options(kw)) def identify(self, x, y): """Returns a description of the widget component under the point given @@ -458,7 +462,10 @@ class Treeview(Widget, Tkinter.Listbox): returns the item identifier of the newly created item. See ITEM OPTIONS for the list of available options. """ - pass + if not parent: parent = '' + args = (self._w, 'insert', parent, index) + if id: args = args + ('-id', id) + return self.tk.call(args + self._options(kw)) def item(item, **kw): """Query or modify the options for the specified item. If no -option diff --git a/pysollib/tile/statusbar.py b/pysollib/tile/statusbar.py index dffb1b9f..e3abc65c 100644 --- a/pysollib/tile/statusbar.py +++ b/pysollib/tile/statusbar.py @@ -120,6 +120,7 @@ class MfxStatusbar: def configLabel(self, name, **kw): if kw.has_key('fg'): + kw['foreground'] = kw['fg'] del kw['fg'] label = getattr(self, name + "_label") apply(label.config, (), kw) @@ -165,21 +166,21 @@ class PysolStatusbar(MfxStatusbar): # l = self._createLabel("info", fill='both', expand=1) ##l.config(text="", justify="left", anchor='w') - #~l.config(padx=8) + l.config(padding=(8, 0)) class HelpStatusbar(MfxStatusbar): def __init__(self, top): MfxStatusbar.__init__(self, top, row=4, column=0, columnspan=3) l = self._createLabel("info", fill='both', expand=1) - l.config(justify="left", anchor='w') #~, padx=8) + l.config(justify="left", anchor='w', padding=(8, 0)) class HtmlStatusbar(MfxStatusbar): def __init__(self, top, row, column, columnspan): MfxStatusbar.__init__(self, top, row=row, column=column, columnspan=columnspan) l = self._createLabel("url", fill='both', expand=1) - l.config(justify="left", anchor='w') #~, padx=8) + l.config(justify="left", anchor='w', padding=(8, 0)) # /*********************************************************************** diff --git a/pysollib/tile/tkhtml.py b/pysollib/tile/tkhtml.py index 60a081e2..ab991d96 100644 --- a/pysollib/tile/tkhtml.py +++ b/pysollib/tile/tkhtml.py @@ -527,6 +527,7 @@ def tkhtml_main(args): except: url = os.path.join(os.pardir, os.pardir, "data", "html", "index.html") top = Tkinter.Tk() + top.tk.call("package", "require", "tile") top.wm_minsize(400, 200) viewer = HTMLViewer(top) viewer.app = None diff --git a/pysollib/tile/tkstats.py b/pysollib/tile/tkstats.py index 48b3e640..d0114c6f 100644 --- a/pysollib/tile/tkstats.py +++ b/pysollib/tile/tkstats.py @@ -300,229 +300,98 @@ class SingleGame_StatsDialog(MfxDialog): # // # ************************************************************************/ -class CanvasWriter(PysolStatsFormatter.StringWriter): - def __init__(self, canvas, parent_window, font, w, h): - self.canvas = canvas +class TreeWriter(PysolStatsFormatter.StringWriter): + def __init__(self, tree, parent_window, font, w, h): + self.tree = tree self.parent_window = parent_window - ##self.fg = canvas.cget("insertbackground") - self.fg = canvas.option_get('foreground', '') or canvas.cget("insertbackground") self.font = font - self.w = w - self.h = h - self.x = self.y = 0 self.gameid = None self.gamenumber = None - self.canvas.config(yscrollincrement=h) self._tabs = None - - def _addItem(self, id): - self.canvas.dialog.nodes[id] = (self.gameid, self.gamenumber) + self.w = w + self.h = h def p(self, s): - if self.y > 16000: - return - h1, h2 = 0, 0 - while s and s[0] == "\n": - s = s[1:] - h1 = h1 + self.h - while s and s[-1] == "\n": - s = s[:-1] - h2 = h2 + self.h - self.y = self.y + h1 - if s: - id = self.canvas.create_text(self.x, self.y, text=s, anchor="nw", - font=self.font, fill=self.fg) - self._addItem(id) - self.y = self.y + h2 + pass def pheader(self, s): pass def _calc_tabs(self, arg): - tw = 15*self.w + if self.parent_window.tree_tabs: + self._tabs = self.parent_window.tree_tabs + return + tw = 20*self.w ##tw = 160 self._tabs = [tw] - font = tkFont.Font(self.canvas, self.font) + font = tkFont.Font(self.tree, self.font) for t in arg[1:]: tw = font.measure(t)+20 self._tabs.append(tw) self._tabs.append(10) + self.parent_window.tree_tabs = self._tabs def pstats(self, *args, **kwargs): - gameid=kwargs.get('gameid', None) header = False if self._tabs is None: # header - header = True self._calc_tabs(args) - self.gameid = 'header' - self.gamenumber = None -## if False: -## sort_by = ( 'name', 'played', 'won', 'lost', -## 'time', 'moves', 'percent', ) -## frame = Tkinter.Frame(self.canvas) -## i = 0 -## for t in args: -## w = self._tabs[i] -## if i == 0: -## w += 10 -## b = Tkinter.Button(frame, text=t) -## b.grid(row=0, column=i, sticky='ew') -## b.bind('<1>', lambda e, f=self.parent_window.rearrange, s=sort_by[i]: f(s)) -## frame.columnconfigure(i, minsize=w) -## i += 1 -## self.canvas.create_window(0, 0, window=frame, anchor='nw') -## self.y += 20 -## return -## if False: -## i = 0 -## x = 0 -## for t in args: -## w = self._tabs[i] -## h = 18 -## anchor = 'ne' -## y = 0 -## self.canvas.create_rectangle(x+2, y, x+w, y+h, width=1, -## fill="#00ff00", outline="#000000") -## x += w -## self.canvas.create_text(x-3, y+3, text=t, anchor=anchor) -## i += 1 -## self.y += 20 -## return + header = True - else: - self.gameid = gameid - self.gamenumber = None - if self.y > 16000: - return - x, y = 1, self.y - p = self._pstats_text t1, t2, t3, t4, t5, t6, t7 = args - h = 0 if not header: t1=gettext(t1) # game name - for var, text, anchor, tab in ( - ('name', t1, 'nw', self._tabs[0]+self._tabs[1]), - ('played', t2, 'ne', self._tabs[2]), - ('won', t3, 'ne', self._tabs[3]), - ('lost', t4, 'ne', self._tabs[4]), - ('time', t5, 'ne', self._tabs[5]), - ('moves', t6, 'ne', self._tabs[6]), - ('percent', t7, 'ne', self._tabs[7]), ): - if header: self.gamenumber=var - h = max(h, p(x, y, anchor=anchor, text=text)) - x += tab + if header: + for column, text, anchor, tab in ( + ('#0', t1, 'nw', self._tabs[0]), + ('played', t2, 'ne', self._tabs[1]), + ('won', t3, 'ne', self._tabs[2]), + ('lost', t4, 'ne', self._tabs[3]), + ('time', t5, 'ne', self._tabs[4]), + ('moves', t6, 'ne', self._tabs[5]), + ('percent', t7, 'ne', self._tabs[6]), ): + self.tree.heading(column, text=text, + command=lambda par=self.parent_window, col=column: par.headerClick(col)) + self.tree.column(column, width=tab) + else: + id = self.tree.insert(None, "end", text=t1, + values=(t2, t3, t4, t5, t6, t7)) + self.parent_window.tree_items.append(id) - self.pstats_perc(x, y, t7) - self.y += h - self.gameid = None - return + def plog(self, *args, **kwargs): + header = False + if self._tabs is None: + # header + self._calc_tabs(('', '99999999999999999999', '9999-99-99 99:99', 'XXXXXXXXXXXX')) + header = True -## h = max(h, p(x, y, anchor="nw", text=t1)) -## if header: self.gamenumber='played' -## x += self._tabs[0]+self._tabs[1] -## h = max(h, p(x, y, anchor="ne", text=t2)) -## if header: self.gamenumber='won' -## x += self._tabs[2] -## h = max(h, p(x, y, anchor="ne", text=t3)) -## if header: self.gamenumber='lost' -## x += self._tabs[3] -## h = max(h, p(x, y, anchor="ne", text=t4)) -## if header: self.gamenumber='time' -## x += self._tabs[4] -## h = max(h, p(x, y, anchor="ne", text=t5)) -## if header: self.gamenumber='moves' -## x += self._tabs[5] -## h = max(h, p(x, y, anchor="ne", text=t6)) -## if header: self.gamenumber='percent' -## x += self._tabs[6] -## h = max(h, p(x, y, anchor="ne", text=t7)) -## x += self._tabs[7] -## self.pstats_perc(x, y, t7) -## self.y += h -## self.gameid = None + t1, t2, t3, t4 = args[:4] + if not header: t1=gettext(t1) # game name - def _pstats_text(self, x, y, **kw): - kwdefault(kw, font=self.font, fill=self.fg) - id = apply(self.canvas.create_text, (x, y), kw) - self._addItem(id) - return self.h - ##bbox = self.canvas.bbox(id) - ##return bbox[3] - bbox[1] - - def pstats_perc(self, x, y, t): - if not (t and "0" <= t[0] <= "9"): - return - perc = int(round(float(str(t)))) - if perc < 1: - return - rx, ry, rw, rh = x, y+1, 2 + 8*10, self.h-5 - if 1: - w = int(round(rw*perc/100.0)) - if 1 and w < 1: - return - if w > 0: - w = max(3, w) - w = min(rw - 2, w) - id = self.canvas.create_rectangle(rx, ry, rx+w, ry+rh, width=1, - fill="#00ff00", outline="#000000") - if w < rw: - id = self.canvas.create_rectangle(rx+w, ry, rx+rw, ry+rh, width=1, - fill="#ff0000", outline="#000000") - return - ##fill = "#ffffff" - ##fill = self.canvas["bg"] - fill = None - id = self.canvas.create_rectangle(rx, ry, rx+rw, ry+rh, width=1, - fill=fill, outline="#808080") - if 1: - rx, rw = rx + 1, rw - 1 - ry, rh = ry + 1, rh - 1 - w = int(round(rw*perc/100.0)) - if w > 0: - id = self.canvas.create_rectangle(rx, ry, rx+w, ry+rh, width=0, - fill="#00ff00", outline="") - if w < rw: - id = self.canvas.create_rectangle(rx+w, ry, rx+rw, ry+rh, width=0, - fill="#ff0000", outline="") - return - p = 1.0 - ix = rx + 2 - for i in (1, 11, 21, 31, 41, 51, 61, 71, 81, 91): - if perc < i: - break - ##c = "#ff8040" - r, g, b = 255, 128*p, 64*p - c = "#%02x%02x%02x" % (int(r), int(g), int(b)) - id = self.canvas.create_rectangle(ix, ry+2, ix+6, ry+rh-2, width=0, - fill=c, outline=c) - ix = ix + 8 - p = max(0.0, p - 0.1) - - def plog(self, gamename, gamenumber, date, status, gameid=-1, won=-1): - if gameid > 0 and "0" <= gamenumber[0:1] <= "9": - self.gameid = gameid - self.gamenumber = gamenumber - self.p("%-25s %-20s %17s %s\n" % (gamename, gamenumber, date, status)) - self.gameid = None - self.gamenumber = None + if header: + for column, text, anchor, tab in ( + ('#0', t1, 'nw', self._tabs[0]), + ('gamenumber', t2, 'ne', self._tabs[1]), + ('date', t3, 'ne', self._tabs[2]), + ('status', t4, 'ne', self._tabs[3]), ): + self.tree.heading(column, text=text, + command=lambda par=self.parent_window, col=column: par.headerClick(col)) + self.tree.column(column, width=tab) + ##if column in ('gamenumber', 'date', 'status'): + ## self.tree.column(column, anchor='center') + else: + id = self.tree.insert(None, "end", text=t1, values=(t2, t3, t4)) + self.parent_window.tree_items.append(id) # /*********************************************************************** # // # ************************************************************************/ -class AllGames_StatsDialogScrolledCanvas(MfxScrolledCanvas): - pass - - class AllGames_StatsDialog(MfxDialog): - # for font "canvas_fixed" - #CHAR_W, CHAR_H = 7, 16 - #if os.name == "mac": CHAR_W = 6 - # - YVIEW = 0 + FONT_TYPE = "default" + COLUMNS = ('played', 'won', 'lost', 'time', 'moves', 'percent') def __init__(self, parent, title, app, player, **kw): lines = 25 @@ -539,6 +408,8 @@ class AllGames_StatsDialog(MfxDialog): self.player = player self.title = title self.sort_by = 'name' + self.tree_items = [] + self.tree_tabs = None # kwdefault(kw, width=self.CHAR_W*64, height=lines*self.CHAR_H) kw = self.initKw(kw) @@ -549,22 +420,15 @@ class AllGames_StatsDialog(MfxDialog): self.top.wm_minsize(200, 200) self.button = kw.default # - self.sc = AllGames_StatsDialogScrolledCanvas(top_frame, - width=kw.width, height=kw.height) - self.sc.pack(fill=Tkinter.BOTH, expand=1, padx=kw.padx, pady=kw.pady) - # - self.nodes = {} - self.canvas = self.sc.canvas - self.canvas.dialog = self - bind(self.canvas, "<1>", self.singleClick) + frame = Tkinter.Frame(top_frame) + frame.pack(fill='both', expand=True, padx=kw.padx, pady=kw.pady) + sb = Tkinter.Scrollbar(frame) + sb.pack(side='right', fill='y') + self.tree = Tkinter.Treeview(frame, columns=self.COLUMNS) + self.tree.pack(side='left', fill='both', expand=True) + self.tree.config(yscrollcommand=sb.set) + sb.config(command=self.tree.yview) self.fillCanvas(player, title) - bbox = self.canvas.bbox("all") - ##print bbox - ##self.canvas.config(scrollregion=bbox) - dx, dy = 4, 0 - self.canvas.config(scrollregion=(-dx,-dy,bbox[2]+dx,bbox[3]+dy)) - self.canvas.xview_moveto(-dx) - self.canvas.yview_moveto(self.YVIEW) # focus = self.createButtons(bottom_frame, kw) self.mainloop(focus, kw.timeout) @@ -583,47 +447,32 @@ class AllGames_StatsDialog(MfxDialog): def destroy(self): self.app = None - self.canvas.dialog = None - self.nodes = {} - self.sc.destroy() + self.tree.destroy() MfxDialog.destroy(self) - def rearrange(self, sort_by): + def headerClick(self, column): + if column == '#0': + sort_by = 'name' + else: + sort_by = column if self.sort_by == sort_by: return self.sort_by = sort_by self.fillCanvas(self.player, self.title) - def singleClick(self, event=None): - id = self.canvas.find_withtag(Tkinter.CURRENT) - if not id: - return - ##print id, self.nodes.get(id[0]) - gameid, gamenumber = self.nodes.get(id[0], (None, None)) - if gameid == 'header': - if self.sort_by == gamenumber: return - self.sort_by = gamenumber - self.fillCanvas(self.player, self.title) - return - ## FIXME / TODO - return - if gameid and gamenumber: - print gameid, gamenumber - elif gameid: - print gameid - # # # def fillCanvas(self, player, header): - self.canvas.delete('all') - self.nodes = {} + if self.tree_items: + self.tree.delete(tuple(self.tree_items)) + self.tree_items = [] a = PysolStatsFormatter(self.app) - #print 'CHAR_W:', self.CHAR_W - writer = CanvasWriter(self.canvas, self, - self.font, self.CHAR_W, self.CHAR_H) + writer = TreeWriter(self.tree, self, + self.font, self.CHAR_W, self.CHAR_H) if not a.writeStats(writer, player, header, sort_by=self.sort_by): - writer.p(_("No entries for player ") + player + "\n") + # FIXME + pass destruct(writer) destruct(a) @@ -633,35 +482,45 @@ class AllGames_StatsDialog(MfxDialog): # ************************************************************************/ class FullLog_StatsDialog(AllGames_StatsDialog): - YVIEW = 1 + FONT_TYPE = "fixed" + COLUMNS = ('gamenumber', 'date', 'status') def fillCanvas(self, player, header): a = PysolStatsFormatter(self.app) - writer = CanvasWriter(self.canvas, self, self.font, self.CHAR_W, self.CHAR_H) + writer = TreeWriter(self.tree, self, self.font, + self.CHAR_W, self.CHAR_H) if not a.writeFullLog(writer, player, header): - writer.p(_("No log entries for %s\n") % player) + # FIXME + pass destruct(a) def initKw(self, kw): kw = KwStruct(kw, - strings=(_("&OK"), (_("Session &log..."), 104), (_("&Save to file"), 203)), default=0, + strings=(_("&OK"), (_("Session &log..."), 104), + (_("&Save to file"), 203)), default=0, width=76*self.CHAR_W, ) return AllGames_StatsDialog.initKw(self, kw) + def headerClick(self, column): + pass + class SessionLog_StatsDialog(FullLog_StatsDialog): def fillCanvas(self, player, header): a = PysolStatsFormatter(self.app) - writer = CanvasWriter(self.canvas, self, self.font, self.CHAR_W, self.CHAR_H) + writer = TreeWriter(self.tree, self, self.font, + self.CHAR_W, self.CHAR_H) if not a.writeSessionLog(writer, player, header): - writer.p(_("No current session log entries for %s\n") % player) + # FIXME + pass destruct(a) def initKw(self, kw): kw = KwStruct(kw, - strings=(_("&OK"), (_("&Full log..."), 103), (_("&Save to file"), 204)), default=0, + strings=(_("&OK"), (_("&Full log..."), 103), + (_("&Save to file"), 204)), default=0, ) return FullLog_StatsDialog.initKw(self, kw) diff --git a/pysollib/tile/tkutil.py b/pysollib/tile/tkutil.py index ace112bc..a1d4efe1 100644 --- a/pysollib/tile/tkutil.py +++ b/pysollib/tile/tkutil.py @@ -430,5 +430,12 @@ def load_theme(app, top, theme): top.tk_setPalette(bg) bg = top.tk.call('style', 'lookup', '.', '-background', 'active') top.option_add('*Menu.activeBackground', bg) + font = app.opt.fonts['default'] + if font: + top.tk.call('style', 'configure', '.', '-font', font) + else: + font = top.tk.call('style', 'lookup', '.', '-font') + top.option_add('*font', font) + From a4a25adbd9fa7a91188cd7395a617402f3908a56 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 20 Oct 2006 21:18:06 +0000 Subject: [PATCH 079/266] * improved statistics * improved tile support * misc. bugs fixes and improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@81 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/ru_games.po | 4 +- pysollib/actions.py | 27 ++-- pysollib/app.py | 8 +- pysollib/game.py | 8 +- pysollib/games/capricieuse.py | 4 +- pysollib/games/fortythieves.py | 10 +- pysollib/games/numerica.py | 5 + pysollib/games/royalcotillion.py | 19 ++- pysollib/pysolgtk/tkstats.py | 105 +++++++------- pysollib/stats.py | 197 ++++++++++++++++----------- pysollib/tile/progressbar.py | 3 +- pysollib/tile/tkconst.py | 4 +- pysollib/tile/tkstats.py | 227 ++++++++++--------------------- pysollib/tile/tktree.py | 4 +- pysollib/tk/tkstats.py | 205 +++++++++------------------- 15 files changed, 371 insertions(+), 459 deletions(-) diff --git a/po/ru_games.po b/po/ru_games.po index a8361fb1..419db16f 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" "POT-Creation-Date: Sat Oct 7 20:02:33 2006\n" -"PO-Revision-Date: 2006-10-07 20:10+0400\n" +"PO-Revision-Date: 2006-10-08 18:43+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -1430,7 +1430,7 @@ msgid "Intelligence +" msgstr "Смекалка +" msgid "Interchange" -msgstr "Чередование" +msgstr "Перестановка" msgid "Interment" msgstr "Погребение" diff --git a/pysollib/actions.py b/pysollib/actions.py index 0358bbc8..54f85814 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -46,18 +46,16 @@ from settings import TOP_TITLE from gamedb import GI # stats imports -from stats import PysolStatsFormatter +from stats import FileStatsFormatter from pysoltk import SingleGame_StatsDialog, AllGames_StatsDialog from pysoltk import FullLog_StatsDialog, SessionLog_StatsDialog from pysoltk import Status_StatsDialog, Top_StatsDialog from pysoltk import GameInfoDialog # toolkit imports -from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE from pysoltk import MfxMessageDialog, MfxSimpleEntry from pysoltk import MfxExceptionDialog from pysoltk import PlayerOptionsDialog -#from pysoltk import HintOptionsDialog from pysoltk import TimeoutsDialog from pysoltk import ColorsDialog from pysoltk import FontsDialog @@ -533,7 +531,7 @@ class PysolMenubarActions: # Game menu - statistics # - def _mStatsSave(self, player, header, filename, write_method): + def _mStatsSave(self, player, filename, write_method): file = None if player is None: text = _("Demo statistics") @@ -544,10 +542,8 @@ class PysolMenubarActions: filename = os.path.normpath(filename) try: file = open(filename, "a") - a = PysolStatsFormatter(self.app) - writer = a.FileWriter(file) - apply(write_method, (a, writer, player, header)) - destruct(a) + a = FileStatsFormatter(self.app, file) + write_method(a, player) except EnvError, ex: if file: file.close() d = MfxExceptionDialog(self.top, ex, @@ -597,19 +593,16 @@ class PysolMenubarActions: d = GameInfoDialog(self.top, header, self.app) elif mode == 202: # print stats to file - header = _("Statistics for ") + p0 - write_method = PysolStatsFormatter.writeStats - self._mStatsSave(player, header, "stats", write_method) + write_method = FileStatsFormatter.writeStats + self._mStatsSave(player, "stats", write_method) elif mode == 203: # print full log to file - header = _("Full log for ") + p0 - write_method = PysolStatsFormatter.writeFullLog - self._mStatsSave(player, header, "log", write_method) + write_method = FileStatsFormatter.writeFullLog + self._mStatsSave(player, "log", write_method) elif mode == 204: # print session log to file - header = _("Session log for ") + p0 - write_method = PysolStatsFormatter.writeSessionLog - self._mStatsSave(player, header, "log", write_method) + write_method = FileStatsFormatter.writeSessionLog + self._mStatsSave(player, "log", write_method) elif mode == 301: # reset all player stats if self.game.areYouSure(_("Reset all statistics"), diff --git a/pysollib/app.py b/pysollib/app.py index c1c8329f..6d73bbbb 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -143,10 +143,10 @@ class Options: 'startdrag' : True, 'turnwaste' : True, 'undo' : True, - 'gamefinished' : True, - 'gamelost' : True, - 'gameperfect' : True, - 'gamewon' : True, + 'gamefinished' : False, + 'gamelost' : False, + 'gameperfect' : False, + 'gamewon' : False, } # fonts self.fonts = {"default" : None, diff --git a/pysollib/game.py b/pysollib/game.py index b52018da..f5f77889 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -778,8 +778,6 @@ class Game: def _defaultHandler(self): self.interruptSleep() self.deleteStackDesc() - if self.demo: - self.stopDemo() def clickHandler(self, event): self._defaultHandler() @@ -789,6 +787,9 @@ class Game: def undoHandler(self, event): if not self.app: return EVENT_PROPAGATE # FIXME (GTK) self._defaultHandler() + if self.demo: + self.stopDemo() + return if self.app.opt.mouse_undo and not self.event_handled: self.app.menubar.mUndo() self.event_handled = False @@ -797,6 +798,9 @@ class Game: def redoHandler(self, event): if not self.app: return EVENT_PROPAGATE # FIXME (GTK) self._defaultHandler() + if self.demo: + self.stopDemo() + return if self.app.opt.mouse_undo and not self.event_handled: self.app.menubar.mRedo() self.event_handled = False diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py index f3351ded..032391b1 100644 --- a/pysollib/games/capricieuse.py +++ b/pysollib/games/capricieuse.py @@ -132,7 +132,7 @@ class Strata(Game): for i in range(8): s.rows.append(AC_RowStack(x, y, self, max_move=1, max_accept=1)) x = x + l.XS - s.talon = RedealTalonStack(l.XM, l.YM, self, max_rounds=2) + s.talon = RedealTalonStack(l.XM, l.YM, self, max_rounds=3) # define stack-groups l.defaultStackGroups() @@ -157,6 +157,6 @@ registerGame(GameInfo(293, Nationale, "Nationale", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, altnames=('Zigzag Course',) )) registerGame(GameInfo(606, Strata, "Strata", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 1, GI.SL_MOSTLY_SKILL, + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 2, GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 9115b21d..526f217e 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -693,18 +693,20 @@ class Octagon(Game): i = 0 for x, y in ((l.XM+w1, l.YM), (l.XM+w1+l.XS, l.YM), - (l.XM+w1-2*l.XS-l.XM, l.YM+l.YS), - (l.XM+w1-l.XS-l.XM, l.YM+l.YS), - (l.XM+w1+2*l.XS+l.XM, l.YM+l.YS), - (l.XM+w1+3*l.XS+l.XM, l.YM+l.YS), + (l.XM+w1-2*l.XS-l.XS/2-l.XM, l.YM+l.YS), + (l.XM+w1-l.XS-l.XS/2-l.XM, l.YM+l.YS), + (l.XM+w1+2*l.XS+l.XS/2+l.XM, l.YM+l.YS), + (l.XM+w1+3*l.XS+l.XS/2+l.XM, l.YM+l.YS), (l.XM+w1, l.YM+2*l.YS), (l.XM+w1+l.XS, l.YM+2*l.YS),): s.foundations.append(SS_FoundationStack(x, y, self, suit=i%4)) i += 1 x, y = l.XM+w1, l.YM+l.YS s.talon = WasteTalonStack(x, y, self, max_rounds=4) + l.createText(s.talon, 'nw') x += l.XS s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'ne') l.defaultStackGroups() diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index 7497c5a6..e06a1edf 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -596,6 +596,10 @@ class Toad(Game): # // Shifting # ************************************************************************/ +class Shifting_Hint(Numerica_Hint): + shallMovePile = DefaultHint._cautiousShallMovePile + + class Shifting_RowStack(Numerica_RowStack): def acceptsCards(self, from_stack, cards): if not BasicRowStack.acceptsCards(self, from_stack, cards): @@ -611,6 +615,7 @@ class Shifting_RowStack(Numerica_RowStack): class Shifting(Numerica): + Hint_Class = Shifting_Hint RowStack_Class = StackWrapper(Shifting_RowStack, max_accept=1) diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 0c1e134b..d11f2cff 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -415,10 +415,8 @@ class Carpet(Game): # // British Constitution # ************************************************************************/ -class BritishConstitution_RowStack(AC_RowStack): +class BritishConstitution_RowStackMethods: def acceptsCards(self, from_stack, cards): - if not AC_RowStack.acceptsCards(self, from_stack, cards): - return False if self in self.game.s.rows[:8] and from_stack in self.game.s.rows[8:16]: return True if self in self.game.s.rows[8:16] and from_stack in self.game.s.rows[16:24]: @@ -429,6 +427,18 @@ class BritishConstitution_RowStack(AC_RowStack): return True return False +class BritishConstitution_RowStack(BritishConstitution_RowStackMethods, AC_RowStack): + def acceptsCards(self, from_stack, cards): + if not AC_RowStack.acceptsCards(self, from_stack, cards): + return False + return BritishConstitution_RowStackMethods.acceptsCards(self, from_stack, cards) + +class NewBritishConstitution_RowStack(BritishConstitution_RowStackMethods, RK_RowStack): + def acceptsCards(self, from_stack, cards): + if not RK_RowStack.acceptsCards(self, from_stack, cards): + return False + return BritishConstitution_RowStackMethods.acceptsCards(self, from_stack, cards) + class BritishConstitution_Foundation(SS_FoundationStack): def acceptsCards(self, from_stack, cards): @@ -500,8 +510,7 @@ class BritishConstitution(Game): class NewBritishConstitution(BritishConstitution): - RowStack_Class = StackWrapper(BritishConstitution_RowStack, base_rank=JACK) - + RowStack_Class = StackWrapper(NewBritishConstitution_RowStack, base_rank=JACK) # /*********************************************************************** diff --git a/pysollib/pysolgtk/tkstats.py b/pysollib/pysolgtk/tkstats.py index 28e2281d..e2ff02fe 100644 --- a/pysollib/pysolgtk/tkstats.py +++ b/pysollib/pysolgtk/tkstats.py @@ -40,61 +40,71 @@ gettext = _ # // # ************************************************************************/ -class StatsWriter(PysolStatsFormatter.StringWriter): +class StatsFormatter(PysolStatsFormatter): - def __init__(self, store): + def __init__(self, app, store): + self.app = app self.store = store - def p(self, s): - pass - - def pheader(self, s): - pass - - def pstats(self, *args, **kwargs): - gameid=kwargs.get('gameid', None) - if gameid is None: - # header - return + def writeStats(self, player, sort_by='name'): + for result in self.getStatResults(player, sort_by): + iter = self.store.append(None) + self.store.set(iter, + 0, gettext(result[0]), + 1, result[1], + 2, result[2], + 3, result[3], + 4, result[4], + 5, result[5], + 6, result[6], + 7, result[7]) + total, played, won, lost, time, moves, perc = self.getStatSummary() + text = _("Total (%d out of %d games)") % (played, total) iter = self.store.append(None) self.store.set(iter, - 0, gettext(args[0]), - 1, args[1], - 2, args[2], - 3, args[3], - 4, args[4], - 5, args[5], - 6, args[6], - 7, gameid) + 0, text, + 1, won+lost, + 2, won, + 3, lost, + 4, time, + 5, moves, + 6, perc, + 7, -1) + return 1 -class LogWriter(PysolStatsFormatter.StringWriter): +class LogFormatter(PysolStatsFormatter): MAX_ROWS = 10000 - def __init__(self, store): + def __init__(self, app, store): + self.app = app self.store = store self._num_rows = 0 - def p(self, s): - pass + def writeLog(self, player, prev_games): + if not player or not prev_games: + return 0 + num_rows = 0 + for result in self.getLogResults(player, prev_games): + iter = self.store.append(None) + self.store.set(iter, + 0, gettext(result[0]), + 1, result[1], + 2, result[2], + 3, result[3], + 4, result[4]) + num_rows += 1 + if num_rows > self.MAX_ROWS: + break + return 1 - def pheader(self, s): - pass + def writeFullLog(self, player): + prev_games = self.app.stats.prev_games.get(player) + return self.writeLog(player, prev_games) - def plog(self, gamename, gamenumber, date, status, gameid=-1, won=-1): - if gameid < 0: - # header - return - if self._num_rows > self.MAX_ROWS: - return - iter = self.store.append(None) - self.store.set(iter, - 0, gettext(gamename), - 1, gamenumber, - 2, date, - 3, status, - 4, gameid) - self._num_rows += 1 + def writeSessionLog(self, player): + prev_games = self.app.stats.session_games.get(player) + return self.writeLog(player, prev_games) class Game_StatsDialog: @@ -107,7 +117,6 @@ class Game_StatsDialog: self.games = {} self.games_id = [] # sorted by name # - formatter = PysolStatsFormatter(self.app) glade_file = app.dataloader.findFile('pysolfc.glade') # games = app.gdb.getGamesIdSortedByName() @@ -142,16 +151,16 @@ class Game_StatsDialog: self._updateTop(gameid) # all games stat store = self._createStatsList() - writer = StatsWriter(store) - formatter.writeStats(writer, player, header, sort_by='name') + formatter = StatsFormatter(app, store) + formatter.writeStats(player) # full log store = self._createLogList('full_log_treeview') - writer = LogWriter(store) - formatter.writeFullLog(writer, player, header) + formatter = LogFormatter(app, store) + formatter.writeFullLog(player) # session log store = self._createLogList('session_log_treeview') - writer = LogWriter(store) - formatter.writeSessionLog(writer, player, header) + formatter = LogFormatter(app, store) + formatter.writeSessionLog(player) # self._translateLabels() dialog = self.widgets_tree.get_widget('stats_dialog') diff --git a/pysollib/stats.py b/pysollib/stats.py index 65b311db..0fd6a6d2 100644 --- a/pysollib/stats.py +++ b/pysollib/stats.py @@ -38,69 +38,28 @@ import os, sys, time, types # PySol imports -from mfxutil import SubclassResponsibility, Struct, destruct from mfxutil import format_time from settings import PACKAGE, VERSION from gamedb import GI - -# // FIXME - this a quick hack and needs a rewrite - - # /*********************************************************************** # // # ************************************************************************/ class PysolStatsFormatter: - def __init__(self, app): - self.app = app - - # - # - # - - class StringWriter: - def __init__(self): - self.text = "" - - def p(self, s): - self.text = self.text + s - - def nl(self, count=1): - self.p("\n" * count) - - def pheader(self, s): - self.p(s) - - def pstats(self, *args, **kwargs): - s = "%-30s %7s %7s %7s %7s %7s %7s\n" % args - self.p(s) - - def plog(self, gamename, gamenumber, date, status, gameid=-1, won=-1): - self.p("%-25s %-20s %17s %s\n" % (gamename, gamenumber, date, status)) - class FileWriter(StringWriter): - def __init__(self, file): - self.file = file + def getStatHeader(self): + return (_("Game"), + _("Played"), + _("Won"), + _("Lost"), + _('Playing time'), + _('Moves'), + _("% won")) - def p(self, s): - self.file.write(s.encode('utf-8')) - - # - # - # - - def writeHeader(self, writer, header, pagewidth=72): - date = time.ctime(time.time()) - date = time.strftime("%Y-%m-%d %H:%M", time.localtime(time.time())) - blanks = max(pagewidth - len(header) - len(date), 1) - writer.pheader(header + " "*blanks + date + "\n") - writer.pheader("-" * pagewidth + "\n") - writer.pheader("\n") - - def writeStats(self, writer, player, header, sort_by='name'): + def getStatResults(self, player, sort_by='name'): app = self.app # sort_functions = { @@ -113,18 +72,8 @@ class PysolStatsFormatter: 'percent': app.getGamesIdSortedByPercent, } sort_func = sort_functions[sort_by] - - self.writeHeader(writer, header, 62) - writer.pstats(player or _("Demo games"), - _("Played"), - _("Won"), - _("Lost"), - _('Playing time'), - _('Moves'), - _("% won")) - writer.nl() - twon, tlost, tgames, ttime, tmoves = 0, 0, 0, 0, 0 g = sort_func() + twon, tlost, tgames, ttime, tmoves = 0, 0, 0, 0, 0 for id in g: name = app.getGameTitleName(id) #won, lost = app.stats.getStats(player, id) @@ -134,33 +83,43 @@ class PysolStatsFormatter: if won + lost > 0: perc = "%.1f" % (100.0 * won / (won + lost)) else: perc = "0.0" if won > 0 or lost > 0 or id == app.game.id: - #writer.pstats(name, won+lost, won, lost, perc, gameid=id) t = format_time(time) m = str(round(moves, 1)) - writer.pstats(name, won+lost, won, lost, t, m, perc, gameid=id) + yield [name, won+lost, won, lost, t, m, perc, id] tgames = tgames + 1 - writer.nl() won, lost = twon, tlost if won + lost > 0: if won > 0: - time = format_time(ttime/won) - moves = round(tmoves/won, 1) + time = format_time(ttime/tgames) + moves = round(tmoves/tgames, 1) else: time = format_time(0) moves = 0 perc = "%.1f" % (100.0*won/(won+lost)) else: perc = "0.0" - writer.pstats(_("Total (%d out of %d games)") % (tgames, len(g)), - won+lost, won, lost, time, moves, perc) - writer.nl(2) - return tgames + self.total_games = len(g) + self.played_games = tgames + self.won_games = won + self.lost_games = lost + self.avrg_time = time + self.avrg_moves = moves + self.percent = perc + #yield (_("Total (%d out of %d games)") % (tgames, len(g)), + # won+lost, won, lost, time, moves, perc, '') - def _writeLog(self, writer, player, header, prev_games): - if not player or not prev_games: - return 0 - self.writeHeader(writer, header, 71) - writer.plog(_("Game"), _("Game number"), _("Started at"), _("Status")) - writer.nl() + def getStatSummary(self): + return self.total_games, \ + self.played_games, \ + self.won_games, \ + self.lost_games, \ + self.avrg_time, \ + self.avrg_moves, \ + self.percent + + def getLogHeader(self): + return _("Game"), _("Game number"), _("Started at"), _("Status") + + def getLogResults(self, player, prev_games): twon, tlost = 0, 0 for pg in prev_games: if type(pg) is not types.TupleType: @@ -198,14 +157,88 @@ class PysolStatsFormatter: status = "*error*" if -2 <= pg[2] <= 2: status = (_("Loaded"), _("Not won"), _("Lost"), _("Won"), _("Perfect")) [pg[2]+2] - writer.plog(name, gamenumber, date, status, gameid=gameid, won=pg[2]) - writer.nl(2) + #writer.plog(name, gamenumber, date, status, gameid=gameid, won=pg[2]) + yield [name, gamenumber, date, status, pg[2], gameid] + + # + # + # + + def writeStats(self, player, sort_by='name'): + pass + def writeFullLog(self, player): + pass + def writeSessionLog(self, player): + pass + + +class FileStatsFormatter(PysolStatsFormatter): + + def __init__(self, app, file): + self.app = app + self.file = file + + def p(self, s): + self.file.write(s.encode('utf-8')) + + def nl(self, count=1): + self.p("\n" * count) + + def pheader(self, s): + self.p(s) + + def pstats(self, *args, **kwargs): + s = "%-30s %7s %7s %7s %7s %7s %7s\n" % args + self.p(s) + + def plog(self, gamename, gamenumber, date, status, gameid=-1, won=-1): + self.p("%-25s %-20s %17s %s\n" % (gamename, gamenumber, date, status)) + + def writeHeader(self, header, pagewidth=72): + date = time.ctime(time.time()) + date = time.strftime("%Y-%m-%d %H:%M", time.localtime(time.time())) + blanks = max(pagewidth - len(header) - len(date), 1) + self.pheader(header + " "*blanks + date + "\n") + self.pheader("-" * pagewidth + "\n") + self.pheader("\n") + + def writeStats(self, player, sort_by='name'): + header = _("Statistics for ") + player + self.writeHeader(header, 62) + header = self.getStatHeader() + self.pstats(*header) + self.nl() + for result in self.getStatResults(player, sort_by): + gameid = result.pop() + self.pstats(gameid=gameid, *result) + self.nl() + total, played, won, lost, time, moves, perc = self.getStatSummary() + self.pstats(_("Total (%d out of %d games)") % (played, total), + won+lost, won, lost, time, moves, perc) + self.nl(2) + return played + + def writeLog(self, player, header, prev_games): + if not player or not prev_games: + return 0 + self.writeHeader(header, 71) + header = self.getLogHeader() + self.plog(*header) + self.nl() + for result in self.getLogResults(player, prev_games): + gameid = result.pop() + won = result.pop() + self.plog(gameid=gameid, won=won, *result) + self.nl(2) return 1 - def writeFullLog(self, writer, player, header): + def writeFullLog(self, player): + header = _("Full log for ") + player prev_games = self.app.stats.prev_games.get(player) - return self._writeLog(writer, player, header, prev_games) + return self.writeLog(player, header, prev_games) - def writeSessionLog(self, writer, player, header): + def writeSessionLog(self, player): + header = _("Session log for ") + player prev_games = self.app.stats.session_games.get(player) - return self._writeLog(writer, player, header, prev_games) + return self.writeLog(player, header, prev_games) + diff --git a/pysollib/tile/progressbar.py b/pysollib/tile/progressbar.py index cb01eaaf..e8af51bb 100644 --- a/pysollib/tile/progressbar.py +++ b/pysollib/tile/progressbar.py @@ -112,7 +112,8 @@ class PysolProgressBar: return self.percent = min(100, max(0, self.percent)) self.progress.config(value=self.percent) - self.top.update_idletasks() + ##self.top.update_idletasks() + self.top.update() # /*********************************************************************** diff --git a/pysollib/tile/tkconst.py b/pysollib/tile/tkconst.py index ec3e405d..308ffd4a 100644 --- a/pysollib/tile/tkconst.py +++ b/pysollib/tile/tkconst.py @@ -54,7 +54,8 @@ __all__ = ['tkversion', # imports import sys, os -import Tile as Tkinter +import traceback +import Tkinter # Toolkit imports @@ -73,6 +74,7 @@ try: tkversion = tuple(m[:4]) del m except: + traceback.print_exc() pass # experimental diff --git a/pysollib/tile/tkstats.py b/pysollib/tile/tkstats.py index d0114c6f..f623f3d8 100644 --- a/pysollib/tile/tkstats.py +++ b/pysollib/tile/tkstats.py @@ -80,12 +80,7 @@ class SingleGame_StatsDialog(MfxDialog): self.top.wm_minsize(200, 200) self.button = kw.default # - ##createChart = self.create3DBarChart createChart = self.createPieChart - ##createChart = self.createSimpleChart -## if parent.winfo_screenwidth() < 800 or parent.winfo_screenheight() < 600: -## createChart = self.createPieChart -## createChart = self.createSimpleChart # self.font = self.app.getFont("default") self.tk_font = tkFont.Font(self.top, self.font) @@ -177,79 +172,6 @@ class SingleGame_StatsDialog(MfxDialog): c.create_text(x, ty[1]-dy, text="%d%%" % (100-pw), anchor="ne", font=tfont, fill=fg) -## def _createChart3DBar(self, canvas, perc, x, y, p, col): -## if perc < 0.005: -## return -## # translate and scale -## p = list(p[:]) -## for i in (0, 1, 2, 3): -## p[i] = (x + p[i][0], y + p[i][1]) -## j = i + 4 -## dx = int(round(p[j][0] * perc)) -## dy = int(round(p[j][1] * perc)) -## p[j] = (p[i][0] + dx, p[i][1] + dy) -## # draw rects -## def draw_rect(a, b, c, d, col, canvas=canvas, p=p): -## points = (p[a][0], p[a][1], p[b][0], p[b][1], -## p[c][0], p[c][1], p[d][0], p[d][1]) -## canvas.create_polygon(points, fill=col) -## draw_rect(0, 1, 5, 4, col[0]) -## draw_rect(1, 2, 6, 5, col[1]) -## draw_rect(4, 5, 6, 7, col[2]) -## # draw lines -## def draw_line(a, b, canvas=canvas, p=p): -## ##print a, b, p[a], p[b] -## canvas.create_line(p[a][0], p[a][1], p[b][0], p[b][1]) -## draw_line(0, 1) -## draw_line(1, 2) -## draw_line(0, 4) -## draw_line(1, 5) -## draw_line(2, 6) -## ###draw_line(3, 7) ## test -## draw_line(4, 5) -## draw_line(5, 6) -## draw_line(6, 7) -## draw_line(7, 4) - - - # - # charts - # - -## def createSimpleChart(self, app, won, lost, text): -## #c, tfont, fg = self._createChartInit(frame, 300, 100, text) -## self._createChartInit(300, 100, text) -## c, tfont, fg = self.canvas, self.font, self.fg -## # -## tx = (90, 180, 210) -## ty = (21, 41, 75) -## self._createChartTexts(tx, ty, won, lost) - -## def create3DBarChart(self, app, won, lost, text): -## image = app.gimages.stats[0] -## iw, ih = image.width(), image.height() -## #c, tfont, fg = self._createChartInit(frame, iw+160, ih, text) -## self._createChartInit(iw+160, ih, text) -## c, tfont, fg = self.canvas, self.font, self.fg -## pwon, plost = self._getPwon(won, lost) -## # -## tx = (iw+20, iw+110, iw+140) -## yy = ih/2 ## + 7 -## ty = (yy+21-46, yy+41-46, yy+75-46) -## # -## c.create_image(0, 7, image=image, anchor="nw") -## # -## p = ((0, 0), (44, 6), (62, -9), (20, -14), -## (-3, -118), (-1, -120), (-1, -114), (-4, -112)) -## col = ("#00ff00", "#008200", "#00c300") -## self._createChart3DBar(c, pwon, 102, 145+7, p, col) -## p = ((0, 0), (49, 6), (61, -10), (15, -15), -## (1, -123), (3, -126), (4, -120), (1, -118)) -## col = ("#ff0000", "#860400", "#c70400") -## self._createChart3DBar(c, plost, 216, 159+7, p, col) -## # -## self._createChartTexts(tx, ty, won, lost) -## c.create_text(tx[0], ty[0]-48, text=self.player, anchor="nw", font=tfont, fill=fg) def createPieChart(self, app, won, lost, text): #c, tfont, fg = self._createChartInit(frame, 300, 100, text) @@ -300,8 +222,11 @@ class SingleGame_StatsDialog(MfxDialog): # // # ************************************************************************/ -class TreeWriter(PysolStatsFormatter.StringWriter): - def __init__(self, tree, parent_window, font, w, h): +class TreeFormatter(PysolStatsFormatter): + MAX_ROWS = 10000 + + def __init__(self, app, tree, parent_window, font, w, h): + self.app = app self.tree = tree self.parent_window = parent_window self.font = font @@ -311,12 +236,6 @@ class TreeWriter(PysolStatsFormatter.StringWriter): self.w = w self.h = h - def p(self, s): - pass - - def pheader(self, s): - pass - def _calc_tabs(self, arg): if self.parent_window.tree_tabs: self._tabs = self.parent_window.tree_tabs @@ -331,57 +250,73 @@ class TreeWriter(PysolStatsFormatter.StringWriter): self._tabs.append(10) self.parent_window.tree_tabs = self._tabs - def pstats(self, *args, **kwargs): - header = False + def writeStats(self, player, sort_by='name'): + header = self.getStatHeader() if self._tabs is None: - # header - self._calc_tabs(args) - header = True + self._calc_tabs(header) + t1, t2, t3, t4, t5, t6, t7 = header + for column, text, anchor, tab in ( + ('#0', t1, 'nw', self._tabs[0]), + ('played', t2, 'ne', self._tabs[1]), + ('won', t3, 'ne', self._tabs[2]), + ('lost', t4, 'ne', self._tabs[3]), + ('time', t5, 'ne', self._tabs[4]), + ('moves', t6, 'ne', self._tabs[5]), + ('percent', t7, 'ne', self._tabs[6]), ): + self.tree.heading(column, text=text, + command=lambda par=self.parent_window, col=column: par.headerClick(col)) + self.tree.column(column, width=tab) - t1, t2, t3, t4, t5, t6, t7 = args - if not header: t1=gettext(t1) # game name - - if header: - for column, text, anchor, tab in ( - ('#0', t1, 'nw', self._tabs[0]), - ('played', t2, 'ne', self._tabs[1]), - ('won', t3, 'ne', self._tabs[2]), - ('lost', t4, 'ne', self._tabs[3]), - ('time', t5, 'ne', self._tabs[4]), - ('moves', t6, 'ne', self._tabs[5]), - ('percent', t7, 'ne', self._tabs[6]), ): - self.tree.heading(column, text=text, - command=lambda par=self.parent_window, col=column: par.headerClick(col)) - self.tree.column(column, width=tab) - else: + for result in self.getStatResults(player, sort_by): + t1, t2, t3, t4, t5, t6, t7, t8 = result + t1=gettext(t1) # game name id = self.tree.insert(None, "end", text=t1, values=(t2, t3, t4, t5, t6, t7)) self.parent_window.tree_items.append(id) - def plog(self, *args, **kwargs): - header = False + total, played, won, lost, time, moves, perc = self.getStatSummary() + text = _("Total (%d out of %d games)") % (played, total) + id = self.tree.insert(None, "end", text=text, + values=(won+lost, won, lost, time, moves, perc)) + self.parent_window.tree_items.append(id) + + return 1 + + def writeLog(self, player, prev_games): if self._tabs is None: - # header self._calc_tabs(('', '99999999999999999999', '9999-99-99 99:99', 'XXXXXXXXXXXX')) - header = True - - t1, t2, t3, t4 = args[:4] - if not header: t1=gettext(t1) # game name - - if header: - for column, text, anchor, tab in ( - ('#0', t1, 'nw', self._tabs[0]), - ('gamenumber', t2, 'ne', self._tabs[1]), - ('date', t3, 'ne', self._tabs[2]), - ('status', t4, 'ne', self._tabs[3]), ): - self.tree.heading(column, text=text, - command=lambda par=self.parent_window, col=column: par.headerClick(col)) - self.tree.column(column, width=tab) - ##if column in ('gamenumber', 'date', 'status'): - ## self.tree.column(column, anchor='center') - else: + header = self.getLogHeader() + t1, t2, t3, t4 = header + for column, text, anchor, tab in ( + ('#0', t1, 'nw', self._tabs[0]), + ('gamenumber', t2, 'ne', self._tabs[1]), + ('date', t3, 'ne', self._tabs[2]), + ('status', t4, 'ne', self._tabs[3]), ): + self.tree.heading(column, text=text, + command=lambda par=self.parent_window, col=column: par.headerClick(col)) + self.tree.column(column, width=tab) + ##if column in ('gamenumber', 'date', 'status'): + ## self.tree.column(column, anchor='center') + if not player or not prev_games: + return 0 + num_rows = 0 + for result in self.getLogResults(player, prev_games): + t1, t2, t3, t4, t5, t6 = result + t1=gettext(t1) # game name id = self.tree.insert(None, "end", text=t1, values=(t2, t3, t4)) self.parent_window.tree_items.append(id) + num_rows += 1 + if num_rows > self.MAX_ROWS: + break + return 1 + + def writeFullLog(self, player): + prev_games = self.app.stats.prev_games.get(player) + return self.writeLog(player, prev_games) + + def writeSessionLog(self, player): + prev_games = self.app.stats.session_games.get(player) + return self.writeLog(player, prev_games) # /*********************************************************************** @@ -467,14 +402,9 @@ class AllGames_StatsDialog(MfxDialog): if self.tree_items: self.tree.delete(tuple(self.tree_items)) self.tree_items = [] - a = PysolStatsFormatter(self.app) - writer = TreeWriter(self.tree, self, + formatter = TreeFormatter(self.app, self.tree, self, self.font, self.CHAR_W, self.CHAR_H) - if not a.writeStats(writer, player, header, sort_by=self.sort_by): - # FIXME - pass - destruct(writer) - destruct(a) + formatter.writeStats(player, sort_by=self.sort_by) # /*********************************************************************** @@ -487,13 +417,9 @@ class FullLog_StatsDialog(AllGames_StatsDialog): COLUMNS = ('gamenumber', 'date', 'status') def fillCanvas(self, player, header): - a = PysolStatsFormatter(self.app) - writer = TreeWriter(self.tree, self, self.font, - self.CHAR_W, self.CHAR_H) - if not a.writeFullLog(writer, player, header): - # FIXME - pass - destruct(a) + formatter = TreeFormatter(self.app, self.tree, self, self.font, + self.CHAR_W, self.CHAR_H) + formatter.writeFullLog(player) def initKw(self, kw): kw = KwStruct(kw, @@ -509,13 +435,9 @@ class FullLog_StatsDialog(AllGames_StatsDialog): class SessionLog_StatsDialog(FullLog_StatsDialog): def fillCanvas(self, player, header): - a = PysolStatsFormatter(self.app) - writer = TreeWriter(self.tree, self, self.font, - self.CHAR_W, self.CHAR_H) - if not a.writeSessionLog(writer, player, header): - # FIXME - pass - destruct(a) + formatter = TreeFormatter(self.app, self.tree, self, self.font, + self.CHAR_W, self.CHAR_H) + formatter.writeSessionLog(player) def initKw(self, kw): kw = KwStruct(kw, @@ -582,8 +504,7 @@ class _TopDialog(MfxDialog): self.createBitmaps(top_frame, kw) cnf = {'master': top_frame, - 'highlightthickness': 1, - 'highlightbackground': 'black', + 'padding': (4, 1), } frame = apply(Tkinter.Frame, (), cnf) frame.pack(expand=Tkinter.YES, fill=Tkinter.BOTH, padx=10, pady=10) @@ -654,9 +575,9 @@ class Top_StatsDialog(MfxDialog): app.stats.games_stats[player].has_key(gameid) and app.stats.games_stats[player][gameid].time_result.top): - Tkinter.Label(frame, text=_('Minimum')).grid(row=0, column=1) - Tkinter.Label(frame, text=_('Maximum')).grid(row=0, column=2) - Tkinter.Label(frame, text=_('Average')).grid(row=0, column=3) + Tkinter.Label(frame, text=_('Minimum')).grid(row=0, column=1, padx=4) + Tkinter.Label(frame, text=_('Maximum')).grid(row=0, column=2, padx=4) + Tkinter.Label(frame, text=_('Average')).grid(row=0, column=3, padx=4) ##Tkinter.Label(frame, text=_('Total')).grid(row=0, column=4) s = app.stats.games_stats[player][gameid] diff --git a/pysollib/tile/tktree.py b/pysollib/tile/tktree.py index 35599f68..fb092f5f 100644 --- a/pysollib/tile/tktree.py +++ b/pysollib/tile/tktree.py @@ -297,7 +297,9 @@ class MfxTreeInCanvas(MfxScrolledCanvas): # set scroll region bbox = self.canvas.bbox("all") ##self.canvas.config(scrollregion=bbox) - self.canvas.config(scrollregion=(0,0,bbox[2],bbox[3])) + ##self.canvas.config(scrollregion=(0,0,bbox[2],bbox[3])) + dx, dy = 8, 0 # margins + self.canvas.config(scrollregion=(-dx,-dy,bbox[2]+dx,bbox[3]+dy)) self.canvas.config(yscrollincrement=self.style.disty) def clear(self): diff --git a/pysollib/tk/tkstats.py b/pysollib/tk/tkstats.py index 0c699e56..58a842d4 100644 --- a/pysollib/tk/tkstats.py +++ b/pysollib/tk/tkstats.py @@ -299,8 +299,9 @@ class SingleGame_StatsDialog(MfxDialog): # // # ************************************************************************/ -class CanvasWriter(PysolStatsFormatter.StringWriter): - def __init__(self, canvas, parent_window, font, w, h): +class CanvasFormatter(PysolStatsFormatter): + def __init__(self, app, canvas, parent_window, font, w, h): + self.app = app self.canvas = canvas self.parent_window = parent_window ##self.fg = canvas.cget("insertbackground") @@ -308,7 +309,7 @@ class CanvasWriter(PysolStatsFormatter.StringWriter): self.font = font self.w = w self.h = h - self.x = self.y = 0 + #self.x = self.y = 0 self.gameid = None self.gamenumber = None self.canvas.config(yscrollincrement=h) @@ -317,26 +318,6 @@ class CanvasWriter(PysolStatsFormatter.StringWriter): def _addItem(self, id): self.canvas.dialog.nodes[id] = (self.gameid, self.gamenumber) - def p(self, s): - if self.y > 16000: - return - h1, h2 = 0, 0 - while s and s[0] == "\n": - s = s[1:] - h1 = h1 + self.h - while s and s[-1] == "\n": - s = s[:-1] - h2 = h2 + self.h - self.y = self.y + h1 - if s: - id = self.canvas.create_text(self.x, self.y, text=s, anchor="nw", - font=self.font, fill=self.fg) - self._addItem(id) - self.y = self.y + h2 - - def pheader(self, s): - pass - def _calc_tabs(self, arg): tw = 15*self.w ##tw = 160 @@ -347,59 +328,12 @@ class CanvasWriter(PysolStatsFormatter.StringWriter): self._tabs.append(tw) self._tabs.append(10) - def pstats(self, *args, **kwargs): - gameid=kwargs.get('gameid', None) - header = False - if self._tabs is None: - # header - header = True - self._calc_tabs(args) - self.gameid = 'header' - self.gamenumber = None -## if False: -## sort_by = ( 'name', 'played', 'won', 'lost', -## 'time', 'moves', 'percent', ) -## frame = Tkinter.Frame(self.canvas) -## i = 0 -## for t in args: -## w = self._tabs[i] -## if i == 0: -## w += 10 -## b = Tkinter.Button(frame, text=t) -## b.grid(row=0, column=i, sticky='ew') -## b.bind('<1>', lambda e, f=self.parent_window.rearrange, s=sort_by[i]: f(s)) -## frame.columnconfigure(i, minsize=w) -## i += 1 -## self.canvas.create_window(0, 0, window=frame, anchor='nw') -## self.y += 20 -## return -## if False: -## i = 0 -## x = 0 -## for t in args: -## w = self._tabs[i] -## h = 18 -## anchor = 'ne' -## y = 0 -## self.canvas.create_rectangle(x+2, y, x+w, y+h, width=1, -## fill="#00ff00", outline="#000000") -## x += w -## self.canvas.create_text(x-3, y+3, text=t, anchor=anchor) -## i += 1 -## self.y += 20 -## return - - else: - self.gameid = gameid - self.gamenumber = None - if self.y > 16000: - return - x, y = 1, self.y - p = self._pstats_text + def pstats(self, y, args, gameid=None): + x = 1 t1, t2, t3, t4, t5, t6, t7 = args - h = 0 - if not header: t1=gettext(t1) # game name - + self.gamenumber = None + if gameid is None: # header + self.gameid = 'header' for var, text, anchor, tab in ( ('name', t1, 'nw', self._tabs[0]+self._tabs[1]), ('played', t2, 'ne', self._tabs[2]), @@ -408,46 +342,13 @@ class CanvasWriter(PysolStatsFormatter.StringWriter): ('time', t5, 'ne', self._tabs[5]), ('moves', t6, 'ne', self._tabs[6]), ('percent', t7, 'ne', self._tabs[7]), ): - if header: self.gamenumber=var - h = max(h, p(x, y, anchor=anchor, text=text)) + if gameid is None: # header + self.gamenumber=var + id = self.canvas.create_text(x, y, text=text, anchor=anchor, + font=self.font, fill=self.fg) + self._addItem(id) x += tab - self.pstats_perc(x, y, t7) - self.y += h - self.gameid = None - return - -## h = max(h, p(x, y, anchor="nw", text=t1)) -## if header: self.gamenumber='played' -## x += self._tabs[0]+self._tabs[1] -## h = max(h, p(x, y, anchor="ne", text=t2)) -## if header: self.gamenumber='won' -## x += self._tabs[2] -## h = max(h, p(x, y, anchor="ne", text=t3)) -## if header: self.gamenumber='lost' -## x += self._tabs[3] -## h = max(h, p(x, y, anchor="ne", text=t4)) -## if header: self.gamenumber='time' -## x += self._tabs[4] -## h = max(h, p(x, y, anchor="ne", text=t5)) -## if header: self.gamenumber='moves' -## x += self._tabs[5] -## h = max(h, p(x, y, anchor="ne", text=t6)) -## if header: self.gamenumber='percent' -## x += self._tabs[6] -## h = max(h, p(x, y, anchor="ne", text=t7)) -## x += self._tabs[7] -## self.pstats_perc(x, y, t7) -## self.y += h -## self.gameid = None - - def _pstats_text(self, x, y, **kw): - kwdefault(kw, font=self.font, fill=self.fg) - id = apply(self.canvas.create_text, (x, y), kw) - self._addItem(id) - return self.h - ##bbox = self.canvas.bbox(id) - ##return bbox[3] - bbox[1] def pstats_perc(self, x, y, t): if not (t and "0" <= t[0] <= "9"): @@ -498,13 +399,51 @@ class CanvasWriter(PysolStatsFormatter.StringWriter): ix = ix + 8 p = max(0.0, p - 0.1) - def plog(self, gamename, gamenumber, date, status, gameid=-1, won=-1): - if gameid > 0 and "0" <= gamenumber[0:1] <= "9": - self.gameid = gameid - self.gamenumber = gamenumber - self.p("%-25s %-20s %17s %s\n" % (gamename, gamenumber, date, status)) - self.gameid = None - self.gamenumber = None + def writeStats(self, player, sort_by='name'): + header = self.getStatHeader() + y = 0 + if self._tabs is None: + self._calc_tabs(header) + self.pstats(y, header) + # + y += 2*self.h + for result in self.getStatResults(player, sort_by): + gameid = result.pop() + result[0]=gettext(result[0]) # game name + self.pstats(y, result, gameid) + y += self.h + # + y += self.h + total, played, won, lost, time, moves, perc = self.getStatSummary() + s = _("Total (%d out of %d games)") % (played, total) + self.pstats(y, (s, won+lost, won, lost, time, moves, perc)) + + def writeLog(self, player, prev_games): + y = 0 + header = self.getLogHeader() + t1, t2, t3, t4 = header + s = "%-25s %-20s %-17s %s" % header + id = self.canvas.create_text(1, y, text=s, anchor="nw", + font=self.font, fill=self.fg) + self._addItem(id) + y += 2*self.h + if not player or not prev_games: + return 0 + for result in self.getLogResults(player, prev_games): + result[0]=gettext(result[0]) # game name + s = "%-25s %-20s %-17s %s" % tuple(result[:4]) + id = self.canvas.create_text(1, y, text=s, anchor="nw", + font=self.font, fill=self.fg) + y += self.h + return 1 + + def writeFullLog(self, player): + prev_games = self.app.stats.prev_games.get(player) + return self.writeLog(player, prev_games) + + def writeSessionLog(self, player): + prev_games = self.app.stats.session_games.get(player) + return self.writeLog(player, prev_games) # /*********************************************************************** @@ -617,14 +556,9 @@ class AllGames_StatsDialog(MfxDialog): def fillCanvas(self, player, header): self.canvas.delete('all') self.nodes = {} - a = PysolStatsFormatter(self.app) - #print 'CHAR_W:', self.CHAR_W - writer = CanvasWriter(self.canvas, self, + writer = CanvasFormatter(self.app, self.canvas, self, self.font, self.CHAR_W, self.CHAR_H) - if not a.writeStats(writer, player, header, sort_by=self.sort_by): - writer.p(_("No entries for player ") + player + "\n") - destruct(writer) - destruct(a) + writer.writeStats(player, self.sort_by) # /*********************************************************************** @@ -636,11 +570,9 @@ class FullLog_StatsDialog(AllGames_StatsDialog): FONT_TYPE = "fixed" def fillCanvas(self, player, header): - a = PysolStatsFormatter(self.app) - writer = CanvasWriter(self.canvas, self, self.font, self.CHAR_W, self.CHAR_H) - if not a.writeFullLog(writer, player, header): - writer.p(_("No log entries for %s\n") % player) - destruct(a) + writer = CanvasFormatter(self.app, self.canvas, self, + self.font, self.CHAR_W, self.CHAR_H) + writer.writeFullLog(player) def initKw(self, kw): kw = KwStruct(kw, @@ -652,11 +584,10 @@ class FullLog_StatsDialog(AllGames_StatsDialog): class SessionLog_StatsDialog(FullLog_StatsDialog): def fillCanvas(self, player, header): - a = PysolStatsFormatter(self.app) - writer = CanvasWriter(self.canvas, self, self.font, self.CHAR_W, self.CHAR_H) - if not a.writeSessionLog(writer, player, header): - writer.p(_("No current session log entries for %s\n") % player) - destruct(a) + a = PysolStatsFormatter() + writer = CanvasFormatter(self.app, self.canvas, self, + self.font, self.CHAR_W, self.CHAR_H) + writer.writeSessionLog(player) def initKw(self, kw): kw = KwStruct(kw, From ffc332886dc8fa21e9ed85b67134fb7da97a52b5 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 22 Oct 2006 21:21:38 +0000 Subject: [PATCH 080/266] * misc. bugs fixes and improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@82 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/games/ultra/matrix.py | 41 ++++++------ pysollib/main.py | 114 ++------------------------------- pysollib/pysolgtk/tkwrap.py | 14 +++- pysollib/tile/tkwrap.py | 74 +++++++++++++++++++-- pysollib/tk/tkwrap.py | 88 ++++++++++++++++++++++++- 5 files changed, 189 insertions(+), 142 deletions(-) diff --git a/pysollib/games/ultra/matrix.py b/pysollib/games/ultra/matrix.py index b36ce233..70e833c3 100644 --- a/pysollib/games/ultra/matrix.py +++ b/pysollib/games/ultra/matrix.py @@ -80,9 +80,6 @@ class Matrix_RowStack(OpenStack): base_rank=ANY_RANK) apply(OpenStack.__init__, (self, x, y, game), cap) - def acceptsCards(self, from_stack, cards): - return OpenStack.acceptsCards(self, from_stack, cards) - def canFlipCard(self): return 0 @@ -315,23 +312,22 @@ class Matrix3(Game): # Game extras # - def shuffle(self): - cards = list(self.cards)[:] + def _shuffleHook(self, cards): + # create solved game + ncards = len(cards)-1 + for c in cards: + if c.rank == ncards: + cards.remove(c) + break + n = 0 + for i in range(ncards-1): + for j in range(i+1, ncards): + if cards[i].rank > cards[j].rank: + n += 1 cards.reverse() - for card in cards: - self.s.talon.addCard(card, update=0) - card.showBack(unhide=0) - - def scramble(self): - if self.gstats.restarted: - self.random.reset() - ncards, randint = self.gameinfo.ncards, self.random.randint - r = self.s.rows[ncards - int(math.sqrt(ncards))] - rc, stackmap = 1, r.blockMap() - for i in range(randint(max(200, ncards * 4), max(300, ncards * 5))): - r.clickHandler(r) - r = self.s.rows[stackmap[rc][randint(0, len(stackmap[0]) - 1)]] - rc, stackmap = (rc + 1) % 2, r.blockMap() + if n%2: + cards[0], cards[1] = cards[1], cards[0] + return [c]+cards # # Game over rides @@ -339,10 +335,9 @@ class Matrix3(Game): def startGame(self): assert len(self.s.talon.cards) == self.gameinfo.ncards - self.s.talon.dealRow(rows=self.s.rows[:self.gameinfo.ncards - 1], - flip=1, frames=3) - self.scramble() self.startDealSample() + self.s.talon.dealRow(rows=self.s.rows[:self.gameinfo.ncards - 1], + frames=3) def isGameWon(self): if self.busy: @@ -352,7 +347,7 @@ class Matrix3(Game): for r in s[:l]: if not r.cards or not r.cards[0].rank == r.id: return 0 - self.s.talon.dealRow(rows=s[l:], flip=1, frames=3) + self.s.talon.dealRow(rows=s[l:], frames=3) return 1 def shallHighlightMatch(self, stack1, card1, stack2, card2): diff --git a/pysollib/main.py b/pysollib/main.py index ccb8b807..e69f5dc6 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -88,7 +88,7 @@ def parse_option(argv): "fg=", "foreground=", "bg=", "background=", "fn=", "font=", - "tile-theme=", + "theme=", "french-only", "noplugins", "nosound", @@ -105,7 +105,7 @@ def parse_option(argv): "fg": None, "bg": None, "fn": None, - "tile-theme": None, + "theme": None, "french-only": False, "noplugins": False, "nosound": False, @@ -125,8 +125,8 @@ def parse_option(argv): opts["bg"] = i[1] elif i[0] in ("--fn", "--font"): opts["fn"] = i[1] - elif i[0] == "--tile-theme": - opts["tile-theme"] = i[1] + elif i[0] == "--theme": + opts["theme"] = i[1] elif i[0] == "--french-only": opts["french-only"] = True elif i[0] == "--noplugins": @@ -194,13 +194,6 @@ def pysol_init(app, args): return 1 sys.exit(1) opts, filename = opts - wm_command = "" - prog = sys.executable - if prog and os.path.isfile(prog): - argv0 = os.path.normpath(args[0]) - prog = os.path.abspath(prog) - if os.path.isfile(argv0): - wm_command = prog + " " + os.path.abspath(argv0) if filename: app.commandline.loadgame = filename app.commandline.game = opts['game'] @@ -281,104 +274,7 @@ def pysol_init(app, args): app.opt.sound_mode = 0 # init toolkit 2) - sw, sh, sd = top.winfo_screenwidth(), top.winfo_screenheight(), top.winfo_screendepth() - top.wm_group(top) - top.wm_title(PACKAGE + " " + VERSION) - top.wm_iconname(PACKAGE + " " + VERSION) - if sw < 640 or sh < 480: - top.wm_minsize(400, 300) - else: - top.wm_minsize(520, 360) - ##self.top.wm_maxsize(9999, 9999) # unlimited - top.wm_protocol("WM_DELETE_WINDOW", top.wmDeleteWindow) - if wm_command: - top.wm_command(wm_command) - if 1: - # set expected window size to assist the layout of the window manager - top.config(width=min(800,sw-64), height=min(600,sh-64)) - try: - wm_set_icon(top, app.dataloader.findIcon()) - except: pass - - # set global color scheme - if not opts["fg"] and not opts["bg"]: - if os.name == "posix": # Unix/X11 - pass - if os.name == "mac": - color, priority = "#d9d9d9", "60" - classes = ( - "Button", "Canvas", "Checkbutton", "Entry", - "Frame", "Label", "Listbox", "Menubutton", ### "Menu", - "Message", "Radiobutton", "Scale", "Scrollbar", "Text", - ) - for c in classes: - top.option_add("*" + c + "*background", color, priority) - top.option_add("*" + c + "*activeBackground", color, priority) - else: - bg, fg = opts["bg"], opts["fg"] - if bg: - top.tk_setPalette(bg) - app.top_palette[1] = bg - app.top_bg = bg - if fg: - top.option_add("*foreground", fg) - app.top_palette[0] = fg - - # - if os.name == "posix": # Unix/X11 - top.option_add('*Entry.background', 'white', 60) - top.option_add('*Entry.foreground', 'black', 60) - top.option_add('*Listbox.background', 'white', 60) - top.option_add('*Listbox.foreground', 'black', 60) - ##top.option_add('*borderWidth', '1', 50) - ##top.option_add('*Button.borderWidth', '1', 50) - top.option_add('*Scrollbar.elementBorderWidth', '1', 60) - top.option_add('*Scrollbar.borderWidth', '1', 60) - top.option_add('*Menu.borderWidth', '1', 60) - #top.option_add('*Button.HighlightBackground', '#595d59') - #top.option_add('*Button.HighlightThickness', '1') - - # font - if opts["fn"]: - font = opts["fn"] - top.option_add("*font", font) - elif os.name == 'posix': - top.option_add("*font", "Helvetica 12", 50) - font = top.option_get('font', '') - else: - font = None - if TOOLKIT == 'tk': - from tkFont import Font - try: - f = Font(top, font) - except: - print >> sys.stderr, "invalid font name:", font - pass - else: - if font: - fa = f.actual() - app.opt.fonts["default"] = (fa["family"], - fa["size"], - fa["slant"], - fa["weight"]) - else: - app.opt.fonts["default"] = None - - if USE_TILE: # for tile - from pysoltk import load_theme - import settings - if opts['tile-theme']: - settings.TILE_THEME = opts['tile-theme'] - try: - load_theme(app, top, settings.TILE_THEME) - except Exception, err: - print >> sys.stderr, 'ERROR: set theme:', err - ##top.option_add('*Toolbar.relief', 'groove') - ##top.option_add('*Toolbar.relief', 'raised') - ##top.option_add('*Toolbar.borderWidth', 1) - ##top.option_add('*Toolbar.Button.Pad', 2) - ##top.option_add('*Toolbar.Button.default', 'disabled') - ##top.option_add('*Toolbar*takeFocus', 0) + top.initToolkit(app, opts['fg'], opts['bg'], opts['fn'], opts['theme']) # check games if len(app.gdb.getGamesIdSortedByName()) == 0: diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index 3b8ef444..e5e0ab3e 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -38,6 +38,7 @@ from gtk import gdk # PySol imports ## from pysollib.images import Images +from pysollib.settings import PACKAGE, VERSION # Toolkit imports from tkutil import makeToplevel, loadImage @@ -164,8 +165,6 @@ class _MfxToplevel(gtk.Window): ##w, h = newGeometry ##self.resize(w, h) - - def wm_group(self, pathName=None): # FIXME pass @@ -238,6 +237,17 @@ class MfxRoot(_MfxToplevel): def connectApp(self, app): self.app = app + def initToolkit(self, app, fg=None, bg=None, font=None, theme=None): + sw, sh, sd = self.winfo_screenwidth(), self.winfo_screenheight(), self.winfo_screendepth() + ##self.wm_group(self) + self.wm_title(PACKAGE + ' ' + VERSION) + ##self.wm_iconname(PACKAGE + ' ' + VERSION) + if sw < 640 or sh < 480: + self.wm_minsize(400, 300) + else: + self.wm_minsize(520, 360) + ##self.self.wm_maxsize(9999, 9999) # unlimited + # sometimes an update() is needed under Windows, whereas # under Unix an update_idletask() would be enough... def busyUpdate(self): diff --git a/pysollib/tile/tkwrap.py b/pysollib/tile/tkwrap.py index 1ffdfc19..b4668d21 100644 --- a/pysollib/tile/tkwrap.py +++ b/pysollib/tile/tkwrap.py @@ -43,10 +43,12 @@ __all__ = ['TclError', import os, sys, time, types from Tkinter import TclError import Tile as Tkinter +from tkFont import Font # PySol imports from pysollib.mfxutil import destruct, Struct -from tkutil import after_idle +from pysollib.settings import PACKAGE, VERSION +from tkutil import after_idle, load_theme, wm_set_icon from tkconst import EVENT_HANDLED, EVENT_PROPAGATE # /*********************************************************************** @@ -85,12 +87,6 @@ StringVar = Tkinter.StringVar class MfxRoot(Tkinter.Tk): def __init__(self, **kw): apply(Tkinter.Tk.__init__, (self,), kw) -## self.tk.call("package", "require", "tile") -## from pysollib.settings import TILE_THEME -## if TILE_THEME: -## ##self.tk.call('style', 'theme', 'use', TILE_THEME) -## style = Tkinter.Style(self) -## style.theme_use(TILE_THEME) self.app = None # for interruptible sleep #self.sleep_var = Tkinter.IntVar(self) @@ -102,6 +98,70 @@ class MfxRoot(Tkinter.Tk): def connectApp(self, app): self.app = app + def initToolkit(self, app, fg=None, bg=None, font=None, theme=None): + sw, sh, sd = self.winfo_screenwidth(), self.winfo_screenheight(), self.winfo_screendepth() + self.wm_group(self) + self.wm_title(PACKAGE + ' ' + VERSION) + self.wm_iconname(PACKAGE + ' ' + VERSION) + if sw < 640 or sh < 480: + self.wm_minsize(400, 300) + else: + self.wm_minsize(520, 360) + ##self.self.wm_maxsize(9999, 9999) # unlimited + self.wm_protocol('WM_DELETE_WINDOW', self.wmDeleteWindow) + prog = sys.executable + if prog and os.path.isfile(prog): + argv0 = os.path.normpath(sys.argv[0]) + prog = os.path.abspath(prog) + if os.path.isfile(argv0): + wm_command = prog + " " + os.path.abspath(argv0) + self.wm_command(wm_command) + if 1: + # set expected window size to assist the layout of the window manager + self.config(width=min(800,sw-64), height=min(600,sh-64)) + try: + wm_set_icon(self, app.dataloader.findIcon()) + except: pass + + # font + if font: + self.option_add('*font', font) + elif os.name == 'posix': + self.option_add('*font', 'Helvetica 12', 50) + font = self.option_get('font', '') + try: + f = Font(self, font) + except: + print >> sys.stderr, 'invalid font name:', font + pass + else: + if font: + fa = f.actual() + app.opt.fonts['default'] = (fa['family'], + fa['size'], + fa['slant'], + fa['weight']) + else: + app.opt.fonts['default'] = None + + # theme + import pysollib.settings + if theme: + pysollib.settings.TILE_THEME = theme + try: + load_theme(app, self, pysollib.settings.TILE_THEME) + except Exception, err: + print >> sys.stderr, 'ERROR: set theme:', err + ##self.option_add('*Toolbar.relief', 'groove') + ##self.option_add('*Toolbar.relief', 'raised') + ##self.option_add('*Toolbar.borderWidth', 1) + ##self.option_add('*Toolbar.Button.Pad', 2) + ##self.option_add('*Toolbar.Button.default', 'disabled') + ##self.option_add('*Toolbar*takeFocus', 0) + + + + # sometimes an update() is needed under Windows, whereas # under Unix an update_idletasks() would be enough... def busyUpdate(self): diff --git a/pysollib/tk/tkwrap.py b/pysollib/tk/tkwrap.py index 74b26631..10b7c4ef 100644 --- a/pysollib/tk/tkwrap.py +++ b/pysollib/tk/tkwrap.py @@ -43,10 +43,12 @@ __all__ = ['TclError', import os, sys, time, types import Tkinter from Tkinter import TclError +from tkFont import Font # PySol imports from pysollib.mfxutil import destruct, Struct -from tkutil import after_idle +from pysollib.settings import PACKAGE, VERSION +from tkutil import after_idle, wm_set_icon from tkconst import EVENT_HANDLED, EVENT_PROPAGATE # /*********************************************************************** @@ -96,6 +98,90 @@ class MfxRoot(Tkinter.Tk): def connectApp(self, app): self.app = app + def initToolkit(self, app, fg=None, bg=None, font=None, theme=None): + sw, sh, sd = self.winfo_screenwidth(), self.winfo_screenheight(), self.winfo_screendepth() + self.wm_group(self) + self.wm_title(PACKAGE + ' ' + VERSION) + self.wm_iconname(PACKAGE + ' ' + VERSION) + if sw < 640 or sh < 480: + self.wm_minsize(400, 300) + else: + self.wm_minsize(520, 360) + ##self.self.wm_maxsize(9999, 9999) # unlimited + self.wm_protocol('WM_DELETE_WINDOW', self.wmDeleteWindow) + prog = sys.executable + if prog and os.path.isfile(prog): + argv0 = os.path.normpath(sys.argv[0]) + prog = os.path.abspath(prog) + if os.path.isfile(argv0): + wm_command = prog + " " + os.path.abspath(argv0) + self.wm_command(wm_command) + if 1: + # set expected window size to assist the layout of the window manager + self.config(width=min(800,sw-64), height=min(600,sh-64)) + try: + wm_set_icon(self, app.dataloader.findIcon()) + except: pass + + # set global color scheme + if not fg and not bg: + if os.name == 'posix': # Unix/X11 + pass + if os.name == 'mac': + color, priority = '#d9d9d9', '60' + classes = ( + 'Button', 'Canvas', 'Checkbutton', 'Entry', + 'Frame', 'Label', 'Listbox', 'Menubutton', ### 'Menu', + 'Message', 'Radiobutton', 'Scale', 'Scrollbar', 'Text', + ) + for c in classes: + self.option_add('*' + c + '*background', color, priority) + self.option_add('*' + c + '*activeBackground', color, priority) + else: + if bg: + self.tk_setPalette(bg) + app.top_palette[1] = bg + app.top_bg = bg + if fg: + self.option_add('*foreground', fg) + app.top_palette[0] = fg + + # + if os.name == 'posix': # Unix/X11 + self.option_add('*Entry.background', 'white', 60) + self.option_add('*Entry.foreground', 'black', 60) + self.option_add('*Listbox.background', 'white', 60) + self.option_add('*Listbox.foreground', 'black', 60) + ##self.option_add('*borderWidth', '1', 50) + ##self.option_add('*Button.borderWidth', '1', 50) + self.option_add('*Scrollbar.elementBorderWidth', '1', 60) + self.option_add('*Scrollbar.borderWidth', '1', 60) + self.option_add('*Menu.borderWidth', '1', 60) + #self.option_add('*Button.HighlightBackground', '#595d59') + #self.option_add('*Button.HighlightThickness', '1') + + # font + if font: + self.option_add('*font', font) + elif os.name == 'posix': + self.option_add('*font', 'Helvetica 12', 50) + font = self.option_get('font', '') + try: + f = Font(self, font) + except: + print >> sys.stderr, 'invalid font name:', font + pass + else: + if font: + fa = f.actual() + app.opt.fonts['default'] = (fa['family'], + fa['size'], + fa['slant'], + fa['weight']) + else: + app.opt.fonts['default'] = None + + # sometimes an update() is needed under Windows, whereas # under Unix an update_idletasks() would be enough... def busyUpdate(self): From 97520889732d80c946796c787161422fe8af7714 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 23 Oct 2006 21:15:36 +0000 Subject: [PATCH 081/266] + 2 new games * misc. improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@83 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/games/beleagueredcastle.py | 11 ++++++++ pysollib/games/gypsy.py | 42 +++++++++++++++++++++++------ pysollib/games/ultra/matrix.py | 9 ++++--- pysollib/main.py | 8 +++--- 4 files changed, 53 insertions(+), 17 deletions(-) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index f0cc3232..43d12306 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -847,6 +847,15 @@ class Soother(Game): return int(to_stack in self.s.rows) +# /*********************************************************************** +# // Penelope's Web +# ************************************************************************/ + +class PenelopesWeb(StreetsAndAlleys): + RowStack_Class = StackWrapper(RK_RowStack, base_rank=KING) + + + # register the game registerGame(GameInfo(146, StreetsAndAlleys, "Streets and Alleys", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) @@ -888,3 +897,5 @@ registerGame(GameInfo(626, Soother, "Soother", GI.GT_4DECK_TYPE | GI.GT_ORIGINAL, 4, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(650, CastlesEnd, "Castles End", GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(665, PenelopesWeb, "Penelope's Web", + GI.GT_BELEAGUERED_CASTLE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index bf59c31a..8246c490 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -45,7 +45,7 @@ from pysollib.layout import Layout from pysollib.hint import AbstractHint, DefaultHint, CautiousDefaultHint from pysollib.hint import KlondikeType_Hint, YukonType_Hint -from spider import Spider_Hint +from spider import Spider_SS_Foundation, Spider_RowStack, Spider_Hint # /*********************************************************************** @@ -619,7 +619,7 @@ class Trapdoor_Talon(DealRowTalonStack): n = 0 rows = self.game.s.rows reserves = self.game.s.reserves - for i in range(8): + for i in range(len(rows)): r1 = reserves[i] r2 = rows[i] if r1.cards: @@ -632,16 +632,18 @@ class Trapdoor_Talon(DealRowTalonStack): class Trapdoor(Gypsy): + Foundation_Class = SS_FoundationStack + RowStack_Class = AC_RowStack - def createGame(self): - kw = {'rows' : 8, + def createGame(self, rows=8): + kw = {'rows' : rows, 'waste' : 0, 'texts' : 1, - 'reserves' : 8,} + 'reserves' : rows,} Layout(self).createGame(layout_method = Layout.gypsyLayout, talon_class = Trapdoor_Talon, - foundation_class = SS_FoundationStack, - row_class = AC_RowStack, + foundation_class = self.Foundation_Class, + row_class = self.RowStack_Class, reserve_class = OpenStack, **kw ) @@ -650,6 +652,29 @@ class Trapdoor(Gypsy): Gypsy.startGame(self) self.s.talon.dealCards() + +class TrapdoorSpider(Trapdoor): + Foundation_Class = Spider_SS_Foundation + RowStack_Class = Spider_RowStack + Hint_Class = Spider_Hint + + def createGame(self): + Trapdoor.createGame(self, rows=10) + + def startGame(self, flip=0): + for i in range(3): + self.s.talon.dealRow(flip=flip, frames=0) + r = self.s.rows + rows = (r[0], r[3], r[6], r[9]) + self.s.talon.dealRow(rows=rows, flip=flip, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + shallHighlightMatch = Game._shallHighlightMatch_RK + getQuickPlayScore = Game._getSpiderQuickPlayScore + + # /*********************************************************************** # // Flamenco # ************************************************************************/ @@ -784,4 +809,5 @@ registerGame(GameInfo(584, Eclipse, "Eclipse", GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(640, BrazilianPatience, "Brazilian Patience", GI.GT_GYPSY, 2, 0, GI.SL_MOSTLY_SKILL)) - +registerGame(GameInfo(666, TrapdoorSpider, "Trapdoor Spider", + GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/ultra/matrix.py b/pysollib/games/ultra/matrix.py index 70e833c3..0b9e7fa6 100644 --- a/pysollib/games/ultra/matrix.py +++ b/pysollib/games/ultra/matrix.py @@ -128,6 +128,7 @@ class Matrix_RowStack(OpenStack): row = game.s.rows if not self.cards or game.drag.stack is self or self.basicIsBlocked(): return 1 + game.playSample("move", priority=10) stack_map = self.blockMap() for j in range(2): dir = 1 @@ -140,11 +141,11 @@ class Matrix_RowStack(OpenStack): step = 1 from_stack = row[stack_map[j][i + dir]] while not from_stack is self: - from_stack.playMoveMove(1, to_stack, frames = 0, sound = 1) + from_stack.playMoveMove(1, to_stack, frames=0, sound=0) to_stack = from_stack step = step + 1 from_stack = row[stack_map[j][i + dir * step]] - self.playMoveMove(1, to_stack, frames = 0, sound = 1) + self.playMoveMove(1, to_stack, frames=0, sound=0) return 1 return 1 @@ -302,7 +303,7 @@ class Matrix3(Game): x = x + l.CW # Create talon - x, y = l.XM - l.XS, l.YM + x, y = -2*l.XS, 0 # invisible s.talon = InitialDealTalonStack(x, y, self) # Define stack groups @@ -347,7 +348,7 @@ class Matrix3(Game): for r in s[:l]: if not r.cards or not r.cards[0].rank == r.id: return 0 - self.s.talon.dealRow(rows=s[l:], frames=3) + self.s.talon.dealRow(rows=s[l:], frames=0) return 1 def shallHighlightMatch(self, stack1, card1, stack2, card2): diff --git a/pysollib/main.py b/pysollib/main.py index e69f5dc6..d983dcfe 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -43,7 +43,7 @@ import gettext # PySol imports from mfxutil import destruct, EnvError from util import CARDSET, DataLoader -from settings import PACKAGE, TOOLKIT, VERSION, USE_TILE +from settings import PACKAGE, TOOLKIT, VERSION from resource import Tile from gamedb import GI from app import Application @@ -52,7 +52,7 @@ from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient from pysolaudio import Win32AudioClient, OSSAudioClient, PyGameAudioClient # Toolkit imports -from pysoltk import tkversion, wm_withdraw, wm_set_icon, loadImage +from pysoltk import tkversion, wm_withdraw, loadImage from pysoltk import MfxMessageDialog, MfxExceptionDialog from pysoltk import TclError, MfxRoot from pysoltk import PysolProgressBar @@ -508,7 +508,5 @@ def main(args=None): raise Exception, "-1 % 13 != 12" # run it - r = pysol_main(args) - ##print "FINAL\n"; dumpmem() - return r + return pysol_main(args) From 4a1892eb97160d6c5a1cbb6ff3edde12d28d74db Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 1 Nov 2006 23:06:59 +0000 Subject: [PATCH 082/266] + new file: pysollib/init.py * improved tile binding * misc. improvements and bugs fixes * update ru translation git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@84 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- README | 3 +- data/images/buttons/bluecurve/new.gif | Bin 0 -> 226 bytes .../toolbar/default/empty-large/autodrop.gif | Bin 135 -> 0 bytes .../toolbar/default/empty-large/new.gif | Bin 137 -> 0 bytes .../toolbar/default/empty-large/open.gif | Bin 141 -> 0 bytes .../toolbar/default/empty-large/quit.gif | Bin 138 -> 0 bytes .../toolbar/default/empty-large/redo.gif | Bin 142 -> 0 bytes .../toolbar/default/empty-large/restart.gif | Bin 153 -> 0 bytes .../toolbar/default/empty-large/rules.gif | Bin 144 -> 0 bytes .../toolbar/default/empty-large/save.gif | Bin 135 -> 0 bytes .../default/empty-large/statistics.gif | Bin 138 -> 0 bytes .../toolbar/default/empty-large/undo.gif | Bin 145 -> 0 bytes po/games.pot | 17 +- po/pysol.pot | 366 +++++++------- po/ru_games.po | 55 +-- po/ru_pysol.po | 445 ++++++++---------- pysol | 58 +-- pysollib/app.py | 57 ++- pysollib/game.py | 4 +- pysollib/games/auldlangsyne.py | 3 +- pysollib/games/beleagueredcastle.py | 3 +- pysollib/games/harp.py | 19 +- pysollib/games/klondike.py | 33 ++ pysollib/games/montana.py | 1 + pysollib/init.py | 76 +++ pysollib/main.py | 2 +- pysollib/settings.py | 10 +- pysollib/stats.py | 4 +- pysollib/tile/Tile.py | 24 +- pysollib/tile/fontsdialog.py | 4 +- pysollib/tile/menubar.py | 15 +- pysollib/tile/playeroptionsdialog.py | 4 +- pysollib/tile/progressbar.py | 3 +- pysollib/tile/selectcardset.py | 10 +- pysollib/tile/selectgame.py | 2 - pysollib/tile/selecttile.py | 2 - pysollib/tile/soundoptionsdialog.py | 6 +- pysollib/tile/statusbar.py | 61 ++- pysollib/tile/tkcanvas.py | 8 +- pysollib/tile/tkstats.py | 2 +- pysollib/tile/tkutil.py | 30 +- pysollib/tile/tkwidget.py | 63 +-- pysollib/tile/tkwrap.py | 2 +- pysollib/tile/toolbar.py | 21 +- pysollib/tk/playeroptionsdialog.py | 2 +- pysollib/tk/tkcanvas.py | 8 +- pysollib/tk/tkutil.py | 9 +- pysollib/tk/tkwidget.py | 3 +- pysollib/util.py | 8 +- 49 files changed, 727 insertions(+), 716 deletions(-) create mode 100644 data/images/buttons/bluecurve/new.gif delete mode 100644 data/images/toolbar/default/empty-large/autodrop.gif delete mode 100644 data/images/toolbar/default/empty-large/new.gif delete mode 100644 data/images/toolbar/default/empty-large/open.gif delete mode 100644 data/images/toolbar/default/empty-large/quit.gif delete mode 100644 data/images/toolbar/default/empty-large/redo.gif delete mode 100644 data/images/toolbar/default/empty-large/restart.gif delete mode 100644 data/images/toolbar/default/empty-large/rules.gif delete mode 100644 data/images/toolbar/default/empty-large/save.gif delete mode 100644 data/images/toolbar/default/empty-large/statistics.gif delete mode 100644 data/images/toolbar/default/empty-large/undo.gif create mode 100644 pysollib/init.py diff --git a/README b/README index a07b15d3..e1c41730 100644 --- a/README +++ b/README @@ -13,7 +13,8 @@ Requirements. or - PyGame: http://www.pygame.org/ (mp3, ogg, wav, midi, tracker music) -** other modules (not necessarily) ** +** other packages (not necessarily) ** + - Tile: http://tktable.sourceforge.net/tile/ (0.7.8 or later) - PIL (Python Image Library): http://www.pythonware.com/products/pil - Freecell Solver: http://vipe.technion.ac.il/~shlomif/freecell-solver/ diff --git a/data/images/buttons/bluecurve/new.gif b/data/images/buttons/bluecurve/new.gif new file mode 100644 index 0000000000000000000000000000000000000000..04ddcc418814ce5dbffc6daa449ed9c74131301e GIT binary patch literal 226 zcmZ?wbhEHb6k!lyXklPra!Olw_hsLSJFN$<)$BN5yx~;ViX#=9PbV(em$u|U!;W+F zFFsgt<7v&dGZ8bkH|;p@-@l37Ju_(1R@b)GZtZIl=I^zwUlulPyGi+c>$;`d`LmSL zr~F3(ia%KxxftXbbQpjDWG4e_`~&sAl+1YFynm2=WoK9UTRaG{fgWe@$5J^TeCf* Wk(5-e8iRCObBmvOcaM@HgEau0$Z7uo literal 0 HcmV?d00001 diff --git a/data/images/toolbar/default/empty-large/autodrop.gif b/data/images/toolbar/default/empty-large/autodrop.gif deleted file mode 100644 index cad5be042515518e646ddbaca200fc7e0ec04747..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfyuk4f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{Z;XT&Kkgv3bBn<8fEAm(UjChPJI&1SjZ*g}qg4zH)&MX!IEMfL diff --git a/data/images/toolbar/default/empty-large/new.gif b/data/images/toolbar/default/empty-large/new.gif deleted file mode 100644 index 4d251008d5932ecdd323d9dd4ba30e36037b2bb5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 137 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfyuY0f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{c9*E~qB3|Ll<8?Xmf3fs^w^ nArq~s$LBB6P*Gbx{o%#sr>&H)rGDdH_hyarnm0XK3=Gx)Q7SlF diff --git a/data/images/toolbar/default/empty-large/open.gif b/data/images/toolbar/default/empty-large/open.gif deleted file mode 100644 index 285a2acfd70f7110f89ed751895078efe675513f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 141 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfhn-3f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{c9+n3vZ+SR(g9sekp$EH>$0 rCY@(hr>sQdA}$*Vukyt2uik--`O{p2{L diff --git a/data/images/toolbar/default/empty-large/quit.gif b/data/images/toolbar/default/empty-large/quit.gif deleted file mode 100644 index 588d0682be9b9d11e0f845ffb93c86b04b682190..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfyu9@f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{eWnn0wDYY}@xi{Jl4e_JO+x o+hqK@7-cu@Ote~fYN?=kZPuI{cQ@}^qnHu0m|bVGC9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfhnk`f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{XnRE(=b0*#7RrwD-v@ng`~d t4Y+)@RETgkv+4FK+-JyZYy diff --git a/data/images/toolbar/default/empty-large/restart.gif b/data/images/toolbar/default/empty-large/restart.gif deleted file mode 100644 index 98bdc0bfb1479930dfd7cb7a9594a6dcf34a0085..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 153 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfho49f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{bwxE~_^@m|$mI^Wn8+Q@i~7 zuq!tkyl)!?R?9WA$y|*3`gGOBHPc`IaoQfz`l(xY_Q}hiEq}*}Pd=_`v3A-^dsYT( E0D#Uy!2kdN diff --git a/data/images/toolbar/default/empty-large/rules.gif b/data/images/toolbar/default/empty-large/rules.gif deleted file mode 100644 index fa8779c5c57da205df7b2482be712e6dc0ce317d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 144 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfhnY?f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{XnRE~_^@=-&6SasKNcB{nh_ v(;VEgPCa@*vxQ0eaK@DrTfA0XSYBxUP;PH~{`Z4_Yx|F`d?TyHz+epkbUHt9 diff --git a/data/images/toolbar/default/empty-large/save.gif b/data/images/toolbar/default/empty-large/save.gif deleted file mode 100644 index 82380c660c35a90efabef3bf73f129ae4462144a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfyuk4f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{c9+79S{_UAarSWFPZ2t^G%J lB^=_KjxI6&`8u${;_$_;K&|;PnoBZSzaQ9Cw330r8UX3AHzxo9 diff --git a/data/images/toolbar/default/empty-large/statistics.gif b/data/images/toolbar/default/empty-large/statistics.gif deleted file mode 100644 index 37063236e77014fcf2c25f79fa10dd363b56b935..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfyu9@f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{c9-79S{N-?=Gy@5jTrO{TFQ oC3-HDxyXKa*({ZPMsdq6Z@X3J))}*J(-C}7xLw10HW!060J6R~n*aa+ diff --git a/data/images/toolbar/default/empty-large/undo.gif b/data/images/toolbar/default/empty-large/undo.gif deleted file mode 100644 index 9e3bb0e81a053e9b431c9805476d50b2ac3813d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmZ?wbhEHb)L>9!_`m=H`}glx{Kp?q8JwS^P@JEWS(2Dpl**v^lZBCifssK6qy(gx zfhn}7f92`7{EO#oxz)Y--k#t5ZI3*rJ?mWd>eRM(+{XnQF7($vY&`d2%DZ3|RR?C? v24|(-)1HOt)^bbS($_}$zFQXd&g}G6q4oFIhWUh4?LU\n" "Language-Team: LANGUAGE \n" @@ -768,6 +768,9 @@ msgstr "" msgid "Double Grasshopper" msgstr "" +msgid "Double Kingsley" +msgstr "" + msgid "Double Klondike" msgstr "" @@ -1518,6 +1521,9 @@ msgstr "" msgid "Kingsdown Eights" msgstr "" +msgid "Kingsley" +msgstr "" + msgid "Klondike" msgstr "" @@ -2631,6 +2637,9 @@ msgstr "" msgid "Pegged Triangle 2" msgstr "" +msgid "Penelope's Web" +msgstr "" + msgid "Penguin" msgstr "" @@ -2946,6 +2955,9 @@ msgstr "" msgid "Scarab" msgstr "" +msgid "Scarp" +msgstr "" + msgid "Scheidungsgrund" msgstr "" @@ -3447,6 +3459,9 @@ msgstr "" msgid "Trapdoor" msgstr "" +msgid "Trapdoor Spider" +msgstr "" + msgid "Treasure Trove" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index df025155..0e605b22 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Sat Oct 7 20:03:30 2006\n" +"POT-Creation-Date: Tue Oct 31 19:33:33 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-10-07 20:03+0400\n" +"POT-Creation-Date: 2006-10-31 19:33+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,45 +32,45 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: pysollib/actions.py:260 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:258 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "" -#: pysollib/actions.py:273 pysollib/tk/menubar.py:815 +#: pysollib/actions.py:271 pysollib/tk/menubar.py:815 #: pysollib/tk/menubar.py:829 msgid "Select game" msgstr "" -#: pysollib/actions.py:287 +#: pysollib/actions.py:285 msgid "Invalid game number" msgstr "" -#: pysollib/actions.py:288 +#: pysollib/actions.py:286 msgid "Invalid game number\n" msgstr "" -#: pysollib/actions.py:305 +#: pysollib/actions.py:303 msgid "Select next game number" msgstr "" -#: pysollib/actions.py:314 pysollib/actions.py:324 +#: pysollib/actions.py:312 pysollib/actions.py:322 msgid "Select new game number" msgstr "" -#: pysollib/actions.py:315 +#: pysollib/actions.py:313 msgid "" "\n" "\n" "Enter new game number" msgstr "" -#: pysollib/actions.py:316 +#: pysollib/actions.py:314 msgid "&Next number" msgstr "" -#: pysollib/actions.py:316 pysollib/app.py:1150 pysollib/app.py:1162 -#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:478 -#: pysollib/main.py:486 pysollib/tk/colorsdialog.py:122 +#: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 +#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865 +#: pysollib/main.py:374 pysollib/main.py:382 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -78,149 +78,141 @@ msgstr "" #: pysollib/tk/selectcardset.py:397 pysollib/tk/selecttile.py:159 #: pysollib/tk/soundoptionsdialog.py:170 pysollib/tk/soundoptionsdialog.py:211 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:499 -#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 -#: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 -#: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:777 -#: pysollib/tk/tkstats.py:861 pysollib/tk/tkwidget.py:159 -#: pysollib/tk/tkwidget.py:324 +#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:512 +#: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594 +#: pysollib/tk/tkstats.py:636 pysollib/tk/tkstats.py:708 +#: pysollib/tk/tkstats.py:792 pysollib/tk/tkwidget.py:160 +#: pysollib/tk/tkwidget.py:325 msgid "&OK" msgstr "" -#: pysollib/actions.py:316 pysollib/app.py:1162 pysollib/game.py:925 -#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 -#: pysollib/game.py:1339 pysollib/tk/colorsdialog.py:122 +#: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167 +#: pysollib/game.py:929 pysollib/game.py:1315 pysollib/game.py:1330 +#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1122 #: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:324 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:325 msgid "&Cancel" msgstr "" -#: pysollib/actions.py:332 +#: pysollib/actions.py:330 msgid "Select random game" msgstr "" -#: pysollib/actions.py:368 +#: pysollib/actions.py:366 msgid "Select next game" msgstr "" -#: pysollib/actions.py:401 pysollib/tk/toolbar.py:211 +#: pysollib/actions.py:399 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "" -#: pysollib/actions.py:451 +#: pysollib/actions.py:449 msgid "Clear bookmarks" msgstr "" -#: pysollib/actions.py:452 +#: pysollib/actions.py:450 msgid "Clear all bookmarks ?" msgstr "" -#: pysollib/actions.py:462 +#: pysollib/actions.py:460 msgid "Restart game" msgstr "" -#: pysollib/actions.py:463 +#: pysollib/actions.py:461 msgid "Restart this game ?" msgstr "" -#: pysollib/actions.py:504 +#: pysollib/actions.py:502 msgid "" "Comments for %s:\n" "\n" msgstr "" -#: pysollib/actions.py:506 +#: pysollib/actions.py:504 msgid "Comments for " msgstr "" -#: pysollib/actions.py:524 pysollib/actions.py:554 +#: pysollib/actions.py:522 pysollib/actions.py:550 msgid "Error while writing to file" msgstr "" -#: pysollib/actions.py:527 pysollib/actions.py:557 +#: pysollib/actions.py:525 pysollib/actions.py:553 msgid " Info" msgstr "" -#: pysollib/actions.py:528 +#: pysollib/actions.py:526 msgid "" "Comments were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:539 +#: pysollib/actions.py:537 msgid "Demo statistics" msgstr "" -#: pysollib/actions.py:542 +#: pysollib/actions.py:540 msgid "Your statistics" msgstr "" -#: pysollib/actions.py:558 +#: pysollib/actions.py:554 msgid "" " were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:572 +#: pysollib/actions.py:568 msgid " Demo" msgstr "" -#: pysollib/actions.py:572 +#: pysollib/actions.py:568 msgid " Demo " msgstr "" -#: pysollib/actions.py:575 pysollib/actions.py:593 +#: pysollib/actions.py:571 pysollib/actions.py:589 msgid " for " msgstr "" -#: pysollib/actions.py:581 pysollib/actions.py:600 +#: pysollib/actions.py:577 pysollib/stats.py:206 msgid "Statistics for " msgstr "" -#: pysollib/actions.py:584 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:580 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "" -#: pysollib/actions.py:587 data/glade-translations:31 +#: pysollib/actions.py:583 data/glade-translations:31 msgid "Full log" msgstr "" -#: pysollib/actions.py:590 data/glade-translations:32 +#: pysollib/actions.py:586 data/glade-translations:32 msgid "Session log" msgstr "" -#: pysollib/actions.py:596 +#: pysollib/actions.py:592 msgid "Game Info" msgstr "" -#: pysollib/actions.py:605 -msgid "Full log for " -msgstr "" - -#: pysollib/actions.py:610 -msgid "Session log for " -msgstr "" - -#: pysollib/actions.py:615 +#: pysollib/actions.py:608 msgid "Reset all statistics" msgstr "" -#: pysollib/actions.py:616 +#: pysollib/actions.py:609 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" msgstr "" -#: pysollib/actions.py:622 +#: pysollib/actions.py:615 msgid "Reset game statistics" msgstr "" -#: pysollib/actions.py:623 +#: pysollib/actions.py:616 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -228,23 +220,23 @@ msgid "" "%s ?" msgstr "" -#: pysollib/actions.py:678 +#: pysollib/actions.py:671 msgid "Play demo" msgstr "" -#: pysollib/actions.py:689 +#: pysollib/actions.py:682 msgid "Set player options" msgstr "" -#: pysollib/actions.py:703 data/glade-translations:40 +#: pysollib/actions.py:696 data/glade-translations:40 msgid "Set colors" msgstr "" -#: pysollib/actions.py:723 +#: pysollib/actions.py:716 msgid "Set fonts" msgstr "" -#: pysollib/actions.py:732 data/glade-translations:33 +#: pysollib/actions.py:725 data/glade-translations:33 msgid "Set timeouts" msgstr "" @@ -252,23 +244,28 @@ msgstr "" msgid "Unknown" msgstr "" -#: pysollib/app.py:1012 +#: pysollib/app.py:894 pysollib/game.py:1315 pysollib/game.py:1330 +#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/menubar.py:363 +msgid "&New game" +msgstr "" + +#: pysollib/app.py:1017 msgid "Loading %s %s..." msgstr "" -#: pysollib/app.py:1047 +#: pysollib/app.py:1052 msgid " load error" msgstr "" -#: pysollib/app.py:1048 +#: pysollib/app.py:1053 msgid "Error while loading " msgstr "" -#: pysollib/app.py:1142 +#: pysollib/app.py:1147 msgid "Incompatible " msgstr "" -#: pysollib/app.py:1144 +#: pysollib/app.py:1149 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -277,57 +274,57 @@ msgid "" "Please select a %s type %s.\n" msgstr "" -#: pysollib/app.py:1160 +#: pysollib/app.py:1165 msgid "Please select a %s type %s" msgstr "" -#: pysollib/game.py:844 pysollib/game.py:850 +#: pysollib/game.py:848 pysollib/game.py:854 msgid "Player\n" msgstr "" -#: pysollib/game.py:921 +#: pysollib/game.py:925 msgid "Discard current game ?" msgstr "" -#: pysollib/game.py:1265 +#: pysollib/game.py:1269 msgid "" "\n" "You have reached\n" "#%d in the %s of playing time" msgstr "" -#: pysollib/game.py:1268 +#: pysollib/game.py:1272 msgid "" "\n" "and #%d in the %s of moves" msgstr "" -#: pysollib/game.py:1270 +#: pysollib/game.py:1274 msgid "" "\n" "You have reached\n" "#%d in the %s of moves" msgstr "" -#: pysollib/game.py:1273 +#: pysollib/game.py:1277 msgid "" "\n" "and #%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1275 +#: pysollib/game.py:1279 msgid "" "\n" "You have reached\n" "#%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1302 pysollib/game.py:1318 +#: pysollib/game.py:1306 pysollib/game.py:1322 #: pysollib/tk/soundoptionsdialog.py:100 msgid "Game won" msgstr "" -#: pysollib/game.py:1303 +#: pysollib/game.py:1307 msgid "" "\n" "Congratulations, this\n" @@ -338,12 +335,7 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 -#: pysollib/game.py:1339 pysollib/tk/menubar.py:363 -msgid "&New game" -msgstr "" - -#: pysollib/game.py:1319 +#: pysollib/game.py:1323 msgid "" "\n" "Congratulations, you did it !\n" @@ -353,100 +345,100 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1331 pysollib/game.py:1337 +#: pysollib/game.py:1335 pysollib/game.py:1341 #: pysollib/tk/soundoptionsdialog.py:98 msgid "Game finished" msgstr "" -#: pysollib/game.py:1332 pysollib/game.py:1862 +#: pysollib/game.py:1336 pysollib/game.py:1866 msgid "" "\n" "Game finished\n" msgstr "" -#: pysollib/game.py:1338 +#: pysollib/game.py:1342 msgid "" "\n" "Game finished, but not without my help...\n" msgstr "" -#: pysollib/game.py:1339 +#: pysollib/game.py:1343 msgid "&Restart" msgstr "" -#: pysollib/game.py:1753 +#: pysollib/game.py:1757 msgid "Score %6d" msgstr "" -#: pysollib/game.py:1852 +#: pysollib/game.py:1856 msgid "&Cool" msgstr "" -#: pysollib/game.py:1852 +#: pysollib/game.py:1856 msgid "&Great" msgstr "" -#: pysollib/game.py:1852 +#: pysollib/game.py:1856 msgid "&Wow" msgstr "" -#: pysollib/game.py:1852 +#: pysollib/game.py:1856 msgid "&Yeah" msgstr "" -#: pysollib/game.py:1853 pysollib/game.py:1865 pysollib/game.py:1878 +#: pysollib/game.py:1857 pysollib/game.py:1869 pysollib/game.py:1882 msgid " Autopilot" msgstr "" -#: pysollib/game.py:1854 +#: pysollib/game.py:1858 msgid "" "\n" "Game solved in %d moves.\n" msgstr "" -#: pysollib/game.py:1877 +#: pysollib/game.py:1881 msgid "&Hmm" msgstr "" -#: pysollib/game.py:1877 +#: pysollib/game.py:1881 msgid "&Oh well" msgstr "" -#: pysollib/game.py:1877 +#: pysollib/game.py:1881 msgid "&That's life" msgstr "" -#: pysollib/game.py:1879 +#: pysollib/game.py:1883 msgid "" "\n" "This won't come out...\n" msgstr "" -#: pysollib/game.py:2291 +#: pysollib/game.py:2295 msgid "Set bookmark" msgstr "" -#: pysollib/game.py:2292 +#: pysollib/game.py:2296 msgid "Replace existing bookmark %d ?" msgstr "" -#: pysollib/game.py:2314 +#: pysollib/game.py:2318 msgid "Goto bookmark" msgstr "" -#: pysollib/game.py:2315 +#: pysollib/game.py:2319 msgid "Goto bookmark %d ?" msgstr "" -#: pysollib/game.py:2346 +#: pysollib/game.py:2350 msgid "Open game" msgstr "" -#: pysollib/game.py:2357 pysollib/game.py:2366 pysollib/game.py:2371 +#: pysollib/game.py:2361 pysollib/game.py:2370 pysollib/game.py:2375 msgid "Load game error" msgstr "" -#: pysollib/game.py:2358 +#: pysollib/game.py:2362 msgid "" "Error while loading game.\n" "\n" @@ -454,22 +446,22 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2367 +#: pysollib/game.py:2371 msgid "Error while loading game" msgstr "" -#: pysollib/game.py:2372 +#: pysollib/game.py:2376 msgid "" "Internal error while loading game.\n" "\n" "Please report this bug." msgstr "" -#: pysollib/game.py:2397 +#: pysollib/game.py:2401 msgid "Save game error" msgstr "" -#: pysollib/game.py:2398 +#: pysollib/game.py:2402 msgid "Error while saving game" msgstr "" @@ -683,7 +675,7 @@ msgstr "" #: pysollib/games/auldlangsyne.py:158 pysollib/games/calculation.py:104 #: pysollib/games/numerica.py:90 pysollib/games/numerica.py:272 -#: pysollib/games/numerica.py:639 pysollib/games/numerica.py:752 +#: pysollib/games/numerica.py:644 pysollib/games/numerica.py:757 msgid "Tableau. Build regardless of rank and suit." msgstr "" @@ -801,7 +793,7 @@ msgstr "" msgid "Deal %d" msgstr "" -#: pysollib/games/numerica.py:259 pysollib/games/royalcotillion.py:840 +#: pysollib/games/numerica.py:259 pysollib/games/royalcotillion.py:849 msgid "Foundation. Build up by color." msgstr "" @@ -1235,7 +1227,7 @@ msgstr "" msgid " Help" msgstr "" -#: pysollib/main.py:67 pysollib/main.py:386 +#: pysollib/main.py:67 pysollib/main.py:282 msgid " installation error" msgstr "" @@ -1249,7 +1241,7 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:75 pysollib/main.py:394 pysollib/tk/menubar.py:382 +#: pysollib/main.py:75 pysollib/main.py:290 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "" @@ -1289,7 +1281,7 @@ msgid "" "try %s --help for more information" msgstr "" -#: pysollib/main.py:387 +#: pysollib/main.py:283 msgid "" "\n" "No games were found !!!\n" @@ -1300,25 +1292,25 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:473 pysollib/main.py:481 +#: pysollib/main.py:369 pysollib/main.py:377 msgid " installation problem" msgstr "" -#: pysollib/main.py:474 +#: pysollib/main.py:370 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:482 +#: pysollib/main.py:378 msgid "" "The pysolsoundserver module was not found.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:489 +#: pysollib/main.py:385 msgid "Welcome to " msgstr "" @@ -1801,76 +1793,84 @@ msgstr "" msgid "Free cell." msgstr "" -#: pysollib/stats.py:118 pysollib/tk/tkstats.py:78 -msgid "Demo games" +#: pysollib/stats.py:53 pysollib/stats.py:119 +msgid "Game" msgstr "" -#: pysollib/stats.py:119 +#: pysollib/stats.py:54 msgid "Played" msgstr "" -#: pysollib/stats.py:120 pysollib/stats.py:200 +#: pysollib/stats.py:55 pysollib/stats.py:158 msgid "Won" msgstr "" -#: pysollib/stats.py:121 pysollib/stats.py:200 +#: pysollib/stats.py:56 pysollib/stats.py:158 msgid "Lost" msgstr "" -#: pysollib/stats.py:122 pysollib/tk/statusbar.py:156 +#: pysollib/stats.py:57 pysollib/tk/statusbar.py:156 #: data/glade-translations:25 msgid "Playing time" msgstr "" -#: pysollib/stats.py:123 data/glade-translations:26 +#: pysollib/stats.py:58 data/glade-translations:26 msgid "Moves" msgstr "" -#: pysollib/stats.py:124 +#: pysollib/stats.py:59 msgid "% won" msgstr "" -#: pysollib/stats.py:153 -msgid "Total (%d out of %d games)" -msgstr "" - -#: pysollib/stats.py:162 -msgid "Game" -msgstr "" - -#: pysollib/stats.py:162 +#: pysollib/stats.py:119 msgid "Status" msgstr "" -#: pysollib/stats.py:162 pysollib/tk/statusbar.py:158 -#: pysollib/tk/tkstats.py:735 +#: pysollib/stats.py:119 pysollib/tk/statusbar.py:158 +#: pysollib/tk/tkstats.py:666 msgid "Game number" msgstr "" -#: pysollib/stats.py:162 pysollib/tk/tkstats.py:738 +#: pysollib/stats.py:119 pysollib/tk/tkstats.py:669 msgid "Started at" msgstr "" -#: pysollib/stats.py:185 +#: pysollib/stats.py:143 msgid "** UNKNOWN %d **" msgstr "" -#: pysollib/stats.py:193 +#: pysollib/stats.py:151 msgid "** ERROR **" msgstr "" -#: pysollib/stats.py:200 +#: pysollib/stats.py:158 msgid "Loaded" msgstr "" -#: pysollib/stats.py:200 +#: pysollib/stats.py:158 msgid "Not won" msgstr "" -#: pysollib/stats.py:200 +#: pysollib/stats.py:158 msgid "Perfect" msgstr "" +#: pysollib/stats.py:205 pysollib/stats.py:236 pysollib/stats.py:242 +msgid "Demo" +msgstr "" + +#: pysollib/stats.py:216 pysollib/tk/tkstats.py:418 +msgid "Total (%d out of %d games)" +msgstr "" + +#: pysollib/stats.py:237 +msgid "Full log for " +msgstr "" + +#: pysollib/stats.py:243 +msgid "Session log for " +msgstr "" + #: pysollib/tk/colorsdialog.py:71 data/glade-translations:41 msgid "Text foreground:" msgstr "" @@ -2792,12 +2792,12 @@ msgstr "" msgid "Lost:" msgstr "" -#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:805 +#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:736 #: data/glade-translations:18 msgid "Playing time:" msgstr "" -#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:812 +#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:743 #: data/glade-translations:19 msgid "Moves:" msgstr "" @@ -3034,6 +3034,10 @@ msgstr "" msgid "Unable to service request:\n" msgstr "" +#: pysollib/tk/tkstats.py:78 +msgid "Demo games" +msgstr "" + #: pysollib/tk/tkstats.py:95 data/glade-translations:16 msgid "Total" msgstr "" @@ -3059,140 +3063,128 @@ msgstr "" msgid "&Reset..." msgstr "" -#: pysollib/tk/tkstats.py:574 pysollib/tk/tkstats.py:647 -#: pysollib/tk/tkstats.py:663 +#: pysollib/tk/tkstats.py:513 pysollib/tk/tkstats.py:579 +#: pysollib/tk/tkstats.py:594 msgid "&Save to file" msgstr "" -#: pysollib/tk/tkstats.py:575 +#: pysollib/tk/tkstats.py:514 msgid "&Reset all..." msgstr "" -#: pysollib/tk/tkstats.py:625 -msgid "No entries for player " -msgstr "" - -#: pysollib/tk/tkstats.py:642 -msgid "No log entries for %s\n" -msgstr "" - -#: pysollib/tk/tkstats.py:647 +#: pysollib/tk/tkstats.py:579 msgid "Session &log..." msgstr "" -#: pysollib/tk/tkstats.py:658 -msgid "No current session log entries for %s\n" -msgstr "" - -#: pysollib/tk/tkstats.py:663 +#: pysollib/tk/tkstats.py:594 msgid "&Full log..." msgstr "" -#: pysollib/tk/tkstats.py:678 +#: pysollib/tk/tkstats.py:609 msgid "Highlight piles: " msgstr "" -#: pysollib/tk/tkstats.py:679 +#: pysollib/tk/tkstats.py:610 msgid "Highlight cards: " msgstr "" -#: pysollib/tk/tkstats.py:680 +#: pysollib/tk/tkstats.py:611 msgid "Highlight same rank: " msgstr "" -#: pysollib/tk/tkstats.py:683 +#: pysollib/tk/tkstats.py:614 msgid "" "\n" "Redeals: " msgstr "" -#: pysollib/tk/tkstats.py:684 +#: pysollib/tk/tkstats.py:615 msgid "" "\n" "Cards in Talon: " msgstr "" -#: pysollib/tk/tkstats.py:686 +#: pysollib/tk/tkstats.py:617 msgid "" "\n" "Cards in Waste: " msgstr "" -#: pysollib/tk/tkstats.py:688 +#: pysollib/tk/tkstats.py:619 msgid "" "\n" "Cards in Foundations: " msgstr "" -#: pysollib/tk/tkstats.py:691 +#: pysollib/tk/tkstats.py:622 msgid "Game status" msgstr "" -#: pysollib/tk/tkstats.py:694 +#: pysollib/tk/tkstats.py:625 msgid "Playing time: " msgstr "" -#: pysollib/tk/tkstats.py:695 +#: pysollib/tk/tkstats.py:626 msgid "Started at: " msgstr "" -#: pysollib/tk/tkstats.py:696 +#: pysollib/tk/tkstats.py:627 msgid "Moves: " msgstr "" -#: pysollib/tk/tkstats.py:697 +#: pysollib/tk/tkstats.py:628 msgid "Undo moves: " msgstr "" -#: pysollib/tk/tkstats.py:698 +#: pysollib/tk/tkstats.py:629 msgid "Bookmark moves: " msgstr "" -#: pysollib/tk/tkstats.py:699 +#: pysollib/tk/tkstats.py:630 msgid "Demo moves: " msgstr "" -#: pysollib/tk/tkstats.py:700 +#: pysollib/tk/tkstats.py:631 msgid "Total player moves: " msgstr "" -#: pysollib/tk/tkstats.py:701 +#: pysollib/tk/tkstats.py:632 msgid "Total moves in this game: " msgstr "" -#: pysollib/tk/tkstats.py:702 +#: pysollib/tk/tkstats.py:633 msgid "Hints: " msgstr "" -#: pysollib/tk/tkstats.py:706 +#: pysollib/tk/tkstats.py:637 msgid "&Statistics..." msgstr "" -#: pysollib/tk/tkstats.py:732 +#: pysollib/tk/tkstats.py:663 msgid "N" msgstr "" -#: pysollib/tk/tkstats.py:741 +#: pysollib/tk/tkstats.py:672 msgid "Result" msgstr "" -#: pysollib/tk/tkstats.py:797 data/glade-translations:21 +#: pysollib/tk/tkstats.py:728 data/glade-translations:21 msgid "Minimum" msgstr "" -#: pysollib/tk/tkstats.py:798 data/glade-translations:22 +#: pysollib/tk/tkstats.py:729 data/glade-translations:22 msgid "Maximum" msgstr "" -#: pysollib/tk/tkstats.py:799 data/glade-translations:23 +#: pysollib/tk/tkstats.py:730 data/glade-translations:23 msgid "Average" msgstr "" -#: pysollib/tk/tkstats.py:819 data/glade-translations:20 +#: pysollib/tk/tkstats.py:750 data/glade-translations:20 msgid "Total moves:" msgstr "" -#: pysollib/tk/tkstats.py:850 +#: pysollib/tk/tkstats.py:781 msgid "No TOP for this game" msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 419db16f..0e9778bb 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sat Oct 7 20:02:33 2006\n" -"PO-Revision-Date: 2006-10-08 18:43+0400\n" +"POT-Creation-Date: Tue Oct 31 19:32:40 2006\n" +"PO-Revision-Date: 2006-10-31 19:57+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -774,6 +774,10 @@ msgstr "Двойной Золотой рудник" msgid "Double Grasshopper" msgstr "Двойной кузнечик" +#, fuzzy +msgid "Double Kingsley" +msgstr "Двойной Бисли" + msgid "Double Klondike" msgstr "Двойной Клондайк" @@ -953,9 +957,8 @@ msgstr "Экспресс" msgid "Eye" msgstr "Глаз" -#, fuzzy msgid "F-15 Eagle" -msgstr "Маджонг F-15 Eagle" +msgstr "F-15 Eagle" msgid "Faerie Queen" msgstr "Королева фей" @@ -1538,6 +1541,10 @@ msgstr "Короли" msgid "Kingsdown Eights" msgstr "" +#, fuzzy +msgid "Kingsley" +msgstr "Короли" + msgid "Klondike" msgstr "Клондайк" @@ -2677,6 +2684,9 @@ msgstr "" msgid "Pegged Triangle 2" msgstr "" +msgid "Penelope's Web" +msgstr "" + msgid "Penguin" msgstr "Пингвин" @@ -2995,6 +3005,9 @@ msgstr "Саксония" msgid "Scarab" msgstr "Скарабей" +msgid "Scarp" +msgstr "Откос" + msgid "Scheidungsgrund" msgstr "Scheidungsgrund" @@ -3317,7 +3330,6 @@ msgstr "Улицы" msgid "Streets and Alleys" msgstr "Улицы и аллеи" -#, fuzzy msgid "Striptease" msgstr "Стриптиз" @@ -3414,13 +3426,11 @@ msgstr "Сад" msgid "The Great Wall" msgstr "Великая Стена" -#, fuzzy msgid "The Last Monarch" msgstr "Последний Монарх" -#, fuzzy msgid "The Last Monarch II" -msgstr "Последний Монарх" +msgstr "Последний Монарх II" msgid "The Little Corporal" msgstr "Маленький Капрал" @@ -3515,6 +3525,10 @@ msgstr "Маджонг Traditional Reviewed" msgid "Trapdoor" msgstr "Люк" +#, fuzzy +msgid "Trapdoor Spider" +msgstr "Люк" + msgid "Treasure Trove" msgstr "Клад" @@ -3648,7 +3662,7 @@ msgid "Victory Arrow" msgstr "Маджонг Victory Arrow" msgid "Virginia Reel" -msgstr "" +msgstr "Виргинский Рил" #, fuzzy msgid "Wake-Robin" @@ -3767,26 +3781,3 @@ msgstr "" msgid "Zodiac" msgstr "Зодиак" - -#~ msgid "Leo" -#~ msgstr "Лев" - -#~ msgid "Mahjongg Leo" -#~ msgstr "Маджонг Лев" - -#, fuzzy -#~ msgid "Big Ground" -#~ msgstr "Большая гора" - -#, fuzzy -#~ msgid "Tri Peaks" -#~ msgstr "Три вершины" - -#~ msgid "Ground for a Divorce (3 decks)" -#~ msgstr "Повод для разрыва (3 колоды)" - -#~ msgid "Ground for a Divorce (4 decks)" -#~ msgstr "Повод для разрыва (4 колоды)" - -#~ msgid "Triple York" -#~ msgstr "Тройной Йорк" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 16810ff2..f6e028e3 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Sat Oct 7 20:03:30 2006\n" -"PO-Revision-Date: 2006-10-05 16:31+0400\n" +"POT-Creation-Date: Tue Oct 31 19:33:33 2006\n" +"PO-Revision-Date: 2006-10-31 19:57+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -14,32 +14,32 @@ msgstr "" "Content-Transfer-Encoding: utf-8\n" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:260 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:258 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "Новая игра" -#: pysollib/actions.py:273 pysollib/tk/menubar.py:815 +#: pysollib/actions.py:271 pysollib/tk/menubar.py:815 #: pysollib/tk/menubar.py:829 msgid "Select game" msgstr "Выбрать игру" -#: pysollib/actions.py:287 +#: pysollib/actions.py:285 msgid "Invalid game number" msgstr "Неправильный номер игры" -#: pysollib/actions.py:288 +#: pysollib/actions.py:286 msgid "Invalid game number\n" msgstr "Неправильный номер игры\n" -#: pysollib/actions.py:305 +#: pysollib/actions.py:303 msgid "Select next game number" msgstr "Выберите номер следующей игры" -#: pysollib/actions.py:314 pysollib/actions.py:324 +#: pysollib/actions.py:312 pysollib/actions.py:322 msgid "Select new game number" msgstr "Выберите номер новой игры" -#: pysollib/actions.py:315 +#: pysollib/actions.py:313 msgid "" "\n" "\n" @@ -49,13 +49,13 @@ msgstr "" "\n" "Введите номер новой игры" -#: pysollib/actions.py:316 +#: pysollib/actions.py:314 msgid "&Next number" msgstr "&Следующий номер" -#: pysollib/actions.py:316 pysollib/app.py:1150 pysollib/app.py:1162 -#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:478 -#: pysollib/main.py:486 pysollib/tk/colorsdialog.py:122 +#: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 +#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865 +#: pysollib/main.py:374 pysollib/main.py:382 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -63,56 +63,56 @@ msgstr "&Следующий номер" #: pysollib/tk/selectcardset.py:397 pysollib/tk/selecttile.py:159 #: pysollib/tk/soundoptionsdialog.py:170 pysollib/tk/soundoptionsdialog.py:211 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:499 -#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 -#: pysollib/tk/tkstats.py:647 pysollib/tk/tkstats.py:663 -#: pysollib/tk/tkstats.py:705 pysollib/tk/tkstats.py:777 -#: pysollib/tk/tkstats.py:861 pysollib/tk/tkwidget.py:159 -#: pysollib/tk/tkwidget.py:324 +#: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:512 +#: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594 +#: pysollib/tk/tkstats.py:636 pysollib/tk/tkstats.py:708 +#: pysollib/tk/tkstats.py:792 pysollib/tk/tkwidget.py:160 +#: pysollib/tk/tkwidget.py:325 msgid "&OK" msgstr "&ОК" -#: pysollib/actions.py:316 pysollib/app.py:1162 pysollib/game.py:925 -#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 -#: pysollib/game.py:1339 pysollib/tk/colorsdialog.py:122 +#: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167 +#: pysollib/game.py:929 pysollib/game.py:1315 pysollib/game.py:1330 +#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1122 #: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85 #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:324 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:325 msgid "&Cancel" msgstr "От&мена" -#: pysollib/actions.py:332 +#: pysollib/actions.py:330 msgid "Select random game" msgstr "Выбор случайной игры" -#: pysollib/actions.py:368 +#: pysollib/actions.py:366 msgid "Select next game" msgstr "Выбрать следующую игру" -#: pysollib/actions.py:401 pysollib/tk/toolbar.py:211 +#: pysollib/actions.py:399 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "Выйти из " -#: pysollib/actions.py:451 +#: pysollib/actions.py:449 msgid "Clear bookmarks" msgstr "Удалить закладки" -#: pysollib/actions.py:452 +#: pysollib/actions.py:450 msgid "Clear all bookmarks ?" msgstr "Удалить все закладки?" -#: pysollib/actions.py:462 +#: pysollib/actions.py:460 msgid "Restart game" msgstr "Начать игру с начала" -#: pysollib/actions.py:463 +#: pysollib/actions.py:461 msgid "Restart this game ?" msgstr "Начать игру с начала?" -#: pysollib/actions.py:504 +#: pysollib/actions.py:502 msgid "" "Comments for %s:\n" "\n" @@ -120,19 +120,19 @@ msgstr "" "Комментарий для %s:\n" "\n" -#: pysollib/actions.py:506 +#: pysollib/actions.py:504 msgid "Comments for " msgstr "Комментарий для " -#: pysollib/actions.py:524 pysollib/actions.py:554 +#: pysollib/actions.py:522 pysollib/actions.py:550 msgid "Error while writing to file" msgstr "Ошибка при записи в файл" -#: pysollib/actions.py:527 pysollib/actions.py:557 +#: pysollib/actions.py:525 pysollib/actions.py:553 msgid " Info" msgstr " Информация" -#: pysollib/actions.py:528 +#: pysollib/actions.py:526 msgid "" "Comments were appended to\n" "\n" @@ -140,15 +140,15 @@ msgstr "" "Комментарий добавлен в файл\n" "\n" -#: pysollib/actions.py:539 +#: pysollib/actions.py:537 msgid "Demo statistics" msgstr "Статистика демо" -#: pysollib/actions.py:542 +#: pysollib/actions.py:540 msgid "Your statistics" msgstr "Ваша статистика" -#: pysollib/actions.py:558 +#: pysollib/actions.py:554 msgid "" " were appended to\n" "\n" @@ -156,52 +156,44 @@ msgstr "" " добавлена в файл\n" "\n" -#: pysollib/actions.py:572 +#: pysollib/actions.py:568 msgid " Demo" msgstr " Демо" -#: pysollib/actions.py:572 +#: pysollib/actions.py:568 msgid " Demo " msgstr " Демо " -#: pysollib/actions.py:575 pysollib/actions.py:593 +#: pysollib/actions.py:571 pysollib/actions.py:589 msgid " for " msgstr " для " -#: pysollib/actions.py:581 pysollib/actions.py:600 +#: pysollib/actions.py:577 pysollib/stats.py:206 msgid "Statistics for " msgstr "Статистика игры " -#: pysollib/actions.py:584 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:580 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "Статистика" -#: pysollib/actions.py:587 data/glade-translations:31 +#: pysollib/actions.py:583 data/glade-translations:31 msgid "Full log" msgstr "Полный лог" -#: pysollib/actions.py:590 data/glade-translations:32 +#: pysollib/actions.py:586 data/glade-translations:32 msgid "Session log" msgstr "Лог сессии" -#: pysollib/actions.py:596 +#: pysollib/actions.py:592 msgid "Game Info" msgstr "Информация об игре" -#: pysollib/actions.py:605 -msgid "Full log for " -msgstr "Полный лог для " - -#: pysollib/actions.py:610 -msgid "Session log for " -msgstr "Лог сессии для " - -#: pysollib/actions.py:615 +#: pysollib/actions.py:608 msgid "Reset all statistics" msgstr "Очистить всю статистику" -#: pysollib/actions.py:616 +#: pysollib/actions.py:609 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" @@ -209,11 +201,11 @@ msgstr "" "Очистить всю статистику и лог для игрока\n" "%s?" -#: pysollib/actions.py:622 +#: pysollib/actions.py:615 msgid "Reset game statistics" msgstr "Очистить статистику игры" -#: pysollib/actions.py:623 +#: pysollib/actions.py:616 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -225,23 +217,23 @@ msgstr "" "и игры\n" "%s?" -#: pysollib/actions.py:678 +#: pysollib/actions.py:671 msgid "Play demo" msgstr "Показать демо" -#: pysollib/actions.py:689 +#: pysollib/actions.py:682 msgid "Set player options" msgstr "Установить настройки игрока" -#: pysollib/actions.py:703 data/glade-translations:40 +#: pysollib/actions.py:696 data/glade-translations:40 msgid "Set colors" msgstr "Настроить цвета" -#: pysollib/actions.py:723 +#: pysollib/actions.py:716 msgid "Set fonts" msgstr "Настроить шрифт" -#: pysollib/actions.py:732 data/glade-translations:33 +#: pysollib/actions.py:725 data/glade-translations:33 msgid "Set timeouts" msgstr "Настроить таймауты" @@ -249,23 +241,28 @@ msgstr "Настроить таймауты" msgid "Unknown" msgstr "Неизвестный" -#: pysollib/app.py:1012 +#: pysollib/app.py:894 pysollib/game.py:1315 pysollib/game.py:1330 +#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/menubar.py:363 +msgid "&New game" +msgstr "&Новая игра" + +#: pysollib/app.py:1017 msgid "Loading %s %s..." msgstr "Загружается %s %s..." -#: pysollib/app.py:1047 +#: pysollib/app.py:1052 msgid " load error" msgstr " ошибка при загрузке" -#: pysollib/app.py:1048 +#: pysollib/app.py:1053 msgid "Error while loading " msgstr "Ошибка при загрузке" -#: pysollib/app.py:1142 +#: pysollib/app.py:1147 msgid "Incompatible " msgstr "Несовместимый " -#: pysollib/app.py:1144 +#: pysollib/app.py:1149 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -279,19 +276,19 @@ msgstr "" "\n" "Необходимо выбрать %s типа %s.\n" -#: pysollib/app.py:1160 +#: pysollib/app.py:1165 msgid "Please select a %s type %s" msgstr "Выберите %s типа %s" -#: pysollib/game.py:844 pysollib/game.py:850 +#: pysollib/game.py:848 pysollib/game.py:854 msgid "Player\n" msgstr "Игрок\n" -#: pysollib/game.py:921 +#: pysollib/game.py:925 msgid "Discard current game ?" msgstr "Завершить текущую игру?" -#: pysollib/game.py:1265 +#: pysollib/game.py:1269 msgid "" "\n" "You have reached\n" @@ -301,7 +298,7 @@ msgstr "" "Вы достигли\n" "#%d в %s игрового времени" -#: pysollib/game.py:1268 +#: pysollib/game.py:1272 msgid "" "\n" "and #%d in the %s of moves" @@ -309,7 +306,7 @@ msgstr "" "\n" "и #%d в %s количества ходов" -#: pysollib/game.py:1270 +#: pysollib/game.py:1274 msgid "" "\n" "You have reached\n" @@ -319,7 +316,7 @@ msgstr "" "Вы достигли\n" "#%d в %s количества ходов" -#: pysollib/game.py:1273 +#: pysollib/game.py:1277 msgid "" "\n" "and #%d in the %s of total moves" @@ -327,7 +324,7 @@ msgstr "" "\n" "и #%d в %s общего количества ходов" -#: pysollib/game.py:1275 +#: pysollib/game.py:1279 msgid "" "\n" "You have reached\n" @@ -337,12 +334,12 @@ msgstr "" "Вы достигли\n" "#%d в %s общего количества ходов" -#: pysollib/game.py:1302 pysollib/game.py:1318 +#: pysollib/game.py:1306 pysollib/game.py:1322 #: pysollib/tk/soundoptionsdialog.py:100 msgid "Game won" msgstr "Игра выиграна" -#: pysollib/game.py:1303 +#: pysollib/game.py:1307 msgid "" "\n" "Congratulations, this\n" @@ -361,12 +358,7 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 -#: pysollib/game.py:1339 pysollib/tk/menubar.py:363 -msgid "&New game" -msgstr "&Новая игра" - -#: pysollib/game.py:1319 +#: pysollib/game.py:1323 msgid "" "\n" "Congratulations, you did it !\n" @@ -383,12 +375,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1331 pysollib/game.py:1337 +#: pysollib/game.py:1335 pysollib/game.py:1341 #: pysollib/tk/soundoptionsdialog.py:98 msgid "Game finished" msgstr "Игра закончена" -#: pysollib/game.py:1332 pysollib/game.py:1862 +#: pysollib/game.py:1336 pysollib/game.py:1866 msgid "" "\n" "Game finished\n" @@ -396,7 +388,7 @@ msgstr "" "\n" "Игра закончена\n" -#: pysollib/game.py:1338 +#: pysollib/game.py:1342 msgid "" "\n" "Game finished, but not without my help...\n" @@ -404,35 +396,35 @@ msgstr "" "\n" "Игра закончена, но не без моей помощи...\n" -#: pysollib/game.py:1339 +#: pysollib/game.py:1343 msgid "&Restart" msgstr "&Начало" -#: pysollib/game.py:1753 +#: pysollib/game.py:1757 msgid "Score %6d" msgstr "Счёт %6d" -#: pysollib/game.py:1852 +#: pysollib/game.py:1856 msgid "&Cool" msgstr "&Отлично" -#: pysollib/game.py:1852 +#: pysollib/game.py:1856 msgid "&Great" msgstr "&Здорово" -#: pysollib/game.py:1852 +#: pysollib/game.py:1856 msgid "&Wow" msgstr "&Ура" -#: pysollib/game.py:1852 +#: pysollib/game.py:1856 msgid "&Yeah" msgstr "&Ага" -#: pysollib/game.py:1853 pysollib/game.py:1865 pysollib/game.py:1878 +#: pysollib/game.py:1857 pysollib/game.py:1869 pysollib/game.py:1882 msgid " Autopilot" msgstr " Автопилот" -#: pysollib/game.py:1854 +#: pysollib/game.py:1858 msgid "" "\n" "Game solved in %d moves.\n" @@ -440,19 +432,19 @@ msgstr "" "\n" "Игра решена за %d ходов\n" -#: pysollib/game.py:1877 +#: pysollib/game.py:1881 msgid "&Hmm" msgstr "&Хмм" -#: pysollib/game.py:1877 +#: pysollib/game.py:1881 msgid "&Oh well" msgstr "&Ох" -#: pysollib/game.py:1877 +#: pysollib/game.py:1881 msgid "&That's life" msgstr "&Такова жизнь" -#: pysollib/game.py:1879 +#: pysollib/game.py:1883 msgid "" "\n" "This won't come out...\n" @@ -460,31 +452,31 @@ msgstr "" "\n" "Не удалось...\n" -#: pysollib/game.py:2291 +#: pysollib/game.py:2295 msgid "Set bookmark" msgstr "Установить закладку" -#: pysollib/game.py:2292 +#: pysollib/game.py:2296 msgid "Replace existing bookmark %d ?" msgstr "Заменить существующую закладку %d ?" -#: pysollib/game.py:2314 +#: pysollib/game.py:2318 msgid "Goto bookmark" msgstr "Перейти к закладке" -#: pysollib/game.py:2315 +#: pysollib/game.py:2319 msgid "Goto bookmark %d ?" msgstr "Перейти к закладке %d ?" -#: pysollib/game.py:2346 +#: pysollib/game.py:2350 msgid "Open game" msgstr "Открыть игру" -#: pysollib/game.py:2357 pysollib/game.py:2366 pysollib/game.py:2371 +#: pysollib/game.py:2361 pysollib/game.py:2370 pysollib/game.py:2375 msgid "Load game error" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2358 +#: pysollib/game.py:2362 msgid "" "Error while loading game.\n" "\n" @@ -496,11 +488,11 @@ msgstr "" "Возможно повреждён файл,\n" "или ошибка в программе." -#: pysollib/game.py:2367 +#: pysollib/game.py:2371 msgid "Error while loading game" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2372 +#: pysollib/game.py:2376 msgid "" "Internal error while loading game.\n" "\n" @@ -510,11 +502,11 @@ msgstr "" "\n" "Пожалуйста сообщите об этой ошибке." -#: pysollib/game.py:2397 +#: pysollib/game.py:2401 msgid "Save game error" msgstr "Ошибка при сохранении игры" -#: pysollib/game.py:2398 +#: pysollib/game.py:2402 msgid "Error while saving game" msgstr "Ошибка при сохранении игры" @@ -728,7 +720,7 @@ msgstr "Пазлы" #: pysollib/games/auldlangsyne.py:158 pysollib/games/calculation.py:104 #: pysollib/games/numerica.py:90 pysollib/games/numerica.py:272 -#: pysollib/games/numerica.py:639 pysollib/games/numerica.py:752 +#: pysollib/games/numerica.py:644 pysollib/games/numerica.py:757 msgid "Tableau. Build regardless of rank and suit." msgstr "Игровой стол. Складывать не считаясь с мастью и достоинством." @@ -866,7 +858,7 @@ msgstr "Раунд %d/%d" msgid "Deal %d" msgstr "Сдача %d" -#: pysollib/games/numerica.py:259 pysollib/games/royalcotillion.py:840 +#: pysollib/games/numerica.py:259 pysollib/games/royalcotillion.py:849 msgid "Foundation. Build up by color." msgstr "Базовая ячейка. Складывать по возрастанию в соответствии с цветом." @@ -1339,7 +1331,7 @@ msgstr "Не найден файл помощи\n" msgid " Help" msgstr " Помощь" -#: pysollib/main.py:67 pysollib/main.py:386 +#: pysollib/main.py:67 pysollib/main.py:282 msgid " installation error" msgstr " проблема с установкой" @@ -1353,7 +1345,7 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:75 pysollib/main.py:394 pysollib/tk/menubar.py:382 +#: pysollib/main.py:75 pysollib/main.py:290 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "В&ыход" @@ -1366,7 +1358,6 @@ msgstr "" "попробуйте %s --help для получения более подробной информации" #: pysollib/main.py:143 -#, fuzzy msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" @@ -1385,14 +1376,18 @@ msgid "" msgstr "" "Использование: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME начинать с игры GAMENAME\n" +" -i --gameid=GAMEID\n" +" --french-only\n" " --fg --foreground=COLOR цвет текста\n" " --bg --background=COLOR цвет фона\n" " --fn --font=FONT шрифт по умолчанию\n" +" --sound-mod=MOD\n" " --nosound отключить звук\n" " --noplugins отключить загрузку плагинов\n" " -h --help показать это сообщение и выйти\n" "\n" " FILE - имя файла сохранённой игры\n" +" MOD - one of following: pss(default), pygame, oss, win\n" #: pysollib/main.py:161 msgid "" @@ -1410,7 +1405,7 @@ msgstr "" "%s: неправильное имя файла\n" "попробуйте %s --help для получения более подробной информации" -#: pysollib/main.py:387 +#: pysollib/main.py:283 msgid "" "\n" "No games were found !!!\n" @@ -1421,18 +1416,18 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:473 pysollib/main.py:481 +#: pysollib/main.py:369 pysollib/main.py:377 msgid " installation problem" msgstr "" -#: pysollib/main.py:474 +#: pysollib/main.py:370 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:482 +#: pysollib/main.py:378 msgid "" "The pysolsoundserver module was not found.\n" "\n" @@ -1442,7 +1437,7 @@ msgstr "" "\n" "Звук и фоновая музыка будут недоступны" -#: pysollib/main.py:489 +#: pysollib/main.py:385 msgid "Welcome to " msgstr "Добро пожаловать в " @@ -1515,9 +1510,8 @@ msgid "Dashavatara Ganjifa" msgstr "Дашаватара Ганджифа" #: pysollib/resource.py:262 -#, fuzzy msgid "Trumps only" -msgstr "Козырь" +msgstr "Без мастей" #: pysollib/resource.py:267 msgid "Adult" @@ -1947,76 +1941,84 @@ msgstr "Сброс." msgid "Free cell." msgstr "Свободная ячейка." -#: pysollib/stats.py:118 pysollib/tk/tkstats.py:78 -msgid "Demo games" -msgstr "Демо игры" +#: pysollib/stats.py:53 pysollib/stats.py:119 +msgid "Game" +msgstr "Игра" -#: pysollib/stats.py:119 +#: pysollib/stats.py:54 msgid "Played" msgstr "Играл" -#: pysollib/stats.py:120 pysollib/stats.py:200 +#: pysollib/stats.py:55 pysollib/stats.py:158 msgid "Won" msgstr "Выиграл" -#: pysollib/stats.py:121 pysollib/stats.py:200 +#: pysollib/stats.py:56 pysollib/stats.py:158 msgid "Lost" msgstr "Проиграл" -#: pysollib/stats.py:122 pysollib/tk/statusbar.py:156 +#: pysollib/stats.py:57 pysollib/tk/statusbar.py:156 #: data/glade-translations:25 msgid "Playing time" msgstr "Время игры" -#: pysollib/stats.py:123 data/glade-translations:26 +#: pysollib/stats.py:58 data/glade-translations:26 msgid "Moves" msgstr "Ходов" -#: pysollib/stats.py:124 +#: pysollib/stats.py:59 msgid "% won" msgstr "% побед" -#: pysollib/stats.py:153 -msgid "Total (%d out of %d games)" -msgstr "Всего (%d из %d игр)" - -#: pysollib/stats.py:162 -msgid "Game" -msgstr "Игра" - -#: pysollib/stats.py:162 +#: pysollib/stats.py:119 msgid "Status" msgstr "Статус" -#: pysollib/stats.py:162 pysollib/tk/statusbar.py:158 -#: pysollib/tk/tkstats.py:735 +#: pysollib/stats.py:119 pysollib/tk/statusbar.py:158 +#: pysollib/tk/tkstats.py:666 msgid "Game number" msgstr "Номер игры" -#: pysollib/stats.py:162 pysollib/tk/tkstats.py:738 +#: pysollib/stats.py:119 pysollib/tk/tkstats.py:669 msgid "Started at" msgstr "Игра начата" -#: pysollib/stats.py:185 +#: pysollib/stats.py:143 msgid "** UNKNOWN %d **" msgstr "" -#: pysollib/stats.py:193 +#: pysollib/stats.py:151 msgid "** ERROR **" msgstr "" -#: pysollib/stats.py:200 +#: pysollib/stats.py:158 msgid "Loaded" msgstr "Загружал" -#: pysollib/stats.py:200 +#: pysollib/stats.py:158 msgid "Not won" msgstr "Не выиграл" -#: pysollib/stats.py:200 +#: pysollib/stats.py:158 msgid "Perfect" msgstr "Великолепная" +#: pysollib/stats.py:205 pysollib/stats.py:236 pysollib/stats.py:242 +msgid "Demo" +msgstr "Демо" + +#: pysollib/stats.py:216 pysollib/tk/tkstats.py:418 +msgid "Total (%d out of %d games)" +msgstr "Всего (%d из %d игр)" + +#: pysollib/stats.py:237 +msgid "Full log for " +msgstr "Полный лог для " + +#: pysollib/stats.py:243 +msgid "Session log for " +msgstr "Лог сессии для " + #: pysollib/tk/colorsdialog.py:71 data/glade-translations:41 msgid "Text foreground:" msgstr "Цвет текста:" @@ -2940,12 +2942,12 @@ msgstr "Выиграл:" msgid "Lost:" msgstr "Проиграл:" -#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:805 +#: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:736 #: data/glade-translations:18 msgid "Playing time:" msgstr "Игровое время:" -#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:812 +#: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:743 #: data/glade-translations:19 msgid "Moves:" msgstr "Ходов:" @@ -3190,6 +3192,10 @@ msgstr "" msgid "Unable to service request:\n" msgstr "Невозможно выполнить запрос:\n" +#: pysollib/tk/tkstats.py:78 +msgid "Demo games" +msgstr "Демо игры" + #: pysollib/tk/tkstats.py:95 data/glade-translations:16 msgid "Total" msgstr "Всего" @@ -3215,48 +3221,36 @@ msgstr "&Все игры..." msgid "&Reset..." msgstr "О&чистить..." -#: pysollib/tk/tkstats.py:574 pysollib/tk/tkstats.py:647 -#: pysollib/tk/tkstats.py:663 +#: pysollib/tk/tkstats.py:513 pysollib/tk/tkstats.py:579 +#: pysollib/tk/tkstats.py:594 msgid "&Save to file" msgstr "&Сохранить в файл" -#: pysollib/tk/tkstats.py:575 +#: pysollib/tk/tkstats.py:514 msgid "&Reset all..." msgstr "О&чистить все..." -#: pysollib/tk/tkstats.py:625 -msgid "No entries for player " -msgstr "Нет записей для игрока " - -#: pysollib/tk/tkstats.py:642 -msgid "No log entries for %s\n" -msgstr "Нет записей для %s\n" - -#: pysollib/tk/tkstats.py:647 +#: pysollib/tk/tkstats.py:579 msgid "Session &log..." msgstr "&Лог сессии..." -#: pysollib/tk/tkstats.py:658 -msgid "No current session log entries for %s\n" -msgstr "В текущем сеансе нет записей для %s\n" - -#: pysollib/tk/tkstats.py:663 +#: pysollib/tk/tkstats.py:594 msgid "&Full log..." msgstr "&Полный лог..." -#: pysollib/tk/tkstats.py:678 +#: pysollib/tk/tkstats.py:609 msgid "Highlight piles: " msgstr "Подсветка групп: " -#: pysollib/tk/tkstats.py:679 +#: pysollib/tk/tkstats.py:610 msgid "Highlight cards: " msgstr "Подсветка карт: " -#: pysollib/tk/tkstats.py:680 +#: pysollib/tk/tkstats.py:611 msgid "Highlight same rank: " msgstr "Подсветка карт одного достоинства: " -#: pysollib/tk/tkstats.py:683 +#: pysollib/tk/tkstats.py:614 msgid "" "\n" "Redeals: " @@ -3264,7 +3258,7 @@ msgstr "" "\n" "Раздач: " -#: pysollib/tk/tkstats.py:684 +#: pysollib/tk/tkstats.py:615 msgid "" "\n" "Cards in Talon: " @@ -3272,7 +3266,7 @@ msgstr "" "\n" "Карт в колоде: " -#: pysollib/tk/tkstats.py:686 +#: pysollib/tk/tkstats.py:617 msgid "" "\n" "Cards in Waste: " @@ -3280,7 +3274,7 @@ msgstr "" "\n" "Карт в сбросе: " -#: pysollib/tk/tkstats.py:688 +#: pysollib/tk/tkstats.py:619 msgid "" "\n" "Cards in Foundations: " @@ -3288,75 +3282,75 @@ msgstr "" "\n" "Карт в игре: " -#: pysollib/tk/tkstats.py:691 +#: pysollib/tk/tkstats.py:622 msgid "Game status" msgstr "Статус игры" -#: pysollib/tk/tkstats.py:694 +#: pysollib/tk/tkstats.py:625 msgid "Playing time: " msgstr "Игровое время: " -#: pysollib/tk/tkstats.py:695 +#: pysollib/tk/tkstats.py:626 msgid "Started at: " msgstr "Игра начата: " -#: pysollib/tk/tkstats.py:696 +#: pysollib/tk/tkstats.py:627 msgid "Moves: " msgstr "Ходов: " -#: pysollib/tk/tkstats.py:697 +#: pysollib/tk/tkstats.py:628 msgid "Undo moves: " msgstr "Отменено ходов: " -#: pysollib/tk/tkstats.py:698 +#: pysollib/tk/tkstats.py:629 msgid "Bookmark moves: " msgstr "Ходов по закладкам: " -#: pysollib/tk/tkstats.py:699 +#: pysollib/tk/tkstats.py:630 msgid "Demo moves: " msgstr "Демо ходов: " -#: pysollib/tk/tkstats.py:700 +#: pysollib/tk/tkstats.py:631 msgid "Total player moves: " msgstr "Всего ходов игрока:" -#: pysollib/tk/tkstats.py:701 +#: pysollib/tk/tkstats.py:632 msgid "Total moves in this game: " msgstr "Всего ходов в этой игре: " -#: pysollib/tk/tkstats.py:702 +#: pysollib/tk/tkstats.py:633 msgid "Hints: " msgstr "Подсказок: " -#: pysollib/tk/tkstats.py:706 +#: pysollib/tk/tkstats.py:637 msgid "&Statistics..." msgstr "&Статистика..." -#: pysollib/tk/tkstats.py:732 +#: pysollib/tk/tkstats.py:663 msgid "N" msgstr "N" -#: pysollib/tk/tkstats.py:741 +#: pysollib/tk/tkstats.py:672 msgid "Result" msgstr "Результат" -#: pysollib/tk/tkstats.py:797 data/glade-translations:21 +#: pysollib/tk/tkstats.py:728 data/glade-translations:21 msgid "Minimum" msgstr "Минимум" -#: pysollib/tk/tkstats.py:798 data/glade-translations:22 +#: pysollib/tk/tkstats.py:729 data/glade-translations:22 msgid "Maximum" msgstr "Максимум" -#: pysollib/tk/tkstats.py:799 data/glade-translations:23 +#: pysollib/tk/tkstats.py:730 data/glade-translations:23 msgid "Average" msgstr "Среднее" -#: pysollib/tk/tkstats.py:819 data/glade-translations:20 +#: pysollib/tk/tkstats.py:750 data/glade-translations:20 msgid "Total moves:" msgstr "Всего ходов:" -#: pysollib/tk/tkstats.py:850 +#: pysollib/tk/tkstats.py:781 msgid "No TOP for this game" msgstr "TOP для текущей игры отсутствует" @@ -3499,72 +3493,3 @@ msgstr "Все игры" #: data/glade-translations:57 msgid "Set font" msgstr "Настроить шрифт" - -#~ msgid "Restart &game" -#~ msgstr "&Начать с начала" - -#~ msgid "Balance $%4d" -#~ msgstr "Баланс $%4d" - -#~ msgid "&Mixer..." -#~ msgstr "Ми&ксер..." - -#~ msgid "Error while saving options" -#~ msgstr "Ошибка при сохранении настроек" - -#~ msgid "" -#~ "Options were saved to\n" -#~ "\n" -#~ msgstr "" -#~ "Опции сохранены в\n" -#~ "\n" - -#~ msgid "Set demo options" -#~ msgstr "Настройка демо" - -#~ msgid "Display floating Demo logo" -#~ msgstr "Показывать демо лого" - -#~ msgid "Show score in statusbar" -#~ msgstr "Показывать счёт в строке состояния" - -#~ msgid "Set demo delay in seconds" -#~ msgstr "Установить задержку демо в секундах" - -#~ msgid "Select" -#~ msgstr "Выбрать" - -#~ msgid "Started at " -#~ msgstr "Игра начата " - -#~ msgid "Playable Area" -#~ msgstr "Область игры" - -#~ msgid "Alignment" -#~ msgstr "Компоновка" - -#~ msgid "What's &new ?" -#~ msgstr "&Новости" - -#~ msgid "Playing Time:" -#~ msgstr "Время игры:" - -#~ msgid "Enable highlight ¬ matching cards" -#~ msgstr "Разрешить показывать &отсутствие совпадение карт" - -#~ msgid "Invalid or damaged " -#~ msgstr "Повреждённый " - -#~ msgid "Balance %d/%d" -#~ msgstr "Баланс %d/%d" - -#~ msgid "No" -#~ msgstr "Нет" - -#~ msgid "" -#~ " Free\n" -#~ "Matching\n" -#~ "Pair" -#~ msgstr "" -#~ " свободных\n" -#~ "пар" diff --git a/pysol b/pysol index 4a67e441..6bcca61b 100755 --- a/pysol +++ b/pysol @@ -1,20 +1,8 @@ -#! /usr/bin/env python -## -*- coding: iso-8859-1 -*- -## -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python ##---------------------------------------------------------------------------## ## ## PySol -- a Python Solitaire game ## -## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer -## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer -## All Rights Reserved. -## ## 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 2 of the License, or @@ -30,48 +18,14 @@ ## If not, write to the Free Software Foundation, Inc., ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ## -## Markus F.X.J. Oberhumer -## -## http://www.oberhumer.com/pysol -## ##---------------------------------------------------------------------------## -import sys, os - -if os.name == 'nt' and not os.environ.has_key('LANG'): - try: - import locale - l = locale.getdefaultlocale() - os.environ['LANG'] = l[0] - except: - pass -##locale.setlocale(locale.LC_ALL, '') - -import gettext -##locale_dir = 'locale' -locale_dir = None -if os.path.isdir(sys.path[0]): - d = os.path.join(sys.path[0], 'locale') -else: - # i.e. library.zip - d = os.path.join(os.path.dirname(sys.path[0]), 'locale') -if os.path.exists(d) and os.path.isdir(d): - locale_dir = d -##if locale_dir: locale_dir = os.path.normpath(locale_dir) -gettext.install('pysol', locale_dir, unicode=True) - -## init toolkit -import pysollib.settings -if '--tile' in sys.argv: - #pysollib.settings.TOOLKIT = 'gtk' - pysollib.settings.USE_TILE = True - sys.argv.remove('--tile') -elif '--gtk' in sys.argv: - pysollib.settings.TOOLKIT = 'gtk' - sys.argv.remove('--gtk') - -from pysollib.main import main #import pychecker.checker +from pysollib.init import init +init() + +import sys +from pysollib.main import main sys.exit(main(sys.argv)) diff --git a/pysollib/app.py b/pysollib/app.py index 6d73bbbb..c476c4a8 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -58,7 +58,7 @@ from settings import TOP_SIZE, TOP_TITLE, TOOLKIT # Toolkit imports from pysoltk import wm_withdraw, loadImage -from pysoltk import MfxMessageDialog, MfxExceptionDialog +from pysoltk import MfxDialog, MfxMessageDialog, MfxExceptionDialog from pysoltk import TclError, MfxRoot, MfxCanvas, MfxScrolledCanvas from pysoltk import PysolMenubar from pysoltk import PysolProgressBar @@ -123,8 +123,8 @@ class Options: # sound self.sound = True self.sound_mode = 1 - self.sound_sample_volume = 128 - self.sound_music_volume = 128 + self.sound_sample_volume = 80 + self.sound_music_volume = 100 self.sound_samples = { 'areyousure' : True, 'autodrop' : True, @@ -230,7 +230,6 @@ class Options: CSI.TYPE_TAROCK: ("Vienna 2K", ""), CSI.TYPE_HEXADECK: ("Hex A Deck", ""), CSI.TYPE_MUGHAL_GANJIFA: ("Mughal Ganjifa", ""), - ##CSI.TYPE_MUGHAL_GANJIFA: ("Dashavatara Ganjifa", ""), ##CSI.TYPE_NAVAGRAHA_GANJIFA: ("Navagraha Ganjifa", ""), CSI.TYPE_NAVAGRAHA_GANJIFA: ("Dashavatara Ganjifa", ""), CSI.TYPE_DASHAVATARA_GANJIFA: ("Dashavatara Ganjifa", ""), @@ -423,23 +422,25 @@ class Statistics: return won, lost def updateStats(self, player, game, status): - return self.updateLog(player, game, status) - - def updateLog(self, player, game, status): ret = None log = (game.id, game.getGameNumber(format=0), status, game.gstats.start_time, game.gstats.total_elapsed_time, VERSION_TUPLE, game.getGameScore(), game.getGameScoreCasino(), game.GAME_VERSION) # full log - if player is not None and status >= 0: - if not self.prev_games.has_key(player): - self.prev_games[player] = [] - self.prev_games[player].append(log) - if not self.all_prev_games.has_key(player): - self.all_prev_games[player] = [] - self.all_prev_games[player].append(log) - ret = self.updateGameStat(player, game, status) + if status >= 0: + if player is None: + # demo + ret = self.updateGameStat(player, game, status) + else: + # player + if not self.prev_games.has_key(player): + self.prev_games[player] = [] + self.prev_games[player].append(log) + if not self.all_prev_games.has_key(player): + self.all_prev_games[player] = [] + self.all_prev_games[player].append(log) + ret = self.updateGameStat(player, game, status) # session log if not self.session_games.has_key(player): self.session_games[player] = [] @@ -661,7 +662,11 @@ class Application: # create the canvas self.scrolled_canvas = MfxScrolledCanvas(self.top) self.canvas = self.scrolled_canvas.canvas - self.scrolled_canvas.grid(row=1, column=1, sticky='nsew') + if os.name == 'nt': + self.scrolled_canvas.grid(row=1, column=1, sticky='nsew', + padx=1, pady=1) + else: + self.scrolled_canvas.grid(row=1, column=1, sticky='nsew') self.top.grid_columnconfigure(1, weight=1) self.top.grid_rowconfigure(1, weight=1) self.setTile(self.tabletile_index, force=True) @@ -873,7 +878,6 @@ class Application: ## self.gimages.stats.append(self.dataloader.findImage(f, dir)) def loadImages3(self): - MfxMessageDialog.img = {} if os.name == 'posix': dir = os.path.join('images', 'dialog', 'bluecurve') else: @@ -882,15 +886,16 @@ class Application: fn = self.dataloader.findImage(f, dir) im = loadImage(fn) MfxMessageDialog.img[f] = im -## MfxMessageDialog.button_img = {} -## dir = os.path.join('images', 'buttons', 'bluecurve') -## for n, f in ( -## (_('OK'), 'ok'), -## (_('Cancel'), 'cancel'), -## ): -## fn = self.dataloader.findImage(f, dir) -## im = loadImage(fn) -## MfxMessageDialog.button_img[n] = im + if 0 and TOOLKIT == 'tk': + dir = os.path.join('images', 'buttons', 'bluecurve') + for n, f in ( + (_('&OK'), 'ok'), + (_('&Cancel'), 'cancel'), + (_('&New game'), 'new'), + ): + fn = self.dataloader.findImage(f, dir) + im = loadImage(fn) + MfxDialog.button_img[n] = im SelectDialogTreeData.img = [] dir = os.path.join('images', 'tree') for f in ('folder', 'openfolder', 'node', 'emptynode'): diff --git a/pysollib/game.py b/pysollib/game.py index f5f77889..fb4719f7 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1282,9 +1282,9 @@ class Game: # only update the session log if self.app.opt.update_player_stats: if self.gstats.loaded: - self.app.stats.updateLog(self.app.opt.player, self, -2) + self.app.stats.updateStats(self.app.opt.player, self, -2) elif self.gstats.updated == 0 and self.stats.demo_updated == 0: - self.app.stats.updateLog(self.app.opt.player, self, -1) + self.app.stats.updateStats(self.app.opt.player, self, -1) return '' def checkForWin(self): diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index d31acec8..9b62f7c1 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -210,12 +210,13 @@ class StrategyPlus(Strategy): def fillStack(self, stack): if stack is self.s.talon and stack.cards: c = stack.cards[-1] - if c.rank == ACE: + while c.rank == ACE: old_state = self.enterState(self.S_FILL) self.moveMove(1, stack, self.s.foundations[c.suit]) if stack.canFlipCard(): stack.flipMove() self.leaveState(old_state) + c = stack.cards[-1] # /*********************************************************************** diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 43d12306..9b06f4cd 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -697,7 +697,7 @@ class Rittenhouse(Game): talon = self.s.talon self.startDealSample() while talon.cards: - talon.dealRowAvail() + talon.dealRowAvail(frames=3) self.fillAll() def fillAll(self): @@ -801,6 +801,7 @@ class SelectiveCastle(StreetsAndAlleys, Chessboard): # ************************************************************************/ class Soother(Game): + Hint_Class = CautiousDefaultHint def createGame(self, rows=9): l, s = Layout(self), self.s diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index 6aeaebc0..be61dbd5 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -55,6 +55,7 @@ from spider import Spider_Hint class DoubleKlondike(Game): Layout_Method = Layout.harpLayout + Foundation_Class = SS_FoundationStack RowStack_Class = KingAC_RowStack Hint_Class = KlondikeType_Hint @@ -69,7 +70,7 @@ class DoubleKlondike(Game): max_rounds=max_rounds, num_deal=num_deal) s.waste = WasteStack(l.s.waste.x, l.s.waste.y, self) for r in l.s.foundations: - s.foundations.append(SS_FoundationStack(r.x, r.y, self, suit=r.suit)) + s.foundations.append(self.Foundation_Class(r.x, r.y, self, suit=r.suit)) for r in l.s.rows: s.rows.append(self.RowStack_Class(r.x, r.y, self)) # default @@ -278,6 +279,19 @@ class Delivery(BigDeal): self.s.talon.dealCards() # deal first card to WasteStack +# /*********************************************************************** +# // Double Kingsley +# ************************************************************************/ + +class DoubleKingsley(DoubleKlondike): + Foundation_Class = StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1) + RowStack_Class = StackWrapper(KingAC_RowStack, base_rank=ACE, dir=1) + + def createGame(self): + DoubleKlondike.createGame(self, max_rounds=1) + + + # register the game registerGame(GameInfo(21, DoubleKlondike, "Double Klondike", GI.GT_KLONDIKE, 2, -1, GI.SL_BALANCED)) @@ -309,5 +323,8 @@ registerGame(GameInfo(590, ChineseKlondike, "Chinese Klondike", suits=(0, 1, 2) )) registerGame(GameInfo(591, Pantagruel, "Pantagruel", GI.GT_KLONDIKE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(668, DoubleKingsley, "Double Kingsley", + GI.GT_KLONDIKE, 2, 0, GI.SL_BALANCED)) + diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 149912f1..31d0116e 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -1315,6 +1315,35 @@ class Athena(Klondike): self.s.talon.dealCards() +# /*********************************************************************** +# // Kingsley +# ************************************************************************/ + +class Kingsley(Klondike): + + Foundation_Class = StackWrapper(SS_FoundationStack, base_rank=KING, dir=-1) + RowStack_Class = StackWrapper(KingAC_RowStack, base_rank=ACE, dir=1) + + def createGame(self): + Klondike.createGame(self, max_rounds=1) + + +# /*********************************************************************** +# // Scarp +# ************************************************************************/ + +class Scarp(Klondike): + Talon_Class = DealRowTalonStack + RowStack_Class = AC_RowStack + + def createGame(self): + Klondike.createGame(self, max_rounds=1, rows=13, waste=0, playcards=28) + + def startGame(self): + Klondike.startGame(self, flip=1) + + + # register the game registerGame(GameInfo(2, Klondike, "Klondike", GI.GT_KLONDIKE, 1, -1, GI.SL_BALANCED)) @@ -1452,5 +1481,9 @@ registerGame(GameInfo(634, Chinaman, "Chinaman", GI.GT_KLONDIKE, 1, 1, GI.SL_BALANCED)) registerGame(GameInfo(651, EightByEight, "Eight by Eight", GI.GT_KLONDIKE, 2, 2, GI.SL_BALANCED)) +registerGame(GameInfo(667, Kingsley, "Kingsley", + GI.GT_KLONDIKE, 1, 0, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(669, Scarp, "Scarp", + GI.GT_GYPSY | GI.GT_ORIGINAL, 3, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py index 39a468c2..5c87d1fb 100644 --- a/pysollib/games/montana.py +++ b/pysollib/games/montana.py @@ -363,6 +363,7 @@ class Jungle_RowStack(Montana_RowStack): class Jungle(BlueMoon): Talon_Class = StackWrapper(Montana_Talon, max_rounds=2) RowStack_Class = Jungle_RowStack + Hint_Class = Galary_Hint # /*********************************************************************** diff --git a/pysollib/init.py b/pysollib/init.py new file mode 100644 index 00000000..d1c574df --- /dev/null +++ b/pysollib/init.py @@ -0,0 +1,76 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +import sys, os, locale +import traceback +import gettext + +# /*********************************************************************** +# // init +# ************************************************************************/ + +def init(): + + if os.name == 'nt' and not os.environ.has_key('LANG'): + try: + l = locale.getdefaultlocale() + os.environ['LANG'] = l[0] + except: + pass + ##locale.setlocale(locale.LC_ALL, '') + + ##locale_dir = 'locale' + locale_dir = None + if os.path.isdir(sys.path[0]): + d = os.path.join(sys.path[0], 'locale') + else: + # i.e. library.zip + d = os.path.join(os.path.dirname(sys.path[0]), 'locale') + if os.path.exists(d) and os.path.isdir(d): + locale_dir = d + ##if locale_dir: locale_dir = os.path.normpath(locale_dir) + gettext.install('pysol', locale_dir, unicode=True) + + ## init toolkit + import settings + if '--gtk' in sys.argv: + settings.TOOLKIT = 'gtk' + sys.argv.remove('--gtk') + else: + if '--tile' in sys.argv: + settings.USE_TILE = True + sys.argv.remove('--tile') + elif settings.USE_TILE == 'auto': + # check tile + import Tkinter + root = Tkinter.Tk() + root.withdraw() + settings.USE_TILE = False + try: + tile_version = root.tk.call('package', 'require', 'tile') + except: + pass + else: + if tile_version >= '0.7.8': + settings.USE_TILE = True + #root.destroy() + Tkinter._default_root = None + diff --git a/pysollib/main.py b/pysollib/main.py index d983dcfe..5a7e8d0f 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -35,7 +35,7 @@ # imports -import sys, os, re, string, time, types +import sys, os, locale import traceback import getopt import gettext diff --git a/pysollib/settings.py b/pysollib/settings.py index 3824d2ca..1c6bcff8 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -21,7 +21,7 @@ import sys, os -n_ = lambda x: x +n_ = lambda x: x # for gettext # #PACKAGE = 'PySolFC' @@ -32,9 +32,11 @@ VERSION = '4.82' FC_VERSION = '0.9.4' VERSION_TUPLE = (4, 82) -TOOLKIT = 'tk' # or 'gtk' -USE_TILE = False -TILE_THEME = 'default' # name of tile's theme +TOOLKIT = 'tk' # or 'gtk' +USE_TILE = 'auto' # or True or False +TILE_THEME = 'default' # name of tile's theme +if os.name == 'nt': + TILE_THEME = 'winnative' # data dirs DATA_DIRS = [] diff --git a/pysollib/stats.py b/pysollib/stats.py index 0fd6a6d2..340322f8 100644 --- a/pysollib/stats.py +++ b/pysollib/stats.py @@ -49,7 +49,6 @@ from gamedb import GI class PysolStatsFormatter: - def getStatHeader(self): return (_("Game"), _("Played"), @@ -203,6 +202,7 @@ class FileStatsFormatter(PysolStatsFormatter): self.pheader("\n") def writeStats(self, player, sort_by='name'): + if player is None: player = _('Demo') header = _("Statistics for ") + player self.writeHeader(header, 62) header = self.getStatHeader() @@ -233,11 +233,13 @@ class FileStatsFormatter(PysolStatsFormatter): return 1 def writeFullLog(self, player): + if player is None: player = _('Demo') header = _("Full log for ") + player prev_games = self.app.stats.prev_games.get(player) return self.writeLog(player, header, prev_games) def writeSessionLog(self, player): + if player is None: player = _('Demo') header = _("Session log for ") + player prev_games = self.app.stats.session_games.get(player) return self.writeLog(player, header, prev_games) diff --git a/pysollib/tile/Tile.py b/pysollib/tile/Tile.py index 440d83b1..7c9dfc6c 100644 --- a/pysollib/tile/Tile.py +++ b/pysollib/tile/Tile.py @@ -158,8 +158,6 @@ class Combobox(Widget, Tkinter.Entry): class Entry(Widget, Tkinter.Entry): def __init__(self, master=None, cnf={}, **kw): - if kw.has_key('bg'): - del kw['bg'] Widget.__init__(self, master, "ttk::entry", cnf, kw) def validate(self): @@ -172,26 +170,21 @@ class Entry(Widget, Tkinter.Entry): class Label(Widget, Tkinter.Label): def __init__(self, master=None, cnf={}, **kw): - for opt in ('bd', 'bg', 'fg', 'padx', 'pady', 'height', - 'highlightbackground', 'highlightthickness'): - if kw.has_key(opt): - del kw[opt] Widget.__init__(self, master, "ttk::label", cnf, kw) class Frame(Widget, Tkinter.Frame): def __init__(self, master=None, cnf={}, **kw): - for opt in ('bd', 'highlightbackground', 'highlightthickness',): - if kw.has_key(opt): - del kw[opt] Widget.__init__(self, master, "ttk::frame", cnf, kw) -class LabelFrame(Widget, Tkinter.Frame): +class SizeGrip(Widget): + def __init__(self, master=None, cnf={}, **kw): + Widget.__init__(self, master, "ttk::sizegrip", cnf, kw) + + +class LabelFrame(Widget, Tkinter.LabelFrame): def __init__(self, master=None, cnf={}, **kw): - for opt in ('padx', 'pady',): - if kw.has_key(opt): - del kw[opt] Widget.__init__(self, master, "ttk::labelframe", cnf, kw) @@ -202,8 +195,6 @@ class Menubutton(Widget, Tkinter.Menubutton): class Scale(Widget, Tkinter.Scale): def __init__(self, master=None, cnf={}, **kw): - if kw.has_key('resolution'): - del kw['resolution'] Widget.__init__(self, master, "ttk::scale", cnf, kw) @@ -272,7 +263,8 @@ class Paned(Widget): def __init__(self, master=None, cnf={}, **kw): if not kw.has_key('orient'): kw['orient'] = 'horizontal' - Widget.__init__(self, master, "ttk::paned", cnf, kw) + ##Widget.__init__(self, master, "ttk::paned", cnf, kw) + Widget.__init__(self, master, "ttk::panedwindow", cnf, kw) def add(self, subwindow, **kw): """Adds a new pane to the window. subwindow must be a direct child of diff --git a/pysollib/tile/fontsdialog.py b/pysollib/tile/fontsdialog.py index bd11fa97..3d288fd6 100644 --- a/pysollib/tile/fontsdialog.py +++ b/pysollib/tile/fontsdialog.py @@ -85,7 +85,7 @@ class FontChooserDialog(MfxDialog): frame.pack(expand=True, fill='both', padx=5, pady=10) frame.columnconfigure(0, weight=1) #frame.rowconfigure(1, weight=1) - self.entry = Tkinter.Entry(frame, bg='white') + self.entry = Tkinter.Entry(frame) self.entry.grid(row=0, column=0, columnspan=2, sticky='news') self.entry.insert('end', _('abcdefghABCDEFGH')) self.list_box = Tkinter.Listbox(frame, width=36, exportselection=False) @@ -144,8 +144,6 @@ class FontChooserDialog(MfxDialog): kw = KwStruct(kw, strings=(_("&OK"), _("&Cancel")), default=0, - padx=10, pady=10, - buttonpadx=10, buttonpady=5, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tile/menubar.py b/pysollib/tile/menubar.py index fb1742df..b5695b68 100644 --- a/pysollib/tile/menubar.py +++ b/pysollib/tile/menubar.py @@ -1119,21 +1119,16 @@ class PysolMenubar(PysolMenubarActions): def mSelectCardsetDialog(self, *event): if self._cancelDrag(break_pause=False): return - ##strings, default = ("&OK", "&Load", "&Cancel"), 0 - strings, default = (None, _("&Load"), _("&Cancel"),), 1 - ##if os.name == "posix": - strings, default = (None, _("&Load"), _("&Cancel"), _("&Info..."),), 1 t = CARDSET key = self.app.nextgame.cardset.index d = SelectCardsetDialogWithPreview(self.top, title=_("Select ")+t, - app=self.app, manager=self.app.cardset_manager, key=key, - strings=strings, default=default) + app=self.app, manager=self.app.cardset_manager, key=key) cs = self.app.cardset_manager.get(d.key) if cs is None or d.key == self.app.cardset.index: return - if d.status == 0 and d.button in (0, 1) and d.key >= 0: + if d.status == 0 and d.button == 0 and d.key >= 0: self.app.nextgame.cardset = cs - if d.button == 1: + if d.button == 0: self._cancelDrag() self.game.endGame(bookmark=1) self.game.quitGame(bookmark=1) @@ -1159,10 +1154,6 @@ class PysolMenubar(PysolMenubarActions): def mOptChangeCardback(self, *event): self._mOptCardback(self.app.cardset.backindex + 1) -## def mOptTableTile(self, *event): -## if self._cancelDrag(break_pause=False): return -## self._mOptTableTile(self.tkopt.tabletile.get()) - def mOptChangeTableTile(self, *event): if self._cancelDrag(break_pause=False): return n = self.app.tabletile_manager.len() diff --git a/pysollib/tile/playeroptionsdialog.py b/pysollib/tile/playeroptionsdialog.py index d6529f30..758e2348 100644 --- a/pysollib/tile/playeroptionsdialog.py +++ b/pysollib/tile/playeroptionsdialog.py @@ -86,8 +86,6 @@ class SelectUserNameDialog(MfxDialog): strings=(_("&OK"), _("&Cancel")), default=0, separatorwidth=0, resizable=0, - padx=10, pady=10, - buttonpadx=10, buttonpady=5, ) return MfxDialog.initKw(self, kw) @@ -118,7 +116,7 @@ class PlayerOptionsDialog(MfxDialog): self.player_var = Tkinter.Entry(frame, exportselection=1, width=w) self.player_var.insert(0, app.opt.player) self.player_var.grid(row=1, column=0, sticky='ew', padx=0, pady=5) - widget = Tkinter.Button(frame, text=_('Select...'), + widget = Tkinter.Button(frame, text=_('Choose...'), command=self.selectUserName) widget.grid(row=1, column=1, padx=5, pady=5) widget = Tkinter.Checkbutton(frame, variable=self.confirm_var, diff --git a/pysollib/tile/progressbar.py b/pysollib/tile/progressbar.py index e8af51bb..c79cf1d6 100644 --- a/pysollib/tile/progressbar.py +++ b/pysollib/tile/progressbar.py @@ -59,8 +59,7 @@ class PysolProgressBar: self.top.wm_resizable(0, 0) self.top.config(cursor="watch") # - self.frame = Tkinter.Frame(self.top, relief=Tkinter.FLAT, bd=0, - takefocus=0) + self.frame = Tkinter.Frame(self.top, relief='flat', borderwidth=0) self.progress = Tkinter.Progressbar(self.frame, maximum=100, length=250) ##style = Tkinter.Style(self.progress) ##style.configure('TProgressbar', background=color) diff --git a/pysollib/tile/selectcardset.py b/pysollib/tile/selectcardset.py index 6b66f287..8c730995 100644 --- a/pysollib/tile/selectcardset.py +++ b/pysollib/tile/selectcardset.py @@ -239,19 +239,17 @@ class SelectCardsetDialogWithPreview(MfxDialog): def initKw(self, kw): kw = KwStruct(kw, - strings=(_("&OK"), _("&Load"), _("&Cancel"),), + strings = (_("&Load"), _("&Info..."), _("&Cancel"),), default=0, resizable=1, - padx=10, pady=10, - buttonpadx=10, buttonpady=5, ) return MfxDialog.initKw(self, kw) def mDone(self, button): - if button in (0, 1): # Ok/Load + if button in (0, 2): # Load/Cancel self.key = self.tree.selection_key self.tree.n_expansions = 1 # save xyview in any case - if button in (3, 4): + if button == 1: # Info cs = self.manager.get(self.tree.selection_key) if not cs: return @@ -399,8 +397,6 @@ class CardsetInfoDialog(MfxDialog): default=0, resizable=1, separatorwidth=2, - padx=10, pady=10, - buttonpadx=10, buttonpady=5, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index aeda3ada..ac86c3cb 100644 --- a/pysollib/tile/selectgame.py +++ b/pysollib/tile/selectgame.py @@ -267,8 +267,6 @@ class SelectGameDialog(MfxDialog): strings=(None, None, _("&Cancel"),), default=0, separatorwidth=2, resizable=1, - padx=10, pady=10, - buttonpadx=10, buttonpady=5, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tile/selecttile.py b/pysollib/tile/selecttile.py index 5fc73517..8cea59fb 100644 --- a/pysollib/tile/selecttile.py +++ b/pysollib/tile/selecttile.py @@ -161,8 +161,6 @@ class SelectTileDialogWithPreview(MfxDialog): default=0, resizable=1, font=None, - padx=10, pady=10, - buttonpadx=10, buttonpady=5, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tile/soundoptionsdialog.py b/pysollib/tile/soundoptionsdialog.py index c8666c60..cc1da11a 100644 --- a/pysollib/tile/soundoptionsdialog.py +++ b/pysollib/tile/soundoptionsdialog.py @@ -143,8 +143,7 @@ class SoundOptionsDialog(MfxDialog): kw.strings[1] = None # if Tkinter.TkVersion >= 8.4: - frame = Tkinter.LabelFrame(top_frame, text=_('Enable samles'), - padx=5, pady=5) + frame = Tkinter.LabelFrame(top_frame, text=_('Enable samles')) else: frame = Tkinter.Frame(top_frame, bd=2, relief='groove') frame.pack(expand=1, fill='both', padx=5, pady=5) @@ -173,9 +172,6 @@ class SoundOptionsDialog(MfxDialog): kw = KwStruct(kw, strings=strings, default=0, - resizable=1, - padx=10, pady=10, - buttonpadx=10, buttonpady=5, ) return MfxDialog.initKw(self, kw) diff --git a/pysollib/tile/statusbar.py b/pysollib/tile/statusbar.py index e3abc65c..0d2578bd 100644 --- a/pysollib/tile/statusbar.py +++ b/pysollib/tile/statusbar.py @@ -68,37 +68,30 @@ class MfxStatusbar: # self.padx = 1 self.label_relief = 'sunken' - self.frame = Tkinter.Frame(self.top, bd=1) - self.frame.grid(row=self._row, column=self._column, - columnspan=self._columnspan, sticky='ew', - padx=1, pady=1) - #if os.name == "mac": - # Tkinter.Label(self.frame, width=2).pack(side='right') - if os.name == 'nt': - self.frame.config(relief='raised') - self.padx = 0 - if 0: - self.frame.config(bd=0) - self.label_relief = 'flat' - self.padx = 0 + self.top_frame = Tkinter.Frame(self.top) + self.top_frame.grid(row=self._row, column=self._column, + columnspan=self._columnspan, sticky='ew') + self.frame = Tkinter.Frame(self.top_frame) + self.frame.pack(side='left', expand=True, fill='both', padx=0, pady=1) +## if os.name == "mac": +## Tkinter.Label(self.frame, width=2).pack(side='right') +## if os.name == 'nt': +## #self.frame.config(relief='raised') +## #self.padx = 1 +## pass +## if 0: +## self.frame.config(bd=0) +## self.label_relief = 'flat' +## self.padx = 0 # util def _createLabel(self, name, side='left', fill='none', expand=0, width=0, tooltip=None): - if 0: - frame = Tkinter.Frame(self.frame, bd=1, relief=self.label_relief, - highlightbackground='#9e9a9e', - highlightthickness=1) - frame.pack(side=side, fill=fill, padx=self.padx, expand=expand) - label = Tkinter.Label(frame, width=width, bd=0) - label.pack(expand=True, fill='both') - else: - label = Tkinter.Label(self.frame, width=width, - relief=self.label_relief, bd=1, - highlightbackground='black' - ) - label.pack(side=side, fill=fill, padx=self.padx, expand=expand) + frame = Tkinter.Frame(self.frame, borderwidth=1, relief=self.label_relief) + frame.pack(side=side, fill=fill, padx=self.padx, expand=expand) + label = Tkinter.Label(frame, width=width) + label.pack(expand=True, fill='both') setattr(self, name + "_label", label) self._widgets.append(label) if tooltip: @@ -107,6 +100,10 @@ class MfxStatusbar: b.setText(tooltip) return label + def _createSizeGrip(self): + sg = Tkinter.SizeGrip(self.top_frame) + sg.pack(side='right', anchor='se') + # # public methods @@ -132,11 +129,11 @@ class MfxStatusbar: self.top.wm_geometry("") # cancel user-specified geometry if not show: # hide - self.frame.grid_forget() + self.top_frame.grid_forget() else: # show - self.frame.grid(row=self._row, column=self._column, - columnspan=self._columnspan, sticky='ew') + self.top_frame.grid(row=self._row, column=self._column, + columnspan=self._columnspan, sticky='ew') self._show = show return True @@ -154,7 +151,7 @@ class MfxStatusbar: class PysolStatusbar(MfxStatusbar): def __init__(self, top): - MfxStatusbar.__init__(self, top, row=3, column=0, columnspan=3) + MfxStatusbar.__init__(self, top, row=4, column=0, columnspan=3) # for n, t, w in ( ("time", _("Playing time"), 10), @@ -167,11 +164,12 @@ class PysolStatusbar(MfxStatusbar): l = self._createLabel("info", fill='both', expand=1) ##l.config(text="", justify="left", anchor='w') l.config(padding=(8, 0)) + self._createSizeGrip() class HelpStatusbar(MfxStatusbar): def __init__(self, top): - MfxStatusbar.__init__(self, top, row=4, column=0, columnspan=3) + MfxStatusbar.__init__(self, top, row=3, column=0, columnspan=3) l = self._createLabel("info", fill='both', expand=1) l.config(justify="left", anchor='w', padding=(8, 0)) @@ -181,6 +179,7 @@ class HtmlStatusbar(MfxStatusbar): MfxStatusbar.__init__(self, top, row=row, column=column, columnspan=columnspan) l = self._createLabel("url", fill='both', expand=1) l.config(justify="left", anchor='w', padding=(8, 0)) + self._createSizeGrip() # /*********************************************************************** diff --git a/pysollib/tile/tkcanvas.py b/pysollib/tile/tkcanvas.py index f2eb5e28..987963f9 100644 --- a/pysollib/tile/tkcanvas.py +++ b/pysollib/tile/tkcanvas.py @@ -268,8 +268,12 @@ class MfxCanvas(Tkinter.Canvas): ## for i in range(len(stack.cards)): ## if stack.cards[i].item.id in current: ## return i - x = event.x-self.xmargin+self.xview()[0]*int(self.cget('width')) - y = event.y-self.ymargin+self.yview()[0]*int(self.cget('height')) + if self.preview: + dx, dy = 0, 0 + else: + dx, dy = -self.xmargin, -self.ymargin + x = event.x+dx+self.xview()[0]*int(self.cget('width')) + y = event.y+dy+self.yview()[0]*int(self.cget('height')) ##x, y = event.x, event.y items = list(self.find_overlapping(x,y,x,y)) items.reverse() diff --git a/pysollib/tile/tkstats.py b/pysollib/tile/tkstats.py index f623f3d8..1d5f4506 100644 --- a/pysollib/tile/tkstats.py +++ b/pysollib/tile/tkstats.py @@ -144,7 +144,7 @@ class SingleGame_StatsDialog(MfxDialog): self.fg = c.option_get('foreground', '') or c.cget("insertbackground") # c.create_rectangle(2, 7, w, h, fill="", outline="#7f7f7f") - l = Tkinter.Label(c, text=text, font=self.font, bd=0, padx=3, pady=1) + l = Tkinter.Label(c, text=text) dy = int(self.font_metrics['ascent']) - 10 dy = dy/2 c.create_window(20, -dy, window=l, anchor="nw") diff --git a/pysollib/tile/tkutil.py b/pysollib/tile/tkutil.py index a1d4efe1..f7730ee9 100644 --- a/pysollib/tile/tkutil.py +++ b/pysollib/tile/tkutil.py @@ -101,9 +101,13 @@ def wm_map(window, maximized=0): def wm_set_icon(window, filename): if not filename: return - if os.name == "posix": - window.wm_iconbitmap("@" + filename) - window.wm_iconmask("@" + filename) + if os.name == 'nt': + ##window.tk.call('wm', 'iconbitmap', root._w, '-default', '@'+filename) + pass + elif os.name == "posix": + ##window.wm_iconbitmap("@"+filename) + ##window.wm_iconmask("@"+filename) + pass __wm_get_geometry_re = re.compile(r"^(\d+)x(\d+)\+([\-]?\d+)\+([\-]?\d+)$") @@ -424,18 +428,28 @@ def load_theme(app, top, theme): traceback.print_exc() pass # set theme + all_themes = top.tk.call('style', 'theme', 'names') + if theme not in all_themes: + print >> sys.stderr, 'WARNING: invalid theme name:', theme + theme = 'default' if theme: top.tk.call('style', 'theme', 'use', theme) - bg = top.tk.call('style', 'lookup', '.', '-background') - top.tk_setPalette(bg) - bg = top.tk.call('style', 'lookup', '.', '-background', 'active') - top.option_add('*Menu.activeBackground', bg) + if theme not in ('winnative',): + bg = top.tk.call('style', 'lookup', '.', '-background') + top.tk_setPalette(bg) + bg = top.tk.call('style', 'lookup', '.', '-background', 'active') + top.option_add('*Menu.activeBackground', bg) + if theme == 'winnative': + top.tk.call('style', 'configure', 'Toolbutton', '-padding', '1 1') + #if 'xpnative' in all_themes: + # theme = 'xpnative' font = app.opt.fonts['default'] if font: top.tk.call('style', 'configure', '.', '-font', font) else: font = top.tk.call('style', 'lookup', '.', '-font') - top.option_add('*font', font) + if font: + top.option_add('*font', font) diff --git a/pysollib/tile/tkwidget.py b/pysollib/tile/tkwidget.py index e8641f55..ac70ae50 100644 --- a/pysollib/tile/tkwidget.py +++ b/pysollib/tile/tkwidget.py @@ -33,7 +33,8 @@ ## ##---------------------------------------------------------------------------## -__all__ = ['MfxMessageDialog', +__all__ = ['MfxDialog', + 'MfxMessageDialog', 'MfxExceptionDialog', 'MfxSimpleEntry', 'MfxTooltip', @@ -43,6 +44,7 @@ __all__ = ['MfxMessageDialog', # imports import os, sys, time, types +import Tkinter as Tk import Tile as Tkinter import traceback @@ -147,10 +149,9 @@ class MfxDialog: # ex. _ToplevelDialog key = event.char key = unicode(key, 'utf-8') key = key.lower() - button = self.accel_keys.get(key) - if not button is None: - self.mDone(button) - + widget = self.accel_keys.get(key) + if not widget is None: + widget.event_generate('<>') def initKw(self, kw): kw = KwStruct(kw, @@ -172,7 +173,7 @@ class MfxDialog: # ex. _ToplevelDialog def createFrames(self, kw): bottom_frame = Tkinter.Frame(self.top) - bottom_frame.pack(side='bottom', fill='both', expand=0, ipadx=3, ipady=3) + bottom_frame.pack(side='bottom', fill='both', expand=0, ipadx=3, ipady=3, padx=5) if kw.separatorwidth > 0: separator = Tkinter.Separator(self.top) separator.pack(side='bottom', fill='x', pady=kw.separatorwidth/2) @@ -191,7 +192,7 @@ class MfxDialog: # ex. _ToplevelDialog def createButtons(self, frame, kw): button = column = -1 - padx, pady = kw.get("buttonpadx", 10), kw.get("buttonpady", 10) + padx, pady = kw.get("buttonpadx", 5), kw.get("buttonpady", 5) focus = None max_len = 0 for s in kw.strings: @@ -208,8 +209,6 @@ class MfxDialog: # ex. _ToplevelDialog elif max_len > 9 : button_width = max_len+1 elif max_len > 6 : button_width = max_len+2 else : button_width = 8 - #print 'button_width =', button_width - # # for s in kw.strings: xbutton = button = button + 1 @@ -220,37 +219,38 @@ class MfxDialog: # ex. _ToplevelDialog if s is None: continue accel_indx = s.find('&') + button_img = None + if MfxDialog.button_img: + button_img = MfxDialog.button_img.get(s) s = s.replace('&', '') if button < 0: - b = Tkinter.Button(frame, text=s, state="disabled") + widget = Tkinter.Button(frame, text=s, state="disabled") button = xbutton else: - b = Tkinter.Button(frame, text=s, default="normal", + widget = Tkinter.Button(frame, text=s, default="normal", command=(lambda self=self, button=button: self.mDone(button))) if button == kw.default: - focus = b + focus = widget focus.config(default="active") - self.buttons.append(b) + self.buttons.append(widget) # - b.config(width=button_width) + widget.config(width=button_width) if accel_indx >= 0: # key accelerator - b.config(underline=accel_indx) + widget.config(underline=accel_indx) key = s[accel_indx] - self.accel_keys[key.lower()] = button + self.accel_keys[key.lower()] = widget # -## img = None -## if self.button_img: -## img = self.button_img.get(s) -## b.config(compound='left', image=img) + if button_img: + widget.config(compound='left', image=button_img) column += 1 - b.grid(column=column, row=0, sticky="nse", padx=padx, pady=pady) + widget.grid(column=column, row=0, sticky="nse", padx=padx, pady=pady) if focus is not None: l = (lambda event=None, self=self, button=kw.default: self.mDone(button)) bind(self.top, "", l) bind(self.top, "", l) - # left justify - ##frame.columnconfigure(0, weight=1) + # right justify + frame.columnconfigure(0, weight=1) return focus @@ -429,7 +429,7 @@ class MfxTooltip: class MfxScrolledCanvas: def __init__(self, parent, hbar=2, vbar=2, **kw): - kwdefault(kw, highlightthickness=0, bd=1, relief='sunken') + kwdefault(kw, borderwidth=1, relief='sunken') self.parent = parent self.createFrame(kw) self.canvas = None @@ -694,8 +694,7 @@ class StackDesc: text = stack.getHelp()+'\n'+stack.getBaseCard() text = text.strip() if text: - frame = Tkinter.Frame(self.canvas, highlightthickness=1, - highlightbackground='black') + frame = Tkinter.Frame(self.canvas) self.frame = frame label = Tkinter.Message(frame, font=font, text=text, width=cardw-8, fg='#000000', bg='#ffffe0', bd=1) @@ -725,7 +724,7 @@ class StackDesc: # // # ************************************************************************/ -class PysolScale: +class MyPysolScale: def __init__(self, parent, **kw): if kw.has_key('resolution'): self.resolution = kw['resolution'] @@ -766,3 +765,13 @@ class PysolScale: self.scale.configure(**kw) config = configure + +class TkinterScale(Tk.Scale): + def __init__(self, parent, **kw): + if kw.has_key('value'): + del kw['value'] + Tk.Scale.__init__(self, parent, **kw) + + +#PysolScale = MyPysolScale +PysolScale = TkinterScale diff --git a/pysollib/tile/tkwrap.py b/pysollib/tile/tkwrap.py index b4668d21..3448f795 100644 --- a/pysollib/tile/tkwrap.py +++ b/pysollib/tile/tkwrap.py @@ -106,7 +106,7 @@ class MfxRoot(Tkinter.Tk): if sw < 640 or sh < 480: self.wm_minsize(400, 300) else: - self.wm_minsize(520, 360) + self.wm_minsize(540, 380) ##self.self.wm_maxsize(9999, 9999) # unlimited self.wm_protocol('WM_DELETE_WINDOW', self.wmDeleteWindow) prog = sys.executable diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py index c2f61553..d6d00d57 100644 --- a/pysollib/tile/toolbar.py +++ b/pysollib/tile/toolbar.py @@ -273,16 +273,11 @@ class PysolToolbar(PysolToolbarActions): # Change the look of the frame to match the platform look # (see also setRelief) if os.name == 'posix': - #self.frame.config(bd=0, highlightthickness=1) - #~self.frame.config(bd=1, relief=self.frame_relief, highlightthickness=0) - self.frame.config(bd=1, relief='raised', highlightthickness=0) pass elif os.name == "nt": - self.frame.config(bd=2, relief=self.frame_relief, padx=2, pady=2) - #self._createSeparator(width=4, side=Tkinter.LEFT, relief=Tkinter.FLAT) - #self._createSeparator(width=4, side=Tkinter.RIGHT, relief=Tkinter.FLAT) + self.frame.config(relief=self.frame_relief) else: - self.frame.config(bd=0, highlightthickness=1) + pass def config(self, w, v): if w == 'player': @@ -353,8 +348,6 @@ class PysolToolbar(PysolToolbarActions): sep = ToolbarSeparator(self.frame, position=position, toolbar=self, - bd=1, - highlightthickness=1, width=4, takefocus=0, relief=self.separator_relief) @@ -367,8 +360,6 @@ class PysolToolbar(PysolToolbarActions): sep = ToolbarFlatSeparator(self.frame, position=position, toolbar=self, - bd=1, - highlightthickness=1, width=5, takefocus=0, relief='flat') @@ -462,16 +453,16 @@ class PysolToolbar(PysolToolbarActions): if side == 1: # top - pack_func(row=0, column=1, sticky='ew') + pack_func(row=0, column=1, sticky='ew', padx=0, pady=0) elif side == 2: # bottom - pack_func(row=2, column=1, sticky='ew') + pack_func(row=2, column=1, sticky='ew', padx=0, pady=0) elif side == 3: # left - pack_func(row=1, column=0, sticky='ns') + pack_func(row=1, column=0, sticky='ns', padx=0, pady=1) else: # right - pack_func(row=1, column=2, sticky='ns') + pack_func(row=1, column=2, sticky='ns', padx=0, pady=1) # set orient orient = side in (1, 2) and Tkinter.HORIZONTAL or Tkinter.VERTICAL self._setOrient(orient) diff --git a/pysollib/tk/playeroptionsdialog.py b/pysollib/tk/playeroptionsdialog.py index 6881c961..2d043cba 100644 --- a/pysollib/tk/playeroptionsdialog.py +++ b/pysollib/tk/playeroptionsdialog.py @@ -117,7 +117,7 @@ class PlayerOptionsDialog(MfxDialog): self.player_var = Tkinter.Entry(frame, exportselection=1, width=w) self.player_var.insert(0, app.opt.player) self.player_var.grid(row=1, column=0, sticky='ew', padx=0, pady=5) - widget = Tkinter.Button(frame, text=_('Select...'), + widget = Tkinter.Button(frame, text=_('Choose...'), command=self.selectUserName) widget.grid(row=1, column=1, padx=5, pady=5) widget = Tkinter.Checkbutton(frame, variable=self.confirm_var, diff --git a/pysollib/tk/tkcanvas.py b/pysollib/tk/tkcanvas.py index 3f035c5d..f021a08b 100644 --- a/pysollib/tk/tkcanvas.py +++ b/pysollib/tk/tkcanvas.py @@ -267,8 +267,12 @@ class MfxCanvas(Tkinter.Canvas): ## for i in range(len(stack.cards)): ## if stack.cards[i].item.id in current: ## return i - x = event.x-self.xmargin+self.xview()[0]*int(self.cget('width')) - y = event.y-self.ymargin+self.yview()[0]*int(self.cget('height')) + if self.preview: + dx, dy = 0, 0 + else: + dx, dy = -self.xmargin, -self.ymargin + x = event.x+dx+self.xview()[0]*int(self.cget('width')) + y = event.y+dy+self.yview()[0]*int(self.cget('height')) ##x, y = event.x, event.y items = list(self.find_overlapping(x,y,x,y)) items.reverse() diff --git a/pysollib/tk/tkutil.py b/pysollib/tk/tkutil.py index 104392dd..08664547 100644 --- a/pysollib/tk/tkutil.py +++ b/pysollib/tk/tkutil.py @@ -100,9 +100,12 @@ def wm_map(window, maximized=0): def wm_set_icon(window, filename): if not filename: return - if os.name == "posix": - window.wm_iconbitmap("@" + filename) - window.wm_iconmask("@" + filename) + if os.name == 'nt': + window.wm_iconbitmap(default="@"+filename) + elif os.name == "posix": + ##window.wm_iconbitmap("@" + filename) + ##window.wm_iconmask("@" + filename) + pass __wm_get_geometry_re = re.compile(r"^(\d+)x(\d+)\+([\-]?\d+)\+([\-]?\d+)$") diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index e2587f11..f321d05c 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -33,7 +33,8 @@ ## ##---------------------------------------------------------------------------## -__all__ = ['MfxMessageDialog', +__all__ = ['MfxDialog', + 'MfxMessageDialog', 'MfxExceptionDialog', 'MfxSimpleEntry', 'MfxTooltip', diff --git a/pysollib/util.py b/pysollib/util.py index 765bc55f..660cd91a 100644 --- a/pysollib/util.py +++ b/pysollib/util.py @@ -216,10 +216,14 @@ class DataLoader: def findIcon(self, filename=None, subdirs=None): if not filename: - filename = PACKAGE.lower() + ##filename = PACKAGE.lower() + filename = 'pysol' root, ext = os.path.splitext(filename) if not ext: - filename = filename + ".xbm" + if os.name == 'nt': + filename = filename + ".ico" + else: + filename = filename + ".xbm" return self.findFile(filename, subdirs) def findDir(self, filename, subdirs=None): From 4cebac735eac4a400d10905a138711bda2321db4 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 4 Nov 2006 22:20:36 +0000 Subject: [PATCH 083/266] * improved tile binding git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@85 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- data/tcl/menu8.4.tcl | 357 ++++++++++++++++++++++++++++++++++ pysollib/games/fan.py | 10 +- pysollib/init.py | 42 ++-- pysollib/main.py | 46 ++--- pysollib/pysolaudio.py | 26 +-- pysollib/pysolgtk/tkwidget.py | 2 + pysollib/settings.py | 3 +- pysollib/tile/tkutil.py | 6 + pysollib/tile/tkwidget.py | 53 ++--- pysollib/tile/toolbar.py | 23 +-- 10 files changed, 453 insertions(+), 115 deletions(-) create mode 100644 data/tcl/menu8.4.tcl diff --git a/data/tcl/menu8.4.tcl b/data/tcl/menu8.4.tcl new file mode 100644 index 00000000..91e96f36 --- /dev/null +++ b/data/tcl/menu8.4.tcl @@ -0,0 +1,357 @@ +# this file from tkabber project + +namespace eval :: { + +proc myMenuButtonDown {args} { + global myMenuFlag myMenuMotion + eval ::tk::MenuButtonDown $args + set myMenuFlag 1 +} +proc myMenuInvoke {args} { + global myMenuFlag myMenuMotion + if {$myMenuFlag || $myMenuMotion} { + eval ::tk::MenuInvoke $args + } + set myMenuFlag 0 + set myMenuMotion 0 +} +proc myMenuMotion {args} { + global myMenuFlag myMenuMotion + eval ::tk::MenuMotion $args + set myMenuMotion 1 +} +proc myMenuLeave {args} { + global myMenuFlag myMenuMotion + eval ::tk::MenuLeave $args + set myMenuMotion 0 +} +bind Menu {myMenuLeave %W %X %Y %s} +bind Menu {myMenuButtonDown %W} +bind Menu {myMenuInvoke %W 1} +bind Menu {myMenuMotion %W %x %y %s} +set myMenuFlag 0 +set myMenuMotion 0 + +# ::tk::MenuNextEntry -- +# Activate the next higher or lower entry in the posted menu, +# wrapping around at the ends. Disabled entries are skipped. +# +# Arguments: +# menu - Menu window that received the keystroke. +# count - 1 means go to the next lower entry, +# -1 means go to the next higher entry. + +proc ::tk::MenuNextEntry {menu count} { + global ::tk::Priv + + if {[string equal [$menu index last] "none"]} { + return + } + set length [expr {[$menu index last]+1}] + set quitAfter $length + set active [$menu index active] + if {[string equal $active "none"]} { + set i 0 + } else { + set i [expr {$active + $count}] + } + while {1} { + if {$quitAfter <= 0} { + # We've tried every entry in the menu. Either there are + # none, or they're all disabled. Just give up. + + return + } + while {$i < 0} { + incr i $length + } + while {$i >= $length} { + incr i -$length + } + if {[catch {$menu entrycget $i -state} state] == 0} { + if {[string compare $state "disabled"]} { + break + } + } + if {$i == $active} { + return + } + incr i $count + incr quitAfter -1 + } + $menu activate $i + ::tk::GenerateMenuSelect $menu + if {[string equal [$menu type $i] "cascade"]} { + set cascade [$menu entrycget $i -menu] + if {[string equal [$menu cget -type] "menubar"] && [string compare $cascade ""]} { + # Here we auto-post a cascade. This is necessary when + # we traverse left/right in the menubar, but undesirable when + # we traverse up/down in a menu. + $menu postcascade $i + ::tk::MenuFirstEntry $cascade + } + } +} + +# ::tk::MenuNextMenu -- +# This procedure is invoked to handle "left" and "right" traversal +# motions in menus. It traverses to the next menu in a menu bar, +# or into or out of a cascaded menu. +# +# Arguments: +# menu - The menu that received the keyboard +# event. +# direction - Direction in which to move: "left" or "right" + +proc ::tk::MenuNextMenu {menu direction} { + global ::tk::Priv + + # First handle traversals into and out of cascaded menus. + + if {[string equal $direction "right"]} { + set count 1 + set parent [winfo parent $menu] + set class [winfo class $parent] + if {[string equal [$menu type active] "cascade"]} { + $menu postcascade active + set m2 [$menu entrycget active -menu] + if {[string compare $m2 ""]} { + ::tk::MenuFirstEntry $m2 + } + return + } else { + set parent [winfo parent $menu] + while {[string compare $parent "."]} { + if {[string equal [winfo class $parent] "Menu"] \ + && [string equal [$parent cget -type] "menubar"]} { + tk_menuSetFocus $parent + ::tk::MenuNextEntry $parent 1 + return + } + set parent [winfo parent $parent] + } + } + } else { + set count -1 + set m2 [winfo parent $menu] + if {[string equal [winfo class $m2] "Menu"]} { + if {[string compare [$m2 cget -type] "menubar"]} { + $menu activate none + ::tk::GenerateMenuSelect $menu + tk_menuSetFocus $m2 + + # This code unposts any posted submenu in the parent. + $m2 postcascade none + + #set tmp [$m2 index active] + #$m2 activate none + #$m2 activate $tmp + return + } + } + } + + # Can't traverse into or out of a cascaded menu. Go to the next + # or previous menubutton, if that makes sense. + + set m2 [winfo parent $menu] + if {[string equal [winfo class $m2] "Menu"]} { + if {[string equal [$m2 cget -type] "menubar"]} { + tk_menuSetFocus $m2 + ::tk::MenuNextEntry $m2 -1 + return + } + } + + set w $::tk::Priv(postedMb) + if {[string equal $w ""]} { + return + } + set buttons [winfo children [winfo parent $w]] + set length [llength $buttons] + set i [expr {[lsearch -exact $buttons $w] + $count}] + while {1} { + while {$i < 0} { + incr i $length + } + while {$i >= $length} { + incr i -$length + } + set mb [lindex $buttons $i] + if {[string equal [winfo class $mb] "Menubutton"] \ + && [string compare [$mb cget -state] "disabled"] \ + && [string compare [$mb cget -menu] ""] \ + && [string compare [[$mb cget -menu] index last] "none"]} { + break + } + if {[string equal $mb $w]} { + return + } + incr i $count + } + ::tk::MbPost $mb + ::tk::MenuFirstEntry [$mb cget -menu] +} + +# ::tk::MenuFirstEntry -- +# Given a menu, this procedure finds the first entry that isn't +# disabled or a tear-off or separator, and activates that entry. +# However, if there is already an active entry in the menu (e.g., +# because of a previous call to ::tk::PostOverPoint) then the active +# entry isn't changed. This procedure also sets the input focus +# to the menu. +# +# Arguments: +# menu - Name of the menu window (possibly empty). + +proc ::tk::MenuFirstEntry menu { + if {[string equal $menu ""]} { + return + } + tk_menuSetFocus $menu + if {[string compare [$menu index active] "none"]} { + return + } + set last [$menu index last] + if {[string equal $last "none"]} { + return + } + for {set i 0} {$i <= $last} {incr i} { + if {([catch {set state [$menu entrycget $i -state]}] == 0) \ + && [string compare $state "disabled"]} { + #~$menu activate $i + #~::tk::GenerateMenuSelect $menu + # Only post the cascade if the current menu is a menubar; + # otherwise, if the first entry of the cascade is a cascade, + # we can get an annoying cascading effect resulting in a bunch of + # menus getting posted (bug 676) + if {[string equal [$menu type $i] "cascade"] && \ + [string equal [$menu cget -type] "menubar"]} { + set cascade [$menu entrycget $i -menu] + if {[string compare $cascade ""]} { + $menu postcascade $i + ::tk::MenuFirstEntry $cascade + } + } + return + } + } +} + +# ::tk::MenuMotion -- +# This procedure is called to handle mouse motion events for menus. +# It does two things. First, it resets the active element in the +# menu, if the mouse is over the menu. Second, if a mouse button +# is down, it posts and unposts cascade entries to match the mouse +# position. +# +# Arguments: +# menu - The menu window. +# x - The x position of the mouse. +# y - The y position of the mouse. +# state - Modifier state (tells whether buttons are down). + +proc ::tk::MenuMotion {menu x y state} { + global ::tk::Priv + if {$menu eq $::tk::Priv(window)} { + if {[$menu cget -type] eq "menubar"} { + if {[info exists ::tk::Priv(focus)] && $menu ne $::tk::Priv(focus)} { + $menu activate @$x,$y + ::tk::GenerateMenuSelect $menu + } + } else { + $menu activate @$x,$y + ::tk::GenerateMenuSelect $menu + } + } + #debugmsg plugins "MENU: $menu $::tk::Priv(activeMenu) $::tk::Priv(activeItem) $::tk::Priv(focus)" + if {([$menu cget -type] ne "menubar") || \ + ([info exist ::tk::Priv(focus)] && ($::tk::Priv(focus) ne "") && ($::tk::Priv(activeItem) != "none"))} { + myMenuPostCascade $menu + } +} + +# ::tk::MenuButtonDown -- +# Handles button presses in menus. There are a couple of tricky things +# here: +# 1. Change the posted cascade entry (if any) to match the mouse position. +# 2. If there is a posted menubutton, must grab to the menubutton; this +# overrrides the implicit grab on button press, so that the menu +# button can track mouse motions over other menubuttons and change +# the posted menu. +# 3. If there's no posted menubutton (e.g. because we're a torn-off menu +# or one of its descendants) must grab to the top-level menu so that +# we can track mouse motions across the entire menu hierarchy. +# +# Arguments: +# menu - The menu window. + +proc ::tk::MenuButtonDown menu { + variable ::tk::Priv + global tcl_platform + + if {![winfo viewable $menu]} { + return + } + $menu postcascade active + if {$Priv(postedMb) ne "" && [winfo viewable $Priv(postedMb)]} { + grab -global $Priv(postedMb) + } else { + while {[$menu cget -type] eq "normal" \ + && [winfo class [winfo parent $menu]] eq "Menu" \ + && [winfo ismapped [winfo parent $menu]]} { + set menu [winfo parent $menu] + } + + if {$Priv(menuBar) eq {}} { + set Priv(menuBar) $menu + set Priv(cursor) [$menu cget -cursor] + $menu configure -cursor arrow + } else { + $menu activate none + #MenuUnpost $menu + } + + # Don't update grab information if the grab window isn't changing. + # Otherwise, we'll get an error when we unpost the menus and + # restore the grab, since the old grab window will not be viewable + # anymore. + + if {$menu ne [grab current $menu]} { + SaveGrabInfo $menu + } + + # Must re-grab even if the grab window hasn't changed, in order + # to release the implicit grab from the button press. + + if {[tk windowingsystem] eq "x11"} { + grab -global $menu + } + } +} + +set myPriv(id) "" +set myPriv(delay) 170 +set myPriv(activeMenu) "" +set myPriv(activeItem) "" + +proc myMenuPostCascade {menu} { + global myPriv + + if {$myPriv(id) ne ""} { + if {($myPriv(activeMenu) == $menu) && ($myPriv(activeItem) == [$menu index active])} { + return + } else { + after cancel $myPriv(id) + } + } + if {[string equal [$menu cget -type] "menubar"]} { + $menu postcascade active + } else { + set myPriv(activeMenu) $menu + set myPriv(activeItem) [$menu index active] + set myPriv(id) [after $myPriv(delay) "$menu postcascade active"] + } +} + +} diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index 02fdf85e..f0005f85 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -588,12 +588,12 @@ class Troika(Fan): self.s.talon.dealRow(rows=[t], frames=4) -class TroikaPlus_RowStack(RK_RowStack): +class Quads_RowStack(RK_RowStack): def getBottomImage(self): return self.game.app.images.getReserveBottom() -class TroikaPlus(Troika): - RowStack_Class = StackWrapper(TroikaPlus_RowStack, dir=0, +class Quads(Troika): + RowStack_Class = StackWrapper(Quads_RowStack, dir=0, ##base_rank=NO_RANK, max_cards=4) def createGame(self): @@ -758,8 +758,8 @@ registerGame(GameInfo(385, BoxFan, "Box Fan", GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(516, Troika, "Troika", GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) -registerGame(GameInfo(517, TroikaPlus, "Troika +", - GI.GT_FAN_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(517, Quads, "Quads", + GI.GT_FAN_TYPE | GI.GT_OPEN | GI.GT_ORIGINAL, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(625, FascinationFan, "Fascination Fan", GI.GT_FAN_TYPE, 1, 6, GI.SL_BALANCED)) registerGame(GameInfo(647, Crescent, "Crescent", diff --git a/pysollib/init.py b/pysollib/init.py index d1c574df..9294ff01 100644 --- a/pysollib/init.py +++ b/pysollib/init.py @@ -23,6 +23,8 @@ import sys, os, locale import traceback import gettext +import settings + # /*********************************************************************** # // init # ************************************************************************/ @@ -50,27 +52,29 @@ def init(): gettext.install('pysol', locale_dir, unicode=True) ## init toolkit - import settings if '--gtk' in sys.argv: settings.TOOLKIT = 'gtk' sys.argv.remove('--gtk') - else: - if '--tile' in sys.argv: + elif '--tk' in sys.argv: + settings.TOOLKIT = 'tk' + settings.USE_TILE = False + sys.argv.remove('--tk') + elif '--tile' in sys.argv: + settings.TOOLKIT = 'tk' + settings.USE_TILE = True + sys.argv.remove('--tile') + elif settings.TOOLKIT == 'tk' and settings.USE_TILE == 'auto': + # check tile + import Tkinter + root = Tkinter.Tk() + root.withdraw() + settings.USE_TILE = False + try: + root.tk.call('package', 'require', 'tile', '0.7.8') + except: + pass + else: settings.USE_TILE = True - sys.argv.remove('--tile') - elif settings.USE_TILE == 'auto': - # check tile - import Tkinter - root = Tkinter.Tk() - root.withdraw() - settings.USE_TILE = False - try: - tile_version = root.tk.call('package', 'require', 'tile') - except: - pass - else: - if tile_version >= '0.7.8': - settings.USE_TILE = True - #root.destroy() - Tkinter._default_root = None + #root.destroy() + Tkinter._default_root = None diff --git a/pysollib/main.py b/pysollib/main.py index 5a7e8d0f..2026f297 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -43,7 +43,7 @@ import gettext # PySol imports from mfxutil import destruct, EnvError from util import CARDSET, DataLoader -from settings import PACKAGE, TOOLKIT, VERSION +from settings import PACKAGE, TOOLKIT, VERSION, SOUND_MOD from resource import Tile from gamedb import GI from app import Application @@ -243,29 +243,31 @@ def pysol_init(app, args): warn_thread = 0 warn_pysolsoundserver = 0 app.audio = None - if opts["nosound"]: + sounds = {'pss': PysolSoundServerModuleClient, + 'pygame': PyGameAudioClient, + 'oss': OSSAudioClient, + 'win': Win32AudioClient} + if opts["nosound"] or SOUND_MOD == 'none': app.audio = AbstractAudioClient() + elif opts['sound-mod']: + c = sounds[opts['sound-mod']] + app.audio = c() + elif SOUND_MOD == 'auto': + for c in (PysolSoundServerModuleClient, + PyGameAudioClient, + OSSAudioClient, + Win32AudioClient, + AbstractAudioClient): + try: + app.audio = c() + except: + pass + else: + # success + break else: - if opts['sound-mod']: - d = {'pss': PysolSoundServerModuleClient, - 'pygame': PyGameAudioClient, - 'oss': OSSAudioClient, - 'win': Win32AudioClient} - c = d[opts['sound-mod']] - app.audio = c() - else: - for c in (PysolSoundServerModuleClient, - PyGameAudioClient, - OSSAudioClient, - Win32AudioClient, - AbstractAudioClient): - try: - app.audio = c() - except: - pass - else: - # success - break + c = sounds[SOUND_MOD] + app.audio = c() app.audio.startServer() # update sound_mode if isinstance(app.audio, PysolSoundServerModuleClient): diff --git a/pysollib/pysolaudio.py b/pysollib/pysolaudio.py index 3363c625..2f977a76 100644 --- a/pysollib/pysolaudio.py +++ b/pysollib/pysolaudio.py @@ -390,11 +390,7 @@ class OSSAudioClient(AbstractAudioClient): def __init__(self): AbstractAudioClient.__init__(self) - try: - import ossaudiodev, wave - except: - if traceback: traceback.print_exc() - raise + import ossaudiodev, wave self.audiodev = ossaudiodev def startServer(self): @@ -430,18 +426,14 @@ class PyGameAudioClient(AbstractAudioClient): def __init__(self): AbstractAudioClient.__init__(self) - try: - import pygame.mixer, pygame.time - if os.name == 'nt': - # for py2exe - import pygame.base, pygame.rwobject, pygame.mixer_music - self.mixer = pygame.mixer - self.mixer.init() - self.music = self.mixer.music - self.time = pygame.time - except: - ##if traceback: traceback.print_exc() - raise + import pygame.mixer, pygame.time + if os.name == 'nt': + # for py2exe + import pygame.base, pygame.rwobject, pygame.mixer_music + self.mixer = pygame.mixer + self.mixer.init() + self.music = self.mixer.music + self.time = pygame.time self.audiodev = self.mixer self.sound = None self.sound_channel = None diff --git a/pysollib/pysolgtk/tkwidget.py b/pysollib/pysolgtk/tkwidget.py index 71d8f24d..1eece443 100644 --- a/pysollib/pysolgtk/tkwidget.py +++ b/pysollib/pysolgtk/tkwidget.py @@ -65,6 +65,8 @@ class _MyDialog(gtk.Dialog): class MfxDialog(_MyDialog): + img = {} + button_img = {} def __init__(self, parent, title='', timeout=0, resizable=0, diff --git a/pysollib/settings.py b/pysollib/settings.py index 1c6bcff8..25759f8a 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -23,7 +23,7 @@ import sys, os n_ = lambda x: x # for gettext -# + #PACKAGE = 'PySolFC' PACKAGE = 'PySol' PACKAGE_URL = 'http://sourceforge.net/projects/pysolfc/' @@ -37,6 +37,7 @@ USE_TILE = 'auto' # or True or False TILE_THEME = 'default' # name of tile's theme if os.name == 'nt': TILE_THEME = 'winnative' +SOUND_MOD = 'auto' # or 'pss', 'pygame', 'oss', 'win', 'none' # data dirs DATA_DIRS = [] diff --git a/pysollib/tile/tkutil.py b/pysollib/tile/tkutil.py index f7730ee9..4d87b4b5 100644 --- a/pysollib/tile/tkutil.py +++ b/pysollib/tile/tkutil.py @@ -414,6 +414,12 @@ def get_text_width(text, font, root=None): # ************************************************************************/ def load_theme(app, top, theme): + # + if os.name == 'posix': + f = os.path.join(app.dataloader.dir, 'tcl', 'menu8.4.tcl') + if os.path.exists(f): + top.tk.call('source', f) + # top.tk.call("package", "require", "tile") # load available themes d = os.path.join(app.dataloader.dir, 'themes') diff --git a/pysollib/tile/tkwidget.py b/pysollib/tile/tkwidget.py index ac70ae50..83b55a31 100644 --- a/pysollib/tile/tkwidget.py +++ b/pysollib/tile/tkwidget.py @@ -43,7 +43,7 @@ __all__ = ['MfxDialog', ] # imports -import os, sys, time, types +import os, sys, time, locale import Tkinter as Tk import Tile as Tkinter import traceback @@ -103,28 +103,7 @@ class MfxDialog: # ex. _ToplevelDialog def destroy(self): after_cancel(self.timer) unbind_destroy(self.top) - try: - self.top.wm_withdraw() - except: - if traceback: traceback.print_exc() - pass - try: - self.top.destroy() - except: - if traceback: traceback.print_exc() - pass - #destruct(self.top) - if 1 and self.parent: # ??? - try: - ##self.parent.update_idletasks() - # FIXME: why do we need this under Windows ? - if hasattr(self.parent, "busyUpdate"): - self.parent.busyUpdate() - else: - self.parent.update() - except: - if traceback: traceback.print_exc() - pass + self.top.destroy() self.top = None self.parent = None @@ -147,11 +126,18 @@ class MfxDialog: # ex. _ToplevelDialog def altKeyEvent(self, event): key = event.char - key = unicode(key, 'utf-8') - key = key.lower() - widget = self.accel_keys.get(key) - if not widget is None: - widget.event_generate('<>') + try: + if os.name == 'nt': + key = unicode(key, locale.getpreferredencoding()) + else: + key = unicode(key, 'utf-8') + except: + pass + else: + key = key.lower() + widget = self.accel_keys.get(key) + if not widget is None: + widget.event_generate('<>') def initKw(self, kw): kw = KwStruct(kw, @@ -196,12 +182,9 @@ class MfxDialog: # ex. _ToplevelDialog focus = None max_len = 0 for s in kw.strings: - if type(s) is types.TupleType: + if type(s) is tuple: s = s[0] if s: - ##s = re.sub(r"[\s\.\,]", "", s) - #if os.name == 'posix': - # s = s.replace('...', '.') s = s.replace('&', '') max_len = max(max_len, len(s)) ##print s, len(s) @@ -212,7 +195,7 @@ class MfxDialog: # ex. _ToplevelDialog # for s in kw.strings: xbutton = button = button + 1 - if type(s) is types.TupleType: + if type(s) is tuple: assert len(s) == 2 button = int(s[1]) s = s[0] @@ -228,7 +211,7 @@ class MfxDialog: # ex. _ToplevelDialog button = xbutton else: widget = Tkinter.Button(frame, text=s, default="normal", - command=(lambda self=self, button=button: self.mDone(button))) + command=(lambda self=self, button=button: self.mDone(button))) if button == kw.default: focus = widget focus.config(default="active") @@ -429,7 +412,7 @@ class MfxTooltip: class MfxScrolledCanvas: def __init__(self, parent, hbar=2, vbar=2, **kw): - kwdefault(kw, borderwidth=1, relief='sunken') + kwdefault(kw, highlightthickness=0, bd=1, relief='sunken') self.parent = parent self.createFrame(kw) self.canvas = None diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py index d6d00d57..dd6ff8b0 100644 --- a/pysollib/tile/toolbar.py +++ b/pysollib/tile/toolbar.py @@ -76,16 +76,17 @@ class AbstractToolbarButton: if self.visible and not force: return self.visible = True - padx, pady = 2, 2 if orient == Tkinter.HORIZONTAL: + padx, pady = 0, 2 self.grid(row=0, column=self.position, - ipadx=padx, ipady=pady, + padx=padx, pady=pady, sticky='nsew') else: + padx, pady = 2, 0 self.grid(row=self.position, column=0, - ipadx=padx, ipady=pady, + padx=padx, pady=pady, sticky='nsew') def hide(self): @@ -273,9 +274,10 @@ class PysolToolbar(PysolToolbarActions): # Change the look of the frame to match the platform look # (see also setRelief) if os.name == 'posix': + ##self.frame.config(bd=1, relief=self.frame_relief) pass elif os.name == "nt": - self.frame.config(relief=self.frame_relief) + self.frame.config(bd=2, relief=self.frame_relief, padx=2, pady=2) else: pass @@ -323,7 +325,7 @@ class PysolToolbar(PysolToolbarActions): self.frame_relief = 'groove' else: self.frame_relief = 'raised' - self.separator_relief = 'sunken' #'raised' + self.separator_relief = 'sunken' if os.name == 'nt': self.frame_relief = 'groove' self.separator_relief = 'groove' @@ -373,7 +375,6 @@ class PysolToolbar(PysolToolbarActions): name = label.lower() image = self._loadImage(name) position = len(self._widgets) - bd = self.button_relief == 'flat' and 1 or 2 kw = { 'position' : position, 'toolbar' : self, @@ -381,20 +382,10 @@ class PysolToolbar(PysolToolbarActions): 'command' : command, 'takefocus' : 0, 'text' : gettext(label), - 'bd' : bd, - 'relief' : self.button_relief, - 'padx' : self.button_pad, - 'pady' : self.button_pad } - if Tkinter.TkVersion >= 8.4: - kw['overrelief'] = 'raised' if image: kw['image'] = image if check: - if Tkinter.TkVersion >= 8.4: - kw['offrelief'] = self.button_relief - kw['indicatoron'] = False - kw['selectcolor'] = '' button = ToolbarCheckbutton(self.frame, **kw) else: button = ToolbarButton(self.frame, **kw) From 4c7c9ce7f98aae678bef71b775a7e9988392a9d1 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 5 Nov 2006 22:46:19 +0000 Subject: [PATCH 084/266] * misc improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@86 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- MANIFEST.in | 3 +- data/tcl/menu8.4.tcl | 59 +++++----- data/themes/blue/blue.tcl | 153 +++++++++++++++++++++++++ data/themes/blue/blue/arrowdown-h.gif | Bin 0 -> 315 bytes data/themes/blue/blue/arrowdown-p.gif | Bin 0 -> 312 bytes data/themes/blue/blue/arrowdown.gif | Bin 0 -> 313 bytes data/themes/blue/blue/arrowleft-h.gif | Bin 0 -> 329 bytes data/themes/blue/blue/arrowleft-p.gif | Bin 0 -> 327 bytes data/themes/blue/blue/arrowleft.gif | Bin 0 -> 323 bytes data/themes/blue/blue/arrowright-h.gif | Bin 0 -> 330 bytes data/themes/blue/blue/arrowright-p.gif | Bin 0 -> 327 bytes data/themes/blue/blue/arrowright.gif | Bin 0 -> 324 bytes data/themes/blue/blue/arrowup-h.gif | Bin 0 -> 309 bytes data/themes/blue/blue/arrowup-p.gif | Bin 0 -> 313 bytes data/themes/blue/blue/arrowup.gif | Bin 0 -> 314 bytes data/themes/blue/blue/button-h.gif | Bin 0 -> 696 bytes data/themes/blue/blue/button-n.gif | Bin 0 -> 770 bytes data/themes/blue/blue/button-n.xcf | Bin 0 -> 1942 bytes data/themes/blue/blue/button-p.gif | Bin 0 -> 769 bytes data/themes/blue/blue/check-hc.gif | Bin 0 -> 254 bytes data/themes/blue/blue/check-hu.gif | Bin 0 -> 234 bytes data/themes/blue/blue/check-nc.gif | Bin 0 -> 249 bytes data/themes/blue/blue/check-nu.gif | Bin 0 -> 229 bytes data/themes/blue/blue/radio-hc.gif | Bin 0 -> 1098 bytes data/themes/blue/blue/radio-hu.gif | Bin 0 -> 626 bytes data/themes/blue/blue/radio-nc.gif | Bin 0 -> 389 bytes data/themes/blue/blue/radio-nu.gif | Bin 0 -> 401 bytes data/themes/blue/blue/sb-thumb-p.gif | Bin 0 -> 343 bytes data/themes/blue/blue/sb-thumb.gif | Bin 0 -> 316 bytes data/themes/blue/blue/sb-vthumb-p.gif | Bin 0 -> 333 bytes data/themes/blue/blue/sb-vthumb.gif | Bin 0 -> 308 bytes data/themes/blue/blue/slider-p.gif | Bin 0 -> 182 bytes data/themes/blue/blue/slider.gif | Bin 0 -> 182 bytes data/themes/blue/blue/vslider-p.gif | Bin 0 -> 183 bytes data/themes/blue/blue/vslider.gif | Bin 0 -> 283 bytes data/themes/blue/pkgIndex.tcl | 6 + pysollib/game.py | 2 +- pysollib/tile/soundoptionsdialog.py | 2 +- scripts/build.bat | 3 +- setup.py | 2 + 40 files changed, 196 insertions(+), 34 deletions(-) create mode 100644 data/themes/blue/blue.tcl create mode 100644 data/themes/blue/blue/arrowdown-h.gif create mode 100644 data/themes/blue/blue/arrowdown-p.gif create mode 100644 data/themes/blue/blue/arrowdown.gif create mode 100644 data/themes/blue/blue/arrowleft-h.gif create mode 100644 data/themes/blue/blue/arrowleft-p.gif create mode 100644 data/themes/blue/blue/arrowleft.gif create mode 100644 data/themes/blue/blue/arrowright-h.gif create mode 100644 data/themes/blue/blue/arrowright-p.gif create mode 100644 data/themes/blue/blue/arrowright.gif create mode 100644 data/themes/blue/blue/arrowup-h.gif create mode 100644 data/themes/blue/blue/arrowup-p.gif create mode 100644 data/themes/blue/blue/arrowup.gif create mode 100644 data/themes/blue/blue/button-h.gif create mode 100644 data/themes/blue/blue/button-n.gif create mode 100644 data/themes/blue/blue/button-n.xcf create mode 100644 data/themes/blue/blue/button-p.gif create mode 100644 data/themes/blue/blue/check-hc.gif create mode 100644 data/themes/blue/blue/check-hu.gif create mode 100644 data/themes/blue/blue/check-nc.gif create mode 100644 data/themes/blue/blue/check-nu.gif create mode 100644 data/themes/blue/blue/radio-hc.gif create mode 100644 data/themes/blue/blue/radio-hu.gif create mode 100644 data/themes/blue/blue/radio-nc.gif create mode 100644 data/themes/blue/blue/radio-nu.gif create mode 100644 data/themes/blue/blue/sb-thumb-p.gif create mode 100644 data/themes/blue/blue/sb-thumb.gif create mode 100644 data/themes/blue/blue/sb-vthumb-p.gif create mode 100644 data/themes/blue/blue/sb-vthumb.gif create mode 100644 data/themes/blue/blue/slider-p.gif create mode 100644 data/themes/blue/blue/slider.gif create mode 100644 data/themes/blue/blue/vslider-p.gif create mode 100644 data/themes/blue/blue/vslider.gif create mode 100644 data/themes/blue/pkgIndex.tcl diff --git a/MANIFEST.in b/MANIFEST.in index da71a05a..22416433 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,6 +8,8 @@ include pysol setup.py setup.cfg MANIFEST.in Makefile COPYING README include pysollib/*.py pysollib/tk/*.py pysollib/tile/*.py pysollib/pysolgtk/*.py include pysollib/games/*.py pysollib/games/special/*.py include pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py +include data/tcl/*.tcl +graft data/themes include scripts/build.bat scripts/create_iss.py scripts/mahjongg_utils.py include scripts/all_games.py scripts/cardset_viewer.py #graft data/plugins @@ -17,7 +19,6 @@ include scripts/all_games.py scripts/cardset_viewer.py include docs/* graft data/html graft data/html-src -graft data/themes ## ## data - images ## diff --git a/data/tcl/menu8.4.tcl b/data/tcl/menu8.4.tcl index 91e96f36..438322a8 100644 --- a/data/tcl/menu8.4.tcl +++ b/data/tcl/menu8.4.tcl @@ -1,4 +1,5 @@ # this file from tkabber project +# http://www.jabberstudio.org/projects/tkabber/ namespace eval :: { @@ -44,13 +45,13 @@ set myMenuMotion 0 proc ::tk::MenuNextEntry {menu count} { global ::tk::Priv - if {[string equal [$menu index last] "none"]} { + if {[$menu index last] eq "none"} { return } set length [expr {[$menu index last]+1}] set quitAfter $length set active [$menu index active] - if {[string equal $active "none"]} { + if {$active eq "none"} { set i 0 } else { set i [expr {$active + $count}] @@ -69,7 +70,7 @@ proc ::tk::MenuNextEntry {menu count} { incr i -$length } if {[catch {$menu entrycget $i -state} state] == 0} { - if {[string compare $state "disabled"]} { + if {$state ne "disabled"} { break } } @@ -81,9 +82,9 @@ proc ::tk::MenuNextEntry {menu count} { } $menu activate $i ::tk::GenerateMenuSelect $menu - if {[string equal [$menu type $i] "cascade"]} { + if {[$menu type $i] eq "cascade"} { set cascade [$menu entrycget $i -menu] - if {[string equal [$menu cget -type] "menubar"] && [string compare $cascade ""]} { + if {[$menu cget -type] eq "menubar" && $cascade ne ""} { # Here we auto-post a cascade. This is necessary when # we traverse left/right in the menubar, but undesirable when # we traverse up/down in a menu. @@ -108,22 +109,22 @@ proc ::tk::MenuNextMenu {menu direction} { # First handle traversals into and out of cascaded menus. - if {[string equal $direction "right"]} { + if {$direction eq "right"} { set count 1 set parent [winfo parent $menu] set class [winfo class $parent] - if {[string equal [$menu type active] "cascade"]} { + if {[$menu type active] eq "cascade"} { $menu postcascade active set m2 [$menu entrycget active -menu] - if {[string compare $m2 ""]} { + if {$m2 ne ""} { ::tk::MenuFirstEntry $m2 } return } else { set parent [winfo parent $menu] - while {[string compare $parent "."]} { - if {[string equal [winfo class $parent] "Menu"] \ - && [string equal [$parent cget -type] "menubar"]} { + while {$parent ne "."} { + if {[winfo class $parent] eq "Menu" && \ + [$parent cget -type] eq "menubar"} { tk_menuSetFocus $parent ::tk::MenuNextEntry $parent 1 return @@ -134,8 +135,8 @@ proc ::tk::MenuNextMenu {menu direction} { } else { set count -1 set m2 [winfo parent $menu] - if {[string equal [winfo class $m2] "Menu"]} { - if {[string compare [$m2 cget -type] "menubar"]} { + if {[winfo class $m2] eq "Menu"} { + if {[$m2 cget -type] ne "menubar"} { $menu activate none ::tk::GenerateMenuSelect $menu tk_menuSetFocus $m2 @@ -155,8 +156,8 @@ proc ::tk::MenuNextMenu {menu direction} { # or previous menubutton, if that makes sense. set m2 [winfo parent $menu] - if {[string equal [winfo class $m2] "Menu"]} { - if {[string equal [$m2 cget -type] "menubar"]} { + if {[winfo class $m2] eq "Menu"} { + if {[$m2 cget -type] eq "menubar"} { tk_menuSetFocus $m2 ::tk::MenuNextEntry $m2 -1 return @@ -164,7 +165,7 @@ proc ::tk::MenuNextMenu {menu direction} { } set w $::tk::Priv(postedMb) - if {[string equal $w ""]} { + if {$w eq ""} { return } set buttons [winfo children [winfo parent $w]] @@ -178,13 +179,13 @@ proc ::tk::MenuNextMenu {menu direction} { incr i -$length } set mb [lindex $buttons $i] - if {[string equal [winfo class $mb] "Menubutton"] \ - && [string compare [$mb cget -state] "disabled"] \ - && [string compare [$mb cget -menu] ""] \ - && [string compare [[$mb cget -menu] index last] "none"]} { + if {[winfo class $mb] eq "Menubutton" \ + && [$mb cget -state] ne "disabled" \ + && [$mb cget -menu] ne "" \ + && [[$mb cget -menu] index last] ne "none"} { break } - if {[string equal $mb $w]} { + if {$mb eq $w} { return } incr i $count @@ -205,30 +206,30 @@ proc ::tk::MenuNextMenu {menu direction} { # menu - Name of the menu window (possibly empty). proc ::tk::MenuFirstEntry menu { - if {[string equal $menu ""]} { + if {$menu eq ""} { return } tk_menuSetFocus $menu - if {[string compare [$menu index active] "none"]} { + if {[$menu index active] ne "none"} { return } set last [$menu index last] - if {[string equal $last "none"]} { + if {$last eq "none"} { return } for {set i 0} {$i <= $last} {incr i} { if {([catch {set state [$menu entrycget $i -state]}] == 0) \ - && [string compare $state "disabled"]} { + && $state ne "disabled"} { #~$menu activate $i #~::tk::GenerateMenuSelect $menu # Only post the cascade if the current menu is a menubar; # otherwise, if the first entry of the cascade is a cascade, # we can get an annoying cascading effect resulting in a bunch of # menus getting posted (bug 676) - if {[string equal [$menu type $i] "cascade"] && \ - [string equal [$menu cget -type] "menubar"]} { + if {[$menu type $i] eq "cascade" && \ + [$menu cget -type] eq "menubar"} { set cascade [$menu entrycget $i -menu] - if {[string compare $cascade ""]} { + if {$cascade ne ""} { $menu postcascade $i ::tk::MenuFirstEntry $cascade } @@ -345,7 +346,7 @@ proc myMenuPostCascade {menu} { after cancel $myPriv(id) } } - if {[string equal [$menu cget -type] "menubar"]} { + if {[$menu cget -type] eq "menubar"} { $menu postcascade active } else { set myPriv(activeMenu) $menu diff --git a/data/themes/blue/blue.tcl b/data/themes/blue/blue.tcl new file mode 100644 index 00000000..e5c49470 --- /dev/null +++ b/data/themes/blue/blue.tcl @@ -0,0 +1,153 @@ +# blue.tcl - Copyright (C) 2004 Pat Thoyts +# +# blue.tcl,v 1.30 2005/12/13 23:04:25 patthoyts Exp +# +# + +namespace eval tile::theme::blue { + + package provide tile::theme::blue 0.7 + + variable I + array set I [tile::LoadImages \ + [file join [file dirname [info script]] blue] *.gif] + + variable colors + array set colors { + -frame "#6699cc" + -lighter "#bcd2e8" + -window "#e6f3ff" + -selectbg "#ffff33" + -selectfg "#000000" + -disabledfg "#666666" + } + + style theme create blue -settings { + + style configure . \ + -borderwidth 1 \ + -background $colors(-frame) \ + -fieldbackground $colors(-window) \ + -troughcolor $colors(-lighter) \ + -selectbackground $colors(-selectbg) \ + -selectforeground $colors(-selectfg) \ + ; + style map . -foreground [list disabled $colors(-disabledfg)] + + ## Buttons. + # + style configure TButton -padding "10 0" + style layout TButton { + Button.button -children { + Button.focus -children { + Button.padding -children { + Button.label + } + } + } + } + + style element create button image $I(button-n) \ + -map [list pressed $I(button-p) active $I(button-h)] \ + -border 4 -sticky ew + + style element create Checkbutton.indicator image $I(check-nu) \ + -width 24 -sticky w -map [list \ + {!disabled active selected} $I(check-hc) \ + {!disabled active} $I(check-hu) \ + {!disabled selected} $I(check-nc) ] + + style element create Radiobutton.indicator image $I(radio-nu) \ + -width 24 -sticky w -map [list \ + {!disabled active selected} $I(radio-hc) \ + {!disabled active} $I(radio-hu) \ + selected $I(radio-nc) ] + + style configure TMenubutton -relief raised -padding {10 2} + style configure TRadiobutton -padding 1 + style configure TCheckbutton -padding 1 + + ## Toolbar buttons. + # + style configure Toolbutton \ + -width 0 -relief flat -borderwidth 2 -padding 4 \ + -background $colors(-frame) -foreground #000000 ; + style map Toolbutton -background [list active $colors(-selectbg)] + style map Toolbutton -foreground [list active $colors(-selectfg)] + style map Toolbutton -relief { + disabled flat + selected sunken + pressed sunken + active raised + } + + ## Entry widgets. + # + style configure TEntry \ + -selectborderwidth 1 -padding 2 -insertwidth 2 -font TkTextFont + style configure TCombobox \ + -selectborderwidth 1 -padding 2 -insertwidth 2 -font TkTextFont + + ## Notebooks. + # + style configure TNotebook.Tab -padding {4 2 4 2} + style map TNotebook.Tab \ + -background \ + [list selected $colors(-frame) active $colors(-lighter)] \ + -padding [list selected {4 4 4 2}] + + ## Labelframes. + # + style configure TLabelframe -borderwidth 2 -relief groove + + ## Scrollbars. + # + style layout Vertical.TScrollbar { + Scrollbar.trough -children { + Scrollbar.uparrow -side top + Scrollbar.downarrow -side bottom + Scrollbar.uparrow -side bottom + Vertical.Scrollbar.thumb -side top -expand true -sticky ns + } + } + + style layout Horizontal.TScrollbar { + Scrollbar.trough -children { + Scrollbar.leftarrow -side left + Scrollbar.rightarrow -side right + Scrollbar.leftarrow -side right + Horizontal.Scrollbar.thumb -side left -expand true -sticky we + } + } + + style element create Horizontal.Scrollbar.thumb image $I(sb-thumb) \ + -map [list {pressed !disabled} $I(sb-thumb-p)] -border 3 + + style element create Vertical.Scrollbar.thumb image $I(sb-vthumb) \ + -map [list {pressed !disabled} $I(sb-vthumb-p)] -border 3 + + foreach dir {up down left right} { + style element create ${dir}arrow image $I(arrow${dir}) \ + -map [list \ + disabled $I(arrow${dir}) \ + pressed $I(arrow${dir}-p) \ + active $I(arrow${dir}-h)] \ + -border 1 -sticky {} + } + + ## Scales. + # + style element create Scale.slider \ + image $I(slider) -map [list {pressed !disabled} $I(slider-p)] + + style element create Vertical.Scale.slider \ + image $I(vslider) -map [list {pressed !disabled} $I(vslider-p)] + + style element create Horizontal.Progress.bar \ + image $I(sb-thumb) -border 2 + style element create Vertical.Progress.bar \ + image $I(sb-vthumb) -border 2 + + } +} + diff --git a/data/themes/blue/blue/arrowdown-h.gif b/data/themes/blue/blue/arrowdown-h.gif new file mode 100644 index 0000000000000000000000000000000000000000..3c1be9d880958303c00527831b0c89de72766017 GIT binary patch literal 315 zcmZ?wbhEHbtxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNR!2O2`8d9=u z3)7o72B-+0SiI0cWcu0kl3g3PHk>=L?c!dexdECtUpwx&U+|5MPrrRb$&p)kT8f`W m=4GYEr$;q6WF)65$+u+&^Mu(e$ViHd3N!I}xY|21SOWk~x_R9I literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/arrowdown-p.gif b/data/themes/blue/blue/arrowdown-p.gif new file mode 100644 index 0000000000000000000000000000000000000000..1cb36ec5543e8058defe8c6de4798ad1720baa44 GIT binary patch literal 312 zcmZ?wbhEHbtxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNj!2E<45>l+~ zhutxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0udVZGhrW7Dg@xdj=f_AOQJ^fi3L7{f7z~QnGFf z)0;O2s0f}|ywE^o`q}i7T^qPIoIA1Y;$EY<0h%{o8}90TbM|%wU*hxZ;>%}y)4Q`$ ioSs4mE>D8gL%U26=WpEMTMF8JY4M^8LR>GqPi>q literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/arrowleft-h.gif b/data/themes/blue/blue/arrowleft-h.gif new file mode 100644 index 0000000000000000000000000000000000000000..cbc3db27567257c45c39d3d3cdfa140b76cb8382 GIT binary patch literal 329 zcmZ?wbhEHbtxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNc!2ARc9lqAK zB}Fr3w8SoGD4mipTNlB?bX&keE@6Y1V4Vfa1e27W0OxZPEu;ne`Bf*Kkm;Y#q0u0c z(2r8#EFu*)r2xJXW3!Jges(N)Rbk--`OY1VVw literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/arrowleft-p.gif b/data/themes/blue/blue/arrowleft-p.gif new file mode 100644 index 0000000000000000000000000000000000000000..14d541b03e3411ca1f99b58ae3788ab550594c1f GIT binary patch literal 327 zcmZ?wbhEHbtxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNUztxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNQ!2ARc9lqAK zB}Fr3w8So~P&g%Fwk{(3+Q%1Vo%htxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNs!2ARc9lqAK zB}Fr3jKl(1N_GYCNZ(*%ns}B=rvF27w?MlrUx$>F+Zx5g9X6NT&aeu1#s&4iU=}YBoRG%GLww-ENPC}^Vk*Stxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNUztxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNg!2ARc9lqAK zB}Fr3jKl&MOLhhDNZ&YS+AV4!_ki7yr_4ej!^3c`n9Dsutxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNX!2O2`8d9>y z<{#L6FhXMz$CHZz5?wy(AzraD)6b^2-2RYsScD}h>R*~}R_XP-J;!gS@4ma|%IlX= ffjKq#(ajD1O~tPA8C|?Q;Z81Yt{$%TjttfSl+}7` literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/arrowup-p.gif b/data/themes/blue/blue/arrowup-p.gif new file mode 100644 index 0000000000000000000000000000000000000000..20b6a824f42b0fd9e256f01547dc35fa5ea66ddc GIT binary patch literal 313 zcmZ?wbhEHbtxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0r61HbC(w3nLeUJ%bL&c#xkM*uoCXPk13A#oFF{ zVL^tCf*|M7rkfRfOotC~P7PY?tZObbGtBnk+u{ti^sC49f8Djtxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0udVZGhrW7Dg@xdj=f_AOQJ^fi3*N{f7z~QnGFf z)0;O2s0f}|ywE^o`q}i7T^qPIoIA1Y;$EY)%!ITFe%BWw+8cs*(=CMii-*}@p-t~J2F@U09O6Dr2qf` literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/button-h.gif b/data/themes/blue/blue/button-h.gif new file mode 100644 index 0000000000000000000000000000000000000000..0947f43b9024931f4f444507adcd96a6a4827173 GIT binary patch literal 696 zcmZ?wbhEHbRA5kGIL5$`HuFq${vlo6G<}22gxb^b&0F*4oGqAt-p;KvuI#j(OMAhr zlckF$f&Tfg#3!}5zQYp=DfzTCOtdf%3tx_W7ox8II#-8o~| z-Ff@&85(6RKKNk8(MS6F8Ea2G-gM@vo?iO)^UwA4)Aw9@aq!x!V>jQNzWeUtgZIZT zKfU(&(9?#e|rDr=e!;hgwx>)x8P~P<|4;xr3_t*i z3kLRo4Gc}qEv;?s9i3g>369fZ25|ntCsUl zYvOa_7udXI>$dG%*EKl_3hmo};NYPHyBM5=MNXbNedg@xqfVk?m#z5H%6S=vhwnB-)M*G#+9qCu8!E)H_34E>g($h z4%fAY9d5h1Ipgvw+iK=necR;<9-o@4y$f&Tfg#3!}5zQYp=DfzTCOtdf%3tx_W7ox8II#-8o~| z-Ff@&85(6RKKNk8(MS6F8Ea2G-gM@vo?iO)^UwA4)Aw9@aq!x!V>jQNzWeUtgZIZT zKfU(&(9?#e|rDr=e!;hgwx>)x8P~P<|4;ym|3saO zQWHy3QxwWGOEMHfGEx=XJ$(ZhbQpjD6iE#1{~8#Ynp;}i+B-VCx)~Umn3*O{nmlDH z6Jsk2D;xXVdGi-6oXf%4!o|(Aa@FcJYgh4dH1jd>3vAoIW9P0NOf5`;LI)2WK63Q% z-ex9Ykuzt{oxgDIL=%&!*!3GXZ{5CmnSn|C;iJb-o<6xJA^Ga{o44=YGD$T{NPqqI z{m0KAFJ%7y`_I74^u~dsxxJY~SSx15goI7}0?J-g(%l!#7BHZ(DP7b4v7%4_}$uZg2N5czmi=`tbA~$%@af z?w$_U=Z!bb;gIv$vEkuC^8x{<3C``0k55qcuG`am{E?hp9RsJ*lFiT0FL2~n4B}v9 Z@?N1TIy0qZVm5>Oggx`tY6vh`0{~xe+U)=U literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/button-n.xcf b/data/themes/blue/blue/button-n.xcf new file mode 100644 index 0000000000000000000000000000000000000000..e38ed19e6107c0064d3f848e17c4dafe29bca95a GIT binary patch literal 1942 zcmY+FT})g>6vywqv{0?6Aly5T`@-WawP~s^ZrN2aJ~T1W#0Qd6Ty_?0VK=bYN@5_f zTGxlBN$ZA%rcHyXG=|uan$}92(u7LGHgsvFB9?9-6x{M5AE^*`=6cTD*>yeHGxMAO znR{mD+}+t=V^i35)X!Y3@o+!`b16qI0oQeCUIE|XJE>{tU}fOjz)Qi)!7IUwgOG~) zLrqPA<_L^6e9(NeB~TX$)Vq!}MjBinGz47lyu1HBjGEw>0%uv!eF!}oj!RnuhXejd zW2m_{5~>Z?MH*x%JDtF&Kus;ezN$*o;DcshQ*{$t&DhteXmfN57fJDakUA z_b*4s96pJf;r$BoY&vtikVCQIg*iF?Eyucd0T>+2z_>S+$0L$;sb9_0yBx+f)&6zd zOI4MclhQOi1DN5xmt)-vIdb~RJeE`Q8-2?e6-Jfnf*u`hr?1X`DA*EeYp%zkEF<)V z;8=DWe1~FuL(eIOPJ2F&cjoa6d0d>wF9Bn&tl=xfHPEtOtnB(A8GSP1Y}Ew}uihB^ zzh)$G>|>c4T1m^Os9^;xbFj8KTps401I%FD6K*rxc*MhWmZ_&l+pTs%QK#)4R)@mQ zW7aW+Uq-E{L_trG6N*leQ=Ha720^<>mlDsCv*K0ABxo<`Rn$lNM5WaFNxz~2GT@N= z3b`WO7R3;I!ZF zC5eJwCYK$;b94FyWDxFabD1yfMXtWS zYOeB`*MYaHt0vc;KHVtY;4`gI9KAYQzPIBf&SPK4E8@OH<`!#YWlY>k6eKdEKi(ZH zALG%{gpuIK?3k0)N0RLj6VX z?0>_{!1&()mc2{x4pUYL7iw-9xW|gJ_m0cai|`rEZ;KYY%oeBZ?bw*M7`C_Bq7$hP xNoqqm`Z-4fc85M}i*Imd4AuWAmeYEW&R|q&+wFg1Jw4rav2Db7cg+6C{uc(EzbpU% literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/button-p.gif b/data/themes/blue/blue/button-p.gif new file mode 100644 index 0000000000000000000000000000000000000000..e819b1b9516f08eb362a06faab5cc73347204eb9 GIT binary patch literal 769 zcmZ?wbhEHbRA5kGIL5$`HuFqe*WQ$ACv9EZb#>G9_0#R#IunZ5-+T1t{g=?$YVS~DW>J3U(c4!af9%+M(ZsCe{)>-K-+g=V@{^HC!Gl*{?!WwOVqSFn z`R7~DJ{cHfT)g-8+T)MMFF(Eb;Juz+`susxj@^87@Y<_AmtN@Ur*A+1Twgz9)0wAh zPdr|6^pT-a*5ZQ?boJ8a?YlQ)*WKvWos+lU?%Q&+bHnwv)t6h=UTau>v3}*1s)c8( zmR+h?av^2PiIRoqOBY`(n03<5r9H0fbiw@dd2`OjH*Za-Jsq8YNZ%my|4;ym|3saO zQWHy3QxwWGOEMHfGEx=XJ$(ZhbQpjD6iE#1{~8#Ynp;}i+B=#VnL2yhnOP>Xuuhsf zZ8{rUD?110y!i_jF683o;pLmv%r79gcHR078`lY~Y!Vg`-MMS`p1r%oSX#s-jvPI9 z{KPTIgUwRX=Pz8mborvpnI>5|`P+By-n)NC;W`70;oO=OBw>+yaC=Pn*g zy`x=|HG)^gtlXs1J>4Mr)Ev#?7;bTk;#YT07C+~9(oNuy_1d!H;v#!?!H$DlR$g8n zFkg*Tq4_}1>WIx*cUP5aSxO}w?vnK`(>WxSad}nj>9DoDEq>;YPR;e+{w_v_qxi+$ z)7#g_@3RtkC*iYW!^6X^l>#pePc-z)Pf+%r=VNI!L7}BZLgLWQ&Cky-uoTuzT5@5c X_ljU)2d4)ei?44;J}oA~!C(ylK=;}E literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/check-hc.gif b/data/themes/blue/blue/check-hc.gif new file mode 100644 index 0000000000000000000000000000000000000000..b753aead9746368bf7c445ab48936afe6a0cc565 GIT binary patch literal 254 zcmZ?wbhEHb6k-r!XklP@|K(@-;)}PRf390`xpnQeo{cvc7#JpRyESX~-GvA4uQ>8> z{mIAM&OO_E>BW)juTI~2d+Fi(n@>MJc=hE!aX<%X9MC2q1_st<1%lzt& z3Utmld*7*8C!7~3!8SjDlE$%l>UWXkoV zvvCZ!bHtPV%%xwHgeUK3|HfNWt;g5G=g`{5)}hDW>(D!azrR;cK)_+z%$YL;^aSTG aShz?~PiWcl6)T1GnAWaazhSK+gEas(ZHGhv literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/check-hu.gif b/data/themes/blue/blue/check-hu.gif new file mode 100644 index 0000000000000000000000000000000000000000..74dbb799a2c3a59ce2dceba0a660ae5712acafc4 GIT binary patch literal 234 zcmZ?wbhEHb6k-r!XklPTn|bE_m!IW}FW!Fsxo*Yf*0tAqHr|-L?bfW_cNZSGzv9Tl z^(P;1JNInwr58u8zdC*A?WKqBZ$AC_;MEtPE@F@l0}z1hVqncrQ0PnX^U

    EgR^SYJywz_lai+jiZI&5K$p{`~GeuGCt!_Q%HS zi&|^q^v*n2YK!~-So~X+5^poFeM>8AyAofIeNR7MUyl+$zx~u1Gp6$^3Cx?nV4;AL R;L>HwR|u-DR#RlK1^@v}VL<=@ literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/check-nu.gif b/data/themes/blue/blue/check-nu.gif new file mode 100644 index 0000000000000000000000000000000000000000..6f360ffd621e45e90d84deb0de5b94ba803683a9 GIT binary patch literal 229 zcmZ?wbhEHb6k-r!XklQ`)lDm3e6eoD<<_;=dN$seyzSPk-FFurxWD4a!}TX0Z#(yF z@1++fYnFmSUy3JN#;SFV8hZ+KxF03l zudwTIdH>&`X@!H1R6py)#FIHzyo;Jkyw=LObgU^m?b;#qU_-?m0nKwSwnQmL?YRHp vhtrW2x8GN^tvLAp_kUg`zUG$JHa;c(uI`>*ekFm4lO|6QP@Ar%$Y2cs+*XAO literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/radio-hc.gif b/data/themes/blue/blue/radio-hc.gif new file mode 100644 index 0000000000000000000000000000000000000000..f7c21fb0c31f79f82417c7a3945c536697706663 GIT binary patch literal 1098 zcmd6m$x~AY0LC8_5tJ4|Tfu=*T809(B9=O)P#Q>~P;Eu5!~_NqLYBAWWf3qTWD!D! zG>usvd22e3N(v~#Aj;AtlaQC?4aBid4?Xn2p)=Z!M-QIb(*L5r`EK9u@Lj&I+FQ@@ zt`!1>zzYD7k~>2LCnHial9N;0LwHJtC*^n?Bw`T3LgZeO^1YTwg1#s;6GFV32)2P@ zo2W0WB%(?x0g)*=!AbF?0*`@M81k&a&LzY#k2>a5Kg?^~OB(En8V{l57D6W>W=Dpz zkZTpT&qEUoX!I(^oUqZQwo=2+z%aI|CBrJ3g(*(zOM){|$h`(n&nry60gXjGgbMrQ zJrYE!HmEJ`QDrOK10BQ%gIqp|P<^aH&fyMQ@Bu;d<}l zC>2yQahTqlnu0u=kbPc0?h#2)eoOm@mDNQ>#V5+jc=Zk9K8e<7H@JV&Q=3{krervX zNrN~Gdp2PEoJ{ZN>Xq^88*_7W^Yim-YEED76066oM)$0NS|4U&D8nJ%4a7dD7{4VN zgg@sCii?ZuK0SN2r(Zj6GkF8!^oEq+K!Sy_5bAsg-y{anv5Qy4=RRvV|82(*sM6cK z7W|>XAG+?3EB%~|+?Epw*cVZHAFI9(AV$|9GJ3Ulu=9#Y*xe@qRl{bx*>l%KJ=Xgp z8h=vhPs`~Yn20N9f*SXV)-kJ@oIwrKO5KFUV7oEpHM#Ga$rZzo;Sqma#iU>+Ehmx) zzNPYowAkv1>%pjVR)6cB!4)w17LDYp!M|t5)c%AFPr+1DNwO*;ti^vG!Pj-fnvPu8 z(?J~*8S%3S!zt)(kmOK`Rg+uS>6n&@tCWL1{%cXuP1+3%cabMd2@*>4}rma8Jsw{i-~FWl~kZdo0fwUTGc7Qz1f z5EKGzc0-r&q$y4H+fsr$Ic?Z2Q80; z7fN{Am%nnJ#M9CS-RoDPlBtWwzc2y&3hUa^rOnp7(q^pf64Bx~#?xn2dG57i)uPSG zDsSK$2IznJ$DfDiI_|W(tB3wNvhdwPS8flxFmqqHJit*c_kD}q>*mw>JG0QyrQWbH t<6s3`bZX%F{!`V`2V1q0K2KG50>1occVGI&&L_|K0*47WaO4nB|1U<3QJ4S# literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/radio-hu.gif b/data/themes/blue/blue/radio-hu.gif new file mode 100644 index 0000000000000000000000000000000000000000..a006630388efa1cc1bc541171e6d7109174631a6 GIT binary patch literal 626 zcmZ?wbhEHb6k-r!IL5$`HuFsStTUN&&SuO$lQrjT?!5Db3(prVypTWteD<7k#fvVK zFTGT~{BrHeD|IWc)U3EtvFuXG;)|KH&lW5=U%L2W&5Fw{Yp->0x-ntvt=`Qy+t**O zUv;H?>BXG6=W^zq>)Lo@`p&zH4nA0U?D48&kCz^PID60CzAd*J*Icbxez|MIjoEwe ztvmT-@8y@rZoWBj>+ON7uQs1~y70h*zOAg&VTUvED9bn^DwEoYz2*?X^J!}ZGLmosLctz34wbHnxd`|t0*^y2E{k1sxa|Mczm zr|-XCef)9j+2_O8U#~d&sDJCNqD2?7=bkHEaG__@&80^k-h27w{rBTH z-%j6oH)Y3d208*AkX@j-U|_%Az|hp((%RO{$kfHe+}^>$%Er#l#=+U!$~b|Gn}?T= zUqEo$j3yyr5m7O52?eM2Ny2`0|O^FueDE1?xY=l*&V`?@}g1-p#@zPOD{P_6u8G0 zRV}}~{rqz>kPgsjpihJt7}!=hG!%H~NOd-*eCiP4ndk5LK%zj1tF3vVgM>$Shoj=c z2m`S$m&68#F6lmY6{VR0Qm)WS(pI=USzYFDpSTEDTAVa~h-YZotF-rd_jaq`sZGpknC sH#WDn?{ey4Ehs7}tC;1In4FrPncd|a${ZdU9UJfVG$5|Z$&tYt0EJAb8vpZ>_(&lN7XP`>n1$NKBNn{Q6odaG{bmClVfrtG*q zXYalF`|npQz0|Vy+N5o_R~~z`_QaE_<(J#nU!S(~&eFpVH=cgF_1rTCDghmkIUv6< zux)c_DDcpc>TFE;)FHw%&)@NZM1c@jTk}E(36Jg$N5zE^24Y<txlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`KT+qR)Wnk16ovB4k_?5Aj8p}8Pu~Cr z#h)yUTnzRMIt)Mn@+<>e^nv@14k~S3OcO60&atwUzmVv>Hfp5|W7_GrdB#lL6+U9| zEK{~r&0WW#@?nRJouJFRAAja@y!`#YmXD9WrM0bvkBPUtr?=aMi+j@KDLgK0GiJ`3 O!DR0--__oc!5RQ9Jc3pL literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/sb-thumb.gif b/data/themes/blue/blue/sb-thumb.gif new file mode 100644 index 0000000000000000000000000000000000000000..d9bfc0a7bea85fdbc85a6f76047bb3d8e332ac0f GIT binary patch literal 316 zcmZ?wbhEHbtxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNh!2ARc9lqAK zB}Fr3w8So~m|~a{u|8t;fsZe$_Q$p}IO)wk`KY7nY#6`lhaEC@f&uS-{MoCt;m7}m nI&mh6*0%OmNp|U;-o73gcDcz@rpn1H*t5GSx+>W_GFSruoqKva literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/sb-vthumb-p.gif b/data/themes/blue/blue/sb-vthumb-p.gif new file mode 100644 index 0000000000000000000000000000000000000000..930d7fd9ffab76babca9f7b94db9b3c4f1ee9914 GIT binary patch literal 333 zcmZ?wbhEHbtxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`KT+qR)Wnk16ovB4k_?5Aj8p}8Pu~Cr z#h)yUTnzRMIt)Mn@+<>e;DPxGFC?T`+nX;e$goim| literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/sb-vthumb.gif b/data/themes/blue/blue/sb-vthumb.gif new file mode 100644 index 0000000000000000000000000000000000000000..060be5dd41c2783e36275958886606cdeaecedea GIT binary patch literal 308 zcmZ?wbhEHbtxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0mjI1uc-`PZmZl273k_1|R_WiGeNf!2O2`8d9=u z3)7o72B-+0SiI0cWcu0kl3g3PHu$aBa&fQG;pk1`Yh^Z0E7SlW|_=eZ^A7tW-l;lV13J9gSBs;&pt+pUUthqM2B#i z$$F;JbfM3Mt=29sXOFbmn!DYk!r-sT<1jF2y3pq|H*&<+>M}HN&))7dHgveX(b?tk zHaK@bKy>8n^#A|>A^8LW3IHDfEC2ui00{sN000Fu;3tfvAVv~pVVgIiD(edH+6qoB kJ9%o)y4xfO^vMK6^Z0E7SlW|_=eZ^A7tW-l;lV13J9gSBs;&pt+pUUthqM2B#i z$$F;JbfM3Mt=29sXOFbmn!DYk!r-sT<1jF2y3pq|H*&<+>M}HN&))7dHgveX(b?tk zHaK@bKy>8n^#A|>A^8LW3IHDfEC2ui00{sN000Fu;3tfvAbJ~SQBpLbD(edH+6qoB kJ9KJCJl(AqYfXs1mrr&Sx;~c+$`k!qq13DPq74B6JE?|FNB{r; literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/vslider-p.gif b/data/themes/blue/blue/vslider-p.gif new file mode 100644 index 0000000000000000000000000000000000000000..bc37b31c3de9234f5b47fb99ff828e808da9f607 GIT binary patch literal 183 zcmV;o07(BwNk%w1VGaNZ0E7SlW|_=eZ^A7tW-l;lV13J9gSBs;&pt+pUUthqM2B#i z$$F;JbfM3Mt=29sXOFbmn!DYk!r-sT<1jF2y3pq|H*&<+>M}HN&))7dHgveX(b?tk zHaK@bKy>8n^#A|>A^8LW3IHDfEC2ui01f~N000Fv;3tgEXbN8{cx>xl>L$-LEMj=B ld$3^rz~F`_pcs!xo=C!MI&Ff8bV{{}NTrEDoBD(R06SCxQ5FCI literal 0 HcmV?d00001 diff --git a/data/themes/blue/blue/vslider.gif b/data/themes/blue/blue/vslider.gif new file mode 100644 index 0000000000000000000000000000000000000000..d3745c7f6285242f01e5107ca992176c2e304e0a GIT binary patch literal 283 zcmZ?wbhEHbtxlk zOC<}>x30aWrsv2cb6P`u>Ry@1A~lR7oMA#7ah6&%E+YP{JnQ3W+glJUcCAA zqnSmyy+g^9H(&2PdXrGRUSB`m*0r61HbC(w3nLeUJ%bL&c#xkM*enjrPk2$lq2_)t zU$etv{srz}r?pW_ow~|SfAwIUwxMFrM=paGTW)FJ*>S&M%>n22w>LUHDp()G#>ij| E023ctd;kCd literal 0 HcmV?d00001 diff --git a/data/themes/blue/pkgIndex.tcl b/data/themes/blue/pkgIndex.tcl new file mode 100644 index 00000000..4facac70 --- /dev/null +++ b/data/themes/blue/pkgIndex.tcl @@ -0,0 +1,6 @@ +# Package index for tile demo pixmap themes. + +if {[file isdirectory [file join $dir blue]]} { + package ifneeded tile::theme::blue 0.7 \ + [list source [file join $dir blue.tcl]] +} diff --git a/pysollib/game.py b/pysollib/game.py index fb4719f7..5cf48df3 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1018,7 +1018,7 @@ class Game: return if self.app.debug and not self.top.winfo_ismapped(): return - #self.top.busyUpdate() + ##self.top.busyUpdate() ##self.canvas.after(200) self.canvas.update_idletasks() old_a = self.app.opt.animations diff --git a/pysollib/tile/soundoptionsdialog.py b/pysollib/tile/soundoptionsdialog.py index cc1da11a..bba93f5f 100644 --- a/pysollib/tile/soundoptionsdialog.py +++ b/pysollib/tile/soundoptionsdialog.py @@ -155,7 +155,7 @@ class SoundOptionsDialog(MfxDialog): for n, t, v in self.samples: v.set(app.opt.sound_samples[n]) w = Tkinter.Checkbutton(frame, text=t, anchor='w', variable=v) - w.grid(row=row, column=col, sticky='ew') + w.grid(row=row, column=col, sticky='ew', padx=3, pady=1) if col == 1: col = 0 row += 1 diff --git a/scripts/build.bat b/scripts/build.bat index cc9ed4cf..084532b7 100755 --- a/scripts/build.bat +++ b/scripts/build.bat @@ -7,9 +7,8 @@ cp -r locale dist cp fc-solve.exe dist cp smpeg.dll ogg.dll vorbis.dll vorbisfile.dll dist python setup.py py2exe +cp -r d:\Python\tcl\tile0.7.8 dist\tcl cp -r data\music dist\data -rem rm -rf dist\tcl\tcl8.4\encoding -rem rm -rf dist\tcl\tk8.4\demos dist\tcl\tk8.4\images python scripts\create_iss.py "d:\Program Files\Inno Setup 5\ISCC.exe" setup.iss pause diff --git a/setup.py b/setup.py index 2c4c6475..6acd58d6 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,8 @@ datas = [ 'sound', 'tiles', 'toolbar', + 'themes', + 'tcl', ] for s in file('MANIFEST.in'): if s.startswith('graft data/cardset-'): From ea95db220023952d13ec1dc678dfb87c65fae014 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 6 Nov 2006 22:10:44 +0000 Subject: [PATCH 085/266] + 1 new game * misc improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@87 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/games.pot | 8 +- po/pysol.pot | 162 +++++++++++++++++++------------------- po/ru_games.po | 12 ++- po/ru_pysol.po | 162 +++++++++++++++++++------------------- pysollib/actions.py | 1 + pysollib/app.py | 12 --- pysollib/game.py | 3 +- pysollib/games/spider.py | 14 ++++ pysollib/mfxutil.py | 21 ----- pysollib/resource.py | 50 ------------ pysollib/tile/tkutil.py | 14 ++-- pysollib/tile/tkwidget.py | 6 +- pysollib/tk/tkwidget.py | 5 -- 13 files changed, 198 insertions(+), 272 deletions(-) diff --git a/po/games.pot b/po/games.pot index c4f8b9b8..f3afc809 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Oct 31 19:32:40 2006\n" +"POT-Creation-Date: Mon Nov 6 09:46:50 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2742,6 +2742,9 @@ msgstr "" msgid "Quadruple Alliance" msgstr "" +msgid "Quads" +msgstr "" + msgid "Quartets" msgstr "" @@ -3510,9 +3513,6 @@ msgstr "" msgid "Troika" msgstr "" -msgid "Troika +" -msgstr "" - msgid "Trusty Twelve" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index 0e605b22..6d8c93bd 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Tue Oct 31 19:33:33 2006\n" +"POT-Creation-Date: Mon Nov 6 09:47:42 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-10-31 19:33+0300\n" +"POT-Creation-Date: 2006-11-06 09:47+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -70,7 +70,7 @@ msgstr "" #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 #: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865 -#: pysollib/main.py:374 pysollib/main.py:382 pysollib/tk/colorsdialog.py:122 +#: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -81,8 +81,8 @@ msgstr "" #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:512 #: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594 #: pysollib/tk/tkstats.py:636 pysollib/tk/tkstats.py:708 -#: pysollib/tk/tkstats.py:792 pysollib/tk/tkwidget.py:160 -#: pysollib/tk/tkwidget.py:325 +#: pysollib/tk/tkstats.py:792 pysollib/tk/tkwidget.py:159 +#: pysollib/tk/tkwidget.py:324 msgid "&OK" msgstr "" @@ -95,7 +95,7 @@ msgstr "" #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:325 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:324 msgid "&Cancel" msgstr "" @@ -1227,7 +1227,7 @@ msgstr "" msgid " Help" msgstr "" -#: pysollib/main.py:67 pysollib/main.py:282 +#: pysollib/main.py:67 pysollib/main.py:284 msgid " installation error" msgstr "" @@ -1241,7 +1241,7 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:75 pysollib/main.py:290 pysollib/tk/menubar.py:382 +#: pysollib/main.py:75 pysollib/main.py:292 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "" @@ -1281,7 +1281,7 @@ msgid "" "try %s --help for more information" msgstr "" -#: pysollib/main.py:283 +#: pysollib/main.py:285 msgid "" "\n" "No games were found !!!\n" @@ -1292,293 +1292,293 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:369 pysollib/main.py:377 +#: pysollib/main.py:371 pysollib/main.py:379 msgid " installation problem" msgstr "" -#: pysollib/main.py:370 +#: pysollib/main.py:372 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:378 +#: pysollib/main.py:380 msgid "" "The pysolsoundserver module was not found.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:385 +#: pysollib/main.py:387 msgid "Welcome to " msgstr "" -#: pysollib/resource.py:242 +#: pysollib/resource.py:192 msgid "French type (52 cards)" msgstr "" -#: pysollib/resource.py:243 +#: pysollib/resource.py:193 msgid "Hanafuda type (48 cards)" msgstr "" -#: pysollib/resource.py:244 +#: pysollib/resource.py:194 msgid "Tarock type (78 cards)" msgstr "" -#: pysollib/resource.py:245 +#: pysollib/resource.py:195 msgid "Mahjongg type (42 tiles)" msgstr "" -#: pysollib/resource.py:246 +#: pysollib/resource.py:196 msgid "Hex A Deck type (68 cards)" msgstr "" -#: pysollib/resource.py:247 +#: pysollib/resource.py:197 msgid "Mughal Ganjifa type (96 cards)" msgstr "" -#: pysollib/resource.py:248 +#: pysollib/resource.py:198 msgid "Navagraha Ganjifa type (108 cards)" msgstr "" -#: pysollib/resource.py:249 +#: pysollib/resource.py:199 msgid "Dashavatara Ganjifa type (120 cards)" msgstr "" -#: pysollib/resource.py:250 +#: pysollib/resource.py:200 msgid "Trumps only type (variable cards)" msgstr "" -#: pysollib/resource.py:254 +#: pysollib/resource.py:204 msgid "French" msgstr "" -#: pysollib/resource.py:255 pysollib/resource.py:279 +#: pysollib/resource.py:205 pysollib/resource.py:229 msgid "Hanafuda" msgstr "" -#: pysollib/resource.py:256 pysollib/resource.py:295 +#: pysollib/resource.py:206 pysollib/resource.py:245 msgid "Tarock" msgstr "" -#: pysollib/resource.py:257 pysollib/resource.py:282 +#: pysollib/resource.py:207 pysollib/resource.py:232 msgid "Mahjongg" msgstr "" -#: pysollib/resource.py:258 pysollib/resource.py:280 +#: pysollib/resource.py:208 pysollib/resource.py:230 msgid "Hex A Deck" msgstr "" -#: pysollib/resource.py:259 +#: pysollib/resource.py:209 msgid "Mughal Ganjifa" msgstr "" -#: pysollib/resource.py:260 +#: pysollib/resource.py:210 msgid "Navagraha Ganjifa" msgstr "" -#: pysollib/resource.py:261 +#: pysollib/resource.py:211 msgid "Dashavatara Ganjifa" msgstr "" -#: pysollib/resource.py:262 +#: pysollib/resource.py:212 msgid "Trumps only" msgstr "" -#: pysollib/resource.py:267 +#: pysollib/resource.py:217 msgid "Adult" msgstr "" -#: pysollib/resource.py:268 +#: pysollib/resource.py:218 msgid "Animals" msgstr "" -#: pysollib/resource.py:269 +#: pysollib/resource.py:219 msgid "Anime" msgstr "" -#: pysollib/resource.py:270 +#: pysollib/resource.py:220 msgid "Art" msgstr "" -#: pysollib/resource.py:271 +#: pysollib/resource.py:221 msgid "Cartoons" msgstr "" -#: pysollib/resource.py:272 +#: pysollib/resource.py:222 msgid "Children" msgstr "" -#: pysollib/resource.py:273 +#: pysollib/resource.py:223 msgid "Classic look" msgstr "" -#: pysollib/resource.py:274 +#: pysollib/resource.py:224 msgid "Collectors" msgstr "" -#: pysollib/resource.py:275 +#: pysollib/resource.py:225 msgid "Computers" msgstr "" -#: pysollib/resource.py:276 +#: pysollib/resource.py:226 msgid "Engines" msgstr "" -#: pysollib/resource.py:277 +#: pysollib/resource.py:227 msgid "Fantasy" msgstr "" -#: pysollib/resource.py:278 +#: pysollib/resource.py:228 msgid "Ganjifa" msgstr "" -#: pysollib/resource.py:281 +#: pysollib/resource.py:231 msgid "Holiday" msgstr "" -#: pysollib/resource.py:283 +#: pysollib/resource.py:233 msgid "Movies" msgstr "" -#: pysollib/resource.py:284 +#: pysollib/resource.py:234 msgid "Matrix" msgstr "" -#: pysollib/resource.py:285 +#: pysollib/resource.py:235 msgid "Music" msgstr "" -#: pysollib/resource.py:286 +#: pysollib/resource.py:236 msgid "Nature" msgstr "" -#: pysollib/resource.py:287 +#: pysollib/resource.py:237 msgid "Operating Systems" msgstr "" -#: pysollib/resource.py:288 +#: pysollib/resource.py:238 msgid "People" msgstr "" -#: pysollib/resource.py:289 +#: pysollib/resource.py:239 msgid "Places" msgstr "" -#: pysollib/resource.py:290 +#: pysollib/resource.py:240 msgid "Plain" msgstr "" -#: pysollib/resource.py:291 +#: pysollib/resource.py:241 msgid "Products" msgstr "" -#: pysollib/resource.py:292 +#: pysollib/resource.py:242 msgid "Round cardsets" msgstr "" -#: pysollib/resource.py:293 +#: pysollib/resource.py:243 msgid "Science Fiction" msgstr "" -#: pysollib/resource.py:294 +#: pysollib/resource.py:244 msgid "Sports" msgstr "" -#: pysollib/resource.py:296 +#: pysollib/resource.py:246 msgid "Vehicels" msgstr "" -#: pysollib/resource.py:297 +#: pysollib/resource.py:247 msgid "Video Games" msgstr "" -#: pysollib/resource.py:302 +#: pysollib/resource.py:252 msgid "Australia" msgstr "" -#: pysollib/resource.py:303 +#: pysollib/resource.py:253 msgid "Austria" msgstr "" -#: pysollib/resource.py:304 +#: pysollib/resource.py:254 msgid "Belgium" msgstr "" -#: pysollib/resource.py:305 +#: pysollib/resource.py:255 msgid "Canada" msgstr "" -#: pysollib/resource.py:306 +#: pysollib/resource.py:256 msgid "China" msgstr "" -#: pysollib/resource.py:307 +#: pysollib/resource.py:257 msgid "Czech Republic" msgstr "" -#: pysollib/resource.py:308 +#: pysollib/resource.py:258 msgid "Denmark" msgstr "" -#: pysollib/resource.py:309 +#: pysollib/resource.py:259 msgid "England" msgstr "" -#: pysollib/resource.py:310 +#: pysollib/resource.py:260 msgid "France" msgstr "" -#: pysollib/resource.py:311 +#: pysollib/resource.py:261 msgid "Germany" msgstr "" -#: pysollib/resource.py:312 +#: pysollib/resource.py:262 msgid "Great Britain" msgstr "" -#: pysollib/resource.py:313 +#: pysollib/resource.py:263 msgid "Hungary" msgstr "" -#: pysollib/resource.py:314 +#: pysollib/resource.py:264 msgid "India" msgstr "" -#: pysollib/resource.py:315 +#: pysollib/resource.py:265 msgid "Italy" msgstr "" -#: pysollib/resource.py:316 +#: pysollib/resource.py:266 msgid "Japan" msgstr "" -#: pysollib/resource.py:317 +#: pysollib/resource.py:267 msgid "Netherlands" msgstr "" -#: pysollib/resource.py:318 +#: pysollib/resource.py:268 msgid "Russia" msgstr "" -#: pysollib/resource.py:319 +#: pysollib/resource.py:269 msgid "Spain" msgstr "" -#: pysollib/resource.py:320 +#: pysollib/resource.py:270 msgid "Sweden" msgstr "" -#: pysollib/resource.py:321 +#: pysollib/resource.py:271 msgid "Switzerland" msgstr "" -#: pysollib/resource.py:322 +#: pysollib/resource.py:272 msgid "USA" msgstr "" -#: pysollib/settings.py:55 data/glade-translations:29 +#: pysollib/settings.py:58 data/glade-translations:29 msgid "Top 10" msgstr "" @@ -2472,7 +2472,7 @@ msgid "" msgstr "" #: pysollib/tk/playeroptionsdialog.py:120 -msgid "Select..." +msgid "Choose..." msgstr "" #: pysollib/tk/playeroptionsdialog.py:124 diff --git a/po/ru_games.po b/po/ru_games.po index 0e9778bb..a7fa332a 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Oct 31 19:32:40 2006\n" +"POT-Creation-Date: Mon Nov 6 09:46:50 2006\n" "PO-Revision-Date: 2006-10-31 19:57+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" @@ -2790,6 +2790,10 @@ msgstr "Четырёхугольник" msgid "Quadruple Alliance" msgstr "Четырёхсторонний альянс" +#, fuzzy +msgid "Quads" +msgstr "Четвёрка" + msgid "Quartets" msgstr "Квартеты" @@ -3577,9 +3581,6 @@ msgstr "Тройной Юкон" msgid "Troika" msgstr "Тройка" -msgid "Troika +" -msgstr "Тройка +" - msgid "Trusty Twelve" msgstr "Верные двенадцать" @@ -3781,3 +3782,6 @@ msgstr "" msgid "Zodiac" msgstr "Зодиак" + +#~ msgid "Troika +" +#~ msgstr "Тройка +" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index f6e028e3..f96eae84 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Oct 31 19:33:33 2006\n" -"PO-Revision-Date: 2006-10-31 19:57+0300\n" +"POT-Creation-Date: Mon Nov 6 09:47:42 2006\n" +"PO-Revision-Date: 2006-11-06 09:53+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -55,7 +55,7 @@ msgstr "&Следующий номер" #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 #: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865 -#: pysollib/main.py:374 pysollib/main.py:382 pysollib/tk/colorsdialog.py:122 +#: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -66,8 +66,8 @@ msgstr "&Следующий номер" #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:512 #: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594 #: pysollib/tk/tkstats.py:636 pysollib/tk/tkstats.py:708 -#: pysollib/tk/tkstats.py:792 pysollib/tk/tkwidget.py:160 -#: pysollib/tk/tkwidget.py:325 +#: pysollib/tk/tkstats.py:792 pysollib/tk/tkwidget.py:159 +#: pysollib/tk/tkwidget.py:324 msgid "&OK" msgstr "&ОК" @@ -80,7 +80,7 @@ msgstr "&ОК" #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 #: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:325 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:324 msgid "&Cancel" msgstr "От&мена" @@ -1331,7 +1331,7 @@ msgstr "Не найден файл помощи\n" msgid " Help" msgstr " Помощь" -#: pysollib/main.py:67 pysollib/main.py:282 +#: pysollib/main.py:67 pysollib/main.py:284 msgid " installation error" msgstr " проблема с установкой" @@ -1345,7 +1345,7 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:75 pysollib/main.py:290 pysollib/tk/menubar.py:382 +#: pysollib/main.py:75 pysollib/main.py:292 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "В&ыход" @@ -1405,7 +1405,7 @@ msgstr "" "%s: неправильное имя файла\n" "попробуйте %s --help для получения более подробной информации" -#: pysollib/main.py:283 +#: pysollib/main.py:285 msgid "" "\n" "No games were found !!!\n" @@ -1416,18 +1416,18 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:369 pysollib/main.py:377 +#: pysollib/main.py:371 pysollib/main.py:379 msgid " installation problem" msgstr "" -#: pysollib/main.py:370 +#: pysollib/main.py:372 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:378 +#: pysollib/main.py:380 msgid "" "The pysolsoundserver module was not found.\n" "\n" @@ -1437,275 +1437,275 @@ msgstr "" "\n" "Звук и фоновая музыка будут недоступны" -#: pysollib/main.py:385 +#: pysollib/main.py:387 msgid "Welcome to " msgstr "Добро пожаловать в " -#: pysollib/resource.py:242 +#: pysollib/resource.py:192 msgid "French type (52 cards)" msgstr "Классические (52 карты)" -#: pysollib/resource.py:243 +#: pysollib/resource.py:193 msgid "Hanafuda type (48 cards)" msgstr "Ханафуда (48 карт)" -#: pysollib/resource.py:244 +#: pysollib/resource.py:194 msgid "Tarock type (78 cards)" msgstr "Таро (78 карт)" -#: pysollib/resource.py:245 +#: pysollib/resource.py:195 msgid "Mahjongg type (42 tiles)" msgstr "Маджонг (42 фишки)" -#: pysollib/resource.py:246 +#: pysollib/resource.py:196 msgid "Hex A Deck type (68 cards)" msgstr "Hex A Deck (68 карт)" -#: pysollib/resource.py:247 +#: pysollib/resource.py:197 msgid "Mughal Ganjifa type (96 cards)" msgstr "Мугал Ганджифа (96 карт)" -#: pysollib/resource.py:248 +#: pysollib/resource.py:198 msgid "Navagraha Ganjifa type (108 cards)" msgstr "Наваграха Ганджифа (108 карт)" -#: pysollib/resource.py:249 +#: pysollib/resource.py:199 msgid "Dashavatara Ganjifa type (120 cards)" msgstr "Дашаватара Ганджифа (120 карт)" -#: pysollib/resource.py:250 +#: pysollib/resource.py:200 msgid "Trumps only type (variable cards)" msgstr "Без мастей (переменное количество карт)" -#: pysollib/resource.py:254 +#: pysollib/resource.py:204 msgid "French" msgstr "Классические" -#: pysollib/resource.py:255 pysollib/resource.py:279 +#: pysollib/resource.py:205 pysollib/resource.py:229 msgid "Hanafuda" msgstr "Ханафуда" -#: pysollib/resource.py:256 pysollib/resource.py:295 +#: pysollib/resource.py:206 pysollib/resource.py:245 msgid "Tarock" msgstr "Таро" -#: pysollib/resource.py:257 pysollib/resource.py:282 +#: pysollib/resource.py:207 pysollib/resource.py:232 msgid "Mahjongg" msgstr "Маджонг" -#: pysollib/resource.py:258 pysollib/resource.py:280 +#: pysollib/resource.py:208 pysollib/resource.py:230 msgid "Hex A Deck" msgstr "Hex A Deck" -#: pysollib/resource.py:259 +#: pysollib/resource.py:209 msgid "Mughal Ganjifa" msgstr "Мугал Ганджифа" -#: pysollib/resource.py:260 +#: pysollib/resource.py:210 msgid "Navagraha Ganjifa" msgstr "Наваграха Ганджифа" -#: pysollib/resource.py:261 +#: pysollib/resource.py:211 msgid "Dashavatara Ganjifa" msgstr "Дашаватара Ганджифа" -#: pysollib/resource.py:262 +#: pysollib/resource.py:212 msgid "Trumps only" msgstr "Без мастей" -#: pysollib/resource.py:267 +#: pysollib/resource.py:217 msgid "Adult" msgstr "Для взрослых" -#: pysollib/resource.py:268 +#: pysollib/resource.py:218 msgid "Animals" msgstr "Животные" -#: pysollib/resource.py:269 +#: pysollib/resource.py:219 msgid "Anime" msgstr "Мультфильмы" -#: pysollib/resource.py:270 +#: pysollib/resource.py:220 msgid "Art" msgstr "Искусство" -#: pysollib/resource.py:271 +#: pysollib/resource.py:221 msgid "Cartoons" msgstr "Комиксы" -#: pysollib/resource.py:272 +#: pysollib/resource.py:222 msgid "Children" msgstr "Дети" -#: pysollib/resource.py:273 +#: pysollib/resource.py:223 msgid "Classic look" msgstr "Классический вид" -#: pysollib/resource.py:274 +#: pysollib/resource.py:224 msgid "Collectors" msgstr "Коллекционные" -#: pysollib/resource.py:275 +#: pysollib/resource.py:225 msgid "Computers" msgstr "Компьютеры" -#: pysollib/resource.py:276 +#: pysollib/resource.py:226 msgid "Engines" msgstr "Машины" -#: pysollib/resource.py:277 +#: pysollib/resource.py:227 msgid "Fantasy" msgstr "Фентези" -#: pysollib/resource.py:278 +#: pysollib/resource.py:228 msgid "Ganjifa" msgstr "Ганджифа" -#: pysollib/resource.py:281 +#: pysollib/resource.py:231 msgid "Holiday" msgstr "Праздники" -#: pysollib/resource.py:283 +#: pysollib/resource.py:233 msgid "Movies" msgstr "Фильмы" -#: pysollib/resource.py:284 +#: pysollib/resource.py:234 msgid "Matrix" msgstr "Мозаика" -#: pysollib/resource.py:285 +#: pysollib/resource.py:235 msgid "Music" msgstr "Музыка" -#: pysollib/resource.py:286 +#: pysollib/resource.py:236 msgid "Nature" msgstr "Природа" -#: pysollib/resource.py:287 +#: pysollib/resource.py:237 msgid "Operating Systems" msgstr "Операционные системы" -#: pysollib/resource.py:288 +#: pysollib/resource.py:238 msgid "People" msgstr "Люди" -#: pysollib/resource.py:289 +#: pysollib/resource.py:239 msgid "Places" msgstr "Дома" -#: pysollib/resource.py:290 +#: pysollib/resource.py:240 msgid "Plain" msgstr "Простые" -#: pysollib/resource.py:291 +#: pysollib/resource.py:241 msgid "Products" msgstr "Продукты" -#: pysollib/resource.py:292 +#: pysollib/resource.py:242 msgid "Round cardsets" msgstr "Закруглённые" -#: pysollib/resource.py:293 +#: pysollib/resource.py:243 msgid "Science Fiction" msgstr "Научная фантастика" -#: pysollib/resource.py:294 +#: pysollib/resource.py:244 msgid "Sports" msgstr "Спорт" -#: pysollib/resource.py:296 +#: pysollib/resource.py:246 msgid "Vehicels" msgstr "Транспортные средства" -#: pysollib/resource.py:297 +#: pysollib/resource.py:247 msgid "Video Games" msgstr "Видеоигры" -#: pysollib/resource.py:302 +#: pysollib/resource.py:252 msgid "Australia" msgstr "Австралия" -#: pysollib/resource.py:303 +#: pysollib/resource.py:253 msgid "Austria" msgstr "Австрия" -#: pysollib/resource.py:304 +#: pysollib/resource.py:254 msgid "Belgium" msgstr "Бельгия" -#: pysollib/resource.py:305 +#: pysollib/resource.py:255 msgid "Canada" msgstr "Канада" -#: pysollib/resource.py:306 +#: pysollib/resource.py:256 msgid "China" msgstr "Китай" -#: pysollib/resource.py:307 +#: pysollib/resource.py:257 msgid "Czech Republic" msgstr "Чехия" -#: pysollib/resource.py:308 +#: pysollib/resource.py:258 msgid "Denmark" msgstr "Дания" -#: pysollib/resource.py:309 +#: pysollib/resource.py:259 msgid "England" msgstr "Англия" -#: pysollib/resource.py:310 +#: pysollib/resource.py:260 msgid "France" msgstr "Франция" -#: pysollib/resource.py:311 +#: pysollib/resource.py:261 msgid "Germany" msgstr "Германия" -#: pysollib/resource.py:312 +#: pysollib/resource.py:262 msgid "Great Britain" msgstr "Великобритания" -#: pysollib/resource.py:313 +#: pysollib/resource.py:263 msgid "Hungary" msgstr "Венгрия" -#: pysollib/resource.py:314 +#: pysollib/resource.py:264 msgid "India" msgstr "Индия" -#: pysollib/resource.py:315 +#: pysollib/resource.py:265 msgid "Italy" msgstr "Италия" -#: pysollib/resource.py:316 +#: pysollib/resource.py:266 msgid "Japan" msgstr "Япония" -#: pysollib/resource.py:317 +#: pysollib/resource.py:267 msgid "Netherlands" msgstr "Голландия" -#: pysollib/resource.py:318 +#: pysollib/resource.py:268 msgid "Russia" msgstr "Россия" -#: pysollib/resource.py:319 +#: pysollib/resource.py:269 msgid "Spain" msgstr "Испания" -#: pysollib/resource.py:320 +#: pysollib/resource.py:270 msgid "Sweden" msgstr "Швеция" -#: pysollib/resource.py:321 +#: pysollib/resource.py:271 msgid "Switzerland" msgstr "Швейцария" -#: pysollib/resource.py:322 +#: pysollib/resource.py:272 msgid "USA" msgstr "США" -#: pysollib/settings.py:55 data/glade-translations:29 +#: pysollib/settings.py:58 data/glade-translations:29 msgid "Top 10" msgstr "Top 10" @@ -2622,7 +2622,7 @@ msgstr "" "Пожалуйста введите Ваше имя" #: pysollib/tk/playeroptionsdialog.py:120 -msgid "Select..." +msgid "Choose..." msgstr "Выбрать..." #: pysollib/tk/playeroptionsdialog.py:124 diff --git a/pysollib/actions.py b/pysollib/actions.py index 54f85814..65f74742 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -421,6 +421,7 @@ class PysolMenubarActions: def mRedoAll(self, *args): if self._cancelDrag(): return if self.menustate.redo: + self.app.top.busyUpdate() self.game.playSample("redo", loop=1) while self.game.moves.index < len(self.game.moves.history): self.game.redo() diff --git a/pysollib/app.py b/pysollib/app.py index c476c4a8..b13d0630 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -1505,10 +1505,6 @@ Please select a %s type %s. dirs = manager.getSearchDirs(self, ("cardsets", ""), "PYSOL_CARDSETS") if self.debug: dirs = dirs + manager.getSearchDirs(self, "cardsets-*") - try: - dirs = dirs + manager.getRegistryDirs(self, ("PySol_Cardsets", "Cardsets")) - except: - pass ##print dirs found, t = [], {} for dir in dirs: @@ -1564,10 +1560,6 @@ Please select a %s type %s. dirs = manager.getSearchDirs(self, ("tiles-*", os.path.join("tiles", 'stretch')), "PYSOL_TILES") - try: - dirs = dirs + manager.getRegistryDirs(self, "Tiles") - except: - pass ##print dirs s = "((\\" + ")|(\\".join(IMAGE_EXTENSIONS) + "))$" ext_re = re.compile(s, re.I) @@ -1675,10 +1667,6 @@ Please select a %s type %s. manager = self.music_manager # find all available music songs dirs = manager.getSearchDirs(self, "music-*", "PYSOL_MUSIC") - try: - dirs = dirs + manager.getRegistryDirs(self, "Music") - except: - pass ##print dirs ext_re = re.compile(self.audio.EXTENTIONS) self.initResource(manager, dirs, ext_re, Music) diff --git a/pysollib/game.py b/pysollib/game.py index 5cf48df3..17ffc6e9 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1018,8 +1018,7 @@ class Game: return if self.app.debug and not self.top.winfo_ismapped(): return - ##self.top.busyUpdate() - ##self.canvas.after(200) + self.top.busyUpdate() self.canvas.update_idletasks() old_a = self.app.opt.animations if old_a == 0: diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 385fba7c..a1728d6b 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -864,6 +864,7 @@ class Applegate(Game): # // Big Divorce # // Spider (4 decks) # // Very Big Divorce +# // Chinese Spider # ************************************************************************/ class BigSpider(Spider): @@ -939,6 +940,16 @@ class GroundForADivorce4Decks(Spider4Decks): shallHighlightMatch = Game._shallHighlightMatch_RKW +class ChineseSpider(Spider): + def createGame(self): + Spider.createGame(self, rows=12, playcards=28) + def startGame(self): + for l in range(5): + self.s.talon.dealRow(frames=0, flip=0) + self.startDealSample() + self.s.talon.dealRow() + + # /*********************************************************************** # // York # ************************************************************************/ @@ -1179,4 +1190,7 @@ registerGame(GameInfo(570, LongTail, "Long Tail", GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(571, ShortTail, "Short Tail", GI.GT_SPIDER | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(670, ChineseSpider, "Chinese Spider", + GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL, + suits=(0, 1, 2),)) diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py index 94316078..50d1f670 100644 --- a/pysollib/mfxutil.py +++ b/pysollib/mfxutil.py @@ -52,14 +52,6 @@ if os.name == "mac": # macfs module is deprecated, consider using Carbon.File or Carbon.Folder import macfs, MACFS -win32api = shell = shellcon = None -if sys.platform.startswith('win'): - try: - import win32api - #from win32com.shell import shell, shellcon - except ImportError: - pass - # /*********************************************************************** # // exceptions # ************************************************************************/ @@ -183,24 +175,11 @@ if os.name == "posix": def win32_getusername(): user = os.environ.get('USERNAME','').strip() - try: - user = win32api.GetUserName().strip() - except AttributeError: - pass return user def win32_getprefdir(package): hd = win32_gethomedir() return os.path.join(hd, 'PySolFC') -## dname = os.path.expanduser("~\\.pysol") -## if not os.path.isdir(dname): -## try: -## dname = os.path.join( -## shell.SHGetFolderPath(0, shellcon.CSIDL_APPDATA, 0, 0), -## package, package) -## except AttributeError: -## pass -## return os.path.abspath(dname) def win32_gethomedir(): # %USERPROFILE%, %APPDATA% diff --git a/pysollib/resource.py b/pysollib/resource.py index 12935e33..1e87eb43 100644 --- a/pysollib/resource.py +++ b/pysollib/resource.py @@ -39,7 +39,6 @@ import sys, os, glob, operator, types #import traceback # PySol imports -from mfxutil import win32api from mfxutil import Struct, KwStruct, EnvError, latin1_to_ascii from settings import PACKAGE, VERSION @@ -134,28 +133,6 @@ class ResourceManager: except EnvError, ex: pass - def _addRegistryKey(self, result, hkey, subkey): - k = None - try: - k = win32api.RegOpenKeyEx(hkey, subkey, 0, KEY_READ) - nsubkeys, nvalues, t = win32api.RegQueryInfoKey(k) - for i in range(nvalues): - try: - key, value, vtype = win32api.RegEnumValue(k, i) - except: - break - if not key or not value: - continue - if vtype == 1 and type(value) is types.StringType: - for d in value.split(os.pathsep): - self._addDir(result, d.strip()) - finally: - if k is not None: - try: - win32api.RegCloseKey(k) - except: - pass - def getSearchDirs(self, app, search, env=None): if type(search) is types.StringType: search = (search,) @@ -186,33 +163,6 @@ class ResourceManager: print "getSearchDirs", env, search, "->", result return result - def getRegistryDirs(self, app, categories): - if not win32api: - return [] - # - vendors = ("Markus Oberhumer", "",) - versions = (VERSION, "",) - if type(categories) is types.StringType: - categories = (categories,) - # - result = [] - for version in versions: - for vendor in vendors: - for category in categories: - t = ("Software", vendor, PACKAGE, version, category) - t = filter(None, t) - subkey = '\\'.join(t) - ##print "getRegistryDirs subkey", subkey - for hkey in (HKEY_CURRENT_USER, HKEY_LOCAL_MACHINE): - try: - self._addRegistryKey(result, hkey, subkey) - except: - pass - # - if app.debug >= 5: - print "getRegistryDirs", category, "->", result - return result - # /*********************************************************************** # // Cardset diff --git a/pysollib/tile/tkutil.py b/pysollib/tile/tkutil.py index 4d87b4b5..2bd4592c 100644 --- a/pysollib/tile/tkutil.py +++ b/pysollib/tile/tkutil.py @@ -426,13 +426,13 @@ def load_theme(app, top, theme): if os.path.isdir(d): top.tk.call('lappend', 'auto_path', d) for t in os.listdir(d): - #top.tk.call('tile::setTheme', t) - try: - top.tk.call('package', 'require', 'tile::theme::'+t) - ##print 'load theme:', t - except: - traceback.print_exc() - pass + if os.path.exists(os.path.join(d, t, 'pkgIndex.tcl')): + try: + top.tk.call('package', 'require', 'tile::theme::'+t) + #print 'load theme:', t + except: + traceback.print_exc() + pass # set theme all_themes = top.tk.call('style', 'theme', 'names') if theme not in all_themes: diff --git a/pysollib/tile/tkwidget.py b/pysollib/tile/tkwidget.py index 83b55a31..44e8d372 100644 --- a/pysollib/tile/tkwidget.py +++ b/pysollib/tile/tkwidget.py @@ -50,7 +50,6 @@ import traceback # PySol imports from pysollib.mfxutil import destruct, kwdefault, KwStruct -from pysollib.mfxutil import win32api # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE @@ -104,6 +103,7 @@ class MfxDialog: # ex. _ToplevelDialog after_cancel(self.timer) unbind_destroy(self.top) self.top.destroy() + self.top.update_idletasks() self.top = None self.parent = None @@ -430,8 +430,6 @@ class MfxScrolledCanvas: if hbar: if hbar == 3: w = 21 - if win32api: - w = win32api.GetSystemMetrics(3) # SM_CYHSCROLL self.frame.grid_rowconfigure(1, minsize=w) self.createHbar() if not vbar: @@ -440,8 +438,6 @@ class MfxScrolledCanvas: if vbar: if vbar == 3: w = 21 - if win32api: - w = win32api.GetSystemMetrics(2) # SM_CXVSCROLL self.frame.grid_columnconfigure(1, minsize=w) self.createVbar() bind(self.vbar, "", self._mapBar) diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index f321d05c..c634d57d 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -49,7 +49,6 @@ import traceback # PySol imports from pysollib.mfxutil import destruct, kwdefault, KwStruct -from pysollib.mfxutil import win32api # Toolkit imports from tkconst import EVENT_HANDLED, EVENT_PROPAGATE @@ -449,8 +448,6 @@ class MfxScrolledCanvas: if hbar: if hbar == 3: w = 21 - if win32api: - w = win32api.GetSystemMetrics(3) # SM_CYHSCROLL self.frame.grid_rowconfigure(1, minsize=w) self.createHbar() if not vbar: @@ -459,8 +456,6 @@ class MfxScrolledCanvas: if vbar: if vbar == 3: w = 21 - if win32api: - w = win32api.GetSystemMetrics(2) # SM_CXVSCROLL self.frame.grid_columnconfigure(1, minsize=w) self.createVbar() bind(self.vbar, "", self._mapBar) From 224c2e76e4cf42540d0cfffc9d69d88e2f68e5fe Mon Sep 17 00:00:00 2001 From: skomoroh Date: Tue, 7 Nov 2006 22:23:43 +0000 Subject: [PATCH 086/266] ** version 0.9.4 ** * misc improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@88 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- MANIFEST.in | 5 ++ po/games.pot | 5 +- po/pysol.pot | 140 +++++++++++++++++++-------------------- po/ru_games.po | 12 ++-- po/ru_pysol.po | 138 +++++++++++++++++++------------------- pysollib/gamedb.py | 1 + pysollib/tile/tkhtml.py | 3 +- pysollib/tile/toolbar.py | 4 ++ 8 files changed, 162 insertions(+), 146 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 22416433..6580affe 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -61,3 +61,8 @@ graft data/cardset-oxymoron graft data/cardset-standard graft data/cardset-tuxedo graft data/cardset-vienna-2k +## +## exclude dirs +## +global-exclude .xvpics/* .thumbnails/* +global-exclude .svn/* .svn/*/* diff --git a/po/games.pot b/po/games.pot index f3afc809..fdc5b81f 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Mon Nov 6 09:46:50 2006\n" +"POT-Creation-Date: Tue Nov 7 05:42:15 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -534,6 +534,9 @@ msgstr "" msgid "Chinese Solitaire" msgstr "" +msgid "Chinese Spider" +msgstr "" + msgid "Chip" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index 6d8c93bd..d08e9958 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Mon Nov 6 09:47:42 2006\n" +"POT-Creation-Date: Tue Nov 7 05:43:10 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-11-06 09:47+0300\n" +"POT-Creation-Date: 2006-11-07 05:43+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -69,7 +69,7 @@ msgid "&Next number" msgstr "" #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 -#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865 +#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1864 #: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 @@ -87,8 +87,8 @@ msgid "&OK" msgstr "" #: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167 -#: pysollib/game.py:929 pysollib/game.py:1315 pysollib/game.py:1330 -#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/colorsdialog.py:122 +#: pysollib/game.py:929 pysollib/game.py:1314 pysollib/game.py:1329 +#: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1122 #: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85 @@ -111,108 +111,108 @@ msgstr "" msgid "Quit " msgstr "" -#: pysollib/actions.py:449 +#: pysollib/actions.py:450 msgid "Clear bookmarks" msgstr "" -#: pysollib/actions.py:450 +#: pysollib/actions.py:451 msgid "Clear all bookmarks ?" msgstr "" -#: pysollib/actions.py:460 +#: pysollib/actions.py:461 msgid "Restart game" msgstr "" -#: pysollib/actions.py:461 +#: pysollib/actions.py:462 msgid "Restart this game ?" msgstr "" -#: pysollib/actions.py:502 +#: pysollib/actions.py:503 msgid "" "Comments for %s:\n" "\n" msgstr "" -#: pysollib/actions.py:504 +#: pysollib/actions.py:505 msgid "Comments for " msgstr "" -#: pysollib/actions.py:522 pysollib/actions.py:550 +#: pysollib/actions.py:523 pysollib/actions.py:551 msgid "Error while writing to file" msgstr "" -#: pysollib/actions.py:525 pysollib/actions.py:553 +#: pysollib/actions.py:526 pysollib/actions.py:554 msgid " Info" msgstr "" -#: pysollib/actions.py:526 +#: pysollib/actions.py:527 msgid "" "Comments were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:537 +#: pysollib/actions.py:538 msgid "Demo statistics" msgstr "" -#: pysollib/actions.py:540 +#: pysollib/actions.py:541 msgid "Your statistics" msgstr "" -#: pysollib/actions.py:554 +#: pysollib/actions.py:555 msgid "" " were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:568 +#: pysollib/actions.py:569 msgid " Demo" msgstr "" -#: pysollib/actions.py:568 +#: pysollib/actions.py:569 msgid " Demo " msgstr "" -#: pysollib/actions.py:571 pysollib/actions.py:589 +#: pysollib/actions.py:572 pysollib/actions.py:590 msgid " for " msgstr "" -#: pysollib/actions.py:577 pysollib/stats.py:206 +#: pysollib/actions.py:578 pysollib/stats.py:206 msgid "Statistics for " msgstr "" -#: pysollib/actions.py:580 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:581 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "" -#: pysollib/actions.py:583 data/glade-translations:31 +#: pysollib/actions.py:584 data/glade-translations:31 msgid "Full log" msgstr "" -#: pysollib/actions.py:586 data/glade-translations:32 +#: pysollib/actions.py:587 data/glade-translations:32 msgid "Session log" msgstr "" -#: pysollib/actions.py:592 +#: pysollib/actions.py:593 msgid "Game Info" msgstr "" -#: pysollib/actions.py:608 +#: pysollib/actions.py:609 msgid "Reset all statistics" msgstr "" -#: pysollib/actions.py:609 +#: pysollib/actions.py:610 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" msgstr "" -#: pysollib/actions.py:615 +#: pysollib/actions.py:616 msgid "Reset game statistics" msgstr "" -#: pysollib/actions.py:616 +#: pysollib/actions.py:617 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -220,23 +220,23 @@ msgid "" "%s ?" msgstr "" -#: pysollib/actions.py:671 +#: pysollib/actions.py:672 msgid "Play demo" msgstr "" -#: pysollib/actions.py:682 +#: pysollib/actions.py:683 msgid "Set player options" msgstr "" -#: pysollib/actions.py:696 data/glade-translations:40 +#: pysollib/actions.py:697 data/glade-translations:40 msgid "Set colors" msgstr "" -#: pysollib/actions.py:716 +#: pysollib/actions.py:717 msgid "Set fonts" msgstr "" -#: pysollib/actions.py:725 data/glade-translations:33 +#: pysollib/actions.py:726 data/glade-translations:33 msgid "Set timeouts" msgstr "" @@ -244,8 +244,8 @@ msgstr "" msgid "Unknown" msgstr "" -#: pysollib/app.py:894 pysollib/game.py:1315 pysollib/game.py:1330 -#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/menubar.py:363 +#: pysollib/app.py:894 pysollib/game.py:1314 pysollib/game.py:1329 +#: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/menubar.py:363 msgid "&New game" msgstr "" @@ -286,45 +286,45 @@ msgstr "" msgid "Discard current game ?" msgstr "" -#: pysollib/game.py:1269 +#: pysollib/game.py:1268 msgid "" "\n" "You have reached\n" "#%d in the %s of playing time" msgstr "" -#: pysollib/game.py:1272 +#: pysollib/game.py:1271 msgid "" "\n" "and #%d in the %s of moves" msgstr "" -#: pysollib/game.py:1274 +#: pysollib/game.py:1273 msgid "" "\n" "You have reached\n" "#%d in the %s of moves" msgstr "" -#: pysollib/game.py:1277 +#: pysollib/game.py:1276 msgid "" "\n" "and #%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1279 +#: pysollib/game.py:1278 msgid "" "\n" "You have reached\n" "#%d in the %s of total moves" msgstr "" -#: pysollib/game.py:1306 pysollib/game.py:1322 +#: pysollib/game.py:1305 pysollib/game.py:1321 #: pysollib/tk/soundoptionsdialog.py:100 msgid "Game won" msgstr "" -#: pysollib/game.py:1307 +#: pysollib/game.py:1306 msgid "" "\n" "Congratulations, this\n" @@ -335,7 +335,7 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1323 +#: pysollib/game.py:1322 msgid "" "\n" "Congratulations, you did it !\n" @@ -345,100 +345,100 @@ msgid "" "%s\n" msgstr "" -#: pysollib/game.py:1335 pysollib/game.py:1341 +#: pysollib/game.py:1334 pysollib/game.py:1340 #: pysollib/tk/soundoptionsdialog.py:98 msgid "Game finished" msgstr "" -#: pysollib/game.py:1336 pysollib/game.py:1866 +#: pysollib/game.py:1335 pysollib/game.py:1865 msgid "" "\n" "Game finished\n" msgstr "" -#: pysollib/game.py:1342 +#: pysollib/game.py:1341 msgid "" "\n" "Game finished, but not without my help...\n" msgstr "" -#: pysollib/game.py:1343 +#: pysollib/game.py:1342 msgid "&Restart" msgstr "" -#: pysollib/game.py:1757 +#: pysollib/game.py:1756 msgid "Score %6d" msgstr "" -#: pysollib/game.py:1856 +#: pysollib/game.py:1855 msgid "&Cool" msgstr "" -#: pysollib/game.py:1856 +#: pysollib/game.py:1855 msgid "&Great" msgstr "" -#: pysollib/game.py:1856 +#: pysollib/game.py:1855 msgid "&Wow" msgstr "" -#: pysollib/game.py:1856 +#: pysollib/game.py:1855 msgid "&Yeah" msgstr "" -#: pysollib/game.py:1857 pysollib/game.py:1869 pysollib/game.py:1882 +#: pysollib/game.py:1856 pysollib/game.py:1868 pysollib/game.py:1881 msgid " Autopilot" msgstr "" -#: pysollib/game.py:1858 +#: pysollib/game.py:1857 msgid "" "\n" "Game solved in %d moves.\n" msgstr "" -#: pysollib/game.py:1881 +#: pysollib/game.py:1880 msgid "&Hmm" msgstr "" -#: pysollib/game.py:1881 +#: pysollib/game.py:1880 msgid "&Oh well" msgstr "" -#: pysollib/game.py:1881 +#: pysollib/game.py:1880 msgid "&That's life" msgstr "" -#: pysollib/game.py:1883 +#: pysollib/game.py:1882 msgid "" "\n" "This won't come out...\n" msgstr "" -#: pysollib/game.py:2295 +#: pysollib/game.py:2294 msgid "Set bookmark" msgstr "" -#: pysollib/game.py:2296 +#: pysollib/game.py:2295 msgid "Replace existing bookmark %d ?" msgstr "" -#: pysollib/game.py:2318 +#: pysollib/game.py:2317 msgid "Goto bookmark" msgstr "" -#: pysollib/game.py:2319 +#: pysollib/game.py:2318 msgid "Goto bookmark %d ?" msgstr "" -#: pysollib/game.py:2350 +#: pysollib/game.py:2349 msgid "Open game" msgstr "" -#: pysollib/game.py:2361 pysollib/game.py:2370 pysollib/game.py:2375 +#: pysollib/game.py:2360 pysollib/game.py:2369 pysollib/game.py:2374 msgid "Load game error" msgstr "" -#: pysollib/game.py:2362 +#: pysollib/game.py:2361 msgid "" "Error while loading game.\n" "\n" @@ -446,22 +446,22 @@ msgid "" "but this could also be a bug you might want to report." msgstr "" -#: pysollib/game.py:2371 +#: pysollib/game.py:2370 msgid "Error while loading game" msgstr "" -#: pysollib/game.py:2376 +#: pysollib/game.py:2375 msgid "" "Internal error while loading game.\n" "\n" "Please report this bug." msgstr "" -#: pysollib/game.py:2401 +#: pysollib/game.py:2400 msgid "Save game error" msgstr "" -#: pysollib/game.py:2402 +#: pysollib/game.py:2401 msgid "Error while saving game" msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index a7fa332a..1faaf812 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Mon Nov 6 09:46:50 2006\n" -"PO-Revision-Date: 2006-10-31 19:57+0300\n" +"POT-Creation-Date: Tue Nov 7 05:42:15 2006\n" +"PO-Revision-Date: 2006-11-07 05:51+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -538,6 +538,9 @@ msgstr "Китайский Клондайк" msgid "Chinese Solitaire" msgstr "Китайский пасьянс" +msgid "Chinese Spider" +msgstr "Китайский Паук" + msgid "Chip" msgstr "Щепка" @@ -2790,9 +2793,8 @@ msgstr "Четырёхугольник" msgid "Quadruple Alliance" msgstr "Четырёхсторонний альянс" -#, fuzzy msgid "Quads" -msgstr "Четвёрка" +msgstr "Четвёрки" msgid "Quartets" msgstr "Квартеты" @@ -3778,7 +3780,7 @@ msgid "Zeus" msgstr "Зевс" msgid "Zigzag Course" -msgstr "" +msgstr "Зигзагообразный курс" msgid "Zodiac" msgstr "Зодиак" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index f96eae84..73ad59b0 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Mon Nov 6 09:47:42 2006\n" +"POT-Creation-Date: Tue Nov 7 05:43:10 2006\n" "PO-Revision-Date: 2006-11-06 09:53+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" @@ -54,7 +54,7 @@ msgid "&Next number" msgstr "&Следующий номер" #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 -#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1865 +#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1864 #: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 @@ -72,8 +72,8 @@ msgid "&OK" msgstr "&ОК" #: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167 -#: pysollib/game.py:929 pysollib/game.py:1315 pysollib/game.py:1330 -#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/colorsdialog.py:122 +#: pysollib/game.py:929 pysollib/game.py:1314 pysollib/game.py:1329 +#: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1122 #: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85 @@ -96,23 +96,23 @@ msgstr "Выбрать следующую игру" msgid "Quit " msgstr "Выйти из " -#: pysollib/actions.py:449 +#: pysollib/actions.py:450 msgid "Clear bookmarks" msgstr "Удалить закладки" -#: pysollib/actions.py:450 +#: pysollib/actions.py:451 msgid "Clear all bookmarks ?" msgstr "Удалить все закладки?" -#: pysollib/actions.py:460 +#: pysollib/actions.py:461 msgid "Restart game" msgstr "Начать игру с начала" -#: pysollib/actions.py:461 +#: pysollib/actions.py:462 msgid "Restart this game ?" msgstr "Начать игру с начала?" -#: pysollib/actions.py:502 +#: pysollib/actions.py:503 msgid "" "Comments for %s:\n" "\n" @@ -120,19 +120,19 @@ msgstr "" "Комментарий для %s:\n" "\n" -#: pysollib/actions.py:504 +#: pysollib/actions.py:505 msgid "Comments for " msgstr "Комментарий для " -#: pysollib/actions.py:522 pysollib/actions.py:550 +#: pysollib/actions.py:523 pysollib/actions.py:551 msgid "Error while writing to file" msgstr "Ошибка при записи в файл" -#: pysollib/actions.py:525 pysollib/actions.py:553 +#: pysollib/actions.py:526 pysollib/actions.py:554 msgid " Info" msgstr " Информация" -#: pysollib/actions.py:526 +#: pysollib/actions.py:527 msgid "" "Comments were appended to\n" "\n" @@ -140,15 +140,15 @@ msgstr "" "Комментарий добавлен в файл\n" "\n" -#: pysollib/actions.py:537 +#: pysollib/actions.py:538 msgid "Demo statistics" msgstr "Статистика демо" -#: pysollib/actions.py:540 +#: pysollib/actions.py:541 msgid "Your statistics" msgstr "Ваша статистика" -#: pysollib/actions.py:554 +#: pysollib/actions.py:555 msgid "" " were appended to\n" "\n" @@ -156,44 +156,44 @@ msgstr "" " добавлена в файл\n" "\n" -#: pysollib/actions.py:568 +#: pysollib/actions.py:569 msgid " Demo" msgstr " Демо" -#: pysollib/actions.py:568 +#: pysollib/actions.py:569 msgid " Demo " msgstr " Демо " -#: pysollib/actions.py:571 pysollib/actions.py:589 +#: pysollib/actions.py:572 pysollib/actions.py:590 msgid " for " msgstr " для " -#: pysollib/actions.py:577 pysollib/stats.py:206 +#: pysollib/actions.py:578 pysollib/stats.py:206 msgid "Statistics for " msgstr "Статистика игры " -#: pysollib/actions.py:580 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:581 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "Статистика" -#: pysollib/actions.py:583 data/glade-translations:31 +#: pysollib/actions.py:584 data/glade-translations:31 msgid "Full log" msgstr "Полный лог" -#: pysollib/actions.py:586 data/glade-translations:32 +#: pysollib/actions.py:587 data/glade-translations:32 msgid "Session log" msgstr "Лог сессии" -#: pysollib/actions.py:592 +#: pysollib/actions.py:593 msgid "Game Info" msgstr "Информация об игре" -#: pysollib/actions.py:608 +#: pysollib/actions.py:609 msgid "Reset all statistics" msgstr "Очистить всю статистику" -#: pysollib/actions.py:609 +#: pysollib/actions.py:610 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" @@ -201,11 +201,11 @@ msgstr "" "Очистить всю статистику и лог для игрока\n" "%s?" -#: pysollib/actions.py:615 +#: pysollib/actions.py:616 msgid "Reset game statistics" msgstr "Очистить статистику игры" -#: pysollib/actions.py:616 +#: pysollib/actions.py:617 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -217,23 +217,23 @@ msgstr "" "и игры\n" "%s?" -#: pysollib/actions.py:671 +#: pysollib/actions.py:672 msgid "Play demo" msgstr "Показать демо" -#: pysollib/actions.py:682 +#: pysollib/actions.py:683 msgid "Set player options" msgstr "Установить настройки игрока" -#: pysollib/actions.py:696 data/glade-translations:40 +#: pysollib/actions.py:697 data/glade-translations:40 msgid "Set colors" msgstr "Настроить цвета" -#: pysollib/actions.py:716 +#: pysollib/actions.py:717 msgid "Set fonts" msgstr "Настроить шрифт" -#: pysollib/actions.py:725 data/glade-translations:33 +#: pysollib/actions.py:726 data/glade-translations:33 msgid "Set timeouts" msgstr "Настроить таймауты" @@ -241,8 +241,8 @@ msgstr "Настроить таймауты" msgid "Unknown" msgstr "Неизвестный" -#: pysollib/app.py:894 pysollib/game.py:1315 pysollib/game.py:1330 -#: pysollib/game.py:1337 pysollib/game.py:1343 pysollib/tk/menubar.py:363 +#: pysollib/app.py:894 pysollib/game.py:1314 pysollib/game.py:1329 +#: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/menubar.py:363 msgid "&New game" msgstr "&Новая игра" @@ -288,7 +288,7 @@ msgstr "Игрок\n" msgid "Discard current game ?" msgstr "Завершить текущую игру?" -#: pysollib/game.py:1269 +#: pysollib/game.py:1268 msgid "" "\n" "You have reached\n" @@ -298,7 +298,7 @@ msgstr "" "Вы достигли\n" "#%d в %s игрового времени" -#: pysollib/game.py:1272 +#: pysollib/game.py:1271 msgid "" "\n" "and #%d in the %s of moves" @@ -306,7 +306,7 @@ msgstr "" "\n" "и #%d в %s количества ходов" -#: pysollib/game.py:1274 +#: pysollib/game.py:1273 msgid "" "\n" "You have reached\n" @@ -316,7 +316,7 @@ msgstr "" "Вы достигли\n" "#%d в %s количества ходов" -#: pysollib/game.py:1277 +#: pysollib/game.py:1276 msgid "" "\n" "and #%d in the %s of total moves" @@ -324,7 +324,7 @@ msgstr "" "\n" "и #%d в %s общего количества ходов" -#: pysollib/game.py:1279 +#: pysollib/game.py:1278 msgid "" "\n" "You have reached\n" @@ -334,12 +334,12 @@ msgstr "" "Вы достигли\n" "#%d в %s общего количества ходов" -#: pysollib/game.py:1306 pysollib/game.py:1322 +#: pysollib/game.py:1305 pysollib/game.py:1321 #: pysollib/tk/soundoptionsdialog.py:100 msgid "Game won" msgstr "Игра выиграна" -#: pysollib/game.py:1307 +#: pysollib/game.py:1306 msgid "" "\n" "Congratulations, this\n" @@ -358,7 +358,7 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1323 +#: pysollib/game.py:1322 msgid "" "\n" "Congratulations, you did it !\n" @@ -375,12 +375,12 @@ msgstr "" "Количество ходов: %s\n" "%s\n" -#: pysollib/game.py:1335 pysollib/game.py:1341 +#: pysollib/game.py:1334 pysollib/game.py:1340 #: pysollib/tk/soundoptionsdialog.py:98 msgid "Game finished" msgstr "Игра закончена" -#: pysollib/game.py:1336 pysollib/game.py:1866 +#: pysollib/game.py:1335 pysollib/game.py:1865 msgid "" "\n" "Game finished\n" @@ -388,7 +388,7 @@ msgstr "" "\n" "Игра закончена\n" -#: pysollib/game.py:1342 +#: pysollib/game.py:1341 msgid "" "\n" "Game finished, but not without my help...\n" @@ -396,35 +396,35 @@ msgstr "" "\n" "Игра закончена, но не без моей помощи...\n" -#: pysollib/game.py:1343 +#: pysollib/game.py:1342 msgid "&Restart" msgstr "&Начало" -#: pysollib/game.py:1757 +#: pysollib/game.py:1756 msgid "Score %6d" msgstr "Счёт %6d" -#: pysollib/game.py:1856 +#: pysollib/game.py:1855 msgid "&Cool" msgstr "&Отлично" -#: pysollib/game.py:1856 +#: pysollib/game.py:1855 msgid "&Great" msgstr "&Здорово" -#: pysollib/game.py:1856 +#: pysollib/game.py:1855 msgid "&Wow" msgstr "&Ура" -#: pysollib/game.py:1856 +#: pysollib/game.py:1855 msgid "&Yeah" msgstr "&Ага" -#: pysollib/game.py:1857 pysollib/game.py:1869 pysollib/game.py:1882 +#: pysollib/game.py:1856 pysollib/game.py:1868 pysollib/game.py:1881 msgid " Autopilot" msgstr " Автопилот" -#: pysollib/game.py:1858 +#: pysollib/game.py:1857 msgid "" "\n" "Game solved in %d moves.\n" @@ -432,19 +432,19 @@ msgstr "" "\n" "Игра решена за %d ходов\n" -#: pysollib/game.py:1881 +#: pysollib/game.py:1880 msgid "&Hmm" msgstr "&Хмм" -#: pysollib/game.py:1881 +#: pysollib/game.py:1880 msgid "&Oh well" msgstr "&Ох" -#: pysollib/game.py:1881 +#: pysollib/game.py:1880 msgid "&That's life" msgstr "&Такова жизнь" -#: pysollib/game.py:1883 +#: pysollib/game.py:1882 msgid "" "\n" "This won't come out...\n" @@ -452,31 +452,31 @@ msgstr "" "\n" "Не удалось...\n" -#: pysollib/game.py:2295 +#: pysollib/game.py:2294 msgid "Set bookmark" msgstr "Установить закладку" -#: pysollib/game.py:2296 +#: pysollib/game.py:2295 msgid "Replace existing bookmark %d ?" msgstr "Заменить существующую закладку %d ?" -#: pysollib/game.py:2318 +#: pysollib/game.py:2317 msgid "Goto bookmark" msgstr "Перейти к закладке" -#: pysollib/game.py:2319 +#: pysollib/game.py:2318 msgid "Goto bookmark %d ?" msgstr "Перейти к закладке %d ?" -#: pysollib/game.py:2350 +#: pysollib/game.py:2349 msgid "Open game" msgstr "Открыть игру" -#: pysollib/game.py:2361 pysollib/game.py:2370 pysollib/game.py:2375 +#: pysollib/game.py:2360 pysollib/game.py:2369 pysollib/game.py:2374 msgid "Load game error" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2362 +#: pysollib/game.py:2361 msgid "" "Error while loading game.\n" "\n" @@ -488,11 +488,11 @@ msgstr "" "Возможно повреждён файл,\n" "или ошибка в программе." -#: pysollib/game.py:2371 +#: pysollib/game.py:2370 msgid "Error while loading game" msgstr "Ошибка при загрузке игры" -#: pysollib/game.py:2376 +#: pysollib/game.py:2375 msgid "" "Internal error while loading game.\n" "\n" @@ -502,11 +502,11 @@ msgstr "" "\n" "Пожалуйста сообщите об этой ошибке." -#: pysollib/game.py:2401 +#: pysollib/game.py:2400 msgid "Save game error" msgstr "Ошибка при сохранении игры" -#: pysollib/game.py:2402 +#: pysollib/game.py:2401 msgid "Error while saving game" msgstr "Ошибка при сохранении игры" diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index 86a848ea..b0baddfa 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -337,6 +337,7 @@ class GI: ('fc-0.9.1', tuple(range(421, 441))), ('fc-0.9.2', tuple(range(441, 466))), ('fc-0.9.3', tuple(range(466, 661))), + ('fc-0.9.4', tuple(range(661, 671))), ) # deprecated - the correct way is to or a GI.GT_XXX flag diff --git a/pysollib/tile/tkhtml.py b/pysollib/tile/tkhtml.py index ab991d96..6edc07f4 100644 --- a/pysollib/tile/tkhtml.py +++ b/pysollib/tile/tkhtml.py @@ -268,7 +268,8 @@ class HTMLViewer: # create text widget text_frame = Tkinter.Frame(parent) - text_frame.grid(row=1, column=0, columnspan=4, sticky='nsew') + text_frame.grid(row=1, column=0, columnspan=4, + sticky='nsew', padx=1, pady=1) vbar = Tkinter.Scrollbar(text_frame) vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y) self.text = Tkinter.Text(text_frame, diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py index dd6ff8b0..38f3c2e2 100644 --- a/pysollib/tile/toolbar.py +++ b/pysollib/tile/toolbar.py @@ -78,12 +78,16 @@ class AbstractToolbarButton: self.visible = True if orient == Tkinter.HORIZONTAL: padx, pady = 0, 2 + if os.name == 'nt': + padx, pady = 0, 0 self.grid(row=0, column=self.position, padx=padx, pady=pady, sticky='nsew') else: padx, pady = 2, 0 + if os.name == 'nt': + padx, pady = 0, 0 self.grid(row=self.position, column=0, padx=padx, pady=pady, From 40fc8ea10532288a8d87fe09af69e970cf572450 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 8 Nov 2006 23:28:56 +0000 Subject: [PATCH 087/266] * accelerated game registration git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@90 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- Makefile | 1 + pysollib/gamedb.py | 16 +++++++++++----- pysollib/init.py | 9 +++++++++ pysollib/main.py | 15 +++++++++------ pysollib/settings.py | 2 ++ 5 files changed, 32 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 2f182e32..de785276 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ # Makefile for PySolFC override LANG=C +override PYSOL_DEBUG=1 PYSOLLIB_FILES=pysollib/tk/*.py pysollib/*.py \ pysollib/games/*.py pysollib/games/special/*.py \ diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index b0baddfa..9e2e9c44 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -40,6 +40,7 @@ import sys, imp, os, types # PySol imports from mfxutil import Struct, latin1_to_ascii from resource import CSI +from settings import CHECK_GAMES gettext = _ n_ = lambda x: x @@ -486,11 +487,8 @@ class GameManager: def get(self, key): return self.__all_games.get(key) - def register(self, gi): - ##print gi.id, gi.short_name - if not isinstance(gi, GameInfo): - raise GameInfoException, "wrong GameInfo class" - gi.plugin = self.loading_plugin + def _check_game(self, gi): + ##print 'check game:', gi.id, gi.short_name.encode('utf-8') if self.__all_games.has_key(gi.id): raise GameInfoException, "duplicate game ID %s: %s and %s" % \ (gi.id, str(gi.gameclass), @@ -508,6 +506,14 @@ class GameManager: if self.__all_gamenames.has_key(n): raise GameInfoException, "duplicate game altname %s: %s" % \ (gi.id, n) + + def register(self, gi): + ##print gi.id, gi.short_name.encode('utf-8') + if not isinstance(gi, GameInfo): + raise GameInfoException, "wrong GameInfo class" + gi.plugin = self.loading_plugin + if self.loading_plugin or CHECK_GAMES: + self._check_game(gi) ##if 0 and gi.si.game_flags & GI.GT_XORIGINAL: ## return ##print gi.id, gi.name diff --git a/pysollib/init.py b/pysollib/init.py index 9294ff01..f5a67758 100644 --- a/pysollib/init.py +++ b/pysollib/init.py @@ -51,6 +51,15 @@ def init(): ##if locale_dir: locale_dir = os.path.normpath(locale_dir) gettext.install('pysol', locale_dir, unicode=True) + if os.environ.has_key('PYSOL_CHECK_GAMES') or \ + os.environ.has_key('PYSOL_DEBUG'): + settings.CHECK_GAMES = True + if os.environ.has_key('PYSOL_DEBUG'): + try: + settings.DEBUG = int(os.environ['PYSOL_DEBUG']) + except: + settings.DEBUG = 1 + ## init toolkit if '--gtk' in sys.argv: settings.TOOLKIT = 'gtk' diff --git a/pysollib/main.py b/pysollib/main.py index 2026f297..56a9f410 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -43,6 +43,7 @@ import gettext # PySol imports from mfxutil import destruct, EnvError from util import CARDSET, DataLoader +import settings from settings import PACKAGE, TOOLKIT, VERSION, SOUND_MOD from resource import Tile from gamedb import GI @@ -110,7 +111,7 @@ def parse_option(argv): "noplugins": False, "nosound": False, "sound-mod": None, - "debug": 0, + "debug": None, } for i in optlist: if i[0] in ("-h", "--help"): @@ -137,7 +138,10 @@ def parse_option(argv): assert i[1] in ('pss', 'pygame', 'oss', 'win') opts["sound-mod"] = i[1] elif i[0] in ("-D", "--debug"): - opts["debug"] = i[1] + try: + opts["debug"] = int(i[1]) + except: + print >> sys.stderr, 'WARNING: invalid argument for debug' if opts["help"]: print _("""Usage: %s [OPTIONS] [FILE] @@ -202,10 +206,9 @@ def pysol_init(app, args): app.commandline.gameid = int(opts['gameid']) except: print >> sys.stderr, 'WARNING: invalid game id:', opts['gameid'] - try: - app.debug = int(opts['debug']) - except: - print >> sys.stderr, 'invalid argument for debug' + if not opts['debug'] is None: + settings.DEBUG = opts['debug'] + app.debug = settings.DEBUG # init games database import games diff --git a/pysollib/settings.py b/pysollib/settings.py index 25759f8a..c1137aab 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -57,3 +57,5 @@ if os.name == 'mac': TOP_SIZE = 10 TOP_TITLE = n_('Top 10') +DEBUG = 0 # must be integer +CHECK_GAMES = False From 017379ea056b9406e197b7cab40e273a1e657432 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Thu, 9 Nov 2006 22:18:46 +0000 Subject: [PATCH 088/266] + 3 new games * cleanup main.py and mfxutil.py * bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@91 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/games.pot | 11 ++- po/pysol.pot | 134 +++++++++++++-------------- po/ru_games.po | 63 ++++++------- po/ru_pysol.po | 132 +++++++++++++------------- pysollib/app.py | 48 +++++----- pysollib/games/capricieuse.py | 33 ++++++- pysollib/games/spider.py | 37 ++++++++ pysollib/main.py | 139 +++++----------------------- pysollib/mfxutil.py | 84 ----------------- pysollib/tile/soundoptionsdialog.py | 2 +- pysollib/tile/tkhtml.py | 3 +- pysollib/tk/soundoptionsdialog.py | 2 +- pysollib/tk/tkhtml.py | 3 +- 13 files changed, 296 insertions(+), 395 deletions(-) diff --git a/po/games.pot b/po/games.pot index fdc5b81f..d7b5d86c 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Nov 7 05:42:15 2006\n" +"POT-Creation-Date: Thu Nov 9 17:36:05 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -993,6 +993,9 @@ msgstr "" msgid "Fatimeh's Game Relaxed" msgstr "" +msgid "Fifteen" +msgstr "" + msgid "Fifteen Puzzle" msgstr "" @@ -1395,6 +1398,9 @@ msgstr "" msgid "Inca" msgstr "" +msgid "Incompatibility" +msgstr "" + msgid "Indefatigable" msgstr "" @@ -2973,6 +2979,9 @@ msgstr "" msgid "Scorpion Head" msgstr "" +msgid "Scorpion II" +msgstr "" + msgid "Scorpion Tail" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index d08e9958..897e3b01 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Tue Nov 7 05:43:10 2006\n" +"POT-Creation-Date: Thu Nov 9 17:36:57 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-11-07 05:43+0300\n" +"POT-Creation-Date: 2006-11-09 17:36+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -70,7 +70,7 @@ msgstr "" #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 #: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1864 -#: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122 +#: pysollib/main.py:379 pysollib/main.py:387 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -465,211 +465,211 @@ msgstr "" msgid "Error while saving game" msgstr "" -#: pysollib/gamedb.py:120 +#: pysollib/gamedb.py:121 msgid "Baker's Dozen" msgstr "" -#: pysollib/gamedb.py:121 +#: pysollib/gamedb.py:122 msgid "Beleaguered Castle" msgstr "" -#: pysollib/gamedb.py:122 +#: pysollib/gamedb.py:123 msgid "Canfield" msgstr "" -#: pysollib/gamedb.py:123 +#: pysollib/gamedb.py:124 msgid "Fan" msgstr "" -#: pysollib/gamedb.py:124 +#: pysollib/gamedb.py:125 msgid "Forty Thieves" msgstr "" -#: pysollib/gamedb.py:125 +#: pysollib/gamedb.py:126 msgid "FreeCell" msgstr "" -#: pysollib/gamedb.py:126 +#: pysollib/gamedb.py:127 msgid "Golf" msgstr "" -#: pysollib/gamedb.py:127 +#: pysollib/gamedb.py:128 msgid "Gypsy" msgstr "" -#: pysollib/gamedb.py:128 +#: pysollib/gamedb.py:129 msgid "Klondike" msgstr "" -#: pysollib/gamedb.py:129 +#: pysollib/gamedb.py:130 msgid "Montana" msgstr "" -#: pysollib/gamedb.py:130 +#: pysollib/gamedb.py:131 msgid "Napoleon" msgstr "" -#: pysollib/gamedb.py:131 +#: pysollib/gamedb.py:132 msgid "Numerica" msgstr "" -#: pysollib/gamedb.py:132 +#: pysollib/gamedb.py:133 msgid "Pairing" msgstr "" -#: pysollib/gamedb.py:133 +#: pysollib/gamedb.py:134 msgid "Raglan" msgstr "" -#: pysollib/gamedb.py:134 pysollib/gamedb.py:167 +#: pysollib/gamedb.py:135 pysollib/gamedb.py:168 msgid "Simple games" msgstr "" -#: pysollib/gamedb.py:135 +#: pysollib/gamedb.py:136 msgid "Spider" msgstr "" -#: pysollib/gamedb.py:136 +#: pysollib/gamedb.py:137 msgid "Terrace" msgstr "" -#: pysollib/gamedb.py:137 +#: pysollib/gamedb.py:138 msgid "Yukon" msgstr "" -#: pysollib/gamedb.py:138 pysollib/gamedb.py:171 +#: pysollib/gamedb.py:139 pysollib/gamedb.py:172 msgid "One-Deck games" msgstr "" -#: pysollib/gamedb.py:139 pysollib/gamedb.py:172 +#: pysollib/gamedb.py:140 pysollib/gamedb.py:173 msgid "Two-Deck games" msgstr "" -#: pysollib/gamedb.py:140 pysollib/gamedb.py:173 +#: pysollib/gamedb.py:141 pysollib/gamedb.py:174 msgid "Three-Deck games" msgstr "" -#: pysollib/gamedb.py:141 pysollib/gamedb.py:174 +#: pysollib/gamedb.py:142 pysollib/gamedb.py:175 msgid "Four-Deck games" msgstr "" -#: pysollib/gamedb.py:153 +#: pysollib/gamedb.py:154 msgid "Baker's Dozen type" msgstr "" -#: pysollib/gamedb.py:154 +#: pysollib/gamedb.py:155 msgid "Beleaguered Castle type" msgstr "" -#: pysollib/gamedb.py:155 +#: pysollib/gamedb.py:156 msgid "Canfield type" msgstr "" -#: pysollib/gamedb.py:156 +#: pysollib/gamedb.py:157 msgid "Fan type" msgstr "" -#: pysollib/gamedb.py:157 +#: pysollib/gamedb.py:158 msgid "Forty Thieves type" msgstr "" -#: pysollib/gamedb.py:158 +#: pysollib/gamedb.py:159 msgid "FreeCell type" msgstr "" -#: pysollib/gamedb.py:159 +#: pysollib/gamedb.py:160 msgid "Golf type" msgstr "" -#: pysollib/gamedb.py:160 +#: pysollib/gamedb.py:161 msgid "Gypsy type" msgstr "" -#: pysollib/gamedb.py:161 +#: pysollib/gamedb.py:162 msgid "Klondike type" msgstr "" -#: pysollib/gamedb.py:162 +#: pysollib/gamedb.py:163 msgid "Montana type" msgstr "" -#: pysollib/gamedb.py:163 +#: pysollib/gamedb.py:164 msgid "Napoleon type" msgstr "" -#: pysollib/gamedb.py:164 +#: pysollib/gamedb.py:165 msgid "Numerica type" msgstr "" -#: pysollib/gamedb.py:165 +#: pysollib/gamedb.py:166 msgid "Pairing type" msgstr "" -#: pysollib/gamedb.py:166 +#: pysollib/gamedb.py:167 msgid "Raglan type" msgstr "" -#: pysollib/gamedb.py:168 +#: pysollib/gamedb.py:169 msgid "Spider type" msgstr "" -#: pysollib/gamedb.py:169 +#: pysollib/gamedb.py:170 msgid "Terrace type" msgstr "" -#: pysollib/gamedb.py:170 +#: pysollib/gamedb.py:171 msgid "Yukon type" msgstr "" -#: pysollib/gamedb.py:178 pysollib/gamedb.py:186 +#: pysollib/gamedb.py:179 pysollib/gamedb.py:187 msgid "French type" msgstr "" -#: pysollib/gamedb.py:179 pysollib/gamedb.py:187 pysollib/gamedb.py:195 +#: pysollib/gamedb.py:180 pysollib/gamedb.py:188 pysollib/gamedb.py:196 msgid "Ganjifa type" msgstr "" -#: pysollib/gamedb.py:180 pysollib/gamedb.py:188 pysollib/gamedb.py:196 +#: pysollib/gamedb.py:181 pysollib/gamedb.py:189 pysollib/gamedb.py:197 msgid "Hanafuda type" msgstr "" -#: pysollib/gamedb.py:181 pysollib/gamedb.py:189 pysollib/gamedb.py:203 +#: pysollib/gamedb.py:182 pysollib/gamedb.py:190 pysollib/gamedb.py:204 msgid "Hex A Deck type" msgstr "" -#: pysollib/gamedb.py:182 pysollib/gamedb.py:190 pysollib/gamedb.py:208 +#: pysollib/gamedb.py:183 pysollib/gamedb.py:191 pysollib/gamedb.py:209 msgid "Tarock type" msgstr "" -#: pysollib/gamedb.py:194 +#: pysollib/gamedb.py:195 msgid "Dashavatara Ganjifa type" msgstr "" -#: pysollib/gamedb.py:197 +#: pysollib/gamedb.py:198 msgid "Mughal Ganjifa type" msgstr "" -#: pysollib/gamedb.py:198 +#: pysollib/gamedb.py:199 msgid "Navagraha Ganjifa type" msgstr "" -#: pysollib/gamedb.py:202 +#: pysollib/gamedb.py:203 msgid "Shisen-Sho" msgstr "" -#: pysollib/gamedb.py:204 +#: pysollib/gamedb.py:205 msgid "Matrix type" msgstr "" -#: pysollib/gamedb.py:205 +#: pysollib/gamedb.py:206 msgid "Memory type" msgstr "" -#: pysollib/gamedb.py:206 +#: pysollib/gamedb.py:207 msgid "Poker type" msgstr "" -#: pysollib/gamedb.py:207 +#: pysollib/gamedb.py:208 msgid "Puzzle type" msgstr "" @@ -1227,11 +1227,11 @@ msgstr "" msgid " Help" msgstr "" -#: pysollib/main.py:67 pysollib/main.py:284 +#: pysollib/main.py:68 pysollib/main.py:287 msgid " installation error" msgstr "" -#: pysollib/main.py:68 +#: pysollib/main.py:69 msgid "" "No %ss were found !!!\n" "\n" @@ -1241,17 +1241,17 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:75 pysollib/main.py:292 pysollib/tk/menubar.py:382 +#: pysollib/main.py:76 pysollib/main.py:295 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "" -#: pysollib/main.py:99 +#: pysollib/main.py:100 msgid "" "%s: %s\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:143 +#: pysollib/main.py:147 msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" @@ -1269,19 +1269,19 @@ msgid "" " MOD - one of following: pss(default), pygame, oss, win\n" msgstr "" -#: pysollib/main.py:161 +#: pysollib/main.py:165 msgid "" "%s: too many files\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:165 +#: pysollib/main.py:169 msgid "" "%s: invalid file name\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:285 +#: pysollib/main.py:288 msgid "" "\n" "No games were found !!!\n" @@ -1292,25 +1292,25 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:371 pysollib/main.py:379 +#: pysollib/main.py:374 pysollib/main.py:382 msgid " installation problem" msgstr "" -#: pysollib/main.py:372 +#: pysollib/main.py:375 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:380 +#: pysollib/main.py:383 msgid "" "The pysolsoundserver module was not found.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:387 +#: pysollib/main.py:390 msgid "Welcome to " msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 1faaf812..f2d6e134 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Nov 7 05:42:15 2006\n" -"PO-Revision-Date: 2006-11-07 05:51+0300\n" +"POT-Creation-Date: Thu Nov 9 17:36:05 2006\n" +"PO-Revision-Date: 2006-11-09 17:59+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -925,10 +925,10 @@ msgid "Elevator" msgstr "Лифт" msgid "Elevens" -msgstr "Одиннадцать" +msgstr "По одиннадцать" msgid "Elevens Too" -msgstr "Тоже Одиннадцать" +msgstr "Тоже по одиннадцать" msgid "Emperor" msgstr "Император" @@ -1003,6 +1003,9 @@ msgstr "Пасьянс Фатимы" msgid "Fatimeh's Game Relaxed" msgstr "Облегчённый Пасьянс Фатимы" +msgid "Fifteen" +msgstr "Пятнадцать" + #, fuzzy msgid "Fifteen Puzzle" msgstr "Пятнашки" @@ -1011,7 +1014,7 @@ msgid "Fifteen plus" msgstr "Пятнадцать плюс" msgid "Fifteens" -msgstr "Пятнадцать" +msgstr "По пятнадцать" msgid "Final Battle" msgstr "Последняя битва" @@ -1414,6 +1417,9 @@ msgstr "Маджонг Inazuma" msgid "Inca" msgstr "Инка" +msgid "Incompatibility" +msgstr "Несовместимость" + msgid "Indefatigable" msgstr "Неутомимый" @@ -1576,53 +1582,41 @@ msgstr "Гигант" msgid "Kurma" msgstr "" -#, fuzzy msgid "Kyodai 14" -msgstr "Маджонг Kyodai 14" +msgstr "Kyodai 14" -#, fuzzy msgid "Kyodai 17" -msgstr "Маджонг Kyodai 17" +msgstr "Kyodai 17" -#, fuzzy msgid "Kyodai 18" -msgstr "Маджонг Kyodai 18" +msgstr "Kyodai 18" -#, fuzzy msgid "Kyodai 20" -msgstr "Маджонг Kyodai 20" +msgstr "Kyodai 20" -#, fuzzy msgid "Kyodai 23" -msgstr "Маджонг Kyodai 23" +msgstr "Kyodai 23" -#, fuzzy msgid "Kyodai 24" -msgstr "Маджонг Kyodai 24" +msgstr "Kyodai 24" -#, fuzzy msgid "Kyodai 25" -msgstr "Маджонг Kyodai 25" +msgstr "Kyodai 25" -#, fuzzy msgid "Kyodai 26" -msgstr "Маджонг Kyodai 26" +msgstr "Kyodai 26" -#, fuzzy msgid "Kyodai 27" -msgstr "Маджонг Kyodai 27" +msgstr "Kyodai 27" -#, fuzzy msgid "Kyodai 28" -msgstr "Маджонг Kyodai 28" +msgstr "Kyodai 28" -#, fuzzy msgid "Kyodai 41" -msgstr "Маджонг Kyodai 4" +msgstr "Kyodai 41" -#, fuzzy msgid "Kyodai 42" -msgstr "Маджонг Kyodai 42" +msgstr "Kyodai 42" msgid "La Belle Lucie" msgstr "Прекрасная Люси" @@ -1747,7 +1741,7 @@ msgid "Lucas" msgstr "Лукас" msgid "Lucky Piles" -msgstr "Счастливая ячейка" +msgstr "Счастливые кучки" msgid "Lucky Thirteen" msgstr "Счастливые Тринадцать" @@ -3023,6 +3017,9 @@ msgstr "Скорпион" msgid "Scorpion Head" msgstr "Голова скорпиона" +msgid "Scorpion II" +msgstr "Скорпион II" + msgid "Scorpion Tail" msgstr "Хвост скорпиона" @@ -3039,7 +3036,7 @@ msgid "Sea Towers" msgstr "Морские башни" msgid "Seahaven Towers" -msgstr "" +msgstr "Приморские башни" msgid "Selective Castle" msgstr "Избирательный Замок" @@ -3075,7 +3072,7 @@ msgid "Shady Lanes" msgstr "Тенистые аллеи" msgid "Shamrocks" -msgstr "Трилистник" +msgstr "Трилистники" msgid "Shamsher" msgstr "" @@ -3457,7 +3454,7 @@ msgid "Thirteen Up" msgstr "Тринадцать вверх" msgid "Thirteens" -msgstr "Тринадцать" +msgstr "По тринадцать" msgid "Thirty Six" msgstr "Тридцать шесть" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 73ad59b0..e9a60baa 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Nov 7 05:43:10 2006\n" +"POT-Creation-Date: Thu Nov 9 17:36:57 2006\n" "PO-Revision-Date: 2006-11-06 09:53+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" @@ -55,7 +55,7 @@ msgstr "&Следующий номер" #: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 #: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1864 -#: pysollib/main.py:376 pysollib/main.py:384 pysollib/tk/colorsdialog.py:122 +#: pysollib/main.py:379 pysollib/main.py:387 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 @@ -510,211 +510,211 @@ msgstr "Ошибка при сохранении игры" msgid "Error while saving game" msgstr "Ошибка при сохранении игры" -#: pysollib/gamedb.py:120 +#: pysollib/gamedb.py:121 msgid "Baker's Dozen" msgstr "" -#: pysollib/gamedb.py:121 +#: pysollib/gamedb.py:122 msgid "Beleaguered Castle" msgstr "" -#: pysollib/gamedb.py:122 +#: pysollib/gamedb.py:123 msgid "Canfield" msgstr "" -#: pysollib/gamedb.py:123 +#: pysollib/gamedb.py:124 msgid "Fan" msgstr "" -#: pysollib/gamedb.py:124 +#: pysollib/gamedb.py:125 msgid "Forty Thieves" msgstr "" -#: pysollib/gamedb.py:125 +#: pysollib/gamedb.py:126 msgid "FreeCell" msgstr "" -#: pysollib/gamedb.py:126 +#: pysollib/gamedb.py:127 msgid "Golf" msgstr "" -#: pysollib/gamedb.py:127 +#: pysollib/gamedb.py:128 msgid "Gypsy" msgstr "" -#: pysollib/gamedb.py:128 +#: pysollib/gamedb.py:129 msgid "Klondike" msgstr "" -#: pysollib/gamedb.py:129 +#: pysollib/gamedb.py:130 msgid "Montana" msgstr "" -#: pysollib/gamedb.py:130 +#: pysollib/gamedb.py:131 msgid "Napoleon" msgstr "" -#: pysollib/gamedb.py:131 +#: pysollib/gamedb.py:132 msgid "Numerica" msgstr "" -#: pysollib/gamedb.py:132 +#: pysollib/gamedb.py:133 msgid "Pairing" msgstr "" -#: pysollib/gamedb.py:133 +#: pysollib/gamedb.py:134 msgid "Raglan" msgstr "" -#: pysollib/gamedb.py:134 pysollib/gamedb.py:167 +#: pysollib/gamedb.py:135 pysollib/gamedb.py:168 msgid "Simple games" msgstr "Простые игры" -#: pysollib/gamedb.py:135 +#: pysollib/gamedb.py:136 msgid "Spider" msgstr "" -#: pysollib/gamedb.py:136 +#: pysollib/gamedb.py:137 msgid "Terrace" msgstr "" -#: pysollib/gamedb.py:137 +#: pysollib/gamedb.py:138 msgid "Yukon" msgstr "" -#: pysollib/gamedb.py:138 pysollib/gamedb.py:171 +#: pysollib/gamedb.py:139 pysollib/gamedb.py:172 msgid "One-Deck games" msgstr "Игры с одной колодой" -#: pysollib/gamedb.py:139 pysollib/gamedb.py:172 +#: pysollib/gamedb.py:140 pysollib/gamedb.py:173 msgid "Two-Deck games" msgstr "Игры с двумя колодами" -#: pysollib/gamedb.py:140 pysollib/gamedb.py:173 +#: pysollib/gamedb.py:141 pysollib/gamedb.py:174 msgid "Three-Deck games" msgstr "Игры с тремя колодами" -#: pysollib/gamedb.py:141 pysollib/gamedb.py:174 +#: pysollib/gamedb.py:142 pysollib/gamedb.py:175 msgid "Four-Deck games" msgstr "Игры с четырьмя колодами" -#: pysollib/gamedb.py:153 +#: pysollib/gamedb.py:154 msgid "Baker's Dozen type" msgstr "Игры типа Чёртова Дюжина (Baker's Dozen)" -#: pysollib/gamedb.py:154 +#: pysollib/gamedb.py:155 msgid "Beleaguered Castle type" msgstr "Игры типа Осаждённый Замок (Beleaguered Castle)" -#: pysollib/gamedb.py:155 +#: pysollib/gamedb.py:156 msgid "Canfield type" msgstr "Игры типа Кенфилд (Canfield)" -#: pysollib/gamedb.py:156 +#: pysollib/gamedb.py:157 msgid "Fan type" msgstr "Игры типа Веер (Fan)" -#: pysollib/gamedb.py:157 +#: pysollib/gamedb.py:158 msgid "Forty Thieves type" msgstr "Игры типа Сорок Воров (Forty Thieves)" -#: pysollib/gamedb.py:158 +#: pysollib/gamedb.py:159 msgid "FreeCell type" msgstr "Игры типа Свободная Ячейка (FreeCell)" -#: pysollib/gamedb.py:159 +#: pysollib/gamedb.py:160 msgid "Golf type" msgstr "Игры типа Гольф (Golf)" -#: pysollib/gamedb.py:160 +#: pysollib/gamedb.py:161 msgid "Gypsy type" msgstr "Игры типа Цыганский Пасьянс (Gypsy)" -#: pysollib/gamedb.py:161 +#: pysollib/gamedb.py:162 msgid "Klondike type" msgstr "Игры типа Клондайк (Klondike)" -#: pysollib/gamedb.py:162 +#: pysollib/gamedb.py:163 msgid "Montana type" msgstr "Игры типа Монтана (Montana)" -#: pysollib/gamedb.py:163 +#: pysollib/gamedb.py:164 msgid "Napoleon type" msgstr "Игры типа Наполеон (Napoleon)" -#: pysollib/gamedb.py:164 +#: pysollib/gamedb.py:165 msgid "Numerica type" msgstr "Игры числового типа (Numerica)" -#: pysollib/gamedb.py:165 +#: pysollib/gamedb.py:166 msgid "Pairing type" msgstr "Парные игры" -#: pysollib/gamedb.py:166 +#: pysollib/gamedb.py:167 msgid "Raglan type" msgstr "Игры типа Реглан (Raglan)" -#: pysollib/gamedb.py:168 +#: pysollib/gamedb.py:169 msgid "Spider type" msgstr "Игры типа Паук (Spider)" -#: pysollib/gamedb.py:169 +#: pysollib/gamedb.py:170 msgid "Terrace type" msgstr "Игры типа Терраса (Terrace)" -#: pysollib/gamedb.py:170 +#: pysollib/gamedb.py:171 msgid "Yukon type" msgstr "Игры типа Юкон (Yukon)" -#: pysollib/gamedb.py:178 pysollib/gamedb.py:186 +#: pysollib/gamedb.py:179 pysollib/gamedb.py:187 msgid "French type" msgstr "Классические" -#: pysollib/gamedb.py:179 pysollib/gamedb.py:187 pysollib/gamedb.py:195 +#: pysollib/gamedb.py:180 pysollib/gamedb.py:188 pysollib/gamedb.py:196 msgid "Ganjifa type" msgstr "Игры типа Ганджифа" -#: pysollib/gamedb.py:180 pysollib/gamedb.py:188 pysollib/gamedb.py:196 +#: pysollib/gamedb.py:181 pysollib/gamedb.py:189 pysollib/gamedb.py:197 msgid "Hanafuda type" msgstr "Игры типа Ханафуда" -#: pysollib/gamedb.py:181 pysollib/gamedb.py:189 pysollib/gamedb.py:203 +#: pysollib/gamedb.py:182 pysollib/gamedb.py:190 pysollib/gamedb.py:204 msgid "Hex A Deck type" msgstr "Игры типа Hex A Deck" -#: pysollib/gamedb.py:182 pysollib/gamedb.py:190 pysollib/gamedb.py:208 +#: pysollib/gamedb.py:183 pysollib/gamedb.py:191 pysollib/gamedb.py:209 msgid "Tarock type" msgstr "Таро" -#: pysollib/gamedb.py:194 +#: pysollib/gamedb.py:195 msgid "Dashavatara Ganjifa type" msgstr "Игры типа Дашаватара Ганджифа" -#: pysollib/gamedb.py:197 +#: pysollib/gamedb.py:198 msgid "Mughal Ganjifa type" msgstr "Игры типа Мугал Ганджифа" -#: pysollib/gamedb.py:198 +#: pysollib/gamedb.py:199 msgid "Navagraha Ganjifa type" msgstr "Игры типа Наваграха Ганджифа" -#: pysollib/gamedb.py:202 +#: pysollib/gamedb.py:203 msgid "Shisen-Sho" msgstr "Шисен-Сё" -#: pysollib/gamedb.py:204 +#: pysollib/gamedb.py:205 msgid "Matrix type" msgstr "Мозаика" -#: pysollib/gamedb.py:205 +#: pysollib/gamedb.py:206 msgid "Memory type" msgstr "Игры на запоминание" -#: pysollib/gamedb.py:206 +#: pysollib/gamedb.py:207 msgid "Poker type" msgstr "Покер" -#: pysollib/gamedb.py:207 +#: pysollib/gamedb.py:208 msgid "Puzzle type" msgstr "Пазлы" @@ -1331,11 +1331,11 @@ msgstr "Не найден файл помощи\n" msgid " Help" msgstr " Помощь" -#: pysollib/main.py:67 pysollib/main.py:284 +#: pysollib/main.py:68 pysollib/main.py:287 msgid " installation error" msgstr " проблема с установкой" -#: pysollib/main.py:68 +#: pysollib/main.py:69 msgid "" "No %ss were found !!!\n" "\n" @@ -1345,11 +1345,11 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:75 pysollib/main.py:292 pysollib/tk/menubar.py:382 +#: pysollib/main.py:76 pysollib/main.py:295 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "В&ыход" -#: pysollib/main.py:99 +#: pysollib/main.py:100 msgid "" "%s: %s\n" "try %s --help for more information" @@ -1357,7 +1357,7 @@ msgstr "" "%s: %s\n" "попробуйте %s --help для получения более подробной информации" -#: pysollib/main.py:143 +#: pysollib/main.py:147 msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" @@ -1389,7 +1389,7 @@ msgstr "" " FILE - имя файла сохранённой игры\n" " MOD - one of following: pss(default), pygame, oss, win\n" -#: pysollib/main.py:161 +#: pysollib/main.py:165 msgid "" "%s: too many files\n" "try %s --help for more information" @@ -1397,7 +1397,7 @@ msgstr "" "\"%s: слишком много файлов\n" "попробуйте %s --help для получения более подробной информации" -#: pysollib/main.py:165 +#: pysollib/main.py:169 msgid "" "%s: invalid file name\n" "try %s --help for more information" @@ -1405,7 +1405,7 @@ msgstr "" "%s: неправильное имя файла\n" "попробуйте %s --help для получения более подробной информации" -#: pysollib/main.py:285 +#: pysollib/main.py:288 msgid "" "\n" "No games were found !!!\n" @@ -1416,18 +1416,18 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:371 pysollib/main.py:379 +#: pysollib/main.py:374 pysollib/main.py:382 msgid " installation problem" msgstr "" -#: pysollib/main.py:372 +#: pysollib/main.py:375 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:380 +#: pysollib/main.py:383 msgid "" "The pysolsoundserver module was not found.\n" "\n" @@ -1437,7 +1437,7 @@ msgstr "" "\n" "Звук и фоновая музыка будут недоступны" -#: pysollib/main.py:387 +#: pysollib/main.py:390 msgid "Welcome to " msgstr "Добро пожаловать в " diff --git a/pysollib/app.py b/pysollib/app.py index b13d0630..d37fa604 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -853,6 +853,7 @@ class Application: self.top.busyUpdate() def loadImages1(self): + # load dialog images dir = os.path.join("images", "logos") for f in ("joker07_40_774", "joker08_40_774", @@ -861,12 +862,33 @@ class Application: "joker11_100_774", "joker10_100",): self.gimages.logos.append(self.dataloader.findImage(f, dir)) + if os.name == 'posix': + dir = os.path.join('images', 'dialog', 'bluecurve') + else: + dir = os.path.join('images', 'dialog', 'default') + for f in ('error', 'info', 'question', 'warning'): + fn = self.dataloader.findImage(f, dir) + im = loadImage(fn) + MfxMessageDialog.img[f] = im + + # load button images + if 0 and TOOLKIT == 'tk': + dir = os.path.join('images', 'buttons', 'bluecurve') + for n, f in ( + (_('&OK'), 'ok'), + (_('&Cancel'), 'cancel'), + (_('&New game'), 'new'), + ): + fn = self.dataloader.findImage(f, dir) + im = loadImage(fn) + MfxDialog.button_img[n] = im + + def loadImages2(self): + # load canvas images dir = "images" ##for f in ("noredeal", "redeal",): for f in ("stopsign", "redeal",): self.gimages.redeal.append(self.dataloader.findImage(f, dir)) - - def loadImages2(self): dir = os.path.join("images", "demo") for f in ("demo01", "demo02", "demo03", "demo04", "demo05",): self.gimages.demo.append(self.dataloader.findImage(f, dir)) @@ -878,32 +900,16 @@ class Application: ## self.gimages.stats.append(self.dataloader.findImage(f, dir)) def loadImages3(self): - if os.name == 'posix': - dir = os.path.join('images', 'dialog', 'bluecurve') - else: - dir = os.path.join('images', 'dialog', 'default') - for f in ('error', 'info', 'question', 'warning'): - fn = self.dataloader.findImage(f, dir) - im = loadImage(fn) - MfxMessageDialog.img[f] = im - if 0 and TOOLKIT == 'tk': - dir = os.path.join('images', 'buttons', 'bluecurve') - for n, f in ( - (_('&OK'), 'ok'), - (_('&Cancel'), 'cancel'), - (_('&New game'), 'new'), - ): - fn = self.dataloader.findImage(f, dir) - im = loadImage(fn) - MfxDialog.button_img[n] = im + # load treeview images SelectDialogTreeData.img = [] dir = os.path.join('images', 'tree') for f in ('folder', 'openfolder', 'node', 'emptynode'): fn = self.dataloader.findImage(f, dir) im = loadImage(fn) SelectDialogTreeData.img.append(im) + + # load htmlviewer images dir = os.path.join('images', 'htmlviewer') - # fn = self.dataloader.findImage('disk', dir) HTMLViewer.symbols_fn['disk'] = fn diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py index 032391b1..d05f977b 100644 --- a/pysollib/games/capricieuse.py +++ b/pysollib/games/capricieuse.py @@ -48,16 +48,16 @@ class Capricieuse(Game): # game layout # - def createGame(self, **layout): + def createGame(self, rows=12): # create layout l, s = Layout(self), self.s # set window - self.setSize(l.XM+12*l.XS, l.YM+2*l.YS+15*l.YOFFSET) + self.setSize(l.XM+rows*l.XS, l.YM+2*l.YS+15*l.YOFFSET) # create stacks - x, y, = l.XM+2*l.XS, l.YM + x, y, = l.XM+(rows-8)*l.XS/2, l.YM for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) x = x + l.XS @@ -66,7 +66,7 @@ class Capricieuse(Game): base_rank=KING, dir=-1)) x = x + l.XS x, y, = l.XM, y + l.YS - for i in range(12): + for i in range(rows): s.rows.append(self.RowStack_Class(x, y, self, max_move=1, max_accept=1)) x = x + l.XS @@ -114,7 +114,7 @@ class Nationale(Capricieuse): class Strata(Game): - def createGame(self, **layout): + def createGame(self): # create layout l, s = Layout(self), self.s @@ -150,6 +150,27 @@ class Strata(Game): shallHighlightMatch = Game._shallHighlightMatch_AC +# /*********************************************************************** +# // Fifteen +# ************************************************************************/ + +class Fifteen(Capricieuse): + Talon_Class = InitialDealTalonStack + + def createGame(self): + Capricieuse.createGame(self, rows=15) + + def startGame(self): + for i in range(6): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRowAvail() + + def _shuffleHook(self, cards): + return cards + + + # register the game registerGame(GameInfo(292, Capricieuse, "Capricieuse", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 2, GI.SL_MOSTLY_SKILL)) @@ -159,4 +180,6 @@ registerGame(GameInfo(293, Nationale, "Nationale", registerGame(GameInfo(606, Strata, "Strata", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 2, GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) +registerGame(GameInfo(673, Fifteen, "Fifteen", + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index a1728d6b..95270311 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -1081,6 +1081,39 @@ class ShortTail(LongTail): LongTail.createGame(self, rows=8, playcards=24) +# /*********************************************************************** +# // Incompatibility +# ************************************************************************/ + +class Incompatibility(Spidike): + Talon_Class = GroundForADivorce_Talon + RowStack_Class = Spider_SS_RowStack + + def createGame(self): + Spidike.createGame(self, rows=10) + + def startGame(self): + for i in range(4): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + + +# /*********************************************************************** +# // Scorpion II +# ************************************************************************/ + +class ScorpionII(Scorpion): + + def startGame(self): + for i in (3, 3, 3, 0, 0, 0): + self.s.talon.dealRow(rows=self.s.rows[:i], flip=0, frames=0) + self.s.talon.dealRow(rows=self.s.rows[i:], flip=1, frames=0) + self.startDealSample() + self.s.talon.dealRow() + + + # register the game registerGame(GameInfo(10, RelaxedSpider, "Relaxed Spider", GI.GT_SPIDER | GI.GT_RELAXED, 2, 0, GI.SL_MOSTLY_SKILL)) @@ -1193,4 +1226,8 @@ registerGame(GameInfo(571, ShortTail, "Short Tail", registerGame(GameInfo(670, ChineseSpider, "Chinese Spider", GI.GT_SPIDER, 4, 0, GI.SL_MOSTLY_SKILL, suits=(0, 1, 2),)) +registerGame(GameInfo(671, Incompatibility, "Incompatibility", + GI.GT_SPIDER, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(672, ScorpionII, "Scorpion II", + GI.GT_SPIDER, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/main.py b/pysollib/main.py index 56a9f410..3f51d0ce 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -35,27 +35,26 @@ # imports -import sys, os, locale +import sys, os import traceback import getopt -import gettext # PySol imports from mfxutil import destruct, EnvError from util import CARDSET, DataLoader -import settings -from settings import PACKAGE, TOOLKIT, VERSION, SOUND_MOD from resource import Tile from gamedb import GI from app import Application from pysolaudio import thread, pysolsoundserver from pysolaudio import AbstractAudioClient, PysolSoundServerModuleClient from pysolaudio import Win32AudioClient, OSSAudioClient, PyGameAudioClient +import settings +PACKAGE, SOUND_MOD = settings.PACKAGE, settings.SOUND_MOD # Toolkit imports -from pysoltk import tkversion, wm_withdraw, loadImage +from pysoltk import wm_withdraw, loadImage from pysoltk import MfxMessageDialog, MfxExceptionDialog -from pysoltk import TclError, MfxRoot +from pysoltk import MfxRoot from pysoltk import PysolProgressBar @@ -97,21 +96,21 @@ def parse_option(argv): "sound-mod=", "help"]) except getopt.GetoptError, err: - print _("%s: %s\ntry %s --help for more information") \ + print >> sys.stderr, _("%s: %s\ntry %s --help for more information") \ % (prog_name, err, prog_name) return None - opts = {"help": False, - "game": None, - "gameid": None, - "fg": None, - "bg": None, - "fn": None, - "theme": None, - "french-only": False, - "noplugins": False, - "nosound": False, - "sound-mod": None, - "debug": None, + opts = {"help" : False, + "game" : None, + "gameid" : None, + "fg" : None, + "bg" : None, + "fn" : None, + "theme" : None, + "french-only" : False, + "noplugins" : False, + "nosound" : False, + "sound-mod" : None, + "debug" : None, } for i in optlist: if i[0] in ("-h", "--help"): @@ -162,11 +161,11 @@ def parse_option(argv): return None if len(args) > 1: - print _("%s: too many files\ntry %s --help for more information") % (prog_name, prog_name) + print >> sys.stderr, _("%s: too many files\ntry %s --help for more information") % (prog_name, prog_name) return None filename = args and args[0] or None if filename and not os.path.isfile(filename): - print _("%s: invalid file name\ntry %s --help for more information") % (prog_name, prog_name) + print >> sys.stderr, _("%s: invalid file name\ntry %s --help for more information") % (prog_name, prog_name) return None return opts, filename @@ -332,7 +331,7 @@ Please check your %s installation. if not app.audio.CAN_PLAY_SOUND: app.opt.sound = 0 if not opts["nosound"] and not opts['sound-mod'] and pysolsoundserver and not app.audio.connected: - print PACKAGE + ": could not connect to pysolsoundserver, sound disabled." + print >> sys.stderr, PACKAGE + ": could not connect to pysolsoundserver, sound disabled." warn_pysolsoundserver = 1 app.audio.updateSettings() # start up the background music @@ -364,9 +363,9 @@ Please check your %s installation. if thread is None: warn_thread = 1 if thread is None: - print PACKAGE + ": Python thread module not found, sound disabled." + print >> sys.stderr, PACKAGE+": Python thread module not found, sound disabled." else: - print PACKAGE + ": pysolsoundserver module not found, sound disabled." + print >> sys.stderr, PACKAGE+": pysolsoundserver module not found, sound disabled." sys.stdout.flush() if not opts["nosound"]: if warn_thread: @@ -415,39 +414,10 @@ Sounds and background music will be disabled.'''), # /*********************************************************************** -# // +# // main # ************************************************************************/ -def pysol_exit(app): - # clean up - if app.audio is not None: - app.audio.destroy() # shut down audio - destruct(app.audio) - ##app.wm_withdraw() - if app.canvas is not None: - app.canvas.destroy() - destruct(app.canvas) - if app.toolbar is not None: - app.toolbar.destroy() - destruct(app.toolbar) - if app.menubar is not None: - destruct(app.menubar) - top = app.top - destruct(app) - app = None - if top is not None: - try: - top.destroy() - except: - pass - destruct(top) - - -# /*********************************************************************** -# // PySol main entry -# ************************************************************************/ - -def pysol_main(args): +def main(args=None): # create the application app = Application() r = pysol_init(app, args) @@ -455,63 +425,4 @@ def pysol_main(args): return r # let's go - enter the mainloop app.mainloop() -## try: -## r = pysol_init(app, args) -## if r != 0: -## return r -## # let's go - enter the mainloop -## app.mainloop() -## except KeyboardInterrupt, ex: -## print "Exiting on SIGINT." -## pass -## except StandardError, ex: -## if not app.top: -## raise -## t = str(ex.__class__) -## if str(ex): t = t + ":\n" + str(ex) -## d = MfxMessageDialog(app.top, title=PACKAGE + " internal error", -## text="Internal errror. Please report this bug:\n\n"+t, -## strings=("&Quit",), bitmap="error") - try: - pysol_exit(app) - except: - pass return 0 - - -# /*********************************************************************** -# // main -# ************************************************************************/ - -def main(args=None): - - # setup (mainly for JPython) - if not hasattr(sys, "platform"): - sys.platform = "unknown" - if not hasattr(sys, "executable"): - sys.executable = None - if not hasattr(os, "defpath"): - os.defpath = "" - - # check versions - if sys.platform[:4] != "java": - if sys.version[:5] < "1.5.2": - print "%s needs Python 1.5.2 or better (you have %s)" % (PACKAGE, sys.version) - return 1 - assert len(tkversion) == 4 - if TOOLKIT == "tk": - import Tkinter - if tkversion < (8, 0, 0, 0): - print "%s needs Tcl/Tk 8.0 or better (you have %s)" % (PACKAGE, str(tkversion)) - return 1 - # check that Tkinter bindings are also at version 1.5.2 - if not hasattr(Tkinter.Wm, "wm_aspect") or not hasattr(Tkinter.Canvas, "tag_lower"): - print "%s: please update the Python-Tk bindings (aka Tkinter) to version 1.5.2 or better" % (PACKAGE,) - return 1 - # check Python - if -1 % 13 != 12: - raise Exception, "-1 % 13 != 12" - - # run it - return pysol_main(args) - diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py index 50d1f670..0be5c385 100644 --- a/pysollib/mfxutil.py +++ b/pysollib/mfxutil.py @@ -320,90 +320,6 @@ def unpickle(filename): return obj -# /*********************************************************************** -# // -# ************************************************************************/ - -def spawnv(file, args=()): - if not args: - args = () - args = (file,) + tuple(args) - # - if not os.path.isfile(file): - raise os.error, str(file) - mode = os.stat(file)[0] - if not (mode & 0100): - return 0 - # - if os.name == "posix": - pid = os.fork() - if pid == -1: - raise os.error, "fork failed" - if pid != 0: - # parent - try: - os.waitpid(pid, 0) - except: - pass - return 1 - # child - # 1) close all files - for fd in range(255, -1, -1): - try: - os.close(fd) - except: - pass - # 2) open stdin, stdout and stderr to /dev/null - try: - fd = os.open("/dev/null", os.O_RDWR) - os.dup(fd) - os.dup(fd) - except: - pass - # 3) fork again and exec program - try: - if os.fork() == 0: - try: - os.setpgrp() - except: - pass - os.execv(file, args) - except: - pass - # 4) exit - while 1: - os._exit(0) - return 0 - - -def spawnvp(file, args=()): - if file and os.path.isabs(file): - try: - if spawnv(file, args): - return file - except: - ##if traceback: traceback.print_exc() - pass - return None - # - path = os.environ.get("PATH", "") - path = path.split(os.pathsep) - for dir in path: - try: - if dir and os.path.isdir(dir): - f = os.path.join(dir, file) - try: - if spawnv(f, args): - return f - except: - ##if traceback: traceback.print_exc() - pass - except: - ##if traceback: traceback.print_exc() - pass - return None - - # /*********************************************************************** # // # ************************************************************************/ diff --git a/pysollib/tile/soundoptionsdialog.py b/pysollib/tile/soundoptionsdialog.py index bba93f5f..bc899e75 100644 --- a/pysollib/tile/soundoptionsdialog.py +++ b/pysollib/tile/soundoptionsdialog.py @@ -41,7 +41,7 @@ import Tile as Tkinter import traceback # PySol imports -from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct, spawnvp +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct from pysollib.settings import PACKAGE from pysollib.pysolaudio import pysolsoundserver diff --git a/pysollib/tile/tkhtml.py b/pysollib/tile/tkhtml.py index 6edc07f4..3c06825f 100644 --- a/pysollib/tile/tkhtml.py +++ b/pysollib/tile/tkhtml.py @@ -496,7 +496,8 @@ to open the following URL: def errorDialog(self, msg): d = MfxMessageDialog(self.parent, title=PACKAGE+" HTML Problem", - text=msg, bitmap="warning", + text=msg, + ##bitmap="warning", # FIXME: this interp don't have images strings=(_("&OK"),), default=0) def getImage(self, fn): diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index 19f7247e..da9fdcc6 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -41,7 +41,7 @@ import Tkinter import traceback # PySol imports -from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct, spawnvp +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct from pysollib.settings import PACKAGE from pysollib.pysolaudio import pysolsoundserver diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index d5be640d..ab968c83 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -495,7 +495,8 @@ to open the following URL: def errorDialog(self, msg): d = MfxMessageDialog(self.parent, title=PACKAGE+" HTML Problem", - text=msg, bitmap="warning", + text=msg, + ##bitmap="warning", # FIXME: this interp don't have images strings=(_("&OK"),), default=0) def getImage(self, fn): From 356f3808e8bf1978291f1a0e8328ba9a77f53b8f Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 10 Nov 2006 22:27:54 +0000 Subject: [PATCH 089/266] + 1 new game * improved tile binding * bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@92 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/games.pot | 5 +- po/pysol.pot | 45 ++++++++-------- po/ru_games.po | 7 ++- po/ru_pysol.po | 74 ++++++++++++++++---------- pysollib/games/pyramid.py | 102 ++++++++++++++++++++++++++++++++++++ pysollib/main.py | 26 ++++----- pysollib/pysolgtk/tkwrap.py | 3 +- pysollib/tile/Tile.py | 31 +++++++---- pysollib/tile/tkutil.py | 23 ++++---- 9 files changed, 228 insertions(+), 88 deletions(-) diff --git a/po/games.pot b/po/games.pot index d7b5d86c..9ff11803 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Thu Nov 9 17:36:05 2006\n" +"POT-Creation-Date: Fri Nov 10 23:00:51 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -945,6 +945,9 @@ msgstr "" msgid "Exiled Kings" msgstr "" +msgid "Exit" +msgstr "" + msgid "Express" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index 897e3b01..d950f238 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Thu Nov 9 17:36:57 2006\n" +"POT-Creation-Date: Fri Nov 10 23:01:45 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-11-09 17:36+0300\n" +"POT-Creation-Date: 2006-11-10 23:01+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -68,8 +68,8 @@ msgstr "" msgid "&Next number" msgstr "" -#: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 -#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1864 +#: pysollib/actions.py:314 pysollib/app.py:878 pysollib/app.py:1161 +#: pysollib/app.py:1173 pysollib/game.py:929 pysollib/game.py:1864 #: pysollib/main.py:379 pysollib/main.py:387 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 @@ -77,7 +77,7 @@ msgstr "" #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/selectcardset.py:397 pysollib/tk/selecttile.py:159 #: pysollib/tk/soundoptionsdialog.py:170 pysollib/tk/soundoptionsdialog.py:211 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:499 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:500 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:512 #: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594 #: pysollib/tk/tkstats.py:636 pysollib/tk/tkstats.py:708 @@ -86,7 +86,7 @@ msgstr "" msgid "&OK" msgstr "" -#: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167 +#: pysollib/actions.py:314 pysollib/app.py:879 pysollib/app.py:1173 #: pysollib/game.py:929 pysollib/game.py:1314 pysollib/game.py:1329 #: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 @@ -244,28 +244,28 @@ msgstr "" msgid "Unknown" msgstr "" -#: pysollib/app.py:894 pysollib/game.py:1314 pysollib/game.py:1329 +#: pysollib/app.py:880 pysollib/game.py:1314 pysollib/game.py:1329 #: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/menubar.py:363 msgid "&New game" msgstr "" -#: pysollib/app.py:1017 +#: pysollib/app.py:1023 msgid "Loading %s %s..." msgstr "" -#: pysollib/app.py:1052 +#: pysollib/app.py:1058 msgid " load error" msgstr "" -#: pysollib/app.py:1053 +#: pysollib/app.py:1059 msgid "Error while loading " msgstr "" -#: pysollib/app.py:1147 +#: pysollib/app.py:1153 msgid "Incompatible " msgstr "" -#: pysollib/app.py:1149 +#: pysollib/app.py:1155 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -274,7 +274,7 @@ msgid "" "Please select a %s type %s.\n" msgstr "" -#: pysollib/app.py:1165 +#: pysollib/app.py:1171 msgid "Please select a %s type %s" msgstr "" @@ -1227,13 +1227,13 @@ msgstr "" msgid " Help" msgstr "" -#: pysollib/main.py:68 pysollib/main.py:287 -msgid " installation error" +#: pysollib/main.py:67 pysollib/main.py:287 +msgid "%s installation error" msgstr "" -#: pysollib/main.py:69 +#: pysollib/main.py:68 msgid "" -"No %ss were found !!!\n" +"No cardsets were found !!!\n" "\n" "Main data directory is:\n" "%s\n" @@ -1241,17 +1241,17 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:76 pysollib/main.py:295 pysollib/tk/menubar.py:382 +#: pysollib/main.py:75 pysollib/main.py:295 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "" -#: pysollib/main.py:100 +#: pysollib/main.py:99 msgid "" "%s: %s\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:147 +#: pysollib/main.py:146 msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" @@ -1260,6 +1260,7 @@ msgid "" " --fg --foreground=COLOR foreground color\n" " --bg --background=COLOR background color\n" " --fn --font=FONT default font\n" +" --theme=THEME specify theme (for Tile binding)\n" " --sound-mod=MOD\n" " --nosound disable sound support\n" " --noplugins disable load plugins\n" @@ -1293,7 +1294,7 @@ msgid "" msgstr "" #: pysollib/main.py:374 pysollib/main.py:382 -msgid " installation problem" +msgid "%s installation problem" msgstr "" #: pysollib/main.py:375 @@ -1311,7 +1312,7 @@ msgid "" msgstr "" #: pysollib/main.py:390 -msgid "Welcome to " +msgid "Welcome to %s" msgstr "" #: pysollib/resource.py:192 diff --git a/po/ru_games.po b/po/ru_games.po index f2d6e134..eb5ea65c 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Thu Nov 9 17:36:05 2006\n" -"PO-Revision-Date: 2006-11-09 17:59+0300\n" +"POT-Creation-Date: Fri Nov 10 23:00:51 2006\n" +"PO-Revision-Date: 2006-11-10 13:20+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -954,6 +954,9 @@ msgstr "Оправдание" msgid "Exiled Kings" msgstr "Изгнанные короли" +msgid "Exit" +msgstr "Выход" + msgid "Express" msgstr "Экспресс" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index e9a60baa..ae6f26e8 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Thu Nov 9 17:36:57 2006\n" -"PO-Revision-Date: 2006-11-06 09:53+0300\n" +"POT-Creation-Date: Fri Nov 10 23:01:45 2006\n" +"PO-Revision-Date: 2006-11-10 23:18+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -53,8 +53,8 @@ msgstr "" msgid "&Next number" msgstr "&Следующий номер" -#: pysollib/actions.py:314 pysollib/app.py:892 pysollib/app.py:1155 -#: pysollib/app.py:1167 pysollib/game.py:929 pysollib/game.py:1864 +#: pysollib/actions.py:314 pysollib/app.py:878 pysollib/app.py:1161 +#: pysollib/app.py:1173 pysollib/game.py:929 pysollib/game.py:1864 #: pysollib/main.py:379 pysollib/main.py:387 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 @@ -62,7 +62,7 @@ msgstr "&Следующий номер" #: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/selectcardset.py:397 pysollib/tk/selecttile.py:159 #: pysollib/tk/soundoptionsdialog.py:170 pysollib/tk/soundoptionsdialog.py:211 -#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:499 +#: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:500 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:512 #: pysollib/tk/tkstats.py:579 pysollib/tk/tkstats.py:594 #: pysollib/tk/tkstats.py:636 pysollib/tk/tkstats.py:708 @@ -71,7 +71,7 @@ msgstr "&Следующий номер" msgid "&OK" msgstr "&ОК" -#: pysollib/actions.py:314 pysollib/app.py:893 pysollib/app.py:1167 +#: pysollib/actions.py:314 pysollib/app.py:879 pysollib/app.py:1173 #: pysollib/game.py:929 pysollib/game.py:1314 pysollib/game.py:1329 #: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 @@ -241,28 +241,28 @@ msgstr "Настроить таймауты" msgid "Unknown" msgstr "Неизвестный" -#: pysollib/app.py:894 pysollib/game.py:1314 pysollib/game.py:1329 +#: pysollib/app.py:880 pysollib/game.py:1314 pysollib/game.py:1329 #: pysollib/game.py:1336 pysollib/game.py:1342 pysollib/tk/menubar.py:363 msgid "&New game" msgstr "&Новая игра" -#: pysollib/app.py:1017 +#: pysollib/app.py:1023 msgid "Loading %s %s..." msgstr "Загружается %s %s..." -#: pysollib/app.py:1052 +#: pysollib/app.py:1058 msgid " load error" msgstr " ошибка при загрузке" -#: pysollib/app.py:1053 +#: pysollib/app.py:1059 msgid "Error while loading " msgstr "Ошибка при загрузке" -#: pysollib/app.py:1147 +#: pysollib/app.py:1153 msgid "Incompatible " msgstr "Несовместимый " -#: pysollib/app.py:1149 +#: pysollib/app.py:1155 msgid "" "The currently selected %s %s\n" "is not compatible with the game\n" @@ -276,7 +276,7 @@ msgstr "" "\n" "Необходимо выбрать %s типа %s.\n" -#: pysollib/app.py:1165 +#: pysollib/app.py:1171 msgid "Please select a %s type %s" msgstr "Выберите %s типа %s" @@ -1331,25 +1331,31 @@ msgstr "Не найден файл помощи\n" msgid " Help" msgstr " Помощь" -#: pysollib/main.py:68 pysollib/main.py:287 -msgid " installation error" -msgstr " проблема с установкой" +#: pysollib/main.py:67 pysollib/main.py:287 +msgid "%s installation error" +msgstr "%s проблема с установкой" -#: pysollib/main.py:69 +#: pysollib/main.py:68 msgid "" -"No %ss were found !!!\n" +"No cardsets were found !!!\n" "\n" "Main data directory is:\n" "%s\n" "\n" "Please check your %s installation.\n" msgstr "" +"Не найдены наборы карт!!!\n" +"\n" +"Основной каталог:\n" +"%s\n" +"\n" +"Пожалуйста проверьте установку %s.\n" -#: pysollib/main.py:76 pysollib/main.py:295 pysollib/tk/menubar.py:382 +#: pysollib/main.py:75 pysollib/main.py:295 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "В&ыход" -#: pysollib/main.py:100 +#: pysollib/main.py:99 msgid "" "%s: %s\n" "try %s --help for more information" @@ -1357,7 +1363,7 @@ msgstr "" "%s: %s\n" "попробуйте %s --help для получения более подробной информации" -#: pysollib/main.py:147 +#: pysollib/main.py:146 msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" @@ -1366,6 +1372,7 @@ msgid "" " --fg --foreground=COLOR foreground color\n" " --bg --background=COLOR background color\n" " --fn --font=FONT default font\n" +" --theme=THEME specify theme (for Tile binding)\n" " --sound-mod=MOD\n" " --nosound disable sound support\n" " --noplugins disable load plugins\n" @@ -1381,13 +1388,14 @@ msgstr "" " --fg --foreground=COLOR цвет текста\n" " --bg --background=COLOR цвет фона\n" " --fn --font=FONT шрифт по умолчанию\n" +" --theme=THEME установить тему (for Tile binding)\n" " --sound-mod=MOD\n" " --nosound отключить звук\n" " --noplugins отключить загрузку плагинов\n" " -h --help показать это сообщение и выйти\n" "\n" " FILE - имя файла сохранённой игры\n" -" MOD - one of following: pss(default), pygame, oss, win\n" +" MOD - одно из следующих значений: pss(default), pygame, oss, win\n" #: pysollib/main.py:165 msgid "" @@ -1415,10 +1423,17 @@ msgid "" "\n" "Please check your %s installation.\n" msgstr "" +"\n" +"Не найдены игры!!!\n" +"\n" +"Основной каталог с данными:\n" +"%s\n" +"\n" +"Пожалуйста проверьте установку %s.\n" #: pysollib/main.py:374 pysollib/main.py:382 -msgid " installation problem" -msgstr "" +msgid "%s installation problem" +msgstr "%s проблема с установкой" #: pysollib/main.py:375 msgid "" @@ -1426,6 +1441,9 @@ msgid "" "\n" "Sounds and background music will be disabled." msgstr "" +"Ваш дистрибутив Python собран без поддержки нитей.\n" +"\n" +"Звук и фоновая музыка будут недоступны." #: pysollib/main.py:383 msgid "" @@ -1433,13 +1451,13 @@ msgid "" "\n" "Sounds and background music will be disabled." msgstr "" -"Модуль pysolsoundserver не найден\n" +"Модуль pysolsoundserver не найден.\n" "\n" -"Звук и фоновая музыка будут недоступны" +"Звук и фоновая музыка будут недоступны." #: pysollib/main.py:390 -msgid "Welcome to " -msgstr "Добро пожаловать в " +msgid "Welcome to %s" +msgstr "Добро пожаловать в %s" #: pysollib/resource.py:192 msgid "French type (52 cards)" diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index b2f94121..1dae5f5a 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -938,6 +938,106 @@ class Cheops(Pyramid): return abs(card1.rank-card2.rank) in (0,1) +# /*********************************************************************** +# // Exit +# ************************************************************************/ + +class Exit_RowStack(Elevens_RowStack): + def acceptsCards(self, from_stack, cards): + #if self.basicIsBlocked(): + # return 0 + if from_stack is self or not self.cards or len(cards) != 1: + return False + c1 = self.cards[-1] + c2 = cards[0] + #if not c1.face_up or not c2.face_up: + # return False + return self.game._checkPair(c1, c2) + + def moveMove(self, ncards, to_stack, frames=-1, shadow=-1): + self._dropPairMove(ncards, to_stack, frames=-1, shadow=shadow) + + +class Exit(Game): + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + h1 = l.YS+5*l.YOFFSET + self.setSize(l.XM+7*l.XS, l.YM+2*h1+l.YS) + + # create stacks + y = l.YM + for i in (0, 1): + x = l.XM + for j in range(5): + stack = Exit_RowStack(x, y, self, base_rank=NO_RANK, + max_move=1, max_accept=1, dir=0) + s.rows.append(stack) + stack.CARD_YOFFSET = l.YOFFSET + x += l.XS + y += h1 + x, y = self.width-l.XS, l.YM + stack = Exit_RowStack(x, y, self, base_rank=NO_RANK, + max_move=1, max_accept=1, dir=0) + s.reserves.append(stack) + stack.CARD_YOFFSET = l.YOFFSET + x, y = self.width-l.XS, self.height-l.YS + s.foundations.append(AbstractFoundationStack(x, y, self, suit=ANY_SUIT, + max_accept=0, max_move=0, max_cards=52)) + l.createText(s.foundations[0], "n") + x, y = l.XM, self.height-l.YS + s.talon = InitialDealTalonStack(x, y, self) + + # define stack-groups + l.defaultStackGroups() + + def _checkPair(self, c1, c2): + if c1.rank + c2.rank == 9: # A-10, 2-9, 3-8, 4-7, 5-6 + return True + if c1.rank == JACK and c2.rank == JACK: + return True + if c1.rank + c2.rank == 23: # Q-K + return True + return False + + def _shuffleHook(self, cards): + swap_index = None + for i in range(10): + jack_indexes = [] + for j in range(5): + k = i*5+j + c = cards[k] + if c.rank == JACK: + jack_indexes.append(k) + if len(jack_indexes) == 3: + swap_index = jack_indexes[1] + if len(jack_indexes) >= 2: + break + if not swap_index is None: + i = -1 + if cards[-1].rank == JACK: # paranoia + i = -2 + cards[swap_index], cards[i] = cards[i], cards[swap_index] + cards.reverse() + return cards + + def startGame(self): + self.startDealSample() + for i in range(10): + for j in range(5): + self.s.talon.dealRow(rows=[self.s.rows[i]], frames=4) + self.s.talon.dealRow(rows=self.s.reserves, frames=4) + self.s.talon.dealRow(rows=self.s.reserves, frames=4) + +## def getAutoStacks(self, event=None): +## return ((), (), self.sg.dropstacks) + + def shallHighlightMatch(self, stack1, card1, stack2, card2): + return self._checkPair(card1, card2) + + # register the game registerGame(GameInfo(38, Pyramid, "Pyramid", @@ -969,4 +1069,6 @@ registerGame(GameInfo(658, Apophis, "Apophis", GI.GT_PAIRING_TYPE, 1, 2, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(659, Cheops, "Cheops", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(674, Exit, "Exit", + GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/main.py b/pysollib/main.py index 3f51d0ce..663c60ec 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -41,7 +41,7 @@ import getopt # PySol imports from mfxutil import destruct, EnvError -from util import CARDSET, DataLoader +from util import DataLoader from resource import Tile from gamedb import GI from app import Application @@ -64,16 +64,16 @@ from pysoltk import PysolProgressBar def fatal_no_cardsets(app): app.wm_withdraw() - d = MfxMessageDialog(app.top, title=PACKAGE + _(" installation error"), - text=_('''No %ss were found !!! + d = MfxMessageDialog(app.top, title=_("%s installation error") % PACKAGE, + text=_('''No cardsets were found !!! Main data directory is: %s Please check your %s installation. -''') % (CARDSET, app.dataloader.dir, PACKAGE), +''') % (app.dataloader.dir, PACKAGE), bitmap="error", strings=(_("&Quit"),)) - ##raise Exception, "no "+CARDSET+"s found !" + ##raise Exception, "no cardsets found !" # /*********************************************************************** @@ -150,6 +150,7 @@ def parse_option(argv): --fg --foreground=COLOR foreground color --bg --background=COLOR background color --fn --font=FONT default font + --theme=THEME specify theme (for Tile binding) --sound-mod=MOD --nosound disable sound support --noplugins disable load plugins @@ -283,7 +284,7 @@ def pysol_init(app, args): # check games if len(app.gdb.getGamesIdSortedByName()) == 0: app.wm_withdraw() - d = MfxMessageDialog(top, title=PACKAGE + _(" installation error"), + d = MfxMessageDialog(top, title=_("%s installation error") % PACKAGE, text=_(''' No games were found !!! @@ -331,7 +332,7 @@ Please check your %s installation. if not app.audio.CAN_PLAY_SOUND: app.opt.sound = 0 if not opts["nosound"] and not opts['sound-mod'] and pysolsoundserver and not app.audio.connected: - print >> sys.stderr, PACKAGE + ": could not connect to pysolsoundserver, sound disabled." + print >> sys.stderr, "%s: could not connect to pysolsoundserver, sound disabled." % PACKAGE warn_pysolsoundserver = 1 app.audio.updateSettings() # start up the background music @@ -363,14 +364,14 @@ Please check your %s installation. if thread is None: warn_thread = 1 if thread is None: - print >> sys.stderr, PACKAGE+": Python thread module not found, sound disabled." + print >> sys.stderr, "%s: Python thread module not found, sound disabled." % PACKAGE else: - print >> sys.stderr, PACKAGE+": pysolsoundserver module not found, sound disabled." + print >> sys.stderr, "%s: pysolsoundserver module not found, sound disabled." % PACKAGE sys.stdout.flush() if not opts["nosound"]: if warn_thread: top.update() - d = MfxMessageDialog(top, title=PACKAGE + _(" installation problem"), + d = MfxMessageDialog(top, title=_("%s installation problem") % PACKAGE, text=_('''\ Your Python installation is compiled without thread support. @@ -378,7 +379,7 @@ Sounds and background music will be disabled.'''), bitmap="warning", strings=(_("&OK"),)) elif warn_pysolsoundserver: top.update() - d = MfxMessageDialog(top, title=PACKAGE + _(" installation problem"), + d = MfxMessageDialog(top, title=_("%s installation problem") % PACKAGE, text=_('''\ The pysolsoundserver module was not found. @@ -386,7 +387,7 @@ Sounds and background music will be disabled.'''), bitmap="warning", strings=(_("&OK"),)) # create the progress bar - title = _("Welcome to ") + PACKAGE + title = _("Welcome to %s") % PACKAGE color = app.opt.colors['table'] if app.tabletile_index > 0: color = "#008200" @@ -425,4 +426,3 @@ def main(args=None): return r # let's go - enter the mainloop app.mainloop() - return 0 diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index e5e0ab3e..d10ad38f 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -67,6 +67,7 @@ class _MfxToplevel(gtk.Window): #self.add(self.vbox) self.table = gtk.Table(3, 6, False) self.add(self.table) + self.connect('destroy', self.mainquit) self.table.show() self.realize() @@ -112,7 +113,7 @@ class _MfxToplevel(gtk.Window): def mainloop(self): gtk.main() # the global function - def mainquit(self): + def mainquit(self, *args): gtk.main_quit() # the global function def screenshot(self, filename): diff --git a/pysollib/tile/Tile.py b/pysollib/tile/Tile.py index 7c9dfc6c..e5d05edc 100644 --- a/pysollib/tile/Tile.py +++ b/pysollib/tile/Tile.py @@ -27,8 +27,10 @@ TclError = Tkinter.TclError _flatten = Tkinter._flatten -class Style: - def __init__(self, master): +class Style(Tkinter.Misc): + def __init__(self, master=None): + if master is None: + master = Tkinter._default_root self.tk = master.tk def default(self, style, **kw): @@ -82,15 +84,6 @@ class Style: """Sets the current theme to themeName, and refreshes all widgets.""" return self.tk.call("style", "theme", "use", theme) - def _options(self, cnf): - """Internal function.""" - res = () - for k, v in cnf.items(): - if v is not None: - if k[-1] == '_': k = k[:-1] - res = res + ('-'+k, str(v)) - return res - def configure(self, style, **kw): """Sets the default value of the specified option(s) in style.""" @@ -98,6 +91,22 @@ class Style: return self.tk.call("style", "configure", style, *opts) config = configure + def lookup(self, style, option, state=None, default=None): + """Returns the value specified for -option in style + style in state state, using the standard lookup + rules for element options. state is a list of + state names; if omitted, it defaults to all bits + off (the ``normal'' state). If the default argu- + ment is present, it is used as a fallback value in + case no specification for -option is found.""" + opts = [] + if state: + opts = [state] + if default: + opts.append(default) + return self.tk.call("style", "lookup", style, "-"+option, *opts) + + class Widget(Tkinter.Widget, Style): def __init__(self, master, widgetName=None, cnf={}, kw={}, extra=()): diff --git a/pysollib/tile/tkutil.py b/pysollib/tile/tkutil.py index 2bd4592c..358af31b 100644 --- a/pysollib/tile/tkutil.py +++ b/pysollib/tile/tkutil.py @@ -421,6 +421,7 @@ def load_theme(app, top, theme): top.tk.call('source', f) # top.tk.call("package", "require", "tile") + style = Tkinter.Style(top) # load available themes d = os.path.join(app.dataloader.dir, 'themes') if os.path.isdir(d): @@ -434,26 +435,28 @@ def load_theme(app, top, theme): traceback.print_exc() pass # set theme - all_themes = top.tk.call('style', 'theme', 'names') + all_themes = style.theme_names() if theme not in all_themes: print >> sys.stderr, 'WARNING: invalid theme name:', theme theme = 'default' if theme: - top.tk.call('style', 'theme', 'use', theme) - if theme not in ('winnative',): - bg = top.tk.call('style', 'lookup', '.', '-background') - top.tk_setPalette(bg) - bg = top.tk.call('style', 'lookup', '.', '-background', 'active') - top.option_add('*Menu.activeBackground', bg) + style.theme_use(theme) + if theme not in ('winnative', 'xpnative'): + color = style.lookup('.', 'background') + if color: + top.tk_setPalette(color) + color = style.lookup('.', 'background', 'active') + if color: + top.option_add('*Menu.activeBackground', color) if theme == 'winnative': - top.tk.call('style', 'configure', 'Toolbutton', '-padding', '1 1') + style.configure('Toolbutton', padding=1) #if 'xpnative' in all_themes: # theme = 'xpnative' font = app.opt.fonts['default'] if font: - top.tk.call('style', 'configure', '.', '-font', font) + style.configure('.', font=font) else: - font = top.tk.call('style', 'lookup', '.', '-font') + font = style.lookup('.', 'font') if font: top.option_add('*font', font) From e9163216b3e4fbfddf3908a38aed9c64e6cb1a8f Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sat, 11 Nov 2006 22:12:11 +0000 Subject: [PATCH 090/266] + 3 new games git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@93 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/games.pot | 11 ++++- po/pysol.pot | 4 +- po/ru_games.po | 14 +++++- po/ru_pysol.po | 2 +- pysollib/games/pyramid.py | 44 +++++++++++++++++++ pysollib/games/royalcotillion.py | 74 ++++++++++++++++++++++++++++++++ pysollib/games/ultra/hanafuda.py | 2 +- 7 files changed, 144 insertions(+), 7 deletions(-) diff --git a/po/games.pot b/po/games.pot index 9ff11803..09cb16cc 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri Nov 10 23:00:51 2006\n" +"POT-Creation-Date: Sat Nov 11 14:41:04 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -357,6 +357,9 @@ msgstr "" msgid "Box Kite" msgstr "" +msgid "Boxing the Compass" +msgstr "" + msgid "Braid" msgstr "" @@ -1296,6 +1299,9 @@ msgstr "" msgid "Hanafuda Four Seasons" msgstr "" +msgid "Hanafuda Four Winds" +msgstr "" + msgid "Hanoi Puzzle 4" msgstr "" @@ -3555,6 +3561,9 @@ msgstr "" msgid "Two Familiars" msgstr "" +msgid "Two Pyramids" +msgstr "" + msgid "Two Squares" msgstr "" diff --git a/po/pysol.pot b/po/pysol.pot index d950f238..1beceff4 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Fri Nov 10 23:01:45 2006\n" +"POT-Creation-Date: Sat Nov 11 14:41:56 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-11-10 23:01+0300\n" +"POT-Creation-Date: 2006-11-11 14:41+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/ru_games.po b/po/ru_games.po index eb5ea65c..49b0a271 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri Nov 10 23:00:51 2006\n" -"PO-Revision-Date: 2006-11-10 13:20+0300\n" +"POT-Creation-Date: Sat Nov 11 14:41:04 2006\n" +"PO-Revision-Date: 2006-11-11 14:43+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -359,6 +359,9 @@ msgstr "Коробка для веера" msgid "Box Kite" msgstr "Воздушный змей" +msgid "Boxing the Compass" +msgstr "Футляр для компаса" + msgid "Braid" msgstr "Коса" @@ -1314,6 +1317,9 @@ msgstr "Половинный Маджонг Стена" msgid "Hanafuda Four Seasons" msgstr "Ханафуда Четыре сезона" +msgid "Hanafuda Four Winds" +msgstr "Ханафуда Четыре ветра" + msgid "Hanoi Puzzle 4" msgstr "Ханойская головоломка 4" @@ -3611,6 +3617,10 @@ msgstr "Маджонг Two Domes" msgid "Two Familiars" msgstr "Два знакомца" +#, fuzzy +msgid "Two Pyramids" +msgstr "Пирамида" + msgid "Two Squares" msgstr "Два квадрата" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index ae6f26e8..107dc162 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Fri Nov 10 23:01:45 2006\n" +"POT-Creation-Date: Sat Nov 11 14:41:56 2006\n" "PO-Revision-Date: 2006-11-10 23:18+0300\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index 1dae5f5a..7543b4ea 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -1038,6 +1038,48 @@ class Exit(Game): return self._checkPair(card1, card2) +# /*********************************************************************** +# // Two Pyramids +# ************************************************************************/ + +class TwoPyramids(Pyramid): + + def createGame(self): + # create layout + l, s = Layout(self), self.s + + # set window + w = l.XM + 14*l.XS + h = l.YM + 5*l.YS + self.setSize(w, h) + + # create stacks + x, y = l.XM, l.YM+l.YS + s.rows = self._createPyramid(l, x, y, 7) + x += 7*l.XS + s.rows += self._createPyramid(l, x, y, 7) + + x, y = l.XM, l.YM + s.talon = self.Talon_Class(x, y, self) + l.createText(s.talon, "se") + tx, ty, ta, tf = l.getTextAttr(s.talon, "ne") + font = self.app.getFont("canvas_default") + s.talon.texts.rounds = MfxCanvasText(self.canvas, tx, ty, + anchor=ta, font=font) + y += l.YS + s.waste = self.WasteStack_Class(x, y, self, max_accept=1) + l.createText(s.waste, "se") + x, y = self.width-l.XS, l.YM + s.foundations.append(self.Foundation_Class(x, y, self, + suit=ANY_SUIT, dir=0, base_rank=ANY_RANK, + max_move=0, max_cards=104)) + # define stack-groups + l.defaultStackGroups() + self.sg.openstacks.append(s.talon) + self.sg.dropstacks.append(s.talon) + self.sg.openstacks.append(s.waste) + + # register the game registerGame(GameInfo(38, Pyramid, "Pyramid", @@ -1071,4 +1113,6 @@ registerGame(GameInfo(659, Cheops, "Cheops", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(674, Exit, "Exit", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(677, TwoPyramids, "Two Pyramids", + GI.GT_PAIRING_TYPE | GI.GT_ORIGINAL, 2, 2, GI.SL_MOSTLY_LUCK)) diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index d11f2cff..4d7fe037 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -909,6 +909,76 @@ class ShadyLanes(Game): shallHighlightMatch = Game._shallHighlightMatch_AC +# /*********************************************************************** +# // Four Winds +# // Boxing the Compass +# ************************************************************************/ + +class FourWinds_RowStack(ReserveStack): + def getBottomImage(self): + return self.game.app.images.getSuitBottom(self.cap.base_suit) + + +class FourWinds(Game): + + def createGame(self): + l, s = Layout(self), self.s + self.setSize(l.XM+9*l.XS, l.YM+6*l.YS) + + # vertical rows + x = l.XM+l.XS + for i in (0, 1): + y = l.YM+l.YS + for j in range(4): + s.rows.append(FourWinds_RowStack(x, y, self, base_suit=i)) + y += l.YS + x += 6*l.XS + # horizontal rows + y = l.YM+l.YS + for i in (2, 3): + x = l.XM+2.5*l.XS + for j in range(4): + s.rows.append(FourWinds_RowStack(x, y, self, base_suit=i)) + x += l.XS + y += 3*l.YS + # foundations + decks = self.gameinfo.decks + for k in range(decks): + suit = 0 + for i, j in ((0, 3-decks*0.5+k), + (8, 3-decks*0.5+k), + (4.5-decks*0.5+k, 0), + (4.5-decks*0.5+k, 5)): + x, y = l.XM+i*l.XS, l.YM+j*l.YS + s.foundations.append(SS_FoundationStack(x, y, self, + suit=suit, max_move=0)) + suit += 1 + # talon & waste + x, y = l.XM+3.5*l.XS, l.YM+2.5*l.YS + s.talon = WasteTalonStack(x, y, self, max_rounds=2) + l.createText(s.talon, 'n') + x += l.XS + s.waste = WasteStack(x, y, self) + l.createText(s.waste, 'n') + + l.defaultStackGroups() + + def startGame(self): + self.s.talon.dealRow(rows=self.s.foundations, frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealCards() + + def _shuffleHook(self, cards): + # move Aces to top of the Talon (i.e. first cards to be dealt) + return self._shuffleHookMoveToTop(cards, + lambda c: (c.rank == ACE, (c.deck, c.suit))) + + +class BoxingTheCompass(FourWinds): + pass + + # register the game registerGame(GameInfo(54, RoyalCotillion, "Royal Cotillion", @@ -943,4 +1013,8 @@ registerGame(GameInfo(638, RoyalRendezvous, "Royal Rendezvous", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) registerGame(GameInfo(639, ShadyLanes, "Shady Lanes", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED)) +registerGame(GameInfo(675, FourWinds, "Four Winds", + GI.GT_1DECK_TYPE, 1, 1, GI.SL_BALANCED)) +registerGame(GameInfo(676, BoxingTheCompass, "Boxing the Compass", + GI.GT_2DECK_TYPE, 2, 1, GI.SL_BALANCED)) diff --git a/pysollib/games/ultra/hanafuda.py b/pysollib/games/ultra/hanafuda.py index b3e818ec..01a0b98b 100644 --- a/pysollib/games/ultra/hanafuda.py +++ b/pysollib/games/ultra/hanafuda.py @@ -1030,7 +1030,7 @@ r(12348, FlowerClock, "Flower Clock", GI.GT_HANAFUDA | GI.GT_OPEN, 1, 0, GI.SL_M r(12349, Pagoda, "Pagoda", GI.GT_HANAFUDA, 2, 0, GI.SL_BALANCED) r(12350, Samuri, "Samuri", GI.GT_HANAFUDA, 1, 0, GI.SL_BALANCED) r(12351, GreatWall, "Great Wall", GI.GT_HANAFUDA, 4, 0, GI.SL_MOSTLY_SKILL) -r(12352, FourWinds, "Four Winds", GI.GT_HANAFUDA, 1, 1, GI.SL_MOSTLY_SKILL) +r(12352, FourWinds, "Hanafuda Four Winds", GI.GT_HANAFUDA, 1, 1, GI.SL_MOSTLY_SKILL) r(12353, Sumo, "Sumo", GI.GT_HANAFUDA, 1, 0, GI.SL_MOSTLY_SKILL) r(12354, BigSumo, "Big Sumo", GI.GT_HANAFUDA, 2, 0, GI.SL_MOSTLY_SKILL) r(12355, LittleEasy, "Little Easy", GI.GT_HANAFUDA, 1, -1, GI.SL_BALANCED) From 0b5a34c522627d535bec93e1fd578bb9d837e16a Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 12 Nov 2006 02:42:04 +0000 Subject: [PATCH 091/266] + added dir data/html-src git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@94 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- data/html-src/all.htm | 7275 +++++++++++++++++ data/html-src/credits.html | 98 + data/html-src/ganjifa.html | 13 + data/html-src/gen-html.py | 234 + data/html-src/general_rules.html | 38 + data/html-src/glossary.html | 240 + data/html-src/hanafuda.html | 21 + data/html-src/hexadeck.html | 21 + data/html-src/howtoplay.html | 131 + data/html-src/images/c.gif | Bin 0 -> 80 bytes data/html-src/images/camelot-goal.gif | Bin 0 -> 30567 bytes data/html-src/images/d.gif | Bin 0 -> 70 bytes data/html-src/images/h.gif | Bin 0 -> 73 bytes data/html-src/images/hanahelp.gif | Bin 0 -> 77727 bytes data/html-src/images/pysollogo00.gif | Bin 0 -> 2226 bytes data/html-src/images/pysollogo01.gif | Bin 0 -> 18890 bytes data/html-src/images/pysollogo02.gif | Bin 0 -> 13378 bytes data/html-src/images/pysollogo03.gif | Bin 0 -> 4101 bytes data/html-src/images/s.gif | Bin 0 -> 76 bytes data/html-src/index.html | 29 + data/html-src/install.html | 47 + data/html-src/intro.html | 39 + data/html-src/license.html | 331 + data/html-src/news.html | 221 + data/html-src/rules.html | 10 + data/html-src/rules/10x8.html | 20 + data/html-src/rules/8x8.html | 24 + data/html-src/rules/abacus.html | 38 + data/html-src/rules/acesup.html | 27 + data/html-src/rules/acesup5.html | 16 + data/html-src/rules/agnessorel.html | 25 + data/html-src/rules/akbarsconquest.html | 31 + data/html-src/rules/akbarstriumph.html | 28 + data/html-src/rules/alaska.html | 16 + data/html-src/rules/americantoad.html | 17 + data/html-src/rules/appachanswaterfall.html | 27 + data/html-src/rules/ashrafi.html | 22 + data/html-src/rules/ashtadikapala.html | 36 + data/html-src/rules/ashwapati.html | 24 + data/html-src/rules/auldlangsyne.html | 22 + data/html-src/rules/babyspiderette.html | 18 + data/html-src/rules/badseven.html | 13 + data/html-src/rules/bakersdozen.html | 15 + data/html-src/rules/bakersgame.html | 31 + data/html-src/rules/balarama.html | 16 + data/html-src/rules/batsford.html | 17 + data/html-src/rules/beleagueredcastle.html | 19 + data/html-src/rules/betsyross.html | 35 + data/html-src/rules/bigbraid.html | 16 + data/html-src/rules/bigdivorce.html | 16 + data/html-src/rules/bigeasy.html | 25 + data/html-src/rules/bigharp.html | 28 + data/html-src/rules/bigspider.html | 16 + data/html-src/rules/bigsumo.html | 27 + data/html-src/rules/bitsnbytes.html | 40 + data/html-src/rules/blackhole.html | 26 + data/html-src/rules/blackwidow.html | 18 + data/html-src/rules/blindalleys.html | 23 + data/html-src/rules/blondesandbrunettes.html | 11 + data/html-src/rules/bluemoon.html | 31 + data/html-src/rules/braid.html | 44 + data/html-src/rules/bridgetsgame.html | 39 + data/html-src/rules/bridgetsgamedoubled.html | 41 + data/html-src/rules/bristol.html | 14 + data/html-src/rules/brunswick.html | 17 + data/html-src/rules/busyaces.html | 16 + data/html-src/rules/calculation.html | 24 + data/html-src/rules/camelot.html | 53 + data/html-src/rules/canfield.html | 44 + data/html-src/rules/carlton.html | 16 + data/html-src/rules/carpet.html | 16 + data/html-src/rules/casinoklondike.html | 23 + data/html-src/rules/castlesinspain.html | 13 + data/html-src/rules/catstail.html | 25 + data/html-src/rules/cavalier.html | 25 + data/html-src/rules/chameleon.html | 22 + data/html-src/rules/cherrybomb.html | 27 + data/html-src/rules/chessboard.html | 18 + data/html-src/rules/chinesediscipline.html | 25 + data/html-src/rules/chinesesolitaire.html | 19 + data/html-src/rules/citadel.html | 16 + data/html-src/rules/cluitjarslair.html | 23 + data/html-src/rules/cockroach.html | 13 + data/html-src/rules/concentration.html | 26 + data/html-src/rules/congress.html | 17 + data/html-src/rules/convolution.html | 19 + data/html-src/rules/corkscrew.html | 19 + data/html-src/rules/corona.html | 16 + data/html-src/rules/courtyard.html | 17 + data/html-src/rules/cruel.html | 15 + data/html-src/rules/danda.html | 20 + data/html-src/rules/dashavatara.html | 36 + data/html-src/rules/dashavataracircles.html | 14 + data/html-src/rules/deadkinggolf.html | 19 + data/html-src/rules/derfreienapoleon.html | 17 + data/html-src/rules/derkleinenapoleon.html | 46 + data/html-src/rules/deuces.html | 16 + data/html-src/rules/dhanpati.html | 26 + data/html-src/rules/diekoenigsbergerin.html | 19 + data/html-src/rules/diplomat.html | 16 + data/html-src/rules/dojoujisgame.html | 22 + data/html-src/rules/dojoujisgamedoubled.html | 22 + data/html-src/rules/doublebisley.html | 16 + data/html-src/rules/doublecanfield.html | 16 + data/html-src/rules/doublecockroach.html | 15 + data/html-src/rules/doubledrawbridge.html | 17 + data/html-src/rules/doublegrasshopper.html | 34 + data/html-src/rules/doubleklondike.html | 16 + .../rules/doubleklondikebythrees.html | 16 + data/html-src/rules/doublerail.html | 17 + data/html-src/rules/doublesamuri.html | 20 + data/html-src/rules/doublets.html | 23 + data/html-src/rules/doubleyourfun.html | 25 + data/html-src/rules/dover.html | 16 + data/html-src/rules/drawbridge.html | 19 + data/html-src/rules/eaglewing.html | 11 + data/html-src/rules/eastcliff.html | 23 + data/html-src/rules/easthaven.html | 23 + data/html-src/rules/easysupreme.html | 25 + data/html-src/rules/easyxone.html | 27 + data/html-src/rules/eiffeltower.html | 21 + data/html-src/rules/eightlegions.html | 21 + data/html-src/rules/eightoff.html | 16 + data/html-src/rules/eighttimeseight.html | 17 + data/html-src/rules/elevator.html | 21 + data/html-src/rules/eularia.html | 21 + data/html-src/rules/excuse.html | 27 + data/html-src/rules/fallingstar.html | 15 + data/html-src/rules/fan.html | 17 + data/html-src/rules/fastness.html | 16 + data/html-src/rules/fatimehsgame.html | 20 + data/html-src/rules/fatimehsgamerelaxed.html | 29 + data/html-src/rules/fifteenplus.html | 26 + data/html-src/rules/firecracker.html | 24 + data/html-src/rules/fiveaces.html | 26 + data/html-src/rules/flowerarrangement.html | 33 + data/html-src/rules/flowerclock.html | 38 + data/html-src/rules/forecell.html | 23 + data/html-src/rules/fortress.html | 19 + data/html-src/rules/fortyandeight.html | 16 + data/html-src/rules/fortythieves.html | 23 + data/html-src/rules/fourteen.html | 22 + data/html-src/rules/freecell.html | 31 + data/html-src/rules/freefan.html | 16 + data/html-src/rules/freenapoleon.html | 17 + data/html-src/rules/gajapati.html | 25 + data/html-src/rules/gaji.html | 31 + data/html-src/rules/gargantua.html | 16 + data/html-src/rules/garhpati.html | 29 + data/html-src/rules/generalspatience.html | 16 + data/html-src/rules/ghulam.html | 19 + data/html-src/rules/giant.html | 17 + data/html-src/rules/glenwood.html | 29 + data/html-src/rules/golf.html | 25 + data/html-src/rules/goodmeasure.html | 17 + data/html-src/rules/grandfathersclock.html | 20 + data/html-src/rules/grandmothersgame.html | 43 + data/html-src/rules/grasshopper.html | 33 + data/html-src/rules/greaterqueue.html | 19 + data/html-src/rules/greatwall.html | 44 + data/html-src/rules/griffon.html | 16 + data/html-src/rules/groundforadivorce.html | 39 + data/html-src/rules/gypsy.html | 35 + data/html-src/rules/hanafudafourseasons.html | 17 + data/html-src/rules/hanafudafourwinds.html | 29 + data/html-src/rules/hayagriva.html | 14 + data/html-src/rules/hexaklon.html | 36 + data/html-src/rules/hexaklonbythrees.html | 26 + data/html-src/rules/hexlabyrinth.html | 19 + data/html-src/rules/hiddenpassages.html | 21 + data/html-src/rules/hiranyaksha.html | 19 + data/html-src/rules/hopscotch.html | 16 + data/html-src/rules/imperialtrumps.html | 33 + data/html-src/rules/indian.html | 16 + data/html-src/rules/interregnum.html | 29 + data/html-src/rules/iris.html | 21 + data/html-src/rules/irmgard.html | 27 + data/html-src/rules/jane.html | 32 + data/html-src/rules/japanesegarden.html | 20 + data/html-src/rules/japanesegardenii.html | 11 + data/html-src/rules/japanesegardeniii.html | 11 + data/html-src/rules/journeytocuddapah.html | 26 + data/html-src/rules/jumbo.html | 16 + data/html-src/rules/justforfun.html | 25 + data/html-src/rules/kalisgame.html | 21 + data/html-src/rules/kalisgamedoubled.html | 31 + data/html-src/rules/kalisgamerelaxed.html | 30 + data/html-src/rules/katrinasgame.html | 25 + data/html-src/rules/katrinasgamedoubled.html | 31 + data/html-src/rules/katrinasgamerelaxed.html | 31 + data/html-src/rules/khadga.html | 19 + data/html-src/rules/kingalbert.html | 23 + data/html-src/rules/kingdom.html | 21 + data/html-src/rules/kingonlybakersgame.html | 23 + data/html-src/rules/kingonlyhexaklon.html | 30 + data/html-src/rules/kings.html | 25 + data/html-src/rules/klondike.html | 19 + data/html-src/rules/klondikebythrees.html | 16 + data/html-src/rules/klondikeplus16.html | 27 + data/html-src/rules/kurma.html | 20 + data/html-src/rules/labellelucie.html | 21 + data/html-src/rules/ladybetty.html | 20 + data/html-src/rules/ladypalk.html | 17 + data/html-src/rules/larasgame.html | 48 + data/html-src/rules/larasgamedoubled.html | 28 + data/html-src/rules/larasgamerelaxed.html | 28 + data/html-src/rules/lesserqueue.html | 18 + data/html-src/rules/lexingtonharp.html | 26 + data/html-src/rules/littleeasy.html | 28 + data/html-src/rules/littleforty.html | 26 + data/html-src/rules/longbraid.html | 16 + .../html-src/rules/longjourneytocuddapah.html | 26 + data/html-src/rules/lucas.html | 16 + data/html-src/rules/magesgame.html | 19 + data/html-src/rules/mahjongg.html | 31 + data/html-src/rules/makara.html | 20 + data/html-src/rules/maria.html | 17 + data/html-src/rules/martha.html | 15 + data/html-src/rules/matriarchy.html | 21 + data/html-src/rules/matrix.html | 23 + data/html-src/rules/matsukiri.html | 38 + data/html-src/rules/matsukiristrict.html | 10 + data/html-src/rules/matsya.html | 20 + data/html-src/rules/maze.html | 29 + data/html-src/rules/memory24.html | 26 + data/html-src/rules/memory40.html | 26 + data/html-src/rules/merlinsmeander.html | 19 + data/html-src/rules/midshipman.html | 17 + data/html-src/rules/milligancell.html | 19 + data/html-src/rules/milliganharp.html | 26 + data/html-src/rules/mississippi.html | 16 + data/html-src/rules/missmilligan.html | 23 + data/html-src/rules/missmuffet.html | 12 + data/html-src/rules/montana.html | 35 + data/html-src/rules/montecarlo.html | 26 + data/html-src/rules/moosehide.html | 16 + data/html-src/rules/mughalcircles.html | 18 + data/html-src/rules/napoleon.html | 17 + data/html-src/rules/napoleonsexile.html | 24 + data/html-src/rules/narasimha.html | 23 + data/html-src/rules/narpati.html | 29 + data/html-src/rules/nasty.html | 21 + data/html-src/rules/neighbour.html | 34 + data/html-src/rules/newtowerofhanoi.html | 14 + data/html-src/rules/nomad.html | 44 + data/html-src/rules/nordic.html | 12 + data/html-src/rules/numberten.html | 17 + data/html-src/rules/numerica.html | 35 + data/html-src/rules/oddandeven.html | 21 + data/html-src/rules/odessa.html | 22 + data/html-src/rules/oonsoo.html | 26 + data/html-src/rules/oonsooopen.html | 23 + data/html-src/rules/oonsoostrict.html | 23 + data/html-src/rules/oonsootimestwo.html | 20 + data/html-src/rules/oonsootoo.html | 22 + data/html-src/rules/osmosis.html | 11 + data/html-src/rules/pagat.html | 26 + data/html-src/rules/pagoda.html | 34 + data/html-src/rules/parashurama.html | 22 + data/html-src/rules/pasdedeux.html | 29 + data/html-src/rules/passeul.html | 24 + data/html-src/rules/paulownia.html | 25 + data/html-src/rules/peek.html | 16 + data/html-src/rules/pegged.html | 21 + data/html-src/rules/penguin.html | 20 + data/html-src/rules/peony.html | 21 + data/html-src/rules/perpetualmotion.html | 20 + data/html-src/rules/picturegallery.html | 38 + data/html-src/rules/pileon.html | 25 + data/html-src/rules/pine.html | 21 + data/html-src/rules/pokershuffle.html | 18 + data/html-src/rules/pokersquare.html | 16 + data/html-src/rules/ponytail.html | 22 + data/html-src/rules/pyramid.html | 22 + data/html-src/rules/quadrangle.html | 18 + data/html-src/rules/queenie.html | 25 + data/html-src/rules/rachel.html | 19 + data/html-src/rules/rainbow.html | 16 + data/html-src/rules/rainfall.html | 16 + data/html-src/rules/rambling.html | 20 + data/html-src/rules/rankandfile.html | 18 + data/html-src/rules/redandblack.html | 18 + data/html-src/rules/redmoon.html | 21 + data/html-src/rules/relax.html | 29 + data/html-src/rules/relaxedfreecell.html | 15 + data/html-src/rules/relaxedgolf.html | 21 + data/html-src/rules/relaxedpyramid.html | 20 + .../html-src/rules/relaxedseahaventowers.html | 15 + data/html-src/rules/relaxedspider.html | 16 + data/html-src/rules/roslin.html | 16 + data/html-src/rules/royalcotillion.html | 23 + data/html-src/rules/royaleast.html | 17 + data/html-src/rules/rushdike.html | 25 + data/html-src/rules/russianpatience.html | 17 + data/html-src/rules/russianpoint.html | 25 + data/html-src/rules/russiansolitaire.html | 22 + data/html-src/rules/samuri.html | 28 + data/html-src/rules/sanibel.html | 72 + data/html-src/rules/saratoga.html | 16 + data/html-src/rules/scorpion.html | 33 + data/html-src/rules/scorpionhead.html | 16 + data/html-src/rules/scorpiontail.html | 16 + data/html-src/rules/scotchpatience.html | 15 + data/html-src/rules/seahaventowers.html | 16 + data/html-src/rules/serpent.html | 20 + data/html-src/rules/sevenbyfive.html | 16 + data/html-src/rules/sevenbyfour.html | 16 + data/html-src/rules/shamrocks.html | 18 + data/html-src/rules/shamsher.html | 18 + data/html-src/rules/shanka.html | 15 + data/html-src/rules/shisensho.html | 25 + data/html-src/rules/siebenbisas.html | 31 + data/html-src/rules/simplecarlo.html | 27 + data/html-src/rules/simplepairs.html | 18 + data/html-src/rules/simplesimon.html | 17 + data/html-src/rules/singlerail.html | 16 + data/html-src/rules/sixsages.html | 11 + data/html-src/rules/sixtengus.html | 16 + data/html-src/rules/skiz.html | 26 + data/html-src/rules/smallharp.html | 21 + data/html-src/rules/snake.html | 30 + data/html-src/rules/snakestone.html | 19 + data/html-src/rules/spaces.html | 21 + data/html-src/rules/spanishpatience.html | 16 + data/html-src/rules/spider.html | 28 + data/html-src/rules/spiderette.html | 17 + data/html-src/rules/stalactites.html | 19 + data/html-src/rules/steps.html | 17 + data/html-src/rules/storehouse.html | 22 + data/html-src/rules/strategy.html | 17 + data/html-src/rules/streets.html | 16 + data/html-src/rules/streetsandalleys.html | 16 + data/html-src/rules/stronghold.html | 16 + data/html-src/rules/sumo.html | 25 + data/html-src/rules/superflowergarden.html | 21 + data/html-src/rules/superiorcanfield.html | 17 + data/html-src/rules/supersamuri.html | 20 + data/html-src/rules/surukh.html | 17 + data/html-src/rules/tamoshanter.html | 26 + data/html-src/rules/tenavatars.html | 17 + data/html-src/rules/terrace.html | 11 + data/html-src/rules/thefamiliar.html | 25 + data/html-src/rules/thelastmonarch.html | 19 + data/html-src/rules/threepeaks.html | 36 + data/html-src/rules/threepeaksnonscoring.html | 10 + .../html-src/rules/threeshufflesandadraw.html | 25 + data/html-src/rules/thumbandpouch.html | 17 + data/html-src/rules/tipati.html | 25 + data/html-src/rules/towerofhanoy.html | 18 + data/html-src/rules/trefoil.html | 21 + data/html-src/rules/tripeaks.html | 39 + data/html-src/rules/tripleklondike.html | 16 + .../rules/tripleklondikebythrees.html | 16 + data/html-src/rules/tripleline.html | 18 + data/html-src/rules/twofamiliars.html | 23 + data/html-src/rules/unionsquare.html | 26 + data/html-src/rules/vajra.html | 19 + data/html-src/rules/vamana.html | 24 + data/html-src/rules/varaha.html | 19 + data/html-src/rules/variegatedcanfield.html | 16 + data/html-src/rules/vegasklondike.html | 23 + data/html-src/rules/waningmoon.html | 16 + data/html-src/rules/wasp.html | 17 + data/html-src/rules/westcliff.html | 24 + data/html-src/rules/wheeloffortune.html | 29 + data/html-src/rules/whitehead.html | 18 + data/html-src/rules/wicked.html | 21 + data/html-src/rules/willothewisp.html | 21 + data/html-src/rules/windmill.html | 24 + data/html-src/rules/wisteria.html | 20 + data/html-src/rules/yukon.html | 21 + data/html-src/rules/zebra.html | 19 + data/html-src/rules_alternate.html | 2 + data/html-src/wikipedia/accordion.html | 43 + data/html-src/wikipedia/agnes.html | 39 + data/html-src/wikipedia/alhambra.html | 28 + data/html-src/wikipedia/alternation.html | 28 + data/html-src/wikipedia/amazons.html | 31 + data/html-src/wikipedia/baroness.html | 37 + data/html-src/wikipedia/bisley.html | 47 + data/html-src/wikipedia/blockade.html | 21 + .../wikipedia/britishconstitution.html | 41 + data/html-src/wikipedia/capricieuse.html | 31 + data/html-src/wikipedia/captivequeens.html | 37 + data/html-src/wikipedia/colorado.html | 35 + data/html-src/wikipedia/contradance.html | 22 + data/html-src/wikipedia/curdsandwhey.html | 39 + data/html-src/wikipedia/emperor.html | 33 + data/html-src/wikipedia/flowergarden.html | 25 + data/html-src/wikipedia/fortunesfavor.html | 24 + data/html-src/wikipedia/fourseasons.html | 48 + data/html-src/wikipedia/frog.html | 42 + data/html-src/wikipedia/gate.html | 39 + data/html-src/wikipedia/germanpatience.html | 28 + data/html-src/wikipedia/grandduchess.html | 49 + data/html-src/wikipedia/headsandtails.html | 32 + data/html-src/wikipedia/houseinthewood.html | 33 + data/html-src/wikipedia/intelligence.html | 37 + data/html-src/wikipedia/intrigue.html | 46 + data/html-src/wikipedia/kingalbert.html | 29 + data/html-src/wikipedia/lanivernaise.html | 10 + data/html-src/wikipedia/mountolympus.html | 37 + data/html-src/wikipedia/mrsmop.html | 26 + data/html-src/wikipedia/napoleonssquare.html | 30 + data/html-src/wikipedia/nestor.html | 23 + data/html-src/wikipedia/osmosis_w.html | 45 + data/html-src/wikipedia/parallels.html | 46 + data/html-src/wikipedia/patriarchs.html | 44 + data/html-src/wikipedia/perseverance.html | 34 + data/html-src/wikipedia/pussinthecorner.html | 33 + data/html-src/wikipedia/rougeetnoir.html | 47 + data/html-src/wikipedia/royalmarriage.html | 25 + data/html-src/wikipedia/saliclaw.html | 33 + data/html-src/wikipedia/sevendevils.html | 36 + data/html-src/wikipedia/slyfox.html | 48 + data/html-src/wikipedia/sthelena.html | 65 + data/html-src/wikipedia/stonewall.html | 27 + data/html-src/wikipedia/sultan.html | 32 + data/html-src/wikipedia/tournament.html | 51 + data/html-src/wikipedia/virginiareel.html | 60 + data/html-src/wikipedia/zodiac.html | 54 + 421 files changed, 18258 insertions(+) create mode 100644 data/html-src/all.htm create mode 100644 data/html-src/credits.html create mode 100644 data/html-src/ganjifa.html create mode 100755 data/html-src/gen-html.py create mode 100644 data/html-src/general_rules.html create mode 100644 data/html-src/glossary.html create mode 100644 data/html-src/hanafuda.html create mode 100644 data/html-src/hexadeck.html create mode 100644 data/html-src/howtoplay.html create mode 100644 data/html-src/images/c.gif create mode 100644 data/html-src/images/camelot-goal.gif create mode 100644 data/html-src/images/d.gif create mode 100644 data/html-src/images/h.gif create mode 100644 data/html-src/images/hanahelp.gif create mode 100644 data/html-src/images/pysollogo00.gif create mode 100644 data/html-src/images/pysollogo01.gif create mode 100644 data/html-src/images/pysollogo02.gif create mode 100644 data/html-src/images/pysollogo03.gif create mode 100644 data/html-src/images/s.gif create mode 100644 data/html-src/index.html create mode 100644 data/html-src/install.html create mode 100644 data/html-src/intro.html create mode 100644 data/html-src/license.html create mode 100644 data/html-src/news.html create mode 100644 data/html-src/rules.html create mode 100644 data/html-src/rules/10x8.html create mode 100644 data/html-src/rules/8x8.html create mode 100644 data/html-src/rules/abacus.html create mode 100644 data/html-src/rules/acesup.html create mode 100644 data/html-src/rules/acesup5.html create mode 100644 data/html-src/rules/agnessorel.html create mode 100644 data/html-src/rules/akbarsconquest.html create mode 100644 data/html-src/rules/akbarstriumph.html create mode 100644 data/html-src/rules/alaska.html create mode 100644 data/html-src/rules/americantoad.html create mode 100644 data/html-src/rules/appachanswaterfall.html create mode 100644 data/html-src/rules/ashrafi.html create mode 100644 data/html-src/rules/ashtadikapala.html create mode 100644 data/html-src/rules/ashwapati.html create mode 100644 data/html-src/rules/auldlangsyne.html create mode 100644 data/html-src/rules/babyspiderette.html create mode 100644 data/html-src/rules/badseven.html create mode 100644 data/html-src/rules/bakersdozen.html create mode 100644 data/html-src/rules/bakersgame.html create mode 100644 data/html-src/rules/balarama.html create mode 100644 data/html-src/rules/batsford.html create mode 100644 data/html-src/rules/beleagueredcastle.html create mode 100644 data/html-src/rules/betsyross.html create mode 100644 data/html-src/rules/bigbraid.html create mode 100644 data/html-src/rules/bigdivorce.html create mode 100644 data/html-src/rules/bigeasy.html create mode 100644 data/html-src/rules/bigharp.html create mode 100644 data/html-src/rules/bigspider.html create mode 100644 data/html-src/rules/bigsumo.html create mode 100644 data/html-src/rules/bitsnbytes.html create mode 100644 data/html-src/rules/blackhole.html create mode 100644 data/html-src/rules/blackwidow.html create mode 100644 data/html-src/rules/blindalleys.html create mode 100644 data/html-src/rules/blondesandbrunettes.html create mode 100644 data/html-src/rules/bluemoon.html create mode 100644 data/html-src/rules/braid.html create mode 100644 data/html-src/rules/bridgetsgame.html create mode 100644 data/html-src/rules/bridgetsgamedoubled.html create mode 100644 data/html-src/rules/bristol.html create mode 100644 data/html-src/rules/brunswick.html create mode 100644 data/html-src/rules/busyaces.html create mode 100644 data/html-src/rules/calculation.html create mode 100644 data/html-src/rules/camelot.html create mode 100644 data/html-src/rules/canfield.html create mode 100644 data/html-src/rules/carlton.html create mode 100644 data/html-src/rules/carpet.html create mode 100644 data/html-src/rules/casinoklondike.html create mode 100644 data/html-src/rules/castlesinspain.html create mode 100644 data/html-src/rules/catstail.html create mode 100644 data/html-src/rules/cavalier.html create mode 100644 data/html-src/rules/chameleon.html create mode 100644 data/html-src/rules/cherrybomb.html create mode 100644 data/html-src/rules/chessboard.html create mode 100644 data/html-src/rules/chinesediscipline.html create mode 100644 data/html-src/rules/chinesesolitaire.html create mode 100644 data/html-src/rules/citadel.html create mode 100644 data/html-src/rules/cluitjarslair.html create mode 100644 data/html-src/rules/cockroach.html create mode 100644 data/html-src/rules/concentration.html create mode 100644 data/html-src/rules/congress.html create mode 100644 data/html-src/rules/convolution.html create mode 100644 data/html-src/rules/corkscrew.html create mode 100644 data/html-src/rules/corona.html create mode 100644 data/html-src/rules/courtyard.html create mode 100644 data/html-src/rules/cruel.html create mode 100644 data/html-src/rules/danda.html create mode 100644 data/html-src/rules/dashavatara.html create mode 100644 data/html-src/rules/dashavataracircles.html create mode 100644 data/html-src/rules/deadkinggolf.html create mode 100644 data/html-src/rules/derfreienapoleon.html create mode 100644 data/html-src/rules/derkleinenapoleon.html create mode 100644 data/html-src/rules/deuces.html create mode 100644 data/html-src/rules/dhanpati.html create mode 100644 data/html-src/rules/diekoenigsbergerin.html create mode 100644 data/html-src/rules/diplomat.html create mode 100644 data/html-src/rules/dojoujisgame.html create mode 100644 data/html-src/rules/dojoujisgamedoubled.html create mode 100644 data/html-src/rules/doublebisley.html create mode 100644 data/html-src/rules/doublecanfield.html create mode 100644 data/html-src/rules/doublecockroach.html create mode 100644 data/html-src/rules/doubledrawbridge.html create mode 100644 data/html-src/rules/doublegrasshopper.html create mode 100644 data/html-src/rules/doubleklondike.html create mode 100644 data/html-src/rules/doubleklondikebythrees.html create mode 100644 data/html-src/rules/doublerail.html create mode 100644 data/html-src/rules/doublesamuri.html create mode 100644 data/html-src/rules/doublets.html create mode 100644 data/html-src/rules/doubleyourfun.html create mode 100644 data/html-src/rules/dover.html create mode 100644 data/html-src/rules/drawbridge.html create mode 100644 data/html-src/rules/eaglewing.html create mode 100644 data/html-src/rules/eastcliff.html create mode 100644 data/html-src/rules/easthaven.html create mode 100644 data/html-src/rules/easysupreme.html create mode 100644 data/html-src/rules/easyxone.html create mode 100644 data/html-src/rules/eiffeltower.html create mode 100644 data/html-src/rules/eightlegions.html create mode 100644 data/html-src/rules/eightoff.html create mode 100644 data/html-src/rules/eighttimeseight.html create mode 100644 data/html-src/rules/elevator.html create mode 100644 data/html-src/rules/eularia.html create mode 100644 data/html-src/rules/excuse.html create mode 100644 data/html-src/rules/fallingstar.html create mode 100644 data/html-src/rules/fan.html create mode 100644 data/html-src/rules/fastness.html create mode 100644 data/html-src/rules/fatimehsgame.html create mode 100644 data/html-src/rules/fatimehsgamerelaxed.html create mode 100644 data/html-src/rules/fifteenplus.html create mode 100644 data/html-src/rules/firecracker.html create mode 100644 data/html-src/rules/fiveaces.html create mode 100644 data/html-src/rules/flowerarrangement.html create mode 100644 data/html-src/rules/flowerclock.html create mode 100644 data/html-src/rules/forecell.html create mode 100644 data/html-src/rules/fortress.html create mode 100644 data/html-src/rules/fortyandeight.html create mode 100644 data/html-src/rules/fortythieves.html create mode 100644 data/html-src/rules/fourteen.html create mode 100644 data/html-src/rules/freecell.html create mode 100644 data/html-src/rules/freefan.html create mode 100644 data/html-src/rules/freenapoleon.html create mode 100644 data/html-src/rules/gajapati.html create mode 100644 data/html-src/rules/gaji.html create mode 100644 data/html-src/rules/gargantua.html create mode 100644 data/html-src/rules/garhpati.html create mode 100644 data/html-src/rules/generalspatience.html create mode 100644 data/html-src/rules/ghulam.html create mode 100644 data/html-src/rules/giant.html create mode 100644 data/html-src/rules/glenwood.html create mode 100644 data/html-src/rules/golf.html create mode 100644 data/html-src/rules/goodmeasure.html create mode 100644 data/html-src/rules/grandfathersclock.html create mode 100644 data/html-src/rules/grandmothersgame.html create mode 100644 data/html-src/rules/grasshopper.html create mode 100644 data/html-src/rules/greaterqueue.html create mode 100644 data/html-src/rules/greatwall.html create mode 100644 data/html-src/rules/griffon.html create mode 100644 data/html-src/rules/groundforadivorce.html create mode 100644 data/html-src/rules/gypsy.html create mode 100644 data/html-src/rules/hanafudafourseasons.html create mode 100644 data/html-src/rules/hanafudafourwinds.html create mode 100644 data/html-src/rules/hayagriva.html create mode 100644 data/html-src/rules/hexaklon.html create mode 100644 data/html-src/rules/hexaklonbythrees.html create mode 100644 data/html-src/rules/hexlabyrinth.html create mode 100644 data/html-src/rules/hiddenpassages.html create mode 100644 data/html-src/rules/hiranyaksha.html create mode 100644 data/html-src/rules/hopscotch.html create mode 100644 data/html-src/rules/imperialtrumps.html create mode 100644 data/html-src/rules/indian.html create mode 100644 data/html-src/rules/interregnum.html create mode 100644 data/html-src/rules/iris.html create mode 100644 data/html-src/rules/irmgard.html create mode 100644 data/html-src/rules/jane.html create mode 100644 data/html-src/rules/japanesegarden.html create mode 100644 data/html-src/rules/japanesegardenii.html create mode 100644 data/html-src/rules/japanesegardeniii.html create mode 100644 data/html-src/rules/journeytocuddapah.html create mode 100644 data/html-src/rules/jumbo.html create mode 100644 data/html-src/rules/justforfun.html create mode 100644 data/html-src/rules/kalisgame.html create mode 100644 data/html-src/rules/kalisgamedoubled.html create mode 100644 data/html-src/rules/kalisgamerelaxed.html create mode 100644 data/html-src/rules/katrinasgame.html create mode 100644 data/html-src/rules/katrinasgamedoubled.html create mode 100644 data/html-src/rules/katrinasgamerelaxed.html create mode 100644 data/html-src/rules/khadga.html create mode 100644 data/html-src/rules/kingalbert.html create mode 100644 data/html-src/rules/kingdom.html create mode 100644 data/html-src/rules/kingonlybakersgame.html create mode 100644 data/html-src/rules/kingonlyhexaklon.html create mode 100644 data/html-src/rules/kings.html create mode 100644 data/html-src/rules/klondike.html create mode 100644 data/html-src/rules/klondikebythrees.html create mode 100644 data/html-src/rules/klondikeplus16.html create mode 100644 data/html-src/rules/kurma.html create mode 100644 data/html-src/rules/labellelucie.html create mode 100644 data/html-src/rules/ladybetty.html create mode 100644 data/html-src/rules/ladypalk.html create mode 100644 data/html-src/rules/larasgame.html create mode 100644 data/html-src/rules/larasgamedoubled.html create mode 100644 data/html-src/rules/larasgamerelaxed.html create mode 100644 data/html-src/rules/lesserqueue.html create mode 100644 data/html-src/rules/lexingtonharp.html create mode 100644 data/html-src/rules/littleeasy.html create mode 100644 data/html-src/rules/littleforty.html create mode 100644 data/html-src/rules/longbraid.html create mode 100644 data/html-src/rules/longjourneytocuddapah.html create mode 100644 data/html-src/rules/lucas.html create mode 100644 data/html-src/rules/magesgame.html create mode 100644 data/html-src/rules/mahjongg.html create mode 100644 data/html-src/rules/makara.html create mode 100644 data/html-src/rules/maria.html create mode 100644 data/html-src/rules/martha.html create mode 100644 data/html-src/rules/matriarchy.html create mode 100644 data/html-src/rules/matrix.html create mode 100644 data/html-src/rules/matsukiri.html create mode 100644 data/html-src/rules/matsukiristrict.html create mode 100644 data/html-src/rules/matsya.html create mode 100644 data/html-src/rules/maze.html create mode 100644 data/html-src/rules/memory24.html create mode 100644 data/html-src/rules/memory40.html create mode 100644 data/html-src/rules/merlinsmeander.html create mode 100644 data/html-src/rules/midshipman.html create mode 100644 data/html-src/rules/milligancell.html create mode 100644 data/html-src/rules/milliganharp.html create mode 100644 data/html-src/rules/mississippi.html create mode 100644 data/html-src/rules/missmilligan.html create mode 100644 data/html-src/rules/missmuffet.html create mode 100644 data/html-src/rules/montana.html create mode 100644 data/html-src/rules/montecarlo.html create mode 100644 data/html-src/rules/moosehide.html create mode 100644 data/html-src/rules/mughalcircles.html create mode 100644 data/html-src/rules/napoleon.html create mode 100644 data/html-src/rules/napoleonsexile.html create mode 100644 data/html-src/rules/narasimha.html create mode 100644 data/html-src/rules/narpati.html create mode 100644 data/html-src/rules/nasty.html create mode 100644 data/html-src/rules/neighbour.html create mode 100644 data/html-src/rules/newtowerofhanoi.html create mode 100644 data/html-src/rules/nomad.html create mode 100644 data/html-src/rules/nordic.html create mode 100644 data/html-src/rules/numberten.html create mode 100644 data/html-src/rules/numerica.html create mode 100644 data/html-src/rules/oddandeven.html create mode 100644 data/html-src/rules/odessa.html create mode 100644 data/html-src/rules/oonsoo.html create mode 100644 data/html-src/rules/oonsooopen.html create mode 100644 data/html-src/rules/oonsoostrict.html create mode 100644 data/html-src/rules/oonsootimestwo.html create mode 100644 data/html-src/rules/oonsootoo.html create mode 100644 data/html-src/rules/osmosis.html create mode 100644 data/html-src/rules/pagat.html create mode 100644 data/html-src/rules/pagoda.html create mode 100644 data/html-src/rules/parashurama.html create mode 100644 data/html-src/rules/pasdedeux.html create mode 100644 data/html-src/rules/passeul.html create mode 100644 data/html-src/rules/paulownia.html create mode 100644 data/html-src/rules/peek.html create mode 100644 data/html-src/rules/pegged.html create mode 100644 data/html-src/rules/penguin.html create mode 100644 data/html-src/rules/peony.html create mode 100644 data/html-src/rules/perpetualmotion.html create mode 100644 data/html-src/rules/picturegallery.html create mode 100644 data/html-src/rules/pileon.html create mode 100644 data/html-src/rules/pine.html create mode 100644 data/html-src/rules/pokershuffle.html create mode 100644 data/html-src/rules/pokersquare.html create mode 100644 data/html-src/rules/ponytail.html create mode 100644 data/html-src/rules/pyramid.html create mode 100644 data/html-src/rules/quadrangle.html create mode 100644 data/html-src/rules/queenie.html create mode 100644 data/html-src/rules/rachel.html create mode 100644 data/html-src/rules/rainbow.html create mode 100644 data/html-src/rules/rainfall.html create mode 100644 data/html-src/rules/rambling.html create mode 100644 data/html-src/rules/rankandfile.html create mode 100644 data/html-src/rules/redandblack.html create mode 100644 data/html-src/rules/redmoon.html create mode 100644 data/html-src/rules/relax.html create mode 100644 data/html-src/rules/relaxedfreecell.html create mode 100644 data/html-src/rules/relaxedgolf.html create mode 100644 data/html-src/rules/relaxedpyramid.html create mode 100644 data/html-src/rules/relaxedseahaventowers.html create mode 100644 data/html-src/rules/relaxedspider.html create mode 100644 data/html-src/rules/roslin.html create mode 100644 data/html-src/rules/royalcotillion.html create mode 100644 data/html-src/rules/royaleast.html create mode 100644 data/html-src/rules/rushdike.html create mode 100644 data/html-src/rules/russianpatience.html create mode 100644 data/html-src/rules/russianpoint.html create mode 100644 data/html-src/rules/russiansolitaire.html create mode 100644 data/html-src/rules/samuri.html create mode 100644 data/html-src/rules/sanibel.html create mode 100644 data/html-src/rules/saratoga.html create mode 100644 data/html-src/rules/scorpion.html create mode 100644 data/html-src/rules/scorpionhead.html create mode 100644 data/html-src/rules/scorpiontail.html create mode 100644 data/html-src/rules/scotchpatience.html create mode 100644 data/html-src/rules/seahaventowers.html create mode 100644 data/html-src/rules/serpent.html create mode 100644 data/html-src/rules/sevenbyfive.html create mode 100644 data/html-src/rules/sevenbyfour.html create mode 100644 data/html-src/rules/shamrocks.html create mode 100644 data/html-src/rules/shamsher.html create mode 100644 data/html-src/rules/shanka.html create mode 100644 data/html-src/rules/shisensho.html create mode 100644 data/html-src/rules/siebenbisas.html create mode 100644 data/html-src/rules/simplecarlo.html create mode 100644 data/html-src/rules/simplepairs.html create mode 100644 data/html-src/rules/simplesimon.html create mode 100644 data/html-src/rules/singlerail.html create mode 100644 data/html-src/rules/sixsages.html create mode 100644 data/html-src/rules/sixtengus.html create mode 100644 data/html-src/rules/skiz.html create mode 100644 data/html-src/rules/smallharp.html create mode 100644 data/html-src/rules/snake.html create mode 100644 data/html-src/rules/snakestone.html create mode 100644 data/html-src/rules/spaces.html create mode 100644 data/html-src/rules/spanishpatience.html create mode 100644 data/html-src/rules/spider.html create mode 100644 data/html-src/rules/spiderette.html create mode 100644 data/html-src/rules/stalactites.html create mode 100644 data/html-src/rules/steps.html create mode 100644 data/html-src/rules/storehouse.html create mode 100644 data/html-src/rules/strategy.html create mode 100644 data/html-src/rules/streets.html create mode 100644 data/html-src/rules/streetsandalleys.html create mode 100644 data/html-src/rules/stronghold.html create mode 100644 data/html-src/rules/sumo.html create mode 100644 data/html-src/rules/superflowergarden.html create mode 100644 data/html-src/rules/superiorcanfield.html create mode 100644 data/html-src/rules/supersamuri.html create mode 100644 data/html-src/rules/surukh.html create mode 100644 data/html-src/rules/tamoshanter.html create mode 100644 data/html-src/rules/tenavatars.html create mode 100644 data/html-src/rules/terrace.html create mode 100644 data/html-src/rules/thefamiliar.html create mode 100644 data/html-src/rules/thelastmonarch.html create mode 100644 data/html-src/rules/threepeaks.html create mode 100644 data/html-src/rules/threepeaksnonscoring.html create mode 100644 data/html-src/rules/threeshufflesandadraw.html create mode 100644 data/html-src/rules/thumbandpouch.html create mode 100644 data/html-src/rules/tipati.html create mode 100644 data/html-src/rules/towerofhanoy.html create mode 100644 data/html-src/rules/trefoil.html create mode 100644 data/html-src/rules/tripeaks.html create mode 100644 data/html-src/rules/tripleklondike.html create mode 100644 data/html-src/rules/tripleklondikebythrees.html create mode 100644 data/html-src/rules/tripleline.html create mode 100644 data/html-src/rules/twofamiliars.html create mode 100644 data/html-src/rules/unionsquare.html create mode 100644 data/html-src/rules/vajra.html create mode 100644 data/html-src/rules/vamana.html create mode 100644 data/html-src/rules/varaha.html create mode 100644 data/html-src/rules/variegatedcanfield.html create mode 100644 data/html-src/rules/vegasklondike.html create mode 100644 data/html-src/rules/waningmoon.html create mode 100644 data/html-src/rules/wasp.html create mode 100644 data/html-src/rules/westcliff.html create mode 100644 data/html-src/rules/wheeloffortune.html create mode 100644 data/html-src/rules/whitehead.html create mode 100644 data/html-src/rules/wicked.html create mode 100644 data/html-src/rules/willothewisp.html create mode 100644 data/html-src/rules/windmill.html create mode 100644 data/html-src/rules/wisteria.html create mode 100644 data/html-src/rules/yukon.html create mode 100644 data/html-src/rules/zebra.html create mode 100644 data/html-src/rules_alternate.html create mode 100644 data/html-src/wikipedia/accordion.html create mode 100644 data/html-src/wikipedia/agnes.html create mode 100644 data/html-src/wikipedia/alhambra.html create mode 100644 data/html-src/wikipedia/alternation.html create mode 100644 data/html-src/wikipedia/amazons.html create mode 100644 data/html-src/wikipedia/baroness.html create mode 100644 data/html-src/wikipedia/bisley.html create mode 100644 data/html-src/wikipedia/blockade.html create mode 100644 data/html-src/wikipedia/britishconstitution.html create mode 100644 data/html-src/wikipedia/capricieuse.html create mode 100644 data/html-src/wikipedia/captivequeens.html create mode 100644 data/html-src/wikipedia/colorado.html create mode 100644 data/html-src/wikipedia/contradance.html create mode 100644 data/html-src/wikipedia/curdsandwhey.html create mode 100644 data/html-src/wikipedia/emperor.html create mode 100644 data/html-src/wikipedia/flowergarden.html create mode 100644 data/html-src/wikipedia/fortunesfavor.html create mode 100644 data/html-src/wikipedia/fourseasons.html create mode 100644 data/html-src/wikipedia/frog.html create mode 100644 data/html-src/wikipedia/gate.html create mode 100644 data/html-src/wikipedia/germanpatience.html create mode 100644 data/html-src/wikipedia/grandduchess.html create mode 100644 data/html-src/wikipedia/headsandtails.html create mode 100644 data/html-src/wikipedia/houseinthewood.html create mode 100644 data/html-src/wikipedia/intelligence.html create mode 100644 data/html-src/wikipedia/intrigue.html create mode 100644 data/html-src/wikipedia/kingalbert.html create mode 100644 data/html-src/wikipedia/lanivernaise.html create mode 100644 data/html-src/wikipedia/mountolympus.html create mode 100644 data/html-src/wikipedia/mrsmop.html create mode 100644 data/html-src/wikipedia/napoleonssquare.html create mode 100644 data/html-src/wikipedia/nestor.html create mode 100644 data/html-src/wikipedia/osmosis_w.html create mode 100644 data/html-src/wikipedia/parallels.html create mode 100644 data/html-src/wikipedia/patriarchs.html create mode 100644 data/html-src/wikipedia/perseverance.html create mode 100644 data/html-src/wikipedia/pussinthecorner.html create mode 100644 data/html-src/wikipedia/rougeetnoir.html create mode 100644 data/html-src/wikipedia/royalmarriage.html create mode 100644 data/html-src/wikipedia/saliclaw.html create mode 100644 data/html-src/wikipedia/sevendevils.html create mode 100644 data/html-src/wikipedia/slyfox.html create mode 100644 data/html-src/wikipedia/sthelena.html create mode 100644 data/html-src/wikipedia/stonewall.html create mode 100644 data/html-src/wikipedia/sultan.html create mode 100644 data/html-src/wikipedia/tournament.html create mode 100644 data/html-src/wikipedia/virginiareel.html create mode 100644 data/html-src/wikipedia/zodiac.html diff --git a/data/html-src/all.htm b/data/html-src/all.htm new file mode 100644 index 00000000..22237f9d --- /dev/null +++ b/data/html-src/all.htm @@ -0,0 +1,7275 @@ +

    10 x 8

    +Klondike type. Two decks. Unlimited redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to     8 x 8 +with ten rows and +Hex A Deck +variations. + +

    Rules

    +Game play is like 8 x 8. The rows build down in rank in alternate +color. The Wizards will play in their proper rank position on the +tableau as the alternate of either red or black. Any card or sequence +may be played on an empty row. Cards are dealt from the talon one at +a time. Cards may be played from the foundations. +

    Strategy

    +Try to open a row to the canvas. +

    8 x 8

    +

    +Klondike type. 2 decks. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +As the name implies, the eight playing +piles in the tableau all start with eight cards face-up. +

    +Piles build down by alternate color, and an empty space can be filled +with any card or sequence. +

    +When you click on the talon, one card is turned over onto the waste pile. +There is no limit to the number of times you go through the talon. +

    +You are also permitted to move cards back out of the foundation. + +

    Strategy

    +

    +Try to go for an empty space. +

    Abacus

    +

    +Yukon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick Description

    +

    +A combination of +Yukon type +and +Calculation type +game elements. + +

    Rules

    +

    +The four Foundations build up by suit the following way: +The first pile from Ace, by one. The second pile from Two, by two. +The third pile from Three, by three. The fourth pile from Four, by four. +

    +Club:     A 2 3 4 5 6 7 8 9 T J Q K
+Spade:    2 4 6 8 T Q A 3 5 7 9 J K
+Heart:    3 6 9 Q 2 5 8 J A 4 7 T K
+Diamond:  4 8 Q 3 7 J 2 6 T A 5 9 K
+
    +

    +Cards in Tableau are built down by suit, the ranks going +the opposite way as the foundations: +Club down by one, Spade down by two, Heart down by three and +Diamond down by four. +

    +Groups of cards can be moved regardless of sequence, +and an empty space can be filled with any card or sequence. +

    +When no more moves are possible, click on the Talon. One card will be +added to each of the playing piles. +

    Aces Up

    +

    +One-Deck game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards except the four Aces to the single foundation. + +

    Rules

    +

    +Any top card that is of lower rank and of the same suit of another +top card may be dropped to the foundation. Aces rank high. +

    +There is no building on the tableau, except that an empty pile +may be filled with any card. +

    +When no more moves are possible, click on the talon. One card will be +added to each of the playing piles. + +

    Notes

    +

    +Autodrop is disabled for this game. + +

    History

    +

    +This simple game is known by many names, such as +Aces High, Drivel and Idiot's Delight. +

    Achtmal Acht (Eight Times Eight)

    +

    +Klondike type. 2 decks. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +This is a variant of 8 x 8 +with only two redeals. +Experienced players probably will prefer this. + +

    Rules

    +

    +[To be written] +

    Akbar's Conquest

    +Braid type. Two decks. Two redeals. + +

    Object

    +Move all cards to the Foundations. +

    Quick description

    +Similar to Braid +played with two Mughal +Ganjifa +decks. + +

    Rules

    +Game play is like Braid. In this variation there are two Braid +stacks that each have their own set of Braid reserve stacks. The +game lay out starts with the sixteen foundations in the outer most columns. +The next two columns inwards are the eight Braid reserves. Then there +are two columns with four general reserves each. The inner most two +columns are the two Braid stacks. Each Braid starts with sixteen cards. +When one of the Braid reserves becomes open the card at the top of the +corresponding Braid will be moved there. When all the cards from one +of the Braids are removed a card from the other Braid will be used. +

    +The game is named after the reputed inventor of a twelve suited Ganjifa +deck of singular splendor. It was engraved on ivory and hand painted +by court artisans. No cards from this pack are known to still exist. +

    Strategy

    +Build sequences on the rows that will play when the correct card turns +over from the talon. This game type requires careful strategy to win. +

    +
    +General Ganjifa Rules +

    Akbar's Triumph

    +Braid type. One deck. Two redeals. + +

    Object

    +Move all cards to the Foundations. +

    Quick description

    +Similar to Braid +played with a single Mughal +Ganjifa +deck. + +

    Rules

    +Game play is like Braid. In this variation there are two Braid +stacks that each have their own set of Braid reserve stacks. The +game lay out starts with the eight foundations in the outer most columns. +The next two columns inwards are the eight Braid reserves. Then there +are two columns with four general reserves each. The inner most two +columns are the two Braid stacks. Each Braid starts with twelve cards. +When one of the Braid reserves becomes open the card at the top of the +corresponding Braid will be moved there. When all the cards from one +of the Braids are removed a card from the other Braid will be used. +

    +The game is named after the reputed inventor of a twelve suited Ganjifa +deck of singular splendor. It was engraved on ivory and hand painted +by court artisans. No cards from this pack are known to still exist. +

    Strategy

    +Build sequences on the rows that will play when the correct card turns +over from the talon. This game type requires careful strategy to win. +

    Alaska

    +

    +Yukon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Yukon, +but the rows build up or down in suit. + +

    Rules

    +

    +[To be written] +

    American Toad

    +

    +Canfield type. 2 decks. 1 redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Double Canfield, +but the 8 piles build down in suit, cards are dealt singly, +the reserve is face-up, and only one redeal. + +

    Rules

    +

    +[To be written] +

    Appachan's Waterfall

    +Dashavatara Ganjifa game type. 1 deck. No redeal. + +

    Object

    +Move all cards to the Foundation. + +

    Quick description

    +Build complete suits in descending rank order on the tableau then move +them to the single foundation in ascending rank and suit order. Refer +to the general Ganjifa +description for the suit order used. + +

    Rules

    +Cards will play on the tableau in descending rank order without regard +to suit. They can only be moved to the single foundation when a complete +suit of twelve cards is finished and only in ascending suit order. The +suit of the Fish Incarnation is first, the Tortoise next etc. When a +suit is ready to be moved to the foundation, press (a)uto or play with +auto drop enabled and all twelve cards will move there in order. Four +cards are dealt to each of the ten rows when the game begins. Press +(d)eal or click the talon to deal the next round of one card to each +row. The reserve stacks to either side of the foundation will take one +card each. Cards on the reserves may only be played to the rows. +

    Strategy

    +Make every play possible before dealing the next round. While the cards +will play in rank order only, it's helpful to also work on playing them by +suit. +

    Ashrafi

    +Mughal Ganjifa type. One deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Free Cell. +The rows build down by rank only, no more than twelve to a row. + +

    Rules

    +The cards on the tableau build down by rank regardless of suit. No more +than twelve cards may be placed in one row. The four reserve stacks +below the foundations will hold one card each. The foundations build +up in rank by suit starting with the Ace. Only the Mirs (Kings) may +be played on empty rows. + +

    Strategy

    +Move the tableau cards with the objective of releasing the Aces first. +Keep the reserve stacks open as much as possible. Build piles on +the Mirs so they can be moved to open rows. +

    Ashta Dikapala

    +

    +One Moghul Ganjifa deck. No redeal. + +

    Object

    +

    +Arrange the Eight Guardians in order. + +

    Rules

    +

    +Play is similar to Picture Gallery. +The layout consists of three rows of playing piles, a row for newly +dealt cards and three free cells that will hold one card each. +

    +The cards must be arranged in the top three rows as follows: +

      +
    • The top row must start with a three and build by suit in increments of three, +
    • the second row must with a two, +
    • and the third row must start with an Ace. +
    +

    +If you clear a space at the bottom it will be automatically filled +with a card from the talon. But if the talon is gone and you clear a space +at the bottom, then you can fill it with any card. You may move any card +to the free cells from the tableau on top or the rows below, but only as +long as there are cards left in the talon. When the talon is empty, you +may only move cards from, not to the free cells. +When no further moves are possible, click on the talon for a fresh row +of cards at the bottom. +

    +You win when all of the suits are arranged in order. + +

    Strategy

    +

    +Because of the many piles involved the Picture Gallery requires some +concentration, but it is not too hard to win. +

    Ashwapati

    +Mughal Ganjifa type. One deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank in the same suit. + +

    Rules

    +The cards on the tableau build down by ranks of the same suit. The +foundations build up in rank by suit starting with the Ace. Any +card or movable pile may be played on an empty row. Cards are dealt +from the talon one at a time. There is no limit on the number of +redeals. Cards may be played from the foundations. +

    +This game is one of a series of games that have names ending in "pati" +which transliterates as "lord of". Ashwapati means "Lord of Horses". +The names are the names of the suits in a twelve suit Ganjifa deck. + +

    Strategy

    +Move cards off of the deepest stacks first. +

    Auld Lang Syne

    +

    +Numerica type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The foundations build up by rank ignoring suit. +At game start the four Aces are dealt here. +

    +There is no building on the tableau piles - cards can only be +moved to the foundations, and spaces are not filled. +

    +When no more moves are possible, click on the talon. One card will be +added to each of the playing piles. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Baby Spiderette

    +

    +Spider type. 1 deck. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

    Quick Description

    +

    +Just like Spiderette, +but somewhat easier as groups of cards can be moved +if they build down by rank. + +

    Rules

    +

    +[To be written] +

    Bad Seven (Die böse Sieben)

    +

    +Two-Deck game type. 2 stripped decks. 1 redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +This game is played with two stripped decks. +

    +[To be written] +

    Baker's Dozen

    +

    +Baker's Dozen type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The piles build down by rank regardless of suit. +Only one card can be moved at a time. +

    +Empty piles cannot be filled - therefore all Kings are placed +at the bottom of a pile during the initial dealing. +

    Baker's Game

    +

    +FreeCell type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like FreeCell, +but the piles build down by suit. + +

    Rules

    +

    +All cards are dealt at the start of the game. To compensate for this +there are 4 free cells which can hold any - and just one - card. +

    +Cards may only be moved onto cards of the same suit. +

    +The number of cards you can move as a sequence is restricted by +the number of free cells - the number of free cells required is the +same as if you would make an equivalent sequence of moves with single cards. +(As a shortcut, the computer also considers the number of free piles so +that you can move even more cards as one single sequence.) + +

    History

    +

    +Baker's Game is named after the mathematician C.L. Baker +and was first published in Martin Gardner's June 1968 +Mathematical Games column in Scientific American. +

    Balarama

    +Dashavatara Ganjifa type. One deck. No redeal. +

    Object

    +Move all cards to the foundations. +

    Quick description

    +The cards build down by rank in alternate colors on the tableau, no more +than twelve to a row. Any card or sequence may be played on an empty row. +

    Rules

    +All cards are dealt to the sixteen rows when the games begins. Cards +on the tableau build down in rank in alternating colors. See the general +Ganjifa +card rules for information on that. The foundations build up by suit. +Any card or sequence may be played on an empty row. The four reserve +stacks hold one card each. +

    Strategy

    +An empty row is more useful than the reserve stacks. Try for an empty row. +

    Batsford

    +

    +Klondike type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Double Klondike, +but 10 piles, no redeal, and an extra reserve that can +hold up to 3 Kings. + +

    Rules

    +

    +[To be written] +

    Beleaguered Castle

    +

    +Beleaguered Castle type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +At game start the four Aces are dealt to the foundations. +

    +The eight piles build down by rank regardless of suit. +Only one card can be moved at a time and +empty piles can be filled with any single card. + +

    Strategy

    +

    +Build evenly on to foundations. Try to get an empty pile. +

    Betsy Ross

    +

    +One-Deck game type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Calculation, +but using a waste with 2 redeals instead of row stacks. + +

    Rules

    +

    +The four foundations at the top are out of play. +

    +The four foundations below build regardless of suit the following way: +The first pile from Two, by one. The second pile from Four, by two. +The third pile from Six, by three. The fourth pile from Eight, by four. +

    +1:  2 3 4 5 6 7 8 9 T J Q K
+2:  4 6 8 T Q A 3 5 7 9 J K
+3:  6 9 Q 2 5 8 J A 4 7 T K
+4:  8 Q 3 7 J 2 6 T A 5 9 K
+
    +

    +When you click on the talon, one card is turned over onto the waste pile. +There are 2 redeals. + +

    History

    +

    +This game is known by many names, such as +Fairest, Four Kings, Musical Patience, +Quadruple Alliance and Plus Belle. +

    Big Easy

    +Hanafuda type. 2 decks. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +This is a double deck version of +Little Easy. +The rows build down by rank in the same suit. The foundations +build with cards of the same rank in suit order. Only first rank +cards may be played on an empty row. + +

    Rules

    +The rules are the same as in +Little Easy. + +

    Strategy

    +Disable auto drop and build on the rows until all cards are face up. +These games may be easy by name and easy to play but they're not easy +to win. + +

    Author

    +This game and documentation has been written by +T. Kirk. +

    Big Harp (Die große Harfe)

    +

    +Klondike type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Double Klondike, +but ten piles, anything on an empty space, and no redeal. + +

    Rules

    +

    +Piles build down by alternate color, and an empty space can be filled +with any card or sequence. +

    +Cards from the talon are turned over to the waste pile, one at a time. +You can move the top card to the playing piles or the foundations. +There is no redeal. +

    +You are also permitted to move cards back out of the foundations. + +

    History

    +

    +Small Harp and Big Harp are the German ways of playing +Klondike and Double Klondike. +

    Big Sumo

    +Hanafuda type. 2 decks. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Free Cell. +Cards build from first to fourth rank on the tableau by suit and +from fourth to first on the foundations. Only first rank cards +may be played on an empty row. + +

    Rules

    +This is a two deck version of +Sumo. +Cards build down in rank on the rows and up in rank on the foundations. +Third and fourth rank (trash) cards are not interchangeable. Only a first +rank card or correctly ordered pile may be played on an empty row. + +

    Strategy

    +Don't play cards on the reserves unless they can be removed. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk. +

    Bits n Bytes

    +

    +Hex A Deck type. 1 deck. One redeal. + +

    Object

    +

    +Fill all row stacks. + +

    Quick description

    +

    +Fill Byte stacks by matching the goal card's byte value, fill bit +stacks by matching the corresponding bit value. + +

    Rules

    +

    +When play begins the four left most columns are filled with four +goal cards of different ranks, one from each suit. The next two +columns to the right are the byte stacks. They can be filled +with cards of the same rank as the goal card in that row. The +four right most columns are the bit stacks. They can be filled +with cards of the same suit as the goal card in the respective +row if their least significant bit matches the corresponding +bit on the goal card. +

    +Cards from the talon are turned over to the waste pile, two at a +time. There is only one redeal. +

    +The only function of the Wizards in this game is to block the +waste stack at the worst possible time. + +

    Strategy

    +

    +Since there are only four cards of any one rank, it's important +to fill the byte columns first. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Black Hole

    +

    +Fan game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the single foundation. + +

    Rules

    +

    +The foundation (the Black Hole) builds up or down by rank +ignoring color and suit, wrapping around from King to Ace +and from Ace to King. +

    +There is no building on the tableau piles, and spaces +are not filled. +Only the top card can be moved. + +

    Notes

    +

    +Autodrop is disabled for this game. + +

    Strategy

    +

    +Plan carefully - one wrong move and you may never +be able to untangle the mess. +

    Black Widow

    +

    +Spider type. 2 decks. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

    Quick Description

    +

    +Just like Spider, +but somewhat easier as groups of cards can be moved +if they build down by rank. + +

    Rules

    +

    +[To be written] +

    Blind Alleys

    +

    +Klondike type. 1 deck. 1 redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Klondike, +but 6 piles, anything on an empty space, and one redeal. + +

    Rules

    +

    +Piles build down by alternate color, and an empty space can be filled +with any card or sequence. +

    +Cards from the talon are turned over to the waste pile, one at a time. +You can move the top card to the playing piles or the foundations. +There is one redeal. +

    +You are also permitted to move cards back out of the foundations. +

    Blondes and Brunettes

    +

    +Terrace type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +[To be written] +

    Blue Moon

    +

    +Montana type. 1 deck. 2 redeals. + +

    Object

    +

    +Group all the cards in sets of 13 cards in ascending sequence +by suit from Ace to King. + +

    Quick Description

    +

    +Just like Montana, +but the Aces are moved to the left. +
    Gameplay is completely equivalent. + +

    Rules

    +

    +This 52-card solitaire starts with the entire deck shuffled and dealt +out in four rows. The aces are then moved to the left end of the layout, +making 4 initial free spaces. You may move to a space only the card that +matches the left neighbor in suit, and is one greater in rank. Kings are +high, so no cards may be placed to their right (they create dead spaces). +

    +When no moves can be made, cards still out of sequence are reshuffled +and dealt face up after the ends of the partial sequences, leaving a card +space after each sequence, so that each row looks like a partial sequence +followed by a space, followed by enough cards to make a row of 14. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Braid (Der Zopf)

    +

    +Napoleon type. 2 decks. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +This game is somewhat harder and requires thoughtful strategy. +

    +The layout consist of a Braid of 20 cards, two groups of four helper +fields, four braid fields (each showing a picture of a braid), the waste +pile, and the eight foundations. The first card automatically dealt to a +Foundation sets the beginning value for all foundations, and an indicator +displays the value of that card. +

    +You choose whether the sequences on the foundations will be ascending +or descending, and your choice is displayed in an indicator. The choice is +made when you place the first card on a foundation which is not the +already-determined base card. +It must follow suit and must have a numerical value +of either one more or one less than the base card. Ace is considered one +higher than King, and at the same time one less than Two. +

    +You may place cards on the foundation from anywhere on the table, +including the end of the Braid. The eight helper fields can be filled from +the waste pile but not from the Braid or the braid fields. When you move +a card from a braid field to the foundation, that field is automatically +filled with the last card on the Braid itself. +

    +In going through the talon, you are limited to three rounds, and an +indicator reports on that status. + +

    Strategy

    +

    +You can use the helper fields to temporarily store cards you expect to +use soon, and you can leave them open until the right card comes up from the +Talon. + +

    History

    +

    +This is a solitaire variant of German origin. +

    Double Bridget's Game

    +Hex A Deck game type. 4 decks. 2 redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with sixteen rows, one redeal and +Hex A Deck +variations. This is the same as +Bridget's Game +with four decks and two redeals. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are that the cards are dealt to seventeen piles instead of fourteen +and if a dealt card is of rank eleven or over one card is dealt to +the talon. Otherwise the dealing rules are the same. +

    +Play is the same as Lara's Game with two exceptions. The first exception +is that there is one redeal. When the talon is empty after the first +round the cards are gathered up from the tableau and dealt to the rows +without being shuffled using the same dealing rules as in the first round. +

    +The other exception is the extra reserve stack just to the right of the +rows and the top foundations. This reserve stack has the potential to +save a game that would otherwise be lost. The way it works is this. +When empty it will accept any Wizard card, but only from a foundation. +Once a Wizard has been played on it, it will accept any two cards from +any of the row stacks. Once played on the stack, cards can only be removed +by playing them to a foundation. + +

    Strategy

    +Don't play on the extra reserve stack unless you are sure the +top card will play to a foundation soon. + +

    Notes

    +This game is dedicated to the memory of Bridget Bishop, hanged as a +witch on June 10, 1692 in Salem Massachusetts, U. S. A. and to the +nineteen other victims of that notorious witch hunt. +

    Bridget's Game

    +Hex A Deck game type. 2 decks. 1 redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with sixteen rows, one redeal and +Hex A Deck +variations. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are that the cards are dealt to seventeen piles instead of fourteen +and if a dealt card is of rank eleven or over one card is dealt to +the talon. Otherwise the dealing rules are the same. +

    +Play is the same as Lara's Game with two exceptions. The first exception +is that there is one redeal. When the talon is empty after the first +round the cards are gathered up from the tableau and dealt to the rows +without being shuffled using the same dealing rules as in the first round. +

    +The other exception is the extra reserve stack just to the right of the +rows and the top foundations. This reserve stack has the potential to +save a game that would otherwise be lost. The way it works is this. +When empty it will accept any Wizard card, but only from a foundation. +Once a Wizard has been played on it, it will accept one card only from +any row stack. Once played on the stack, cards can only be remove from +it to a foundation. + +

    Strategy

    +Don't play on the extra reserve stack unless you are sure the +top card will play to a foundation soon. + +

    Notes

    +This game is dedicated to the memory of Bridget Bishop, hanged as a +witch on June 10, 1692 in Salem Massachusetts, U. S. A. and to the +nineteen other victims of that notorious witch hunt. +

    Bristol

    +

    +Fan game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +[To be written] +

    +Empty piles cannot be filled - therefore all Kings are placed +at the bottom of a pile during the initial dealing. +

    Brunswick

    +

    +Yukon type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Lexington Harp, +but deal all cards face-up. +
    Very easy. + +

    Rules

    +

    +[To be written] +

    Busy Aces

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but with 12 piles. + +

    Rules

    +

    +[To be written] +

    Calculation

    +

    +One-Deck game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The four foundations build regardless of suit the following way: +The first pile from Ace, by one. The second pile from Two, by two. +The third pile from Three, by three. The fourth pile from Four, by four. +

    +1:  A 2 3 4 5 6 7 8 9 T J Q K
+2:  2 4 6 8 T Q A 3 5 7 9 J K
+3:  3 6 9 Q 2 5 8 J A 4 7 T K
+4:  4 8 Q 3 7 J 2 6 T A 5 9 K
+
    +Once on a stack, a card can only be moved onto a foundation. + +

    Notes

    +

    +The auto-solver is completely clueless. +

    Canfield

    +

    +Canfield type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Canfield is played with one deck. The object is to build all four +of the foundations at the top right from the rank of the first card +dealt into there (varies from game to game), all in the same suit. +

    +The tableau consists of four piles, starting with one card each. The +cards can be stacked according to the following rules +

      +
    • Red cards may be only played on black cards, and black only on + red. +
    • Only the next smaller card may be played, so that the stacks + are in descending sequence except when the previous card is an Ace, + in which only the King may be played. +
    • You may not move parts of a sequence except the top card. +
    • Empty spaces in the tableau will be filled automatically from + the reserve (the pile below the talon) until it is exhausted. When + the reserve is exhausted, the empty spaces can be filled with any + card. +
    +

    +When there are no more possible moves, click on the talon. Three +cards will be moved from the talon to the waste pile directly to its +right. + +

    Notes

    +

    +The auto-solver is hopeless. Don't believe the hints. They tend to +be right but it doesn't figure everything out (there may be valid +moves that it won't guess). + +

    Author

    +

    +This game and documentation has been written by +Drew Csillag +and is part of the official PySol distribution. +

    Carlton

    +

    +Yukon type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick Description

    +

    +Just like Milligan Harp, +but deal all cards face-up. + +

    Rules

    +

    +[To be written] +

    Carpet

    +

    +One-Deck game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The four foundations are built up in suit from Ace to King. +

    +The 20 reserve piles can hold any single card. +

    +When you click on the talon, one card is turned over onto the waste pile. +There is no redeal. +

    Casino Klondike

    +

    +Klondike type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Klondike, +but only two redeals. + +

    Rules

    +

    +[To be written] + +

    Notes

    +

    +There is a simple casino scoring system here - you debit $52 for each game +and for every card you bear off, you get $5 credit. +Your balance is reset whenever you select a different game. +Loaded games and manually entered game numbers don't count. +

    Castles in Spain

    +

    +Baker's Dozen type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The piles build down by alternate color. +Only one card can be moved at a time, and empty piles +can be filled with any card. +

    Cat's Tail (Der Katzenschwanz)

    +

    +FreeCell type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Die Schlange, +but the number of cards you can move as a sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each King +starting a new pile. +To compensate for this there are 8 free cells which can hold any +- and just one - card. +

    +Piles build down by alternate color, and an empty space cannot be filled. + +

    History

    +

    +This is a solitaire variant of German origin. +

    Cavalier

    +Tarock type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +This is a +Baker's Dozen +type game played with the 78 card Tarock deck. Piles build down +in rank in alternate colors. The Trumps can play as either color. + +

    Rules

    +Rows build down in rank by alternate color with the Trumps playing +as either color. A pile may be moved to another location but only +a single card may be played on an empty row. Cards may be played +from the foundations. + +

    Strategy

    +Use the Trumps to open spots for suit cards. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk. +

    Chameleon

    +

    +Canfield type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Canfield, +but the three piles build down by rank, +cards are dealt singly, and no redeal. + +

    Rules

    +

    +[To be written] + +

    History

    +

    +This game is also known under names such as +Kansas. +

    Cherry Bomb

    +Hanafuda type. 2 decks. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +This is a double deck version of +Fire Cracker. +The rows build down in rank in the same suit. The foundations +build with cards of the same rank in suit order. + +

    Rules

    +The rows build from first rank to fourth rank by suit. The foundations +build in ascending suit order from Pine to Phoenix by rank. The third +and fourth rank (trash) cards are interchangeable on the tableau. Cards +may not be played from the foundations. Any card or correctly ordered +pile may be played on an empty row. + +

    Strategy

    +Build sequences on the tableau. Since the trash cards are interchangeable +it's possible to build a valid sequence that has more than four cards in +a two deck game. + +

    Author

    +This game and documentation has been written by +T. Kirk. +

    Chessboard

    +

    +Beleaguered Castle type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The foundations build up in suit, wrapping around from King to Ace. +The first card moved to the foundations determines the base rank. +

    +The ten piles build up or down in suit, wrapping around from +King to Ace and from Ace to King. +

    +Only one card can be moved at a time and +empty piles can be filled with any single card. +

    Chinese Discipline

    +

    +Yukon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick Description

    +

    +Like Yukon, +but don't deal all cards at game start. + +

    Rules

    +

    +Cards in Tableau are built down by alternate color. +Groups of cards can be moved regardless of sequence. +An empty pile in the Tableau can be filled with a King or a group +of cards with a King on the bottom. +

    +Foundations are built up in suit from Ace to King. +Cards in Foundations are no longer in play. +

    +When no more moves are possible, click on the Talon. +Three more cards will be dealt. +

    Chinese Solitaire

    +

    +Yukon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick Description

    +

    +Just like Chinese Discipline, +but anything on an empty space. + +

    Rules

    +

    +[To be written] +

    +When no more moves are possible, click on the Talon. +Three more cards will be dealt. +

    Citadel

    +

    +Beleaguered Castle type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Beleaguered Castle, +but matching cards are moved to the foundations during initial dealing. + +

    Rules

    +

    +[To be written] +

    Cluitjar's Lair

    +Klondike type. One deck. No redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Klondike +with Hex A Deck +variations. + +

    Rules

    +Game play is like Klondike. The rows build down in rank in alternate +color. Any card or sequence may be played on an empty row. The Wizards +will play in their proper rank position on the tableau regardless of +color. While two or more Wizards will play on top of each other, the stack +must still be of alternating colors to be a movable sequence. Cards are +dealt from the talon one at a time. There is no redeal. Cards may be +played from the foundations. +

    Strategy

    +The Wizards will not play to their foundation until all the suit cards +are on theirs. That can make the end game a bit of a puzzle. Use an +empty row to move them out of the way. +

    Cockroach

    +

    +Tarock type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Play is identical to +Grasshopper +except there is no redeal. +

    Concentration

    +

    +Memory game type. 1 deck. No redeal. + +

    Object

    +

    +Flip all pairs of matching cards and get a score of 50 points or more. + +

    Rules

    +

    +At game start 52 cards are dealt to the tableau piles. +

    +Flip any 2 cards that match in rank. +

    +Any pair that matches will gain you 5 points, while a pair that +doesn't match will cost you 1 point. +

    +You win if your final score reaches 50 points. + +

    Notes

    +

    +To get awarded for a perfect game you must reach the maximum score of +130 points. You can reach this by restarting the game. +

    +Undo, Bookmarks, Autodrop and Quickplay +are disabled for this game. +

    Congress

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the 8 piles build down by rank ignoring suit, +and empty piles are automatically filled from the waste or talon, + +

    Rules

    +

    +[To be written] +

    Convolution

    +

    +FreeCell type. Two Hex A Decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Die Schlange, +with the Hex A Deck Variations and the number of cards you can move as a +sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each King or "Ten" +(hexadecimal) starting a new pile. Rows build down in rank regardless of +color and empty rows cannot be filled. The Wizards play as any color. +

    Corkscrew

    +

    +FreeCell type. Two Tarock Decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Die Schlange, +using two 78 card Tarock decks and the number of cards you can move as a +sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each King or Skiz +starting a new pile. Rows build down in rank regardless of suit. +Empty rows cannot be filled. The eight free cells will hold one card each. +

    Corona

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but empty piles are automatically filled from the waste or talon. + +

    Rules

    +

    +[To be written] +

    Courtyard

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but with 12 piles, sequences can be moved, +and empty piles are automatically filled from the waste or talon. + +

    Rules

    +

    +[To be written] +

    Cruel

    +

    +Baker's Dozen type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The piles build down by suit. +Only one card can be moved at a time, and empty spaces cannot be filled. +

    +When no more moves are possible click on the talon for a redeal. +The cards are not re-shuffled, but re-dealt in packs of 4 cards. +

    Danda

    +

    +FreeCell type. One Moghul Ganjifa Deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Die Schlange, +using the eight suit Moghul Ganjifa deck and the number of cards you can move as a +sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each Raja or King +starting a new pile. Rows build down in rank by alternate force suits. +Refer to the general Ganjifa page. +Empty rows cannot be filled. The eight free cells will hold one card each. +

    Dashavatara Circles

    +Dashavatara Ganjifa type. One deck. No redeal. +

    Object

    +Move all cards to the foundations. +

    Quick description

    +The cards build down by rank and by suit on the tableau. Any card may be +played on an empty row. Only one card may be moved at a time. +

    Rules

    +All cards are dealt to the thirty two rows when the games begins. Cards +on the tableau build down by suit in descending rank order. The foundations +build up by suit. Any card may be played on an empty row. The reserve stacks +hold one card each. Only one card at a time may be moved. +

    Strategy

    +Try to keep a reserve stack open. Play higher ranked cards on empty rows. +

    Dashavatara

    +

    +One Dashavatara Ganjifa deck. No redeal. + +

    Object

    +

    +Arrange the Ten Avatars in order. + +

    Rules

    +

    +Play is similar to Picture Gallery. +The layout consists of three rows of playing piles, a row for newly +dealt cards and three free cells that will hold one card each. +

    +The cards must be arranged in the top three rows as follows: +

      +
    • The top row must start with a three and build by suit in increments of three, +
    • the second row must with a two, +
    • and the third row must start with an Ace. +
    +

    +If you clear a space at the bottom it will be automatically filled +with a card from the talon. But if the talon is gone and you clear a space +at the bottom, then you can fill it with any card. You may move any card +to the free cells from the tableau on top or the rows below, but only as +long as there are cards left in the talon. When the talon is empty, you +may only move cards from, not to the free cells. +When no further moves are possible, click on the talon for a fresh row +of cards at the bottom. +

    +You win when all of the suits are arranged in order. + +

    Strategy

    +

    +Because of the many piles involved the Picture Gallery requires some +concentration, but it is not too hard to win. +

    Dead King Golf

    +

    +Golf type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the waste stack. + +

    Quick Description

    +

    +Just like Golf, +but nothing may be placed on a King. + +

    Rules

    +[To be written] + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Der freie Napoleon

    +

    +Napoleon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Der kleine Napoleon, +only with a different screen layout. +
    Gameplay is completely equivalent. + +

    Rules

    +

    +[To be written] +

    Der kleine Napoleon

    +

    +Napoleon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +This game is somewhat harder and requires thoughtful strategy. +

    +The layout consist of 4 foundations in the middle, +8 row stacks (4 on each of the left and right side), +2 reserve stacks (one on each of the left and right side), +and a free cell in the middle. +

    +The row stacks and reserve stacks grow from the middle and are laid out +open, but only the outer card is in play. +

    +The foundations build either up or down in suit, depending on the +first card you play there. +They wrap around from King to Ace and Ace to King. +

    +The 8 row stacks build both up and down in suit, also wrapping around. +Only a single card can be moved, and free rows can be filled with +any single card. +

    +There is no building on the 2 reserve stacks. Cards can only be moved +to other stacks from there. +

    +Finally there is one extra free cell that can hold any single card. +But to move a card back from the free cell at least one of the +two "blocking" reserve stacks must have been cleared. + +

    Notes

    +

    +Try Der freie Napoleon if +you have troubles understanding the rules - it is the exactly +same game in a different layout. + +

    Strategy

    +

    +Decide carefully if you build the foundations up or down. +

    +Getting a free row stack should be one of your highest priorities. +

    Deuces

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the foundations build up from Two to Ace. + +

    Rules

    +

    +[To be written] +

    Dhanpati

    +Mughal Ganjifa type. One deck. One redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank regardless of suit. + +

    Rules

    +The cards on the tableau build down by rank. The foundations build +up in rank by suit starting with the Ace. Only the Mirs (Kings) may +be played on an empty row. Cards are dealt from the talon three at +a time. There is only one redeal. Cards may not be played from the +foundations. +

    +This game is one of a series of games that have names ending in "pati" +which transliterates as "lord of". Dhanpati means "Lord of Treasure". +The names are the names of the suits in a twelve suit Ganjifa deck. + +

    Strategy

    +Move cards back and forth on the rows to make every play possible on +the first pass through the talon. Don't let the waste stack get too +deep on the second pass. +

    Die Königsbergerin

    +

    +Gypsy type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Gypsy, +but Aces go off during dealing, and cards in the foundations +are no longer in play. + +

    Rules

    +

    +[To be written] +

    +You are not permitted to move cards back out of the foundations. +

    Diplomat

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the 8 piles build down by rank ignoring suit. + +

    Rules

    +

    +[To be written] +

    Double Dojoujis's Game

    +Hanafuda game type. 4 decks. No redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with four Hanafuda decks. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The difference +is the use of four Hanafuda decks instead of two 52 card standard decks +When a first rank card is dealt to the rows two cards are dealt to the talon. +There are twelve first rank cards in a Hanafuda deck. There are 16 rows +in this Lara's game version. Cards are dealt to all sixteen rows based on +their rank and which deck they are from. The four decks are shuffled together +on the talon. +

    +The foundations take four complete rounds of a suit. After the last card +of the first round is played to a foundation the first card of the second +round will play. +

    Dojoujis's Game

    +Hanafuda game type. 2 decks. No redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with two Hanafuda decks. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The difference +is the use of two Hanafuda decks instead of two 52 card standard decks +When a first rank card is dealt to the rows two cards are dealt to the talon. +There are twelve first rank cards in a Hanafuda deck. There are 8 rows +in this Lara's game version. Cards are dealt to all eight rows based on +their rank and which deck they are from. The decks are shuffled together +on the talon. +

    +The foundations take two complete rounds of a suit. After the last card +of the first round is played to a foundation the first card of the second +round will play. +

    Double Canfield

    +

    +Canfield type. 2 decks. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Canfield, +but with two decks and five playing piles. + +

    Rules

    +

    +[To be written] +

    Double Cockroach

    +

    +Tarock type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Play is identical to +Grasshopper +except there are two Trumps only row stacks, and nine row stacks and +there is no redeal. Twenty-eight cards are dealt to the reserve at +the start of the game. +

    Double Drawbridge

    +Klondike type. Two decks. One redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +This is the two deck version of +Drawbridge. +

    Rules

    +Game play is like Klondike. The rows build down in rank in alternate +color. Any card or sequence may be played on an empty row. The Wizards +will play in their proper rank position on the tableau as the alternate of +either red or black. Cards are dealt from the talon one at a time. Cards +may be played from the foundations. +

    Strategy

    +Play cards back off of the foundations to uncover face down cards. +

    Double Grasshopper

    +

    +Tarock type. 2 deck. 1 redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The tableau consists of one reserve stack, two Trumps only row stacks, +and nine row stacks. Twenty-eight cards are dealt to the reserve +stack and one card each to the row stacks. When a row stack is emptied +it must be filled from the reserve stack first. When the reserve stack +is empty any card can be played on an empty row stack. The Trumps only +stacks are left empty and can be played on at will. The row stacks +build down in rank by alternate colors. The Trumps can be played as +either color. The Trumps only row stacks also build down in rank. They +will accept a stack of cards that contains suit cards as long as the +bottom card is a Trump. The foundations build up in rank by suit. + +

    Strategy

    +

    +With skillful play and a bit of luck it's possible to sweep this one +without needing the redeal. The first priority is to empty the reserve +stack. Once that's done try to keep one or more row stacks open. Play +high rank cards on the rows and build down on them. The same goes for +the Trumps only rows. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Double Klondike by Threes

    +

    +Klondike type. 2 decks. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Double Klondike, +but deal three cards. + +

    Rules

    +

    +[To be written] +

    Double Klondike

    +

    +Klondike type. 2 decks. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Klondike, +but with two decks and nine playing piles. + +

    Rules

    +

    +[To be written] +

    Double Rail

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the 5 piles build down by rank ignoring suit, +and sequences can be moved. + +

    Rules

    +

    +[To be written] +

    Double Samuri

    +

    +Hanafuda type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +This is +Samuri +played with two decks. + +

    Strategy

    +Try not to let the waste stack get too deep. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk. +

    Doublets

    +

    +One-Deck game type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards except the four Kings to the single foundation. + +

    Rules

    +

    +The base rank for the foundation is determined at game start, +and it builds up by doubling the rank ignoring suit: +

    +A, 2, 4, 8, 3, 6, Q, J, 9, 5, 10, 7, A, repeat... +

    +The 7 reserve piles are automatically filled from the waste or talon. +

    +Kings are blocking, therefore all Kings in the first 8 cards +are put at the bottom of the talon during game start. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Double Your Fun

    +Hanafuda type. 2 decks. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Free Cell. +The rows build down by rank in the same suit. The foundations +build with cards of the same rank in suit order. + +

    Rules

    +The rows build from first rank to fourth rank by suit. The foundations +build in ascending suit order from Pine to Phoenix by rank. The third +and fourth rank (trash) cards are not interchangeable on the tableau. +Cards may not be played from the foundations. Only first rank cards +or correctly ordered piles may be played on an empty row. + +

    Strategy

    +Use the reserve stacks to release the fourth rank cards first. + +

    Author

    +This game and documentation has been written by +T. Kirk. +

    Drawbridge

    +Klondike type. One deck. One redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Klondike +with Hex A Deck +variations. + +

    Rules

    +Game play is like Klondike. The rows build down in rank in alternate +color. Any card or sequence may be played on an empty row. The Wizards +will play in their proper rank position on the tableau as the alternate of +either red or black. Cards are dealt from the talon one at a time. Cards +may be played from the foundations. +

    Strategy

    +Play cards back off of the foundations to uncover face down cards. +

    Eagle Wing

    +

    +Canfield type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +[To be written] +

    Eastcliff

    +

    +Klondike type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Klondike, +but anything on an empty space, and no redeal. + +

    Rules

    +

    +Piles build down by alternate color, and an empty space can be filled +with any card or sequence. +

    +Cards from the talon are turned over to the waste pile, one at a time. +You can move the top card to the playing piles or the foundations. +There is no redeal. +

    +You are also permitted to move cards back out of the foundations. +

    Easthaven

    +

    +Klondike type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick description

    +

    +Like Klondike, +but anything on an empty space, and no redeal. + +

    Rules

    +

    +Piles build down by alternate color, and an empty space can be filled +with any card or sequence. +

    +Cards from the Talon are turned over to the Waste pile, one at a time. +You can move the top card to the playing piles or the Foundations. +There is no redeal. +

    +You are also permitted to move cards back out of the Foundations. +

    Easy Supreme

    +Hanafuda type. 4 decks. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +This is a four deck version of +Little Easy. +The rows build down by rank in the same suit. The foundations +build with cards of the same rank in suit order. Only first +rank cards may be played on an empty row. + +

    Rules

    +The rules are the same as in +Little Easy. + +

    Strategy

    +Disable auto drop and build on the rows until all cards are face up. +These games may be easy by name and easy to play but they're not easy +to win. + +

    Author

    +This game and documentation has been written by +T. Kirk. +

    Easy x One

    +Hanafuda type. 1 deck. One redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +This is a variation of +Little Easy. +The rows build down by rank in the same suit. The foundations +build with cards of the same rank in suit order. Only first +rank cards may be played on an empty row. + +

    Rules

    +The rules are the same as in +Little Easy +except that the cards deal from the talon one at a time and there +is only one redeal. + +

    Strategy

    +Disable auto drop and build on the rows until all cards are face up. +These games may be easy by name and easy to play but they're not easy +to win. + +

    Author

    +This game and documentation has been written by +T. Kirk. +

    Eiffel Tower

    +

    +Pairing game type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the tableau piles. + +

    Rules

    +

    +This is a very simple game, which takes its name from the shape of the +layout. The object is to use up all the cards from the talon, placing them +on the Tower. You can only put a card on top of another card when the +numerical values of the two cards adds up to 14. King is worth 13, Queen is +worth 12 and Jack is worth 11. You do not have to follow suit. +

    +You win when the talon is all gone. There is no redeal. + +

    Notes

    +

    +Autodrop and Quickplay are disabled for this game. +

    Eight legions

    +Mughal Ganjifa type. One deck. No redeal. + +

    Object

    +Arrange all cards in suit and rank order on the tableau. + +

    Quick description

    +The cards build down by rank only on the tableau. The ten reserve +stacks hold one card each. The game is won when all cards are on the +tableau in suit and rank order. + +

    Rules

    +The game begins with five cards on each of the twelve rows and the ten +reserve stacks empty. Cards are dealt from the talon twelve at a time, one +to each row. Rows can be built with cards of any suit in descending rank. +Only Mirs can be played on an empty row. All twelve suits must be in +descending rank order for the game to be won. + +

    Strategy

    +Make as many plays as possible without filling too many reserves before taking +another deal. Put a priority on getting the Mirs and Wazirs in place. +

    Eight Off

    +

    +FreeCell type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like King Only Baker's Game, +but with 8 free cells. + +

    Rules

    +

    +[To be written] +

    Elevator

    +

    +Golf type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Relaxed Golf, +only with a Pyramid +like layout. + +

    Rules

    +

    +[To be written] + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Eularia

    +Hanafuda type. 1 deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Eularia. +The rows build down in rank by same suit. The foundations +build up in rank by suit. + +

    Rules

    +The rows build from first rank to fourth rank by suit. The foundations +build from fourth to first. The third and fourth rank (trash) cards are +not interchangeable on the tableau. Cards may not be played from the +foundations. Any card or correctly ordered pile may be played on an +empty row. + +

    Strategy

    +Uncover the deepest row stacks first. +

    Excuse

    +

    +Tarock type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Rows build down in rank regardless of suit. Only one card can +be moved at a time. Foundations build up in rank by suit. An +empty row stack cannot be filled. For this reason the Kings and +the highest Trump are dealt to the bottoms of the rows. Cards +can be played from the foundations. + +

    Strategy

    +

    +Uncover low rank cards before building on higher rank cards on +top of them. Use cards already on the foundations to assist in +moving rows. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Falling Star

    +

    +Terrace type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Much like Blondes and Brunettes. + +

    Rules

    +

    +[To be written] +

    Fan

    +

    +Fan game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The 18 piles build down by suit. +Only one card can be moved at a time, and +empty piles can be filled with a King only. + +

    Strategy

    +

    +Build evenly on to foundations. +

    Fatimeh's Game

    +Mughal Ganjifa game type. 1 deck. 2 redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with twelve rows and two redeals. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are that the cards are dealt to thirteen piles instead of fourteen +and if a dealt card is of rank Pradhan or over one card is dealt to the +talon. Otherwise the dealing rules are the same. +

    +Play is the same as Lara's Game except that there are two redeals. When +the talon is empty after each round the cards are gathered up from the +tableau and dealt to the rows without being shuffled using the same +dealing rules as in the first round. +

    Relaxed Fatimeh's Game

    +Mughal Ganjifa game type. 1 deck. 2 redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with twelve rows, two redeals and a reserve stack +which will hold two cards. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are that the cards are dealt to thirteen piles instead of fourteen +and if a dealt card is of rank Pradhan or over one card is dealt to the +talon. Otherwise the dealing rules are the same. +

    +Play is the same as Lara's Game except that there are two redeals. When +the talon is empty after each round the cards are gathered up from the +tableau and dealt to the rows without being shuffled using the same +dealing rules as in the first round. + +

    +The reserve stack will take any two cards from the rows. + +

    Strategy

    +Use the reserve stack to allow buried cards to play. The best times +to use it are just before a redeal. Once played to the reserve a +card may only be played from it to a foundation. +

    Fifteen Plus

    +

    +Tarock type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Rows build down in rank in alternating color. The Trumps can +play as either color. Only one card can be moved at a time. +Foundations build up in rank by suit. Any card can be played +on an empty row. Cards can be played from the foundations. + +

    Strategy

    +

    +Uncover low rank cards before building on higher rank cards on +top of them. Use cards already on the foundations to assist in +moving rows. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Fire Cracker

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +The rows build down in rank in the same suit. The foundations +build with cards of the same rank in suit order. Any card may +be played on an empty row. + +

    Rules

    +The rows build from first rank to fourth rank by suit. The foundations +build in ascending suit order from Pine to Phoenix by rank. The third +and fourth rank (trash) cards are interchangeable on the tableau. +Cards may not be played from the foundations. Any card or correctly +ordered pile may be played on an empty row. + +

    Strategy

    +Build sequences on the tableau. + +

    Author

    +This game and documentation has been written by +T. Kirk. +

    Five Aces

    +Tarock type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +This is a +Baker's Dozen +type game played with the 78 card Tarock deck. Piles build down +in rank in alternate colors. The Trumps can play as either color. +The five Aces are dealt to the foundations at the start of the game. + +

    Rules

    +Rows build down in rank by alternate color with the Trumps playing +as either color. A pile may be moved to another location but only +a single card may be played on an empty row. Cards may be played +from the foundations. + +

    Strategy

    +Use the Trumps to open spots for suit cards. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk. +

    Flower Arrangement

    +

    +Two-Deck game type. Two Hanafuda decks. No redeal. + +

    Object

    +

    +Arrange the Flower Cards in suit order. + +

    Rules

    +

    +The layout consists of three rows of playing piles and a row for newly +dealt cards. +

    +The cards must be arranged from forth rank to first in the top three +rows as follows: +

      +
    • The first row will only accept the first four suits, Pine, Plum, Cherry and Wisteria +
    • the second row will accept the second four, Iris, Peony, Bush Clover and Eularia +
    • and the third row will accept the last four, Chrysanthemum, Maple, Willow and Paulownia. +
    +

    +If you clear a space at the bottom it will be automatically filled +with a card from the talon. But if the talon is gone and you clear a space +at the bottom, then you can fill it with any card. +When no further moves are possible, click on the talon for a fresh row +of cards at the bottom. +

    +You win when all of the suits are arranged in order. + +

    Strategy

    +

    +Because of the many piles involved the Picture Gallery requires some +concentration, but it is not too hard to win. +

    Flower Clock

    +

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +This one is for people who want a mindless distraction. It's a good +way to learn the suits and ranks of the flower cards. The foundations +build from fourth rank to first, by suits. Any fourth rank card can be +played on any open foundation stack, but a game doesn't count as a win +unless the suits are in their proper order. That means Pine is at 1 +o'clock, Plum at 2 o'clock etc. Once a card is played on a foundation stack +it can't be taken off except by undoing the move. There can be no +more than eight cards in a row. + +

    +The cards in the tableau build from first rank to fourth, without regard +to suit. The third and fourth rank cards are interchangable. Any card +can be played on the canvas. + +

    +This is +Grandfather's Clock +with flower cards. + +

    Strategy

    +

    +Hint: try to keep a row open to the canvas. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    ForeCell

    +

    +FreeCell type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like FreeCell, +but the reserves are filled at game start, and only Kings on empty spaces. + +

    Rules

    +

    +[To be written] + +

    History

    +

    +According to the +FreeCell FAQ +this is the first known game which bears an extremely close resemblance +to FreeCell. It was invented in Sweden and dates back at least to 1945. +

    Fortress

    +

    +Beleaguered Castle type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The ten piles build up or down by suit. +Only one card can be moved at a time and +empty piles can be filled with any single card. + +

    Similar Games

    +

    +This is a very hard game - try +Chessboard +for a more enjoyful variant. +

    Forty and Eight

    +

    +Forty Thieves type. 2 decks. 1 redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but with eight piles and one redeal. + +

    Rules

    +

    +[To be written] +

    Forty Thieves

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Forty cards are dealt to 10 piles. These piles are built down in suit. +Only the top card of a pile is available for playing, and +spaces can be filled by any card. +

    +Cards from the talon are turned over to the waste pile, one at a time. +You can move the leftmost card to the playing piles or the foundations. +There is no redeal. + +

    History

    +

    +This is a classic solitaire game that probably dates back to the +nineteenth century. It is known by many names, such as +Napoleon at St.Helena, Big Forty and Le Cadran. +

    Four Seasons

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Arrange all the cards on the rows. + +

    Rules

    +This is a Fan +type game adapted to the Hanafuda cards. The tableau consists of +twelve rows. Any stack may be moved, but only a first rank card +will play on an empty row. The trash cards are not interchangable, +and no more than eight cards can be played on a row. The game is +won when all twelve suits are arranged in order in their respective +places on the tableau. + +

    Strategy

    +Not all Four Seasons hands are solvable. Try to get an open row. +

    Fourteen

    +

    +Pairing game type. 1 deck. No redeal. + +

    Object

    +

    +Discard all pairs of cards that add up to fourteen in rank. + +

    Rules

    +

    +The object is to use up all the cards from the tableau by +discarding pairs of cards that add up to fourteen in rank. +

    +Aces are worth one and Jacks, Queens, and Kings are worth +11, 12, and 13, respectively. +

    +There is no other playing on the piles. +You win when the tableau piles are all gone. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Four Winds

    +

    +Hanafuda type. 1 deck. 1 redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Cards play on the four foundation stacks by rank, in ascending suit order. +Cards play on the four row stacks in descending suit order. The row stacks +will hold no more than three cards. Only one card can be move at a time. +Any card can be played on an empty row stack, but only cards of the same +rank can play on partly filled rows. There are only two passes through +the talon. + +

    Strategy

    +

    +Winning at Four Winds requires a bit of luck and a lot of skill at +using the row stacks to the best advantage. +

    +Hint: try to keep one row stack open. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    FreeCell

    +

    +FreeCell type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +FreeCell is played with one deck. All cards are dealt at the start of the +game. To compensate for this there are 4 free cells which can hold +any - and just one - card. +

    +Piles build down by alternate color, and an empty space can be filled +with any card or sequence. +

    +The number of cards you can move as a sequence is restricted by +the number of free cells - the number of free cells required is the +same as if you would make an equivalent sequence of moves with single cards. +(As a shortcut, the computer also considers the number of free piles so +that you can move even more cards as one single sequence.) + +

    Notes

    +

    +Game numbers in the range 1 to 32000 are compatible to the ones in the +FreeCell FAQ. +Visit this page to find out a lot of interesting information +about FreeCell its variants. +

    +More than 99.9% of all FreeCell games are solvable. +

    Free Napoleon

    +

    +Napoleon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Napoleon, +only with a different screen layout. +
    Gameplay is completely equivalent. + +

    Rules

    +

    +[To be written] +

    Gajapati

    +Mughal Ganjifa type. One deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank and by suit. + +

    Rules

    +The cards on the tableau build down in ranks of the same suit. +The foundations build up in rank by suit starting with the Ace. +Any card or movable pile of cards may be played on an empty row. +Cards are dealt from the talon three at a time. There is no limit +on redeals. Cards may be played from the foundations. +

    +This game is one of a series of games that have names ending in "pati" +which transliterates as "lord of". Gajapati means "Lord of Elephants". +The names are the names of the suits in a twelve suit Ganjifa deck. + +

    Strategy

    +Uncover the deepest row stacks first. Play is simple but the odds +against winning this one are high. +

    Gaji

    +

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +When the cards are dealt, one card of each rank is placed on the four +foundation stacks. The remaining 44 cards are dealt to the tableau. +Cards from the tableau can be played on the foundations by rank, in +circular suit order. That is, Plum 1 plays on Pine 1, Rose 2 plays +on Iris 2, and Pine 3 plays on Phoenix 3. Gaji is wild. It can play +on any card in the tableau and any card can play on Gaji. Any card +can also be played on the canvas. Gaji will only play in its proper +position on the foundation. Cards play on the tableau by suit in +decending rank order. There can be no more than twelve cards in a row. +Once a card is played on a foundation stack it can't be taken off +except by undoing the move. + +

    Strategy

    +

    +Hint: try to keep a row open to the canvas. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Gargantua

    +

    +Klondike type. 2 decks. 1 redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Double Klondike, +but only one redeal. + +

    Rules

    +

    +[To be written] +

    Garhpati

    +Mughal Ganjifa type. One deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank in "alternate" colors. + +

    Rules

    +The cards on the tableau build down by rank in alternate colors. +The foundations build up in rank by suit starting with the Ace. +Only the Mirs (Kings) may be played on an empty row. The Mughal +Ganjifa deck has eight suits and each suit has it's own color. +This makes it a bit of a challenge at times to know what colors +are the "alternates". If a card doesn't play one place, try +a different card of the same rank. Cards are dealt from the talon +three at a time. There is no limit on redeals. Cards may not be +played from the foundations. +

    +This game is one of a series of games that have names ending in "pati" +which transliterates as "lord of". Garhpati means "Lord of Forts". +The names are the names of the suits in a twelve suit Ganjifa deck. + +

    Strategy

    +Uncover the deepest row stacks first. Move cards on the tableau +to allow playing cards from the waste stack. +

    General's Patience

    +

    +Terrace type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Terrace, +but the foundations build up in suit. + +

    Rules

    +

    +[To be written] +

    Ghulam

    +Mughal Ganjifa type. One deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +The cards build down by rank and by suit on the tableau, no more than +twelve to a row. Any card or movable pile may be played on an empty row. + +

    Rules

    +All cards are dealt to the fourteen rows when the games begins. Cards +on the tableau build down by suit in descending rank order. The foundations +build up by suit. Any card or movable pile may be played on an empty row. +The four reserve stacks hold one card each. + +

    Strategy

    +The first priority is to empty a row. Then don't fill it +unless it or another row can be emptied by doing so. +

    Giant

    +

    +Gypsy type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Gypsy, +but you are only permitted to move cards back out of the foundations +if the talon is empty. + +

    Rules

    +

    +[To be written] +

    Golf

    +

    +Golf type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the waste stack. + +

    Rules

    +

    +Build on the waste stack in sequence either up or down regardless of suit. +

    +Only the top card is available for play on the piles. When no more moves are +possible, click on the talon to deal a new card. +

    +Sequences do not wrap around, i.e. only Twos may be placed on Aces +and only Queens may be placed on Kings. + +

    Notes

    +

    +Autodrop is disabled for this game. + +

    Strategy

    +

    +Save Twos for Aces and Queens for Kings. +

    Good Measure

    +

    +Baker's Dozen type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Baker's Dozen, +but 10 piles, and 2 Aces are moved to the foundations +at the start of the game. + +

    Rules

    +

    +[To be written] +

    Grandfather's Clock

    +

    +One-Deck game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Move cards to the foundations until the top of each foundation is the +clock number for that position. Jack equals 11, Queen equals 12, and +Aces must be placed on Kings. +

    +The playing piles build down by rank regardless of suit. Only the top card +is available for play, and empty rows may be filled with any single card. + +

    Notes

    +

    +Autodrop and Quickplay are disabled for this game. +

    Grandmother's Game

    +

    +Spider type. 2 decks. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

    Quick Description

    +

    +Just like Relaxed Spider, +but deal 60 cards face up at game start. + +

    Rules

    +

    +60 cards are dealt open face in 10 piles. +Piles build down by rank, regardless of suit. +However, sequences that are all of the same suit are preferred +because these are available for further movement. +

    +A free space can be filled by any single card or sequence. +

    +The object is to group the cards in sets of 13 cards, from King to Ace +of the same suit. Such groups can be moved to a free space and then off +the game by a mouseclick. +

    +When no more sensible moves are available, click on the talon. One card +will be added to each of the playing piles (this includes the at this time +free spaces too). +

    +You may deal new cards at any time. + +

    Strategy

    +

    +Grandmother's Game is a complex strategic solitaire game which cannot be +solved very often. A good way to get to a satisfactory solution is to establish +at least one, better two or even more, free spaces to get room for moving +the cards and fit them together to descending suits. + +

    History

    +

    +This is a Spider type game of German origin. +

    Grasshopper

    +

    +Tarock type. 1 deck. 1 redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The tableau consists of one reserve stack, one Trumps only row stack, +and five row stacks. Fourteen cards are dealt to the reserve +stack and one card each to the row stacks. When a row stack is emptied +it must be filled from the reserve stack first. When the reserve stack +is empty any card can be played on an empty row stack. The Trumps only +stack is left empty and can be played on at will. The row stacks +build down in rank by alternate colors. The Trumps can be played as +either color. The Trumps only row stack also builds down in rank. It +will accept a stack of cards that contains suit cards as long as the +bottom card is a Trump. The foundations build up in rank by suit. + +

    Strategy

    +

    +The first priority is to empty the reserve stack. Once that's done +try to keep one or more row stacks open. Play +high rank cards on the rows and build down on them. The same goes for +the Trumps only row. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Greater Queue

    +Braid type. 4 decks. Two redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Play is similar to +Braid. + +

    Rules

    +Twenty five cards are dealt to the Braid when the game begins. +The foundations build in ascending suit order from Pine to Paulownia by rank. +Cards are dealt from the talon one at a time and two redeals are allowed. +Cards may not be played from the foundations. + +

    Strategy

    +Build sequences on the rows that will play when the correct card turns +over from the talon. Braid type games require careful strategy to win. +

    Great Wall

    +

    +Hanafuda type. 4 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Cards can be played on the tableau by suits or by rank. +Plum 1 plays on Pine 1, Maple 3 on Mum 3, Pine 2 on +Phoenix 2, etc. Any second rank card can be played on +any first. The third and fourth ranks are interchangable +for all suits. Only first rank cards can be played on the +canvas. There can be no more than 26 cards in a row. +

    +The foundations are of two types. The finish foundations +at the top on the left and right, and the build foundations +on the bottom. Cards must be played on the foundations by +rank in suit order. The finish foundations will only accept +cards as a complete set of all twelve suits. The build +foundations will accept only one card at a time. +The finish foundations will accept three complete sets +of suits. The build foundations will accept one. When +all four decks are on the foundations in order, you have +won. Cards can be moved from the build foundations to +the finish foundations or to the tableau. They cannot +be moved from the finish foundations. + +

    Strategy

    +

    +Since any particular card will usually play in several +different places on the tableau it's probably possible to +win every hand of Great Wall. +

    +Hint: don't play all your first rank cards on the foundations +until all the cards are face up. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Griffon

    +

    +Yukon type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick description

    +

    +Just like Milligan Harp, +but with seven piles, and deal all cards face-up. + +

    Rules

    +

    +[To be written] +

    Ground for a Divorce

    +

    +Spider type. 2 decks. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by same suit and move such sets to the foundations. +The sequence may wrap around. + +

    Quick Description

    +

    +Like Spider, +but sequences wrap around from Ace to King, +and no card will be dealt to an empty space. + +

    Rules

    +

    +50 cards are dealt in 10 piles. Cards are built down, regardless of suit. +However, sequences that are all of the same suit are preferred because +these are available for further movement. +A space can be filled by any card or legal group of cards. +

    +Sequences wrap around, i.e. Kings may be placed on Aces. +

    +The object is to group the cards in descending sets of 13 cards of the +same suit. These sequences may wrap around as well. +Such groups can then be moved to the foundations. +

    +When no more moves are possible, click on the talon. One card will be +added to each non empty space. + +

    History

    +

    +This is my favorite +Spider +variant. Even more decisions, and +with a fair chance of coming out. +The original German name is Scheidungsgrund. +

    Gypsy

    +

    +Gypsy type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The eight playing piles in the tableau all start with two +cards face-down and one showing. +Piles build down by alternate color, and an empty space can be filled +with any card or sequence. +

    +When no more moves are possible, click on the talon. One card will be +added to each of the playing piles. +

    +You are also permitted to move cards back out of the foundation. + +

    Strategy

    +

    +Making heavy use of the Undo key is explicitly encouraged here - you can win +quite a number of games with a little bit of thought. + +

    History

    +

    +Gypsy is my all time favorite - it is probably the reason +that I started writing PySol at all... +

    +I first met Gypsy almost fifteen years ago in the nice +Atari ST game Patience written by Volker Weidner. +And as there seems to be no official name of +this variant I adopted the name Gypsy from another +game called xpat2. +

    Hayagriva

    +Dashavatara Ganjifa type. One deck. No redeal. +

    Object

    +Move all cards to the foundations. +

    Quick description

    +The cards build down by rank only on the tableau, no more +than twelve to a row. Only the Rajas may be played on an empty row. +

    Rules

    +All cards are dealt to the sixteen rows when the games begins. Cards +on the tableau build down in rank only. The foundations build up by suit. +Only a Raja or sequence may be played on an empty row. The four reserve +stacks hold one card each. +

    Strategy

    +An empty row is somewhat more useful than the reserve stacks. Try for an empty row. +

    Hex A Klon by Three

    +Klondike type. One deck. Unlimited redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Klondike +with Hex A Deck +variations. + +

    Rules

    +Game play is like Klondike with the Wizards being wild. They can be played +on the tableau as any rank or color. Once a Wizard is played on a row however +that row may become unmovable. If a Wizard is played in it's proper rank +position the row can still be moved. A stack with two Wizards can be moved +only if they are both in their rank position and they are not adjacent to +each other. The Wizards will not move off of the tableau until all the other +cards have been moved to the foundations. Cards are dealt from the talon three +at a time. Any card or sequence may be played on the canvas. Cards may +be played from the foundations. + +

    Strategy

    +Keep the Wizards off of piles that contain face down cards. Once all the +cards on the tableau are face up try to get the Wizards out of the way. Put +them all on one row stack until the suit cards have been moved to the foundations. +

    Hex A Klon

    +

    +Hex A Deck type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick description

    +

    +Like Klondike, except any card can +be played on an empty row and the Wizards (Jokers) are wild. + +

    Rules

    +

    +Game play is like Klondike with the Wizards being wild. They can be played +on the tableau as any rank or color. Once a Wizard is played on a row however +that row may become unmovable. The Wizards have ranks like the suit cards +corresponding to Ace through Four. If a Wizard is played in it's proper rank +position the row can still be moved. The rank can be determined by the height +of the hat. The Ace Wizard has the tallest hat. A stack with two Wizards can +be moved only if they are both in their rank position and they are not ajacent +to each other. The Wizards will not move off of the tableau until all the other +cards have been moved to the foundations. + +

    Strategy

    +

    +Keep the Wizards off of piles that contain face down cards. Once all the +cards on the tableau are face up try to get the Wizards out of the way. Put +them all on one row stack until the suit cards have been moved to the foundations. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Hidden Passages

    +Klondike type. One deck. One redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Blind Alleys +with Hex A Deck +variations. + +

    Rules

    +Game play is like Blind Alleys. The rows build down in rank in alternate +color. Any card or sequence may be played on an empty row. The Wizards +will play in their proper rank position on the tableau as the alternate +of either red or black. Cards are dealt from the talon one at a time. +The four suit Aces are dealt to the foundations at the start of the +game. Cards may be played from the foundations. +

    Strategy

    +The Wizards will not play to their foundation until all the suit cards +are on theirs. This can make the end game a real challenge. +

    Hiranyaksha

    +

    +FreeCell type. One Dashavatara Ganjifa Deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Die Schlange, +using the ten suit Dashavatara Ganjifa deck and the number of cards you can move as a +sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each Raja or King +starting a new pile. Rows build down in rank regardless of suit. +Empty rows cannot be filled. The ten free cells will hold one card each. +

    Hopscotch

    +

    +One-Deck game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Calculation, +but the initial foundation cards are in club suit. + +

    Rules

    +

    +[To be written] +

    Imperial Trumps

    +

    +Tarock type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +This game is similar to Klondike except the twenty-two trump +cards will play on any suit card of the next higher rank. +Cards will play on the foundation only if the trump card of +equal rank is played first. That means the Ace of Spades +won't play on the Spade foundation until the Ace of Trumps +is played on the Trump foundation. Only Kings or the highest +ranked Trump can be played on an empty row stack. The highest +Trump is called either the Fool or the Skiz depending on the +type of deck. It has either the number 0 or is not numbered. +Cards can be played from the foundations to the tableau. + +

    Strategy

    +

    +Skillful tableau play with the trumps can make all the difference +in this game. You can move a trump from a red card to a +black card of the same rank. This will open the red card for +a black one of the next lower rank. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Indian

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the piles build down by any suit but own. + +

    Rules

    +

    +[To be written] +

    Interregnum

    +

    +Numerica type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The foundations build up by rank ignoring suit. The base rank for +each foundation is one higher than the reserve above it. +

    +Each foundation must be completed by using the card from the reserve above it. +

    +There is no building on the tableau piles - cards can only be +moved to the foundations, and spaces are not filled. +

    +When no more moves are possible, click on the talon. One card will be +added to each of the playing piles. + +

    Notes

    +

    +Autodrop is disabled for this game. + +

    Histoy

    +

    +This is a two-deck variation of +Auld Lang Syne. +

    Iris

    +Hanafuda type. 1 deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Iris. +The rows build down in rank by same suit. The foundations +build up in rank by suit. + +

    Rules

    +The rows build from first rank to fourth rank by suit. The foundations +build from fourth to first. The third and fourth rank (trash) cards are +not interchangeable on the tableau. Cards may not be played from the +foundations. Cards are dealt from the talon three at a time. Only first +rank cards or correctly ordered piles may be played on an empty row. + +

    Strategy

    +Uncover the deepest row stacks first. +

    Irmgard

    +

    +Gypsy type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Gypsy, +but 9 piles and only Kings on empty spaces. + +

    Rules

    +

    +The playing piles build down by alternate color, and an empty space +can only be filled by a King or a sequence starting with a King. +

    +When no more moves are possible, click on the talon. One card will be +added to each of the playing piles, except for the last turn where only +7 cards will be dealt. +

    +You are also permitted to move cards back out of the foundation. + +

    Notes

    +

    +As with Gypsy you are allowed to make heavy use of the Undo key. +

    Japanese Garden

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Rules

    +This is a Fan +type game adapted to the Hanafuda cards. The tableau consists of +six flower beds in two rows above and a Koi pond below with the +foundations at the top. Cards build from first to fourth rank +on the tableau by suit and from fourth to first on the foundations. +Only first rank cards may be played on an empty row. No more than +six cards may be played on a row. Cards may be moved from the Koi +pond to either the rows or the foundations but may not be moved to +the pond. Only one card may be moved at a time. + +

    Strategy

    +It's not at all unusual to have no possible moves after dropping +cards to the foundations. Try to get an open row. +

    Japanese Garden II

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Rules

    +Play is identical to +Japanese Garden +except cards may only be played from the Koi pond to the foundations, +not to the rows. +

    Japanese Garden III

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Rules

    +Play is identical to +Japanese Garden +except there are eight flower bed row stacks that will each +hold up to seven cards. There is no Koi pond in this garden. +

    Journey to Cuddapah

    +Braid type. One deck. Two redeals. + +

    Object

    +Move all cards to the Foundations. +

    Quick description

    +Similar to Braid +played with a single Dashavatara +Ganjifa +deck. + +

    Rules

    +Game play is like Braid. In this variation there are two Braid +stacks that each have their own set of Braid reserve stacks. The +game lay out starts with the ten foundations in the outer most columns. +The next two columns inwards are the ten Braid reserves. Then there +are two columns with five general reserves each. The inner most two +columns are the two Braid stacks. Each Braid starts with fifteen cards. +When one of the Braid reserves becomes open the card at the top of the +corresponding Braid will be moved there. When all the cards from one +of the Braids are removed a card from the other Braid will be used. +

    +Cuddapah is a city in India with a history in the production of Ganjifa cards. +

    Strategy

    +Build sequences on the rows that will play when the correct card turns +over from the talon. This game type requires careful strategy to win. +

    Just For Fun

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Free Cell. +The rows build down by rank in the same suit. The foundations +build with cards of the same rank in suit order. + +

    Rules

    +The rows build from first rank to fourth rank by suit. The foundations +build in ascending suit order from Pine to Phoenix by rank. The third +and fourth rank (trash) cards are not interchangeable on the tableau. +Cards may not be played from the foundations. Only first rank cards +or correctly ordered piles may be played on an empty row. + +

    Strategy

    +Use the reserve stacks to release the fourth rank cards first. + +

    Author

    +This game and documentation has been written by +T. Kirk. +

    Double Kali's Game

    +Dashavatara Ganjifa game type. 2 decks. 3 redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with twelve rows, three redeals and a reserve stack. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are that the cards are dealt to thirteen piles instead of fourteen +and if a dealt card is of rank Pradhan or over one card is dealt to the +talon. Only one 120 card Dashavatara deck is used. Otherwise the +dealing rules are the same. +

    +Play is the same as Lara's Game except that there are three redeals. When +the talon is empty after each round the cards are gathered up from the +tableau and dealt to the rows without being shuffled using the same +dealing rules as in the first round. The foundations take two complete +rounds of a suit. After the first Raja is played to a foundation the +second Ace will play. + +

    +The reserve stack will take any four cards from the rows. + +

    Strategy

    +Use the reserve stack to allow buried cards to play. The best times +to use it are just before a redeal. Once played to the reserve a +card may only be moved from it to a foundation. +

    Kali's Game

    +Dashavatara Ganjifa game type. 1 deck. 2 redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with twelve rows and two redeals. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are that the cards are dealt to thirteen piles instead of fourteen +and if a dealt card is of rank Pradhan or over one card is dealt to the +talon. Only one 120 card Dashavatara deck is used. Otherwise the +dealing rules are the same. +

    +Play is the same as Lara's Game except that there are two redeals. When +the talon is empty after each round the cards are gathered up from the +tableau and dealt to the rows without being shuffled using the same +dealing rules as in the first round. +

    Relaxed Kali's Game

    +Dashavatara Ganjifa game type. 1 deck. 2 redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with twelve rows, two redeals and a reserve stack +which will hold two cards. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are that the cards are dealt to thirteen piles instead of fourteen +and if a dealt card is of rank Pradhan or over one card is dealt to the +talon. Only one 120 card Dashavatara deck is used. Otherwise the +dealing rules are the same. +

    +Play is the same as Lara's Game except that there are two redeals. When +the talon is empty after each round the cards are gathered up from the +tableau and dealt to the rows without being shuffled using the same +dealing rules as in the first round. + +

    +The reserve stack will take any two cards from the rows. + +

    Strategy

    +Use the reserve stack to allow buried cards to play. The best times +to use it are just before a redeal. Once played to the reserve a +card may only be moved from it to a foundation. +

    Double Katrina's Game

    +Tarock game type. 4 decks. 2 redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with twenty two rows and one redeal, using the Tarock deck. +This is the same as Relaxed Katrina's Game +using four decks. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are that the cards are dealt to twenty three piles instead of fourteen +and if a dealt card is of rank Page or over one card is dealt to the +talon. Otherwise the dealing rules are the same. +

    +Play is the same as Lara's Game with two exceptions. The first exception +is that there are two redeals. When the talon is empty after the one +round the cards are gathered up from the tableau and dealt to the rows +without being shuffled using the same dealing rules as in the first round. +

    +The other exception is the reserve stack just to the right of the foundations. +This stack will take any three cards from any of the rows. Once played there +however, a card may not be removed except by playing it to a foundation. + +

    Strategy

    +If two row cards will play on the same foundation pick the card that is on +the row that holds the most cards. Move cards from one set of foundations +to the other to get extra plays. +

    Katrina's Game

    +Tarock game type. 2 decks. 1 redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with twenty two rows and one redeal, using the Tarock deck. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are that the cards are dealt to twenty three piles instead of fourteen +and if a dealt card is of rank Page or over one card is dealt to the +talon. Otherwise the dealing rules are the same. +

    +Play is the same as Lara's Game except that there is one redeal. When +the talon is empty after the first round the cards are gathered up from +the tableau and dealt to the rows without being shuffled using the same +dealing rules as in the first round. + +

    Strategy

    +If row two cards will play on the same foundation pick the card that is on +the row that holds the most cards. Move cards from one set of foundations +to the other to get extra plays. +

    Relaxed Katrina's Game

    +Tarock game type. 2 decks. 1 redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with twenty two rows and one redeal, using the Tarock deck. +This is the same as Katrina's Game +with a reserve stack. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are that the cards are dealt to twenty three piles instead of fourteen +and if a dealt card is of rank Page or over one card is dealt to the +talon. Otherwise the dealing rules are the same. +

    +Play is the same as Lara's Game with two exceptions. The first exception +is that there is one redeal. When the talon is empty after the first +round the cards are gathered up from the tableau and dealt to the rows +without being shuffled using the same dealing rules as in the first round. +

    +The other exception is the reserve stack just to the right of the foundations. +This stack will take any two cards from any of the rows. Once played there +however, a card may not be removed except by playing it to a foundation. + +

    Strategy

    +If two row cards will play on the same foundation pick the card that is on +the row that holds the most cards. Move cards from one set of foundations +to the other to get extra plays. +

    Khadga

    +

    +FreeCell type. One Moghul Ganjifa Deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Snake, using the eight suit Moghul Ganjifa deck +and the number of cards you can move as a sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each Raja or King +starting a new pile. Rows build down in rank and alternate color. +Refer to the general Ganjifa page. +Empty rows cannot be filled. The eight free cells will hold one card each. +

    Kingdom

    +

    +Two-Deck game type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The foundations build up by rank igonoring suit. +

    +The reserve piles can hold a single card and +are automatically filled from the waste or talon. +

    +There is no building on the tableau piles, so you can +only move cards to the foundations. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    King Only Baker's Game

    +

    +FreeCell type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Baker's Game, +but only Kings on empty spaces. + +

    Rules

    +

    +All cards are dealt at the start of the game. To compensate for this +there are 4 free cells which can hold any - and just one - card. +

    +Piles build down by suit, and you can only move Kings to empty slots. +

    +The number of cards you can move as a sequence is restricted by +the number of free cells - the number of free cells required is the +same as if you would make an equivalent sequence of moves with single cards. +

    King Only Hex A Klon

    +Klondike type. One deck. One redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Klondike +with Hex A Deck +variations. + +

    Rules

    +Game play is like Klondike with the Wizards being wild. They can be played +on the tableau as any rank or color. Once a Wizard is played on a row however +that row may become unmovable. If a Wizard is played in it's proper rank +position the row can still be moved. A stack with two Wizards can be moved +only if they are both in their rank position and they are not adjacent to each +other. The Wizards will not move off of the tableau until all the other cards +have been moved to the foundations. Only Kings may be played on the canvas. +Cards may be played from the foundations. + +

    Strategy

    +Keep the Wizards off of piles that contain face down cards. Once all the +cards on the tableau are face up try to get the Wizards out of the way. Put +them all on one row stack until the suit cards have been moved to the foundations. +Since the Wizards will not play to the foundation until all the suit cards are on +the foundations, and since only Kings will play on an empty row, one Wizard is +dealt to the bottom of the second row from the left. If you move that Wizard +and there is no other Wizard on the canvas, you will not be able to win the +game. +

    Klondike by Threes

    +

    +Klondike type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Klondike, +but deal three cards. + +

    Rules

    +

    +[To be written] +

    Klondike

    +

    +Klondike type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Foundations are built up in suit from Ace to King. +

    +The playing piles build down by alternate color, and an empty space +can only be filled by a King or a sequence starting with a King. +

    +When you click on the talon, one card is turned over onto the waste pile. +There is no limit to the number of times you go through the talon. +

    +You are also permitted to move cards back out of the foundations. +

    Klondike Plus 16

    +Klondike type. One deck. One redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Klondike +with Hex A Deck +variations. + +

    Rules

    +Game play is like Klondike with the Wizards being wild. They can be played +on the tableau as any rank or color. Once a Wizard is played on a row however +that row may become unmovable. The Wizards have ranks like the suit cards +corresponding to Ace through four. If a Wizard is played in it's proper rank +position the row can still be moved. The rank can be determined comparing some +distinctive element of the images. The first rank Wizard will be the most elaborate +in some way such as the fattest, the tallest hat etc. A stack with two Wizards can +be moved only if they are both in their rank position and they are not adjacent +to each other. Cards are dealt from the talon one at a time. Only Kings may +be played on an empty row. The Wizards may be played to the foundation at any +time in their proper rank order. Cards may be played from the foundations. + +

    Strategy

    +The Wizards may play to the foundation at any time, but they can be very helpful +in moving cards on the tableau. +

    Kurma

    +Dashavatara Ganjifa type. One deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by suit and rank. + +

    Rules

    +The cards on the tableau build down in rank of the same suit. The +foundations build up in rank by suit starting with the Ace. The cards +are dealt from the talon one at a time. Any card or movable pile may +be played on an empty row. Cards may be played from the foundations. + +

    Strategy

    +The odds against winning this game are high. Try moving cards off of +the deepest piles first. +

    La Belle Lucie

    +

    +Fan game type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The 18 piles build down by suit. +Only one card can be moved at a time. +Empty piles are not filled. +

    +When no more moves are possible, click on the talon. +All cards on the tableau will be re-shuffled. + +

    History

    +

    +This game is also known under names such as +Clover Leaf and Midnight Oil. +

    Labyrinth

    +

    +FreeCell type. Two Hex A Decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Snake, +with the Hex A Deck Variations and the number of cards you can move as a +sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each King or "Ten" +(hexadecimal) starting a new pile. Rows build down in rank and alternate +colors. The Wizards play as any color. Empty rows cannot be filled. +

    Lady Betty

    +

    +Numerica type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Numerica, +but the foundations build up in suit, and 6 row stacks. + +

    Rules

    +

    +The foundations build up in suit from Ace to King. +

    +One card is flipped over at a time and moved onto the stacks. There are no +restrictions on which card may go where on the stacks. Once on a stack, +a card can only be moved onto a foundation. +

    Lady Palk

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the 8 piles build down by rank ignoring suit, +and sequences can be moved. + +

    Rules

    +

    +[To be written] +

    Double Lara's Game

    +Lara's game type. 4 decks. 2 redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with four decks, two redeals and a reserve stack. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are the use of four decks instead of two two redeals and a reserve stack. +Otherwise the play and dealing rules are the same. +

    +When the talon is empty after each round the cards are gathered up from +the tableau and dealt to the rows without being shuffled using the same +dealing rules as in the first round. The foundations take two complete +rounds of a suit. After the last card of the first round is played to +a foundation the first card of the second round will play. + +

    +The reserve stack will take any two cards from the rows. + +

    Strategy

    +Use the reserve stack to allow buried cards to play. The best times +to use it are just before a redeal. Once played to the reserve a +card may only be played from it to a foundation. +

    Lara's Game

    +

    +Two-Deck game type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Cards are dealt to 14 piles. The piles are organized Ace through +five, six through ten, and then the three face cards, followed by the +Talon. [Yes, cards are dealt to the talon!] The rules for this deal +are as follows: +

    +Cards are dealt to the first thirteen piles in order, until the 104 +cards have been used up. If the dealt card matches the place of the +pile it is placed on, one card is dealt to the talon. If the card is +a face card, one card is dealt to the talon. If the card is an Ace, +two cards are dealt to the talon. Each time the deal reaches the King +pile, two cards are dealt to the talon and the deal starts over at the +Ace pile. +

    +The four top foundations build up from Ace, while the left four +Foundations build down from King. Only the top card of any stack is +playable, and the rest of the cards are hidden. +

    +The piles at the bottom of the screen represent the player's hand. +Whenever a card is dealt from the talon, the player picks up the +corresponding pile, places the dealt card at the bottom of the hand +plays any cards that can be played, and replaces the hand to the pile +that was picked up. +

    +There is no redeal. + +

    Notes

    +

    +This game was taught to me by a wonderful woman. Neither she nor I +knows where the game originated (it was taught to her by her older +sister). This game is dedicated to her. Note: it was taught to her +by her *other* older sister. So it really shouldn't be called Lara's +game. But that's what I'm used to calling it, so thus it remains. + +

    Author

    +

    +This game and documentation has been written by +Matthew W. Hohlfeld +and is part of the official PySol distribution. +

    Relaxed Lara's Game

    +Lara's game type. 2 decks. 1 redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Lara's Game +with a redeal and a reserve stack. + +

    Rules

    +Refer to the description of the deal in Lara's Game. The differences +are the use of four decks instead of two two redeals and a reserve stack. +Otherwise the play and dealing rules are the same. +

    +When the talon is empty after each round the cards are gathered up from +the tableau and dealt to the rows without being shuffled using the same +dealing rules as in the first round. The foundations take two complete +rounds of a suit. After the last card of the first round is played to +a foundation the first card of the second round will play. + +

    +The reserve stack will take any single card from the rows. + +

    Strategy

    +Use the reserve stack to allow buried cards to play. The best time +to use it is just before the redeal. Once played to the reserve a +card may only be played from it to a foundation. +

    Lesser Queue

    +Braid type. 2 decks. Two redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Play is similar to +Braid. + +

    Rules

    +The foundations build in ascending suit order from Pine to Paulownia by rank. +Cards are dealt from the talon one at a time and two redeals are allowed. +Cards may not be played from the foundations. + +

    Strategy

    +Build sequences on the rows that will play when the correct card turns +over from the talon. Braid type games require careful strategy to win. +

    Lexington Harp

    +

    +Yukon type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Cards in tableau are built down by alternate color. +Groups of cards can be moved regardless of sequence. +An empty space can be filled with any card or sequence. +

    +Foundations are built up in suit from Ace to King. +Cards in foundations are no longer in play. +

    +When no more moves are possible, click on the talon. One card will be +added to each of the playing piles. + +

    History

    +

    +This is a combination of +Yukon type and +Gypsy type +game elements. +

    Little Easy

    +Hanafuda type. 1 deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank in the same suit. The foundations +build with cards of the same rank in suit order. + +

    Rules

    +The rows build from first rank to fourth rank by suit. The foundations +build in ascending suit order from Pine to Phoenix by rank. The third +and fourth rank (trash) cards are not interchangeable on the tableau. +Cards are dealt from the talon three at a time and there is no limit to +the number of redeals. Cards may not be played from the foundations. +Only first rank cards may be played on an empty row. + +

    Strategy

    +Disable auto drop and build on the rows until all cards are face up. +These games may be easy by name and easy to play but they're not easy +to win. + +

    Author

    +This game and documentation has been written by +T. Kirk. +

    Little Forty

    +

    +Forty Thieves type. 2 decks. 3 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the piles build down by rank only, +sequences can be moved if they build down by suit and rank, +empty piles are automatically filled from the waste or talon, +deal 3 cards each time, and 3 redeals. + +

    Rules

    +

    +[To be written] + +

    History

    +

    +This is a combination of +Forty Thieves type and +Spider type +game elements. +

    Long Braid (Der lange Zopf)

    +

    +Napoleon type. 2 decks. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Braid, +but deal 24 cards to the Braid stack at game start. + +

    Rules

    +

    +[To be written] +

    Long Journey to Cuddapah

    +Braid type. Two decks. Two redeals. + +

    Object

    +Move all cards to the Foundations. +

    Quick description

    +Similar to Braid +played with two Dashavatara +Ganjifa +decks. + +

    Rules

    +Game play is like Braid. In this variation there are two Braid +stacks that each have their own set of Braid reserve stacks. The +game lay out starts with the twenty foundations in the outer most columns. +The next two columns inwards are the ten Braid reserves. Then there +are two columns with five general reserves each. The inner most two +columns are the two Braid stacks. Each Braid starts with twenty cards. +When one of the Braid reserves becomes open the card at the top of the +corresponding Braid will be moved there. When all the cards from one +of the Braids are removed a card from the other Braid will be used. +

    +Cuddapah is a city in India with a history in the production of Ganjifa cards. +

    Strategy

    +Build sequences on the rows that will play when the correct card turns +over from the talon. This game type requires careful strategy to win. +

    Lucas

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but with 13 piles, and sequences can be moved. + +

    Rules

    +

    +[To be written] +

    Mage's Game

    +Baker's Dozen type. One deck. No redeals. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Baker's Dozen +with one row of twelve alternate color row stacks and +Hex A Deck +variations. + +

    Rules

    +Game play is like Baker's Dozen. The rows build down in rank in alternate +color. The Wizards will play in their proper rank position on the +tableau as the alternate of either red or black. Any card or sequence +may be played on an empty row. Cards may be played from the foundations. +

    Strategy

    +Try to open a row to the canvas. +

    Mahjongg

    +Mahjongg tile based solitaire games. + +

    Object

    +Remove all tiles from the tableau. + +

    Quick description

    +Click on two matching tiles to remove them from the tableau. + +

    Rules

    +Tiles may be removed from the tableau only in matching pairs and only +if both tiles are free. A tile is free if there are no tiles on top +of it and no tiles either to the right or left of it. A set of Mahjongg +tiles has three suits of nine tiles plus three Dragons and four Winds, +each of which is repeated four times. And there four Seasons and four +Flowers. This makes a total of 144 tiles in a complete set. The three +suits are usually called Sticks, Coins and Strings although other names +are sometimes used. A three of Sticks will only match another three of +Sticks. The Dragons are known by their colors which are usually red, +green and white. A green Dragon will only match another green Dragon. +The Winds are North, South, East and West. North will only match North +etc. Any Flower will match any other Flower and any Season will match +any other Season. + +

    Strategy

    +Remove tiles from the deepest stacks first. + +

    Notes

    +Mahjongg is a game that requires four players referred to as the four +winds. The first widely distributed computer solitaire game that used +the Mahjongg tiles was called Shanghai and was produced by Activision. +

    Makara

    +

    +FreeCell type. One Moghul Ganjifa Deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Snake, +using the eight suit Moghul Ganjifa deck and the number of cards you can move as a +sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each Raja or King +starting a new pile. Rows build down in rank and suit. +Refer to the general Ganjifa page. +Empty rows cannot be filled. The eight free cells will hold one card each. +

    Maria

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the 9 piles build down by alternate color. +
    Much like Streets. + +

    Rules

    +

    +[To be written] +

    Martha

    +

    +Baker's Dozen type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The four Aces are dealt to the foundations at game start. +

    +The piles build down by alternate color. +Sequences may be moved, but an empty pile can be only +be filled with a single card. +

    Matriarchy

    +

    +Two-Deck game type. 2 decks. Varying number of redeals. + +

    Object

    +

    +Move all cards to the tableau piles. + +

    Rules

    +

    +The object of this game is to build sequences until all the cards are +used up. Cards are placed on Queens in descending order, following suit. +Kings are placed on the empty spaces above the queens, and then cards are +placed on the Kings in ascending order, starting with Ace, also following +suit. For each rank you complete, (that is, having one card of each value) +you get an extra chance at going through the talon. You are permitted to +move cards from one pile to another, as long as you still follow the rules. +The first time you go through the talon, the cards are given two at a time. +The second time, it is three cards, and so on up to twelve. If by that time +you have completed any ranks, your bonus runs start at eleven, then ten, and +so on. You win if you complete all the ranks. +

    Matrix

    +Matrix type. One deck. No redeals. + +

    Object

    +Restore game pieces to their proper order. + +

    Rules

    +When the game opens the all game pieces except for the final piece are +dealt to the tableau in their proper order. The pieces are then scrambled +to a random pattern. With the larger grids it may take several seconds for +the scrambling to be completed. Pieces may not be lifted from the canvas. +They may be moved by clicking on a piece which is in either the row or the +column which has the empty spot. That piece and all intervening pieces will +move one space towards the empty spot. The image game piece sets are best used +with the grid size for which they are designed. The size is indicated in the +name of the set. King of Hearts 4x4, Players Trumps 10x10, etc. The default +set of numbered pieces works with any grid size. When all the pieces have been +restored to their correct order the final piece will be dealt to the tableau and +the game has been won. Every Matrix game can be solved. + +

    Strategy

    +Begin in the upper left hand corner and complete one row before starting the next. +Take a screen shot of the image sets before the game is scrambled. +

    MatsuKiri

    +

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundation. + +

    Rules

    +

    +The cards can only be moved to the foundation as entire suits, in order. +As in Oonsoo, +the third and fourth rank cards are interchangable +for all suits except Rain. Only first rank cards can play on the canvas. +First build the suits on the tableau. Then pick up all four cards at +once and drop them on the foundation. The foundation will only accept +a completed suit if the internal rank order is correct and it's played +in suit order. Plum after Pine, Phoenix after Rain, etc. Stacks in +the tableau can be moved if the cards in the stack are in order or +not. There can be no more than twelve cards in a row. The play in +this game is similar to Seahaven Towers, except there are no reserve +stacks. +

    +This game can have "unbeatable" deals. For instance, if the second +rank card of suit "a" is on the first rank card of suit "b", and the +second rank card of "b" is on the first rank card of "a", neither second +rank card can be moved. You've lost. It's also possible to play +yourself into a similar situation. + +

    Strategy

    +

    +Hint: try to build more than one suit on the tableau at a time. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    MatsuKiri Strict

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Move all cards to the single foundation. + +

    Rules

    +Play is identical to +MatsuKiri +except the trash (third and forth rank) cards are not interchangeable. +

    Matsya

    +Dashavatara Ganjifa type. One deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank only. + +

    Rules

    +The cards on the tableau build down in rank regardless of suit. The +foundations build up in rank by suit starting with the Ace. The cards +are dealt from the talon one at a time. There is no redeal. Only Mirs +(Kings) may be played on an empty row. Cards may not be played from the +foundations. + +

    Strategy

    +The waste stack will be the biggest problem area. Play from it first. +

    Maze

    +

    +Montana type. 1 deck. No redeal. + +

    Object

    +

    +Group all the cards in sets of 12 cards in ascending sequence +by suit from Ace to Queen. There may be empty spaces between +but not within such sequences. The tableau wraps around. + +

    Rules

    +

    +This solitaire starts with the entire deck shuffled and dealt +out to 54 piles. The Kings are then removed making a total of 6 +initial free spaces. +

    +You may move to a space only the card that +matches the neighbor in suit, and is one greater in rank than the left +neighbour or one less in rank than the right neighbour. +

    +As a special rule you may place an Ace of any suit to the right +of a Queen. +

    +The tableau wraps around at the end of rows and from the +bottom-right to the top-left. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Memory 24

    +

    +Memory game type. 24 cards. No redeal. + +

    Object

    +

    +Flip all pairs of matching cards and get a score of 40 points or more. + +

    Rules

    +

    +At game start 12 pairs of cards are dealt to the tableau piles. +

    +Flip any 2 cards that match in suit and rank. +

    +Any pair that matches will gain you 5 points, while a pair that +doesn't match will cost you 1 point. +

    +You win if your final score reaches 40 points. + +

    Notes

    +

    +To get awarded for a perfect game you must reach the maximum score of +60 points. You can reach this by restarting the game. +

    +Undo, Bookmarks, Autodrop and Quickplay +are disabled for this game. +

    Memory 40

    +

    +Memory game type. 40 cards. No redeal. + +

    Object

    +

    +Flip all pairs of matching cards and get a score of 50 points or more. + +

    Rules

    +

    +At game start 20 pairs of cards are dealt to the tableau piles. +

    +Flip any 2 cards that match in suit and rank. +

    +Any pair that matches will gain you 5 points, while a pair that +doesn't match will cost you 1 point. +

    +You win if your final score reaches 50 points. + +

    Notes

    +

    +To get awarded for a perfect game you must reach the maximum score of +100 points. You can reach this by restarting the game. +

    +Undo, Bookmarks, Autodrop and Quickplay +are disabled for this game. +

    Merlin's Meander

    +Braid type. Two decks. Two redeals. + +

    Object

    +Move all suit cards to the Foundations. +

    Quick description

    +Similar to Braid +with Hex A Deck +variations. + +

    Rules

    +Game play is like Braid. In the Hex A Deck variation the Wizards +don't have their own foundations. There are two reserve stacks to +the left of the foundations that will hold up to three Wizards each. +The game is won when all the suit cards have been moved to the foundations. +

    Strategy

    +Build sequences on the rows that will play when the correct card +turns over from the talon. Don't fill the Wizard stacks until you +need to. +

    Midshipman

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the 9 piles build down by any suit but own. +
    Much like Indian. + +

    Rules

    +

    +[To be written] +

    Milligan Cell

    +

    +Gypsy type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Gypsy, +but only Kings on empty spaces, and with four extra free cells. +
    Easy. + +

    Rules

    +

    +[To be written] +

    +You are not permitted to move cards back out of the foundations. +

    Milligan Harp

    +

    +Yukon type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Rules

    +

    +Cards in Tableau are built down by alternate color. +Groups of cards can be moved regardless of sequence. +An empty space can be filled with any card or sequence. +

    +Foundations are built up in suit from Ace to King. +Cards in Foundations are no longer in play. +

    +When no more moves are possible, click on the Talon. One card will be +added to each of the playing piles. + +

    History

    +

    +This is a combination of +Yukon type and +Gypsy type +game elements. +

    Mississippi

    +

    +Yukon type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick description

    +

    +Just like Milligan Harp, +but with seven piles. + +

    Rules

    +

    +[To be written] +

    Miss Milligan

    +

    +Gypsy type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Gypsy, +but only Kings on empty spaces, and with an extra reserve stack +that can be used once the talon is empty. + +

    Rules

    +

    +[To be written] +

    +After the talon is exhausted, you can use the reserve stack +for storing any card or legal sequence +(this process is called weaving). +

    +You are not permitted to move cards back out of the foundations. +

    Montana

    +

    +Montana type. 1 deck. 2 redeals. + +

    Object

    +

    +Group all the cards in sets of 12 cards in acscending sequence +by suit from Two to King. + +

    Rules

    +

    +This solitaire starts with the entire deck shuffled and dealt +out in four rows. The Aces are then removed +making 4 initial free spaces. You may move to a space only the card that +matches the left neighbor in suit, and is one greater in rank. Kings are +high, so no cards may be placed to their right (they create dead spaces). +

    +When no moves can be made, cards still out of sequence are reshuffled +and dealt face up after the ends of the partial sequences, leaving a card +space after each sequence, so that each row looks like a partial sequence +followed by a space, followed by enough cards to make a row of 13. + +

    Notes

    +

    +Autodrop is disabled for this game. + +

    Strategy

    +

    +A moment's reflection will show that this game cannot take more than 12 +redeals. But only 2 redeals are allowed... + +

    History

    +

    +This game is also known under names such as +Gaps. +

    Monte Carlo

    +

    +Pairing game type. 1 deck. No redeal. + +

    Object

    +

    +Discard all pairs of cards of the same rank. + +

    Rules

    +

    +The object is to use up all the cards from the tableau by +discarding pairs of cards of the same rank. +

    +You can only put a card on top of another card +when the two cards are touching horizontally, vertically or diagonally +(i.e. the cards have to be neighbours). +

    +When no more moves are possible, click on the talon. +The cards will be shifted up and the empty spaces at +the bottom will be filled. +

    +You win when the tableau piles are all gone. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Mughal Circles

    +Mughal Ganjifa type. One deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +The cards build down by rank and by suit on the tableau. Any card may be +played on an empty row. Only one card may be moved at a time. + +

    Rules

    +All cards are dealt to the twenty four rows when the games begins. Cards +on the tableau build down by suit in descending rank order. The foundations +build up by suit. Any card may be played on an empty row. The reserve stacks +hold one card each. Only one card at a time may be moved. + +

    Strategy

    +Try to keep a reserve stack open. Play higher ranked cards on empty rows. +

    Napoleon

    +

    +Napoleon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Der kleine Napoleon, +but a little bit easier because there are 2 free cells, +each of which is blocked by the corresponding reserve stack. + +

    Rules

    +

    +[To be written] +

    Napoleon's Exile

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the piles build down by rank ignoring suit. + +

    Rules

    +

    +[To be written] + +

    Similar Games

    + +

    Narasimha

    +Dashavatara Ganjifa type. One deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank in "alternate" colors. + +

    Rules

    +The cards on the tableau build down in rank in alternate colors. The +Dashavatara Ganjifa deck has ten suits and each suit has it's own color. +This makes it a bit problematic at times knowing which colors are alternate. +If a card of one suit doesn't play in a spot, try a different card of the +same rank. The foundations build up in rank by suit starting with the Ace. +The cards are dealt from the talon one at a time. There is no redeal. Only +the Mirs (Kings) may be played on an empty row. Cards may be played from the +foundations. + +

    Strategy

    +The waste stack will be the biggest problem area. Play from it first. +

    Narpati

    +Mughal Ganjifa type. One deck. No redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank in "alternate" colors. + +

    Rules

    +The cards on the tableau build down by rank in alternate colors. +The foundations build up in rank by suit starting with the Ace. +Only the Mirs (Kings) may be played on an empty row. The Mughal +Ganjifa deck has eight suits and each suit has it's own color. +This makes it a bit of a challenge at times to know what colors +are the "alternates". If a card doesn't play one place, try +a different card of the same rank. Cards are dealt from the talon +three at a time. There are no redeals. Cards may be played from +the foundations. +

    +This game is one of a series of games that have names ending in "pati" +which transliterates as "lord of". Narpati means "Lord of Men". +The names are the names of the suits in a twelve suit Ganjifa deck. + +

    Strategy

    +Uncover the deepest row stacks first. Move cards around on the +tableau to open spots for cards from the waste stack. +

    Nasty

    +Tarock type. 1 deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +This game is similar to +Cruel +played with the 78 card Tarock deck. Piles build down in rank in +by suit. Only one card may be moved at a time. + +

    Rules

    +Rows build down in rank by suit. Only one card may be moved at a time. +Only Kings or Skis (the highest Trump) may be played on an empty row. +When no more moves can be made click the talon for a redeal. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk. +

    Neighbour

    +

    +Pairing game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundation. + +

    Rules

    +

    +The object is to use up all the cards from the tableau, placing them +on the single foundation. You can only put a card on top of another card +when the numerical values of the two cards adds up to 13 +and the two cards are touching horizontally, vertically or diagonally +(i.e. the cards have to be Neighbours). +

    +You do not have to follow suit. +Jack is worth 11 and Queen is worth 12. +All Kings go off alone. +

    +Empty spaces are filled automatically by shifting cards up and +dealing from the talon to the bottom piles. +

    +You win when the tableau piles are all gone. + +

    Notes

    +

    +Quickplay is disabled for this game. + +

    History

    +

    +This is a combination of +Monte Carlo and +Pyramid game elements. +

    New Tower of Hanoi

    +Matrix type. One deck. No redeals. + +

    Object

    +Move the tower to either of the other stacks. + +

    Rules

    +Only one disk may be moved at a time. A larger disk may not be placed on +top of a smaller one. Click on the pile to be moved from to high +light it. Then click the pile to be moved to. + +

    Strategy

    +Ask +T +

    Nomad

    +

    +Gypsy type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Gypsy, +but with one extra free cell. + +

    Rules

    +

    +The eight playing piles in the tableau all start with four cards showing. +Piles build down by alternate color, and an empty space can be filled +with any card or sequence. The single free cell at the bottom may hold one +card at a time. +

    +When no more moves are possible, click on the talon. One card will be +added to each of the playing piles. +

    +You are also permitted to move cards back out of the foundation. + +

    Strategy

    +

    +Making heavy use of the Undo key is explicitly encouraged here - you can win +many games with a little bit of thought. Keeping the free cell open for sorting +is usually a good idea. + +

    History

    +

    +Nomad was created to be more strategic than Gypsy (hence all the open cards), +and be solvable more often than it under optimal play. From empiric data, I +find it's solvable in all but one in ten games, where I was solving only +slightly above a quarter of the Gypsy games. At the same time, the single free +cell gives it a very rich complexity. + +

    Author

    +

    +This game and documentation has been written by +Deon Ramsey<miavir@furry.de> (based on code and documentation by +Markus Oberhumer) and is part of the official PySol distribution. +

    Number Ten

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the piles build down by alternate color, and sequences can +be moved. + +

    Rules

    +

    +[To be written] +

    Numerica

    +

    +Numerica type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The foundations build up by rank - suits and colors are irrelevant. +

    +One card is flipped over at a time and moved onto the stacks. There are no +restrictions on which card may go where on the stacks. Once on a stack, +a card can only be moved onto a foundation. + +

    Strategy

    +

    +To solve this, you will need to plan carefully when placing the cards onto +the stacks - one wrong move and you'll never be able to untangle the mess. +

    +A good player can win about one out of three games without taking back moves. +

    +The auto-solver is hopeless. Don't believe the hints. + +

    History

    +

    +This game is also known under names such as +Sir Tommy. + +

    Author

    +

    +This game and documentation has been written by +Galen Brooks +and is part of the official PySol distribution. +

    Odd and Even

    +

    +Two-Deck game type. 2 decks. 1 redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The foundations build up in suit by steps of two. +

    +The 9 reserve piles can hold a single card and are automatically +filled from the waste or talon. +

    +There is no building on the tableau piles, so you can +only move cards to the foundations. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Odessa

    +

    +Yukon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Russian Solitaire, +only with a different initial card layout. + +

    Rules

    +

    +Cards in tableau are built down by suit. +Groups of cards can be moved regardless of sequence. +An empty pile in the tableau can be filled with a King or a group +of cards with a King on the bottom. +

    +Foundations are built up in suit from Ace to King. +Cards in foundations are no longer in play. +

    Oonsoo

    +

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +

    +Arrange all twelve suits in order. + +

    Rules

    +

    +When the hand is dealt there are two rows of six cards face down with +six more face up on top. You can play a card on another card if it's +in the same suit and in decending rank order. The third and fourth +rank cards are interchangable for all suits except Rain. Plum 4 on +Plum 3 is ok. Plum 3 on Plum 4 is ok. Gaji can only be played on +Rain 3. + +

    Strategy

    +

    +Hint: try to keep a row open to the canvas. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Oonsoo Open

    +

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +

    +Arrange all twelve suits in order. + +

    Rules

    +

    +This game is identical to + Oonsoo +except any card or correctly +ordered pile may be played on an empty row. + +

    Strategy

    +Try to keep a row open to the canvas. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Oonsoo Strict

    +

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +

    +Arrange all twelve suits in order. + +

    Rules

    +

    +The third and fourth rank (trash) cards are not +interchangeable in this version of + Oonsoo , but there are two reserve stacks. + +

    Strategy

    +Try to keep a row open to the canvas. Keep one or both of the reserves +open until all the cards are dealt. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Oonsoo

    +

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +

    +Arrange all twelve suits in order. + +

    Rules

    +

    +When the hand is dealt there are two rows of six cards face down with +six more face up on top. You can play a card on another card if it's +in the same suit and in decending rank order. The third and fourth +rank cards are interchangable for all suits except Rain. Plum 4 on +Plum 3 is ok. Plum 3 on Plum 4 is ok. Gaji can only be played on +Rain 3. + +

    Strategy

    +

    +Hint: try to keep a row open to the canvas. +

    Oonsoo

    +

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +

    +Arrange all twelve suits in order. + +

    Rules

    +This game is identical to + Oonsoo +except there is one reserve stack. + +

    Strategy

    +Try to keep a row open to the canvas. Keep the reserve stack open +until all the cards are dealt. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Osmosis

    +

    +One-Deck game type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +[To be written] +

    Pagat

    +

    +Tarock type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +This is a Freecell type of game. Cards on the tableau build down in rank +by suit. Cards build up in rank on the foundations. +A stack can be moved if the cards are in decending rank order +regardless of the suit. Any card or stack can be played on an empty +row. + +

    Strategy

    +

    +The foundations are less important early in the game than +building movable stacks. Use the reserve stacks carefully. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Pagoda

    +

    +Hanafuda type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +When the hand is dealt, the twenty reserve stacks of the pagoda +are filled with cards. The twelve foundation stacks on the +right are labeled with the names of the twelve suits. Cards are +played on the foundations first upwards from the fourth rank to +the first, then downwards from first to fourth. When the first +card is played on a foundation, the label changes from the suit +name to "Rising". When the fifth card is played, the label +changes to "Setting". When the last card is played, the label +reverts to the suit name. Cards can be played on the foundations +from the reserve stacks or from the waste stack. An empty foundation +will only accept the fourth rank card of the correct suit. Cards +are dealt from the talon four at a time, and there is only one +round. + +

    Strategy

    +

    +Hint: it's important to keep one or more reserve stacks open +during the early stages of the game. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Parashumrama

    +Dashavatara Ganjifa type. One deck. One redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank only. + +

    Rules

    +The cards on the tableau build down in rank regardless of suit. The +foundations build up in rank by suit starting with the Ace. The cards +are dealt from the talon three at a time. There is one redeal. Only Mirs +(Kings) may be played on an empty row. Cards may not be played from the +foundations. + +

    Strategy

    +The waste stack will be the biggest problem area. Play from it first. +Move cards on the tableau to make every play possible before dealing +more cards. +

    Pas de Deux

    +

    +Montana type. 2 decks. 1 redeal. + +

    Object

    +

    +Group all cards on the tableau in sets of 13 cards in acscending sequence +by suit from Ace to King. +The first row in Club, the second in Spade, the third in Heart and +the last in Diamond. + +

    Rules

    +

    +This solitaire is played with two separate decks. +The first deck is shuffled and dealt out in four rows. +The second deck is shuffled and becomes the talon. +

    +Only the card that is of the same rank and suit as the top card +of the waste can be moved. This card can be exchanged with any +card on the same row or on the same column of the tableau. +

    +After each move a new card is dealt from the talon to the waste. +There is one redeal. +

    +If you do not want to exchange a card just click on the talon. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Pas Seul

    +

    +Klondike type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Klondike, +but 6 piles, anything on an empty space, and no redeal. +
    Much like Blind Alleys. + +

    Rules

    +

    +Piles build down by alternate color, and an empty space can be filled +with any card or sequence. +

    +Cards from the talon are turned over to the waste pile, one at a time. +You can move the top card to the playing piles or the foundations. +There is no redeal. +

    +You are also permitted to move cards back out of the foundations. +

    Paulownia

    +Hanafuda type. 1 deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down in rank by same suit. The foundations +build up in rank by suit. + +

    Rules

    +The rows build from first rank to fourth rank by suit. The foundations +build from fourth to first. The third and fourth rank (trash) cards are +not interchangeable on the tableau. Cards may not be played from the +foundations. Only first rank cards or correctly ordered piles may be +played on an empty row. + +

    Strategy

    +Uncover the deepest row stacks first. + +

    Author

    +This game and documentation has been written by +T. Kirk. +

    Peek

    +

    +One-Deck game type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Osmosis, +but the rows are dealt face-up. + +

    Rules

    +

    +[To be written] +

    Pegged

    +

    +Puzzle game type. 1 deck. No redeal. + +

    Object

    +

    +Remove all but one card. + +

    Rules

    +

    +This is a classic puzzle game. Cards are removed by jumping over +neighbour cards, and the space beyond the neighbour must be empty. +

    +You win when there is only one card left. + +

    Notes

    +

    +To get awarded for a perfect game the remaining card must be +in the position of the initial free space. +

    +Autodrop and Quickplay are disabled for this game. +

    Penguin

    +

    +FreeCell type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The top left card is called the Beak and determines the base +rank for the foundations. The three other cards of the same rank +are placed to the foundations. +

    +The seven piles build down by same suit, wrapping around from Ace to King. +Empty spaces may only be filled by a card or a sequence +one below the Beak's rank. +

    +The seven free cells (also called Flipper) can hold +any - and just one - card. +

    Peony

    +Hanafuda type. 1 deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Peony. +The rows build down in rank by same suit. The foundations +build up in rank by suit. + +

    Rules

    +The rows build from first rank to fourth rank by suit. The foundations +build from fourth to first. The third and fourth rank (trash) cards are +not interchangeable on the tableau. Cards may not be played from the +foundations. Cards are dealt from the talon three at a time. Any card +or sequence stack may be played on an empty row. + +

    Strategy

    +Uncover the deepest row stacks first. +

    Perpetual Motion

    +

    +One-Deck game type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the single foundation. + +

    Rules

    +

    +The piles build by cards of same rank. +

    +Four cards of the same rank can be moved to the single foundation. +

    +After all cards have been dealt click on the talon for a redeal. +The cards are not re-shuffled, but re-dealt in a certain pattern. + +

    Strategy

    +

    +Good for mindless playing as sooner or later every game should come out. +

    Picture Gallery (Die Bildgallerie)

    +

    +Two-Deck game type. 2 decks. No redeal. + +

    Object

    +

    +Fill the entire Gallery with pictures. + +

    Rules

    +

    +The layout consists of three rows of playing piles, a row for newly- +dealt cards, and a castoff pile for Aces. +

    +All Aces are cast off to the pile on the right. Use the <A> key. +When you clear a space on the tableau, +you can only fill it with the right card: +

      +
    • In the first row, you build up sequences starting with a Four, +
    • in the second row with a Three, and in the +
    • third row with a Two. +
    +You build up sequences incrementing by three, up to +the face cards. Thus, in the first row, each pile is 4-7-10-K, in the +second row 3-6-9-D, and in the third row, 2-5-8-B. Once a sequence has been +started, you have to follow suit. +

    +If you clear a space at the bottom it will get automatically filled +with a card from the talon. But if the talon is gone and you clear a space +at the bottom, then you can fill it with any card. +When no further moves are possible, click on the talon for a fresh row +of cards at the bottom. +

    +You win when the entire Gallery is filled with pictures, that is, face cards. + +

    Strategy

    +

    +Because of the many piles involved the Picture Gallery requires some +concentration, but it is not too hard to win. +

    PileOn

    +

    +One-Deck game type. 1 deck. No redeal. + +

    Object

    +

    +Rearrange the cards so that each pile contains four cards with the +same rank. + +

    Rules

    +

    +Rearrange the cards so that each pile contains four cards with the +same rank. This should leave two piles empty. +

    +Cards can be moved on top of any other card or cards of the same rank. +Groups of cards can be moved if they are of the same rank. +

    +A pile cannot have more than four cards, and an empty slot +can be filled with any card or group of cards with the same rank. + +

    Strategy

    +

    +Keep one of the piles clear as much as possible. Don't allow a pile of +three cards to build up on top of a single card, especially if the +final card from the set is not a bottom card in another pile. +

    Pine

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Pine. +The rows build down in rank by same suit. The foundations +build up in rank by suit. + +

    Rules

    +The rows build from first rank to fourth rank by suit. The foundations +build from fourth to first. The third and fourth rank (trash) cards are +not interchangeable on the tableau. Cards may not be played from the +foundations. Cards are dealt from the talon three at a time and +there is no redeal. + +

    Strategy

    +Uncover the deepest row stacks first. +

    Poker Shuffle

    +

    +Poker type. 1 deck. No redeal. + +

    Object

    +

    +Arrange the 10 Poker hands for a total score of 200 points or more. + +

    Rules

    +

    +At game start 25 cards are dealt to the tableau piles. +

    +Swap any 2 cards on the tableau to maximize your score. +

    +Points are awarded for the 5 Poker hands from left to right and for +the 5 hands from top to bottom. +

    +You win if your score reaches 200 points. +

    Poker Square

    +

    +Poker type. 1 deck. No redeal. + +

    Object

    +

    +Arrange the 10 Poker hands for a total score of 100 points or more. + +

    Rules

    +

    +Place the 25 cards on the tableau to get a score of 100 points or more. +

    +Once on a stack, a card cannot be moved. +

    +Points are awarded for the 5 Poker hands from left to right and for +the 5 hands from top to bottom. +

    Ponytail

    +

    +Tarock type. 2 decks. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Braid, +but with Tarock cards. + +

    Rules

    +

    +[To be written] + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Pyramid

    +

    +Pairing game type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards to the single foundation. + +

    Rules

    +

    +The object is to use up all the cards by placing them +on the single foundation. +

    +You can only put a card on top of another card +when the numerical values of the two cards adds up to 13. +Queen is worth 12 and Jack is worth 11. You do not have to follow suit. +

    +All Kings go off alone. + +

    Notes

    +

    +Quickplay is disabled for this game. +

    Quadrangle

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but with a varying base card, +the foundations and the 12 piles wrap around, +and empty piles are automatically filled from the waste or talon. + +

    Rules

    +

    +[To be written] +

    Queenie

    +

    +Yukon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick Description

    +

    +Like Yukon, +but don't deal all cards at game start. + +

    Rules

    +

    +Cards in Tableau are built down by alternate color. +Groups of cards can be moved regardless of sequence. +An empty pile in the Tableau can be filled with a King or a group +of cards with a King on the bottom. +

    +Foundations are built up in suit from Ace to King. +Cards in Foundations are no longer in play. +

    +When no more moves are possible, click on the Talon. +One card will be added to each of the playing piles. +

    Rachel

    +

    +Spider type. 1 deck. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the Foundations. + +

    Rules

    +

    +Cards are built down, regardless of suit. +A space can be filled by any card or legal group of cards. +

    +The object is to group the cards in sets of 13 cards, from King to Ace +of the same suit. Such groups can be moved to the Foundations. +

    +When you click on the Talon, one card is turned over onto the Waste pile. +There is no redeal. +

    Rainbow

    +

    +Canfield type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Canfield, +but piles build down by rank, cards are dealt singly, and no redeal. + +

    Rules

    +

    +[To be written] +

    Rainfall

    +

    +Canfield type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Canfield, +but cards are dealt singly, and two redeals. + +

    Rules

    +

    +[To be written] +

    Rambling

    +

    +FreeCell type. Two Tarock Decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Snake, +using two 78 card Tarock decks and the number of cards you can move as a +sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each King or Skiz +starting a new pile. Rows build down in rank and suit. The +trumps will only play on other trumps. Empty rows cannot be filled. +The eight free cells will hold one card each. +

    Rank and File

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the piles build down by alternate color, and sequences can +be moved. +
    Much like Number Ten. + +

    Rules

    +

    +[To be written] +

    Red and Black

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the 8 piles build down by alternate color, +the foundations build up by alternate color, +and sequences can be moved. + +

    Rules

    +

    +[To be written] +

    Red Moon

    +

    +Montana type. 1 deck. 2 redeals. + +

    Object

    +

    +Group all the cards in sets of 13 cards in ascending sequence +by suit from Ace to King. + +

    Quick Description

    +

    +Just like Blue Moon, +but easier because of a different initial layout. + +

    Rules

    +

    +[To be written] + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Relaxed FreeCell

    +

    +FreeCell type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like FreeCell, +but the number of cards you can move as a sequence is not restricted. + +

    Rules

    +[To be written] +

    Relaxed Golf

    +

    +Golf type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the waste stack. + +

    Quick Description

    +

    +Just like Golf, +but sequences do wrap around, +i.e. Twos and Kings may be placed on Aces +and Queens and Aces may be placed on Kings. + +

    Rules

    +[To be written] + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Relaxed Pyramid

    +

    +Pairing game type. 1 deck. 2 redeals. + +

    Object

    +

    +Remove all cards from the Pyramid. + +

    Quick Description

    +

    +Just like Pyramid, +but you win as soon as the Pyramid is cleared. + +

    Rules

    +

    +[To be written] + +

    Notes

    +

    +Quickplay is disabled for this game. +

    Relaxed Seahaven Towers

    +

    +FreeCell type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Seahaven Towers, +but the number of cards you can move as a sequence is not restricted. + +

    Rules

    +[To be written] +

    Relaxed Spider

    +

    +Spider type. 2 decks. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

    Quick Description

    +

    +Just like Spider, +but you may deal new cards even if there are empty rows. + +

    Rules

    +[To be written] +

    Relax

    +Hanafuda type. 1 deck. One redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +This is a variation of +Little Easy. +The rows build down by rank in the same suit. The foundations +build with cards of the same rank in suit order. Only first +rank cards may be played on an empty row. Trash card ranks +are interchangeable. + +

    Rules

    +The rules are the same as in +Little Easy +except that the cards deal from the talon one at a time, there +is only one redeal and the third and fourth rank (trash) cards +are interchangeable. + +

    Strategy

    +Disable auto drop and build on the rows until all cards are face up. +These games may be easy by name and easy to play but they're not easy +to win. + +

    Author

    +This game and documentation has been written by +T. Kirk. +

    Royal Cotillion

    +

    +Two-Deck game type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The foundations build up in suit by steps of two. +

    +The 4 reserve piles on the left can only play to the foundations. +

    +The 16 reserve piles on the right can hold a single card and +are automatically filled from the waste or talon. +

    +There is no building on the tableau piles, so you can +only move cards to the foundations. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Royal East

    +

    +One-Deck game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The four foundations in the corners build up in suit, +wrapping around from King to Ace. +The base rank is determined at initial dealing. +

    +The five tableau piles build down by rank, +wrapping around from Ace to King. +Only the top card can be moved. +

    Rushdike

    +

    +Yukon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick Description

    +

    +Like Russian Solitaire, +but don't deal all cards at game start. + +

    Rules

    +

    +Cards in Tableau are built down by suit. +Groups of cards can be moved regardless of sequence. +An empty pile in the Tableau can be filled with a King or a group +of cards with a King on the bottom. +

    +Foundations are built up in suit from Ace to King. +Cards in Foundations are no longer in play. +

    +When no more moves are possible, click on the Talon. +One card will be added to each of the playing piles. +

    Russian Patience (Die Russische)

    +

    +Two-Deck game type. 2 stripped decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +This game is played with two stripped decks. +

    +The foundations build up in suit starting with Ace, then from Seven up to King. +

    +The row stacks build down in alternate color. +Sequences may be moved, and +spaces may be filled by any single card. +

    Russian Point

    +

    +Yukon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick Description

    +

    +Like Russian Solitaire, +but don't deal all cards at game start. + +

    Rules

    +

    +Cards in Tableau are built down by suit. +Groups of cards can be moved regardless of sequence. +An empty pile in the Tableau can be filled with a King or a group +of cards with a King on the bottom. +

    +Foundations are built up in suit from Ace to King. +Cards in Foundations are no longer in play. +

    +When no more moves are possible, click on the Talon. +One card will be added to each of the playing piles. +

    Russian Solitaire

    +

    +Yukon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Yukon, +but piles build down by suit. + +

    Rules

    +

    +Cards in tableau are built down by suit. +Groups of cards can be moved regardless of sequence. +An empty pile in the tableau can be filled with a King or a group +of cards with a King on the bottom. +

    +Foundations are built up in suit from Ace to King. +Cards in foundations are no longer in play. +

    Samuri

    +

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Samuri is a Klondike type game. Play begins with a similar layout. +There are seven row stacks with six foundations to either side. The +Talon is in the middle. Cards are dealt from the talon to the waste +stack one at a time. There is only one round. The cards play on the +foundations from fourth rank to first by suits. They play on the rows +from first to fourth, also by suits. Rank order is strict for all suits. +Only first rank cards will play on the canvas. Cards cannot be removed +from a foundation once played there. + +

    Strategy

    +

    +Hint: try not to let the waste stack get too deep. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Sanibel

    +

    +Yukon / Forty Thieves hybrid. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Foundations are built up in suit from Ace to King. +Cards in the Foundations are no longer available for play in +the Tableau. It is not compulsory to play any card to the Foundations. +

    +The Tableau is built down by alternate color. Any group of cards may be +moved regardless of sequence, so long as the bottom card of the group is +placed on top of a card (in a different pile) that is the next higher card in +rank and of the opposite color. An empty pile in the Tableau can be filled +with any group of cards, even a single card. + +

    History

    +

    +From John Stoneham, Sanibel's inventor: +

    +Sanibel and Captiva are islands off the coast of Ft. Meyers, Florida. One +summer while vacationing there, I played through all the games described in +The Complete Book of Solitaire & Patience Games by Albert H. Morehead +and Geoffrey Mott-Smith (published by Bantam, I believe). I really liked the +play of Yukon but thought the Tableau limited the strategic potential of the +game, so I added an extra deck and experimented with the Tableau layout, +aiming for a game that was almost entirely strategic in nature but not on the +10th order of mental magnitude. The result is Sanibel. The number of face-up +cards initially dealt to the Tableau determines how much "luck" will play a +factor in the game. If you only deal 3 or 4 face-up cards to each pile +retaining the balance in the Reserve, chances are you will loose some games. +Technically, there is nothing wrong with that, and sometimes I will play it +this way. On the other hand, dealing every card face up (except the last 4) +takes away nothing from the game and only serves to increase the strategy +involved. I prefer the 3-down-7-up layout, since the face down cards and the +small Reserve give you something immediate to work for, and it can generate a +little suspense when you know there is a card buried that you need and you're +trying to find a way to uncover it... + +

    Strategy

    +

    +This is entirely a game of skill: if you loose, you just weren't paying +attention. Your first priority should be to expose all the face-down cards and +get the rest of the Reserve into play. Also, do not play a card onto a +Foundation simply because you can (Aces are OK; Twos are probably safe as +well): you may need it for building in the Tableau. You will find that you do +not need to calculate very long sequences to finish the game, but sometimes a +bit of calculation is necessary to expose the buried cards. Sometimes the piles +can grow longer than can be displayed in the window. This usually isn't a +problem, since you can break up the pile fairly often when other plays +become available. Here's something that's a lot of fun: If you have arranged +the cards in proper sequence, playing as few to the Foundations as possible +during the game, one press of the "Auto" button can play 90 or more cards to +the Foundations. It is possible to have every card in the Tableau at the end +of the game, even the Aces; the "Auto" button shoots them all up to the +Foundations in one long riffle! + +

    Author

    +

    +This game and documentation has been written by +John Stoneham +and is part of the official PySol distribution. +

    +Copyright (C) 1998 by John Stoneham. +These rules are free; you can redistribute them and/or modify them under the +terms of the GNU General Public License as published by the Free Software +Foundation; either version 2 of the License, or (at your option) any later +version. +

    Scorpion

    +

    +Spider type. 1 deck. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

    Quick Description

    +

    +Object is like in Spiderette, +but the cards can be moved like in +Russian Solitaire. + +

    Rules

    +

    +The object is to group the cards in sets of 13 cards, from King to Ace +of the same suit. Such groups can be moved to the foundations. +

    +Cards in tableau are built down by suit. +Groups of cards can be moved regardless of sequence. +An empty pile in the tableau can be filled with a King or a group +of cards with a King on the bottom. +

    +When no more moves are possible, click on the talon. +Three more cards will be dealt. + +

    History

    +

    +This is an interesting combination of +Spider type and +Yukon type game elements. +

    Scotch Patience

    +

    +Fan game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The foundations build up by alternate color. +

    +The 18 piles build down by rank ignoring suit. +Only one card can be moved at a time, and +empty piles cannot be filled. +

    Seahaven Towers

    +

    +FreeCell type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like King Only Baker's Game, +but with 10 piles. + +

    Rules

    +

    +[To be written] +

    Serpent

    +

    +FreeCell type. Two Tarock Decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Die Schlange, +using two 78 card Tarock decks and the number of cards you can move as a +sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each King or Skiz +starting a new pile. Rows build down in rank by alternate color. The +trumps will play as any color. Empty rows cannot be filled. The eight +free cells will hold one card each. +

    Shamrocks

    +

    +Fan game type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The 18 piles build up or down regardless of suit. +Each pile can hold no more than three cards. +Only one card can be moved at a time. +Empty piles are not filled. + +

    Strategy

    +

    +Build evenly on to foundations. +

    Shamsher

    +Mughal Ganjifa type. One deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +The cards on the tableau build down by rank regardless of suit, no more than +twelve to a row. Any card or movable pile may be played on an empty row. + +

    Rules

    +All cards are dealt to the fourteen rows when the games begins. Cards +on the tableau build down in descending rank order. The foundations +build up by suit. Any card or movable pile may be played on an empty row. + +

    Strategy

    +The first priority is to empty a row. Then don't fill it +unless it or another row can be emptied by doing so. +

    Shanka

    +Dashavatara Ganjifa type. One deck. No redeal. +

    Object

    +Move all cards to the foundations. +

    Quick description

    +The cards build down by rank only on the tableau, no more +than twelve to a row. Only the Rajas may be played on an empty row. +

    Rules

    +All cards are dealt to the sixteen rows when the games begins. Cards +on the tableau build down in rank only. The foundations build up by suit. +Only a Raja or sequence may be played on an empty row. +

    +Shanka is the conch incarnation of Vishnu. +

    Strategy

    +Try for an empty row. +

    Shisen-Sho

    +

    +Shisen-Sho is a single-player-game similar to Mahjongg and uses the same +set of tiles as Mahjongg. + +

    Object

    +

    +The object of the game is to remove all tiles from the field. + +

    Rules

    +

    +The aim of the game is to remove all tiles from the board. Only two +matching tiles can be removed at a time. Two tiles can only be removed if they +can be connected with a maximum of three connected lines. Lines can be +horizontal or vertical, but not diagonal. +

    +You don't have to draw the lines by yourself, the game does this for +you. Just mark two matching tiles on the board, if they can be connected with a +maximum of three lines, the lines will be drawn and the tiles are +removed. +

    +Remember that lines only may cross the empty border. If you are stuck, you +can use the Hint feature to find two tiles which may be removed. Clicking a +tile with the right mouse button will show you all corresponding tiles, no +matter if they are removable at the moment or not. +

    Sieben bis As

    +

    +Montana type. 1 stripped deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +This game is played with one stripped deck. +

    +This 32-card solitaire starts with the entire deck shuffled and dealt +out in three rows and two extra reserves at the top. +All Sevens from the rows are then dealt to the foundations thereby +making initial free spaces. +

    +You may move to a space only the card that +matches the neighbor in suit, and is one greater in rank than the left +neighbour or one less in rank than the right neighbour. Aces are +high, so no cards may be placed to their right (they create dead spaces). +

    +The foundations build up from Seven to King and then Ace. +You may only move a card from the rows (and not from the reserves) to +the foundations if it has an empty left neightbour - this implies +that you cannot drop a card from the leftmost column without +moving it somewhere else first. + +

    Strategy

    +

    +Don't drop cards to early - you should turn off Autodrop for this game. +

    Simple Carlo

    +

    +Pairing game type. 1 deck. No redeal. + +

    Object

    +

    +Discard all pairs of cards of the same rank. + +

    Quick Description

    +

    +Just like Monte Carlo, +but all pairs of the same rank may be discarded. +
    Extremely easy. + +

    Rules

    +

    +The object is to use up all the cards from the tableau by +discarding pairs of cards of the same rank. +

    +Empty spaces are filled automatically by shifting cards up and +dealing from the talon to the bottom piles. +

    +You win when the tableau piles are all gone. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Simple Pairs

    +

    +Pairing game type. 1 deck. No redeal. + +

    Object

    +

    +Discard all pairs of cards of the same rank. + +

    Rules

    +

    +The object is to use up all the cards from the tableau by +discarding pairs of cards of the same rank. +

    +You win when the tableau piles are all gone. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Simple Simon

    +

    +Spider type. 1 deck. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

    Quick Description

    +

    +Just like Spiderette, +but all cards are dealt at the beginning to the 10 piles. + +

    Rules

    +

    +[To be written] +

    Single Rail

    +

    +Forty Thieves type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Double Rail, +but with one deck and 4 piles. + +

    Rules

    +

    +[To be written] +

    Six Sages

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Rules

    +Play is identical to +Japanese Garden +except there are six row stacks that will each hold up to nine +cards and a reserve stack that will hold one card. +

    Six Tengus

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Rules

    +Play is identical to +Japanese Garden +except there are six row stacks that will each hold up to nine cards. +Two cards may be moved at a time if they are in rank order. + +

    Notes

    +The Tengu is a mythical Japanese character of exceptional fighting skill. +You will need great skill (and more than a little luck) yourself to over +come six of them. +

    Skiz

    +

    +Tarock type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +This is a Freecell type of game. Cards on the tableau build down in rank +by suit. Cards build up in rank on the foundations. +A stack can be moved if the cards are in decending rank order +regardless of the suit. Only a King or the highest trump can be played +on an empty row. + +

    Strategy

    +

    +The foundations are less important early in the game than +building movable stacks. Use the reserve stacks carefully. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Small Harp (Die kleine Harfe)

    +

    +Klondike type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Klondike, +only with a different layout. + +

    Rules

    +

    +[To be written] + +

    History

    +

    +Small Harp and Big Harp are the German ways of playing +Klondike and Double Klondike. +

    Snake (Die Schlange)

    +

    +FreeCell type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like FreeCell, +but with 2 decks, and empty rows are not filled. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each King +starting a new pile. +To compensate for this there are 7 free cells which can hold any +- and just one - card. +

    +Piles build down by alternate color, and an empty space cannot be filled. +

    +The number of cards you can move as a sequence is restricted by +the number of free cells - the number of free cells required is the +same as if you would make an equivalent sequence of moves with single cards. + +

    History

    +

    +This is a FreeCell type game of German origin. +It is related to Cat's Tail. +

    Snakestone

    +

    +FreeCell type. Two Hex A Decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Snake, +with the Hex A Deck Variations and the number of cards you can move as a +sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each King or "Ten" +(hexadecimal) starting a new pile. Rows build down in rank and suit. +The Wizards will play as any color. Empty rows cannot be filled. +

    Spaces

    +

    +Montana type. 1 deck. 2 redeals. + +

    Object

    +

    +Group all the cards in sets of 12 cards in acscending sequence +by suit from Two to King. + +

    Quick Description

    +

    +Just like Montana, +but with random spaces after each redeal. + +

    Rules

    +

    +[To be written] + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Spanish Patience

    +

    +Baker's Dozen type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Baker's Dozen, +but the Foundations build up in alternate color. + +

    Rules

    +

    +[To be written] +

    Spiderette

    +

    +Spider type. 1 deck. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

    Quick Description

    +

    +Like Spider, +but with one deck and 7 piles. Very hard. + +

    Rules

    +

    +[To be written] +

    Spider

    +

    +Spider type. 2 decks. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

    Rules

    +

    +54 cards are dealt in 10 piles. Cards are built down, regardless of suit. +However, sequences that are all of the same suit are preferred because +these are available for further movement. +A space can be filled by any card or legal group of cards. +

    +The object is to group the cards in sets of 13 cards, from King to Ace +of the same suit. Such groups can be moved to the foundations. +

    +When no more moves are possible, click on the talon. One card will be +added to each of the playing piles. +

    +You only may deal new cards if there are no empty spaces. + +

    History

    +

    +Spider is one of the classic solitaire card games. +It offers a lot of decisions, so choose a good strategy. +

    Stalactites

    +

    +FreeCell type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The foundations build up by rank ignoring color and suit, wrapping +around from King to Ace. +The base rank is determined at initial dealing. +

    +There is no building on the tableau piles, and spaces +are not filled. +Only the top card can be moved. +

    +The two free cells can hold any - and just one - card. +

    Steps

    +

    +Klondike type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Double Klondike, +but seven piles, anything on an empty space, and no redeal. +
    Much like Big Harp. + +

    Rules

    +

    +[To be written] +

    Storehouse

    +

    +Canfield type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Canfield, +but the piles build down by suit, +cards are dealt singly, and two redeals. + +

    Rules

    +

    +[To be written] + +

    History

    +

    +This game is also known under names such as +Straight Up. +

    Strategy

    +

    +Numerica type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +One card is flipped over at a time and moved onto the row stacks. There are no +restrictions on which card may go where on the stacks. Once on a stack, +a card can only be moved onto a foundation. +

    +The foundations build up in suit from Ace to King. You can only move +cards to the foundations once all cards have been placed on the +row stacks and the talon is empty. +

    Streets and Alleys

    +

    +Beleaguered Castle type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Beleaguered Castle, +but the Aces are not dealt to the foundations at game start. + +

    Rules

    +

    +[To be written] +

    Streets

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the piles build down by alternate color. + +

    Rules

    +

    +[To be written] +

    Sumo

    +Hanafuda type. 1 deck. No redeal. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Free Cell. +Cards build from first to fourth rank on the tableau by suit and +from fourth to first on the foundations. Only first rank cards +may be played on an empty row. + +

    Rules

    +Cards build down in rank on the rows and up in rank on the foundations. +Third and fourth rank (trash) cards are not interchangeable. Only a first +rank card or correctly ordered pile may be played on an empty row. + +

    Strategy

    +Don't play cards on the reserves unless they can be removed. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk. +

    Super Flower Garden

    +

    +Fan game type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like La Belle Lucie, +but the piles build down by rank. + +

    Rules

    +

    +The 18 piles build down by rank. +Only one card can be moved at a time. +Empty piles are not filled. +

    +When no more moves are possible, click on the talon. +All cards on the tableau will be re-shuffled. +

    Superior Canfield

    +

    +Canfield type. 1 deck. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Canfield, +but the reserve is dealt face-up, and +empty rows are not automatically filled. + +

    Rules

    +

    +[To be written] +

    Super Samuri

    +

    +Hanafuda type. 4 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +This is +Samuri +played with four decks. + +

    Strategy

    +Try not to let the waste stack get too deep. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk. +

    Surukh

    +Dashavatara Ganjifa type. One deck. No redeal. +

    Object

    +Move all cards to the foundations. +

    Quick description

    +The cards build down by rank in alternating force on the tableau, no more +than twelve to a row. Only the Rajas may be played on an empty row. +

    Rules

    +All cards are dealt to the sixteen rows when the games begins. Cards +on the tableau build down in rank in alternating force. See the general +Ganjifa +rules for more information. The easy way to remember the force of a suit +is that the foundations to the left are one force and the foundations to the +right are the other. The foundations build up by suit. Any card or sequence +may be played on an empty row. +

    Strategy

    +Try for an empty row. +

    Tam O'Shanter

    +

    +Numerica type. 1 deck. No redeal. + +

    Quick Description

    +

    +Like Auld Lang Syne, +but do not deal the Aces at game start. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The foundations build up by rank ignoring suit. +

    +There is no building on the tableau piles - cards can only be +moved to the foundations, and spaces are not filled. +

    +When no more moves are possible, click on the talon. One card will be +added to each of the playing piles. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Ten Avatars

    +Dashavatara Ganjifa type. One deck. No redeal. +

    Object

    +Arrange all cards in suit and rank order on the tableau. +

    Quick description

    +The cards may be built down by rank only on the tableau. The twelve +reserve stacks hold one card each. The game is won when all cards are +on the tableau in suit and rank order. +

    Rules

    +The game begins with five cards on each of the ten rows and the twelve +reserve stacks empty. Cards are dealt from the talon ten at a time, one +to each row. Rows can be built with cards of any suit in descending rank. +Only Rajas can be played on an empty row. All ten suits must be in +descending rank order for the game to be won. +

    Strategy

    +Make as many plays as possible without filling too many reserves before taking +another deal. Put a priority on getting the Rajas and Pradhans in place. +

    Terrace

    +

    +Terrace type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +[To be written] +

    The Familiar

    +Klondike type. One deck. One redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +Similar to Klondike +with Hex A Deck +variations. + +

    Rules

    +Game play is like Klondike. The rows build down in rank in alternate +color. The color of the Wizards is the alternate of either red or black. +Only the Tens (top rank cards) may be played on an empty row. There is +one reserve stack that will hold up to three Wizards. No suit cards can +be played there. The Wizards will also play in their proper rank position +on the tableau. They play as the alternate of either red or black. Cards +are dealt from the talon one at a time. Cards may be played from the +foundations. + +

    Strategy

    +Use caution when playing the Wizards on the reserve stack. If you play a +lower rank Wizard on top of a higher rank one, you will have to move it off +before the high rank one will play to the foundation. +

    The last Monarch (Der letzte Monarch)

    +

    +One-Deck game type. 1 deck. No redeal. + +

    Object

    +

    +Move 51 cards (all cards except the last King) to the foundations. + +

    Rules

    +

    +Cards on the tableau must be captured by one of their left, right, top or +bottom neighbour. The captured card is then moved to the foundations or +Reserves, and the capturing card moves into place. +

    +Cards from the reserve can only be moved to the foundations. + +

    Notes

    +

    +Quickplay is disabled for this game. +

    Three Peaks

    +Pairing type game. 1 deck. No redeal. + +

    Object

    +Remove all cards from the tableau. + +

    Rules

    +The object is to remove all the cards from the tableau by playing +them to the waste stack. Cards from the tableau will play to the +waste if they are one rank higher or lower than the card at the top +of the waste. A King will play on an Ace and vice versa. Cards are +played to the waste by clicking on them. Points are made as follows: + +
    +
    When a hand is dealt 52 points are subtracted from the score. +
    For each of the first four cards played from the tableau in a + sequence one point is added. +
    For each of the second four cards played from the tableau in a + sequence two points are added. +
    Then four points for the next four cards, eight for the next four, + then sixteen etc. +
    If one peak is empty the points added are doubled. +
    If two peaks are empty the points added are quadrupled. +

    +

    Ten points are added for emptying the first peak. +
    Twenty points are added for the second peak. +
    Forty points are added for emptying the last peak. +

    +

    When all the cards are removed from the tableau ten points are + added for each card remaining in the talon. +

    +

    The highest possible score for a single hand is 2336 points. +
    + +

    Notes

    +Undo is disabled in this game. +

    Three Peaks Non-scoring

    +Pairing type game. 1 deck. No redeal. + +

    Object

    +Remove all cards from the tableau. + +

    Rules

    +Play is identical to +Three Peaks +except no score is kept and plays can be undone. +

    Three Shuffles and a Draw

    +

    +Fan game type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like La Belle Lucie, +but with an additional draw. + +

    Rules

    +

    +The 18 piles build down by suit. +Only one card can be moved at a time. +Empty piles are not filled. +

    +When no more moves are possible, click on the talon. +All cards on the tableau will be re-shuffled. +

    +Once during the game, any one card below the top of a fan may +be drawn out and used on foundations or fan builds. +Do this by moving the top card of the fan to the Draw pile. +

    Thumb and Pouch

    +

    +Klondike type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Klondike, +but piles build down by any suit but own, anything on an empty space, +and no redeal. + +

    Rules

    +

    +[To be written] +

    Tipati

    +Mughal Ganjifa type. One deck. No redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank regardless of suit. + +

    Rules

    +The cards on the tableau build down by rank. The foundations build +up in rank by suit starting with the Ace. Only the Mirs (Kings) may +be played on an empty row. Cards are dealt from the talon one at +a time. There are no redeals. Cards may not be played from the +foundations. +

    +This game is one of a series of games that have names ending in "pati" +which transliterates as "lord of". Tipati means "Lord (Highest/Queen) of +Women". The names are the names of the suits in a twelve suit Ganjifa deck. + +

    Strategy

    +Move cards back and forth on the rows to make every play possible. +Don't let the waste stack get too deep. +

    Tower of Hanoy

    +

    +Puzzle game type. 9 cards. No redeal. + +

    Object

    +

    +Build a pile containing all 9 cards. + +

    Rules

    +

    +A card may only be placed onto another card that is of higher rank. +

    +Only the top card may be moved, and spaces may be filled +with any single card. + +

    Notes

    +

    +Autodrop is disabled for this game. +

    Trefoil

    +

    +Fan game type. 1 deck. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like La Belle Lucie, +but 16 piles, and the Aces are moved to the foundations at game start. + +

    Rules

    +

    +The 16 piles build down by suit. +Only one card can be moved at a time. +Empty piles are not filled. +

    +When no more moves are possible, click on the talon. +All cards on the tableau will be re-shuffled. +

    Tri Peaks

    +

    +Golf type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the waste stack. + +

    Quick Description

    +

    +Much like Relaxed Golf, +only with a Pyramid +related layout. + +

    Rules

    +

    +Build singly on the waste stack up or down regardless of suit. +

    +Only the top card is available for play. When no more moves are +possible, click on the talon to deal a new card. +

    +Sequences wrap around, +i.e. Twos and Kings may be placed on Aces +and Queens and Aces may be placed on Kings. + +

    Notes

    +

    +There is a simple scoring system here - you debit $120 for each game +($5 for each of the 24 cards in the talon) and for every card you +bear off, you get $1, $2, $3,... credit, depending on the length +of your current streak. +
    +Each cleared peak gains $15 bonus, and there's an +additional $30 if you manage to clear all three peaks. +
    +Your balance is reset whenever you select a different game. +Loaded games and manually entered game numbers don't count. +

    +Autodrop is disabled for this game. +

    Triple Klondike by Threes

    +

    +Klondike type. 3 decks. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Triple Klondike, +but deal three cards. + +

    Rules

    +

    +[To be written] +

    Triple Klondike

    +

    +Klondike type. 3 decks. Unlimited redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Klondike, +but with three decks and 13 playing piles. + +

    Rules

    +

    +[To be written] +

    Triple Line

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the Foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the 12 piles build down by alternate color, +empty rows are automatically filled from the Waste or Talon, +and sequences can be moved. + +

    Rules

    +

    +[To be written] +

    Two Familiars

    +Klondike type. Two decks. One redeal. + +

    Object

    +Move all cards to the Foundations. + +

    Quick description

    +This is a two deck version of The Familiar. + +

    Rules

    +Game play is like Klondike. The rows build down in rank in alternate +color. The color of the Wizards is the alternate of either red or black. +Only the Tens (top rank cards) may be played on an empty row. There is +one reserve stack that will hold up to three Wizards. No suit cards can +be played there. The Wizards will also play in their proper rank position +on the tableau. They play as the alternate of either red or black. Cards +are dealt from the talon one at a time. Cards may be played from the +foundations. + +

    Strategy

    +Use caution when playing the Wizards on the reserve stack. If you play a +lower rank Wizard on top of a higher rank one, you will have to move it off +before the high rank one will play to the foundation. +

    Union Square

    +

    +Two-Deck game type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Cards in tableau can be built either up or down in suit. However, each pile must follow only one of +these rules. For example, if a tableau pile has a three of clubs over a two of clubs, one can only +play a four of clubs on this pile. Any available card can be played on to an empty tableau pile. +

    +Foundation piles are to be built in suit from Ace to King, followed by another King, then back down +to Ace, giving 26 cards per pile when game is won. Cards in foundation piles are no longer in play. +

    +Cards can be flipped singly from the talon to the waste. +Top card of waste is available for play. +There is no redeal. + +

    Strategy

    +

    +A string of beads can be added to from both ends, and so should your piles. +Make good use of any empty slots to append cards. +With a little perseverance, this game can be a lot of fun! +

    Vajra

    +

    +FreeCell type. One Moghul Ganjifa Deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Die Schlange, +using the eight suit Moghul Ganjifa deck and the number of cards you can move as a +sequence is not restricted. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each Raja or King +starting a new pile. Rows build down in rank regardless of suit. +Empty rows cannot be filled. The eight free cells will hold one card each. +

    Vamana

    +Dashavatara Ganjifa type. One deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down by rank in "alternate" colors. + +

    Rules

    +The cards on the tableau build down in rank in alternate colors. The +Dashavatara Ganjifa deck has ten suits and each suit has it's own color. +This makes it a bit problematic at times knowing which colors are alternate. +If a card of one suit doesn't play in a spot, try a different card of the +same rank. The foundations build up in rank by suit starting with the Ace. +The cards are dealt from the talon three at a time. There are unlimited redeals. +Only Mirs (Kings) may be played on an empty row. Cards may not be played from +the foundations. + +

    Strategy

    +The waste stack will be the biggest problem area. Move cards on the tableau +to free up spots for cards on the waste stack. +

    Varaha

    +Dashavatara Ganjifa type. One deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +Play is similar to +Klondike. +The rows build down in rank by suit. + +

    Rules

    +The cards on the tableau build down in rank by suit. The foundations build up +in rank by suit starting with the Ace. The cards are dealt from the talon three +at a time. There are unlimited redeals. Any card or movable pile may be played +on an empty row. Cards may not be played from the foundations. + +

    Strategy

    +The odds against winning this game are high. +

    Variegated Canfield

    +

    +Canfield type. 2 decks. 2 redeals. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Double Canfield, +but the reserve is dealt face-up, and two redeals. + +

    Rules

    +

    +[To be written] +

    Vegas Klondike

    +

    +Klondike type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Just like Klondike, +but no redeal. + +

    Rules

    +

    +[To be written] + +

    Notes

    +

    +There is a simple casino scoring system here - you debit $52 for each game +and for every card you bear off, you get $5 credit. +Your balance is reset whenever you select a different game. +Loaded games and manually entered game numbers don't count. +

    Waning Moon

    +

    +Forty Thieves type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but with 13 piles. + +

    Rules

    +

    +[To be written] +

    Wasp

    +

    +Spider type. 1 deck. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

    Quick Description

    +

    +Just like Scorpion, +but anything on an empty space. + +

    Rules

    +

    +[To be written] +

    Westcliff

    +

    +Klondike type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Klondike, +but 10 piles, anything on an empty space, and no redeal. +
    Very easy. + +

    Rules

    +

    +Piles build down by alternate color, and an empty space can be filled +with any card or sequence. +

    +Cards from the talon are turned over to the waste pile, one at a time. +You can move the top card to the playing piles or the foundations. +There is no redeal. +

    +You are not permitted to move cards back out of the foundations. +

    Wheel of Fortune

    +

    +Tarock type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Cards on the tableau build down by suit. Only two cards +can be placed on a row stack. Only one card can be moved at a +time. Any card can be played on an empty row stack. +The foundations build up in rank from the Ace by suit. +Cards are dealt from the talon two at a time. + +

    Strategy

    +

    +Keeping one or more open row stacks is critical in the early +stages of the game since the cards are dealt two at a time. +It's also important not to let low ranked cards get buried +too deep in the waste stack. Do all you can to place as +many cards as possible on the row stacks. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk +and is part of the official PySol distribution. +

    Whitehead

    +

    +Klondike type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Klondike, +but piles build down by same color +(sequences can be moved only if they build down by same suit), +anything on an empty space, and no redeal. + +

    Rules

    +

    +[To be written] +

    Wicked

    +Tarock type. 1 deck. Unlimited redeals. + +

    Object

    +Move all cards to the foundations. + +

    Quick description

    +This game is similar to +Cruel +played with the 78 card Tarock deck. Piles build down in rank in +by suit. Only one card may be moved at a time. + +

    Rules

    +Rows build down in rank by suit. Only one card may be moved at a time. +An empty row can not be filled. When no more moves can be made click +the talon for a redeal. + +

    Author

    +

    +This game and documentation has been written by +T. Kirk. +

    Will o' the Wisp

    +

    +Spider type. 1 deck. No redeal. + +

    Object

    +

    +Group all the cards in sets of 13 cards in descending sequence +by suit from King to Ace and move such sets to the foundations. + +

    Quick Description

    +

    +Exactly like Spiderette, +but a little bit easier due to the different layout. + +

    Rules

    +

    +[To be written] + +

    History

    +

    +This game was invented by Albert H. Morehead and Geoffrey Mott-Smith. +

    Windmill

    +

    +Two-Deck game type. 2 decks. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +The 4 foundations in the corners build down by rank from King to Ace. +

    +The foundation in the center builds up by rank from Ace to King, +four times wrapping around until it contains 52 cards. +

    +The 8 reserve piles can hold a single card and are +automatically filled from the waste or talon. +

    +Cards can be flipped singly from the talon to the waste. +There is no redeal. + +

    Notes

    +

    +Autodrop and Quickplay are disabled for this game. +

    Wisteria

    +

    +Hanafuda FreeCell type. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Snake, +with the Hanafuda deck but the number of cards you can move as a sequence is +not restricted and there are no "free" cells. + +

    Rules

    +

    +All cards are dealt to 9 piles at the start of the game, each first rank card +starting a new pile. +

    +Piles build from first rank to fourth, and an empty space cannot be filled. +

    Yukon

    +

    +Yukon type. 1 deck. No redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Rules

    +

    +Cards in tableau are built down by alternate color. +Groups of cards can be moved regardless of sequence. +An empty pile in the tableau can be filled with a King or a group +of cards with a King on the bottom. +

    +Foundations are built up in suit from Ace to King. +Cards in foundations are no longer in play. + +

    History

    +

    +Yukon is one of the classic solitaire card games. +

    Zebra

    +

    +Forty Thieves type. 2 decks. 1 redeal. + +

    Object

    +

    +Move all cards to the foundations. + +

    Quick Description

    +

    +Like Forty Thieves, +but the 8 piles build down by alternate color, +the foundations build up by alternate color, +empty piles are automatically filled from the waste or talon, +and one redeal. + +

    Rules

    +

    +[To be written] diff --git a/data/html-src/credits.html b/data/html-src/credits.html new file mode 100644 index 00000000..58a2e2b4 --- /dev/null +++ b/data/html-src/credits.html @@ -0,0 +1,98 @@ +

    PySol credits go to

    +
      +
    • Volker Weidner for getting me into Solitaire +
    • Guido van Rossum for the initial example program +
    • T. Kirk for lots of contributed games and cardsets +
    • the Gnome AisleRiot team for parts of the documentation +
    • the AfterStep and KDE teams for some icons +
    • the Python, Tcl/Tk & Linux crews for making this program possible +
    + +

    Game contributors are

    +
      +
    • T. Kirk <grania@mailcity.com>
      + lots of Ganjifa + Ganjifa, + Hanafuda + and Tarock type games. +
    • Andrew Csillag <andrew@starmedia.net> + +
    • Deon Ramsey <miavir@furry.de> + +
    • Galen Brooks <galen@nine.com> + +
    • Matthew Hohlfeld <hohlfeld@cs.ucsd.edu> + +
    + +

    Cardset contributors are

    +
      +
    • Bao Trinh <bao@cs.umd.edu> +
    • DJ Delorie <dj@delorie.com> +
    • Donald R. Woods <woods@sun.com> +
    • Felix Bellaby <felix@pooh.u-net.com> +
    • Heiko Eissfeldt <heiko@colossus.escape.de> +
    • Jochen Tuchbreiter <whynot@mabi.de> +
    • John Fitzgibbon +
    • John Heidemann <johnh@isi.edu> +
    • Jonathan Blandford <jrb@mit.edu> +
    • Joseph L. Traub <jtraub@zso.dec.com> +
    • Michael Bischoff <mbi@mo.math.nat.tu-bs.de> +
    • Mike Naylor <mike.naylor@5x5poker.com> +
    • Oliver Xymoron <oxymoron@waste.org> +
    • Rene Seindal <rene@seindal.dk> +
    • Rudy Muller <rudy.muller@net.HCC.nl> +
    • Ryu Changwoo <cwryu@eve.kaist.ac.kr> +
    • T. Kirk <grania@mailcity.com> +
    • The Papa <papalini@biancaneve.ing.unifi.it> +
    + +

    Music contributors are

    +
      +
    • Carl Larsson aka Nightbeat + <nightbeat@traxinspace.com> +
    + +

    Special thanks to

    +
      +
    • Andy Markebo <flognat@fukt.hk-r.se> +
    • Charles B. Dorsett +
    • Christian Tismer <tismer@tismer.com> +
    • Dylan Thurston <Dylan.Thurston@math.unige.ch> +
    • Jan Nijtmans <j.nijtmans@chello.nl> +
    • Jordan Russel <jordanr@iname.com> +
    • Kevin O'Connor <koconnor@cse.Buffalo.EDU> +
    • Marc-Andre Lemburg <mal@lemburg.com> +
    • Mark Hammond <MHammond@skippinet.com.au> +
    • Neil Schemenauer <nascheme@enme.ucalgary.ca> +
    • Thomas Gellekum <tg@ihf.rwth-aachen.de> +
    • Vladimir Marangozov <Vladimir.Marangozov@inrialpes.fr> +
    • Zachary Roadhouse <Zachary_Roadhouse@brown.edu> +
    • Natascha +
    + +

    PySol uses the following OpenSource technologies

    + + +

    PySol was created using the following OpenSource technologies

    + diff --git a/data/html-src/ganjifa.html b/data/html-src/ganjifa.html new file mode 100644 index 00000000..6dbcc9fc --- /dev/null +++ b/data/html-src/ganjifa.html @@ -0,0 +1,13 @@ +

    General Ganjifa Card Rules

    +Ganjifa are playing cards from India and other nations in the region. +Usually round, some rectangular decks have been produced. The most significant +difference between Ganjifa and other types of cards is that Ganjifa cards have +traditionally been individually hand painted. There are any where from eight +to twelve or more suits per deck, each suit having usually twelve ranks. The +two most common Ganjifa decks are the Mughal which has eight suits and the +Dashavatara which has ten. The suits have pip cards numbered from Ace through +ten and two court cards, the Wazir and the Mir. Ganjifa solitaire games play +the same as games that use the standard deck but the larger number of different +cards in a deck (96 or 120) adds an element of complexity. The fact that each +suit has it's own color makes things quite interesting in games that use +"Alternate Color" row stacks. diff --git a/data/html-src/gen-html.py b/data/html-src/gen-html.py new file mode 100755 index 00000000..f681bb21 --- /dev/null +++ b/data/html-src/gen-html.py @@ -0,0 +1,234 @@ +#!/usr/bin/env python +# -*- mode: python; coding: koi8-r; -*- +# +# $Id$ +# + +#outdir = '../html' +pysollib_dir = '../..' + +import sys, os, re +from glob import glob + +import gettext +gettext.install('pysol', 'locale', unicode=True) + +try: os.mkdir('html') +except: pass +try: os.mkdir('html/rules') +except: pass + +pysollib_path = os.path.join(sys.path[0], pysollib_dir) +sys.path[0] = os.path.normpath(pysollib_path) +#print sys.path + +import pysollib.games +import pysollib.games.special +import pysollib.games.ultra +import pysollib.games.mahjongg + +from pysollib.gamedb import GAME_DB +from pysollib.gamedb import GI +from pysollib.mfxutil import latin1_to_ascii + + +files = [ + ('credits.html', 'PySol Credits'), + ('ganjifa.html', 'PySol - General Ganjifa Card Rules'), + ('general_rules.html', 'PySol - General Rules'), + ('glossary.html', 'PySol - Glossary'), + ('hanafuda.html', 'PySol - Rules for General Flower Card Rules'), + ('hexadeck.html', 'PySol - General Hex A Deck Card Rules'), + ('howtoplay.html', 'How to play PySol'), + ('index.html', 'PySol - a Solitaire Game Collection'), + ('install.html', 'PySol - Installation'), + ('intro.html', 'PySol - Introduction'), + ('license.html', 'PySol Software License'), + ('news.html', 'PySol - a Solitaire Game Collection'), + #('rules_alternate.html', 'PySol - a Solitaire Game Collection'), + #('rules.html', 'PySol - a Solitaire Game Collection'), + ] + +rules_files = [ + #('hanoipuzzle.html', ), + ('mahjongg.html', 'PySol - Rules for Mahjongg'), + ('matrix.html', 'PySol - Rules for Matrix'), + ('pegged.html', 'PySol - Rules for Pegged'), + ('shisensho.html', 'PySol - Rules for Shisen-Sho'), + ('spider.html', 'PySol - Rules for Spider'), + ('freecell.html', 'PySol - Rules for FreeCell'), + ] +wikipedia_files = [ + ('houseinthewood.html', 'PySol - Rules for House in the Woods'), + ('fourseasons.html', 'PySol - Rules for Four Seasons'), + ] + +main_header = ''' + + +%s + + + + + +
    +''' +main_footer = ''' +

    +
    +%s + +''' + +rules_header = ''' + + +%s + + + + + +
    +''' +rules_footer = ''' +

    +%s +
    +Glossary +
    +General rules + +

    +Back to the index + +''' + +wikipedia_header = ''' + + +%s + + + + + +
    +''' + + +def getGameRulesFilename(n): + if n.startswith('Mahjongg'): return 'mahjongg.html' + ##n = re.sub(r"[\[\(].*$", "", n) + n = latin1_to_ascii(n) + n = re.sub(r"[^\w]", "", n) + n = n.lower() + ".html" + return n + +def gen_main_html(): + for infile, title in files: + outfile = open(os.path.join('html', infile), 'w') + print >> outfile, main_header % title + print >> outfile, open(infile).read() + s = 'Back to the index' + if infile == 'index.html': + s = '' + print >> outfile, main_footer % s + +def gen_rules_html(): + ##ls = glob(os.path.join('rules', '*.html')) + rules_ls = os.listdir('rules') + rules_ls.sort() + wikipedia_ls = os.listdir('wikipedia') + wikipedia_ls.sort() + + games = GAME_DB.getGamesIdSortedByName() + rules_list = [] + files_list = [] + for fn, tt in rules_files: + rules_list.append(('rules', fn, tt, '')) + files_list.append(fn) + for fn, tt in wikipedia_files: + rules_list.append(('wikipedia', fn, tt, '')) + files_list.append(fn) + altnames = [] + + # open file of list of all rules + out_rules = open(os.path.join('html', 'rules.html'), 'w') + print >> out_rules, main_header % 'PySol - a Solitaire Game Collection' + print >> out_rules, open('rules.html').read() + + for id in games: + # create list of rules + + gi = GAME_DB.get(id) + + rules_fn = gi.rules_filename + if not rules_fn: + rules_fn = getGameRulesFilename(gi.name) + + if rules_fn in files_list: + continue + + if rules_fn in rules_ls: + rules_dir = 'rules' + elif rules_fn in wikipedia_ls: + rules_dir = 'wikipedia' + else: + print 'missing rules for %s (file: %s)' \ + % (gi.name.encode('utf-8'), rules_fn) + continue + + ##print '>>>', rules_fn + + title = 'PySol - Rules for ' + gi.name + s = '' + if gi.si.game_type == GI.GT_HANAFUDA: + s = 'General Flower Card rules' + elif gi.si.game_type == GI.GT_DASHAVATARA_GANJIFA: + s = 'About Ganjifa' + elif gi.si.game_type == GI.GT_HEXADECK: + s = 'General Hex A Deck rules' + elif gi.si.game_type == GI.GT_MUGHAL_GANJIFA: + s = 'About Ganjifa' + #print '***', gi.name, '***' + + rules_list.append((rules_dir, rules_fn, title, s)) + files_list.append(rules_fn) + #rules_list.append((rules_fn, gi.name)) + print >> out_rules, '

  • %s' \ + % (rules_fn, gi.name.encode('utf-8')) + for n in gi.altnames: + altnames.append((n, rules_fn)) + + print >> out_rules, '\n' + \ + main_footer % 'Back to the index' + + # create file of altnames + out_rules_alt = open(os.path.join('html', 'rules_alternate.html'), 'w') + print >> out_rules_alt, main_header % 'PySol - a Solitaire Game Collection' + print >> out_rules_alt, open('rules_alternate.html').read() + altnames.sort() + for name, fn in altnames: + print >> out_rules_alt, '
  • %s' \ + % (fn, name.encode('utf-8')) + print >> out_rules_alt, '\n' + \ + main_footer % 'Back to the index' + + # create rules + for dir, filename, title, footer in rules_list: + outfile = open(os.path.join('html', 'rules', filename), 'w') + if dir == 'rules': + print >> outfile, (rules_header % title).encode('utf-8') + else: # d == 'wikipedia' + print >> outfile, (wikipedia_header % title).encode('utf-8') + print >> outfile, open(os.path.join(dir, filename)).read() + print >> outfile, rules_footer % footer + + +gen_main_html() +gen_rules_html() + + + diff --git a/data/html-src/general_rules.html b/data/html-src/general_rules.html new file mode 100644 index 00000000..4c0d6cb9 --- /dev/null +++ b/data/html-src/general_rules.html @@ -0,0 +1,38 @@ +

    General Rules

    +

    +There are some characteristics common to all the games in this package. +Most of them are played with standard 52-card decks, either one or two. The +cards in each suit are ranked King high. K stands for King, Q stands for +Queen and J stands for Jack. In each game, the cards are piled up in either +ascending or descending order, on stacks in the main playing area, called +the Tableau, or piles off to the side, called Foundations. Some piles must +be built up in sequence within the same suit, and others are built up in +suits of alternating colors. + +

    +The Talon is the stack of cards remaining in the deck, not yet played +upon any of the piles, and not yet placed in the discard pile. Some people +also call it the Stock or the Hand. + +

    +The object of each of these games is to use up all the cards in +building Foundations, or to use up all cards in the Talon according to the +rules of the particular game. If all the cards are used up, you win. If +not, you lose. + +

    +In all of the games, you deal cards from the Talon to the discard pile +by clicking once on the Talon with the left mouse button, or pressing <D>. +Where permitted by the rules, you can turn over any face-down card with a +single click of the left mouse button. You pick up and move a card by +clicking on it and holding the button down while you drag it to its intended +destination. If the move would violate the rules, the card will not go +anywhere. If any card or cards can be put on a +Foundation, or in the Ace discard pile of Picture Gallery, a single press of +the <A> key will do all of them, a handy way to quickly finish certain +games. Sometimes the <A> key will build up the Foundations more than you +would like, and these rules allow you to put cards back into the Tableau +from the Foundations. Of course, you can also use the Undo key <Z>. + +

    +If you're confused by all this, just watch a demo game :-) diff --git a/data/html-src/glossary.html b/data/html-src/glossary.html new file mode 100644 index 00000000..281d30b8 --- /dev/null +++ b/data/html-src/glossary.html @@ -0,0 +1,240 @@ +

    Glossary

    + +

    Author's note: These definitions are meant as a guideline only. +See individual game rules as any game has the right to redefine or +modify the rules to make it fun.

    + +
    +
    BASE CARD
    + +
    +

    The first card dealt into a foundation pile. Other foundations +usually have to start with a card of this rank. See: FOUNDATION

    +
    + +
    BUILD BY ALTERNATE COLOR
    + +
    +

    Building by placing a card on to another card of the opposite +color is permitted. Example: Placing a Diamond on a Spade is good, +but placing a Diamond on a Heart is not.

    +
    + +
    BUILD BY ANY SUIT BUT OWN
    + +
    +

    Building by placing a card on to another card of any suit but +the suit of the original card is permitted. Example: Placing a +Diamond on a Heart is good, but placing a Heart on a Heart is +not.

    +
    + +
    BUILD BY COLOR
    + +
    +

    Building by placing a card on to another card of the same color +is permitted. Example: Placing a Diamond on a Heart is good, but +Placing a Diamond on a Club is not.

    +
    + +
    BUILD BY RANK
    + +
    +

    BUILD DOWN or UP ignoring color and suit.

    +
    + +
    BUILD REGARDLESS OF SUIT
    + +
    +

    See BUILD BY RANK.

    +
    + +
    BUILD BY SUIT
    + +
    +

    Building by placing a card on to another card of the same suit +is permitted. Example: Placing a Spade on a Spade is good, but +placing a Spade on a Club is not.

    +
    + +
    BUILD DOWN
    + +
    +

    Building by placing a card of a lower rank on to a card of a +higher rank is permitted. Usually implies a difference of only one +ranking between the two cards. Example: Placing a 10 on a Jack is +good, but placing a 10 on a 9 is not.

    +
    + +
    BUILD DOWN BY *
    + +
    +

    Building by placing a card of a lower rank on to a card of a +higher rank by * is permitted. Example: If * is 2, placing a 10 on +a Queen is good, but placing a 10 on a Jack is not.

    +
    + +
    BUILD UP
    + +
    +

    Building by placing a card of a higher rank on to a card of a +lower rank is permitted. Usually implies a difference of only one +ranking between the two cards. Example: Placing a Queen on a Jack +is good, but placing a Queen on a King is not.

    +
    + +
    BUILD UP BY *
    + +
    +

    Building by placing a card of a higher rank on to a card of a +lower rank by * is permitted. Example: If * is 2, placing a 10 on +an 8 is good, but placing a 10 on a 9 is not.

    +
    + +
    BUILD UP OR DOWN
    + +
    +

    Building by placing a card on to a card of one higher or one +lower rank is permitted. Example: Placing a Jack on a Queen or a 10 +is good, but placing a 10 on a Queen is not.

    +
    + +
    BUILDING
    + +
    +

    The ability to place a card (or group of cards) on another card. +In regards to rank, you can BUILD UP, BUILD DOWN, or BUILD UP/DOWN +BY *. In regards to suit/color, you can BUILD BY SUIT, BUILD BY +COLOR, BUILD BY ALTERNATE COLOR, BUILD BY ANY SUIT BUT OWN, or +BUILD REGARDLESS OF SUIT. Note that all games that build will +follow two of these rules, one from each list.

    +
    + +
    DECK
    + +
    +

    The set of cards used. Most games use a STANDARD DECK, but games +that use a DOUBLE DECK, a JOKER DECK, or a STRIPPED DECK are not +uncommon.

    +
    + +
    DOUBLE DECK
    + +
    +

    A deck of cards consisting of two STANDARD DECKS making a total +of 104 cards.

    +
    + +
    FOUNDATION
    + +
    +

    If a game has a foundation, the game is usually won by placing +all the cards in the foundation pile(s).

    +
    + +
    JOKER DECK
    + +
    +

    A deck of cards consisting of a STANDARD DECK and two jokers +making a total of 54 cards.

    +
    + +
    PILE
    + +
    +

    A designated area where cards can exist.

    +
    + +
    RANK
    + +
    +

    The value of the card. Numbered cards usually have the rank of +the associated number. Aces can either be high or low. If high, +aces are ranked 1. If low, aces are ranked as 14. J, Q, and K are +usually ranked 11, 12, and 13 respectively. However, some games may +rank these cards as 10. In such a case, a high ace might be ranked +as 11.

    +
    + +
    RESERVE
    + +
    +

    Cards in the reserve are usually available to play anywhere. +Usually cannot be built on.

    +
    + +
    SLOT
    + +
    +

    See PILE.

    +
    + +
    STANDARD DECK
    + +
    +

    A 52 card deck. There are four suits of thirteen cards +each. Each suit contains an Ace, 2 through 10, Jack, Queen, and +King. These suits are usually Clubs, Spades, Hearts and Diamonds. +These suits can be grouped into two colors, usually black and red. +The Clubs and the Spaces are black while the Hearts and the +Diamonds are red. PySol allows the possibility of using +different decks. In this case, the new colors and/or suits are +substituted into this paradigm.

    +
    + +
    STRIPPED DECK
    + +
    +

    A 32 card deck. There are four suits of eight cards +each. Each suit contains an Ace, 7 through 10, Jack, Queen, and +King.

    +
    + +
    STOCK
    + +
    +

    See TALON.

    +
    + +
    SUIT
    + +
    +

    Four different kinds in a STANDARD DECK. Usually Clubs, Spades, +Hearts, and Diamonds.

    +
    + +
    TABLEAU
    + +
    +

    The playing field, where the main action occurs. Usually allows +building.

    +
    + +
    TALON
    + +
    +

    The remainder of the deck after all the original cards have been +dealt and are usually kept faced down.

    +
    + +
    VALUE
    + +
    +

    See RANK.

    +
    + +
    WASTE
    + +
    +

    A stack of cards face up, usually next to the TALON. Top card +usually in play.

    +
    + +
    WRAP AROUND
    + +
    +

    In some games card sequences may wrap around. +When BUILDING UP this means you can place an Ace on a King. +When BUILDING DOWN this means you can place a King on an Ace.

    +
    +
    diff --git a/data/html-src/hanafuda.html b/data/html-src/hanafuda.html new file mode 100644 index 00000000..a7868375 --- /dev/null +++ b/data/html-src/hanafuda.html @@ -0,0 +1,21 @@ +

    General Flower Card Rules

    + +

    +There are some characteristics common to all the games played with Hanafuda +cards. They are all played with one or more of the Asian flower card decks. +This deck is common in a number of Pacific regions including Hawaii. There are +twelve suits of four cards each. The suits are associated with the twelve +months of the year. For a good explanation of what the suits are, try Graham +Leonard's Hanafuda and Kabufuda site at +http://hana.kirisame.org/ + +

    +Most of the flower card solitaire games are played like western deck games +with minor changes. See the General Rules for +basic instructions on how to play solitaire. The object in most cases is to +move all the cards from the tableau to the foundations. Probably the most +difficult part of learning to play with hanafuda cards is learning which cards +belong in which suits and what their ranking is. The ranking of the suits is +sometimes as important as the ranking of the cards in the suit. Try keeping +this hanafuda help image displayed where you can refer to it as you play. + diff --git a/data/html-src/hexadeck.html b/data/html-src/hexadeck.html new file mode 100644 index 00000000..58ed2feb --- /dev/null +++ b/data/html-src/hexadeck.html @@ -0,0 +1,21 @@ +

    General Hex A Deck Card Rules

    +The Hex A Deck is similar to a few card packs published in the early 20th +century that had sixteen cards in each suit. Those decks were intended to +be used when popular games of the period such as Whist were played by five +or more players. The extra cards meant that each player had more cards in their +hand which added interest to the play. The Wizards in the Hex A Deck corresponds +to the Jokers in a regular pack. Their main purpose in most Hex A Deck games +is to show up at the worst possible time. Either that or at the best possible +time. They're very successful at doing that. In games that use alternate +color stacks they may be played as either color. They have ranks from one +through four and sometimes can only be played in rank order. The ranks may +or may not be indicated on the cards. If they are not indicated there is +usually a way to tell which is which. The rank can be determined by comparing +some distinctive element of the images. The first rank Wizard will be the most +elaborate in some way such as the fattest, having the tallest hat etc. They +play on their foundation (if any) in descending order of rank. That is first +through fourth. In some games the Wizards will not move off of the tableau +until all the other cards have been moved to the foundations. In some games +they don't actually enter into play at all. They are just there to make +things interesting. Which is to say make things difficult. And they are +very good at doing that. diff --git a/data/html-src/howtoplay.html b/data/html-src/howtoplay.html new file mode 100644 index 00000000..4a21ab78 --- /dev/null +++ b/data/html-src/howtoplay.html @@ -0,0 +1,131 @@ +

    How to play PySol

    + +

    Mouse Usage

    +

    +Left mouse button: +

      +
    • Drag cards around +
    • Click on the Talon to deal new cards +
    +

    +Right mouse button (or double-click the left button): +

      +
    • Drop cards to the Foundations +
    • Quick play (if enabled) +
    +

    +Middle mouse button (or Ctrl-click the right button): +

      +
    • View partially overlapped cards +
    +

    +Ctrl-click the left mouse button: +

      +
    • Highlight all matching cards on the table +
    +

    +Shift-click the left mouse button: +

      +
    • Highlight all cards with the same rank. +
    + + +

    Two-handed play

    +

    +Put three fingers of one hand on 'A' (auto drop), +'S' (undo) and 'D' (deal). +You can also reach 'R' (redo) from there. +

    +Left-handed people may prefer using 'L' (auto drop), +'K' (undo) and 'J' (deal). + + + +

    Automatic play

    +

    +Note that automatic play can spoil the gameplay, so purists should +not enable any option but maybe Auto face up. Also, some games +disable certain features as they would be trivial otherwise. +

    +Auto face up +

      +
    • Automatically face up all cards. +
    +Auto drop +
      +
    • Automatically drop cards to the Foundations. +
    +Auto deal +
      +
    • Automatically deal cards to the Waste stack if it is empty. +
    +Quick play +
      +
    • Use the right mouse button to move piles around quickly. + The logic involved is not too clever on purpose + (i.e. it does not consult the hint system). +
    + + +

    The animation is too slow...

    +

    +Unfortunately the Tcl/Tk toolkit lacks a sprite concept, so +there is a lot of (invisible double-buffered) redraw going on +when dragging cards around. +

    +Disabling Card shadow, Shade legal moves, +background table tiles and sound will somewhat improve the display speed. + + +

    The table tiles look strange

    +

    +Background table tiles should only be enabled when using +a true-color video mode - otherwise they may look bad +because of dithering. +

    +BTW, you can add your own background tiles by copying the images +to the main data/tiles or your home ~/.PySolFC/tiles directory. + + + +

    Some notes about scoring

    +

    +

      +
    • Scoring only begins after you make your first move. + Also, if you undo all your moves back to the start + the game won't score either. +
    • You will lose a game if you consume a hint or start demo mode. +
    • You can restart any time to get another chance to win this game. +
    • If you don't want to score a lost game you can temporarily change + the player options. +
    • Loaded games don't count. +
    • If you win a game without using Undo, Quick play and + any other of the assist functions you will be given special awards. + +
    • And finally always remember that this is a Patience game. + Relax and enjoy. +
    + + +

    Undocumented key bindings

    +
      +
    • Space - Deal +
    • S - Undo +
    • Backspace - Undo +
    • Ctrl-A - Auto drop and face up cards in one step +
    • Ctrl-B - Change card background +
    • Ctrl-H - Show internal rating when giving a hint +
    • Ctrl-I - Change table tile +
    • Ctrl-N - Start a new game with the next game number +
    • Ctrl-P - Change player name +
    • Ctrl-U - Play the next music song +
    diff --git a/data/html-src/images/c.gif b/data/html-src/images/c.gif new file mode 100644 index 0000000000000000000000000000000000000000..b0bd3707e6b453734590dfe21263ed9edf047477 GIT binary patch literal 80 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 literal 0 HcmV?d00001 diff --git a/data/html-src/images/hanahelp.gif b/data/html-src/images/hanahelp.gif new file mode 100644 index 0000000000000000000000000000000000000000..5a62dec746651a3b9f8ebaedae15c5dceed9dc9b GIT binary patch literal 77727 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 literal 0 HcmV?d00001 diff --git a/data/html-src/images/pysollogo00.gif b/data/html-src/images/pysollogo00.gif new file mode 100644 index 0000000000000000000000000000000000000000..5df896fc8b81bdd08cf61ed10b5dac8ef9b5972f GIT binary patch literal 2226 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 xPn8DTV?jaxvS8#8q^bL(nmu2)cSXiz32q{A&# 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

    ) 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 LpZ$;sVAcNtrfS(r literal 0 HcmV?d00001 diff --git a/data/html-src/images/pysollogo03.gif b/data/html-src/images/pysollogo03.gif new file mode 100644 index 0000000000000000000000000000000000000000..6d28ba320985ded39a120b79fb7cf13c2c7ccd15 GIT binary patch literal 4101 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 D!w{UH literal 0 HcmV?d00001 diff --git a/data/html-src/images/s.gif b/data/html-src/images/s.gif new file mode 100644 index 0000000000000000000000000000000000000000..d2233af9b3736d5459c79afb37e7476571bd390c GIT binary patch literal 76 zcmZ?wbhEHbPySol - a Solitaire Game Collection +

    + +

    Introduction +

    Installation +

    How to play + +

    Rules

    + + + +

    PySol license terms +

    +

    + + + +

    +PySol is distributed under the terms of the +GNU General Public License. diff --git a/data/html-src/install.html b/data/html-src/install.html new file mode 100644 index 00000000..ff96dd87 --- /dev/null +++ b/data/html-src/install.html @@ -0,0 +1,47 @@ +

    Installation

    +

    +There is no need to compile anything since the whole program is just +a Python script. Just run it, and that's all. +

    +PySol requires Python 1.5.2 and Tcl/Tk 8.0.5 or better. Both packages are +freely available for Unix, Windows and Macintosh platforms. +

    +PySol is free Open Source software distributed under the terms of the +GNU GPL. + + +

    Windows 95/98/ME/NT/2000

    + +PySol now ships as a completely self-contained setup file, so there's +no need to install anything else. +

    +If you want to modify the PySol source code or write your own +Python programs you can get the development system from +http://www.python.org/download/download_windows.html + + +

    Unix

    + +There are good chances that your system already ships with Python and Tcl/Tk.
    +Otherwise visit +http://www.python.org/download/ +for full source code. +

    +Also, installable packages exist for all major Linux distributions, +FreeBSD and HPUX. + + +

    Macintosh

    + +Self installing exectuables for Python and Tcl/Tk are available from
    +http://www.python.org/download/download_mac.html +

    +As I don't have access to a Mac I'd appreciate any detailed feedback on +installation and look & feel. "Porting" from X11 to Windows only required some +minor changes in the default font settings, so I hope the situation on Macs is +similar. +

    +[ I have been told that PySol works fine on a Mac - just drop "pysol.py" + on the Python interpreter and that's it. But for some reason you must + assign a large amount of memory to the Python interpreter. ] + diff --git a/data/html-src/intro.html b/data/html-src/intro.html new file mode 100644 index 00000000..79cee346 --- /dev/null +++ b/data/html-src/intro.html @@ -0,0 +1,39 @@ +

    Introduction

    +

    +"Why yet another solitaire game ?" you may ask. +The answer is simple... + +

    PySol highlights

    +
      +
    • currently supports more than 200 distinct solitaire games +
    • based upon an extensible solitaire engine +
    • lots of classic games like Forty Thieves, FreeCell, Klondike and Spider +
    • special games like Ganjifa, Hanafuda, Poker and Tarock type games +
    • very nice look and feel +
    • multiple cardsets and backgrounds +
    • background table tiles +
    • unlimited undo & redo +
    • persistent bookmarks +
    • load & save games +
    • player statistics +
    • hint system +
    • demo games +
    • support for user written plug-ins +
    • sound samples and background music +
    • integrated HTML help browser +
    • lots of documentation +
    • portable across Unix/X11, Windows 95/98/2000/NT and MacOS +
    • written in 100% pure Python +
    • distributed under the terms of the GNU General Public License +
    • Commercial Quality Freeware +
    + + diff --git a/data/html-src/license.html b/data/html-src/license.html new file mode 100644 index 00000000..0e92c7ab --- /dev/null +++ b/data/html-src/license.html @@ -0,0 +1,331 @@ +

    + GNU GENERAL PUBLIC LICENSE
    + Version 2, June 1991 +

    + +

    + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA +
    + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. +

    + +
    +

    Preamble + +

    + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundations software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + +

    + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + +

    + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + +

    + Also, for each authors protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors reputations. + +

    + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyones free use or not licensed at all. + +

    + The precise terms and conditions for copying, distribution and +modification follow. + +

    + +

    + + GNU GENERAL PUBLIC LICENSE
    + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +     +

    + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +

    +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + +

    + 1. You may copy and distribute verbatim copies of the Programs +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +

    +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + +

    + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + +

    +

    + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + +

    + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + +

    + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) +

    + +

    +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +

    +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +

    +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + +

    + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + +

    +

    + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + +

    + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + +

    + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) +

    + +

    +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +

    +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + +

    + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + +

    + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + +

    + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + +

    + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +

    +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +

    +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + +

    + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + +

    + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + +

    + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + +

    +

    NO WARRANTY + +

    + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + +

    + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE 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. + +

    END OF TERMS AND CONDITIONS diff --git a/data/html-src/news.html b/data/html-src/news.html new file mode 100644 index 00000000..994ee5f1 --- /dev/null +++ b/data/html-src/news.html @@ -0,0 +1,221 @@ +

    +==================================================================
+User visible changes for PySol - a solitaire game collection
+==================================================================
+
+Changes in 4.82 (02 Sep 2003, 202 games)
+  * support Python 2.3
+  - a number of small bug fixes
+  + stay tuned for Pysol 5 with *lots* of improvements :-)
+
+Changes in 4.81 (24 Jun 2002, 202 games)
+  * adapted for new pysol-sound-server 3.00
+  - fixed Spider-type games
+
+Changes in 4.80 (28 Nov 2001, 202 games)
+  * support Python 2.2
+
+Changes in 4.73 (28 Sep 2001, 202 games)
+  - fixed rules of Irmgard
+  - a number of other bug fixes
+
+Changes in 4.72 (31 May 2001, 202 games)
+  - fixed a problem when using hints in Black Hole
+
+Changes in 4.71 (20 Apr 2001, 202 games)
+  * improved dynamic scrollbar handling
+  * support both Python 1.5, Python 2.0 and Python 2.1 within one package
+
+Changes in 4.70 (05 Mar 2001, 202 games)
+  * 1 new game
+  * added dynamic scrollbars
+  * support both Python 1.5 and Python 2.0 within one package
+  * fixed some minor problems
+
+Changes in 4.60 (02 Aug 2000, 201 games)
+  * 6 new games
+  * added persistent bookmarks
+  * implemented smart playing that keeps the redo history
+  * new statistics dialog featuring real 3D bar charts
+  - Windows: fixed a problem where the sound could cause crashes
+  - corrected a number of game rules and descriptions
+
+Changes in 4.50 (11 Jun 2000, 195 games)
+  * added support for small toolbar icons
+  * added "Alternate Names" to the game selection dialog
+  * improved the sound dialog
+  - moved the Mahjongg games to the new PyJongg package
+
+Changes in 4.41 (30 May 2000, 195 games)
+  * 6 new games
+  - Windows: avoid loading incompatible DLLs from the system directory
+
+Changes in 4.30 (23 May 2000, 189 games)
+  * 6 new games
+  - fixed an internal error in Grasshopper and Double Grasshopper
+  - corrected rules of Penguin
+
+Changes in 4.20 (27 Apr 2000, 183 games)
+  * 14 new games, including HexADeck and Memory type variants
+  * added a "Recent games" menubar entry
+  * improved statistics dialog
+  - really fixed the detection of Straights in Poker type games
+  - fixed a problem when changing the card background
+
+Changes in 4.10 (18 Apr 2000, 169 games)
+  - fixed a memory leak
+
+Changes in 4.00 (12 Apr 2000, 169 games)
+  * PySol now plays Tarock type games
+  * display a floating "Demo" logo while playing demo games
+  * options are now saved automatically at program exit
+  - Poker type games: cards for a Straight can now be in any sequence
+  - fixed a scoring problem in Casino Klondike and Vegas Klondike
+
+Changes in 3.40 (12 Feb 2000, 161 games)
+  * 3 new games
+  * updated the pysol-sound-server
+  - fixed a problem with winning in Golf type games
+  - some other minor fixes
+
+Changes in 3.30 (26 Jan 2000, 158 games)
+  * 7 new games
+  * converted the pysol-sound-server into a Python extension module
+
+Changes in 3.21 (21 Jan 2000, 151 games)
+  * 2 new games
+  * updated the pysol-sound-server
+  - Windows: added the missing PyWinTypes15.dll to the setup file
+
+Changes in 3.20 (18 Jan 2000, 149 games)
+  * added 8 Hanafuda type games (Oonsoo, Pagoda, MatsuKiri, ...)
+  * added 2 Poker type games (Poker Shuffle, Poker Square)
+  * added 13 other new games (Der Katzenschwanz, Perpetual Motion,
+    Die Schlange, Three Shuffles and a Draw, Vegas Klondike, ...)
+  * background music is supported under Win32 as well
+  - corrected redeal rules of La Belle Lucie and Trefoil
+  - corrected rules of Aces Up
+
+Changes in 3.10 (21 Dec 1999, 126 games)
+  * 17 new games
+  * new sound support (including background MP3 and MOD music under Unix)
+  * added a playable preview dialog (yes, you can play games there :-)
+  * nice cardset and table-tile select dialogs
+  * added "Hold and quit" to continue a game on next start
+  - quite a number of bug and feature fixes
+
+Changes in 3.00 (04 Nov 1999, 111 games)
+  * bought a new solitaire book and implemented 67 new games :-)
+  * added a menubar entry for popular games
+  * new assist function: highlight all cards with the same rank
+    (shift-click the left mouse button)
+  * added images for the Talon redeal state
+  * FreeCell game numbers are now compatible to the FreeCell FAQ
+  * added a "Next number" button to the game number dialog
+  * improved statistics and log views
+  * the bundled version now ships as pre-compiled Python bytecode
+    because it loads faster and uses much less memory
+  - corrected some layout problems
+
+Changes in 2.99 (13 Oct 1999, 44 games)
+  * 1 new game: Lara's Game
+  * re-enabled the relaxed game variants
+  * due to popular demand I've finally implemented "Quick play"
+  * statistics and logs can be exported to a file
+  * a huge number of other improvements
+  - saved games are not compatible with previous versions
+  - some changes in key and mouse bindings
+
+Changes in 2.91 (23 Jun 1999, 43 games)
+  - check for Python 1.5.2 at program startup
+  - some other minor fixes
+
+Changes in 2.90 (16 Jun 1999, 43 games)
+  * added 19 new games (2 games disabled)
+  * implemented a nice select-game tree dialog
+  * starting a new game is noticeably faster now
+  * documentation updated
+  - PySol now requires Python 1.5.2
+
+Changes in 2.14 (26 May 1999, 24 games)
+  - fixed rules of Calculation which got broken in 2.02
+
+Changes in 2.13 (13 May 1999, 24 games)
+  - fixed a small bug in "Select game by number..."
+
+Changes in 2.12 (20 Apr 1999, 24 games)
+  - another small bug fix
+
+Changes in 2.11 (07 Apr 1999, 24 games)
+  - some finor fixes
+
+Changes in 2.10 (11 Mar 1999, 24 games)
+  * major display speed improvements
+  * added support for background table tiles
+  * rearranged source code to prepare for a future Gnome, KDE,
+    wxWindows or JPython/Swing version
+  - fixed rules of Spider and Divorce which got broken in 2.02
+
+Changes in 2.02 (20 Jan 1999, 24 games)
+  * 1 new game: Canfield
+  * new assist function: autoplay
+  * new assist function: automatic face up
+  * new assist function: highlight all matching cards
+    (control-click the left mouse button)
+  * can change card background
+  * support for timer-based animations
+  * improved interaction with the window manager (X11)
+
+Changes in 2.01 (21 Dec 1998, 23 games)
+  * 4 new games: Eight Off, Dead King Golf, Relaxed Golf and Grandfather's Clock
+  * created new package PySol-Cardsets - get it from the PySol home page
+  * implemented a statusbar
+  * new assist function: highlight all moveable piles
+  * enabled tearoff menus under Unix
+  * improved table layout with small and large cardsets
+
+Changes in 2.00 (30 Nov 1998, 19 games)
+  * 2 new games: Calculation and Numerica
+  * implemented support for plugins - now you can easily add your own games
+  * new option to automatically shade legal moves
+  * added additional cardsets for low and high screen resolutions
+  * major source code rearrangements
+
+Changes in 1.12 (13 Oct 1998, 17 games)
+  * display a progress bar during startup
+
+Changes in 1.11 (09 Oct 1998, 17 games)
+  * 3 new games: Big Harp, Eiffel Tower and Matriarchy
+  * enhanced statistics, can change player name
+  * added "Select game by number"
+  * implemented tooltips
+  - some fixes for Windows (vanishing menubar, problems when $HOME was
+    not set, better toplevel geometry)
+  - corrected rules of Ground for a Divorce
+
+Changes in 1.10 (02 Oct 1998, 14 games)
+  * 1 new game: Ground for a Divorce
+  * added a toolbar
+  * implemented shadows
+
+Changes in 1.03 (26 Sep 1998, 13 games)
+  * 4 new games: Spider, Relaxed Spider, Braid and Forty Thieves
+  * middle mouse button (or Control-left) shows partially hidden cards
+  * menus restructured
+  * major source code rearrangements
+
+Changes in 1.02 (16 Sep 1998, 9 games)
+  * 1 new game: Picture Gallery
+  * added strict-rules variants of FreeCell and Seahaven Towers
+  * added a small manual page
+  * improved animation speed
+
+Changes in 1.01 (14 Sep 1998, 6 games)
+  * 2 new games: FreeCell and Seahaven Towers
+  * the Undo key is now bound both to 'z' as well as 's'
+
+Changes in 1.00 (10 Sep 1998, 4 games)
+  * includes 4 games: Gypsy, Irmgard, 8x8 and Klondike
+  * first public release
+
+
    diff --git a/data/html-src/rules.html b/data/html-src/rules.html new file mode 100644 index 00000000..de62bce8 --- /dev/null +++ b/data/html-src/rules.html @@ -0,0 +1,10 @@ +

    PySol - Game Rules

    +
    + +

    Basic Concepts

    + +

    Game Rules

    +

    • IPUDrIr=;^*p>&) z6`QZu=M32R_D&$pi5wM!f{|OYCRB*3`AhM6rp$cG)3{FI8g=Wo4~qCwt>@*q)2kV8 v4-F=S6BjV|;AM^XtA$&yUVO@$&`4SAN>Nw>VKj+s9T$jd8Auw70IdE8B<$Y> literal 13367 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 diff --git a/data/images/demo/demo05.gif b/data/images/demo/demo05.gif index f2e64a3a45e677edf6f36918df15d3310b6439cc..63202946333f546f202d6844711edeaef9521b41 100644 GIT binary patch delta 8147 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 aam0x7--Zrq;qc`FO=;Ptszize&;LJT!g0d@ diff --git a/data/images/dialog/bluecurve/error.gif b/data/images/dialog/bluecurve/error.gif index 162aab24f14801e853db548ea074717750baff0c..56db2ea6f12f98033646c367ba2f19b5d25f29fe 100644 GIT binary patch delta 1222 zcmdnXvzLe4-P6s&GSPs+fZ_W@ZtIDjP80iVCSI^%{`KqEWKqWO$@z>bY^%7~t|=)^ zp3f*ze@aPdmY7%<7Z<~TfcgQk6=CT>*su7Lg^`P)gFy%AjCx=^889$#{AUp4l=0ZG z;9xU{uvW~84GRyq3n+Wd@z}WNXt#uMmP-jk!|{FvN4Xmw9~k&GgDiL$nHih9O;X>z zPz-W9<1vZ7C1rxraxc*ttzTY5GBdleTNIzWb0#Cmi_J)Ak=IY&7$kw^6isk<09|S3Da$Y!Wh*r>$|GEcu6FmG)P?&chxC z8etdA7u`{eQ8lR$YIGCWZQLMG@##r`46CeF#Y)ES`u%Hzngb*Q5*enRj^F5F5ODAa zn=03y3eSm$JTu!EmhikZFm-BWI3XFsQ562IfkA^Q!y}-b=e;t=1BUtnjsyNFoEAzf z{}(tY?kX~mm}jHTZ`(FY8`;s2_8L`28CEgL5~(jmq57^<|K)OB6c~z5M|vU zu*iu)5WJAcE-xn*ctFT| z!9*1&hBb{hd8#K|a8eNE$XHk+o?!X+C7&@$GkjXUtWrECuw|Og z27~9EmNzm580>4dig6}x5Oi$)>$-DMk+O)wb0MWC2Uvu=#8?;#%h$HL2u-eE)p=)C zwpKg)@)D!}3tPn&3b8QAB*-ok=T-dEd56I^PU@iSyeviS6?YzbHL-gfS?I)~v0{hT z)PPU!3nY)9^U^N&b66EFeO}2tmBn`rHEhxJN_n^fB$#}3JPUWqyfQ#%t`@?#U!7f+j2=DB<$Q~fEH6NQc! zKMUsby((I6DY5$98jtj=?Cs_s7`Mz(n)Bi1m1AMG7a8+kI4n8cE_Qq4*{F`*i;PSe aCrkO3GkNE3x$Sc@K|^ZeI;qKuY%%~kb59)r delta 1245 zcmdnXvzLe4-P6s&GSPs+fZ_Q>ZfoXaYDyE`oS3Hx2~F&+$MBz1#$&^RgUuYmS}`X!EIiyUpzJlrW8+~VI^b8%*fPZp8bc#DT(Q<$0YWij02O>Pm9gyXJYMAc5Z98uDW&SOomW5 zo2k$uuenxJnHDbM% zQf4SmTjM-gicfWw_Sd}5!#+kDVHeC7-BFHFHJKrF&`of+X@|fJqoqP}ta3IJb~1in z-@i7fJ3}%dv0>Wj_`NO$2@hG=)wxbgh}`JpmD$FyLFS`@X;Ul13CRSFqVR7G44O2$U;fPLgmGb80zwxSe%}z#=CGn@3YS>or!bc+{nrc2SX^b%~&hfVmpW0imp` z3I{t+{H=J%Ao%7YyP}+0-~nO(9TQcY7>+bX@-|QT(4-{Bk+HBuqQ-E3lPTLr7A}pN zN&$xZlHVF-7(OjuRw+?3v1OXx4g+;A>l>K@49+!M!#LAV2s*a@b=|qBNJT{9xv=sZ z23Cb$cmTkAXf@_!{xjBFAMg;);ACde+E&a3pN^A3Y;oK&Oy zye38M6?Yy+9b)%+aL|cGbHxs=sR5td6{L@!^U^L4a#(d;=Dd=5DofxI#)qq}XI1B{ zWtQD=fL&h0;JA#OOTnQnf;JBn#h)u}XJk`2u}YV>PPL?-K~z#hp-n=rq|uQ_{fL9! zoYaJ`$~>2EWUA+4Jy95V@v~4q->ahK))K4Vt?@`tME=A7Er(iLY$Zh77?@+~z_ zplj)j4J^*eOC*n$Z72xH#4+JKZu6W+R&2*ySInzyyT`3RVL$Bq`{(od;p>m|N1}Me zT;`rSIzR_r%27#jTI#MlVq%RDA`&5^3Q{TZjYiEtD_$TFIE}&qS-!{P33x;-MufbR zBG(_=xw2v?Wg~nBJnTf+6lB;Zgae;XPfx=uWaXZqQVP7rfM08258l5}>NB#O8n)uf z0PKutZEb}hq|vCy<0Jg;;|vBvX$yLfwZib}BVZ31b|M!R7T`cH1Vzv&ae+0lN~OBf zO!WKxB9X{_iwnP2!EXGTNADb_^>($`hPggNic*1~N+AfUuPN>AY8H!YeA6^>qsXa% zdYfv@}8bRi5wskZCX zbKPi?V1z%ZvG(C|8dvR;qeaZ7=^kwO{G&qV16x5lvK9^C&K##oV;Y3splTfJvoRB9 zIrhNeHtW?Y1&L5Qms@F`lGq3FUlp8Xmm_Um98OM4m8nmLX0Y+$TltnK(#??%UuApQ zq>*D|r8?7kG48FpN@IOS^u=z+iN~JYzh$=~^>>A^IIn*HWz< zfED$#%dSihnb_0-soK9^5EG=Anv0M&3%NYwLc28JIMX|%5QJAZxrjSwt{a9ihFOJ) z`r;5471h72`#`E4D?E7q+@u;r?5|EKOcwQoapE8DTkcHU&wu5BPEMWX((i+2Bstk$ zXKhkTKAi^&E~mLtjFQ0IE{tB@x4RX@ERxILR(5Ad_+Cqzj_K~thPYT1t?R_lx-|3T zn3_-T_{J;?*;lF7%5=Hsk@Tb7&7(U;mYxTb`rBml6xZggIrbbn%Y2Eq>H-rpSJAtQ zXasK`c**U$cv#;qVm>bid&f^=EI_d@f+w~P^xB@AEaJe69}S@3{XzRb9Ei%mz4j z89?)ashIm{2O*x2{4AO}j&dX@3;t|~#dy)C61+7q5gf~0w`Yg$4OmHR1h5Sq?UDi7JwuCtPO4+M3KD9T`&^~WPurE)tqN|&eSy>E#Ligb2l z0ZTc+dVl8R>W2J#A@-f(#Cy5u+4O{QS9cca<(PcN(jE@r5 delta 1240 zcmV;}1Sk9I4C)LEM@dFFIbkpWFaYO~3m^mX;)0PYBo(r}o%k|zG-?$SQKl0K4_j?$(+ zlYs#h1J0f@la>Knf6@y6+BUwP3fkJ*=CTTEZf54fLjKk!{>}!<%F6!oiVhA6Dk>_z zzN#)N7UsGtZf;`o-fo79ex9D5UQ!CKavtjH>RMV_#+EM9szy3GI=-ql9vTY%`kwyM z8s65j&YCXLraFp-cE*}U=C&g8(nkK;DmFGUQc_0p+G3WLlRW|-e<~^_4h{}tUQUXJ za{m6VZf;)Yx-M>NTF#OV&YCLDmLBG|9-e{*Qc_aRo;K#P66V52|NsC0|NsC0|NsC0 z|NsC0|NsC0|NsC0|Ns9X`2+z90RI3i00000FaR(B00{m7{|OvOu%N+%2oow?$grWq zhY%x5oJg^v#fum-e`?&wv7^L1dCZ6unaAV7Jlxn=IR{`8fEs+JZ4zlx;DKx!M1Gn#?XtpbudNID_;n&b{AsjP5( zGcZGAo^-!h)cN9S9I0_%zM{GVt4JSN1;}wTlhH#eZF9%%e}b^9%-yfxUioE3C4!Y1 zge{t}vcgm+Qi~UO1I74D5L7!jwPGa;SB7bsD{`BZq|Rpu-b9fR1**(AB&N)^>O-Xx zgBmlkN;I>M1F9fjNP+SOhzuFhq#&y%ehtVP1Ii=*ZjMsB(_&|U0P)`Cs?*-Sr&tkS^p+c}^ic#SoV+54G4>1*gBOJ; zfx?YV1Tw`UH1rTBL^B-l%><41(TY#ez|ukj{(Z2+PHVUTfyN>O@L@)x5pB}I2Y*b^ zN257CsX7SfCRioRO&Y$7Zms)!Au%K^X~%| zc;bmW2YZ6XC$;3lMJ7HFF$2F7<*^AgnE0T_e-x^Gx=1cgIKf35kFdofN4sW$4h=7) zz{Ss8ypf3(4zM+{M`l1HK@Ib$F#ymxJTlKW(A?~i$yuCJ3M1G!5CAVA(7^~gBloD0 zzvZNHgcKwEpo=a?Akz*=H3^glHUvoV_DUHel#&J>h}Jz&J8~RRiWE{DE<_|@2tLp@ zGBq$lj4o#!6NVh*I8IOv0Ces-0MlqbkR#Z9evTZX7nDdS*nn_J>afQy`|J$`1OPkn C&^5;Z diff --git a/data/images/dialog/bluecurve/question.gif b/data/images/dialog/bluecurve/question.gif index 67116154a9d5fc9da4674348dd478d6c20206831..741cbecf091ec107a68f551eb75d24f6848f4ed2 100644 GIT binary patch delta 1372 zcmci8Z!nt&0LSs?NuET4@DRyGnx#nuk*R-8OR+Zp5QZu}($uUh?W|{An4130lLQg% zNJLR`Sr}n%r;+va&o);X66zdzQ|Ht)=jQ6P#o0#B&aQ9wX7BoY|Gm%MZ2)j4zPh-jx z#C%7$#4yW%P2Gx<1)WmzC3={7oAPpJQ&by5%CRsynrpR2a$KaW zUT^{LmwJ#Twiztz)}K0;dl0m9yeX}>L~3d8sl~<%k28eZnz^Qky!N%{*W`XgZbV^a zFq1neK8$W<>}97_yK+pFwn89r{IOJPCRoN|oVAvw<` z=>xg?H+++g=Ps{FZ@_(GR_I)*C)fQeJ78I$@dDjc#f6+(xUrB!bzdgzFFe7PG*bd= z81C4*tL&5Jt(Iz{rY0=Q&-aQ_-1U?Y(l=1!G1g-i*>WTc*-dt22QK(sS0Wb(md&@KN>mL7LKEs$Y*1rc-fKqBtd9&a;1QJ`JqkcEmb(8l%Frc(QFjQu|~S%@xd{O+vTI8^qgET zRwqp$__^2oBCWOV`p_!0RHS+nz`AdesQf;f)p++Y-8e_kBGOB&sIvEs?Pe!y!E53m zHK|FgR}&IB1By13lEdtqat@bWe#*J+TJ+5^wNfz!sS8iY8JuFFo#XS57Xy1e*nml` z>>?BMc4F<+iwSBc_5d;yyZJk7Z*J?LZu&^Tfp5#29d5$8Gtm@hcO;5oe2}cgaril> zNI}!FlkCof?pkUd4~d&9$c%K*)SsHsk2*DWJn3|qGWYRPi#5stwcLwBh3HBz1wh3Q z`6;vr#Sg2$7SPJaNcm_Knk|a_#(+6eIy%PAM23L$5`>sEeJg*5IwyDv3D+qoFK@TW^dBKL7;xlc* M#=A!AAP7kM7ypXApa1{> delta 1383 zcmb`D4O5Z_0DxcM#m`Vc2|qXmKM;tFDRY+OA>aqZ8n%wqJjkL|o+;AWF3Y_@ibl=B zFtXwrkl*tZSV!fY(^nK^UYp#`cCO5Mm7CX^cx{(mr`!I)ZrAezp6BifVuF~+VqsD4 z&MFqb0+x-Dhfz5^k@4h-=x*02gTWZSwr#5X!AZA|+J9zHL6*KTz1>h8K3KUlrGuKwR1=sg z3mN9~28<;~8x>k@EqdUvxAEl5Uy2iB+<`BkTu;3&338A<{KDLVA}~)7lp)YBX1%mC zv6^wB{54sGvybcxi>gxeO(s{dB{%p0lP3hZFM>q~b>)Fj(@k~#bh^GZMHFN87>}UL z>{ag#fCG*tavwmFZtDH@Iezr{k>5hl9A9}zT-D>d%Quc$W-~hKB&tv>0dR>vYTbfI zGU}v(Udsu#df9w=qkbxR<4O)VM(3uj7SKx-2mEAtTE7jm-#pHbJGgh3hUjJBw($!E zwn@yk7uGc8Xr{l_Vs8x=lOVBDM|_xau?Cl>QbSziXFnh+qveJQVS2NYe2msG`YP1b z(wbM0!Qy;~Ae|fG`Xl7+a3)l{h}}U&3gCX?<)yPeN(@#t&KE0TZ)zv4py2DS;nEWG zryb5^aG^mngipP-MW~6|y*LrkvwL4S9J{DaC#bHudOYiU2U-wXK^l*EMPP+7P#&#c zc?HR)^!UB*n$zFWFZoCqsl}XtK2S8Tj(e9~&vVftPx>e!=i-fMp}{s6QxTh`BGs3z zd1pfsEpG)MrN#wZ6vNEhv!u%gI~>3qD*q$iYv;fe)9nFo7@aG@5o3RKPE$L}@I|Bw zwmQo%6LYjlTKORA?sce#=ihqJuy1&wy*nQU+lTUz>4xLAIPmz01D(WB_AP%SquH8> z(que}TFCs^h|XyWdZ_PNoPcog6hiZ7d^k@V=oCAEVodqig_Z^jLMVN<1JnQ&;?+e*-jv B(4PPR diff --git a/data/images/dialog/bluecurve/warning.gif b/data/images/dialog/bluecurve/warning.gif index 964e14d1aca91ca55ca9936c4e750d8db9b12173..435365027eac35b6b5dda1cbbde22e29bf2abe03 100644 GIT binary patch delta 1216 zcmZ3=vy?~M-P6s&GSPs+fZ;m>10Nrsot03Kmsnnw(YijSf9Kflor^nmsP5CFvVXVq zCK{$qoFzALw=w^|b#DKzN&S0Q6&I!V?^)1fW=4a_W{k;`=P(-72l?skTj$kRXLjsZ z7X$r4J^igjv5}VcEB<6*3XYX=wE-K(n|>^^myKE0=?pmiqI~W~=^F=)BxvkxQ({7Y46_ zE+*yTO(M4@vt-Na)9%df^z0T%O)OA1bhQqIlcjGvKKF+rV6$R+pr zjRz~!RZj{x^#pic7VCbf$GL08f|H+E+05(n@7zkbywqsQ>AJeAHw!&{q}3E-B&2MA zot$kPTBGyUBGpk=B*JaS3|SSA8IDf(I1;ZcdECR8^yWRpEvNmaU&=`#KCJ^B|8LD`^yU_g5OOvYPCGkG!DP~kh>edfEaaCo+9l(x zZYv^EAH=aBR-*S#V!Vj;n}p+Hrmm+ubC>w=gORy4-PG934N|pk3mgfBai95i7c`u zDvk$5M9&^@7t)ppdnjG7XW_9jDZ2|Qla01qbYnOAP%n7brD=)-i}V!HM8#qY0VQ?C z!V(8}_KLoR&m~lks0OlC2z+D{%MtmgT&#U(qq=Bf8G{qIf=ibhd&Lv>iQZu{hguTz z_B}jU-aKOi8;^s+1vaVVEe@`-Mq4i&l2tPK|Kb97-&U+-wok?K!wg`bX7jX3=Dun-}<Q zazq>s)Ho`6rf|a{K2tTrW!t_-#k`SF*fLSl**3=EKuG2TuZ3N52Mp&oh3TB!w92aG ut`>*v7e&XNTwenYbLVV-`|WnY@v~*T8Of>N?^Zlt`~6-`Jd=n3gEasiDr7ML delta 1204 zcmZ3=vy{is-P6s&GSPs+fZ;g<10Nrsot03Kmsnnw(YijSf9KfF?F+kiF7DW&x=)YF z{@v1Bw=8U;b{bP(*Tf0(%zbTk6W1GyYH7*sTj%!gn$*8{RdG>z|DFZqYj0W}VmPN(IS@qTF1^MaiTj$kRXLjsZ*MGW!db-(!-J(eB!X$|* z{$yd~V))OX!vF-JNMqpm$MAo$GP7bmI|GBohZ`3hm2@SldQ@f_u+BEI`;n12xk=SY zQszg@N2g^1e6!h_Wmauo?y$ro#fOE_%Yd6%wQ8TqD~9$~<&!C4nwpV;i$oXXv;Zf2o%Xn`AJp>|)+;+uUeTq68B=l*Hj+L6e^ zBNitVo!RWxH%G~Q&W4POk1j42kT%*CvRQqvsAzoz#{yZY89x&5i`xIW;4Wbrt8$oG zzF|QFQ&>V`JHxxP3ddQhHEytrD_l}I?CQwj#4h@8WkS2G_6~J+sn`pQNYf7Zr!&(pd)=m+f zW{K)pz`C(iW23WF)PVqJhSi2kI#_i*1jE)vFuasu2^O$ql`vRwFiZAF)$3-lESsAb z1l%`FV2Nm%#HcXsT0IGwUt^fc4 diff --git a/data/images/dialog/default/error.gif b/data/images/dialog/default/error.gif index b6049aba55d54f407d2d64aa7cf1ec57b6118fc0..bebf4a5c680e95e734ba0bbcc8c16f31f1645df0 100644 GIT binary patch delta 196 zcmV;#06YJb0_Fh>M@dFFIbk3GAOP|Jkqj(Ypj8<@ej*BUQLs36%Rg*U_ yCtR7Dpq)FVL8Ci#IHH~nf-?6PA5#4Q delta 242 zcmaFHIE9JF-P6s&GEsp+f#DO=L>`^`n;N@xK782fDK2A?9ASMyfurQC@VuMOTnw+$ z9N71KVF+>f%XE;XrA1tkg~NbBu}NsDN(%!I!-|zWft(5s35*=Erq=}&1OylY!q14Z za&R!Ldwmr|>F@l+s=%C4WWtcbU;-xft621b9KBvIJs_nKE)lN5kP^$ppcpO{uE>zW z$i$!!t{ASsuo5WbtKkb2;$~1}(PvR)Sjod+rN^+6k%!@g2E$5WhVwv0qWo9+Ps=hg joM1T3sLd##A@Eq6J4I0NG2?6A4__ERiGJ1QWUvMRk|#jA diff --git a/data/images/dialog/default/info.gif b/data/images/dialog/default/info.gif index c5e5a79a1a1c7b0991e51484ac4d697771329f32..668c5450f01d49db35673cbf2b5928d31ee636c0 100644 GIT binary patch delta 192 zcmV;x06+ha0^$J-M@dFFIbk3GAOP|Jkqj(wPu`P;4w6!IQce<>ZxxP2S!WF~~2>?4(bW4K( delta 237 zcmaFF*w4h{?&)S>nW(^^!0?HAB9Bh}6^mUqpFV8$6qiwX&6r)=tk!qj^N zYWgD>o>U)UQn;@y#_&^aBZB~QgnKwM13xnpkOuOYn8V#&nHdDQm~1o5bQmH8co-5~ z83cJ5mS{5wiZC#*VqsOC jCLqOs;{<~w1ONRK3@i-%Pfu*;e|9mb}~%C4;x2>?5? C@>2@{ delta 258 zcmWN`F-yZh7zW@s_l45dD|ZJGQxQ2(Trq=8z%jQwg(elPt7q=n`j{>c z^j+nY*r<(SfsK!%gtT961(1R1QcmcGkQ9alLChzYeDowS>hJXlvdnTJIqLb;p(?nk zL0OS0Vg(5kb zUnZn#!=7&}e>hm%RgR;)k`L#CsZ1GwhGrbGl+YIN_=5s|J7>;%m1Z|H?)JO#iHTFn zj1YjX)16^*nJcP?gy;~?Sby4nI!!%z83TBEWI~8}jCOsDkr!}*Qgm`@m6LjSQ<|G7 rN{&FEAeWsrq>@Ymsj5XHt)eeGZCtjuT(e)gyuH4>5x>H}3JCx^VE|TB delta 263 zcmcc5xRQy--P6s&GEsp+f#DPLL>`^`cNV+$eAGR)l1Y*Ig6`qH%nAih1Zu<;I8;R! zTxVFbR^)*AhHJhJ@yrLhwsZW^YY;6Iu!v)85H&y{r$;ez~QlBfg__JpO(rB1x5yI E0Nz$g-T(jq diff --git a/data/images/htmlviewer/disk.gif b/data/images/htmlviewer/disk.gif index 5566e474e687472e1e5eac69720e13d3064dcb69..cb97b64e3744f3d1ec4a5bd32ab262744ae9cb9c 100644 GIT binary patch delta 17 YcmWFy<#zXUv#?C$W8h=>Fp=8}03|F0Pyhe` delta 17 YcmWFy<#zXUv#?C$W8hc0+@t3P%NH?V5>^m zQIIdv00Xu})dG{?OTI@2E^NZ$O2flXbR-?ffMNy;b*d69!Y051j!hF-j-+wL6|#rt zAWfKYqXmus41huiWl{zkM@v&$owNXdLeP;FD2@u5Fd)*Y0}_@^h_E%phpb=OoywqP z1&I+SFdbo$HilXu2OmBZ8e)QnWe|j_YOp6?gSSsn04{>!#0)D$G(a*iU;*=oSid30;6=&NrYT~aDYq#2n@iLGNCZQOe!)i^N4PY&|zX76rIz-AS+N% z)d2%Yl9gje!kB>@BuL78#snptuvG)hK=+_= zJ0?=V0R_atLIWdK8PEY1ppXGG2v{%y2`JQs!WSoG@P&!S5$WbM3DCxW#dw}n`Q{2Z z)NsKG8pMRBo*@j10tp$Ak*Flxy*Xl4-EiTN6ID(bP#PNGpn;xTU2#&F%s|xRn;|&_ z8;V9GP+Uw^-WMGXEV!gZ23MFl!Jdqb;n1Q{DjEQ=iJh~fv{N#MLjxJ$Z~;^o&>(}K zX^v?BWiSOma*8D2VmpL?VoWGX=Y5Y{#R5S}yyPce-wC@Nk-j`KfumbMhmIr$6fg#3 zr#vJ;FvhWgE_eP#ImSB^yd!{eTrh!gRSwfJVldpTd&>k-?FpLzQI<@RR=o@$uMm&C zmhYP_wg_7-x<2E83}()AN-r;Wvdg~!5wyhxkOcJFDfm)k&u(0QiOKR4vmz7m7#%n8 z4%J&g(TM;7ojou%VL#TXlebev^SF9YZjo+8*fm;Xxubyrh8>3^36P0?QmJ;{q*Ga>OVMOT_btfWKy} z0v!g3z(X?70358K0Vr^SgKRN|1|Z;m0vSL9QZlEk&X z6!YMIv|rXN^Kyy%@vYw3Pq{TqzqgtHv25!MGxDK!Uhi zMiY=>oy#TQ3^54>6CqZoDitYswn#%mT1SNbI0#H6Xn+X+RuvLCi&Zf}ll?j&EkqIj zDIgs?fHN9@hKeE_qyYt3K$vp423Hv@27?+!7Mn05aijqa4oJfzqtk>Msg8_8;6M|o zAs7-Y!%sRIK%UNJBT=M5Z<2_K0UVG4D1?eZBg$0ACV-+Ky75SBaDqs#V7y!euR$d` zA1jiw1je)iGe%HMRZif^WiVh3Bw{4dXyykCh~ff&&0`fAmT>_o%&CuC=ud9gFsLPb zh(1?fgCo_LhJT&G39QpwxV|NToAHN86QIFK^!BeSf=Nux>;yFRCP6fyDV_CU0S=s& zA`Lj84Suqw8q;)usF2`N46uctNR-Qh_JRaV8p%uabA$(s$pUrprx*(ph%<2%hyQV; z(iup95GFUE;t3M^Q(Y`@fgdkBg{nV$J2$BgfQA87v z!D4BEgSuKE1A6USKzJDgbCH05=NKg~snUev80SGPNegLvM*{{3Mh`k~HRv zWtugU!$9&0h0(zR!(D6*Zm!Y;vsK>L;)lrqroyW z1nD(`3#%E5JwRes%(MVu&rl>dF-8)9I#~u(!vHK~UgfhRK^1F*_E4uL`! zYMC>-aeQN}4eLXsEkUu>JXjHtA%FdE2!p`>ts--)Gf!n{hq zgriPiE)~p+uD8vXSU9HhKM2OIN=LzPYe3qgvw-e2xO>b2a{>$?bqG8?fzeowF`{s# z*?%eR3XYB}7A*bfD@eg5R`8=N4C(+J)IhbVgfyz{$QtI$g$7u#cT1#d1sfPb>cgoR zZMD)k|2p&0Ix!;DMF1jWk1j$Aj7G#r!BdPUV^PEwlYrd&v1fCvpd^{lKPC_hP607~ zGIQp$t4wTSH=^XvU4u#K&npqpX;*BcAQ&jj!{#vw2nW621tmyf{Y98Ubn1kPnX_LD On@|FT3?cm>00298`V(sa literal 4849 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 literal 7574 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 literal 7431 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 vL!4okx$;H{oqeIkvW|H3wjKr3_kj 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 RU7A+Al9vA@YH$F+;s0Q^C;I>Z literal 27061 zcmdSBi+dF1-9LQa_ss0$0WG!BXFzO2YumwE zi)Azlu_dj@b zuUug>GvD*+bANZw{K^?Ur!2dR{EK{{lPS}4?dyNj@$C&WmVRUA>GNkVxZsS7Rt%ig z^Oc1coPBcVlJ&p(+L=qg_RTe4UwFbLE55P9Jo|eK7yR_wUmf}NJ?lm`u3!0+4L4r9 z?Tp30`PI+wy86OL4!*GOr|X~i@1H*L=)(sd{>8yxZGH8PH~#WT^@BG*_~?_@KKbO$ zPmaF%$v=;M@~=NvKKb~_&%bx%*Sr%jkNu_kuYXmmZ&s^+sa8L!R;%Ry z&;PajJ7!$9_7FO|KXp$>G8T{@j5i-Tq})E9j4Q7_6iQAyaQN+a)@Kv(Km=FE8xM7Un#m*^ z8{^}Llo;+#XZHuP{tqYCekamt6!n&ob?Y;om$~M$Hy6f|t;3%FLElrXQ= z)Y!T2Go3DA{!nA@aM3MEi$l@Q)rI?Jwxx>ICB1v3(t_t7sh?9Udwqg0G%ua)u}Nv9 zBrC6eU0{)u znCu^%sa9H!oEJ^B>%(N(SMM%86zyHD9p1YmHkzJn>m~Nr@%r1oHAc46<#M8H#g~O; z&#ezh<+@ zu6FX$d8d;;LGIN0rsR6G3>!UNFLfy&z3obWf9mp*5ST;q(o3gbO2zuioYI`eeq0>r zwfb7K{zTqa|N5n`R(*}DO)4pKEL%tqUtXgAun$jNX_ii!`Pf8B41C1;Ha9I*ZkB#{ z-u@9^MlZNRdW|(8J<_i|z3`=FW}o<4_{x&JZG}~uSwHkmDyG*y^cCrm-m)$xm+HTe znu--=<)@A}J=AD&Rx_L}UD+ZxEwz5>%gnI|jSeY)WQy~Zl921UdP6YrQC;4r47(E- z#a4QG>BM`yzux-=zc;o<+b=z$J9J&+QtPFKpMhtZ-TxdBhZhxH>9Grs=z=orl@>Ox zc1phb%gjG5Jn>tVkM8|qnDnvO8g)O7=;oGN&pYkDysx=mds%#P4x!awG-a*6N3I)J z`dEB$2W~DpRBT%9PWT{A-q&8VM|_>Vca`QmGDt*Oo}>5mHuCqt+w@SqZt2o~XmxX= zQ6zHqgo%<6F+Cb;Tw2Ua&BMjg!sg!FOFyXJH#*`=Uj0Gd*Ew7!Qntr(*`cCx^U8V$ znozQyEAPLeY)db#RPsW@l3ioL_#6Uz;VCOKOP$if%=2HCVXwy@l$v_Q5?eRPKEU}a z`QQY7OkU$`k`)-qSFe|eeBF%8;RO7)#-$|hOBPs(#rjEpWz(=ppEyq%>{}+PMItpm zKU}K%nu`!!9$VbkH8I)KD;t&+Lt=8c2$$(6C1GMt(G}zYU1)V#Y~Nm%Ipq4%T>Pj6}Ub*0H7O;sl z$D~X8O)76Ca^0tS{~TRtw(ZkSsuaHS`b09ke+SE$L>jcI-*RUzIidvnJre!WZCj+| zFY5dYjjYD?<^S>0(rhJv=AcSL?FVU{Z41e3 zh^XuIiBrz;|KiZLsI4-;MZ~PfZXU>=d#aL;4y(S5O?}JDG(4oz14I3?iia&FLVOqx zGdIL~9POS}?#!@F1n7F*bkY;jiD-WYZ$FnsZ4&h_uiG@H3#yWrha9Sm5nroCf1OpG zjeGE}LxTvE(6}pScQ-`WxYY0HzFYp0&z$=C9o?^QT5|H@{L@QJma1-b#jI(^R(LF- zoi5F@$CCXXjTjp)Y%5+XXI0vB`r2S?F%mPpdfD11HQO0kwMnYIFK~`Mns}GUr&#&W zPdwJt{-V@omHf#WEWORUr!ABBUk;C0La49ZrD2`OmZwZ#txMy5o9$(~ka2Y3?W_IK zId-yfHAHsvXAGHI$a1NoJrmsKic@<^vCE62xsSZvZE8MrhBq?ldB-<*|93-6DlboZ z*J1CxtNSJ!)L&<^_3sn0k>vg3lNl5tt~p}+*4PiM8z*9`o%d()_+e45H|@X*TgYwI zmrb=sas|it%6o2AXsyunzg($pycE3qk&zESaHQmbF8xGj>5n|-D}aW(JgOi|eQCG! zAe{OMyZLoVT)WDSc|TOLwk{gi+rp3=kM`I?k4k+@JQh}6soxNC@2ii*GGVFTSz7nJ zDZR9-6#bSn8oI2FcDxLU4C-6qu&CyWlU3zdt;8X(_ry4+eW};l%xald=|l zEu%A^?uucg_8}rDNI#u+~v^v;KlB`aQDnc8@l@_JvK(i&w37 zXt(vaG_|-5W}Q5`!4{%!{;Xb;?p#XbF3+AA)Wx=8Do-ui!pl>y>8kW?y+~tGT%aIx zz$5BEa+s(Ssn;C|A*ZBNh;jXhJSect*hXKwnIB(@kRH&3wnZ2By7cy~t~Axi-!boV zq2o&;MUhXA{(iD-5vkcCXB!SpZgp9gOM}U8uxWc-p-$Ucm9i#X*8*~teB+9r2{HX3 zGjAk8%Vwj`l2ETj1$%;IH3Wf^kM?^l9o);##>;r_tfhSyU$!UKa@O)Z}7>`70#4;z8e})ns|SkzuMwU;(P= zn**xO5|%4R<1~B)VHwB1u*KZshbnVKOj{&cq34_!xwS;oE^W3b44f#E(Qca7X&f5z zXtGQanv%6h!VGQ&6^rJI4I#LiOSq@Qk1P_hiL4WUktEzIom*t{i$WXzW|0StjA)aP zPGjKOfgx#HqYV(m@^@&lZks9!Rjd#w#R<(=G*F?sMMaJFR_N_^FmBOP5WjW=%tb8{ zGiXfpcNp~6XNg>)>{%pS8guDZi%Q2?_ejq=Q1)&E| z^GMPo=?XoiAdFiy>Cq0CHn`Mh(J`CGjMJNIl1D3~(W8^>|7FQ<(H=`kDyc?7ljv-8 z+F7JYg=RfSP7@U}YSFky<5rbqRV7^{<4z#qk?uJ(=~DcXD_nHfn6MLCaPc6P)oFy# z2<|Tk*$RRDVDzqWmNY2-)P0mTm?Tl5W5}EZf-B?2(3a=tlbUv9gF>XF-WYe-7e(5r z&_tO*JCG`+`6pEfmXZgkimSJ7rgqbEe5Us?6z##lu-1$l#@nOv! zPInfG-=(7vOk=$e9vtY1k)U#1_+mB%D(DR=T+wMQlhdOe@KTNb9(sfUJo=hL|MWJU z?g;Y{9U2YUK|G|%q@bJ9*jz{W)Mkw)vIp(%r)kfhKnUBBq#jIG$WGL1XcmqDAB5!z z-T!a|KS3+vQoT~;DIo^MYcx_po>L%vmW1%n?)xH8@UL#8@Y{_y3ms*6EZv!hNolqy z%qXx!5W5&Tgcz>)6Yyu)1TRoU#9E=K=I^jbs?1(SaG9}3H2QLZbXZ*Rv0_79%Vc#W zWx+o~S&bfoMj+&ERH=|$MVMP=35DYMaCNv0B;@{8bFq4tA?@7^3u`n9``cW_+#O(H z-H*V|BEHaf6iG8ITp%Im{16geg&=rwBfpGCTpg-bP6>@`)ky3x7ZT1KEnI}egJ=OO zaa?2xJ!N((^n^QYuH7#{7|!F+3|OfVM#6*4Alv~;AX6rzC7LRe2Q@mbWe`3P18y02 z>68-B%y=j31>x{XEdoU}yR6;gq+=SL1nMqLAvq!A6gQqy=JA-p&zjz$)12q;_z(3j zOfGrcjsy%pmq!b9&tXXKaKJ80fLak&AP4q3%sTwifl{W^Z59n7m6|a)6iDOAv2v9t z@O+JdWDoMKEuf+xZA8ix#2!SRvq^*J&q9}G3JvN0_fOkZaSqonv6bpl6n7#H256r}YHx89*lD zE?{vghl&Dp{RPi|kw7u@P??P5E@U^e$!AmpP)`Q>Fk^7t1cDH;;E{yxN9Id;Oa8oj zKX{TABz%Hb+)AbikKvd4sAAEz4nt+Sxk8a+kTN6Cw4~>d$S|r=lJ42{zRmpNOQiNu4@fM9k6QgM4)tjDFI zNx~*s*G<>KP)6;g)3`<*n5FWZ-wKIFW^`2u57}86fRK+sPAe4CGSG+*ZBIEfZ&@$~ z!)j3^;CgEkG8vp})C^`_)NLNFsRF&ug#!{vCt;*O)Z;?v=9@SV(+s3!>NCiK6=Yo> zS%<1#2nDpvJ=@Pm6;C1z4Z8R@=f@FNI@%E4FEy8G8ZU6Do}aa<)c64%?IUnSR2}I1 zyzLaJHBhE&UA#$dw0Wz9YJ{Y+(Wpu5kUED*CdnEM2?Dl?nLz~h%!+Ul!Uyx3Lppa7 z$tGfjUgNM-F^k)M8qJkiTbW(^I-64%zUBRT|{xrK5Qw8bm|~;nMZ!y+QGbB_tB9Ld=!q4s(=Bo@1 zkI&@{cRs<@x6$Ge?cK*sdux2**qc>02388}+HI@@KWj{UkzJTJV8aa078N?RL=#RO zatR_Zr%^m8L0A&wtU&~gK=&dvRcy$@o%Ru5O*?gJKi-GTDGP0hFim5v$Ye#%3RH8P z6?7)&OgaC;_lVCX5^3_TAUkW&gc*F$J{x99m1*Vs6!*i<36;+A zh@=r_{qwK0n&*!kLmo9=e;;%eg4&VD}tmlB-s5A5qo< z1*x_1V4a*Zw(M}g$lM$|=Yiei<8GSsPEWYYxdAm!$Zrs)kbiIar>$zHW|)=k^BlEh znPKR*X}FG~E?cR)rNxWbgyW7Ix^?*~)6~>*hg<3C&by}V+FI%Q()J7WBAGmR*sd%! z-KuM>T6NggE%jr!<+2}d{^hPmpMK+)|L3sU-EFwqs#2fnHI}=~>5itkV<2(rd8Jh? z-P^zQ)D1MM&bB(HA^*Ln^FT zZp*?yJ-u!2f17H)w1d`V*6yzi*o)~o7e&;y*5B&1AM_zhLUmyv7C1YxR z3pRvAU(f$}Ya7%|s$SVpjt#L`4zZX+aN<&umCmr{vA1_^E z(6WaF06g+cAskG3%5M>Bo*ogZNPWW|MsAi?KEt%=z(_*5Gezu8^(%zrT7qr z_MBIsRLT@+EY|xa@aZ0%(CAHWo=Rc!St6+#6`}*K+g7J(r4w`e>!!C|f0h%Je|Ft# zuSmfa8pZr%{CakHjb~G~?bYkRo2Rdx_d91olzS@qP}dsW?nvLH^|8>P+b78?L~0p? zG{VvqZd*!KuceY=BS{SdZubwGx-YG2z_Mh^u3?n zW=_O%Lmpw`5KJFZO_y91G3?pC9(eob-FQH5=(D_VeRLM3(KX%=kG$$_c3JYWVu?wE zYDt{ZW4L62Tn-Apq~`{DU{|qqQ(+-|%Kb@T+8PYh07wYSZ8IqK9fYNPy{&oHK1%#s zZ6U1Y1D4m=1=#eOlN$upV+Zc?PV931VkfCy{ow+eCe^$$gvzD3Um%$aNem4=dGznL z+~csPJ%F%i37&t7fS1BL+CZI(gF3@)Ck~Z2#loKmDb*Hc zn|-05kni~|TRO?1p-w`B1$}MQAk@Dr1!|JJXxqTH(8B1_R9LZx$kQyH zF6ky;1$cNTpr0<&4rV+Oc;A)kkr6aic=6?u6xH(qAa2?HE(dw!73!wcL0y`xWj9o-T)@-u_*wMMD;#9?4-nYo6dGe1HEH3RV~<^cqmg%*5FZ@mv0TZIqnkh6Vl9@ zaH>Lsoel}Yk$$&*L>_3PfgZyAYJ~OJx1`<$InNgQbs>CFnuT3EXuCwr*lg`o`^x*4 zH;bApEvR5%aZxGsA7_nx_~k#d&%0e@{&RdNN8xe8I#8lD->%NYB752y9K715ESzGaJ-B$ds!6@%=ke0vrmegc`+$9=|-hk{<<< z=WDk+4*YfFnS&1VL8Iu5L&JdjbRtZ3$+s<)1(v3(zE*<*D5s+3F23=r`M`ij;$sxZ zJdGJ96^%2#62fN>2~ ziX0qgjbj9GC_-vfh}pJJL;G)H#4cPT%(GtE`eT#TZFQ+uVHs$rvEniXb#TBFW9=@c zr4A}0r6@W%GTS~=(HrHjxl}>haqtqd%dlr8k5dZ+LH*!f5*jvzdH{!@=3BZ0M?w0m z9|bNB_wqvk{pw{;P~U({19m=qvHF((3YE$5v`iJ49P%ZzHj+Od-gu>7C08x8JN%v< zA40t~ZTjc@OM#e9pi4Rx0P^$Sq?j#^&M5*b)!B;`Aj}S}e9INWo57luZ@TeA7A)Ab zP7@mT>yKs3l2C7wK*pBSIvmikF9^FA`Gz0AV`zJj4LV|)tJ3}|4eO}`8WDI8HwgW; zyDY2cBY-zQypRZ!U9xPoL*uUPTfQmp*TLBy+j;Utc!Wc>LVnFMSgT*9=nsUmFs(qK zyER+r(kZe%p~&9iib;GoeZM)Z+jO#NS1EVPt+tra@=QgS4dFTw2t2H} z>i(%^a?Nskd-MCN#i(wFdjGj7T0odqNM=9ro$$WxTcS`|b?X{>@u4sbtzBz|zNb{lmIagWT5K;(uGSt|C;+S&q&3pE`)SjMED{0*{Uu2rfJAUgWlg3 zEQd}kJG4J7DHYpyb;DJ{fJ<_SIke#C_rD3RKb^wsS?>tq!KPit$mljzNVLDW8q%My zIp_G0vu1-AP&-T-bz0s*J7Fh_Y~M>HiwvAkn+^K3#oqyLckozq4t*Z@DAObB=%jDb zreasf`JL<3Hzxb*W9ono=5k@I`xXdJUz2_Pce|Bm1{pJRZ)_MQS0nnw)afr_5 z_cyo{%`Cd;L^+IED(nOw_*4KB@+v+8LBk1`L|s_434HwZGd`2~a3khcBPY5T^#MF^ zCO%w_9L6$)!pmZ{Cx=}+CEhY+m4aF0@dyOd-9-C$hrzrfS%%@!S;XUZ_fuL{=;-7I7 zgERG}{P!fKit*N8XVk@SyFPvc`fY;o`{2tBDTkzN3>)8>1;E3DooQUB$b7gzZFB81 zGjITWXlUA5t{ldgkVG4=Fjb{@0$K&2ZYfU#3kBaM`FuD3$vLQ~Dg3jKgIV6^?3;gQ z%^2)FuH3LPJy)QOS5euZtxq+CUB9f*BcHP)>sWU^hYuiI*y3ts<>)P5*PSq+6~;3^ z@1`wiEa00(Ae0mW^O*;3q7xKa(8WXpcgxv)(C`_#OnFttzU7+%0T4h!t@0;^D^xY= zKt4V}0dF?gKkNMzr3FA5$q-?dGyKw@xfbF&k&OQ^;UM&;!6y@c?z&SWTQoYwBxzUZ zs`=`j2skhY7jSEm|A#yj5q=LKr0`HcfZM~35gOUz^%yJtFdzb=rGDy;WGBy9$wz~P9{-XR>hnRVYn zB-jB+J07i~Bj7xNiCa{%=(!-6hQr%(Z&!wEwXcn+t{t*T)hhBnb< zpjaUaDzrgqN#UL2oVdSz!$OFWaG7K(Y;DJXciR;42v$K3=P{DTNgvlQs0Z~~7$`-L z%-7gV1#m$4Jxt;?vEewFGSSxXfH!h+mvxehHBIP7-u6h?t@`mq!Nep?r*u=u1`c4B zrw`x^htr67RMW?C1ISO;>E|t>EXbSuPhpQ7sQ5oq$!}Zv69BN!$H9h8e8xFY1T1j& zFcE><9j6UU8gLb=^E%pCrl_dfckpZiy?`iOFAFyWykWw{at-P|uUhmLm&ot}`<5e@ z(hO3Df+Pp|Yq8*j?*Rk2Sm(OfRgPjV#=Rm!&!ue!$7zH@`ZKgD94`kF^B*=~51lrd zJO@Fdh+ZYJ3DQ7Vof!br=>kQxAi={dcj`FydhnH+9elMwK+Lq8w9#et=$MPdhm=-J zNIr)g(C7~q)glenCfXe<#u} z)MU^EuGgq`+5eXnv@GR&X?>B0j}LKV6UhmmJ;qrH1Qhx}UdRDK<+dd$CkT0vhNq}BXV81#Ru#G_EFw3dH#6b$M(CgO|*y#D|X&lZ1^SbndHMQuqNL>Bz zSvCz{%3Y4T46cX#wdjC@fQkgCK;8nrT0!|}=|QE0I>0dot`@BeI4{mW0C?KufO$Z! z@br!_0f$kY#?ip&v;#+y8jYB*-~a*@baflQ0J1%PIh|6Vei+huhIbYkeXh*C27^hn z^OS-IR_HXNikRm<35Gkd1)n z+`x@dR6bmk!=EM*`pFw-CzY$@?F0eUps}bL30d4wvPV7$i>PYHLunSdID9{a-@>YX z4kW;*$Sv?;19B3-MWZ^>Tc>1nf{iKIKr$%WjkLlkMk*@eF6soM8vmzgF|-)a8dnPH z2uuwmzVhZTen*o9?(iuHZ_qZ2KIf6=YRB2K#VwQo=Q#h3Sl>Z;M?OH00blUpv=}}E zZZzVng`W>@W02)1#o+dc2%O2`XI49rhY-Ax>#obMlWC9yQL6HvcjDk5{TA9M1gA$) zX~FS<0&PXsg~Q_~GOmT1M{>?HQ6vIr6LldaOj2-q!7YJm-(uthBsOsGa%Lng#wxj> z7DKh}waBERfaU^k?o!AuZP@`W2ILcAA{#ke|M@Bc3x$hajmLR_bOn;oSfYS?`610D zO~|MbAFuy44}qw-?YRn>RAAE$UTKhEQE4DdxE$T(gl_?PeHI)9X{M{la734c@g2gv zBy#UAjoghu(7Bu-3@1VY6K(QgYbfb(=l{h)hBGx8W$$u^1F}HzHXKpF+VGvI^Gp_s zHfUIllxFh;ya}y@!aiR{f_S(Y_}B{`eJ*&M?uoVMqu?)EbPiQHMdT??5uSytp|B4x zN1&m^oL%0FgIs=cgT5%I&_IQBW4o$C{&gmaR_F%@K`s^@Wrat_$M-hB}{^PWxri7Yx$zJMO%T?Gk+1xie;@{Q|p# zjkCMxF431uiV|=-pX5&@lGviHZ#vYOnUt308Sy||dn+#EkCI=E+RlJ-lNyPg(VX`-7@^vrYY7gR1EeLGlF$_h|VM zX}I25S+Tb-42J{D=e6@x6E4TTYhsgmk`Y+KAoV3Z_EBn_L_DcSYYIiWvY3bOdVMI?2R{B~~ zzyQxp4x4#jQ|~(Jd+QG>2;q<6^#{m8QO-c(hR)gahRP4V=<_wKDPD&i+Iw}e@ejkV z-qd(m<<~1a&MUg-Mz8Qj{9W4syEbeqj|hU_arNER?a!S>eS;p6Hw<~;R|T+mL3l|*)B2?B8YLiOm({#BIX>sTn?@HXRE$h6 zyDW8|IuY$!1Nc`Oa`#5FNzEq0N&tqEV!tkJSfiK3It}`M2RJ=N}oSBWa)$5eU&9bXifp-h*pxiJZnKz`39Et>NEqZW}b(ppuHG;jftuY zKnSsM?H~uF|8)h(%>lXDe^9^Nt{qf>%5nu>d&x{$6Z?J!wlO%41YOZxtB0XmHkklD;Kpd$|P zFSUjG0tuU;ufO)sGeiaXNb`jE+Jf9W0-c1)x9MW^XhLY`z>eKE6*>N+Q4+0U&F^w= z7@x7bkqS*jU2qph@R{%{?~@IX}{` zefVpoXpaSvRUx~_1-Kjxw3~zhXbNlj*dA9(sXG0}jZe(EU>)6c$62)9V!_V0g#->V zGN>}Zz(%hwo&1128trw_INM_D^d!JN=IhbLQxzHk3fY7Tkp;la5g^T#8*$FJ1jWs< ztAbM4EUwYTX_=D$isEQAYf?Y3s^wc04HtO*^y#N-NkTr~nTf6Ub6s>N4^# zh!*{LA!(oL`hytL~gHQS^0Do$GPsgVK*Nucw6W0A&gBB*|3F{_XmAJSmXBV1?AK}skvZF zhRHhe*T`G@@`9?13D0c>&c?wt|5Cv0JL(R(p0xfSPhiuNNCWo$AAae6D~n@IteGK>}G^S?%--o8to(2L^^Uvl(M7dDu3qKDvjc6cp2zM&p{YzlzRy`^pIU>J!^$_lGU#;3 zV`#yoQNNCp2w>kQIXFh}rUijJH$R(~`%S70%$kF3df#M~wPJVLs!*Ih;P{fVtQ!`W zIAUG9t^?&{YdmqT(I?iG$?$6Zwd8;e^gMrt1xM0t;ka;(nJ>=>H=?N;bjhRF9G5=p z2yd+}ovbPOG^7VOE&@H5a6w@Yk&rH0U#lX|VBL8LyWAhy%(vC1`ZDqjct@^aQ&CX_ zV8S@Uj9h8t<;l+J+rRrPg#$*lw}o&40j$@e>yYj9J$C&_&9nvmiQKCE3#v*d+4KPu z^M>i|X{?|zhBd;-??}DPr92K$XlRcu&#AP=?B!UY!ooC`vMm$+pG_B_bZGX)34@%5 ztbx#Ab^o>7Kjh}6UWwf`f=pH+@6MSZiSYw0>us9eCkWbDpM=&CrA+w#5BG@~ej-DB zFQ58+=&|nc`j!0LLkEr*^jU5^Yq@~4iQIEZsS5O$4sEo9o+);DE@vOaY6K_c~3u0J}yJEQsiI);%O((1r@xgp13Kevdp;W2S7;S3C|S zbidD$9$y7b>dgG;%(py>H6&51E=FVP!-9=P;})O8kxYWcAo_VgeL0}0F2yK<3(%s^ z+e=b>_F!GuI@CfBpU1Z`vC@KB06R?QQu+)Q&oJk^^jd&<2HkZYx$AJa*&2et=#irZ zx_Q4p3w>b)2%~7Zeb)2sFEgPTb3sibf{NtKSAAlY1jedeHi7@Ut8RELTakQpe$CQQ?KrjeSzo7}Y<18c&E_l@hI zqXfDK1$L^=eEkS}ePkv8wgBY!7GV$oC730N`k;~B&xT+VwEBKv1`6hTtAJG?NKSSdWF3|H8w=@IkZs^J^UjWyEUW z31>p-(FzQ{p;#)YVxGlcHy3K^FiGP`klEZjV9%Tdbbt$nr>6}z#bYyE?v1Y$NUX9n z#48(#6k~xR2kkcLvo^yiYUCkL*d!8yi~Jg%!WCU6lkA!6*)KMa%+ze!|L1VXTXfVR z4P}4aGYozq~~-e!4bsr8y+QT~DqgaU`W^bWtCVuSPG7Sw2!EekB3YIW>R? zdip*yTcG_1_?{k+m;ez#Zr0?gFiSt@a_W5kho1&D3SW-H>>AlssQF9HRT1-3 zD?;3*bCE$z5(HALDOCF&e9&L4av*Ky<*J{s29>T{n|*o?Qr*MXd*l^xR-+0BL6({X z(4tJ@1s3PD=^?xbE!*5LP%MxjuhlqeB9(*VDj6>a;W9y&%RCvi6l-iyghR$1@~A`Z z;8226>)*MLKxTXj;viBzA`@Qb{?8UDu9Co^4QxB>Xe3_dF_i(i|ImebAu}>UUEz$J z<3|RCZILYRQVCU>1cLzKn2eg`^28CeAG-^tbr9`jemBw<4KBsWRI;UAyCKf`+OIKXCpK=JBP|W@w?7q+oFRDct~nwAA^_xNYz4CcBpr z!Nws1AY*#;9@vIbWEO5MA{nWW8wML-30bBE$DB|%&OhN-?X}F2vA`czpkIM(9JF<5 z_p@}mg|OruP68lw0XHDdryx5Z-@rxjz62W@G+Xea7ew9W@o$n7&L@JmNOUOx?D^0v z3a8C2@Yz)U{=Frhd%`daw1(Cmhqgs>Zl0FGNhLA~Y`8pjzWk-X15QzHh?PkUfn6aD zg)zF(};z{*O@9kziQLMLy@f6#N_$AXu3NR#dvPLKol7%M6sl&nhf6P1sHxMOYY{ zNJyhkN<7b@sQA?so`BqrR0M7y6{tSDgaCEL25E!J0GuM3A%jAjQ;LndN?~-6=yF$H zp+@1f;Mn4aHZZ2&q>FE(!0HhWnnlow=d|~9hktMgtTq&hXp#o-<`Q%wa1a@;swB{! z!TUmp7oCPo9(35U%^4I*NfaAb_Vc^|H2u~q8B&7`P72jCaweOM<40#Y3ivdgO6Ydb z$>@{^Ief|B=jxJ88npYUKPDJRQD6;4;X09SR5o z0;lj>Bz)*4T);<8YK^9%<6dOP1{YD*cznMcDu6Iu6+{q!6Xm)M7BjhTg9K_mLN!bP z3eYedt%ljx+st{TrXAx8lw>@U1MmR(ag9cN4v`3(W+1ard`Mv?rWKvnMI;mjY@6`1 zD#2%Oz$lU*WQK;2!%z$F&l9Y-^Q3K2+d8reJ2cp`)m`m8)4`^yr)_r(jV@P9c2PN; zf7bqV(LdNB-Mj;zANohIX~x{Mzy9s7|FPvMtlM5+QoGfIu6y2*PxIeD()TP`wrqFH zcXr!`;~Mn#MW5PcvFJMXQd8|UbZymapaS|CQ+TO&)A_?G=8dA!{rxkP$i3c#^)ONPzi;?c2vI zq{M>hj6b2MKOhqGC-)TEp4@^@mXAO7oxfg8Bz(_-u9e^yxlFrecoXX~-@a5|vkJ}^ z2+sTH(d!<4Q4*!816v&zPFJUNYc9a$K(ujatl*CL>Ki-trM8{NCtG`rF$2eZJ(_;r zgOUoLT2fdTYFlEUwZ8KkU%|l%wpf!I+UJHfc$807`s8l6G7|2%h3%!{@2WRkv}rcG zo>G4XC?Y;9Uy>X6&gZ_u3S{^zh~O)m`p>cC$^S~WPl!=fj|r#0@%>wgq*#5?X`8Td z85~5Q(%;P{*c|p;5gV~3IlKg8dum7#!n4MQgW-Vc*kWRhcFAp5|JWjI3>Z0mYz2T@ zNx8(H954a4etQ|Amo|3Vn2|I1s)2Z~NzVGZPu0JLtYy>eN7h6j4S)**IXu^6W0kDk+MvaVGdH$=KQD-bmF&XXF2s&+ zlfPd!pH_Yx*HwdPa)UfHpC z)DO>E;R%m@NuuYdBlzNiOcYDO7c3e{c%BFc1Y(JMY&sbSUT91LHqJmbf+n-JP{;|R zq6jE)DXXP=tOwQro|OJl_Z9M+!h@)aJ-X0KMl(9NEZfrUeR-)zXHmi=jE}Hf-M?Gy z%cpvFz*4_DZJakGG>uiz8{c+itBj);Xek31Uq2T7kI0~G>O!aOhF%=Wi+s1RV7EN< z7b1RnU9&ZEBUP|j+2fJS0A0AWNJE#|vqK<0)wN^&CIB@ebm@5pknx80^{s#@>$U-u z!UxCOy}56-*bJYb?=Y4J1nlqv*k>6vz!xVwi|&ONLjhT?Fk5`=q0{87vn@9MS6Z(I zt_I8&TJ4Hz)uXt$u?Z(Wz1-s_pdgoe~%mJK-^^r4HfMzU6fb+GYGxrUW+V^m@LRtGg z1gws|WwLzu=Uj@KihX`rM>H(1d-4|h zgJ5&u3cAn)v+^@E&7Pb?8VOrlo^LnLJ_e;F^LAj3Drd*Zwl!b1X}eBt8Hg0cA{M4? zGG)Ij;(P+fWkTH6!=^HdZ>@l?b>DrF6QaH7xAC+4TY6V8dF`d$IZtF-jLdqk_^07P$vi%d5O?{w%;LQJKjZ}?X+37buSJ{ z$`Auu!^w#8w_UO4mk6zgh*Vc3QFjD5FDfuP*mocGebpKywVvas|jD*nCDj_uc=xhDuYAS|kcKHmG z)9ZZ5&xOWg=o}6HQMp!wp?O9ZEZO9!jW_8-BLbE`(BzM)5R1sS5e$F0*zbk-ROgY4 zC_nj6Kwl1dbwU1(BRDam&1ITG^|R=11P-WpfR#B|kWkTFbNow!zaFRS;6tvgtIVGe z)$8_QTUw`S^#?r_nlcH14Ma;~c>seGnq0NOdvhO|cG0sbNLA-x!ntO{4GifpGxskdd4)iHP|pfw2U`KmlU|Z;9_&Ol|<=Qka2HyC>9u z&x*;QXOgi3A2Xmfe~}#i4LuBcm@dj2Pq=}dv~$Zz5AYWKo&sW>q7O&EEt;fGuS?aC zrLY-*PDMmDfDn!TV~mez*#fO|QTs^9*^&adjx7!RuE&m9>MbCrQj8LlmvQ;uTg$up zaD^UgZvy}i0TQl`8)5ARNa&JRTLUl>mlK17i%tYtA_nsS2niH~lRY9tK;MWxaAE=y*=?>aK!(`E3?3Cf3Ht_o@n_s3eXcV}5jXZSbb1493 zsMDtg;1ry^Oa8iH689o?UJmcTfw4RTjnrl=L>Kg$HhDw@?IZh2Uu_nv`N$Aewgy8naY7~3n_9ZU)ghMb6 zzw>Y$2Qvw0=G&jq$22;o(IS6T0800%9Jz;H;I_x_#q$%0KAb*y1jj^K@NBTjwOKah z5#vE3mv`rMDkDwS^d43b|F<1i7;69yqr#=5aN`E^-iB3FMrgeq$`wx7UqCq!PHPU z)KRGYQs5r07AQX*ack?Q__l|_4D5M`Dt5W~^O4keq!${4kRJ}8Agm5%bO>S((9NN* zhZ<^nedR|yr2`a1h!!T(ut!chqYlpvAEkKbxO2kb$O8BVg`|yP6GcSe&^53FgMwFd zOTc8zCCDbU{XF7F%v(fK!`xBP_rSN|ZYFumgka%Y4BFWlLKZxV&p#ASfJWdQS=?e0 z>vCELkfxR|MM$oPbEw166rP}l!HLff=pGtde;h_oYBi;K9nnqyiVQ>O5v7QQ9 z{I-9>irsQNxJZ>pCWIHTuIWAbd(6C$+#@Nos}62v^DJ^;dp3bLIc|#sM##o31EvwB zAo*`}p|&3hwgbt=Mh@dzhlPQrMAg93(__$16#uO07yN-&JS669ff!3`xFuH~3_!Yb z%F|hZh~_0B`+U49+GJzxC+y}2-#Wq18<0)OGYOOU;eG1djRvtMC>l86OKvL$Q;N%w zZX4_{l$G|#4d4?jIWu7i$)Z5e3i~Kx0c_yj8+715a8X?3%nZ8|Stt9?@hymLQHe$? zOyum3+Jqy}W2oOBI2TqGxdhl`ztTar*mh4@u+3vT2R^40*~ScIh7qwo`34tP1p z+W}CD>Y<#gN3BCh3Ju8ZaAT9~27d%t7+rmg>oi&<_^aPI2Z~ELS>qTre#>5agY9=1 z&P#H|H(rbU0GFkVb2vZH3xZVV%lK#tjw>Cx^P#tI?JB;3ZNR2y-Lgr9|iz}B2)GnA4}>BL_QIQ>wWQk7q&I*NzWn3V0?U+1 z6kjC+C&HDVa$VnzZ-+5y=zsVF)8;UIFuWG$sGPlv;^2@Ujh?uU+W?;X#^-o)^rUO5 zBELTL zc1<=^dy6W>pGb$2k+>3%C*x`TI_%n}BY~ThOnY;q5{by^Y;I;pHk+u%mz2uX=l(oa{AvEcMK2^VBmx8s5G4@h#az)LMPT;XZty?f$+ol3##dy71Zh^91Ru z%AD2K3uI*Dq_!(J4L`el?X`)vq5JlfzrAod0V@6Vjh_NoY(Gs$3+i`9pHQaVniG-`?)bn>X*x zzVDkiZ^Y_p@>NAwT*(hVw6D5m;>WHwzIR`=ap6M8+}P{&MceY(@FlCeJJC}22j|kM zZCW_qHtJq#@AJ#aso`{?&?85pnVjpw!tMHwE>{N?7)jO*=gkC)G%U>Lb!)FTQq?wc z@x(3CUT?4?&ro@d1pV%=4@OTi9SkRoll@mZDjVE1BHfxZV6X5bx0IAUv4uv#zwCI)dW4 z&b48>C$h^t>stkEe~&^n@H{Im{fGz9#6cM_tByO6g#4=b*~4 z7#l?{Z|l*#Er&B{dPIHDsF#C@bo<%U9Yse9cB80Ico&kK8@r0zUXK{YxLUi@W}d-r zP$RMR$n>pPpT#f@RB;#`36)8~5yzV8O^zRRFZ+kS$Wm`=Y9p?-X+27!Gk=THcvO2| zQVfIA%8X6q_*zyjZTe(*#k^RDQ>a~_8wD|P(y*lJJIEta;&S$^FM-j77Ic)@yn(6m zf;h0=ZkEq=8y`s2?0Q8sE$`*-Gq>Jdj&Mw$2B zv&c)+#Mqnf(|IN9qxKb27#t4%z4a(Toyl`@gHH7>P`Kp0v_TVM1`e8_EWGWYzVlJWs#F0S61_ zX3B($;nhF|(7f^GqYIGqx&2wepFsYBYw|jty#B({iurT4HvO_ zp$rZCHB)GI_bbbcrvvCC*|2x;w?_n26BUAoNOEr2@@6$bF+6fIXZbXDh!n}vDBiFO ziEx=Qp1~KiJ-%2!lOenJijTh$q7)pVnKy4tQQwF7>G`N@Pbh4XWpC(pB*Q8O`!3$BCRykqYMZ`vv z$b2>!6W$#lLWt1HZwkH*V8(0@ZCzm^uso=McgD&4!E?iwk^!Nf-seve8t5QG%=dY1 zBlcl3W@2(FlUlHiGNgG%U;7U;9uWSa_K9V?NC+vfD$~M~&zj-{a?)W_)y``Ywp@@% zEF@iLcRgfiBUIL2*j46|M^9pBcIl+xyN3vgoG=fNp*~j|%yXN9ft0Mlo&3!S{@9>@ zU4{zD+8Z!B1U;9;$tOYRGF9$06Kc-c-H@jKghLr>1h)~ZBjwQMUWP2z9^X;KzhR9@ z=-I!;5kZ!MTuUD8|9Z%S`84vqQ9~C%Cho^X%19Nh$T+)0Fzjy79GUrYX1K>UHI5@u zjvTn=Q#-YA#5HS|g{bt(x9{A0pCg&JFUT|@wB^I4bD8DKYr=y5K0o%T)hdlfbW3h9 zlAK;o95UZ}cefSn*FC%t?`p&HXLO2^1GL4a;j4}mgJc-}*}1NO++V349rJdJsG!F_ zy=%l>66-f*SpLsb?vR3UYDLR;R4Ydb6M7?f)ee@5AZQJ_Byr6YXJID@g}s%)CeL)8 zR!~m8oNOvK8!Caoe3I?sJ$eo@&G7U3!C=@7+ z<=*om6I(XiFE;(8T}%?ox2frlSrb3=B;m^ji6t1Js4Svn@Z1Cu0jLs>Ad}f-qFS=T zqnqWX^mqRIvSQ~iOd-L?iNRfU#bEJ(=s8QVw2)ZFE60)5xfLe7ntAkpy`r?aLN)5> z?Vx=Xfb={ld>PJe64jtR05CcsljJ>!d@_m)4|(<@(N5r^H3BIP;gYTA-LfRbHDr zlNtexh~VAeG5_oEZyTGMbdJltB;ovS))66GEL(Gt$aeEAydg>;@}@b2dgxaKA-9iZ zpv~*hVqUC2A!=P>Q&wEY_<8O{+B%>b)Kyzzi_O6HMiN;1ksE2u2p~QUF*@~2ibxrr zvFc(PIZ0u_Sm#Hl?tdU$B8i+*lcuWO4D7@VI(bfOc^U^T?^hY`}_@$6tA`xp@Ms$*o;XQcHnWUQoA70X@+4lOEClLB8% zg=y2J20M@ zcg7LUU|F5O|2>etI*ca@^ksukefrCs5V6S=*C{E}+ZPm-DwiS-h~}P|!=(Zd#DSLgZhFQPQqbv% z5FVeS^H1EJ85g?Fb1c}pohH7URx6<)5`g{y(Q4RY46;g#9@h`!Cax65wE!F%(V}rj zNEI8A1%&(YE561Fmn>Pl0fVnXi#^y{dG1T#Je}^ii^4Q2is?oej!BP`=eZE92GXRk zip^LJ%kp`SpaonkHa1`wP}$5^+zG$Md~&(T^Ef~N4yMu^f%O4;zCWAJg0y;5V~7GE zCm~6mdO!DLA9Q0oS52hEodu2KCp2!nDO8~yZZceqGx*=+97Noi7LsTJ?<0qv|4jhR zg)nk>pi|GACj7o$Umywzv?v^gBY#o`PZ?v>c(~=8hv^(gK#MziX*5JPhUwuF2lL|h z>i?x=bnCDHoC|%2Sj~~oXiAG#!EUiGm`XK3#>`I;5n@cCdTH?nSPh{@RPYTI>sQff`=@v(PAK> zupC4gx5Fi;`D{aCJOb@+15>1D{#msT5?}h`Tuy9Y!FTyILRk?oQRy%^Rm?#c2AdDT zec&uyFxz?bErbf?liT=cPh%~ZnK_tM?*WqIH)@Fwf^wWz+P; z1g%WN83j1#VcKH#_dxw5x85fU_#a1*Rvtp`c#$M6ogr4O!Ng@53p zjG~*v=q7i5RU5w_ACMpa{~MYOnIPPO6QKx$yPfll=d-V_y~eOS@HNUXOAx%q$oRVC;E diff --git a/data/images/logos/joker11_100_774.gif b/data/images/logos/joker11_100_774.gif index 1cad929d6ac58abea1a61164ba647204669d484d..e16c9414e367bdc9329eb5be7cb9f3eee713cbba 100644 GIT binary patch delta 8082 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 literal 14249 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 EKPy$BX8-^I delta 1455 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 delta 6184 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 diff --git a/data/images/pause/pause02.gif b/data/images/pause/pause02.gif index cabaec076d8e72e0f28345e537dc7c5e8a795c48..a21921ab8622e7565766c37c0c3cbac67c19cdb7 100644 GIT binary patch delta 7180 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 BIyC?Q diff --git a/data/images/pause/pause03.gif b/data/images/pause/pause03.gif index dac60b49f7b5d6a99163368a75f90a2d729fd078..0ff7af7fc84b4f42b1f25eff8da7afc2082b161e 100644 GIT binary patch delta 5495 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 ASpWb4 delta 5496 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 RvpnlI>Or3g5jd;f{Xd$Ie7*nx diff --git a/data/images/redeal.gif b/data/images/redeal.gif index 8674b8dada416350db4707658d263502992f952b..e2919ef733f781bff2e61fcd434c1653a10a6b27 100644 GIT binary patch delta 834 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 Q*^@r`lRz1i`j`L!J6=~0Hvj+t literal 5835 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 m=cTWfCInmIhY)c5tlODhMSq|-xRJPutP z8j1=v<|5CD@*)!a)h+e5;$#R z#2Q&6W4AS&EkEz`_$n)BNM*gRyy%YI&ax5?sV$a8yUAfU$D18y&yvqmdB?0IE4_DI zF1u^d?&=0jRau$+k*%f3+^5=AI{3k4cW?Lg*lV-WxW$-puVwcHFVkCFyWKADiAmbw zPyzp2heCI@WpX1%wNVAtw+=}2_j4+9d1u;sDz}U_6))?b?Wd=7$Mwx&F}4tVDe>o)&UDV-|CLuJF!(YvPmB5Uxz zzH;ReERNfv7aAYliCJ%pK}u?aco7-r-YOk(2?Kl7*pF;vxLsv%H10!aJ&$p4Lpu}VBHbR4Gud|JmS^<-;1#$UQ z>jIxtd#~3cb@Pe^`4_u{9%2`n1yw=6&_j_TpHObukO;%epmRi1YKkis`Hr%F7$d-M z6mW4r5UOehFy&bI-$iEC-YAp9%vyL-6R(=c5-JnD5d_QWFyRC-KkUg*eqB;-8I^Mb z#=Oy0XN570XN^4NUIPrZZeCQ9?@M_y``k%#D{o=i-OqpvHOU^R%S133kHrY8Dl8{} zEoKs$+FWg%AdnLP(-{~?xcYXk74!o#ad{5IF}@QgTUin6$n`I zEzySU({8XwRb<29#dM&}e-apetDUD@0}G zG3~Z>rk!oTv81-{pQuPx4a5?NP^Eyby~&*T5!RV_JFUntK7HRC5s?6q8)1(J>-b+# z`0aM2wQ}z$n=(=YX~{5;x$yiEP+vVmg0&&bW3@ZQ6L2jo;Hqrl6LpDI$`M-N1Z}U2 z3L~PC@Pjc z`;e@lR03*=5qKnmsyG1=AOP)D^rkGDkPKb@d=e%Q9b$y{C~Fog{t`$O24I1#n;k~C2&e`OM@dFFIbkpWCIIySkqr5N$^;m$*eo`Xpn8YRMho_Oxm@LQ8Mab1 zzSIGrahfO=4g5l%S4=(yZ*WO+bQf+8iHeI23Kt#)5rao^3@a82i<+7W79R+blS7qt znVYAHexDAaI|Xwlhp4j-jvWYsaIXxprnIPz9taO`q_V%Xj-R1ZuMNG($hHWqQ%xj) z9KO-X92o_103;#Wnho2j-3n9$;TxHa3Iz)D1@-gv^9%Th3LD<*05rI3BtnM{3rZ1DR`;WE{7E0tEvKbd0Fm6#-bINR{f4 z(LzEdi&ELPn+Nt|NX8Txr(D@m$Abf=EYj3Wm7qZk@g!E5=TL_Yh!Qa=QVmdl<2!tN z?qt#zFQ4!QyJvzENABDv1?i|<%jTS0U?l+xK&$@z!mR~g1ROYVjC-mJfU1Q@u$_Cb zNTLED2vPo=tpe&N$uH$xRRQp=2qE4Hx<%7T2-E~fgaGUvV$Lj$JQ9e4MPwI(9Svlt z;fDSJNHQT2@`;ebh$x^yqKP9XityiuM-+g-PA~3sK#VgUkPC}Nv=BoKGVJIhk2|)2 K~HCvq|Dx1VwqkWj!-53=Dld=>Gq1nWR3JqZ@ zwggJMch`-O|{f3Tq`ol;9*T5^-drqGv>6q@8o$;-SY1On+(I>wg+2hQ(& zAE#FLova)iA00Y!It|_MeB>+TztXolC=YH9#>bpnS%Ga-et) z`?I4{8gW7G7U+!weNXY6c1|_uX>mejHop*9V+r z=Ax#^XCJMVH|LJOj5jt?e_tlV;)isWDFG~~vDbrd?CiyAY+%-Bo%X$@)?ruo*wmj& zVo&-M}tYK_27i=*<;j6dcd zoYROj5x6eBu#8$}-`r$ZbHdJ5pz|t;>eR}Xq-9Ay6fk#_YLYY=n2!D4k`#Mm=l`Zo zy_Z?HDN5{ZEc&)!*Cz~R&A-elT5Dg*bXg%=hx0Nde-ftZ6Nh~^7mnu70!(`^%SbhomE$qf0eQHTryJ7XLl96hD3sBP>DhJIu>n$N85Pw+ zo}y1pk0Py?o)BVvj3d&UUO@4p11%z08JU;^OQ@~Lpap@2By#?p&qM2QL(mI%FsY3% zB4d_vRFGX>ZjRAAcHOsr%tahaZZ>_s_Rrhjzrx_>qY+Bw zebq%owwB}PNSE&Qz^|h^1tk5pXtjUvtetW}^*+uu9K4&%-hz9f^abyGP2mV5{{zC8 B>=pn3 diff --git a/data/images/toolbar/bluecurve/large/autodrop.gif b/data/images/toolbar/bluecurve/large/autodrop.gif index 42cf5ce19b453603274127329715415b33881542..148682d0d5cc2b84b94e089431bd086f5248d20e 100644 GIT binary patch delta 962 zcmbQwHJ?kv-P6s&GEsp+f#Ev?10Nq#SCQDadtLM9&Fk|MI=751FN|qc7Tdc+c@y=d zdHVYL7A=}*r6>08-Mfj=W?Df(L7$El%?c8`H;?Pxp`6zBn#3k2C$}t(D=#l? z@=r$TKrbz(O_R8;)roz(mUgL)Yg-YQo*GaxudS=iON;B%F1bxzY_E1PecH!%Z5`Xc zQ(SRgOq=?+e%)9l^SBvBr z1_aboW~<^)7Dg_HBMdqqV?eRR!114LCpIiR+%BN(HHYJ4i@d6| zk?Qef@oC|pzU%OyL=$)t|$jG)nl z6S{UB0<6`a7V}S*jcsErKKw#qI-{J8O^3^u)2w#JG8`6{+?{88<#x@9GWIy$(j=pj za`xAQ01?3{0v)Wai6KjTHtIwced0KwB*oh5Qe|-6xz)LHf+?Q#+3oh3_~QtvQp`bKfBNc?@s2!>{7sm>c4 zS#=l|EIOdtT5+jS$M!}-fY34D1FV4=Qy9*0tbFk3gc#S6?@f~vJuaQ}Vq4g7h&@Ii z+c4?oJ;Z7!?~{Y-kj6tVnsaa>cS$uU4%Q6A@sr1^{FiHrD_E delta 1026 zcmbu6?@t4}tXyi-;1MUVev_Y#<6O7L?KAIdG)_vT5>Y&) zi8`e|J+%IIiWPOEu1=^U(4Y%UyphzGP3a-+g+48t_OJssfaAEc6KXV_aZ)s~o|J8f zcu|!YO;FHdgQ0$2Jk+^mgwdHi?+jSd!gxRuwP7&_CK2tAG)A*gC590fkcq&K7Y}&`zv{(Jj~M% z^ai~?5z_1iP-+TzwUB<9;3X)K2(S|r+fv7iQ+Tsd95G@`Q!xIs`FtrX#X;1D#~k?H z|0DPBlq6_C_K*T(pO~|z zeejd@@x+TKhtNEQ0;y`)Fe*;)876~cZP2dP+mYqui>BcLzPMupyT;8*pXZuxuFA6( z8iF;`fyfc22v429YA$*&1*nYk4FqpBdA9MOCWrrY7?>}$D(;N-E!!lDl0 zrk~}hzi9b4r-OWa?9=35?`MA4*|H*Oe4q8pdU24SUNQEZsE~iY`5j?xy}6xN*ZOGW zK&?L)m)|eYVZzr>=CTEbF6(xCck8vW0|U>F4%R0ZR*dQ{SIv^b7aVKq@xwiB@|51w zb94Db4e^fPGiFL<&*iTTsF~9~o<4MVibW`k5zeyzh|SMMOO*e#ax$qiUEoyjd_|DC z+O<4-h_!NIaN?t(NI(VdZIX-&ocZ-Ei+_>A)(%!Ym1-u-fa#S&zJk~u`peJ5_yeYt zl_v-#aDQ85#ja$GD@#6p*7k$o6Gf$|x+bGro_~Y&r#vlF)z=aGV!`Q(xxV6MaF7%K E0ozQ{lK=n! diff --git a/data/images/toolbar/bluecurve/large/new.gif b/data/images/toolbar/bluecurve/large/new.gif index be3ed975a118ad8ce22239d1b529ade7bf83ebad..46d997104b08414bfc14bcd541e793cd981fc76b 100644 GIT binary patch delta 57 zcmZ3-vW|t@-P6s&GEsp+f#K^!?mf~BV4(Pug^`QFjzI^+1IaP4{dbu7=r0qC_vD9+ Fz5r{u4O;*J delta 57 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 diff --git a/data/images/toolbar/bluecurve/large/quit.gif b/data/images/toolbar/bluecurve/large/quit.gif index 89515b04e195cd2975ad20fedddd703aa0876b50..2bf9c604384429729b24b88b00e8a0e1b7c43561 100644 GIT binary patch delta 1111 zcmbQvJ)K+9-P6s&GEsp+f#Ev?0}~U|zD05W{{73!%bKWUKQSe0;z3=-Z?7)t>FMn& z<673{)R(7aXJ%7}Y0xFv^KGCCPPVsYywRt?Tm&bCPm0 z652H@Y;q%`8NZvAmYG#lTasLqm!6iE-Q@F(qCAuG^j39w$q6y-niVzqKchtbwrOE; zenxdsQf)~}Zf0UladJvhe4D0)*_oL+>G3hp8r0L;0s`ifYro=87Dg_H#SA(i^FcAm z!115Kom0kR!-9j&9Ku>LCpIiR+|JMLF~`EN@o2Y%umOvKd;1d0MYp!RbeWVQEng}Y zz;HmQq27ssCoRWG*wa(l%Jtu$PKV`zi%pWEcKL8PsGXfHxNL#~W5&xV9C0!nrV+|s zJ%J2s3cMbxYAV?HtF7Uj{lt$&F_<&#fZ&pD4u*M3rE`rEn;Px%eto%_l;9-9o#}pb z#RrFm25ol+kIXOaEKKSrxZZ-pB zsg=Vr0j8dq{}&dkI!L}^la_g?Bh4qNyZobs;i5!lA)6Qu!JF~6e>rZpJ)GcF6XLOe zL)FLP5G$9`I>kk= z*~q5cawGBhRF<8Qu1um=KAcc$<}nmkNcy?cEmpT zoOmTj<&NP=)%ps-4uz&YB?b;o%mD^%K7}`*xC#ooBy=#hI0SHT=x#|kzJ`PM1BZM~ z$1YCw%8r9>8j%eLnEBmiBoyiL7b#Q+tW7o$Xj9Ff(a50Ix#V@rF260WSvc-3V|NsB oV!UvKQ~p`?p?$u8J{*$#=wvd%m0u;G;2=B4nh%F~Sy>pY0ew6*2><{9 delta 1113 zcmbQvJ)K+0-P6s&GEsp+f#Ep=0}~U|zD03PW@1S}djJ0Y%gW38_3qY0NqgonH@%4w zQOrhWK@&IW8l-tieS3B3->+|adV2fHxR$j!sj1oZeu!8ZJQRhZB|sApHW?uR9ljg8_>EqIVCB+tRS^b)57e`%$)T2{?iE5 z)5u&x#wz|~VdP@?&rq+!00f}8WZ?M6@Sju0W5a@j%^bp7F()=GJlxLD?J>t*9d>$~?s;nHYuxLJdv~{COu9C3|%(ckq%hTqJN}@^Y)(s9ioB z4r*s-i|kt9a4{oOoGVj_!*oWncW*tzfitTnt7R^BiqN^k$=xbY->MwUne-y@Ne?H( zR-e+hNe7*nT&qMhwI&~6n!=O$|LOsSMutWMKZb&jM>trg=v0KV7%X;jy=QI3{OV2kBEFkx1I+Jui@I!1E}m|8qHq)YG$KTu>UP_%ETBmi|wluoyB~K7=5m>vWC|96fp*mn~p3Q+{ zS~W*DI%v;aQr)^Md`mSe=e=d-2gRHi6OMApKihq1UzmVlv&=^)lL@Xu1_1>Jxj5Fa Me>lX;%EDj`0F*r)zyJUM diff --git a/data/images/toolbar/bluecurve/large/redo.gif b/data/images/toolbar/bluecurve/large/redo.gif index 01ea4dcafc75467e69087bfc214e9a522dc2d55e..dcaf36f290bc65710910868642b8911d2be01156 100644 GIT binary patch delta 146 zcmaFQ`ks~B-P6s&GEsp+f#KUm?r26^2I7F?PZmZlhGGUCkaCc22KN6A#gi8^{$Yyn znY@rm%B0wf$3waKZ0D{H?=1%t9-d({=M^~5dEg1}9KOOQAFkd>=wgdCT$DBM@`A2c NS2rXd=3`;71_1r1Co2E| delta 146 zcmaFQ`ks~B-P6s&GEsp+f#KLj?r28a|HJ{spDc`A4D}2;3_t+V&A|Szp?>mW#y?EH z5tA1(Ntx7p@pvdVpY7b$;l1Tx!oxFc=DY&`IS)MHox@l7gtB%!+b0Z)&LLqPKW>i diff --git a/data/images/toolbar/bluecurve/large/restart.gif b/data/images/toolbar/bluecurve/large/restart.gif index 8deaece8ebd11a6f9491770d41d3d783ab5cc599..001a3bcb70285c091c7a6cad222046de949582de 100644 GIT binary patch delta 436 zcmeC=>g3{f_jI$cOjKY{VEDd~yOpt?VPL^Xw_il@CkrDNLj!{jC>}u3!ocx=vLf?8 Mrk-b$6g3{f_jI$cOjKY{V0gZfyOpv2|G diff --git a/data/images/toolbar/bluecurve/large/rules.gif b/data/images/toolbar/bluecurve/large/rules.gif index c6c6fa287919afa624b1a16c7b0146f1702a2e46..fb235579ed4facb2025cfd7106d6e49894012f26 100644 GIT binary patch delta 1010 zcmaFM{g#{C-P6s&GEsp+f#Lf^Zo7#-8r-vHefspt%*^bP9oNKGt%;j-CqA;7tjL%) zxr@<$@)<@gp<8`r*Sv(n!ouX_bv)F(xZLHa9M& zrlzJgKBjl4_TBOlJ7&bh#>8|?kLj2d-!?t2yu7?s^Z3>o@ky~Uo$`|Nb7PylibCR@UWgi2V@HYt)kJ~bb&0AGoZXW9fT zeAsSkU2ZxsQEFDy35y+xd|mG9%o;a~7cpul)pwbG-kj;Vh}m7ubJdlD59Hh#H}u?K zJ`mBWsnWn0&D>cpvC&4;MrY$^#gMhOY>W#IlxQ83%a99VNNQ!iG)r7%OXRWqo8crX>pBG35&QGEcuMq>`-aiP|xAC)=T`)rZvr~ zvaR8+{}T+Ic5AVhIvE(OQ+8#wKEOGTNnv4Wmp9Lq90Q5Nee)AN8D_NT?Uk6)Dw7;= zsWq|YN}~Wz>x?F6LotyJ2mDx<9&$22$g{9lM<%3Izx6%L^Q* z1s2_Inm#A7fq(voQ>}-k4oVcxVVNgk)Wywq^B}WGri^-%s?Z4`F$4VVAqPumiXs#1O@l|>`geXDa+A5ZW8-1I4j*S% z6ZWr*j`D`=DfHkj+hA~liF-;BqX5H}peAES4kKPR*BM?DwB&j}2=c77P}suE(Q)Kr W7{iT+O=SY6Z@*j)kQWhPum%7etXtv$ delta 988 zcmV<210($H3+)RFM@dFFIbk3GAOPo)3qAw7Iu4OZC=nV4nwpyO^71w|Hqt%{+Nu(f zd@2JT9uASFEd$m<4w2J50*Vfk4gqHa#y%30bpbyEPD%!ov;is}CMqV{j&}O;?$$~Y zR#sN3DgquJ9>z8bmKFlGG7gjQ0V)GZ76y|V0viT?3If)8UXwKfAt#E8ipDMi#ySqR zE(*#v25xR{zP`Syo(`@u4jKjm%1RziMg}S>8k2DXB!4Ob0wxLq>ed!I4hFI!0@ij~ zo*o9aDh7%U2EsB1&R#x_5(cs^4o(gR&Vp{nG6uFT4$3wP|NsC0|NsC0{~`GV0SW;B z04x9i001BWAOHXe{s8|897wRB!Gj1BDqP60p~Hs^J#Z*dV^%GKwK8TzFsnuh4zp|} zEYn2~D1T5-XiX>~PR9{DQ4|eZ1A_pQ9HL;J&S{h8Z|&HK0x6EqLnZ~1_7)9HH(IzaUWP5!o>qq z92q9yjTz&E#4T}GiYTK|a1RhrG4|l~G3JmwSbwl|nW5Js?_d^f#5MZyr67lF!~o3j z#9|DKdZBd2YW^^Fz$ne1wOzD&H^BzHH%LS;BYWVgHNGpP5|gcGRzqC z1%DoCa59ErgY1FO42;OaLp2u^u)t0Q)$#&8&>#WNFCA2c&^M;UAw?twqyve8uC(Bn zD)RIZpFt&1%I6p!W>QzQpg4Bh)GZhVl>eLHG!BSg$^}{ zB#;MGBw&C9R*-Q+8ryhrPzjk-atJp8Ixz$nXNXe*6)$KrO&hEgHV6dAusKi(-7KQp zf}gZufDp{8@Wn$M&@6GB1gSLgN(=_^0YnvV97lpD68sX@Gcp9CkAgmYzyTjmB!2<| zjhhI-N3etyrT{fO;BpQw&^S}rDI9$9LlB5CMo~n3DxL2QdT24q4RU z2n>9@pvVFX#DW140OW!~I7K94P9+9Pm`ac>9+mLX47E5Qv;zo;#L-p&@DYP{5H;=e K(@-B25CA)A|8U3v diff --git a/data/images/toolbar/bluecurve/large/save.gif b/data/images/toolbar/bluecurve/large/save.gif index cfe6df2df486ed3eb67cc6717709baa6f00da5b5..d9edf5b8069a28bee2006715575514167090b6cb 100644 GIT binary patch delta 1061 zcmZqTZsO*4_jI$cOjKY{VE8_fTZ;eNw{LDsq&K-=n&wZ4-ali%Lo9ty;Az zE@@g=RMD<|m)zWfg2M79hcl}1MLx9O0Om{L~WqN1`@lP55WPF}&NKKT-(rNp*f z_uSl)Zr!>U7BxvsOl{hFRUvltk27@Y}L9`40HzdbhZ!G zI>n#$ER0+X8yR#!;-J`K;P}sw%qiosVZp&>4q>gB6B`tr1o#*{=6GyOa%Gyzmp0?k zaeqm+>H9ilJU?}>m|U;YdrRnWf}H=lLu(E+cTPS#+e}>d(L_~m6**;{5YLN?7cfb! zh>K8q)YyD^xwXX`hlT^qS7nmATs)5~NszN>s@M2q@k!)W$g1$-Cmlj8JuBC-e7=*p zfbHb$O@8Gs*3K%+mF7x+z!$Q>>w%Q1|D7p_EBf&w?<6 zRR4Uh^o#XPe7e65GFx`_Xhh|;Pwg~WDRKNipYPpWrMfrMU(7pn%5|3K!R602^6piA zvnZUldH&{QBKKEcz53ljtm}+HGsiB)MNQoGcMiA-O^*pW++uK`z)5Yxfgmr|qB8== zwK%GlDsWBslK4nCASKjAX$fo7Y(cjpg%1?{UMzRiFu#+)S}zjtVWA_t0~_ZPq0%dj zT^uHQ>Bo9&Z9cY0SeP7QRFJUwa7&&2hXbpaO36dEEJ=?-SAnoMGekp~R00|c78VLI z2-KZ;&^3L<(L+aA9c>I*_$)*cV^ujtk`63jt5IlCh?RJBTv_Fcq&G*b!@=cY_J#qh z+`1{h961>|j1FtAEjM_T!DgbfAT&iH!NE;J$06XrYG#3WAvUQ6WslkyZ{!hbVx9Oh zz=3mq!lDBV(mVzX;tCakN3@emF0F7&Wwx<)&RRiS4aQ= delta 1105 zcmcJM?N1X20Eh2DO5ak<36+(XQA7$1SYhBs&8XJ)fQEHYv1sQCoCHXRMVM)pF81ZD z9X7%&#EzYCD>o_Zhz-=qk~&B!CNRjzxY^FRiMM5OgcxRsG9{ax+dtr^J)fWC_ar}* zgK{_(Rqz{SO&LH2@Vkp6NHUrnTU%SOQcni9{0!L{w@sPEcNQ+2JH*ut}*xef|gprMKvDNx80EhVXcNmF9U;ui1<$ zRYshcA$^O{7h-v#@&5|{?F*mo0NFqk$OoSD@3R2&84zWqR!(?k&oX!A9bcFbhM=85 zO>M>!C z_=C=aS7$U-;IMe?9s7%JJy4YwBzihzTzOmGe(8J}f{8Za!;(8rfZ~5!HK6#JN zw<96R)F@(q=2x9tyNVf4rgPq>dB^EjsJ`6s#q}Y5X+a$OQ|oWTdydk=hCw&2MuoUk`uT`7qlp9 zJJhW!D6c>wvr93&O{>be?UYO>Kbz;hbvN+1=*P~r`%pVPR69Ew%`vQ+j8e1vTEc13 z?tA0m@NQc&MqB4tfu_w6xA&3tqr}lcV$NQAD=5ob$mm~+v(WVXt4z~KBgZ2~GWo}v z!}9Da2hpE)z5S$<-dn%+rv)r{^U*^E|5*N}jd_5<%1S!R4K1-s3Ptlh7aDEnQp!(5 zp*;fmLo7c&aYd1wJ2)AyPiY5XsNumt(vg^)Q?^sX(+~jl{CwcTCu4sfRxqj>C+!L4 zB~9<GX2~pjjM=OySh6}8g4CESyV}YE zQ0~O+_5IB^4#j1++gRCW5~+$>cA9^dcRt6p5O_dd?gltFZv=(B@OytuKe<2NaR>x~ G{r>=~2|_yn diff --git a/data/images/toolbar/bluecurve/large/statistics.gif b/data/images/toolbar/bluecurve/large/statistics.gif index 2f04b7d4884bb72b926eb098b72147fe79f29198..23183ef36019a014b48a697d6508a1239f76f53e 100644 GIT binary patch delta 154 zcmeBW>t*A1_jI$cOjKY{VEDF?JCxCxffS(llZBCsp^!lbqzPmO1N;Am!pVyn^%)B% zUuJXxk`hdn0+Q}+!kWQGF-s4vpU|ikmNj`Hld8lqMu%lRGmSIamK>b9qG6Uq<|GA& Njc##sCf{Sy2LMcoBFz8* delta 154 zcmeBW>t*A1_jI$cOjKY{U^upsJCxD+KPf=*CkrDNLp_5I0}z1BU||2(P(OJwqdsH( znAj7Wrs~($fPRqkI`XS&rIWtwj~E=u4tGgkvU1h OVWZo<`IGN4=>q`el2Jnd diff --git a/data/images/toolbar/bluecurve/large/undo.gif b/data/images/toolbar/bluecurve/large/undo.gif index 3d155f3c4846836cce723cdcdbbd913c2095b7b2..851c6a6bb46cd2036e4cabcb0e8e32d6b9e0074b 100644 GIT binary patch delta 180 zcmX@ZdWMzT-P6s&GEsp+f#KUmZWG3O2C4$ZpDc`A3~3BHAX7n>FtGn`NNZ|tX>Duo z=Fw*EFmX}~!{jbTCg!Qr+9vN~+|M{`avhT*(;Uso3z=m3Oq*F68~1c8d(V^M HV6X-N6#gLH delta 180 zcmX@ZdWMzT-P6s&GEsp+f#KLjZWG4(|5OEvKUo;L80r~x7=Qp|2?P7ThWe)Fme#iR zj?S*`p5DIx2@@x^Fih@ZWMZB=t!?r?#{G={Cf6}3GHK13ypTzj?{70pW8>zx|3oSs1w(x*2pp0SyXw29Ey>;+!%b o8x|aF<`5LtiaD`ip>rbx6Ni97!-2!DlWmwEGv!!JR%EdP04mQH8vpDuo b=AVKVidypYKZ09>VV4*&oF diff --git a/data/images/toolbar/bluecurve/small/pause.gif b/data/images/toolbar/bluecurve/small/pause.gif index a25232aff8b4ef7378782b6686d7523b7fb6c899..01fa2f3bf28185e80bd20f4db09e3974f3f47bf3 100644 GIT binary patch delta 137 zcmV;40CxY^1H=IgM@dFFIbj$87y$DCkqkt1anQ+0tGzhu&Ab0#2aKdN24xl~$T0xY ziWsjJBur8}cfMl*MB`8h#1g{-OeG{5dCj5?>5N5}7{JvOeP$00gOmprV=sa7IA92m rfdq!xRFEq*0>WbM5ES-z82|%BI{*Y?KNln^j3XhCk&=^?7!d$F#Ah)h literal 471 zcmZ?wbhEHblwgox_{_(^$jB%nBBG?E6c`wonVDHsRMgegHEGhMl`B_n*|O!pfdhB$ z+M5CLMzl)zXEz!E@$eJ+gk z0;0J1oFi0QF`pHTh0`dYZ3+c^4Gatg5TjUI&oP{1T`@uO0N6@LaUpMJ3lPBsF^Vbc z!;}Xx9&be+KwQPWVy=)(3FFq_CXh206zeT1^D59=z~;{gaVcZREzJX#4YxE8LR`h} zXUxj>{7~jH2B3LBSH)PI1)A5eY^D&@gN+8k4aEx#f)!eUE&{6Yo51SJc&>Ak570oc h4-Nbz4>+=SXfj&>Wr02f1sISJV0b`-z;b1<1^_qS+Wr6l diff --git a/data/images/toolbar/bluecurve/small/quit.gif b/data/images/toolbar/bluecurve/small/quit.gif index d0dc32412bd728178277723df37b0ff84e29154a..3ffa227bf0d9dfccb48e5b69dd600ee94ebf5373 100644 GIT binary patch delta 170 zcmZo>Yi8qi_jI$cOq5`dVEDF?+nh0xfqFpkCkrDNLpp;F$ViY44DA0K(kCxw3}8&3 z{Do0fDE;}%m)e>-x}QTb0xl%XYi8qi_jI$cOq5`dU^ups+nh1+KlOm(PZmZlhI$4a1|R_0z`*{mp?>mW#sJ3p z$zK>%h3cQbe5tLeqx(4|Bj7^9Jnqc;$=XaMe2F4SN2C>%*jj~xm(BP)c`Z{I0RC}k AHvj+t diff --git a/data/images/toolbar/bluecurve/small/redo.gif b/data/images/toolbar/bluecurve/small/redo.gif index c12718782a15a6a356e0e2662ed7145f889c7ebb..0b0282fd62ddbe277b7695cbf5c3bcf7956e1f21 100644 GIT binary patch delta 160 zcmX@idYF~l-P6s&GEss-g5ldnZU@E)28w~=PZmZlhAajhkVzne8QA|fWKCYoxScU* yax{~JMwl%hEv6Wq)FJtq!Qr;OUeyH6=|PisFsC!^SwC5kWg`GVn-b9g delta 393 zcmcb_d5M$T-P6s&GEss-g5mi_?tP5){|6QfwEZ#E@xJ0u7Dg_H{|q_|KmZC{29AFW f|0gRm*E0T}ypUOx>3jU-9n9%W8}>|AWZ4J+$?jMX diff --git a/data/images/toolbar/bluecurve/small/save.gif b/data/images/toolbar/bluecurve/small/save.gif index 31fcc983dced74878b84c0ce542a1f6366e6bbf9..88bf022cfa53664ae9c387a11a3dea57787238f2 100644 GIT binary patch delta 132 zcmeyw`iYg>-P6s&GEss-g5ldnZU@E)28w~=PZmZlhAajhkVzne8QA|fWKCYoSiqPy VS%j&ZN!)+(LM9Q$;K|#VYyieA5YGSr delta 132 zcmeyw`iYg>-P6s&GEss-g5lUkZU@GQ{}cnopDc`A4D}2;3_t)fn1TIYL;d8%j0KGK WlSP=inF7QoFJuy7{5^RalMMjmLQ_Nl diff --git a/data/images/toolbar/bluecurve/small/statistics.gif b/data/images/toolbar/bluecurve/small/statistics.gif index ee714fa7e9b14b00ea256d6ce034f1e33d163579..7234907e008a94bba9d9240bf888cb1c58611c10 100644 GIT binary patch delta 251 zcmZ3*x{8(C-P6s&GEss-g5ldnZehlH2KoZUpDc`A4ABfaAZvlHU}Iol|KAWjc`>7f zMKptyw4jVE$HG1eVJPyyVj0Wx9fol4AuaC5+rv3 delta 251 zcmZ3*x{8(C-P6s&GEss-g5lUkZehmy|MUflKUo;L80r~x7=Qri3N{7?_J0lalNU2u zSkyB}NejxzGVW>;6_%4%P-H(`&!MEOBB`o2Sxvo(iER?Q#`OBxog5lXJgraFHSe`+ vX>-&w&#Ip+%;d{hKRJ=fP~si`Wadc^c%2rorZ02j=+oMf>UKR)fx#L8LHd+@ diff --git a/data/images/toolbar/bluecurve/small/undo.gif b/data/images/toolbar/bluecurve/small/undo.gif index 35fe78d38b69e267faafd21832efd2152d761813..ad0573bb944641014e16b7544df3e0d63afa34cd 100644 GIT binary patch delta 140 zcmZ3&x`dV6-P6s&GEss-g5ldnZU@E)28w~=PZmZlhAajhkVzne8QA|fWKCYoxPxh> e+vHd#6X8{C&62_bNj3`FFAkn|X=G$zum%7X)DuPk delta 140 zcmZ3&x`dV6-P6s&GEss-g5lUkZU@GQ{}cnopDc`A4D}2;3_t)fn1TIYL;d8%j60Zq ex=)T}G7$h7p6uA25SIHdR3qR diff --git a/data/images/toolbar/bluecurve/xlarge/autodrop.gif b/data/images/toolbar/bluecurve/xlarge/autodrop.gif index 508206f4bf59af04e63d4a926c2eee4b617d7617..1b77ec8f4515439f2aa72d68eb5e0a4e0ec0bb90 100644 GIT binary patch delta 1130 zcmV-w1eN>c4do3BM@dFFIbkpWFaY;jvIMLdmOVHf5@5$JY(WKIguruifEzar8tTAEQ)O2LTWu^gP_e+Q zLItlJ3}8o~V1h5d${o?vrw^Dir4Ye-@+4R=Ds#$7+q-~akXIk3OmXlE<-i5F${mQ% zXMbI?GU_H5B1iiK8O-o3dD@{vVUHl9gMWB+L7)T*n2snbu?~#7V^7H4>a=Z?vqOiH zbm9X~N{%n453>IYPJT*|n*fUF!qz(8^Fk*Aurp$gmwk8coNaRg4-Jk=3H?@HaNR5r zOD5H5AdGv2oX`se-As{y3FfTA%POlRF@H)fK3tOrcmYZf+JFgAV8d!)z|dePA|w!8 z0z)){;UcTNU2s^J&Y(?5W`?FB^)#?8U;f!RI=rO1H7`v zC}LQeiwF@8|BAw)jc7rG9{?2h*B+;qHvlw|kipBEykuj7i@^=>NCp@%@XR=CP$Opo z3PquVrsNSY#udaEGVCfNR5Hkt#($`Sfg{f}Ldp`1Voa}7 z5MaVM=K|7*5`j$e4h~l$B!Qp<2C+ghLcbl`;{Nh~5WrYHxHu_J&Opo%16pzuxsARgr7$vQ+qz!w%+B7evkoqVey z1OQ}#0W%B;tOO~@;DO2=c65f&1=lXgj%hlmkcu=e@L|TP5u?MMI5&+g&U%0{p5I)Spj3W$~ zlJmflAcH~%s6=ze3Jdg2YJVjo8`Q%WwV-hg5L^I~?l@Nmg3R2gTmk|IUu>XJ6ki~a z$0v|XpoJD|e6z$POuX~P9e=2?0JR$>;L9oAh{FmE<-fe?(K1e4wd2kQ^RP5=M^ delta 1099 zcmV-R1ho6*4do3BM@dFFIbkpWFaYO~3zY+sUJj9<6$9?ZZjrS!1NPc_k?2np9tJKZ z8u!K%`rd-{!UXcV9P+|8lSKh(2I`(39v%{tt^rF7`reYamIwCQbUr>llm7u;0-^?! zTmncE;&Lu-Zft;7 z2^>hUpuvL(6DnNDu%W|;5F<*QNU@^Dix@L%+{m#bMHy5i00Kag#}5S_4JsJ~@>Xd)% z+7>`K9TLEYFKj^tVuoaD#1UU29vpbIG9Xt0cXiJV{z1?X6j zfC=)@QVcD$FrkVtK!oE5cmYZf+JFgAaKmb2z|bHmA|w!80!2`Qp(M1tpoV`nLYT6L z1b=}xpcRO45<&!NM572AYP3k+0C_ZlArmifh#vcIyCmb#_v^mNvBkU3c0EI0y z1t0|cI2<{u*k>s{Ka42a5X^sIFl8MzEJ_7KGH|lxfCJzHhbm=QDvSvJ5e|yNp_Ft{ z!yo_@_ZJ|imN$Sln4nS2n#GJ`f{VcoU`YlTFp$kVaCjqU0t!*VgQnyWaE2DmEHW%D zBXEMqlF-b8K_%Hx!ip2#fWT;gDPa4eE-bWz10xvH0!^=05MaVP=N5lLNfU->vX2f| zA|!#J0}ipmGe#(LZ@%j=?12fDc=}2{O=P0UCbn?U+d+UJTiyplEKp4+b94~KB1}jk zGo~m9kZ~o27%)pFWT3E50U#dafi(;W+ypDq^brdm zdvu1-1=lW#k7+!pAPavtE(D^++H6l<$t&r0OorB;*dT_k2myBL#bAgGBm)3h_yC0q zQIKHx)T30L&%gp?y~#F?ya5QQS`q-(Sz_GcgAhRQVofCsypr?4nMi{|2C;0z#|jJd zO)4iN8}x%1zO)gJ5MLCM?mJf-BF)^fcme_kVr-xh6=ERZhbc>!OwdIaaH!*iCQs}` z2OosIu>iFjC2$NZ>9|u%4dn0B0v)#aL&yqZ@GwP67c3yg3OW#yg$;!0Pz@{q91~tj R|4_gWv_X;ro?(;D1{X2Pz;FNn diff --git a/data/images/toolbar/bluecurve/xlarge/new.gif b/data/images/toolbar/bluecurve/xlarge/new.gif index 54cf7bbe07b854ecd51d61353a2129e15dd1d7b2..3de6288eaafec98456c0edabc7aaee54bf02e2ee 100644 GIT binary patch delta 65 zcmdnRwu_D1-P6s&GSPs+fZ^*z?mf~BV4(Pug^`QFjzI^+1IaP4{dbu7=r0q)|H%&- O|1#?^gin6R6bS(Svk`0n delta 65 zcmdnRwu_D1-P6s&GSPs+fMMxG?mg1~!9ejR3nLeUJ%bJd5P;+u*!~@u_~Huk`NC5aT7ncA4 diff --git a/data/images/toolbar/bluecurve/xlarge/open.gif b/data/images/toolbar/bluecurve/xlarge/open.gif index 7e48a65f25dc93ef2b0963a873996379eba57e9e..656669f2f6f13192a40b33d8dfac5496f95719bf 100644 GIT binary patch delta 1546 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 delta 113 zcmeyy_Kl6(-P6s&GSPs+fZ^Ci?sP`O|G0tTPZmZlhI$4a1|R_GU||2(P(OJw<0F~> s9!qZ>*19%de|gy6S*5RUtk+xI_0~%)=iJsSag!G^6*11AEW(@w0JOO~C;$Ke diff --git a/data/images/toolbar/bluecurve/xlarge/quit.gif b/data/images/toolbar/bluecurve/xlarge/quit.gif index d52725f60b4b8723c712c6c0e95b56f589b43311..a16a3b4d338dbe78347412c41b10ab9e065b21a8 100644 GIT binary patch delta 1621 zcmbV}TU3$<0Dyn4BKKR4TLiy|cnOt=#LNH{5Y3dOnVCaMbIz=6$DFzN@fMgFf^+5^ zM@UVpIkn4La~|`O&8(TnnzPn1yIJd^ty%N5*9+}R_dGwBl-)_y}iBZDylP!Rg%tf5aIraiw&s`C7j_% zg9{v0aE7TU-Ji?yVzI>be98HS)XFTON}XSzr-EQuhh1Ni&czbF7G_4&GOr3Fn4<^p zHppI#)YavP7hgSHcy#^6b*E9sA`)4^|HJhEvj3|1e<5L5;3g3GUcUbTV3vSWo*Zpw z)1^`j%|Go*r)%I4*<07B?Q#ztW~@pLSGAjtYjhf{g%e{RC~=5B6kD`@N`${|)4D1B zlXy>zvwmob8E{k*^uwO%P$>?&aXeu8`B7yq!6wKqBODutGu*ykbw??w`;1;1r^`e z{#Z*8W270--=4p~;y$^pLYq!t_;?QuTSm{0Tqa8~Tq??&q`->R%+~-qY;xy4WEQYz zm|>Z9rC$b2vIHDc4^@~kzc5hE186T`T)BL$9mFL2H^T`^wO=Zt8f~9R{ zH!7+Jb6-ij9{LE-WZQ)tA7@JRvK%CA$YaMGywaL9@x(_(tNi{k1?(BS+>~TXbfeUG zn@&2e1!9_HlkEw#*U#mB%ma*l51S$;mgWaYn~SGMeU1cz%_yL1=6BJ4p+I}`0J_t| znrCX59q~X5?whf~w7EE|tO|bhTqiOhmsj1E6WHoA9%A)yv?=;AOsHmtc*U?58>uny zp43+(?S99t6N=b?YqQ|6|6!~rZuK@gXGFD5^yE1=$WYY6JyNv?>mNG@G!rK1?!EkT zd?^CAvu)%Apu#sivzA7ghv;r3(-g-K7|g}^UL<0bWCbC?JHdwq%uF5ET zE_7LNYkK&L?5fSB01g-YE5Zk8?!vE-FU+s7z?~;}l&H>nj!;Z5?SCn%6_0)TCSy(k z*fk)2#mc$XNuFvlq>(+Cxcd;fK1wly9=el{W9MSl7t{U(6RyDld~(VkR(WD9vb2m> zMs6v${YV=%?Se|+*gJ0MEnKc5W%0-l?imR+B7An^clD_~8xK&Xk={feGYe9{K0v|% zf*ztzgDVxGXjVmE`02q+v8dLJ-IrJvo&rPqTKL$aIU77%L6rj;f-ze;pIkytx-=sE z*4b%ZUv`hy4e<#^(ExlR0U@^ydVKw=)|6RgBaK=HD7#_s5Q`a|&Os9@l{Z?X^ zOK_{c6w#4^gRVp|Cl!dTJw`@hVfo5jr8<0pa&%|$46A+m5W@gfS0*4~^m!~i^wlz3 zaWu$`fz-Wl5>K%`k~>|KyF8Q5#5KdN>3jz+$oS{f1tA|f_IG7@r53f|t{1_}b`oyqFy2%5|PRw1G0`zk?R`+?#hyr1_37+3I+nAdOAuv9zI5H4h{~EZYs{EZW0zA zlRN=114ceBlWYMYRKj`^PC6F4mR>e4DjpslLPl<`vaYIzMt)u%5*`v3B0eq- zmU1$#j!sHWdiLhZs)|a6VjiA;KEieezP`R*LK2>48iHOLDjo_J7A6V~5|hILDhVDQ zGP;^t4h|NR@BtVDer7V02m&MwMm8EcCI%)R5>h%6lPm%lFk(g)dR{6X8Wu`EE?!0+ z8X7K=ax%7>T8d^SLPm0~j#7SF9(Ga^A|g5l1_~k?4wGL37=Lb7Chp3XmTE5g^6EY+ z3ijsC?#`ZKN*WFh8vp#0lgA`m)kHU59hl4L0HYgOvUpuImTc07t!(AF19cImt2Yi{SuCNkgvGUPB+7!R z?@_Y}|Naa7v>Y5vS>%esGNSYnP^Dvycsw_YWuux4wtuqXVqmLH?#LLD z;bWl}9z2CgOE~bVC|S$}E4c_T0Kue6|GrU?!sG?5S6CYU7b5Pb$sP=Q_V}@Y9Mogy zNDVTWRAGSq3fBSfYy09xEeRtG=f@s96u1KzJ79ppdVCZj0enUo1c3%X*k@q{bO2xo z9GoPg*nbFxSkMFpU>ITIi6-u_hXoCOKo$T70Z@j8GyIA8iC-7 zg}6wTK{P-?BaLNf;7Ar&`~nIe${Z+UkUtusA|Kzpcn}RV;IpKCWkeB=C?gO@qL4zy zVPYqi;DI6rO}q%>K@-k6<^WL4lBOReo(KjQcz-CNMF??lql<}P)afNc6Nny5?&2EYRX3n*l8Pl-GD!pybI1S{+$q^N2vrX>o(3J9#QU_uES zuz!(a5bt2?3qw$7AnBN-Op+<1o#+5fGW2Kz$T5ow$xJ_J6wJ#)Ln!I3A~RrmWg?@L zAj~jT2m#~{{bZtXCbc1ig9~-2%BKKJ44UkTmTWPG7rg{YP9`nHtVt^f4O@w-_(XvW z9u|-YtDq<{xRfY; z9(o8r{1x>g@DBq33|3h4iD6NV1eT1j#1f^AkUbX6b)bR*3S6Ur_yU2#5O5$62yia=)sD&sFAeniHKz{)j6afGYQh*g;BP~gAhaH%}JgmfJE-1W#3bWw^ zM1(;EDTtv8hVYOAa9|Zb0O2X@Kn5mY0u!}W!3r(1&;duZ0T<4IVGd#_!vfTh13y^B z2c7a1d5mxo^Z3INuOR|AxFH8#G)E51K}I)R!-)>D;VRbng9GNl43Ln;9C7rJ18Xe9 z9EVtjHLO8KJoXWfXMExsztD&pXn>BM@B{%ou?zw@av6|ZMj{zWfJQFk5F$WhLm=Rh zYysetzSx*3HL0}~rpP*BiBF`J2@-V+zQ@@zWwtZ&<`sJJ+*xUPx6 z?X@Hxe7%!ZOfW;C~Mj=zp8CgQgT{; zU6UJ_6zi>$=7qH#Vi+h;PnpGvKUo;L7!EV&fQ$jf1Ovx^hIURFj|~eBHggDT#hlo% z@Nm0;vez7sjf;+UOBiR}Ik8dMl_i9uqGrX@sZ)LGm8GLTB(Cynn8K}lL*U9Eo`wRwzT1}lx_S5M z(PrPEZ}$$cvYeQwJd0id!)GMlX{GTbR*~!|; zF-^cwNM?7nrjN+lZ7#=u2&&Kf#gHYus)wCL=xhSB;77xYp6c~(UrJ92uQ*_IOoHi6 z;So{A8H>0i5km@CKlOpj>im2`5cCaI9it| zxN~gW!Q`Xw9Ke|18nvLlkVU@wjo=}Et%QYB9U4;|7>3G!x(&^fB6y`*KrX;F~} z22GBfFJ`)H7+>oUWaR$Q#4e}!X5yh)EQOPrwAN`Da88l%ZS<74{ZYgy%__5`m8Iy% z;^Uca22(zHXy(*3dNQ$P3bybymWeR16`BN`)CinlCBVqwacd%@oXnycPJzWsoV)|r z6d6yl2rn@@CGtGcJ3z5nLdii&KE-Ip4yKif$5`}hJ}?Ts?#gBmv&=|3Ek1ujKnLR+ zE)!>g4I4gsYH?mT8%Z(+0h($ delta 1125 zcmcK1i&L5f008h0P{uQYsS9*yNhGbLJWI1W{3$ zIzjWCHO^PAtZ05E=V=+f5S`NCI821k>45)cHX`i={_9w+2v zv)Q^HkKW;936yMk9i2{hdNz9oA(mKTxS$(64u{p&+3Jx157fyGklF%Cq;d>Co~O36 z-jG&0m6mBdotMPBuo2p~+IzZwf#uTW>I${lg~3zx_F0v|sqgWC z1{ak|XM@&ihp#Ig&NNm!e0U=D@Hi|`8CXedVW~q^2dONxC;tQHUlA}2Z~~+N|N8F< zKpDfp37RH*&_C0Fie=yS|(6Ou)cB_3r@eNnf^20pE9YchFv@a`0 zc-sZnp=Xa~yJvpN)ZJ?wo+#(GVUjD>Gw^>%r5RVMx@k*_xjO?AlX2`Q&*sM!`$v+3 zm!!yu;W4nsNpuQC4%^C=UmK-TroCPe((ev_akG-LPb!ZMsmUd zapm;Y0?{Wq{3F|PhOq2L4z9H5qJvHBAIr-^&?;9^`jQEEv_LT|qP}_MH!bdBRi!zz zKYMKM)EUwnxXdXd16tz8Tr)SnO}e{hVIolc#xv%&KSi(9kP0Pe`&aHo)H3N?oIrXF zR+6jzer%p;q43Ovl-hxhMQtCrn^_Z&_g9ebr7VOvQ*EMla@>x>EXF*`L#6T8S_)xN zWqdCqfdb9;MXW*+&O!^Wbiq`?YuMM>5CZX{c(2KyDu5Cp-ULr*5=w4Jv{PE^g4Ob!CK|d9 ziQB|b2BiH%n}038>S2{|Ldd?z&h}+XrX-2kiHVv-v<|hYK(1{kxYT9>1&bgY%9zRE z?ckwSHoBH=BfvsE){6-zg>4IM@C_JV1&by{_zVv9LOqXrbPsg}lLe-KOsELu3~*o_ zteepxQ3!Gs;q2mxC&kzm42!}L4B0WY^w=fZ76ux7Wj zT+U|n1k=|_1{Z$}H>4)-b3c{h*#i2~Eut)GI>EjXrA(mLM}G_f!4 zB68$^;Xqe4`@rNbby5?bb&C=!oS z*dlX{VAudI{!Fg4jFgzvDIHh5r$_YsOwM|xu_6f4wzV{nw%_KDr)@rz+mQpVDc}AD zCX4mYy!tk?tT{B#ksOfU{a5RfN2A{i()O0QyE1>H&W?2{ukBqwI_)CWQs{mhy^x|F z)|J?O%}b{LoCRw(M7mN}h88UhW9eRhOQeav(7XrGxJmURw1igZ@SJ;AUm4cf;L%T~ zNkNnBj3bR(&FnOCYaUE|7*hc+W|WeVoGij(extg})YHLmIvB8>a`t|JnM z2fdB(Hr9N!d~lq_2v+1pr#gv>@b)lt5Tt*YB%8{^Nu~7W1AG zq{bRU)#R#EF9KzuF`VI{Sm!B*EcYWTkX6@-q4N2;DWiD#k8Go2tvR^3#gDRd`sJ!ljcWyEY4YC7#>pYMic-+-MvqWmj zr2tUolaViXELTB8{Dkr9kvV?Wk~8~mmK*)Y==SL3)S#>Ar3{?HIIvaQU2b?`@&TZi zJ=)%5t0t{XThuqidG~He$-EiZCFth6cL!$vU(ff#JYdwh!^*`|c}5W~vAb$H}hWTq{%VWEL-;neq}^H4qt zjY8ZyE+m68|Hw=pN>ETBZvi|?PZ|NDB}tPw!qv8 zE^~m%WHS*al4eV@tXPm<pL?Wrkyis3mP6wx!ITWXdv|Il8X|6u@ZYm_&mf5KAg`CuZtk!n#%V9z zGN=XJiY4;J=n;qOhv134n&XFt^;f0`zH%909Waw@%2buK6IFs+;1Vf^Nsd{NIJ@?QWYvzdM zxrf(Q1l2pJuX$mhcOdOedGPfMWRarXuYNRirNDLYHgo2wtLwL~#^cwmeWkbTE1k4= zao2guD}tzn&&wHtcEFihm&LQuv#X`J26WF~tk*j++Ml{ocIh8K#9NkyFxEMVlj{A| zxk3OqX%{)%X09%bGez97fr6+k=dSGy{xkX zU|{)hld diff --git a/data/images/toolbar/bluecurve/xlarge/rules.gif b/data/images/toolbar/bluecurve/xlarge/rules.gif index fc9e37d0ac16964aed0611ce2dd609e81b75afca..7069af7e98d9a840010c7f5e6849ba9b076d4b45 100644 GIT binary patch delta 1492 zcma*h|5K880KoCj^Pms-00M%FMhQa75RC%Vv@h^PDwaiRMmO`MxW<|lmd)i=Jb?+CC}AK zfCRj+A*(3e-Q63a(e;Uj~VY|1|}5N}*h56%_A04=r^53(a$;!Xl>uUg&Is zMU>%P1qs3MvP^`Hz|KElo(cT#cz*{#D0mCRpTwsHK$-$igE$$dU7Z#ZQ`-mMu+F`E}s{4C-YE*3ls=BAmum406Ax7@|t|sGdr~ShUQGrlMhif=HP* zxVG4`KEV-_+8wUT2llj8LWx^>yStTlV9r3D@>)gZT`aGwgHu@!&6rPo500HC}oX*PV%~nY3<4Ot& zjX8Nuxz)xYk-=2R4=(>|jn5TxIFa zCBm|bkQ1m%u6uTE;;K0?$;G&kd}m6hTDKotmHOTOF%ZABBJ{y-b?f@()x71Gn%THOVO*7**cS0ybpi71*1yIhTaSo6=deJ#o#AXW>$<8+fUs8O+{r zl3;Q-@lfF{1#A9A;uxA`kY*AaCR);B+cU5XHm&`w&lKIY)+5>GuGLT_MPtfjYWq>B z1~<;G;1=RFdt!d$wsoh537JSl)8a;D+$*{!y((zuyyDye(jl!Rh8tC>g@`~b>j~K< zBzQL-EokUxr)j2~8rqS4^*!?Jk5(1u8%ep1qIVD1)di0DgBs9xbUXQ(?8B0_;ABmZ z8ZEXcIrXPBorE%@o0An@i*K=(8l<1f8-ucQkT)8wF~DE+|8R&0*XUn#%jZnGzw9=3ylMNynKyF{pZETyse ztR*qSjgNc#KQu9xenB~CF>mv6MynH$qBqdF2;VKWOz3XtyIkoz96D$9B)lzY!I7!f z*UCnpvR~+uF*D^aU4_)S9C5jVWn8-T#;hxcN2{;Q9BQV^?BlIS{O7A0Q1s!*&17sV zdqw3*y~zNU$NzE|^d%)q1eSm+=X_le11|1f&KPI*4Wc)=JX8GSBBX|Bcx3&i0J^aZ zTQ--uJo=1aP{r(cl6_tFlb4%Ah*A~zK+k2K#g59?E+yM`KJ%Lmi_~hl5bGH|$V>Oqc3GJqc5dE!BaJF~&-%E$T$J zb&VUgM7R|^lwDQOk8mnLTIonB)nIh7NPn4US264ZYp|e=2BItmGF^Xd7!99nsa);8 zSzSschZcwjMEN{&%03Z~s#OVKpEYt~Eb#s~jovegPv161t@C$Ba=2B!ei-~L%%bTX z=Czvoz37`oQS9P9i2*UF$?y=3d_z`}u<-NaAfbdu+I(6^SfRy8`8o?}N4+x_zdFq7 zf|f{h5j8uxP)ff77Y4it%Ter?O}(S=#XM4h23{k3tQHO7S*Q|7ks3HpVh(|g=BNeP zaH-x`*Xix#b?^ua%W=TcbcX7AQZiHE3Aw$FM9hySL|nsW!piHSyp|ASus-yGaZftn Y5;oykeD*+NT2kLld)XZ>1cB850ALa}r2qf` delta 1527 zcmVFtlY0Rz10o_Klc)hd1Kze0lji|E111UrlOqBu1EPu!lT89Y z171=JlZ*l?e_jFt+J0Ux4gyX}1{ekcva+(qE&}@I7Rovbwk{6ZN*0153T|$0Dgpw& zwzBTVzUIENehLEr|NkNR1OW;F{{Soi0000m05AXm2>t;72^>hUpuvL(6DnNDu%W|; z5F<*QNU@^Dix@LTL=a*a007x&G`M3Bfrkbt8z4Z?e*hPaY#)b-eB}_A6c9|rgbF2q zhYTFqaGA>%&k!UA3^onWumb=mD%6;XF)>S&f(8s5_{zCc=T4rr^stGdXacw-yhgqG z03%U{Y(!>BWhUv_IIIe*b)rX)KrH~ZY7u}(<5n9?%MznfQEI|D7*ASoD0B-ZfDsf{ z=~6&5e_<_pVq}<`#){RAb>b>;fWuCN>sa56s8DyTRgWH$E0h~{BO8S*Ma(5ckVhwu z(yTINyP uX-wqp;{J8#J6Sh%=FNr1$Utm!#w`vkz`|-!dg3zv+|IwOobNPlVJh} z&YGf9#l98$#R2|y?TZRCo$6Nhs2XEwrfC z0(V-pP)H8zY;(yN2qY8&2%&h=z!X2c2Vx6PkfX{6ssQrFD7;{jNEr{%^5B0W-hu-& zdB~E`4KjoR!a5Dm!U2(md{M zfAHRIJrsgQ4XXH{0Ut4>6oM&0baO!gWKP)~2WSkF&JPN$=*bOIawj4!;Rpc;ANd^A zKsDlAFlHeihFF0I04#Jz6N5}s$ZevAGtC+PNOY6X52mE?M>tacr$ilmFw_VQXsp_u zodx7z3Zn}Bunr9KGhe?c9gwot(Xf0%>ULN{PwoeIXhafks14Dc;N z=De`R6Rnuh0;Lz2@(>b6e1pmaZhU}l7c?wH13uQMgUK;Zd~pQ{0Xr1J5h9>c4=<`T zgKonK(GY|&Dtz+|7?_;Gh;R-y5J)UWsB;cEWLzw;D!kOQOvK=f;sP!YH2|?}e@U3@ zvO+ZIFb6or+;a~*=e&^3Lm@zO&oU}#?E;E2*?if3NG)=VMzfGfEuB01Q2j~LQY-N&m+Ag@Wd0r1ak#9u+Sh= z10hVY#{u!M8 zw3Uw~m_QN{DBeNxKn*FB!+D3YQ#kr32X+|EXt9We9iGr1GnF7D6rhGE{#KA$FaryN z=l}-YSBMIr;Q_(018j^In_@g+JO0Be!!Wv0js>iu5>+$EAf}RsVaNi58LWUJ3W$ng z%tjrGNJe+u7mjRrfE5TBf5S7Jv5w7kf(dcRM>aA6#qMz781w;$S-^3QcMaQF8yt{|$q)kovM9|DXs`ljSfPvx z8H6At(TO+&W(tI8T?;00j6)nk7{d4fFobakbiknlQ)t2nYJr0Ye~h7%R)E0T6ygC+ zIDs0MFabT(K!7O(>K9c&mo)!{4J0&S2x4FYT{PoKE8u`l3PC_M5V3+;NJ0|=fWja? zasqv5;GN3Y!6D5-gF%dd02DZ2K^AnO3lvC$6Vqde2V6n}8sI`D0(pfjWU&%(4n!8^ daEV6%Km&7tO(Pi14X8#p%F&K`)F1%?06U-CY32X` diff --git a/data/images/toolbar/bluecurve/xlarge/save.gif b/data/images/toolbar/bluecurve/xlarge/save.gif index 9315de2b9898a7d1bee3aa65f1a082a877e5fa8c..88757b93a2f8768c604e28ae8ca3d64d45044d3b 100644 GIT binary patch delta 1453 zcmcK0i&N4E0KoAd4-sEPifC%S@PTBBNS0;}2oaSC%vW5Q+RHJ|lALbjxgxPLwo{lZ&WrOzys@Y zheQaE$CGE`-N(kp6sn$5vA(OTUtHP3>P@Iwn+L^`4RK-%5 z%;ZwF##F5`Db%Bp(aE|d6NQ$anWKu1JuQ~?SS)jiOdcBTU#aNlm$u0&dyDv*B7O@q zneXh3rcjub)%~%QOaubm)4LcH6v^Qf&CJYnby*ZDlM(?AcGl?3JbsI=X-uUaP2=#m z`CKIn91+~sHS^}phsbCSm)C?w2W94{b53iL(_|`jZw^v<3;>1$T5IHhq2JaW039T7XNPY$ z#8+SSpy|y`RX*pEVy_<^X}k8|P*Mx^qDm^+AuASIp}VX}5Pwz~v-2=`kc3vEAN9 zCfEv;6}Jtqlv&JAjl`IM>V50G;M-~>^yQ1s&QjtgoL@{Ef?$hA-gCGBhsBYbpn&4Mhe z5X*{a`)<)D)b;0SRc-^hJEsgq_Z8u&7WNRHAUi)4`Nseo6dI@*UOJBwaIlR~4@CF? zJ{&jsFtYxJwkq;_{M4+}3JUqFHY5K|U_?S`RFc=&tsLWzRoAe_{Is?Z(4{P)sFC7z zGU7qlw=;deR+i9$4eC-@v}43L$tBqD?uPSl&~Ft%^_43i>p!(;nJYAf7m_l95%^~wKspVU-cA*>P)z4 zhNPb;*jO9v9&Q$udvKezVi%^>&x)_@$$sd4&x0}uIU7nC@sDLJ9>7$^)Tg^ohWBeO z#u%x4=7@Z)Q%-Xp8G;{_--%AY{A_f#^%6Vk*o-|E?Y z1^3Gx<&R)QW!76*z;sUgqn-?-WLFP7n}Hal$_db^j=a__hhpUEVTS2ti#v~4z#x(? zi6w*!C=7MItx3^9j`XPJYRaak774jd2f8gCqwm?Rrj`yxK^rqdz9T z+Rv(sap|NJ7!F~LzP+$#OJ*PhzD4lZ#%J}!9P7Q}{dgT#*GT#do}0`rx7k=fE`&R> zgeuv1Saqmii3gaU$G0xyg>3iX>8m{~Yo?#2pXM9rF`%RCkE8n@foH3349l-aiE{{R6Y BOGN+x delta 1423 zcmV;A1#tTJ4)+cVM@dFFIbkpWFaYO~3rY!QW_EINay~*@kytP%QdV}(&d!pSx_*MH zijJzbw!(snu5xyYYHD&WE;`cE(oR-}4h{~Hplk`&+TKb|eu|Q|lMew!19p0%lT-mM z13p4>lYs#tA!=@(f`+=**4|1^auyaMiju;5ezJy&zIJ+^c6zQ-T8fjs0UivRp1!uW z){>USmY&L!;Q=Qb5)vAoqSA7DuA-*SmYT{|T5@V`YF1iyPEJmf8Uiy{K0aEqw%Sfo zg7WhAHac3Orq*h5rWO_^USgVJW}Z@3hL)PXl9tM1YMwSWI$ma)o~G7nZlX#~b`laE zmYU8!LS|-eqEcFpPEu~3qRI{q8p6WHa(14Rj{+fo|NsC0|NsC0|NsC0|NsC0|NkNR z1OW;F{{Soi0000m05AXm2>t;72^>hUpuvL(6DnNDu%W|;5F<*QNU@?r0aP+-+{m$` zM~n@Y8+RZ3X1Qo@m;QkE=rP$5Vuch)Ab~DK{_zJkGX4_?J?HFEfiNYW$m4Sq zS}3Fh8Y-a#HZdwx4n45AFwZ=LFxT9K=m9C+l~``L z0gP#+fuuqn$Wu%-b@srYihM>V!J2-528zu%=%5qlBh5s^NGi67CZUSz0qEzIZ%&Fw zk{&z~iWZD8!o+C)q*3r=kU@?rL7Z7(w&m1AY-%5%)B!MGt4Bh4G`L3kun7Ev}|t? zR#=hOGu7DU78`s}!A&|x$nryfIE84FM9R%{pa~)T!aNBQZ0&H%473>Gsa@54!3Qiy z+#!Y;+k}(E{vk=OVvPx!6v1>RXCpzxT@H|Oha6P~IY0@)+)=j~NoWJf5lLPVhzU9{ z?Q~vztx3Wfkhq|S9tWU)zyZlbFoHH-o8k2ld@lq?8EF8b*VzCQk@^9D#~|{}8B>@t z#qm?rz(xaEeB&0f+_s_g?@B3{ZfUlwgLs&18B5LBT!vl0EkDuK*#y$0i6-fDc&k z3tza!1_DUGSeQX_B|+eBK;U2xfj!{~y1?KU*sy_PkN|@Nh+#4YaDpq8f-gugLpn;5 z4iSzJ1z20K1ONaa!vQ4Yh{;Gn3f`c^reqc78GYhMFHb0`3#Uo!S@_looePR9^Fc@+W3prhk5u Q6E&;S4c diff --git a/data/images/toolbar/bluecurve/xlarge/undo.gif b/data/images/toolbar/bluecurve/xlarge/undo.gif index 0686390dc8a9b1c1696aa0100838c60471c6ec63..05b2c5a7fe715f99bfb0833d3c3fa95fa58f0f45 100644 GIT binary patch delta 403 zcmdnNwS$Y>-P6s&GSPs+fZ_W_?hB0d3-P6s&GSPs+fZ_Q@?hB0d{|6QfwEbS>cwg}+3nLf9e+C@}AOHm=1IIsx z|C5!O|1kZFn5@W>&iH?FCySHVPk#1Rl@A9aly-48C<>}fc%s0(<0t>*hb*?t;?ol* IE3%3M08i;p_W%F@ diff --git a/data/images/toolbar/crystal/large/autodrop.gif b/data/images/toolbar/crystal/large/autodrop.gif index 84ca821597becd945b10b75a8c1059ee563dc305..27316fb6db4ed2c0a664461cdbeb1312b04a5aee 100644 GIT binary patch delta 714 zcmV;*0yX`R2#^R1M@dFFIbk3GAOQA}3rvw(Mvtk3itcwsA@g zXk1PI+YiWc90@N`8wZ}C1!`(ULIo0HujT3Y_0y1W^asyC?=j z;zX6Boha`H6hsLH7hqbLI5`5KAOS=i01)w{3xz-=b-J{GR{}~7H3b0_K$HN0qy`j9 z2#jFEhMN--?vO!4AtQhe3l3ov;^S9?9AwDsaPy|he-;A<3b+&^w z6eo0`K%qrTgMvgmBski^C6Nv3X6UFIP+)_s4>}yV)zzh%bnpM*84&0M3Xu*E9u#@7 zmP1>Y3*b^M>!dE3A$f}wiL~Kw#w>!XGNB8FOpY@J7Ar2&p;f18062V`s%5S~C>AdV zI1(wre+CX5_An_?LTHiEaw(_&@dJ$#A`dh$F*F1K=ys!3SQ{cw>%BBq1Onc8swDZ5?!Apa&2@kPrk6a+m>! z7j*D|ffPWb;X)7;9I}Q0Zt!$MmoBVeLL75sP(ztHR*}XHG(d2`gN7W?!vJA8;6NF8 wEIe@l2NztB02^V10YVdHw2{YaFdkyS0m$%C>Pz4QO0V|JxJ)|NkNR1O*fTe*i210000W03ZMW2mgS7f`f#GhKGoU z3sVgrMn(!pTN8!fTRW# zObCpC14kSb684x`Lm?vo4+{=qBm(4DgB@nf^oS$pN*4nL3b-Uf1yz(8c<+^tPeaSxz*KWn{@C0;297IMT!v*4;~zO zu(m^6mkZ!hEeoZtnId_Q9Err?Z^kWxt2&`8#mo*h1r{ql;-OWiX#hHWo62RbKq(e4 z2S^er0f!D9{x~sVLg;^y(Q+xL4iaPy6C)2cI5AWN0OWU)DO*+(BtQTrOd1%8ZO8zC zDaZ*MzTEsdlR6X$?fy-uALc7!8Za3FbM)H`wWnYh1xzqrBJ{05LKRiGAi{qdB>Gl|78M|%0|PYt zz<~jX6fwgHUU)%97IL6~g%x!$F#!l*)Ocf#O)McGA$pY218p97WZ;JoLX00000 zAOIi$00sZxCq`sxo{6Zg?C893%pi&pS#9pdaRJei0V1ViMR>f~#S?)9G{w~s3G+Re zjw>|!nNnY~$rSPAdcQNp0J2d?7L@3jY84RfctUZG^dT;85f~T^00%mJJOu@R6BU00 zkQj!DUosFE5&{Aw8Iw7QNmm^mnwp+1pfC(q9ug9x9UP}dl@6;D6CSOuZ?jUBs}Bmp zy1Np-Dxg0P%)`XG2FN=+5Y-5OfX>CzU41^*f6lnL+xWCq-a&i<7g91iw+{z`3LQ$cXizRllYR&R06Vd)mWcoW delta 460 zcmZ3*JdK6h-P6s&GEsp+f#K>z?y&lM_uikl`sUotH@i;ts=~GGGuXZ>3tZn3GU7jB-T+ESQQ&%6%#VjDrCB!XK*j`e`#4>#bOX}o|I1ceX zK?w<72KJ~qF|4ffg+-Y+NGw}XA0!|y#KhzxxjAxWX1Sc)u3h!}d=CWhlq(1c9hQ?l zp0<_mw6L(k*>nAui?*KT=X!kWw$MGV1M&QC9zVIo_98k);48=c1@E4Is+}A6ZT_9a z!^iqBud082qfQ4?BYcHlA~A`7RRlrsK>b z&mN`lOGc3mjlMIa+^3Zk2w5baFrH&%YxnY{aq_-G)lR2Bl~Yu_jal2i#bkv%54L33 dly&#iR_*-)?1#E!y|?8=*kxR9<6vU21^@@io_PQO diff --git a/data/images/toolbar/crystal/large/open.gif b/data/images/toolbar/crystal/large/open.gif index 81adb77f852d8de61ca2e9c38737f6528535fdea..fb46d786e870513b7d244ca6c230bd143f2de969 100644 GIT binary patch delta 259 zcmeC+=-}XX_jI$cOjKY{VEDF?JA={b%>Sxsm+swr5uCFrcE*GAU;hh69AW?i#h)y! zA`Ep5Iv^fM0|Wd2hPtName#iRj?S*`o>n`fGhjm9f61%;)B@ z$!biBEDt0(k4*Mva$sbh+{2{BSTuP%lc7(IN%6xy3?;pKYL}KM$}VMZ4ou6qaAPsE zK?g@U*YSr!%lvZL%};sUzZ=ot7M|wtVWU%I=L2iSxQx!`g+Ik#nCCe(ILJ20o~YZD z|6;NUvx%Imd`iZZBVwy}Jam(*{LsK6_i z|NkNR1O*fTe*i210000W03ZMW2mgS7f`f#GhKGoWii?beJ~CsCl7Ex60Y(9Rll%c9 z2zzL+gmz5X){`azAq3lc)nO J0pOF@12KtqY#0Cl diff --git a/data/images/toolbar/crystal/large/pause.gif b/data/images/toolbar/crystal/large/pause.gif index 8c3d83a7544e9af09da5ec40314efb6f53c3c482..7f4956c7888d4431014603ac1adc5d5147e34cea 100644 GIT binary patch delta 210 zcmV;@04@Ka2fP9dM@dFFIbk3GAOQ3LkqmTyxgaEtWNDsgs;+G7zHlthbZx6Z9t1fc z_JCc^1xO?ihQh!HDI$YU7{$Na=7NJ@q!;PX;kIP#P(dWY4!H$eqF|FZs7}(&JV7G(hk{z9Z&2t9 zwC|ub)Wx+^x;PgXm*Bl^k_!?<7eoHQ$NA1V_eWY*Q#Vd2Q20;*Ayg<7DwT?17?x!@ zj??XSUDxgPdV|4WG#X7NlOPD@^LZGCQ53-+ukxpY5U5ZUdmO{67hli#qOe+XVM{#_O6?(z z@Z)Cv`b;R%bWv>~9+5yNv64rKZW1~cN?wLXxTGW7iZZKHXzj7LvWgF4cl0}#K%}6X z{JyNq%aP*jv4nx;&h=xikVMe6U&6?wO7ZD}a6wAZvk7K`I&%mYq;pmLWjO#QzK{@E i8_Md^C*>j?;`D@zEVJH9xO|)c+Pu6<`oaAQ4!!_he4C{J diff --git a/data/images/toolbar/crystal/large/quit.gif b/data/images/toolbar/crystal/large/quit.gif index 0e57a7473caafdceef5eef9ab9f4defc008e60fa..e150e724b7bca275dc24bce5312b3b51d054a65c 100644 GIT binary patch delta 370 zcmV-&0ge8R2aN{{M@dFFIbk3GAOQA}3!4+)9v-|Hd=n3gI5DM1X+6p|{8Zyt(M~goR zEa({{F&gOZEE+K*8SmlHf{R8S3H&@G|1ntb8z}D|kAVp$h&$rJK$9^76%vl*fYG32 zNp%`A)TohBV+IR0lUM>QJ2#wej2d-F2%`&NAQ(%QtOlo0xeoOT76y^GaO&S8fZ#NP z1hq5S9tn%1uU{NO=xVi#cL;#CFA^)plfMEW0XUQ30wgz&(9i)yh;tz*MzDBJT?lOy z)Po!k5b_9x&Jd@Y~96doAIMxsf*4o+% zKH3^G&(TSXK?yAA86z2_}e3;=zEE zF#;75lIVcZpkzsP8Zp?gkx^p?3pbNk0xUZ?oNkO7wMYn~3t%7^OO~t#r%<^L^$He- zk+*Q_-y(qEG=l`SGub8yo1?Ga97O19wTrh1fVM9ZE6$U@0w4i7li&g*H`*GfDlRE<$ a5+D%wC4yiDJt$>iQb$Bc$%IFfW&f`f#GhKGoWii?bmj*pO$l9P%sU28xgnwm~cJ(4gELrhC-MyEz5 zUZYWCk2+;#AQ=+1wzgAWW>1Yg1Xx=r!o$SE2^SF_m0|>FG6pdh7dbIE7}wYsDrPif zi4X)LWhW;HELsQ?Cw~zs74Gji1SBwrN8~3vX%9aI1wjREgseLdreMJqCtMhMLWBqc zDnEiOpf?D{1`RU^P(Z>F2?ZitHWWg@Aj^XSA`?}~Sfgc28!Q$Sx}wA%#f2U`Na4U> z0F<9lidYFCC8q~9ZWhQy^rVB+rvyew9Wmgk)kY;c6luVEPntY z`2+%XCN68wYIiYU}#W{JOo)>D8j?U!U-1<9+hMSYBB~f7Z*7( zHyGF07%FHqW{D64B4;Nj2rOF&6MrWWDHZPTI0PgxhezZmJ8KU=1qDF`Z-lHnFs5L^ z7AIU7fD2v9)65eWq%T{aX#z(C7`0wNPx$ylRhOB*Z}6vCp! zAH{_pJWS!hU_g|gQHop%FeRr4HgFcmLQ1Su(cdLJnSF`6A~qJERt0VxlA8`Os*xNZ$B=;(bQAbpb$0xmN5Ox%d( zOsoThya2e;LW719JTR)I}-a;127D3BFukWuR&LN-Hpa1{= zA^8La6aaq!EC2ui03ZM$000O7fPaF6goTEOh=&DCby<#CD0FFwlz&=Y5CEDN7n+)E za+QT69uN>Q1Su(ddmkwTF`6A~qJNXu0VxlB8`Os*xNZ$B=;(eRAbyh%0xmN7Ox%d( zOsoThya2e;LW719JTR){W3r{mHUK*K5L5u-ju|+esKi)B1J0i_kPL}c?~`u=N&$nD zx&kFwdQt-nxFWS4$|?&G22dIWfD8k2H@G-QPwp0?VVKFC8$gB3N4XFef^p89+E2irEe$(ozzg+KoCNcTemw^c~H;L$?svL!RZ*UL?6h}-pILy$%^qqwZn zv<26dT3t0BbGW<-Xmp%dTDnfhQ0Q>Cr^Vw1GfXm>5AWd9t`BVqaQ2wiEn$(oLvp)v zdXI&A+_3|RPECC(&6{*i8ZK_S%oTS;aK`5?O$=3fc0M<(lvtP?)!mvboTjarE-QLU zZsFy$JH2ZQ{uj3_P|!FeWXSjF)!o_CJG=`6mK?a7rQ*WmnC#|Jad5}R$Kpo+{xt}t z7{nazaIc9tymNCp-=uoY=zTRi{F0Pof>y`nCd?5MU(Cs@QJd5tzP#jyBvs z(D61?vMcU>Cy>s;cv0zD_s`GIMFU*V z|MQk$2<1q8VCdBN_xJaW9Rd%T_Wu`5!5RRkMGIg6 delta 677 zcmV;W0$Tmk2h#@`M@dFFIbk3GAOPk70F3|u@2;-YQc{^SGm#eg1DOB-lMewL0-2eU zDgiKm%ri6PARz9Oll5$D`M0pW`0000W03ZMW2mgS1f`f#GhKGoVTPPA{jwoA+l7dlLK1`S-nwnHW8Iy(*4wyPe zLMJCNM>?84C7_f(1_nntDp9z(I6pNc4Q!u(l3fl4A7?B}OD;qjP62kwOLZ#^7jTJD z#Ap#oNp>0mK;q&kZ{0i$)xn0cM;xfsu82vM@O!1B^*JVC`N`rLY6ET z9u~?X!2@R;j;(P2b%>}SNCJ~G5Ay2Wo41HdaZ#qg-FifX0zqa-On||-v11rB{sM_2 zWH4OAh)IBO!@0BP4w5NbzI-@O;v-&vQmbBlVBC@yqX`2jje^7x8@O}pt}yNef#1M^ z>i|GE&lVCobmI=r8%UDi&r5ZV_q-1>sUgjQR8D7f?mdUJMxk zRtRP2L1KaZ`}ehs81VwXe-Rvjlt&2-tl(K^P(T0}0ta#?#cYSL(LfCdRA}LJ9Q0UV zp@mui5Z)mfT(CnEj|ox0I3YaN0RRCe0*8nl@MQrDNkqU`3oJq~Nd{HyFvJ=m1S#Z@ zK0M)}fQevXgfIw0V6Z_NWTmk|3Py5J8Z3fj(1sEsbSVM=V0vf;l33=EKm`h0d2 zJ^%z(M~M`IhG3BR@PSFLT-h?F%a;%c5h+r3;D|`##w-qGk|e>yk`5hdLgeLfxMmHQ zk%h{L$-;qy%9SmLiKCJy56CqYjs(F;NR9!NDfP6Zf1`$l04fS*9!+Yc0neDU82mcW3b0{|EjL=g@- z=-Fox);J+0XIS#YKNA}CSV#k9gp$FO5mb4>1#wI;!3Gv>E;j!#3?5LbUI?^op|P{Cm(?T06TY)`iuYo delta 646 zcmV;10(t%72jT|{M@dFFIbk3GAOPl(3t|IiW|@&~NCReOnUS@S1GUB0lSKhMfB*mg zA^8La6aaq!EC2ui03ZM$000O7fPaF6goTEOh>41ejE#vxFJY2eT4^ycXJ=PeZ*L}_ zE-nozh(cgs1PcogtPrZNu&+2A4Tly4BO|IFQ$ZN9zzc0{XDo(cQmm>41AcnJu|z~P z2!=*ZB_*nJT~;m7uq|ji#)VoVe`I8;7-)A(;IC+UCgp@EBL)VlXj>oJ@C)=va8Yki zni2*+00f4I2^E5dVwCvs!AY)M*)pcfmr#fiDpY#th*$#0EDmOtEZM{I&K+q)*-&S3y8NsD#A^3?3;`oFIWvMTQI?J{}|pk>!h_ zHy`@+QKdwLh`&ypuqurB!Gk;@LZon9Xa^3K3)oo3Jh%$y#Gmtc@dAf5Aro5|++owC z$(S(#g5MZkqXvrOD1^+ee{IMFhdV962u9-CPUqM{Acc9+p@WJQ&CRrsgGYuP>z-%K z2>#-Q5hIksbpLM1#S%GIr1<_VoOto$muT_B4^V(thzkr@p@(3E8FpPBCukQ2B?A^{ zNDl{O1;KDP6ldIVW!NC14RzF!1_czXVIUz~5HV8~59T3+1r~(yTptRS#DJm$02ngF z5e_-%*=G^fI3XozSQ14)6dLqcNCRhtlEIV_RC&P#bWAY81{;vzB@8e)-~bO!7Lq~{ gEIgs6nnkqfW)TR)DJKAQI%4OYc;>0+AAtY>JM$I>8~^|S diff --git a/data/images/toolbar/crystal/large/statistics.gif b/data/images/toolbar/crystal/large/statistics.gif index d3237d552a5ae38fd31eab0380659a714a87c4df..c66cd82c91c05bf7b29df0991027e57f3d5b270e 100644 GIT binary patch delta 765 zcmVobj<4aRGk-0000003rDV1rz{& z04x9i001BWAOHXd|A2migM@{IG8hLMhK!AcGHZ7lL<5t)8t zI;g3rYimSIudf?-7+IKX0l2xjIYb*R6t0vSmvQ2!MrbFlS^*IVax* z=myT4k3=S9hOC*#ib<3zKPXkIW5|IPSGJg#I<#g75l4S@O6kFs>yQ*kkhGXem1Z;y zHz;JqxV3AKAua!)K)fZrGa5m$l(Y0-8(n7~+%7Z?L_3i6TT zz?~DA4;*j+h0kGW54bQM&BaTN8SXUP`657xk`k~5l;~o3j-A_FM2}`%!3zmeD1Nkd z{TlX>BT0V}IJk{F%mfe6qk910!_A%H#7i7M4#!RcJ4wQG3F92Pi}Nl382IspcyaAV z;K+v)CA@g@&V>j$Ki$A}_poUC z3NE;x3m!aZzyS@o7N8A0u%MrXQ^e847e{co-~@mCg$Use*_BWR4;i2*#1d0QgO{8GP z2oPOldIJe@ynw~0pkmR73M>TCXbm0AkPR6=fI#U5u%_XK0$|i?tF3a>plb~Zh@t95 vf<*8J2RIaqgB)@UpzN~D4seD71E4X34=8Dpg%1W~tL?Vja+`%afdBwI{xCRa delta 765 zcmVoblGqudxP?j+ldG8we?UpG9~?5}AKw zJE*CsY-~kMudf_<8CsZa0l2xjIz=2@zrZI5Xk$B!w_yg#%gVe>Cv?%#4qzSubG3!Z z6(d*P-&aHluXJwaZhzDsPjhLcgF69FK4kRu^lalz9Ovj@RY76KWD^802#bRV5#r;( z(1AGz)T;O}Fz3f5f&r!^+$fGA2Zs+I<%&T5l3}S@qfXUD-jh*lDL>km1eXI zI4WetxV5VfA};@;MDaovTC@aq_LRV}Hf2UQfZ-eo5qH7^Y0-ERFrO#n$5V|lP-Q|l78tyjW0V80^5)-fmnDAnl&Yjy`M2}`{;Y$fpDS)(g z{TenBBuW%KxPOgX422KSqkjPK;|-qS#7!JO9_NmNJ4(WL5#t>Ci}No48~_4_cyaAW z;>eF9CA@g@&W8*+KmEXU_poUAjbiJlu?BfPN;AO z2@zz9Ls|)Pz>vkKpl0F63M~lHs0|*_kWCpsgg_|I2RRg*!yI!EpzN~D5`e}61f)U34=8D(#SaH$tL?Vja;t?qfdBwIFSk1m diff --git a/data/images/toolbar/crystal/large/undo.gif b/data/images/toolbar/crystal/large/undo.gif index 15558dbabd1f2e7c3a6333be2d614be69c4caf85..2d6a622b2fcb653d4c90f7638203448870dc7728 100644 GIT binary patch delta 410 zcmV;L0cHOC1^WdHM@dFFIbk3GAOQA}3zdR{1w$jfj=w4#&Cbpm$H|K~22m5(+1e9M24B;NH!VUx<>u$+3@v}(j4kf(Ef)v# z2NLk^S&Uv;I{i9LGmZ#6^2EWG00H_D05@ns12HZ{z?gUigo%q64fyC_Wuk~g9~@9I zRAt2lA}CR6WT7ZRkrgX+7?QFA#D$wUTdb%-!w?1~Fjp`MaVW=%Ck&D*mEZtCi5EGz zyZ`{e!H^YNj1V{^0*6)uq)L?v0b#&_0}vnvNC2>e$3jG4SS&c0@uaTZyLMXuNMeKn z!$DnetQaz&uwlbOuG)YS;_V_U8>qHGOL<6B8wz+(fbmF5kQ_^>inbx30s;yIq?6$S E8tlTKWdHyG delta 424 zcmV;Z0ayO}1^WdHM@dFFIbk3GAOPl(3zY)^nE;WXT?qhY0DYQ$l(m$S0UIG^nPxhC zI$D-mLcKyvj!e1Axy9SXP@qu0&%UPLp8x;i`9=NzOvb2#nL?{r#!w>~TBfXBlDjdzu&Kk$bi#P^U6WH0>6Hf+Y(}*}NLqO%` z=jIG8f8UHP?(Z!Z2lEFK@a|lUV_ZA^J5Dr^2t)$K!IuC5`Vjy(XhDNBE=0hXs0Dbsnuu;Phh9xjpGzoD? z#|kJ6k}8$p06>WsI>NjF0Kfr}6<&@II3yy6Rs*C;l@0-6z<~o0AO=VPz@*1QL}gek zIG_QguHCzKTL4gUgaX4sVsfk?GN7R3IwW?;Q|^3GpMfs diff --git a/data/images/toolbar/crystal/small/autodrop.gif b/data/images/toolbar/crystal/small/autodrop.gif index 16c18457936236f94cecc3c94c483116162c451d..4b2bbf71b9bfff683b412d1697407e1e09ca5dba 100644 GIT binary patch delta 428 zcmV;d0aO0`1^fjIM@dFFIbjw676A6K3q1iCzP^#z)nM7of2O9to|lcZw6uGBd*iyjFq8KyfvEH|bH z8UPB45kX*XKV3sJdLIV|NfiJ=2Z^0v1zJiHe@7fBHAF!G=~{#qOiV&Ta&|3zQawLA z2>|YIg%0TezRa2u=E4CxKoT&i;J{5EH`vl?h%@VlK@w%2jHyr|hyxcvn2bo5WLBIm zPs)@5vI7qo2MHi$@BlH0$pb0N;MsBJjFk#55`h6@Dh|$-EMairLPP^7LUI&5dy*2! zdQKQd=FADvPtliZDp{VvI;TX57!DPY_yR|Xm@Q{nxCAi6h7B15i!vY(p(e^28FFu= z!O>v=4+x5o6j|Zrg^meM>M&SrgM*GHZ4#YOLFW#dJQyBi0ihzt9RU<*R8d3#%M}v~ WT#)FKAqAE_P&T-E5~_EiKma>Fl9ZPK delta 428 zcmV;d0aO0`1^fjIM@dFFIbjw6769h43q1iInVFfszLD6~VA;%nrl!B1myNWvw0nDd z=H~YyAt{q!0VIF_|NkNR1O*fTe*i210000M02TlM2mgS7f`fw%h7E*?iho*g1xrgp z1yqZQRd6mYERP8l2_BV#a0&-MKNd@vR0$)9iwZ0rraujIvlb%>iyjFq8KyfvEH|bH z8UPB45kX*YKV3sJd>;n~NfiJ=2Z^0v1zJiHM;s_ML_vQ5=~{#qOiV&Tba*X(QawLA z2>|YJg%0TezRa2u=E4CyKoT&i;NZ=lH`vl?m^15#K@w%2jHyr|hyxcvn2bo5WY(N6 zPs)@5vO^CT2MHi$@BlH0$pb0N=-F}RjFk#55`h6@Y7WkoEMairLPP^7LUa^7dy*2! zP8de&)CqLaPtliZDp{VvTBk&b7!DPY_!38nm@Q{nxCAiMrVSYbi!vY(u_g)|8FFu^ z!O>v=4+x5o6j|Zrg^meM?l4$vgM*GHZW5hPVJ8ooJs2Kj0ihyC9sv|+R8d3#%M}v~ WT#)#aAqAE`P&T}I5~_EiKma>9eVW1m diff --git a/data/images/toolbar/crystal/small/new.gif b/data/images/toolbar/crystal/small/new.gif index fa21599382faf9671ae01ada6f63bf02fb0a43bb..e25bc886d8940efb0fcd5163a9e22907358994a5 100644 GIT binary patch delta 208 zcmZ3;w2+D0-P6s&GEs~{jN!{fZsq#h_g=jF@crrY59cr6J8|abmFtg>oVdzBG*JA> z!YaZb#GnJx0Wy?4z07AZenniD;8UR$~9$ag(bSpEBy@mrJLIetu!kMgm%FWMmR zu7`EWV*y@1lkN-5iKkUxY&gc8{HDT&A^t_6po7Z27wOv?BOKm+6#L<^SpOe)rA{?# Y4kKd;M`@EwVlvOfhtiC^6aT6J0Imc_YXATM delta 195 zcmV;!06hPp0-*v6M@dFFIbjw6768PN3nL`=_y618=&Cv)85F;+1cFY-rn!j z*W<;`-o(h&|NsAyQ5%0D`2+tc`SPcYykmu2z7!)VPg$Ii3p5fG&P2Zbd-_o5CIO6{Ui@fTTcK0 diff --git a/data/images/toolbar/crystal/small/open.gif b/data/images/toolbar/crystal/small/open.gif index 7e8b03cc1fda79fe5220f5cfb30e83b1fc589c93..b28dcd102ea6c22d9d0ab804c8dff10c9020034d 100644 GIT binary patch delta 415 zcmey)`kj^A-P6s&GEs~{jN#ivZk>r%P7|A4C!R{1Y|I#5&wv3Gf3mQOFjO(C^T5)*0#FP0xL> z#k|Dj#?7?_Y$g?NqNDkJwkp{2d=35{EWyU)r=%nvlk=yed@*C2Oxl^0lR_#Sa_m-m zKdK+4a>_OdRh)Qm@bR$@AuA6C$H`1>;;L%Xd^(B`9~2jr*QsE5$kIJQBql3np~Jy; zPOYj_cYX-9xX%+xIdMaBrV?{qpGjtwU52p9c?r=P~%h4Wbzr(8}2 yW0Ga@EDozi#iCZGDT4VLP7MqVj_Rj61TQZt?YZupq#e+};yG7-h7v0igEauPB9x2( delta 419 zcmV;U0bKs~1@{FDM@dFFIbjw6769gv3oHXOX3UW{LI!h}<^VIyk$FV}gs%3HzGegA z|NoOD0at(j|NkNR1O*fTe*i210000M02TlM2mgS7f`f#GhKGoWihl)hT3(BW3omtb zagl>>2xVSMW^qV`O#-9>H)wxlD{o$AO0N=-g9AD`etslHKUNlAt*=T}S`@RjxLGb< z7QMep6lPjh#X4OGb<4}Xt~D~-83qDU zBO@4Katw*5qd^89Yu0q>QlvpH*R`DkQ3AonihTn zppb7O<%F0iU_^*`+Ve?-KTSNu00F0pjSvk~zuX|Rp+g5Ye6Y|F)MP*xb7suEp+Y6W zk_B_-+&OSS(1Z!*dI=tEcmd)&c%leWks-2$0+bPRNJ4-BfI%wMoH+xdHI3ItVk=O< Ngo&OZm?8xN06XiHHEi?~Bj$k#6b1420f1YkWCA}5L=AC8ZZkrxpFJ8a)EOaK4? literal 409 zcmZ?wbhEHb6k`x$_{_(^$jB%nBBG?E6c`wonVDHsRMgegHEGhMl`B_n*|O!pfdhB$ z+M5CLMzl)zXEz!E@$eJ+gk z0;0J1oFi0QF`pHTb-@y7>;X##rUnKJkQi$#pUi=s3noY&uzU_Qs`bbvhI6efky1eJ zoMJtN8-ASUTCeyqf{oH!Q07&@$94rM29h;c0^|b4xEjD*hONO2C43+yK<6#0M7`oq7FH1k z7X}>$AONXlVBg%}($w72+ScCD+11_C+oWSHE^RnTTcTUV*iKkZWuA(frWtpK4!=CR z(yG;~*q1DB?=uh&T}nw*wOMw*^8*i6#*%4*mWP zJz{{%S7Qi>g9kfspuosPjUFo^0$Jz?LX8eX3IHJBNRY)H03dW6)F9-@lPFWF925uu EJ0|TNFzEqIa4AbJ%@xyC3nJR~4SgJLK@Utcr01<6aeThbO(l4D2)4=yeNxIE)n6u5um zEzE)=H7)XAI|Uf`TDW2k6B0R4f^;mPL6C-&76er!zy(2qLn}4}<=}##qD2Hkdf;Nw z?;!v|O-lF}Ns__B9bYU%O8zGZuLIyZ5DNRyR zR4FD#4JU`AT`W)@R6DpSEG#l0u#^T_Jue!##<);DBp^qFW+*^oV>7q~$xXOl(iT^e zXh{YSE-nGMJ>y&yxPRj<%z`5|E%IYK1sL~UxMmI$5;;?XbS$7jkVcgj1XU!!1wn#C zEj9$@0E3{SMFc~9;9}A5Apk*7O8gi}lEK0qV>)^iWCh8MmoQb}dO@J3O)VD$iQoV; zCN3B~Up^TiD8!SXH;VM=f%FD|1A=^PAXB7j)e;J1{IFVe$x8)qXhJjqL-L0cTwBV5 zd0OZMh!qwyiJ-Mu27rJ=ZpB2{yJgGX2p#N(I&y_c7!`<-{ zSn%M;PD^1q8-o&!B?r2g4GNyEDQIKl;upWRRa)tQQ|Dsk!oD4XQ>LEL3|%iLadLr9 Tvy}EX4bJYXn${|g3=Gx)HbZh7 delta 394 zcmbQkGKWRj-P6s&GEs~{jNvK+gQ;o3%$a8<3fQovrOli&W$Q#ACuT3No{4?x_5c6> zXMh34pDe5*3^oipAOVn82DbkW^8ze{c-l@ZnWX-KgQfp*(NBfS5YslMu*rU{2L0_1 ze@qEcVp{kl)NhV_`yQU=i&`v!v%{5LMT#5wgv`uTIa%U_1qBV78r3VMB-out`2ns&Y%P>N~NBh-j;>5ULd9HPmp@Hr}sgCaTs{IZsqT(nd*D zjsN_4RTfUuW(k8e>)egBv_w19Odn|}ut+E=2{K6Uu`yCLP_;5v)NbQ>p`@Uov*6Tk zr5eivjgQ;9SU6w3iN4?<-7oe#WyyuY$IN`3s$nJv91ggxi``%ld*i@_N5^_Oq$1WN z1T1Qv#j0(g@z}7zjfqD>BO_vi!%<61QAH<%5{)AVxLHgJo*gMzcCbr8>e^OmBL(KJ m#ma@VZU|19dPXyJy^_Su1v$+!`rkA-yRT|mt2i<+SOWl;Q-Hew diff --git a/data/images/toolbar/crystal/small/statistics.gif b/data/images/toolbar/crystal/small/statistics.gif index 93a490869d1e0424fcdef66b79b099339fa7df0a..4a6c91c71dd45b01f891d9a2ca73156325d35e60 100644 GIT binary patch delta 439 zcmbQkHiwPd-P6s&GEs~{jN#ivZm*3I+>Ddc7**;SU_kLF3#$l2ErSk70Hln8{eMGk zQ*%pmNW5ojSC?oUN0v=ocT=G5v}wXN4%TyQ_yW7Q7#A0zBz}LcAf9GsHXnJ*o0h^Q4mG>^{pwxQFE=r# z3wZdvuHw6^vfIK>;mMU30zZUf%WG;rSbTD0(Y*eA&g^F6oP?DVvv?e=GVby4q%m~K zXh^R~=rmZS%*UU2sAGad!2Hh1tR_V=&h1X^(`7prFivf0mStp$d7&f7$Sxylo3O9O zu#t;>jz#G#!_O>y+@jgnN)()@cGR=WnipnW+;rs(zoEai%hIYtT48IQGg=~6FKn1* zn^ajnVe2nfpCCz2sTa9TNse=r9apAplseADJ=d-0%1Nb9$9PpMd6P?1oQ+!?+v+_ttOBhUHtX=r6RU+5qKn0@$Gl!R5P>iIXLWA^# f$4*QF3=9oV@||2icpTrna98Oo=`9M@dFFIbjw6769gv3rYhu(sQv@3jqWF@062Z0VIF_|NkNR1O*fT ze*i210000M02TlM2mgS7f`f#ERbWbmii#Cq2x~oGi-J-vmX;GeK|Gv24pNE=0i&dF zOhF~7C13;!gdhPzEL^l)A51)C54%rl0Y-x^Q(Rqb#%)!0Jbq(i4^RqI41)s(O&~hi zIumw5e!CA(MrhN5189E`Nloi~4&5cYIZq+v)aVfS6JB|Ke(*W+NC+wS=iHlvG;UQjeC_}Z#haER@ZrOjb^bC+OPd!AXioz;Z ztwd^wSi7OXmOf&6eUP;ZW=zr<2^#2il48LeBtfZau{y^>3!O)f+|eQu2aY9sULrv< z_(O#-Pk@*>aKH+MB`NCEkpUSA3KUM3O!z}3Oqd%PGME8Ktf14+H=^%&4Qn diff --git a/data/images/toolbar/crystal/small/undo.gif b/data/images/toolbar/crystal/small/undo.gif index de28996d4868d1af0e0f0d442d2a1f783a510506..6780251e377ab9fa39ce2c7ecaac0cef21b45892 100644 GIT binary patch delta 237 zcmcc4(#g#2?&)S>nJC5}#_)9_cc)PL&Gh|G_Xo@ln16dd`wRB-&(2R=uUO9j28usf zSVb7@7<529kPZg6We)QTJanY`Pb?`qnZs4Qx@9s)v5L-ymFGhCqXIFPmZ_;^Yt891<2cE|lZ<vTyo<)7bz-Owe!~0x!ov61lVxr%>`V@GO7RoI|DEpO#lD@ delta 98 zcmZo?T+cYclCgNAm3$Zz-v>s<3k>oC3^EMt4h#$i3XBp57!!az#sLS%JZTfscV(fsuoO=LEw6h608J#t94w4I&H)3<(=lm}dqtFjxZs*3uJ% diff --git a/data/images/toolbar/default/empty-large/new.gif b/data/images/toolbar/default/empty-large/new.gif index 726649269891b882bafa535f6e0b510f6e525d8c..4d251008d5932ecdd323d9dd4ba30e36037b2bb5 100644 GIT binary patch delta 60 zcmV-C0K@;Y0f_;SIRQ`002Ak#2Q-w delta 102 zcmeBV+{`$^lCgZEm3$O~8iPzjr+fn^2Ln$7GhYIO1OwXvRsk@@2%%UL7+4tEl=T=m s7?>Iu9xz!v;Avn{0Q0yXG$b<=FeCtR17ib2K|u+SrQkd>h=IWx08t7R)&Kwi diff --git a/data/images/toolbar/default/empty-large/open.gif b/data/images/toolbar/default/empty-large/open.gif index 213c32a949c79caa93755cf69d13fed930c4fde0..285a2acfd70f7110f89ed751895078efe675513f 100644 GIT binary patch delta 63 zcmV-F0KosX0gVBWIRR0TIv_Krec+@X@FI_^>1qZWjRGv@ddnkoh6px=&nhHYH714= VEcd(Y5{u)WldJKW)Urnb06Q|u8tec7 delta 103 zcmeBW+{!q?lCg54l|r<71A`hENn|xRpJm{fKdP_48jhMB@QJ4$w1Zy#tlpg!GR16)&SSM7FYlP diff --git a/data/images/toolbar/default/empty-large/quit.gif b/data/images/toolbar/default/empty-large/quit.gif index dd3bed25e191eeae7aab93489f24eff6f1631a95..588d0682be9b9d11e0f845ffb93c86b04b682190 100644 GIT binary patch delta 60 zcmV-C0K@;U0g3^TIRQ?QIv_BO&EbZ=@E7k(1S`PZ!G;`8iUA$6xnVk?%B2xEeQKQ8 S-Ltx^A!t;i2P~5n00280m>HP> delta 97 zcmeBTT+cYclCgNAl|m@*1xAhs4AKn@77Wr1ObHA!42%v9%NP|H*bXoXFt8v588$FV rFfcYS761hq53m(1kYr$sVh~_B5Xju%APi(AFnnNCV7?i^z+epk(2Nrn diff --git a/data/images/toolbar/default/empty-large/redo.gif b/data/images/toolbar/default/empty-large/redo.gif index 8b892e0e8ff3ee769f09a631d6f0d24bae503522..f07c487501e86bc5589857ac3714ea003adf05cd 100644 GIT binary patch delta 62 zcmV-E0KxyX0geHXIRR3UIwCURhwku}?_&fhz@5!d)76N{os)-yPKtqK^y!pPgHov$ Up~NDq*&EmhT~?2>wy6LBJG2rWE&u=k delta 100 zcmeBU+`>4)lCffHI>sRE6@3Et|>H^Evxo7n8>+IIWiHKLr3g`?n*^ delta 130 zcmbQqc!_a>CF8V-R!U_If*%-o8W>y{_!*cR7-X{8XEmm+kj!AbwaCqyfvyOJI;;V9x<^3>Y{X7&ibJ2@C~5nFOGU1~?nUM~D^#6gw0%Bs7Qu#T1OS IgBTdB0rH6)x&QzG diff --git a/data/images/toolbar/default/empty-large/rules.gif b/data/images/toolbar/default/empty-large/rules.gif index 1586582e22c00065d72133aee930c002c7cdd6e5..fa8779c5c57da205df7b2482be712e6dc0ce317d 100644 GIT binary patch delta 64 zcmV-G0Kfmf0gwTZIRR9WIwCaSi@x!JpX>N^JRH$xKt^iH;_sP+0vp3<)X20-s?eu# WH{l+=hi~`6{e6$csq7sp002AvCm>P) delta 110 zcmbQhxQ}syC1cY>E2Sg`o(qf|2N+5iI2srW7+4tEZZ(>%yvWzUtiZs*z}LWVfMEiI z00Z*_Ade}ifzg3cfr0G+qX1AP_W_m$h6IKL2VtOs0w7LcP+)9eC;;;l0*W1!KUW4Z HFjxZs!X_Ad diff --git a/data/images/toolbar/default/empty-large/save.gif b/data/images/toolbar/default/empty-large/save.gif index a489fcb091a404f4cb8a819ddf8acf3b0e016474..82380c660c35a90efabef3bf73f129ae4462144a 100644 GIT binary patch delta 56 zcmV-80LTBJ0fzyQIRQ(NIw34^n|Zn;biM=DD!;`o7(iZv#iTR&>rsF>!_kUSDxX{_ Oq-h2Bz_N0w0029PtrzY9 delta 81 zcmZo?T);TNk}+kXm7*)-oC91sCJ78O3~lqDZf9U&V0U0BU`SwSmp{P3!N3#7zy^|I ha{vk@Ft9f;765td2N(l>Dz0H?c%&}e5yZe?4FEfk6Dj}z diff --git a/data/images/toolbar/default/empty-large/statistics.gif b/data/images/toolbar/default/empty-large/statistics.gif index 949aa4c69b1e28ea6ebfb982885978cfabba2b4e..37063236e77014fcf2c25f79fa10dd363b56b935 100644 GIT binary patch delta 73 zcmV-P0Ji_D0g3?(M@dFFIbkROCIIjNkqj*XPLVnxFL4LCvSYpR!)<~!UGW%<&~`)} f@acmZYs?|E+DksF&aN{Dwk#3gaknT-n+gCs!Mq%0 delta 106 zcmeBTT+PVi?&)S>nW({_#_)l0B9AU({zNOq07eN0=9~tm1O_t(*0T=G5*ci_R4W-Y z7#JHE6Btq$*bXRiaxm~U@E%|=08$JLj2jsE7?=+*STHbwsDz0v3<(Tr3<(a(hdY88 G7_0&0yB8<` diff --git a/data/images/toolbar/default/empty-large/undo.gif b/data/images/toolbar/default/empty-large/undo.gif index 717e2f55376093e4d87eb916cb59c3361fc39d6b..9e3bb0e81a053e9b431c9805476d50b2ac3813d9 100644 GIT binary patch delta 68 zcmV-K0K5Oa0g(ZaIRRCXIv+UDkA2~R&hV7(Qv@YI0}X&fB8|&Qac4Uoq(*10T21bz aR_->-)e^7YtyWA_dcVqOQwA>;002AQ-W+TI delta 112 zcmbQpxR-H)C1c}6EBO=#feDNp42+Tu3=RyE3`_|OEDR0IlQS!V7&salGl4vI2ZjO$ mA0Ush06Wisv4J50s73&a9X_%Y0GSC6nIBXhR|YXKSOWm-k{12| diff --git a/data/images/toolbar/default/large/autodrop.gif b/data/images/toolbar/default/large/autodrop.gif index 8365d49eacf64c0c516c5af40eb2b361dff5d621..ce04e42e0eb53e15b316bbea4f011a21d42251f8 100644 GIT binary patch delta 395 zcmV;60d)SM2lN9BM@dFFIbk3GAOQ3LkqmTy{~#oeBng~Asje&pG*6SHZLI>1vmmtX zySc@o_Yaz4F;E2Zj8Mvzyb|Rgk$Lj z8k%Mx21F(bZhB&bgbZ#Biv|LLf-yOVeTkI}jR7`ghKh=diwg;kK46k*Qg#aqp9~3q z1Ol1~c&7&i1O*4G46C7|B}WBegbD`)0Vf1epuGXj$1Vst(uWEKCq@Ijs%v&zC(+Y~ z3DzV6%iB>=Gf%3zo(cv;0;k(%2M7m400#H@gNY4<01`pq0KHHK2oM;sFvXDp(fUYH zFd%?{12NhWJ9gv-0#C~lp=l?jz_S{5PbhKiVx=*`fs-izfm%s2-JeV`De>A>a|^MG zPUd{tLUJN8C{hdzjI-cWLIY6Jxim=tDZEEU66`33te_c800LCq67P$F0=B3GIKagk pjQ|kwVKvfZL>Vq{=w2&g7Zo|aC{-c&3;2ta!E+1iO3T_j_#7jQ{z?eG z#l^*3E|<^eOQlk!QmIy}wOXy&Z0_&x9~>MU9Ub-i{qcBwc6N4tetvm*$#QP|W&iOU zha^N;2CIpZ7nm*RRG0`whZCAcN-NOPuQA%AZ;KGd$h$x3@kjN0Kyjdp zHWgk85mkp8la&=2sgL;hZ>*cCkX90+Q?BrCk}C` zU;4WVH3BsW%4%ffkaR<_Y=q4zPS@GA^MXr!TWve$Ji@+1HUjO<3pQ=h16&z!OMMP~ zt;@|5&2Z%eDt!5&`HpgHO-d}oHc{8qMUPnb`QC5pJL>6OPJR)3pnm>2%+4hw~>VR@&)FZb)lc9|t&!md+Q-`!|b-2t&iX7^Krw$zx3R~N- z%nbAwx`^mzcDNS{(Cwwt%JQqL*a}C56tld5Ax4tZTW}r8L_?0- zHN(T?S`CRISGN-#W7k%avpykUc8rH)Eh@@d!qE!BCQt&9Y}jZ${Idvnv2tJo`!0I) EAGvj6}9 diff --git a/data/images/toolbar/default/large/new.gif b/data/images/toolbar/default/large/new.gif index 7bac4e04251ba388aa592b675a4b0b1b4342b08c..19275e1dd1ab7fa4bb7986b9d919209bc0c08a29 100644 GIT binary patch delta 456 zcmZ3)vWP{=-P6s&GEsp+f#E9y2L0T~3ck%8_1fhhqV8hm~3jX?q&3~d)OrfgUlwO)uL`NNc|PU$HXK6;gGUGK{4 zrPOx&FFmNXH*NR(<&0VD)&;*WXGy9lO=!qtQEe_MEox6;m6q$S4eIMpVrB90o*FQH zhK8K95HA-S%RJ`=3)7?pdD&Jut(j3ECn3(gS#xW@x|)Kl4DX(O73v3+4)Gt$-F8w< zNlEr>_VJXHCsi-YUyEltpMUG3ii+~RbNg?p)jxajGW%is8@0E}ii#iN_dWTl`uw|9 z#*b&N_htxd+?ZKB{e3eV`yL)OAC5Kic31PtyNN9Spk&9ZXp+$*-X^o5Rr#Hzh^CN| zXV+7SN6{-4o!O>8F#D2Sp0|w6ewL|lPR}vprRS%b<;qD^T}t+t=9#PXK-59qYpTOy qucfnIH?_*H7d;fTz+mB;W|j>86-&7mti8Rx;PEFd7jZ8E25SI;XqOWJ delta 456 zcmZ3)vWP|1-P6s&GEsp+fng~F2WRK(zQ>r@WOsViOt7Yqc zS1zTtyFPFkqx#;o-S1a8X02Nn{JxwesiricA&*6^xumqHJ%v?9zPmQ4uRn>E#lw4Q z!1NiK@-o7F+-xlKoEI!ilM&)$TjjK7MuEJf1kYyst^FG6igL1id-hdm98f+aa4dJ* zNp)pqxwF~FQ%;^#yR2|6p6Pu4t&6IvD)-Lqzoq`{#moBahwX3F->N7neTd)p0FRTyGXz&Gx1|}c!G-=Wvx&*hH0H9!R!K7cD6rL@=5~{VK4JDXN2?q{6py2?TCN>lbNj1f=rW|V6#7&^_K$FJU+d^cm ziUc zV1&^h3xXAku`4T&gnO=U!tAfo+`n>IdjEju)45!>P{@noo3*v-`ue+#jSrifAEo+Z zX(umzc`Y4@jmCDf`T6MR@c8)q$;pq?)6;glO&I&u_+K?eAq$!y80m>Ll30zG&WU6n zNXZm2KsfDU57){te8f1?lT#(g7-GC6pJIgi@y=e$K?>K)@78J;JGI@T4&mFlV$B(q zvH|5X-f01xq;IufIg!LISsM&0^(&Y8YgF)#U7FJMNmqEerD?(B!|E}@C@)2;B{417 zlY2mS7L+VqYkjHqHyN`pWa@^ZiPE`)dyKJ5)BEGZ?C|ms_lk|=*$B^kWh1mNwELU8 zh^)f0S(RhV4{uZb=NGpL1jiItc@0TTWvI z50J|@t2mE|j?kLBBP8EttT+M)%%ap$&#o89X|O8Wat&4-Fa!8rL*Y!zEqX%-UJu}q zZx|*fT2R=y&%J250KB#D{IunGie+=P$fUZqv*k3_Aso-jb^{p!E}Xhl!~ww`6zmsL bSZ~v(u!6^N&;QPD{M-klyaM^bq|uH4%3xjk diff --git a/data/images/toolbar/default/large/pause.gif b/data/images/toolbar/default/large/pause.gif index 8c3d83a7544e9af09da5ec40314efb6f53c3c482..7f4956c7888d4431014603ac1adc5d5147e34cea 100644 GIT binary patch delta 210 zcmV;@04@Ka2fP9dM@dFFIbk3GAOQ3LkqmTyxgaEtWNDsgs;+G7zHlthbZx6Z9t1fc z_JCc^1xO?ihQh!HDI$YU7{$Na=7NJ@q!;PX;kIP#P(dWY4!H$eqF|FZs7}(&JV7G(hk{z9Z&2t9 zwC|ub)Wx+^x;PgXm*Bl^k_!?<7eoHQ$NA1V_eWY*Q#Vd2Q20;*Ayg<7DwT?17?x!@ zj??XSUDxgPdV|4WG#X7NlOPD@^LZGCQ53-+ukxpY5U5ZUdmO{67hli#qOe+XVM{#_O6?(z z@Z)Cv`b;R%bWv>~9+5yNv64rKZW1~cN?wLXxTGW7iZZKHXzj7LvWgF4cl0}#K%}6X z{JyNq%aP*jv4nx;&h=xikVMe6U&6?wO7ZD}a6wAZvk7K`I&%mYq;pmLWjO#QzK{@E i8_Md^C*>j?;`D@zEVJH9xO|)c+Pu6<`oaAQ4!!_he4C{J diff --git a/data/images/toolbar/default/large/quit.gif b/data/images/toolbar/default/large/quit.gif index 1ee09f47d43098a598d79107c0f5b8cdd5d2faa8..829ee56d4bf332e4b90e5e09e073153990b85ad6 100644 GIT binary patch delta 562 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 literal 1142 zcmZ?wbhEHbRA5kG_-e`k1afk6%!+(0nnJ7=;;O2uCMG8A&N5u_8a!FLyj8{m$-24` zHXa@xQBhIeRWa%5>7}KmV(r!fGaQ6hc*tz_Q(oY&wKU9TZ-U|neT3V(~ow{=6%H6wnx1N|e_1MzsS60uzv1#F{ z^$QBal+9{>CI59B_)K=CIFBO`+;gAPa)$WIJx{|-d04O@LR zYb%J7unR^sAWJKbbiAA#&^ILHvNnlT%u4=iUh?Fb{o3ZP0Upkol$-f}c84%F*ph8f1j zzy-AyWTtU(rQRgCT-a(xxSUj?sdS(UrvuDKY-_G&nL>F|4+V=Gbr5Dk-1!fp6lkb) zqy{%kBX0yOL_nT@`(Z|<#uQeVW8fa-g<(#4N+^;G9+LQZD?jOk*d@X>FO|vfO)71{CleZ2;9-Z9Ua#^9gs3nW!u0_ifrvRCfhj8!J49gm zfJqD%OsgfOG=x}p3ymcdRtPU)C`4!k1*`-QF#RSp%n4Z5q4)^l z31HL#!-s)^StZG8u1_D6N)Q9wF;Lf=G8{-Kuuz)N!3?+lDlqEcNfaDfz?=d1?p6f` FYXEOz-+ll9 diff --git a/data/images/toolbar/default/large/rules.gif b/data/images/toolbar/default/large/rules.gif index ee2abcadb92dd636320598d0341963d35caa5b01..7f8ec3c4bd93764c03c6c4d32a2c981f7a1dedf5 100644 GIT binary patch delta 282 zcmV+#0pvG;|>6U zEDqZ320{q405UI?2Lo5Fn8#vZcFO2)fJQQ}C*xxaq9JP;95C~PthYiDu}5EU^^ zNrQh61%6Hh3l9%7KTa?a3XfX>ou7s#9T|zINGAaUrvMxm6brF=mR7F1yl*SF8Nr*w zNx-|v$*mg{4hqfARvZ~>)X4xH8W#_N)jS##a;)M`7Usg}Rc4*-G;6HIAy27o}Vh1K%C2>}8CI|a&Pq5uE@ literal 929 zcmZ?wbhEHbRA5kG_#)2$1OkS>(vEQwZkf_PC31n4DqiUd{^cqG#ir4fTFLzyDU&S| zn=SL_sAVtIEn8w)4mU~VHs5J)l{NR1RR^_|4R z@S*lTdmT)ikzu+c*ccUVK?a5&P($v2XN*Z>H~=z`kztXJf-nPI{hX;VHhY7>78$S_ zkS+#xK`5KO&Oyx48|r{shUu~pae1KO>?!AspxWgpxH1D>^1b!}*p}N{cwpL7_!)tY zhq|0W+!mq?=#qdf1`G^L5SK7aclC!^abWX53xSMONibjjfU7@9KiDVi0uMgf1hOy! zx$*~6Cknxw{=HFNK;ZOekd^WeGB3i#LE*yaV88+rzmRwpCJu5s&_H%jhyc~Y#UDUy z0h96<;Nplt2iXf(j|g;-Y4Q&Wr!EG$2WmLnDE1PmEg%OV8xFR;Li(G)0a&gJfK412E)3YjQJoI67{lo>H$j{ZOM`HGVNrTi z1?WAvA@Ib=a5eJ^EJ}g0@NkiD$e03)37|MqxG)|8`$7?H7HX)&y#aE1D}yxvl64j? diff --git a/data/images/toolbar/default/large/save.gif b/data/images/toolbar/default/large/save.gif index 92c26bb44de74e3f11a0be36af28ccdf2be5464e..ce2d7d403af0f10c9d9fb4bb43ed0963bd1e9e0c 100644 GIT binary patch delta 289 zcmV++0p9+E2IvBiP=Ei>$vJ_gIO`0Qx4rq*TZ>7(!14ayktd3Izq0a^!LYV8xXN-I{~w@VN4OCj*4MIP11I z@C0geJ_-p50f>Ho1Ot0Ch6xCgOo?X$myTqHlQ33@0a5{%34cV7oG4abUpO*s(u>dJRAYiz>#=WIvF%1k1!WPHJnH8u2%+1Zh0szsl99GuY;@ARL z(4)x}sn!ea?(XI5ywef@wguK6`up+V^RX=~G>Ei`U?c&nxM5l&0>qL72vsTcHp3wb n1PBxU>ruf1L>i5l71H&<0)ha(jT}jwqnNTG2!Jg)MgRai5sZ9o literal 772 zcmYL{L1@!Z7{|XfO*(BXJ;=yL4h<+IRAB)N&E}zvx?%88+MVL1wU^H9psa@;<67;I zC=)73sgMdC^iU8qo?C?ORw|UTV^7Vz37)*HzW35;4jqjBvU=1yv!UY3xH46&_@(Vb}nT0S_c55G+Ck$*+e1Lc|KBq31E>r9~F^0 z?0yg5L=@)|0Poj(?$p@wgh~YZ1e*4Q%+s$^!@TxwirXLxRz>TbA4U}yn}`y)!zOVz zDUmn*J(qnPKDo|deJc$DHG2b8e7o_9dxlh5**y&XOaN}?^&##?>u;v(`%A!T>_WUx z5h}B@q$bXca805SHSO%`V$GL@sK;$0E2Uo%%bL|D)RzjoOQ^C~o~frFq8g&G-}#?- zY%%d@q@MCQT^9ReBV3ebcv#k$0zUUhK8|YJD+T+Vg@@Hw9hZe*C#ntkqOIgN5mZQe z7Q1HlC_sB$a>!rB|3B*&Q>bEU(1Ak*9bo8K&2uFit*W+C04UmJKu;L56{qLU(C}{B z3TspK0BR&iCveut>T;*CF-*~4mefc93{7s=vRbB*?eq86X1*P0K$7ozM^ALB$T9!k zFhqeT+|Xr)OTNNXJS-e2cq=ih8^cTpOZAQAqmrf=kR%_ku(7hU83_P8xTQ}g literal 659 zcmd6ku}%ab5Qc{U3FXpViBwlukW912W{Zig-8Li_JKuzL_a4D_@G}(EaxYbMS zO{9Pf`M>$+hsURf{_Z6}fDa3@D%AHwt#CTkR?BwtX_NvBw^E1}^!bqUG3Wd*4=6mR zo2~;w*vI%9Be-p9JFFo_xlDR$87z$ySQ7UM7cIf;N<>b$ggt6bYe%A$40GqSAY#uJ zmKY@NmU_emHG_kIBS8@fV)+KC+bNc8+#p=>UNsJcD`M#V?8PuO&J3&Ze&>Bboi;xQ zEa6K9KYm6zkkrzQx$IhN;bw){QgguW!ufOwn2%tZM23LvwQT8{-wf0BbALbR^Pm0v H8{B^ZzYn;? diff --git a/data/images/toolbar/default/large/undo.gif b/data/images/toolbar/default/large/undo.gif index 6b637b3644735a0fb19ebd1b78a1902eb4f06de8..6bbbf33b8e1d8ce2294e9dde7293072878d011b3 100644 GIT binary patch delta 395 zcmeyyv5AGp-P6s&GEsp+f#EB|L>}{ro*@$#=+-m9fZ|UUMn(o31|5(9NEHLye}{Pm z9y(I}CzceQ%(3ckSn*|MPf*s*Sv^Kexfb`v@=e!HPmDPryyx(xsAU!1W^SuHzbh&9 zRL|CvkdPLamR2*dD66Q9uhCPJX;hf3pd>BRZfVfNz*SjoZDFJ(AtR@(zOr6LSxKR- zB*vM6pC^k!V42+Y5))IohZ>tkM?t`Go;F1%35Lj42S)#Rxf?SWA01vIa&8WTg24NE zP5z?VPCX6>l~}r>e9MG>q$D(6UhXGARP(0n>^^sIDU*=)z5NZ$++s2;4AuanF@Yrj literal 1142 zcmZ?wbhEHbRA5kG_-fC<#Kgod$Iq!G#Ahobs3IY3Aj4y!Dr%v?@1!W@s4g6#DHdxc zo}e$0X{P9=t5$3wlj$H+?W>mUpk3r-QtWA77vND5A>Za9*BYie-CJ#HkYS65Wox*} zv@o-|Nvg}d)R%;sFN-r-o@lo%%XxXW)7CVvy+vUQb7MA^`Wz_#sk)F)%PF{$ycfWUyz@0kVNUQea?U`*+~}`|rR1*6k;eY9K*_Jjgl*um;9@RDJdg z2bvx~%o1Z@_<-&RhK9EO?TBe~b_%Kskw1i!XM#C<(57?0C1r_`pAqq)5a4_v{%z z%1oynW7b+4q#4ZVAygV*K93dXCI)`C2kZ?$%C`8knRq2i^|~$oxFE-A#dSWg++8My zk8e{JoY5$i_40^)gQ1{UUHY)63(WjLpI zEoq~}jH{^(41enEAAn<^;ef-$m5g=v49l-GWtuDyO=AF>0u3$uhJ*_aKskq{?#!7E zD>;}zp#_UMc?W@j6o&os4VO1Jnk=5kh!T?g4jLLjxd#(BcRDFu%wqiU7b)i0|0!^= zHQeW4kg?TGb!zsKBnFs;KzrF01c0H&pAexV)_pW-V+DgKFqoi81t`Y>3N&!ULI_YW zgWU_!2jhKb{)cR)h6oqJ6qIzwKf%HR97|AB{=hvCbi@M-6(l)ieewq$79hEr{|6!& z0n^q)1|&JSlYp_x0Cf6~ztiAOlm7rT6k-J<&_555t$_O)QxF<;sA-xA9xUpx8m+)! F4FDR$qMHB! diff --git a/data/images/toolbar/default/small/autodrop.gif b/data/images/toolbar/default/small/autodrop.gif index bd4a8dfc0942b703ff1c5b742e9dd09aa3a241a3..5d3a5bc36ce8f65412ad4dada4184f30393c0234 100644 GIT binary patch delta 145 zcmV;C0B-;J0`CG0M@dFFIbjw676A1Ckqqa2dBBozNGuwU$fR<~Y&xIAfD~GihB}+6 zGaw?3I+(x`KrRD98%$UUSX?-o24F*KG3JNn{=u5C;YT8yFP$1DRwily diff --git a/data/images/toolbar/default/small/new.gif b/data/images/toolbar/default/small/new.gif index a5c1c7df32a270a5486612fc405bc29956965661..7b4ba655975fca376705f2a4ced00930fd585995 100644 GIT binary patch delta 90 zcmV-g0Hyz)0gwR~L#0FPaF{u$^wtY)3maIl)ak)=XKfkn`vN{nTV sHUpypr-Q>=Mu7$83>*)RGdeIFVPs(PU{YvM!9q*P39Do8~AgBrgf`A|p06YK$z`z<11O(gw r;9(h91A>4c4S-k%)qo%%NCyBA00UJ40s#Vk01-n%Esl?n3JCx^N;WBD diff --git a/data/images/toolbar/default/small/pause.gif b/data/images/toolbar/default/small/pause.gif index 03e79cb44b11a2b0ecdcb835c767e4cf16b6f6df..9585fd1f55d01bbb802f0868bebe5643751ea07e 100644 GIT binary patch delta 134 zcmV;10D1qJ1Hl0dM@dFFIbjw6769`Akqks}ZqUg|tGzhu&AZP)C`w^4UV(xf10bb{ z(PBZuB(qcBxfLLdLm}`=1Pd+{P)O7*hcqMe^-Nj-RnoJ0Jv0nZofmAa1jgZj;T!f5 o7-Uibj>HHEi?~Bj$k#6b1420f1YkWCA}5L=AC8ZZkrxpFJ8a)EOaK4? literal 409 zcmZ?wbhEHb6k`x$_{_(^$jB%nBBG?E6c`wonVDHsRMgegHEGhMl`B_n*|O!pfdhB$ z+M5CLMzl)zXEz!E@$eJ+gk z0;0J1oFi0QF`pHTb-@y7>;X##rUnKJkQi$#pUi=s3noY&uzU_Qs`bbvhI6efky1eJ zoMJtN8-ASUTCeyqf{oH!Q07&@$94rM29h;c0^|b4xEjD*hONO2C43+yK<Q;^9?tGzhu&HDvl7wBF5{p;1{b5Uk0atwbs^niC4R N-=4U9PTxcT06UH^DoFqU delta 122 zcmdnVc!H6~-P6s&GEs~{jNvoSM4s@}qzNZISMRlWefBqNf<)PYqE`(Wx+rL5(qiaT5buOVh&!4-E$H24tSjgjRM36$Zl#Yz+(#9A*pfU18kdBHPe; Shm-YRgIrT{ORKaXgEat49V$!! diff --git a/data/images/toolbar/default/small/redo.gif b/data/images/toolbar/default/small/redo.gif index b0f1f03ee63c598a488df921a70408a7c37278d7..c02791af06baf8c34f56cde4ef22f891cf83d6f6 100644 GIT binary patch delta 98 zcmV-o0G{M@dFFIbjw6769@9kqkdgN?5ww{xHf(YXcZqg^4Fv1rS47dK&kP zLVyV-SP1Fmrtb;R4lvY@q+9v7lNoXsVrtPtLLVG-3Gf}t~N|Ao3{x7 EJM3pC7ytkO delta 113 zcmV-%0FM8d0jB{BM@dFFIbjw6769@EkqkdvSy;N<{xHf(YXcZqg^4Fv1rS47dcXoa z03igJU=lzf01psg3MP~UfB@hC3;+&*z$5@TG7o@B0B~d;0FwaV$T$SxFyMh{WX^y` TX4A;98Rz#RBd^=<_XGetl;I{k diff --git a/data/images/toolbar/default/small/restart.gif b/data/images/toolbar/default/small/restart.gif index 9350c8bd3e9be726f1fbc9e41649b8436b058f1e..a45896f74bc1980bc8f66f4cc4ff442a5e20ec61 100644 GIT binary patch delta 106 zcmV-w0G0p10iXd4M@dFFIbjw6769@9kqkdoQdqj&{xB{;s|B(E!g~jTw0RydgwRNG zR_X;Sfjw#fud_4Sy#2WxU+0!~LnqKI90{u$^wtY+QBaHyKSiKRltfJ4xsN{prA zpcjL{1=dC$2Zr|lJNOuwUOcd21X3SZz|;elFc1$;*)Z~hcs5{_4D~V$EDDE983Y)N V80A2u3WI=nuc+jNi4!;(tO2*QBXR%$ diff --git a/data/images/toolbar/default/small/rules.gif b/data/images/toolbar/default/small/rules.gif index 84cc5cbdeb1022908b11fc8c13618347882902bd..7750545ed3d46adc92dc83a25cf34467d86ea029 100644 GIT binary patch delta 135 zcmV;20C@l70lfhXM@dFFIbjw6769@9kqkd_Z+N=g{>R8^V3UW09SF9S#*H3SaYLaF zTzMVbq0aE;E`}%U9Zj;RN2a pcr4Y1FG{0oxo#{|ZU6uh_wFqOeF1t_77KxTgoTETjgAWm06WnCI{g3u delta 174 zcmdnX_?VH$-P6s&GEs~{jNudeL>~M4sTI5K{5yUkGhuRji)_c1_CkReNddMLnL7b{ znB67%3JZ>}mX}F1VLSBfgOo%(v)|!@2QpmD=duqd8t||Pr+<)|!ol5KW?aGR#c=45 zf!rRpC?HkGy9LCn<2}a0&Bm16%D}?I7RAiU9L2!P#-e7W#=yd_2IQ(TFh~lpw8}6j Zu&_kUXHno@K7ao5HJdhXVdrG91^~w+Hj4lN diff --git a/data/images/toolbar/default/small/save.gif b/data/images/toolbar/default/small/save.gif index 8707b7499f1a046261ffe0604c083ab8322141b9..292abe34c012b9fd7ad0f953204a733899f35432 100644 GIT binary patch delta 128 zcmV-`0Du3K0?q*pM@dFFIbjw6769`AkqlRBXb{OstGzhuJ%RsV2v~ps5CN*DK{-~y z5g&A2f23*evYE%LRqsV{@ocW&A;=mkkF+FAU=n?(#13`K?PetIKP2M!qqrUq68hLTbS z#sf?O94-oVKwIkC+B<+$TLVKIh{wRr#?CgAl?})O@z{)*m|59?5Xxs~Vg~WRTsbBN V5Swi$h$r6HAanl0#fyRr)&PrPDr5iv diff --git a/data/images/toolbar/default/small/statistics.gif b/data/images/toolbar/default/small/statistics.gif index 7db06f8aabe7b4a4dade0ea8e867be9ea69cb986..55845d53240be9d1ac43c74686f294652d98ee96 100644 GIT binary patch delta 101 zcmV-r0Gj`)0gnL;M@dFFIbjw6769=8kqk3XO`MOZ%RS&CjBV0oZ-S!h!+GB`bOIBk zN+_g3;;v;EBQ?U-<_*rR>f;%5z#R}5EYglW<16_@It|kel)8*Iv)G?@2ndVEnJC5}#_*AOB9C!a`kelir)?i7b?{wa(_?n7sAXtYZ(uW+;B!Fh ofWsz7CG7(ar#ja#Fl!o5NZ~rrph6ne@Sk7eN4ir*AOnLn0NK(kg8%>k diff --git a/data/images/toolbar/default/small/undo.gif b/data/images/toolbar/default/small/undo.gif index 7045f29d9cd79a66814ee669f6591d9cec54942a..19ca77fab16a5f7c3fd7a2ee97554fb32dce1c3c 100644 GIT binary patch delta 101 zcmV-r0Gj`)0h<8~M@dFFIbjw6769@9kqkdjO<20z{xHf(>jM~Ag^3?nq;cOc2{xHf(>jM~Ag^3?n1T26zoWdXg z5Fiu)aSj3&2moq5~u_z(W6K>>)OH#n#@6m09VW=qI!OwYCY;`!yy WJeZEf3))^U4=M#{I-gKL0suRxUmQpP delta 93 zcmd05XPjUV9-^`9j+MbFjRpzD*K=6~n8igL7)2TwIGP_b9SS&8V$0oNaDm153R6Qu xfU*dO8KZ;22EiOwAhkk}i)A*0g2V+56DMB=0iFc`j0cXg?YRG8hczREH2_{w9KHYm diff --git a/data/images/tree/folder.gif b/data/images/tree/folder.gif index bda3b430bc72dc47ed96307aa6ac25e955d673e5..27dd6afb6e0ab152c0486d488fc664c07caedd93 100644 GIT binary patch delta 85 zcmV-b0IL760gC|)M@dFFIbja~4FK{0kqkdTJ$M()pil)naIz;%kYVPB9DD)Qib@L1p%zVt5jP>lpGAgG6b0l7&2C^YJ9NI z>9S0tVw8&`heLt@t5aiuf(VBP;{yQ+37)A83X3>w*562XWZ;m<1IY<6FtG_PbkGps ZVsbc;peVw@>cptYz>?5lz`)614FG9%AG!bl diff --git a/data/images/tree/minusnode.gif b/data/images/tree/minusnode.gif index 5a38d019fbc36778b9c907d3f7468fee404d0a4c..4593c8d78070d620ac652d54e7159013812918f5 100644 GIT binary patch delta 50 zcmYd`<8k+Nv#?C$X5eP{$S{$|SYBpMzt|z&g)z;^C&l%BZGQYu723+MtTQy6YnwA8 GgEat%0uXZm delta 58 zcmaz`<8k+Nv#?C$X5eP{$UKq9SY2gKzt|z&#HQ?nEhn2eBU)Ib4th*-yTIzEz_3o6 M1;ps&XJxPk01pTe;Q#;t diff --git a/data/images/tree/node.gif b/data/images/tree/node.gif index 274bcaef4d91b5be4a094ae4a37dcc0348740e4a..11a032cb3b7ed87569fdfd5b3e1d84e791438747 100644 GIT binary patch delta 63 zcmV-F0Kor&0cnshIW{P|+&VDID1aCt>z(W60Rf1jH#n#@5NzwRrVGq(+|HwGi+B#J Vx1J6tdl7cVmIsyUIiG+806Ssv8$AF3 delta 87 zcmd07WSn3S=%=ykj+MbFjRpzD*K=6~n8gJc7zG*_IGP_b9dbBRV$0oNaK#~?o8jPs nYs@!T7!Edsy}1gauCZJJQU};J2!g2Bq6{%FRz=NaV6X-NMv))@ diff --git a/data/images/tree/openfolder.gif b/data/images/tree/openfolder.gif index 4a3d97f04c641d9085e54312062b9aae6df28c0d..e4f111e583cbfd88f36216d5d20b4004183e9fb0 100644 GIT binary patch delta 90 zcmV-g0Hyz|0gwRyB-JFY?=}PJLY;M@&Et; delta 118 zcmV-+0Ez#Q0jvQGM@dFFIbje04FK{6kqkd!UT7N3`Y?<_DJg^m5P%6oC5i&@0BEYF zMlg&+(-^@p7DPb^fFJ;hz<^L76fzk>0Hp{Fp3eXT5*XYH(18FT>ox=h0U$6C5h#R$ Y0N?`{0s{)6Kqw#ufB-<@^`a60J1YnxXaE2J diff --git a/data/images/tree/plusnode.gif b/data/images/tree/plusnode.gif index d802f4a9b59bf673e355f7cb63776e7b47b2556e..b2900e6a280f5a7212a12b4a0cad2a6fa10f8a4a 100644 GIT binary patch delta 54 zcmV-60LlMrVhl$~MmRZP3jhlM@c@wwGb13Jj~2o$p&Dp#EXV2 V1V$hLvMdBf&;U(foc>S%06SKn6MX;x diff --git a/data/images/tree/python.gif b/data/images/tree/python.gif index c34426fb859e481daa9983066eaf7bb9a3f81e18..3212a428226c63e3b6851bc284da409863956bac 100644 GIT binary patch delta 84 zcmV-a0IUC*0g3?(M@dFFIbjX}4*>E2kqkdSJZNeF`wI{t#Hdh#v0c^{Hw*^nF%6k* q<5g|n62>Klts|`zKyW^+)(8fv2q>-$L1U<>Ae&HwQ49$e2>?5UR2$y_ delta 99 zcmV-p0G$7d0hs{|M@dFFIbjX}4*>E8kqkdhOK55U`wI{t#Hdh#0S3qmAPfUQ8bh-* zzyJaySqZ=ZE&_QQLuFJT0BNTv00ICIAjSj?GBbc+P{|M!07GQ}0t^JCh5-PnFiDF9 F06PHu7_k5V diff --git a/data/images/tree/tk.gif b/data/images/tree/tk.gif index f99dcab639a1ef04fc8b8d9df57f33a665719892..502c79a759d4222929ae8e20a376f03992dc4779 100644 GIT binary patch delta 53 zcmV-50LuSvTMS1@MmRZP4gd=P@BonvEg~Nbju5-bZjhO;CfFLznsNq4*YS{{W1i@Q LnTeO8N&x^n;cgU+ delta 72 zcma#f<8k+Nv#?C$W8h}^z&Mdd*VKroPhj@}#t1Hj26hP!&OHn|$Hf`W2r}?H*u@@F cP}v~!b|V9$0K@r>9xMz!%*-1sShyIh0jdNNt^fc4 diff --git a/data/images/wizard.gif b/data/images/wizard.gif index 8c7c9d7beac92c21715a60853be551c3529a630b..a73c1e9f3e8f52df53551a61e875dbc766191dd6 100644 GIT binary patch delta 1162 zcmV;51a5DNkARP_<;o&?KV-Nvfq8%|*Xu!|_ zf5tF))J72?P|%>EOfr7?1Lt6Xi-;2MSyZ)6Aww4q8ievtpjZQBBL!trq0yfPP{ky| zjH$0(um%htOw0+uTFgNiJ3IjP>A?dB1`K%eGzy(X5hi@ZK&X{#uLe6*xEfnjR7@En zSoBj_l)-}!ApabM8pQxqsG}elH~hinEeAk%LkY>OW9L4-XR5Wxp$#$dt-IiOJ41tPioy>#h;qXZBP@V`39Ky$f4~hv+JMSy zKAr&CtF+QOXAU>O7z1l;wwA+|;3@DNDkZE|f&vT73F{9fc)X-Y-Qsq zfP<8ll)&A!2C_EmycfjKVGOG-FspnG0)PT!C0tiN z**idhkl{dZ@IV9H0Kkn(2GIF>isH)mgSI!I@U`#{1kM5hA5eI@=s=|YKq~;Wuz_g~ z&@jS!tTDXK+Ow>kbWj7VEJxNs1_Er;f$#;C&U*wCvG4!@4Q#+a0W`RP*V5x92z`lF z8Z%7>-o^nLybS^TlL7W3Ac_V|jeiI52fk)S8-vZKNR delta 1553 zcmYL|U2GKB701uLGqa!bU73RMV= z5UIC~lbzjx*w~x0YN+r7m4=!JgH&mveAH4RWoC_B%F{fws+Br0R93@-5nIVBmaw1~ z<)OMSf8G1L=lst(_d4w70{iBVkLUYO<{$_E)jnkxQFVJyldRdRmwHsSYcI>OG|U4I z@pCsXW_q*xx;nXoyKg|461Ls?s#ndXQ(Wp`;fr}@+gCSx)B$;KD!sdKX#XjeWc)*o1PWspR6E}_2~zDLbIWPk%fo$AFUYB$9MdGcm0j2It`-U4yZ_&{-vr19okPt zHVqN^%lH1&j23=Z*Kz9twTQG$xAO^NzR2A99Q4+dG&s4@{!hs>-x>OiGiL{8othuN zaO32IsV9#QpIwoV-g?sAe`ZBf|Anh&xBBe61xH6SPdDEjbHK*Wp1#^JYD@wQ%s*Pq zwV1@>zvaELE9MgSZBX`vL^?Oa+`n#X^q>YNQQBP;TQQer?lz2;5LdtzKq{MKal;=* zVj8^5kx9)}Vyke0+kdNWJ!gu61%10bQ0q1?Qpd%`P}k8adP)OG+Cdjr93!J7lSR*AXtcQ`C~H-H_ybrMsffA`CZ4)2Q>gd0Ut)WWCW7Rm zC!A?p>8y?uPHh4lh~Eyvhc^*_JU1iVk+C>kWAnOsLL3igD;oPNA9Xt#!-313Yg3(T zZYZ&UqLaZNqS+vvwS&-H$N&Onc^*`Xr2cE$!c zFH?90#gC9@vt6cC(UW_Ejzj@~TLDOEkQxg@?-O{UY+BtT!9d?8iY3Z*3S^2SU+0t$ zAQQNWm{3RUM4wE}pLS8~B`dxf6pEwfL_(t;|IMUd)&8lZ$h1zG%ue}@(70SL^^N1^ Z9K4)?OHqx;=Ktl3T|e^KotH%z_#fb}3T*%Y diff --git a/data/images/wizardcards.gif b/data/images/wizardcards.gif index 489fc78bfec2f59e1506f16444dc08a085a205d3..fcdf1b16ca97aa6ae460b1909c190d584c6f185c 100644 GIT binary patch delta 937 zcmV;a16KU54dn_9M@dFFIbkpWFaY)du?)=tf0Yg;Bb%EC5}=MSl9d(?Ju<4A2cE8s zF)u3_86z$(J*l@2yNez%F{LuKJvKchC94h-$%zv&94ii|J;W~6n*|OE*@!$aEgG{H zJx^SvF)?08s1}0AvFPb%60AgM~{Y9yG`_qQEUy ze-Q;mTEXI=Ne3Ps0st9O5{GZ!F4a@13F1HxFf?S41vA3|0|zWw+SDK-P8j--Dy8Va zmj)K4G^oOd^Tmsj7Y=yD^eaN9O_(qNz_*Pb&9k@CNtmfALWc+t{|v|l5Me`y4RYsh z%GLo05DEYo*!8i4a0degHoz#n0dHPSe03d+_wIkIvNSpwSwm5(fGjMdc$Efd(3V#h~`V0ic z0s}szQ%7-YMvWUdKK!okmw|L3E43b2z#)4A0}vQMfUs86f*U}R<8b5w#|a=fe_Y4F zWk|iXL3R=tAVCK#ya2-nniv2c4&Vtf0SJrq^+A4eQ3r$%KWy+qc5!X+1BeesXxR<_ zbpXPCicEk4bSM~5fdM4=1!7?^khs7CJicH+0st5=AP^N$h#~(XGYEnW4%OLc00mHf z2tx-a8nA!}BK!yg1P5>zSPei(f3RYchJY{w2=|a#V+GdzDCe9Dgb+XoT`qt_WdQu> zmjoxQdB~E2kO{;IHvY(i4vRLb!H;P#003*VX12g0nxO!MqAjGb01v97x&RH57ApX(1H>BPe+d-cibw}S z0C5AUEntuW2BrqPY6y|GdaMZpgd3{>n#?e*A|3R}L$B6a`)ja}8jEbW;w})WeTnq7 zYqjlSfbFTOvid5x^wJw^t9>Gp-=)8{d#$g)rpjuh-xh4Kud)d^TgXZYL;yer4f}g- zwi4SZ>AV&ftgOa_tm6PIf22O_Zp5pKKrzZGtIQseV-3R20WmBPL=X$G>o3VQw~BMl zI>!LR1BA5jlF&mp{P4T05?e9TOvn0z283{c0M$biUG2yK*SR&r&iBZFfuRrp( zudAX6sRtqS-YSM8iePC zg?^N=HNF-ZpLys0P`y7f;7Ph1;Al4`MP%%*6^06kUXlUORjRF{6esvKejl_nPZlu* z0IJ(4y8;Yb>oOQxJOGl__Uvu633v(K?|%&WwIHb>+JpD)b@V97ikS|}m~<#*#I1@Q zQmX<#;k2a&D`A6l0^H<2+m*boDcHlU}43?A! zMtZlW#k{$kC6cfRV)=UT;VH(&ead98w+WOkv* zjwk?Z*bSsAsidgRI~TysT;OV^fD(ad-vU}s3KBr1pdvRX7tm;39PyjPOxO?tN3~q* zRorE&6SL`=PSKJAt5^jaiGlYD2*rF_72A9d0=7IGGS%gDjx7t%{}0FL-2T6oIa2?l z(*w!_)GF)92Zt5R``U#<5sC>pG&eG);35z)W9iVVpn#k~bc?Kq3q)^V1}+z6NATZ& zxJ4i#){azY>;V$3?>zn@)-850JEbG>e-?E_MMGtfCOl%N0er zuvi|`56Bn`F\n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -835,9 +835,8 @@ msgstr "Двойная и расчёт" msgid "Doublets" msgstr "Дубликаты" -#, fuzzy msgid "Doublets II" -msgstr "Дубликаты" +msgstr "Дубликаты II" msgid "Dover" msgstr "Довер" @@ -1113,7 +1112,7 @@ msgid "Four Winds" msgstr "Четыре ветра" msgid "Foursome" -msgstr "Квартеты" +msgstr "Четвёрки" msgid "Fourteen" msgstr "Четырнадцать" @@ -1197,7 +1196,7 @@ msgid "German FreeCell" msgstr "Немецкая Свободная ячейка" msgid "German Patience" -msgstr "Немецкая пасьянс" +msgstr "Немецкий пасьянс" msgid "Ghulam" msgstr "Ghulam" @@ -1733,9 +1732,8 @@ msgstr "Долгая коса" msgid "Long Journey to Cuddapah" msgstr "Долгое путешествие в Куддапах" -#, fuzzy msgid "Long Tail" -msgstr "Долгая коса" +msgstr "Длинный хвост" msgid "Loose Ends" msgstr "Свободные концы" @@ -2883,7 +2881,7 @@ msgid "Retinue" msgstr "Свита" msgid "Right Triangle" -msgstr "Правый Треугольник" +msgstr "Правый треугольник" msgid "Rings" msgstr "Круги" diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index f13e971d..b2f94121 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -239,7 +239,8 @@ class Pyramid(Game): l.defaultStackGroups() self.sg.openstacks.append(s.talon) self.sg.dropstacks.append(s.talon) - self.sg.openstacks.append(s.waste) + if s.waste: + self.sg.openstacks.append(s.waste) # diff --git a/pysollib/images.py b/pysollib/images.py index 264a21ac..940dbd6f 100644 --- a/pysollib/images.py +++ b/pysollib/images.py @@ -91,6 +91,7 @@ class Images: self._letter_negative = [] self._letter_positive = [] self._shadow = [] + self._xshadow = [] self._shade = [] def destruct(self): @@ -99,6 +100,8 @@ class Images: def __loadCard(self, filename, check_w=1, check_h=1): ##print '__loadCard:', filename f = os.path.join(self.cs.dir, filename) + if not os.path.exists(f): + return None img = loadImage(file=f) w, h = img.width(), img.height() if self.CARDW < 0: @@ -213,6 +216,17 @@ class Images: except: im = None self._shadow.append(im) + + if fast: + self._xshadow.append(None) + elif i > 0: # skip 0 + name = "xshadow%02d.%s" % (i, ext) + try: + im = self.__loadCard(name, check_w=0, check_h=0) + except: + im = None + self._xshadow.append(im) + if progress: progress.update(step=pstep) # shade if fast: @@ -264,11 +278,16 @@ class Images: return self._letter[rank] def getShadow(self, ncards): - assert ncards >= 0 - if ncards >= len(self._shadow): - ##ncards = len(self._shadow) - 1 - return None - return self._shadow[ncards] + if ncards >= 0: + if ncards >= len(self._shadow): + ##ncards = len(self._shadow) - 1 + return None + return self._shadow[ncards] + else: + ncards = abs(ncards)-2 + if ncards >= len(self._xshadow): + return None + return self._xshadow[ncards] def getShade(self): return self._shade[self._shade_index] diff --git a/pysollib/main.py b/pysollib/main.py index 6638024b..78235dae 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -179,8 +179,10 @@ def pysol_init(app, args): os.path.join(app.dn.config, "plugins"), ): if not os.path.exists(d): - try: os.mkdir(d) - except: pass + try: os.makedirs(d) + except: + traceback.print_exc() + pass # init commandline options (undocumented) opts = parse_option(args) diff --git a/pysollib/stack.py b/pysollib/stack.py index 117feda7..4b91f85b 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -377,10 +377,10 @@ class Stack: self.is_open = True if self.max_shadow_cards < 0: self.max_shadow_cards = 999999 - if abs(self.CARD_YOFFSET[0]) != self.game.app.images.CARD_YOFFSET: - # don't display a shadow if the YOFFSET of the stack - # and the images don't match - self.max_shadow_cards = 1 +## if abs(self.CARD_YOFFSET[0]) != self.game.app.images.CARD_YOFFSET: +## # don't display a shadow if the YOFFSET of the stack +## # and the images don't match +## self.max_shadow_cards = 1 if (self.game.app.opt.shrink_face_down and type(ox) is int and type(oy) is int): # no shrink if xoffset/yoffset too small @@ -1145,45 +1145,34 @@ class Stack: return () images = self.game.app.images cx, cy = cards[0].x, cards[0].y - for c in cards[1:]: - if c.x != cx or abs(c.y - cy) != images.CARD_YOFFSET: - return () - cy = c.y - img0, img1 = images.getShadow(0), images.getShadow(l) -## if 0: -## # Dynamically compute the shadow. Doesn't work because -## # PhotoImage.copy() doesn't preserve transparency. -## img1 = images.getShadow(13) -## if img1: -## h = images.CARDH - img0.height() -## h = h + (l - 1) * self.CARD_YOFFSET[0] -## if h < img1.height(): -## if hasattr(img1, '_pil_image'): # use PIL -## import ImageTk -## im = img1._pil_image.crop((0,0,img1.width(),h)) -## img1 = ImageTk.PhotoImage(im) -## else: -## import Tkinter -## dest = Tkinter.PhotoImage(width=img1.width(), height=h) -## dest.blank() -## img1.tk.call(dest, "copy", img1.name, "-from", 0, 0, img1.width(), h) -## assert dest.height() == h and dest.width() == img1.width() -## #print h, img1.height(), dest.height() -## img1 = dest -## self._foo = img1 # keep a reference -## elif h > img1.height(): -## img1 = None + ddx, ddy = cx-cards[-1].x, cy-cards[-1].y + if ddx == 0: # vertical + for c in cards[1:]: + if c.x != cx or abs(c.y - cy) != images.CARD_YOFFSET: + return () + cy = c.y + img0, img1 = images.getShadow(0), images.getShadow(l) + c0 = cards[-1] + if self.CARD_YOFFSET[0] < 0: c0 = cards[0] + elif ddy == 0: # horizontal + for c in cards[1:]: + if c.y != cy or abs(c.x - cx) != images.CARD_XOFFSET: + return () + cx = c.x + img0, img1 = images.getShadow(-l), images.getShadow(1) + c0 = cards[-1] + if self.CARD_XOFFSET[0] < 0: c0 = cards[0] + else: + return () if img0 and img1: - c = cards[-1] - if self.CARD_YOFFSET[0] < 0: c = cards[0] - cx, cy = c.x + images.CARDW + dx, c.y + images.CARDH + dy + cx, cy = c0.x + images.CARDW + dx, c0.y + images.CARDH + dy s1 = MfxCanvasImage(self.game.canvas, cx, cy - img0.height(), image=img1, anchor=ANCHOR_SE) s2 = MfxCanvasImage(self.game.canvas, cx, cy, image=img0, anchor=ANCHOR_SE) if TOOLKIT == 'tk': - s1.lower(c.item) - s2.lower(c.item) + s1.lower(c0.item) + s2.lower(c0.item) ## elif TOOLKIT == 'gtk': ## positions = 2 ## FIXME ## s1.lower(positions) diff --git a/pysollib/tk/selectcardset.py b/pysollib/tk/selectcardset.py index 17fc322a..fc1c9b09 100644 --- a/pysollib/tk/selectcardset.py +++ b/pysollib/tk/selectcardset.py @@ -219,6 +219,7 @@ class SelectCardsetDialogWithPreview(MfxDialog): self.preview = MfxScrolledCanvas(right_frame, width=w2) self.preview.setTile(app, app.tabletile_index, force=True) self.preview.pack(fill='both', expand=1, padx=padx, pady=pady) + self.preview.canvas.preview = 1 # create a preview of the current state self.preview_key = -1 self.preview_images = [] diff --git a/pysollib/tk/selecttile.py b/pysollib/tk/selecttile.py index ef2a9093..4cd41ac6 100644 --- a/pysollib/tk/selecttile.py +++ b/pysollib/tk/selecttile.py @@ -139,6 +139,7 @@ class SelectTileDialogWithPreview(MfxDialog): self.preview = MfxScrolledCanvas(top_frame, width=w2, hbar=0, vbar=0) self.preview.pack(side="right", fill=Tkinter.BOTH, expand=1, padx=kw.padx, pady=kw.pady) + self.preview.canvas.preview = 1 # create a preview of the current state self.preview_key = -1 self.updatePreview(key) diff --git a/pysollib/tk/tkcanvas.py b/pysollib/tk/tkcanvas.py index 855c35f8..3f035c5d 100644 --- a/pysollib/tk/tkcanvas.py +++ b/pysollib/tk/tkcanvas.py @@ -176,8 +176,11 @@ class MfxCanvas(Tkinter.Canvas): self.__tileimage = image if stretch: # - id = self._x_create("image", -self.xmargin, -self.ymargin, - image=image, anchor="nw") + if self.preview: + dx, dy = 0, 0 + else: + dx, dy = -self.xmargin, -self.ymargin + id = self._x_create("image", dx, dy, image=image, anchor="nw") self.tag_lower(id) # also see tag_lower above self.__tiles.append(id) else: diff --git a/pysollib/tk/tkutil.py b/pysollib/tk/tkutil.py index 399c2f58..104392dd 100644 --- a/pysollib/tk/tkutil.py +++ b/pysollib/tk/tkutil.py @@ -56,6 +56,7 @@ __all__ = ['wm_withdraw', # imports import sys, os, re +import traceback import Tkinter from tkFont import Font try: @@ -336,12 +337,6 @@ def makeImage(file=None, data=None, dither=None, alpha=None): # fromstring(mode, size, data, decoder_name='raw', *args) else: return Tkinter.PhotoImage(data=data) - if os.name == "nt": - # not available in Tk after about 8.0 - #if dither is not None: - # kw["dither"] = dither - if alpha is not None: - kw["alpha"] = alpha return apply(Tkinter.PhotoImage, (), kw) loadImage = makeImage From 87da6cc7a3c82700c635f8869e59d861e40dca04 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 20 Sep 2006 21:15:52 +0000 Subject: [PATCH 067/266] * bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@69 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- README | 10 +++++----- pysollib/games/grandduchess.py | 3 +++ pysollib/move.py | 4 ++-- pysollib/stack.py | 14 +++++++++++--- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/README b/README index 09c16afb..a07b15d3 100644 --- a/README +++ b/README @@ -9,13 +9,13 @@ Requirements. - Tkinter ** for sound support (not necessarily) ** -- PySol-Sound-Server: http://www.pysol.org/ -or -- PyGame: http://www.pygame.org/ + - PySol-Sound-Server: http://www.pysol.org/ (mp3, wav, tracker music) + or + - PyGame: http://www.pygame.org/ (mp3, ogg, wav, midi, tracker music) ** other modules (not necessarily) ** -- PIL (Python Image Library): http://www.pythonware.com/products/pil -- Freecell Solver: http://vipe.technion.ac.il/~shlomif/freecell-solver/ + - PIL (Python Image Library): http://www.pythonware.com/products/pil + - Freecell Solver: http://vipe.technion.ac.il/~shlomif/freecell-solver/ Installation. diff --git a/pysollib/games/grandduchess.py b/pysollib/games/grandduchess.py index 72027fc5..e52c21db 100644 --- a/pysollib/games/grandduchess.py +++ b/pysollib/games/grandduchess.py @@ -130,6 +130,9 @@ class GrandDuchess(Game): self.s.talon.dealRow() self.s.talon.dealRow(rows=[self.s.reserves[1]], flip=0) + def redealCards(self): + pass + def getAutoStacks(self, event=None): return ((), (), self.sg.dropstacks) diff --git a/pysollib/move.py b/pysollib/move.py index 86920afa..af78da62 100644 --- a/pysollib/move.py +++ b/pysollib/move.py @@ -490,7 +490,7 @@ class ASingleCardMove(AtomicMove): game.animatedMoveTo(from_stack, to_stack, [card], x, y, frames=self.frames, shadow=self.shadow) to_stack.addCard(card) - stack.refreshView() + ##to_stack.refreshView() def undo(self, game): from_stack = game.allstacks[self.from_stack_id] @@ -502,7 +502,7 @@ class ASingleCardMove(AtomicMove): ## game.animatedMoveTo(from_stack, to_stack, [card], x, y, ## frames=self.frames, shadow=self.shadow) from_stack.insertCard(card, from_pos) - stack.refreshView() + ##to_stack.refreshView() def cmpForRedo(self, other): return cmp((self.from_stack_id, self.to_stack_id, self.from_pos), diff --git a/pysollib/stack.py b/pysollib/stack.py index 4b91f85b..f1c178e9 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -921,7 +921,9 @@ class Stack: if drag.cards: if sound: self.game.playSample("nomove") - if not self.game.app.opt.mouse_type == 'point-n-click': + if self.game.app.opt.mouse_type == 'point-n-click': + drag.stack.moveCardsBackHandler(event, drag) + else: self.moveCardsBackHandler(event, drag) def moveCardsBackHandler(self, event, drag): @@ -2434,8 +2436,13 @@ class ArbitraryStack(OpenStack): def startDrag(self, event, sound=1): OpenStack.startDrag(self, event, sound=sound) - for c in self.cards[self.game.drag.index+1:]: - c.moveBy(0, -self.CARD_YOFFSET[0]) + if self.game.app.opt.mouse_type == 'point-n-click': + self.cards[self.game.drag.index].tkraise() + self.game.drag.shadows[0].tkraise() + else: + for c in self.cards[self.game.drag.index+1:]: + c.moveBy(0, -self.CARD_YOFFSET[0]) + def doubleclickHandler(self, event): # flip or drop a card @@ -2455,6 +2462,7 @@ class ArbitraryStack(OpenStack): return 1 return 0 + def moveCardsBackHandler(self, event, drag): i = self.cards.index(drag.cards[0]) for card in self.cards[i:]: From 9380a98b7ec76a19a28b3d18a2cf2c504c02ec76 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 22 Sep 2006 21:07:16 +0000 Subject: [PATCH 068/266] * bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@70 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/games.pot | 2 +- po/pysol.pot | 636 +++++++++++++++++----------------- po/ru_games.po | 2 +- po/ru_pysol.po | 637 ++++++++++++++++++----------------- pysollib/pysolgtk/tkconst.py | 2 +- pysollib/stack.py | 4 +- pysollib/tk/tkconst.py | 4 +- scripts/cardset_viewer.py | 2 +- 8 files changed, 675 insertions(+), 614 deletions(-) diff --git a/po/games.pot b/po/games.pot index cbc25b17..a75bbdcd 100644 --- a/po/games.pot +++ b/po/games.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Aug 22 21:32:47 2006\n" +"POT-Creation-Date: Thu Sep 21 15:56:22 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/pysol.pot b/po/pysol.pot index d04f0a27..8434726c 100644 --- a/po/pysol.pot +++ b/po/pysol.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "#-#-#-#-# pysol-1.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: Tue Aug 22 21:33:40 2006\n" +"POT-Creation-Date: Thu Sep 21 15:57:22 2006\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgstr "" "Generated-By: pygettext.py 1.5\n" "#-#-#-#-# pysol-2.pot (PACKAGE VERSION) #-#-#-#-#\n" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2006-08-22 21:33+0400\n" +"POT-Creation-Date: 2006-09-21 15:57+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -32,50 +32,50 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: pysollib/actions.py:358 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:260 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "" -#: pysollib/actions.py:371 pysollib/tk/menubar.py:704 -#: pysollib/tk/menubar.py:718 +#: pysollib/actions.py:273 pysollib/tk/menubar.py:815 +#: pysollib/tk/menubar.py:829 msgid "Select game" msgstr "" -#: pysollib/actions.py:388 +#: pysollib/actions.py:287 msgid "Invalid game number" msgstr "" -#: pysollib/actions.py:389 +#: pysollib/actions.py:288 msgid "Invalid game number\n" msgstr "" -#: pysollib/actions.py:406 +#: pysollib/actions.py:305 msgid "Select next game number" msgstr "" -#: pysollib/actions.py:415 pysollib/actions.py:425 +#: pysollib/actions.py:314 pysollib/actions.py:324 msgid "Select new game number" msgstr "" -#: pysollib/actions.py:416 +#: pysollib/actions.py:315 msgid "" "\n" "\n" "Enter new game number" msgstr "" -#: pysollib/actions.py:417 +#: pysollib/actions.py:316 msgid "&Next number" msgstr "" -#: pysollib/actions.py:417 pysollib/app.py:1150 pysollib/app.py:1162 -#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:439 -#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:122 +#: pysollib/actions.py:316 pysollib/app.py:1150 pysollib/app.py:1162 +#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:460 +#: pysollib/main.py:468 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 -#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 -#: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 +#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 +#: pysollib/tk/selectcardset.py:397 pysollib/tk/selecttile.py:159 #: pysollib/tk/soundoptionsdialog.py:170 pysollib/tk/soundoptionsdialog.py:211 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:499 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 @@ -86,141 +86,141 @@ msgstr "" msgid "&OK" msgstr "" -#: pysollib/actions.py:417 pysollib/app.py:1162 pysollib/game.py:925 +#: pysollib/actions.py:316 pysollib/app.py:1162 pysollib/game.py:925 #: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 #: pysollib/game.py:1339 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 -#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1000 -#: pysollib/tk/menubar.py:1002 pysollib/tk/playeroptionsdialog.py:85 -#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1122 +#: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 -#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:170 +#: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:324 msgid "&Cancel" msgstr "" -#: pysollib/actions.py:433 +#: pysollib/actions.py:332 msgid "Select random game" msgstr "" -#: pysollib/actions.py:469 +#: pysollib/actions.py:368 msgid "Select next game" msgstr "" -#: pysollib/actions.py:502 pysollib/tk/toolbar.py:211 +#: pysollib/actions.py:401 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "" -#: pysollib/actions.py:552 +#: pysollib/actions.py:451 msgid "Clear bookmarks" msgstr "" -#: pysollib/actions.py:553 +#: pysollib/actions.py:452 msgid "Clear all bookmarks ?" msgstr "" -#: pysollib/actions.py:563 +#: pysollib/actions.py:462 msgid "Restart game" msgstr "" -#: pysollib/actions.py:564 +#: pysollib/actions.py:463 msgid "Restart this game ?" msgstr "" -#: pysollib/actions.py:605 +#: pysollib/actions.py:504 msgid "" "Comments for %s:\n" "\n" msgstr "" -#: pysollib/actions.py:607 +#: pysollib/actions.py:506 msgid "Comments for " msgstr "" -#: pysollib/actions.py:625 pysollib/actions.py:661 +#: pysollib/actions.py:524 pysollib/actions.py:554 msgid "Error while writing to file" msgstr "" -#: pysollib/actions.py:628 pysollib/actions.py:664 +#: pysollib/actions.py:527 pysollib/actions.py:557 msgid " Info" msgstr "" -#: pysollib/actions.py:629 +#: pysollib/actions.py:528 msgid "" "Comments were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:646 +#: pysollib/actions.py:539 msgid "Demo statistics" msgstr "" -#: pysollib/actions.py:649 +#: pysollib/actions.py:542 msgid "Your statistics" msgstr "" -#: pysollib/actions.py:665 +#: pysollib/actions.py:558 msgid "" " were appended to\n" "\n" msgstr "" -#: pysollib/actions.py:679 +#: pysollib/actions.py:572 msgid " Demo" msgstr "" -#: pysollib/actions.py:679 +#: pysollib/actions.py:572 msgid " Demo " msgstr "" -#: pysollib/actions.py:682 pysollib/actions.py:700 +#: pysollib/actions.py:575 pysollib/actions.py:593 msgid " for " msgstr "" -#: pysollib/actions.py:688 pysollib/actions.py:707 +#: pysollib/actions.py:581 pysollib/actions.py:600 msgid "Statistics for " msgstr "" -#: pysollib/actions.py:691 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:584 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "" -#: pysollib/actions.py:694 +#: pysollib/actions.py:587 data/glade-translations:31 msgid "Full log" msgstr "" -#: pysollib/actions.py:697 +#: pysollib/actions.py:590 data/glade-translations:32 msgid "Session log" msgstr "" -#: pysollib/actions.py:703 +#: pysollib/actions.py:596 msgid "Game Info" msgstr "" -#: pysollib/actions.py:712 +#: pysollib/actions.py:605 msgid "Full log for " msgstr "" -#: pysollib/actions.py:717 +#: pysollib/actions.py:610 msgid "Session log for " msgstr "" -#: pysollib/actions.py:722 +#: pysollib/actions.py:615 msgid "Reset all statistics" msgstr "" -#: pysollib/actions.py:723 +#: pysollib/actions.py:616 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" msgstr "" -#: pysollib/actions.py:729 +#: pysollib/actions.py:622 msgid "Reset game statistics" msgstr "" -#: pysollib/actions.py:730 +#: pysollib/actions.py:623 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -228,27 +228,23 @@ msgid "" "%s ?" msgstr "" -#: pysollib/actions.py:785 +#: pysollib/actions.py:678 msgid "Play demo" msgstr "" -#: pysollib/actions.py:796 +#: pysollib/actions.py:689 msgid "Set player options" msgstr "" -#: pysollib/actions.py:810 -msgid "Sound settings" -msgstr "" - -#: pysollib/actions.py:819 +#: pysollib/actions.py:703 data/glade-translations:40 msgid "Set colors" msgstr "" -#: pysollib/actions.py:839 +#: pysollib/actions.py:723 msgid "Set fonts" msgstr "" -#: pysollib/actions.py:848 +#: pysollib/actions.py:732 data/glade-translations:33 msgid "Set timeouts" msgstr "" @@ -343,7 +339,7 @@ msgid "" msgstr "" #: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 -#: pysollib/game.py:1339 pysollib/tk/menubar.py:256 +#: pysollib/game.py:1339 pysollib/tk/menubar.py:363 msgid "&New game" msgstr "" @@ -714,12 +710,12 @@ msgid "" msgstr "" #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1326 pysollib/util.py:80 +#: pysollib/stack.py:1410 pysollib/util.py:80 msgid "King" msgstr "" #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1325 pysollib/util.py:80 +#: pysollib/stack.py:1409 pysollib/util.py:80 msgid "Queen" msgstr "" @@ -736,11 +732,11 @@ msgid "X" msgstr "" #: pysollib/games/golf.py:114 pysollib/games/golf.py:300 -#: pysollib/stack.py:1980 +#: pysollib/stack.py:2074 msgid "Tableau. No building." msgstr "" -#: pysollib/games/golf.py:385 pysollib/stack.py:1913 +#: pysollib/games/golf.py:385 pysollib/stack.py:2007 msgid "Foundation. Build up regardless of suit." msgstr "" @@ -752,32 +748,32 @@ msgstr "" msgid "Reserve. Only Kings are acceptable." msgstr "" -#: pysollib/games/larasgame.py:163 pysollib/stack.py:1542 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1626 msgid "Round %d" msgstr "" -#: pysollib/games/mahjongg/mahjongg.py:298 +#: pysollib/games/mahjongg/mahjongg.py:305 msgid "" "No Free\n" "Matching\n" "Pairs" msgstr "" -#: pysollib/games/mahjongg/mahjongg.py:299 +#: pysollib/games/mahjongg/mahjongg.py:306 msgid "" "1 Free\n" "Matching\n" "Pair" msgstr "" -#: pysollib/games/mahjongg/mahjongg.py:300 +#: pysollib/games/mahjongg/mahjongg.py:307 msgid "" " Free\n" "Matching\n" "Pairs" msgstr "" -#: pysollib/games/mahjongg/mahjongg.py:301 +#: pysollib/games/mahjongg/mahjongg.py:308 msgid "" "\n" "Tiles\n" @@ -785,7 +781,7 @@ msgid "" "\n" msgstr "" -#: pysollib/games/mahjongg/mahjongg.py:302 +#: pysollib/games/mahjongg/mahjongg.py:309 msgid "" "\n" "Tiles\n" @@ -855,7 +851,7 @@ msgstr "" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1327 pysollib/util.py:79 +#: pysollib/stack.py:1411 pysollib/util.py:79 msgid "Ace" msgstr "" @@ -1235,11 +1231,11 @@ msgstr "" msgid " Help" msgstr "" -#: pysollib/main.py:66 pysollib/main.py:348 +#: pysollib/main.py:67 pysollib/main.py:368 msgid " installation error" msgstr "" -#: pysollib/main.py:67 +#: pysollib/main.py:68 msgid "" "No %ss were found !!!\n" "\n" @@ -1249,43 +1245,47 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:74 pysollib/main.py:356 pysollib/tk/menubar.py:275 +#: pysollib/main.py:75 pysollib/main.py:376 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "" -#: pysollib/main.py:96 +#: pysollib/main.py:98 msgid "" "%s: %s\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:133 +#: pysollib/main.py:139 msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" +" -i --gameid=GAMEID\n" +" --french-only\n" " --fg --foreground=COLOR foreground color\n" " --bg --background=COLOR background color\n" " --fn --font=FONT default font\n" +" --sound-mod=MOD\n" " --nosound disable sound support\n" " --noplugins disable load plugins\n" " -h --help display this help and exit\n" "\n" " FILE - file name of a saved game\n" +" MOD - one of following: pss(default), pygame, oss, win\n" msgstr "" -#: pysollib/main.py:147 +#: pysollib/main.py:157 msgid "" "%s: too many files\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:151 +#: pysollib/main.py:161 msgid "" "%s: invalid file name\n" "try %s --help for more information" msgstr "" -#: pysollib/main.py:349 +#: pysollib/main.py:369 msgid "" "\n" "No games were found !!!\n" @@ -1296,25 +1296,25 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:434 pysollib/main.py:442 +#: pysollib/main.py:455 pysollib/main.py:463 msgid " installation problem" msgstr "" -#: pysollib/main.py:435 +#: pysollib/main.py:456 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:443 +#: pysollib/main.py:464 msgid "" "The pysolsoundserver module was not found.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:450 +#: pysollib/main.py:471 msgid "Welcome to " msgstr "" @@ -1582,222 +1582,222 @@ msgstr "" msgid "USA" msgstr "" -#: pysollib/settings.py:54 +#: pysollib/settings.py:54 data/glade-translations:29 msgid "Top 10" msgstr "" -#: pysollib/stack.py:1321 +#: pysollib/stack.py:1405 msgid "Base card - %s." msgstr "" -#: pysollib/stack.py:1322 +#: pysollib/stack.py:1406 msgid "Empty row cannot be filled." msgstr "" -#: pysollib/stack.py:1323 +#: pysollib/stack.py:1407 msgid "any card" msgstr "" -#: pysollib/stack.py:1324 pysollib/util.py:80 +#: pysollib/stack.py:1408 pysollib/util.py:80 msgid "Jack" msgstr "" -#: pysollib/stack.py:1337 +#: pysollib/stack.py:1421 msgid "No cards" msgstr "" -#: pysollib/stack.py:1338 +#: pysollib/stack.py:1422 msgid "1 card" msgstr "" -#: pysollib/stack.py:1339 +#: pysollib/stack.py:1423 msgid " cards" msgstr "" -#: pysollib/stack.py:1551 pysollib/stack.py:1553 pysollib/stack.py:1589 +#: pysollib/stack.py:1635 pysollib/stack.py:1637 pysollib/stack.py:1673 msgid "Redeal" msgstr "" -#: pysollib/stack.py:1553 +#: pysollib/stack.py:1637 msgid "Stop" msgstr "" -#: pysollib/stack.py:1613 +#: pysollib/stack.py:1698 msgid "Variable redeals." msgstr "" -#: pysollib/stack.py:1614 +#: pysollib/stack.py:1699 msgid "Unlimited redeals." msgstr "" -#: pysollib/stack.py:1615 +#: pysollib/stack.py:1700 msgid "No redeals." msgstr "" -#: pysollib/stack.py:1616 +#: pysollib/stack.py:1701 msgid "One redeal." msgstr "" -#: pysollib/stack.py:1617 +#: pysollib/stack.py:1702 msgid " redeals." msgstr "" -#: pysollib/stack.py:1619 +#: pysollib/stack.py:1704 msgid "Talon." msgstr "" -#: pysollib/stack.py:1844 pysollib/stack.py:2294 +#: pysollib/stack.py:1938 pysollib/stack.py:2388 msgid "Reserve. No building." msgstr "" -#: pysollib/stack.py:1881 +#: pysollib/stack.py:1975 msgid "Foundation." msgstr "" -#: pysollib/stack.py:1897 +#: pysollib/stack.py:1991 msgid "Foundation. Build up by suit." msgstr "" -#: pysollib/stack.py:1898 +#: pysollib/stack.py:1992 msgid "Foundation. Build down by suit." msgstr "" -#: pysollib/stack.py:1899 pysollib/stack.py:1915 pysollib/stack.py:1937 +#: pysollib/stack.py:1993 pysollib/stack.py:2009 pysollib/stack.py:2031 msgid "Foundation. Build by same rank." msgstr "" -#: pysollib/stack.py:1914 +#: pysollib/stack.py:2008 msgid "Foundation. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:1935 +#: pysollib/stack.py:2029 msgid "Foundation. Build up by alternate color." msgstr "" -#: pysollib/stack.py:1936 +#: pysollib/stack.py:2030 msgid "Foundation. Build down by alternate color." msgstr "" -#: pysollib/stack.py:2010 +#: pysollib/stack.py:2104 msgid "Tableau. Build up by alternate color." msgstr "" -#: pysollib/stack.py:2011 +#: pysollib/stack.py:2105 msgid "Tableau. Build down by alternate color." msgstr "" -#: pysollib/stack.py:2012 pysollib/stack.py:2022 pysollib/stack.py:2031 -#: pysollib/stack.py:2040 pysollib/stack.py:2050 pysollib/stack.py:2073 -#: pysollib/stack.py:2083 +#: pysollib/stack.py:2106 pysollib/stack.py:2116 pysollib/stack.py:2125 +#: pysollib/stack.py:2134 pysollib/stack.py:2144 pysollib/stack.py:2167 +#: pysollib/stack.py:2177 msgid "Tableau. Build by same rank." msgstr "" -#: pysollib/stack.py:2020 +#: pysollib/stack.py:2114 msgid "Tableau. Build up by color." msgstr "" -#: pysollib/stack.py:2021 +#: pysollib/stack.py:2115 msgid "Tableau. Build down by color." msgstr "" -#: pysollib/stack.py:2029 +#: pysollib/stack.py:2123 msgid "Tableau. Build up by suit." msgstr "" -#: pysollib/stack.py:2030 +#: pysollib/stack.py:2124 msgid "Tableau. Build down by suit." msgstr "" -#: pysollib/stack.py:2038 +#: pysollib/stack.py:2132 msgid "Tableau. Build up regardless of suit." msgstr "" -#: pysollib/stack.py:2039 +#: pysollib/stack.py:2133 msgid "Tableau. Build down regardless of suit." msgstr "" -#: pysollib/stack.py:2048 +#: pysollib/stack.py:2142 msgid "Tableau. Build up in any suit but the same." msgstr "" -#: pysollib/stack.py:2049 +#: pysollib/stack.py:2143 msgid "Tableau. Build down in any suit but the same." msgstr "" -#: pysollib/stack.py:2071 +#: pysollib/stack.py:2165 msgid "" "Tableau. Build up regardless of suit. Sequences of cards in alternate color " "can be moved as a unit." msgstr "" -#: pysollib/stack.py:2072 +#: pysollib/stack.py:2166 msgid "" "Tableau. Build down regardless of suit. Sequences of cards in alternate " "color can be moved as a unit." msgstr "" -#: pysollib/stack.py:2081 +#: pysollib/stack.py:2175 msgid "" "Tableau. Build up regardless of suit. Sequences of cards in the same suit " "can be moved as a unit." msgstr "" -#: pysollib/stack.py:2082 +#: pysollib/stack.py:2176 msgid "" "Tableau. Build down regardless of suit. Sequences of cards in the same suit " "can be moved as a unit." msgstr "" -#: pysollib/stack.py:2104 +#: pysollib/stack.py:2198 msgid "" "Tableau. Build up by alternate color, can move any face-up cards regardless " "of sequence." msgstr "" -#: pysollib/stack.py:2105 +#: pysollib/stack.py:2199 msgid "" "Tableau. Build down by alternate color, can move any face-up cards " "regardless of sequence." msgstr "" -#: pysollib/stack.py:2106 pysollib/stack.py:2119 +#: pysollib/stack.py:2200 pysollib/stack.py:2213 msgid "" "Tableau. Build by same rank, can move any face-up cards regardless of " "sequence." msgstr "" -#: pysollib/stack.py:2117 +#: pysollib/stack.py:2211 msgid "" "Tableau. Build up by suit, can move any face-up cards regardless of sequence." msgstr "" -#: pysollib/stack.py:2118 +#: pysollib/stack.py:2212 msgid "" "Tableau. Build down by suit, can move any face-up cards regardless of " "sequence." msgstr "" -#: pysollib/stack.py:2151 +#: pysollib/stack.py:2245 msgid "Tableau. Build up or down by color." msgstr "" -#: pysollib/stack.py:2162 +#: pysollib/stack.py:2256 msgid "Tableau. Build up or down by alternate color." msgstr "" -#: pysollib/stack.py:2173 +#: pysollib/stack.py:2267 msgid "Tableau. Build up or down by suit." msgstr "" -#: pysollib/stack.py:2184 +#: pysollib/stack.py:2278 msgid "Tableau. Build up or down regardless of suit." msgstr "" -#: pysollib/stack.py:2195 +#: pysollib/stack.py:2289 msgid "Waste." msgstr "" -#: pysollib/stack.py:2295 +#: pysollib/stack.py:2389 msgid "Free cell." msgstr "" @@ -1818,10 +1818,11 @@ msgid "Lost" msgstr "" #: pysollib/stats.py:122 pysollib/tk/statusbar.py:156 +#: data/glade-translations:25 msgid "Playing time" msgstr "" -#: pysollib/stats.py:123 +#: pysollib/stats.py:123 data/glade-translations:26 msgid "Moves" msgstr "" @@ -1870,40 +1871,48 @@ msgstr "" msgid "Perfect" msgstr "" -#: pysollib/tk/colorsdialog.py:71 +#: pysollib/tk/colorsdialog.py:71 data/glade-translations:41 msgid "Text foreground:" msgstr "" #: pysollib/tk/colorsdialog.py:76 pysollib/tk/colorsdialog.py:94 -#: pysollib/tk/fontsdialog.py:186 +#: pysollib/tk/fontsdialog.py:186 data/glade-translations:49 +#: data/glade-translations:50 data/glade-translations:51 +#: data/glade-translations:52 data/glade-translations:53 +#: data/glade-translations:54 data/glade-translations:55 +#: data/glade-translations:56 data/glade-translations:65 +#: data/glade-translations:66 data/glade-translations:67 +#: data/glade-translations:68 data/glade-translations:69 +#: data/glade-translations:70 data/glade-translations:71 msgid "Change..." msgstr "" #: pysollib/tk/colorsdialog.py:81 pysollib/tk/timeoutsdialog.py:68 +#: data/glade-translations:37 data/glade-translations:42 msgid "Highlight piles:" msgstr "" -#: pysollib/tk/colorsdialog.py:82 +#: pysollib/tk/colorsdialog.py:82 data/glade-translations:43 msgid "Highlight cards 1:" msgstr "" -#: pysollib/tk/colorsdialog.py:83 +#: pysollib/tk/colorsdialog.py:83 data/glade-translations:44 msgid "Highlight cards 2:" msgstr "" -#: pysollib/tk/colorsdialog.py:84 +#: pysollib/tk/colorsdialog.py:84 data/glade-translations:45 msgid "Highlight same rank 1:" msgstr "" -#: pysollib/tk/colorsdialog.py:85 +#: pysollib/tk/colorsdialog.py:85 data/glade-translations:46 msgid "Highlight same rank 2:" msgstr "" -#: pysollib/tk/colorsdialog.py:86 +#: pysollib/tk/colorsdialog.py:86 data/glade-translations:47 msgid "Hint arrow:" msgstr "" -#: pysollib/tk/colorsdialog.py:87 +#: pysollib/tk/colorsdialog.py:87 data/glade-translations:48 msgid "Highlight not matching:" msgstr "" @@ -1911,7 +1920,7 @@ msgstr "" msgid "Select color" msgstr "" -#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:328 +#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:435 msgid "Find card" msgstr "" @@ -1927,31 +1936,31 @@ msgstr "" msgid "Italic" msgstr "" -#: pysollib/tk/fontsdialog.py:168 +#: pysollib/tk/fontsdialog.py:168 data/glade-translations:58 msgid "HTML: " msgstr "" -#: pysollib/tk/fontsdialog.py:169 +#: pysollib/tk/fontsdialog.py:169 data/glade-translations:59 msgid "Small: " msgstr "" -#: pysollib/tk/fontsdialog.py:170 +#: pysollib/tk/fontsdialog.py:170 data/glade-translations:60 msgid "Fixed: " msgstr "" -#: pysollib/tk/fontsdialog.py:171 +#: pysollib/tk/fontsdialog.py:171 data/glade-translations:61 msgid "Tableau default: " msgstr "" -#: pysollib/tk/fontsdialog.py:172 +#: pysollib/tk/fontsdialog.py:172 data/glade-translations:62 msgid "Tableau fixed: " msgstr "" -#: pysollib/tk/fontsdialog.py:173 +#: pysollib/tk/fontsdialog.py:173 data/glade-translations:64 msgid "Tableau large: " msgstr "" -#: pysollib/tk/fontsdialog.py:174 +#: pysollib/tk/fontsdialog.py:174 data/glade-translations:63 msgid "Tableau small: " msgstr "" @@ -1959,484 +1968,500 @@ msgstr "" msgid "Select font" msgstr "" -#: pysollib/tk/menubar.py:74 +#: pysollib/tk/menubar.py:75 msgid "Style" msgstr "" -#: pysollib/tk/menubar.py:83 +#: pysollib/tk/menubar.py:84 msgid "Relief" msgstr "" -#: pysollib/tk/menubar.py:84 +#: pysollib/tk/menubar.py:85 msgid "Flat" msgstr "" -#: pysollib/tk/menubar.py:88 +#: pysollib/tk/menubar.py:89 msgid "Raised" msgstr "" -#: pysollib/tk/menubar.py:93 +#: pysollib/tk/menubar.py:94 msgid "Compound" msgstr "" -#: pysollib/tk/menubar.py:99 +#: pysollib/tk/menubar.py:100 msgid "Hide" msgstr "" -#: pysollib/tk/menubar.py:102 +#: pysollib/tk/menubar.py:103 msgid "Top" msgstr "" -#: pysollib/tk/menubar.py:105 +#: pysollib/tk/menubar.py:106 msgid "Bottom" msgstr "" -#: pysollib/tk/menubar.py:108 +#: pysollib/tk/menubar.py:109 msgid "Left" msgstr "" -#: pysollib/tk/menubar.py:111 +#: pysollib/tk/menubar.py:112 msgid "Right" msgstr "" -#: pysollib/tk/menubar.py:115 +#: pysollib/tk/menubar.py:116 msgid "Small icons" msgstr "" -#: pysollib/tk/menubar.py:118 +#: pysollib/tk/menubar.py:119 msgid "Large icons" msgstr "" -#: pysollib/tk/menubar.py:124 +#: pysollib/tk/menubar.py:125 msgid "Customize toolbar" msgstr "" -#: pysollib/tk/menubar.py:255 +#: pysollib/tk/menubar.py:362 msgid "&File" msgstr "" -#: pysollib/tk/menubar.py:257 +#: pysollib/tk/menubar.py:364 msgid "R&ecent games" msgstr "" -#: pysollib/tk/menubar.py:259 +#: pysollib/tk/menubar.py:366 msgid "Select &random game" msgstr "" -#: pysollib/tk/menubar.py:260 +#: pysollib/tk/menubar.py:367 msgid "&All games" msgstr "" -#: pysollib/tk/menubar.py:261 +#: pysollib/tk/menubar.py:368 msgid "Games played and &won" msgstr "" -#: pysollib/tk/menubar.py:262 +#: pysollib/tk/menubar.py:369 msgid "Games played and ¬ won" msgstr "" -#: pysollib/tk/menubar.py:263 +#: pysollib/tk/menubar.py:370 msgid "Games not &played" msgstr "" -#: pysollib/tk/menubar.py:264 +#: pysollib/tk/menubar.py:371 msgid "Select game by nu&mber..." msgstr "" -#: pysollib/tk/menubar.py:266 +#: pysollib/tk/menubar.py:373 msgid "Fa&vorite games" msgstr "" -#: pysollib/tk/menubar.py:267 +#: pysollib/tk/menubar.py:374 msgid "A&dd to favorites" msgstr "" -#: pysollib/tk/menubar.py:268 +#: pysollib/tk/menubar.py:375 msgid "R&emove from favorites" msgstr "" -#: pysollib/tk/menubar.py:270 +#: pysollib/tk/menubar.py:377 msgid "&Open..." msgstr "" -#: pysollib/tk/menubar.py:271 +#: pysollib/tk/menubar.py:378 msgid "&Save" msgstr "" -#: pysollib/tk/menubar.py:272 +#: pysollib/tk/menubar.py:379 msgid "Save &as..." msgstr "" -#: pysollib/tk/menubar.py:274 +#: pysollib/tk/menubar.py:381 msgid "&Hold and quit" msgstr "" -#: pysollib/tk/menubar.py:279 pysollib/tk/selectgame.py:407 +#: pysollib/tk/menubar.py:386 pysollib/tk/selectgame.py:407 msgid "&Select" msgstr "" -#: pysollib/tk/menubar.py:284 +#: pysollib/tk/menubar.py:391 msgid "&Edit" msgstr "" -#: pysollib/tk/menubar.py:285 +#: pysollib/tk/menubar.py:392 msgid "&Undo" msgstr "" -#: pysollib/tk/menubar.py:286 +#: pysollib/tk/menubar.py:393 msgid "&Redo" msgstr "" -#: pysollib/tk/menubar.py:287 +#: pysollib/tk/menubar.py:394 msgid "Redo &all" msgstr "" -#: pysollib/tk/menubar.py:290 +#: pysollib/tk/menubar.py:397 msgid "&Set bookmark" msgstr "" -#: pysollib/tk/menubar.py:292 pysollib/tk/menubar.py:296 +#: pysollib/tk/menubar.py:399 pysollib/tk/menubar.py:403 msgid "Bookmark %d" msgstr "" -#: pysollib/tk/menubar.py:294 +#: pysollib/tk/menubar.py:401 msgid "Go&to bookmark" msgstr "" -#: pysollib/tk/menubar.py:299 +#: pysollib/tk/menubar.py:406 msgid "&Clear bookmarks" msgstr "" -#: pysollib/tk/menubar.py:302 pysollib/tk/toolbar.py:198 +#: pysollib/tk/menubar.py:409 pysollib/tk/toolbar.py:198 msgid "Restart" msgstr "" -#: pysollib/tk/menubar.py:304 +#: pysollib/tk/menubar.py:411 msgid "&Game" msgstr "" -#: pysollib/tk/menubar.py:305 +#: pysollib/tk/menubar.py:412 msgid "&Deal cards" msgstr "" -#: pysollib/tk/menubar.py:306 +#: pysollib/tk/menubar.py:413 msgid "&Auto drop" msgstr "" -#: pysollib/tk/menubar.py:307 +#: pysollib/tk/menubar.py:414 msgid "&Pause" msgstr "" -#: pysollib/tk/menubar.py:310 +#: pysollib/tk/menubar.py:417 msgid "S&tatus..." msgstr "" -#: pysollib/tk/menubar.py:311 +#: pysollib/tk/menubar.py:418 msgid "&Comments..." msgstr "" -#: pysollib/tk/menubar.py:313 +#: pysollib/tk/menubar.py:420 msgid "&Statistics" msgstr "" -#: pysollib/tk/menubar.py:314 pysollib/tk/menubar.py:322 +#: pysollib/tk/menubar.py:421 pysollib/tk/menubar.py:429 msgid "Current game..." msgstr "" -#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 +#: pysollib/tk/menubar.py:422 pysollib/tk/menubar.py:430 msgid "All games..." msgstr "" -#: pysollib/tk/menubar.py:317 +#: pysollib/tk/menubar.py:424 msgid "Session log..." msgstr "" -#: pysollib/tk/menubar.py:318 +#: pysollib/tk/menubar.py:425 msgid "Full log..." msgstr "" -#: pysollib/tk/menubar.py:321 +#: pysollib/tk/menubar.py:428 msgid "D&emo statistics" msgstr "" -#: pysollib/tk/menubar.py:325 +#: pysollib/tk/menubar.py:432 msgid "&Assist" msgstr "" -#: pysollib/tk/menubar.py:326 +#: pysollib/tk/menubar.py:433 msgid "&Hint" msgstr "" -#: pysollib/tk/menubar.py:327 +#: pysollib/tk/menubar.py:434 msgid "Highlight p&iles" msgstr "" -#: pysollib/tk/menubar.py:330 +#: pysollib/tk/menubar.py:437 msgid "&Demo" msgstr "" -#: pysollib/tk/menubar.py:331 +#: pysollib/tk/menubar.py:438 msgid "Demo (&all games)" msgstr "" -#: pysollib/tk/menubar.py:333 +#: pysollib/tk/menubar.py:440 msgid "Piles description" msgstr "" -#: pysollib/tk/menubar.py:337 +#: pysollib/tk/menubar.py:444 msgid "&Options" msgstr "" -#: pysollib/tk/menubar.py:338 +#: pysollib/tk/menubar.py:445 msgid "&Player options..." msgstr "" -#: pysollib/tk/menubar.py:339 +#: pysollib/tk/menubar.py:446 msgid "&Automatic play" msgstr "" -#: pysollib/tk/menubar.py:340 +#: pysollib/tk/menubar.py:447 msgid "Auto &face up" msgstr "" -#: pysollib/tk/menubar.py:341 +#: pysollib/tk/menubar.py:448 msgid "A&uto drop" msgstr "" -#: pysollib/tk/menubar.py:342 +#: pysollib/tk/menubar.py:449 msgid "Auto &deal" msgstr "" -#: pysollib/tk/menubar.py:344 +#: pysollib/tk/menubar.py:451 msgid "&Quick play" msgstr "" -#: pysollib/tk/menubar.py:345 +#: pysollib/tk/menubar.py:452 msgid "Assist &level" msgstr "" -#: pysollib/tk/menubar.py:346 +#: pysollib/tk/menubar.py:453 msgid "Enable &undo" msgstr "" -#: pysollib/tk/menubar.py:347 +#: pysollib/tk/menubar.py:454 msgid "Enable &bookmarks" msgstr "" -#: pysollib/tk/menubar.py:348 +#: pysollib/tk/menubar.py:455 msgid "Enable &hint" msgstr "" -#: pysollib/tk/menubar.py:349 +#: pysollib/tk/menubar.py:456 msgid "Enable highlight p&iles" msgstr "" -#: pysollib/tk/menubar.py:350 +#: pysollib/tk/menubar.py:457 msgid "Enable highlight &cards" msgstr "" -#: pysollib/tk/menubar.py:351 +#: pysollib/tk/menubar.py:458 msgid "Enable highlight same &rank" msgstr "" -#: pysollib/tk/menubar.py:352 +#: pysollib/tk/menubar.py:459 msgid "Highlight &no matching" msgstr "" -#: pysollib/tk/menubar.py:354 +#: pysollib/tk/menubar.py:461 msgid "&Show removed tiles (in Mahjongg games)" msgstr "" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:462 msgid "Show hint &arrow (in Shisen-Sho games)" msgstr "" -#: pysollib/tk/menubar.py:357 +#: pysollib/tk/menubar.py:464 msgid "&Sound..." msgstr "" -#: pysollib/tk/menubar.py:365 +#: pysollib/tk/menubar.py:472 msgid "Cards&et..." msgstr "" -#: pysollib/tk/menubar.py:366 +#: pysollib/tk/menubar.py:473 msgid "Table t&ile..." msgstr "" -#: pysollib/tk/menubar.py:368 +#: pysollib/tk/menubar.py:475 msgid "Card &background" msgstr "" -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:476 msgid "Card &view" msgstr "" -#: pysollib/tk/menubar.py:370 +#: pysollib/tk/menubar.py:477 msgid "Card shado&w" msgstr "" -#: pysollib/tk/menubar.py:371 +#: pysollib/tk/menubar.py:478 msgid "Shade &legal moves" msgstr "" -#: pysollib/tk/menubar.py:372 +#: pysollib/tk/menubar.py:479 msgid "&Negative cards bottom" msgstr "" -#: pysollib/tk/menubar.py:373 +#: pysollib/tk/menubar.py:480 msgid "Shrink face-down cards" msgstr "" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:481 msgid "Shade &filled stacks" msgstr "" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:482 msgid "A&nimations" msgstr "" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:483 msgid "&None" msgstr "" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:484 msgid "&Timer based" msgstr "" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:485 msgid "&Fast" msgstr "" -#: pysollib/tk/menubar.py:379 +#: pysollib/tk/menubar.py:486 msgid "&Slow" msgstr "" -#: pysollib/tk/menubar.py:380 +#: pysollib/tk/menubar.py:487 msgid "&Very slow" msgstr "" -#: pysollib/tk/menubar.py:381 -msgid "Stick&y mouse" +#: pysollib/tk/menubar.py:488 +msgid "&Mouse" msgstr "" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:489 +msgid "&Drag-and-Drop" +msgstr "" + +#: pysollib/tk/menubar.py:490 +msgid "&Point-and-Click" +msgstr "" + +#: pysollib/tk/menubar.py:491 +msgid "&Sticky mouse" +msgstr "" + +#: pysollib/tk/menubar.py:493 msgid "Use mouse for undo/redo" msgstr "" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:495 msgid "&Fonts..." msgstr "" -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:496 msgid "&Colors..." msgstr "" -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:497 msgid "Time&outs..." msgstr "" -#: pysollib/tk/menubar.py:388 +#: pysollib/tk/menubar.py:499 msgid "&Toolbar" msgstr "" -#: pysollib/tk/menubar.py:390 +#: pysollib/tk/menubar.py:501 msgid "Stat&usbar" msgstr "" -#: pysollib/tk/menubar.py:391 +#: pysollib/tk/menubar.py:502 msgid "Show &statusbar" msgstr "" -#: pysollib/tk/menubar.py:392 +#: pysollib/tk/menubar.py:503 msgid "Show &number of cards" msgstr "" -#: pysollib/tk/menubar.py:393 +#: pysollib/tk/menubar.py:504 msgid "Show &help bar" msgstr "" -#: pysollib/tk/menubar.py:394 +#: pysollib/tk/menubar.py:505 msgid "Save games &geometry" msgstr "" -#: pysollib/tk/menubar.py:395 +#: pysollib/tk/menubar.py:506 msgid "&Demo logo" msgstr "" -#: pysollib/tk/menubar.py:396 +#: pysollib/tk/menubar.py:507 msgid "Startup splash sc&reen" msgstr "" -#: pysollib/tk/menubar.py:402 +#: pysollib/tk/menubar.py:513 msgid "&Help" msgstr "" -#: pysollib/tk/menubar.py:403 +#: pysollib/tk/menubar.py:514 msgid "&Contents" msgstr "" -#: pysollib/tk/menubar.py:404 +#: pysollib/tk/menubar.py:515 msgid "&How to play" msgstr "" -#: pysollib/tk/menubar.py:405 +#: pysollib/tk/menubar.py:516 msgid "&Rules for this game" msgstr "" -#: pysollib/tk/menubar.py:406 +#: pysollib/tk/menubar.py:517 msgid "&License terms" msgstr "" -#: pysollib/tk/menubar.py:409 +#: pysollib/tk/menubar.py:520 msgid "&About " msgstr "" -#: pysollib/tk/menubar.py:521 +#: pysollib/tk/menubar.py:632 msgid "All &games..." msgstr "" -#: pysollib/tk/menubar.py:523 +#: pysollib/tk/menubar.py:634 msgid "Playable pre&view..." msgstr "" -#: pysollib/tk/menubar.py:572 +#: pysollib/tk/menubar.py:683 msgid "&Mahjongg games" msgstr "" -#: pysollib/tk/menubar.py:610 +#: pysollib/tk/menubar.py:721 msgid "&Popular games" msgstr "" -#: pysollib/tk/menubar.py:618 +#: pysollib/tk/menubar.py:729 msgid "&French games" msgstr "" -#: pysollib/tk/menubar.py:625 +#: pysollib/tk/menubar.py:736 msgid "&Oriental games" msgstr "" -#: pysollib/tk/menubar.py:633 +#: pysollib/tk/menubar.py:744 msgid "&Special games" msgstr "" -#: pysollib/tk/menubar.py:639 +#: pysollib/tk/menubar.py:750 msgid "&All games by name" msgstr "" -#: pysollib/tk/menubar.py:1000 pysollib/tk/menubar.py:1002 -#: pysollib/tk/selectcardset.py:240 +#: pysollib/tk/menubar.py:1023 data/glade-translations:72 +msgid "Sound settings" +msgstr "" + +#: pysollib/tk/menubar.py:1122 pysollib/tk/menubar.py:1124 +#: pysollib/tk/selectcardset.py:241 msgid "&Load" msgstr "" -#: pysollib/tk/menubar.py:1002 +#: pysollib/tk/menubar.py:1124 msgid "&Info..." msgstr "" -#: pysollib/tk/menubar.py:1005 +#: pysollib/tk/menubar.py:1127 msgid "Select " msgstr "" -#: pysollib/tk/menubar.py:1066 +#: pysollib/tk/menubar.py:1179 msgid "Select table background" msgstr "" @@ -2515,27 +2540,27 @@ msgstr "" msgid "XLarge cardsets" msgstr "" -#: pysollib/tk/selectcardset.py:319 +#: pysollib/tk/selectcardset.py:320 msgid "About cardset" msgstr "" -#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:365 +#: pysollib/tk/selectcardset.py:336 pysollib/tk/selectgame.py:365 msgid "Type:" msgstr "" -#: pysollib/tk/selectcardset.py:336 +#: pysollib/tk/selectcardset.py:337 msgid "Styles:" msgstr "" -#: pysollib/tk/selectcardset.py:337 +#: pysollib/tk/selectcardset.py:338 msgid "Nationality:" msgstr "" -#: pysollib/tk/selectcardset.py:338 +#: pysollib/tk/selectcardset.py:339 msgid "Year:" msgstr "" -#: pysollib/tk/selectcardset.py:340 +#: pysollib/tk/selectcardset.py:341 msgid "Size:" msgstr "" @@ -2756,20 +2781,24 @@ msgid "Played:" msgstr "" #: pysollib/tk/selectgame.py:371 pysollib/tk/tkstats.py:111 -#: pysollib/tk/tkstats.py:163 +#: pysollib/tk/tkstats.py:163 data/glade-translations:9 +#: data/glade-translations:13 msgid "Won:" msgstr "" #: pysollib/tk/selectgame.py:372 pysollib/tk/tkstats.py:112 -#: pysollib/tk/tkstats.py:164 +#: pysollib/tk/tkstats.py:164 data/glade-translations:11 +#: data/glade-translations:14 msgid "Lost:" msgstr "" #: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:805 +#: data/glade-translations:18 msgid "Playing time:" msgstr "" #: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:812 +#: data/glade-translations:19 msgid "Moves:" msgstr "" @@ -2817,11 +2846,11 @@ msgstr "" msgid "All Backgrounds" msgstr "" -#: pysollib/tk/selecttile.py:158 +#: pysollib/tk/selecttile.py:159 msgid "&Solid color..." msgstr "" -#: pysollib/tk/selecttile.py:177 +#: pysollib/tk/selecttile.py:178 msgid "Select table color" msgstr "" @@ -2897,7 +2926,7 @@ msgstr "" msgid "Perfect game" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:111 +#: pysollib/tk/soundoptionsdialog.py:111 data/glade-translations:73 msgid "Sound enabled" msgstr "" @@ -2905,15 +2934,15 @@ msgstr "" msgid "Use DirectX for sound playing" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:123 +#: pysollib/tk/soundoptionsdialog.py:123 data/glade-translations:74 msgid "Sample volume:" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:131 +#: pysollib/tk/soundoptionsdialog.py:131 data/glade-translations:75 msgid "Music volume:" msgstr "" -#: pysollib/tk/soundoptionsdialog.py:144 +#: pysollib/tk/soundoptionsdialog.py:144 data/glade-translations:76 msgid "Enable samles" msgstr "" @@ -2939,39 +2968,39 @@ msgstr "" msgid "Games played: won/lost" msgstr "" -#: pysollib/tk/timeoutsdialog.py:65 +#: pysollib/tk/timeoutsdialog.py:65 data/glade-translations:34 msgid "Demo:" msgstr "" -#: pysollib/tk/timeoutsdialog.py:66 +#: pysollib/tk/timeoutsdialog.py:66 data/glade-translations:35 msgid "Hint:" msgstr "" -#: pysollib/tk/timeoutsdialog.py:67 +#: pysollib/tk/timeoutsdialog.py:67 data/glade-translations:36 msgid "Raise card:" msgstr "" -#: pysollib/tk/timeoutsdialog.py:69 +#: pysollib/tk/timeoutsdialog.py:69 data/glade-translations:38 msgid "Highlight cards:" msgstr "" -#: pysollib/tk/timeoutsdialog.py:70 +#: pysollib/tk/timeoutsdialog.py:70 data/glade-translations:39 msgid "Highlight same rank:" msgstr "" -#: pysollib/tk/tkconst.py:101 +#: pysollib/tk/tkconst.py:103 msgid "Icons only" msgstr "" -#: pysollib/tk/tkconst.py:102 +#: pysollib/tk/tkconst.py:104 msgid "Text below icons" msgstr "" -#: pysollib/tk/tkconst.py:103 +#: pysollib/tk/tkconst.py:105 msgid "Text beside icons" msgstr "" -#: pysollib/tk/tkconst.py:104 +#: pysollib/tk/tkconst.py:106 msgid "Text only" msgstr "" @@ -3005,15 +3034,16 @@ msgstr "" msgid "Unable to service request:\n" msgstr "" -#: pysollib/tk/tkstats.py:95 +#: pysollib/tk/tkstats.py:95 data/glade-translations:16 msgid "Total" msgstr "" -#: pysollib/tk/tkstats.py:97 +#: pysollib/tk/tkstats.py:97 data/glade-translations:12 msgid "Current session" msgstr "" #: pysollib/tk/tkstats.py:113 pysollib/tk/tkstats.py:165 +#: data/glade-translations:10 data/glade-translations:15 msgid "Total:" msgstr "" @@ -3146,19 +3176,19 @@ msgstr "" msgid "Result" msgstr "" -#: pysollib/tk/tkstats.py:797 +#: pysollib/tk/tkstats.py:797 data/glade-translations:21 msgid "Minimum" msgstr "" -#: pysollib/tk/tkstats.py:798 +#: pysollib/tk/tkstats.py:798 data/glade-translations:22 msgid "Maximum" msgstr "" -#: pysollib/tk/tkstats.py:799 +#: pysollib/tk/tkstats.py:799 data/glade-translations:23 msgid "Average" msgstr "" -#: pysollib/tk/tkstats.py:819 +#: pysollib/tk/tkstats.py:819 data/glade-translations:20 msgid "Total moves:" msgstr "" diff --git a/po/ru_games.po b/po/ru_games.po index 4ac934f4..208b853a 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Aug 22 21:32:47 2006\n" +"POT-Creation-Date: Thu Sep 21 15:56:22 2006\n" "PO-Revision-Date: 2006-09-17 17:05+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 7c1399a3..6f4b6af4 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" -"POT-Creation-Date: Tue Aug 22 21:33:40 2006\n" -"PO-Revision-Date: 2006-08-22 21:34+0400\n" +"POT-Creation-Date: Thu Sep 21 15:57:22 2006\n" +"PO-Revision-Date: 2006-09-21 15:58+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -14,32 +14,32 @@ msgstr "" "Content-Transfer-Encoding: utf-8\n" "Generated-By: pygettext.py 1.5\n" -#: pysollib/actions.py:358 pysollib/tk/toolbar.py:197 +#: pysollib/actions.py:260 pysollib/tk/toolbar.py:197 msgid "New game" msgstr "Новая игра" -#: pysollib/actions.py:371 pysollib/tk/menubar.py:704 -#: pysollib/tk/menubar.py:718 +#: pysollib/actions.py:273 pysollib/tk/menubar.py:815 +#: pysollib/tk/menubar.py:829 msgid "Select game" msgstr "Выбрать игру" -#: pysollib/actions.py:388 +#: pysollib/actions.py:287 msgid "Invalid game number" msgstr "Неправильный номер игры" -#: pysollib/actions.py:389 +#: pysollib/actions.py:288 msgid "Invalid game number\n" msgstr "Неправильный номер игры\n" -#: pysollib/actions.py:406 +#: pysollib/actions.py:305 msgid "Select next game number" msgstr "Выберите номер следующей игры" -#: pysollib/actions.py:415 pysollib/actions.py:425 +#: pysollib/actions.py:314 pysollib/actions.py:324 msgid "Select new game number" msgstr "Выберите номер новой игры" -#: pysollib/actions.py:416 +#: pysollib/actions.py:315 msgid "" "\n" "\n" @@ -49,18 +49,18 @@ msgstr "" "\n" "Введите номер новой игры" -#: pysollib/actions.py:417 +#: pysollib/actions.py:316 msgid "&Next number" msgstr "&Следующий номер" -#: pysollib/actions.py:417 pysollib/app.py:1150 pysollib/app.py:1162 -#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:439 -#: pysollib/main.py:447 pysollib/tk/colorsdialog.py:122 +#: pysollib/actions.py:316 pysollib/app.py:1150 pysollib/app.py:1162 +#: pysollib/game.py:925 pysollib/game.py:1861 pysollib/main.py:460 +#: pysollib/main.py:468 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 #: pysollib/tk/fontsdialog.py:205 pysollib/tk/gameinfodialog.py:155 #: pysollib/tk/playeroptionsdialog.py:85 -#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 -#: pysollib/tk/selectcardset.py:396 pysollib/tk/selecttile.py:158 +#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 +#: pysollib/tk/selectcardset.py:397 pysollib/tk/selecttile.py:159 #: pysollib/tk/soundoptionsdialog.py:170 pysollib/tk/soundoptionsdialog.py:211 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkhtml.py:499 #: pysollib/tk/tkstats.py:288 pysollib/tk/tkstats.py:573 @@ -71,48 +71,48 @@ msgstr "&Следующий номер" msgid "&OK" msgstr "&ОК" -#: pysollib/actions.py:417 pysollib/app.py:1162 pysollib/game.py:925 +#: pysollib/actions.py:316 pysollib/app.py:1162 pysollib/game.py:925 #: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 #: pysollib/game.py:1339 pysollib/tk/colorsdialog.py:122 #: pysollib/tk/edittextdialog.py:82 pysollib/tk/fontsdialog.py:143 -#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1000 -#: pysollib/tk/menubar.py:1002 pysollib/tk/playeroptionsdialog.py:85 -#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:240 +#: pysollib/tk/fontsdialog.py:205 pysollib/tk/menubar.py:1122 +#: pysollib/tk/menubar.py:1124 pysollib/tk/playeroptionsdialog.py:85 +#: pysollib/tk/playeroptionsdialog.py:160 pysollib/tk/selectcardset.py:241 #: pysollib/tk/selectgame.py:266 pysollib/tk/selectgame.py:407 -#: pysollib/tk/selecttile.py:158 pysollib/tk/soundoptionsdialog.py:170 +#: pysollib/tk/selecttile.py:159 pysollib/tk/soundoptionsdialog.py:170 #: pysollib/tk/timeoutsdialog.py:92 pysollib/tk/tkwidget.py:324 msgid "&Cancel" msgstr "От&мена" -#: pysollib/actions.py:433 +#: pysollib/actions.py:332 msgid "Select random game" msgstr "Выбор случайной игры" -#: pysollib/actions.py:469 +#: pysollib/actions.py:368 msgid "Select next game" msgstr "Выбрать следующую игру" -#: pysollib/actions.py:502 pysollib/tk/toolbar.py:211 +#: pysollib/actions.py:401 pysollib/tk/toolbar.py:211 msgid "Quit " msgstr "Выйти из " -#: pysollib/actions.py:552 +#: pysollib/actions.py:451 msgid "Clear bookmarks" msgstr "Удалить закладки" -#: pysollib/actions.py:553 +#: pysollib/actions.py:452 msgid "Clear all bookmarks ?" msgstr "Удалить все закладки?" -#: pysollib/actions.py:563 +#: pysollib/actions.py:462 msgid "Restart game" msgstr "Начать игру с начала" -#: pysollib/actions.py:564 +#: pysollib/actions.py:463 msgid "Restart this game ?" msgstr "Начать игру с начала?" -#: pysollib/actions.py:605 +#: pysollib/actions.py:504 msgid "" "Comments for %s:\n" "\n" @@ -120,19 +120,19 @@ msgstr "" "Комментарий для %s:\n" "\n" -#: pysollib/actions.py:607 +#: pysollib/actions.py:506 msgid "Comments for " msgstr "Комментарий для " -#: pysollib/actions.py:625 pysollib/actions.py:661 +#: pysollib/actions.py:524 pysollib/actions.py:554 msgid "Error while writing to file" msgstr "Ошибка при записи в файл" -#: pysollib/actions.py:628 pysollib/actions.py:664 +#: pysollib/actions.py:527 pysollib/actions.py:557 msgid " Info" msgstr " Информация" -#: pysollib/actions.py:629 +#: pysollib/actions.py:528 msgid "" "Comments were appended to\n" "\n" @@ -140,15 +140,15 @@ msgstr "" "Комментарий добавлен в файл\n" "\n" -#: pysollib/actions.py:646 +#: pysollib/actions.py:539 msgid "Demo statistics" msgstr "Статистика демо" -#: pysollib/actions.py:649 +#: pysollib/actions.py:542 msgid "Your statistics" msgstr "Ваша статистика" -#: pysollib/actions.py:665 +#: pysollib/actions.py:558 msgid "" " were appended to\n" "\n" @@ -156,52 +156,52 @@ msgstr "" " добавлена в файл\n" "\n" -#: pysollib/actions.py:679 +#: pysollib/actions.py:572 msgid " Demo" msgstr " Демо" -#: pysollib/actions.py:679 +#: pysollib/actions.py:572 msgid " Demo " msgstr " Демо " -#: pysollib/actions.py:682 pysollib/actions.py:700 +#: pysollib/actions.py:575 pysollib/actions.py:593 msgid " for " msgstr " для " -#: pysollib/actions.py:688 pysollib/actions.py:707 +#: pysollib/actions.py:581 pysollib/actions.py:600 msgid "Statistics for " msgstr "Статистика игры " -#: pysollib/actions.py:691 pysollib/tk/selectgame.py:350 +#: pysollib/actions.py:584 pysollib/tk/selectgame.py:350 #: pysollib/tk/toolbar.py:208 msgid "Statistics" msgstr "Статистика" -#: pysollib/actions.py:694 +#: pysollib/actions.py:587 data/glade-translations:31 msgid "Full log" msgstr "Полный лог" -#: pysollib/actions.py:697 +#: pysollib/actions.py:590 data/glade-translations:32 msgid "Session log" msgstr "Лог сессии" -#: pysollib/actions.py:703 +#: pysollib/actions.py:596 msgid "Game Info" msgstr "Информация об игре" -#: pysollib/actions.py:712 +#: pysollib/actions.py:605 msgid "Full log for " msgstr "Полный лог для " -#: pysollib/actions.py:717 +#: pysollib/actions.py:610 msgid "Session log for " msgstr "Лог сессии для " -#: pysollib/actions.py:722 +#: pysollib/actions.py:615 msgid "Reset all statistics" msgstr "Очистить всю статистику" -#: pysollib/actions.py:723 +#: pysollib/actions.py:616 msgid "" "Reset ALL statistics and logs for player\n" "%s ?" @@ -209,11 +209,11 @@ msgstr "" "Очистить всю статистику и лог для игрока\n" "%s?" -#: pysollib/actions.py:729 +#: pysollib/actions.py:622 msgid "Reset game statistics" msgstr "Очистить статистику игры" -#: pysollib/actions.py:730 +#: pysollib/actions.py:623 msgid "" "Reset statistics and logs for player\n" "%s\n" @@ -225,27 +225,23 @@ msgstr "" "и игры\n" "%s?" -#: pysollib/actions.py:785 +#: pysollib/actions.py:678 msgid "Play demo" msgstr "Показать демо" -#: pysollib/actions.py:796 +#: pysollib/actions.py:689 msgid "Set player options" msgstr "Установить настройки игрока" -#: pysollib/actions.py:810 -msgid "Sound settings" -msgstr "Настройка звука" - -#: pysollib/actions.py:819 +#: pysollib/actions.py:703 data/glade-translations:40 msgid "Set colors" msgstr "Настроить цвета" -#: pysollib/actions.py:839 +#: pysollib/actions.py:723 msgid "Set fonts" msgstr "Настроить шрифт" -#: pysollib/actions.py:848 +#: pysollib/actions.py:732 data/glade-translations:33 msgid "Set timeouts" msgstr "Настроить таймауты" @@ -366,7 +362,7 @@ msgstr "" "%s\n" #: pysollib/game.py:1311 pysollib/game.py:1326 pysollib/game.py:1333 -#: pysollib/game.py:1339 pysollib/tk/menubar.py:256 +#: pysollib/game.py:1339 pysollib/tk/menubar.py:363 msgid "&New game" msgstr "&Новая игра" @@ -763,12 +759,12 @@ msgstr "" "4: 8 Д 3 7 В 2 6 10 Т 5 9 К" #: pysollib/games/canfield.py:528 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1326 pysollib/util.py:80 +#: pysollib/stack.py:1410 pysollib/util.py:80 msgid "King" msgstr "Король" #: pysollib/games/canfield.py:531 pysollib/games/special/tarock.py:224 -#: pysollib/stack.py:1325 pysollib/util.py:80 +#: pysollib/stack.py:1409 pysollib/util.py:80 msgid "Queen" msgstr "Королева" @@ -786,11 +782,11 @@ msgid "X" msgstr "Х" #: pysollib/games/golf.py:114 pysollib/games/golf.py:300 -#: pysollib/stack.py:1980 +#: pysollib/stack.py:2074 msgid "Tableau. No building." msgstr "Игровой стол. Без выкладывания." -#: pysollib/games/golf.py:385 pysollib/stack.py:1913 +#: pysollib/games/golf.py:385 pysollib/stack.py:2007 msgid "Foundation. Build up regardless of suit." msgstr "Базовая ячейка. Складывать по возрастанию не считаясь с мастью." @@ -802,11 +798,11 @@ msgstr "Баланс $%d" msgid "Reserve. Only Kings are acceptable." msgstr "Резерв. Только для королей." -#: pysollib/games/larasgame.py:163 pysollib/stack.py:1542 +#: pysollib/games/larasgame.py:163 pysollib/stack.py:1626 msgid "Round %d" msgstr "Раунд %d" -#: pysollib/games/mahjongg/mahjongg.py:298 +#: pysollib/games/mahjongg/mahjongg.py:305 msgid "" "No Free\n" "Matching\n" @@ -816,7 +812,7 @@ msgstr "" "свободных\n" "пар" -#: pysollib/games/mahjongg/mahjongg.py:299 +#: pysollib/games/mahjongg/mahjongg.py:306 msgid "" "1 Free\n" "Matching\n" @@ -826,7 +822,7 @@ msgstr "" "свободная\n" "пара" -#: pysollib/games/mahjongg/mahjongg.py:300 +#: pysollib/games/mahjongg/mahjongg.py:307 msgid "" " Free\n" "Matching\n" @@ -836,7 +832,7 @@ msgstr "" "свободных\n" "пар" -#: pysollib/games/mahjongg/mahjongg.py:301 +#: pysollib/games/mahjongg/mahjongg.py:308 msgid "" "\n" "Tiles\n" @@ -847,7 +843,7 @@ msgstr "" "удалено\n" "\n" -#: pysollib/games/mahjongg/mahjongg.py:302 +#: pysollib/games/mahjongg/mahjongg.py:309 msgid "" "\n" "Tiles\n" @@ -931,7 +927,7 @@ msgstr "Жезлы" #: pysollib/games/special/tarock.py:223 #: pysollib/games/ultra/dashavatara.py:351 #: pysollib/games/ultra/hexadeck.py:273 pysollib/games/ultra/mughal.py:254 -#: pysollib/stack.py:1327 pysollib/util.py:79 +#: pysollib/stack.py:1411 pysollib/util.py:79 msgid "Ace" msgstr "Туз" @@ -1339,11 +1335,11 @@ msgstr "Не найден файл помощи\n" msgid " Help" msgstr " Помощь" -#: pysollib/main.py:66 pysollib/main.py:348 +#: pysollib/main.py:67 pysollib/main.py:368 msgid " installation error" msgstr " проблема с установкой" -#: pysollib/main.py:67 +#: pysollib/main.py:68 msgid "" "No %ss were found !!!\n" "\n" @@ -1353,11 +1349,11 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:74 pysollib/main.py:356 pysollib/tk/menubar.py:275 +#: pysollib/main.py:75 pysollib/main.py:376 pysollib/tk/menubar.py:382 msgid "&Quit" msgstr "В&ыход" -#: pysollib/main.py:96 +#: pysollib/main.py:98 msgid "" "%s: %s\n" "try %s --help for more information" @@ -1365,18 +1361,23 @@ msgstr "" "%s: %s\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:133 +#: pysollib/main.py:139 +#, fuzzy msgid "" "Usage: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME start game GAMENAME\n" +" -i --gameid=GAMEID\n" +" --french-only\n" " --fg --foreground=COLOR foreground color\n" " --bg --background=COLOR background color\n" " --fn --font=FONT default font\n" +" --sound-mod=MOD\n" " --nosound disable sound support\n" " --noplugins disable load plugins\n" " -h --help display this help and exit\n" "\n" " FILE - file name of a saved game\n" +" MOD - one of following: pss(default), pygame, oss, win\n" msgstr "" "Испльзование: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME начинать с игры GAMENAME\n" @@ -1389,7 +1390,7 @@ msgstr "" "\n" " FILE - имя файла сохраненной игры\n" -#: pysollib/main.py:147 +#: pysollib/main.py:157 msgid "" "%s: too many files\n" "try %s --help for more information" @@ -1397,7 +1398,7 @@ msgstr "" "\"%s: слишком много файлов\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:151 +#: pysollib/main.py:161 msgid "" "%s: invalid file name\n" "try %s --help for more information" @@ -1405,7 +1406,7 @@ msgstr "" "%s: неправильное имя файла\n" "попробуйте %s --help для получения более подробной информаци" -#: pysollib/main.py:349 +#: pysollib/main.py:369 msgid "" "\n" "No games were found !!!\n" @@ -1416,18 +1417,18 @@ msgid "" "Please check your %s installation.\n" msgstr "" -#: pysollib/main.py:434 pysollib/main.py:442 +#: pysollib/main.py:455 pysollib/main.py:463 msgid " installation problem" msgstr "" -#: pysollib/main.py:435 +#: pysollib/main.py:456 msgid "" "Your Python installation is compiled without thread support.\n" "\n" "Sounds and background music will be disabled." msgstr "" -#: pysollib/main.py:443 +#: pysollib/main.py:464 msgid "" "The pysolsoundserver module was not found.\n" "\n" @@ -1437,7 +1438,7 @@ msgstr "" "\n" "Звук и фоновая музыка будут недоступны" -#: pysollib/main.py:450 +#: pysollib/main.py:471 msgid "Welcome to " msgstr "Добро пожаловать в " @@ -1706,149 +1707,149 @@ msgstr "Швейцария" msgid "USA" msgstr "США" -#: pysollib/settings.py:54 +#: pysollib/settings.py:54 data/glade-translations:29 msgid "Top 10" msgstr "Top 10" -#: pysollib/stack.py:1321 +#: pysollib/stack.py:1405 msgid "Base card - %s." msgstr "Базовая карта - %s." -#: pysollib/stack.py:1322 +#: pysollib/stack.py:1406 msgid "Empty row cannot be filled." msgstr "Пустой ряд не заполняется." -#: pysollib/stack.py:1323 +#: pysollib/stack.py:1407 msgid "any card" msgstr "любая карта" -#: pysollib/stack.py:1324 pysollib/util.py:80 +#: pysollib/stack.py:1408 pysollib/util.py:80 msgid "Jack" msgstr "Валет" -#: pysollib/stack.py:1337 +#: pysollib/stack.py:1421 msgid "No cards" msgstr "Нет карт" -#: pysollib/stack.py:1338 +#: pysollib/stack.py:1422 msgid "1 card" msgstr "1 карта" -#: pysollib/stack.py:1339 +#: pysollib/stack.py:1423 msgid " cards" msgstr " карт" -#: pysollib/stack.py:1551 pysollib/stack.py:1553 pysollib/stack.py:1589 +#: pysollib/stack.py:1635 pysollib/stack.py:1637 pysollib/stack.py:1673 msgid "Redeal" msgstr "Сдать" -#: pysollib/stack.py:1553 +#: pysollib/stack.py:1637 msgid "Stop" msgstr "Стоп" -#: pysollib/stack.py:1613 +#: pysollib/stack.py:1698 msgid "Variable redeals." msgstr "Переменное количество пересдач." -#: pysollib/stack.py:1614 +#: pysollib/stack.py:1699 msgid "Unlimited redeals." msgstr "Неограниченное количество пересдач." -#: pysollib/stack.py:1615 +#: pysollib/stack.py:1700 msgid "No redeals." msgstr "Без пересдачи." -#: pysollib/stack.py:1616 +#: pysollib/stack.py:1701 msgid "One redeal." msgstr "1 пересдача." -#: pysollib/stack.py:1617 +#: pysollib/stack.py:1702 msgid " redeals." msgstr " пересдачи." -#: pysollib/stack.py:1619 +#: pysollib/stack.py:1704 msgid "Talon." msgstr "Колода." -#: pysollib/stack.py:1844 pysollib/stack.py:2294 +#: pysollib/stack.py:1938 pysollib/stack.py:2388 msgid "Reserve. No building." msgstr "Резерв. Без выкладывания." -#: pysollib/stack.py:1881 +#: pysollib/stack.py:1975 msgid "Foundation." msgstr "Базовая ячейка" -#: pysollib/stack.py:1897 +#: pysollib/stack.py:1991 msgid "Foundation. Build up by suit." msgstr "Базовая ячейка. Складывать по возрастанию в соответствии с мастью." -#: pysollib/stack.py:1898 +#: pysollib/stack.py:1992 msgid "Foundation. Build down by suit." msgstr "Базовая ячейка. Складывать по убыванию в соответствии с мастью." -#: pysollib/stack.py:1899 pysollib/stack.py:1915 pysollib/stack.py:1937 +#: pysollib/stack.py:1993 pysollib/stack.py:2009 pysollib/stack.py:2031 msgid "Foundation. Build by same rank." msgstr "Базовая ячейка. Складывать в соответствии с достоинством." -#: pysollib/stack.py:1914 +#: pysollib/stack.py:2008 msgid "Foundation. Build down regardless of suit." msgstr "Базовая ячейка. Складывать не считаясь с мастью." -#: pysollib/stack.py:1935 +#: pysollib/stack.py:2029 msgid "Foundation. Build up by alternate color." msgstr "Базовая ячейка. Складывать по возрастанию чередуя цвет." -#: pysollib/stack.py:1936 +#: pysollib/stack.py:2030 msgid "Foundation. Build down by alternate color." msgstr "Базовая ячейка. Складывать по убыванию чередуя цвет." -#: pysollib/stack.py:2010 +#: pysollib/stack.py:2104 msgid "Tableau. Build up by alternate color." msgstr "Игровой стол. Складывать по возрастанию чередуя цвет." -#: pysollib/stack.py:2011 +#: pysollib/stack.py:2105 msgid "Tableau. Build down by alternate color." msgstr "Игровой стол. Складывать по убыванию чередуя цвет." -#: pysollib/stack.py:2012 pysollib/stack.py:2022 pysollib/stack.py:2031 -#: pysollib/stack.py:2040 pysollib/stack.py:2050 pysollib/stack.py:2073 -#: pysollib/stack.py:2083 +#: pysollib/stack.py:2106 pysollib/stack.py:2116 pysollib/stack.py:2125 +#: pysollib/stack.py:2134 pysollib/stack.py:2144 pysollib/stack.py:2167 +#: pysollib/stack.py:2177 msgid "Tableau. Build by same rank." msgstr "Игровой стол. Складывать в соответствии с достоинством." -#: pysollib/stack.py:2020 +#: pysollib/stack.py:2114 msgid "Tableau. Build up by color." msgstr "Игровой стол. Складывать по возрастанию в соответствии с цветом." -#: pysollib/stack.py:2021 +#: pysollib/stack.py:2115 msgid "Tableau. Build down by color." msgstr "Игровой стол. Складывать по убыванию в соответствии с цветом." -#: pysollib/stack.py:2029 +#: pysollib/stack.py:2123 msgid "Tableau. Build up by suit." msgstr "Игровой стол. Складывать по возрастанию в соответствии с мастью." -#: pysollib/stack.py:2030 +#: pysollib/stack.py:2124 msgid "Tableau. Build down by suit." msgstr "Игровой стол. Складывать по убыванию в соответствии с мастью." -#: pysollib/stack.py:2038 +#: pysollib/stack.py:2132 msgid "Tableau. Build up regardless of suit." msgstr "Игровой стол. Складывать по возрастанию не считаясь с мастью." -#: pysollib/stack.py:2039 +#: pysollib/stack.py:2133 msgid "Tableau. Build down regardless of suit." msgstr "Игровой стол. Складывать по убыванию не считаясь с мастью." -#: pysollib/stack.py:2048 +#: pysollib/stack.py:2142 msgid "Tableau. Build up in any suit but the same." msgstr "Игровой стол. Складывать по возрастанию в любую масть кроме такой же." -#: pysollib/stack.py:2049 +#: pysollib/stack.py:2143 msgid "Tableau. Build down in any suit but the same." msgstr "Игровой стол. Складывать по убыванию в любую масть кроме такой же." -#: pysollib/stack.py:2071 +#: pysollib/stack.py:2165 msgid "" "Tableau. Build up regardless of suit. Sequences of cards in alternate color " "can be moved as a unit." @@ -1856,7 +1857,7 @@ msgstr "" "Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно " "перемещать серии карт чередующихся цветом." -#: pysollib/stack.py:2072 +#: pysollib/stack.py:2166 msgid "" "Tableau. Build down regardless of suit. Sequences of cards in alternate " "color can be moved as a unit." @@ -1864,7 +1865,7 @@ msgstr "" "Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать " "серии карт чередующихся цветом." -#: pysollib/stack.py:2081 +#: pysollib/stack.py:2175 msgid "" "Tableau. Build up regardless of suit. Sequences of cards in the same suit " "can be moved as a unit." @@ -1872,7 +1873,7 @@ msgstr "" "Игровой стол. Складывать по возрастанию не считаясь с мастью. Можно " "перемещать серии карт одинаковой масти." -#: pysollib/stack.py:2082 +#: pysollib/stack.py:2176 msgid "" "Tableau. Build down regardless of suit. Sequences of cards in the same suit " "can be moved as a unit." @@ -1880,7 +1881,7 @@ msgstr "" "Игровой стол. Складывать по убыванию не считаясь с мастью. Можно перемещать " "серии карт одинаковой масти." -#: pysollib/stack.py:2104 +#: pysollib/stack.py:2198 msgid "" "Tableau. Build up by alternate color, can move any face-up cards regardless " "of sequence." @@ -1888,7 +1889,7 @@ msgstr "" "Игровой стол. Складывать по возрастанию чередуя цвет, можно перемещать любую " "серию открытых карт." -#: pysollib/stack.py:2105 +#: pysollib/stack.py:2199 msgid "" "Tableau. Build down by alternate color, can move any face-up cards " "regardless of sequence." @@ -1896,7 +1897,7 @@ msgstr "" "Игровой стол. Складывать по убыванию чередуя цвет, можно перемещать любую " "серию открытых карт." -#: pysollib/stack.py:2106 pysollib/stack.py:2119 +#: pysollib/stack.py:2200 pysollib/stack.py:2213 msgid "" "Tableau. Build by same rank, can move any face-up cards regardless of " "sequence." @@ -1904,14 +1905,14 @@ msgstr "" "Игровой стол. Складывать в соответствии с достоинством, можно перемещать " "любую серию открытых карт." -#: pysollib/stack.py:2117 +#: pysollib/stack.py:2211 msgid "" "Tableau. Build up by suit, can move any face-up cards regardless of sequence." msgstr "" "Игровой стол. Складывать по возрастанию в соответствии с мастью, можно " "перемещать любую серию открытых карт." -#: pysollib/stack.py:2118 +#: pysollib/stack.py:2212 msgid "" "Tableau. Build down by suit, can move any face-up cards regardless of " "sequence." @@ -1919,30 +1920,30 @@ msgstr "" "Игровой стол. Складывать по убыванию в соответствии с мастью, можно " "перемещать любую серию открытых карт." -#: pysollib/stack.py:2151 +#: pysollib/stack.py:2245 msgid "Tableau. Build up or down by color." msgstr "" "Игровой стол. Складывать по возрастанию или убыванию в соответствии с цветом." -#: pysollib/stack.py:2162 +#: pysollib/stack.py:2256 msgid "Tableau. Build up or down by alternate color." msgstr "Игровой стол. Складывать по возрастанию или убыванию чередуя цвет." -#: pysollib/stack.py:2173 +#: pysollib/stack.py:2267 msgid "Tableau. Build up or down by suit." msgstr "" "Игровой стол. Складывать по возрастанию или убыванию в соответствии с мастью." -#: pysollib/stack.py:2184 +#: pysollib/stack.py:2278 msgid "Tableau. Build up or down regardless of suit." msgstr "" "Игровой стол. Складывать по возрастанию или убыванию не считаясь с мастью." -#: pysollib/stack.py:2195 +#: pysollib/stack.py:2289 msgid "Waste." msgstr "Сброс." -#: pysollib/stack.py:2295 +#: pysollib/stack.py:2389 msgid "Free cell." msgstr "Свободная ячейка." @@ -1963,10 +1964,11 @@ msgid "Lost" msgstr "Проиграл" #: pysollib/stats.py:122 pysollib/tk/statusbar.py:156 +#: data/glade-translations:25 msgid "Playing time" msgstr "Время игры" -#: pysollib/stats.py:123 +#: pysollib/stats.py:123 data/glade-translations:26 msgid "Moves" msgstr "Ходов" @@ -2015,40 +2017,48 @@ msgstr "Не выиграл" msgid "Perfect" msgstr "Великолепная" -#: pysollib/tk/colorsdialog.py:71 +#: pysollib/tk/colorsdialog.py:71 data/glade-translations:41 msgid "Text foreground:" msgstr "Цвет текста:" #: pysollib/tk/colorsdialog.py:76 pysollib/tk/colorsdialog.py:94 -#: pysollib/tk/fontsdialog.py:186 +#: pysollib/tk/fontsdialog.py:186 data/glade-translations:49 +#: data/glade-translations:50 data/glade-translations:51 +#: data/glade-translations:52 data/glade-translations:53 +#: data/glade-translations:54 data/glade-translations:55 +#: data/glade-translations:56 data/glade-translations:65 +#: data/glade-translations:66 data/glade-translations:67 +#: data/glade-translations:68 data/glade-translations:69 +#: data/glade-translations:70 data/glade-translations:71 msgid "Change..." msgstr "Изменить..." #: pysollib/tk/colorsdialog.py:81 pysollib/tk/timeoutsdialog.py:68 +#: data/glade-translations:37 data/glade-translations:42 msgid "Highlight piles:" msgstr "Подсветка групп:" -#: pysollib/tk/colorsdialog.py:82 +#: pysollib/tk/colorsdialog.py:82 data/glade-translations:43 msgid "Highlight cards 1:" msgstr "Подсветка карт 1:" -#: pysollib/tk/colorsdialog.py:83 +#: pysollib/tk/colorsdialog.py:83 data/glade-translations:44 msgid "Highlight cards 2:" msgstr "Подсветка карт 2:" -#: pysollib/tk/colorsdialog.py:84 +#: pysollib/tk/colorsdialog.py:84 data/glade-translations:45 msgid "Highlight same rank 1:" msgstr "Подсветка карт одного достоинства 1:" -#: pysollib/tk/colorsdialog.py:85 +#: pysollib/tk/colorsdialog.py:85 data/glade-translations:46 msgid "Highlight same rank 2:" msgstr "Подсветка карт одного достоинства 2:" -#: pysollib/tk/colorsdialog.py:86 +#: pysollib/tk/colorsdialog.py:86 data/glade-translations:47 msgid "Hint arrow:" msgstr "Стрелка подсказки:" -#: pysollib/tk/colorsdialog.py:87 +#: pysollib/tk/colorsdialog.py:87 data/glade-translations:48 msgid "Highlight not matching:" msgstr "Подсветка отсутствия совпадения:" @@ -2056,7 +2066,7 @@ msgstr "Подсветка отсутствия совпадения:" msgid "Select color" msgstr "Выбрать цвет" -#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:328 +#: pysollib/tk/findcarddialog.py:52 pysollib/tk/menubar.py:435 msgid "Find card" msgstr "Найти карту" @@ -2072,31 +2082,31 @@ msgstr "Жирный" msgid "Italic" msgstr "Наклонный" -#: pysollib/tk/fontsdialog.py:168 +#: pysollib/tk/fontsdialog.py:168 data/glade-translations:58 msgid "HTML: " msgstr "HTML: " -#: pysollib/tk/fontsdialog.py:169 +#: pysollib/tk/fontsdialog.py:169 data/glade-translations:59 msgid "Small: " msgstr "Маленький: " -#: pysollib/tk/fontsdialog.py:170 +#: pysollib/tk/fontsdialog.py:170 data/glade-translations:60 msgid "Fixed: " msgstr "Моноширинный: " -#: pysollib/tk/fontsdialog.py:171 +#: pysollib/tk/fontsdialog.py:171 data/glade-translations:61 msgid "Tableau default: " msgstr "Игровой стол по умолчанию: " -#: pysollib/tk/fontsdialog.py:172 +#: pysollib/tk/fontsdialog.py:172 data/glade-translations:62 msgid "Tableau fixed: " msgstr "Игровой стол моноширинный: " -#: pysollib/tk/fontsdialog.py:173 +#: pysollib/tk/fontsdialog.py:173 data/glade-translations:64 msgid "Tableau large: " msgstr "Игровой стол большой: " -#: pysollib/tk/fontsdialog.py:174 +#: pysollib/tk/fontsdialog.py:174 data/glade-translations:63 msgid "Tableau small: " msgstr "Игровой стол маленький: " @@ -2104,484 +2114,500 @@ msgstr "Игровой стол маленький: " msgid "Select font" msgstr "Выбрать шрифт" -#: pysollib/tk/menubar.py:74 +#: pysollib/tk/menubar.py:75 msgid "Style" msgstr "Стиль" -#: pysollib/tk/menubar.py:83 +#: pysollib/tk/menubar.py:84 msgid "Relief" msgstr "Рельеф" -#: pysollib/tk/menubar.py:84 +#: pysollib/tk/menubar.py:85 msgid "Flat" msgstr "Плоский" -#: pysollib/tk/menubar.py:88 +#: pysollib/tk/menubar.py:89 msgid "Raised" msgstr "Выпуклый" -#: pysollib/tk/menubar.py:93 +#: pysollib/tk/menubar.py:94 msgid "Compound" msgstr "Компоновка" -#: pysollib/tk/menubar.py:99 +#: pysollib/tk/menubar.py:100 msgid "Hide" msgstr "Спрятать" -#: pysollib/tk/menubar.py:102 +#: pysollib/tk/menubar.py:103 msgid "Top" msgstr "Сверху" -#: pysollib/tk/menubar.py:105 +#: pysollib/tk/menubar.py:106 msgid "Bottom" msgstr "Внизу" -#: pysollib/tk/menubar.py:108 +#: pysollib/tk/menubar.py:109 msgid "Left" msgstr "Слева" -#: pysollib/tk/menubar.py:111 +#: pysollib/tk/menubar.py:112 msgid "Right" msgstr "Справа" -#: pysollib/tk/menubar.py:115 +#: pysollib/tk/menubar.py:116 msgid "Small icons" msgstr "Маленькие пиктограммы" -#: pysollib/tk/menubar.py:118 +#: pysollib/tk/menubar.py:119 msgid "Large icons" msgstr "Большие пиктограммы" -#: pysollib/tk/menubar.py:124 +#: pysollib/tk/menubar.py:125 msgid "Customize toolbar" msgstr "Настроить панель инструментов" -#: pysollib/tk/menubar.py:255 +#: pysollib/tk/menubar.py:362 msgid "&File" msgstr "&Файл" -#: pysollib/tk/menubar.py:257 +#: pysollib/tk/menubar.py:364 msgid "R&ecent games" msgstr "Выбрать н&едавнюю игру" -#: pysollib/tk/menubar.py:259 +#: pysollib/tk/menubar.py:366 msgid "Select &random game" msgstr "С&лучайная игра" -#: pysollib/tk/menubar.py:260 +#: pysollib/tk/menubar.py:367 msgid "&All games" msgstr "&Все игры" -#: pysollib/tk/menubar.py:261 +#: pysollib/tk/menubar.py:368 msgid "Games played and &won" msgstr "&Выигранные игры" -#: pysollib/tk/menubar.py:262 +#: pysollib/tk/menubar.py:369 msgid "Games played and ¬ won" msgstr "&Невыигранные игры" -#: pysollib/tk/menubar.py:263 +#: pysollib/tk/menubar.py:370 msgid "Games not &played" msgstr "Не&сыгранные игры" -#: pysollib/tk/menubar.py:264 +#: pysollib/tk/menubar.py:371 msgid "Select game by nu&mber..." msgstr "Выбрать игру по &номеру..." -#: pysollib/tk/menubar.py:266 +#: pysollib/tk/menubar.py:373 msgid "Fa&vorite games" msgstr "&Избранные игры" -#: pysollib/tk/menubar.py:267 +#: pysollib/tk/menubar.py:374 msgid "A&dd to favorites" msgstr "&Добавить в избранное" -#: pysollib/tk/menubar.py:268 +#: pysollib/tk/menubar.py:375 msgid "R&emove from favorites" msgstr "&Удалить из избранных" -#: pysollib/tk/menubar.py:270 +#: pysollib/tk/menubar.py:377 msgid "&Open..." msgstr "&Открыть..." -#: pysollib/tk/menubar.py:271 +#: pysollib/tk/menubar.py:378 msgid "&Save" msgstr "&Сохранить" -#: pysollib/tk/menubar.py:272 +#: pysollib/tk/menubar.py:379 msgid "Save &as..." msgstr "Сохранить &как..." -#: pysollib/tk/menubar.py:274 +#: pysollib/tk/menubar.py:381 msgid "&Hold and quit" msgstr "Со&храниться и выйти" -#: pysollib/tk/menubar.py:279 pysollib/tk/selectgame.py:407 +#: pysollib/tk/menubar.py:386 pysollib/tk/selectgame.py:407 msgid "&Select" msgstr "&Выбрать" -#: pysollib/tk/menubar.py:284 +#: pysollib/tk/menubar.py:391 msgid "&Edit" msgstr "Р&едактировать" -#: pysollib/tk/menubar.py:285 +#: pysollib/tk/menubar.py:392 msgid "&Undo" msgstr "&Отмена" -#: pysollib/tk/menubar.py:286 +#: pysollib/tk/menubar.py:393 msgid "&Redo" msgstr "&Повтор" -#: pysollib/tk/menubar.py:287 +#: pysollib/tk/menubar.py:394 msgid "Redo &all" msgstr "Вернуть все" -#: pysollib/tk/menubar.py:290 +#: pysollib/tk/menubar.py:397 msgid "&Set bookmark" msgstr "Установить &закладку" -#: pysollib/tk/menubar.py:292 pysollib/tk/menubar.py:296 +#: pysollib/tk/menubar.py:399 pysollib/tk/menubar.py:403 msgid "Bookmark %d" msgstr "Закладка %d" -#: pysollib/tk/menubar.py:294 +#: pysollib/tk/menubar.py:401 msgid "Go&to bookmark" msgstr "&Перейти к закладке" -#: pysollib/tk/menubar.py:299 +#: pysollib/tk/menubar.py:406 msgid "&Clear bookmarks" msgstr "О&чистить закладки" -#: pysollib/tk/menubar.py:302 pysollib/tk/toolbar.py:198 +#: pysollib/tk/menubar.py:409 pysollib/tk/toolbar.py:198 msgid "Restart" msgstr "Начало" -#: pysollib/tk/menubar.py:304 +#: pysollib/tk/menubar.py:411 msgid "&Game" msgstr "&Игра" -#: pysollib/tk/menubar.py:305 +#: pysollib/tk/menubar.py:412 msgid "&Deal cards" msgstr "&Сдать карты" -#: pysollib/tk/menubar.py:306 +#: pysollib/tk/menubar.py:413 msgid "&Auto drop" msgstr "С&бросить карты" -#: pysollib/tk/menubar.py:307 +#: pysollib/tk/menubar.py:414 msgid "&Pause" msgstr "&Пауза" -#: pysollib/tk/menubar.py:310 +#: pysollib/tk/menubar.py:417 msgid "S&tatus..." msgstr "С&татус" -#: pysollib/tk/menubar.py:311 +#: pysollib/tk/menubar.py:418 msgid "&Comments..." msgstr "&Комментарии..." -#: pysollib/tk/menubar.py:313 +#: pysollib/tk/menubar.py:420 msgid "&Statistics" msgstr "Ст&атистика" -#: pysollib/tk/menubar.py:314 pysollib/tk/menubar.py:322 +#: pysollib/tk/menubar.py:421 pysollib/tk/menubar.py:429 msgid "Current game..." msgstr "Текущая игра..." -#: pysollib/tk/menubar.py:315 pysollib/tk/menubar.py:323 +#: pysollib/tk/menubar.py:422 pysollib/tk/menubar.py:430 msgid "All games..." msgstr "Все игры..." -#: pysollib/tk/menubar.py:317 +#: pysollib/tk/menubar.py:424 msgid "Session log..." msgstr "Лог сессии..." -#: pysollib/tk/menubar.py:318 +#: pysollib/tk/menubar.py:425 msgid "Full log..." msgstr "Полный лог..." -#: pysollib/tk/menubar.py:321 +#: pysollib/tk/menubar.py:428 msgid "D&emo statistics" msgstr "Статистика демо" -#: pysollib/tk/menubar.py:325 +#: pysollib/tk/menubar.py:432 msgid "&Assist" msgstr "&Подсказка" -#: pysollib/tk/menubar.py:326 +#: pysollib/tk/menubar.py:433 msgid "&Hint" msgstr "Подсказать &ход" -#: pysollib/tk/menubar.py:327 +#: pysollib/tk/menubar.py:434 msgid "Highlight p&iles" msgstr "П&оказать группы" -#: pysollib/tk/menubar.py:330 +#: pysollib/tk/menubar.py:437 msgid "&Demo" msgstr "&Демо" -#: pysollib/tk/menubar.py:331 +#: pysollib/tk/menubar.py:438 msgid "Demo (&all games)" msgstr "Демо (&все игры)" -#: pysollib/tk/menubar.py:333 +#: pysollib/tk/menubar.py:440 msgid "Piles description" msgstr "Описания ячеек" -#: pysollib/tk/menubar.py:337 +#: pysollib/tk/menubar.py:444 msgid "&Options" msgstr "&Настройка" -#: pysollib/tk/menubar.py:338 +#: pysollib/tk/menubar.py:445 msgid "&Player options..." msgstr "Настройки &игрока..." -#: pysollib/tk/menubar.py:339 +#: pysollib/tk/menubar.py:446 msgid "&Automatic play" msgstr "Настройки &автоматической игры" -#: pysollib/tk/menubar.py:340 +#: pysollib/tk/menubar.py:447 msgid "Auto &face up" msgstr "Автоматически &переворачивать" -#: pysollib/tk/menubar.py:341 +#: pysollib/tk/menubar.py:448 msgid "A&uto drop" msgstr "А&втоматически сбрасывать карты" -#: pysollib/tk/menubar.py:342 +#: pysollib/tk/menubar.py:449 msgid "Auto &deal" msgstr "Автоматически &сдавать карты" -#: pysollib/tk/menubar.py:344 +#: pysollib/tk/menubar.py:451 msgid "&Quick play" msgstr "&Быстрая игра" -#: pysollib/tk/menubar.py:345 +#: pysollib/tk/menubar.py:452 msgid "Assist &level" msgstr "&Уровень подсказки" -#: pysollib/tk/menubar.py:346 +#: pysollib/tk/menubar.py:453 msgid "Enable &undo" msgstr "Разрешить &возврат хода" -#: pysollib/tk/menubar.py:347 +#: pysollib/tk/menubar.py:454 msgid "Enable &bookmarks" msgstr "Разрешить &закладки" -#: pysollib/tk/menubar.py:348 +#: pysollib/tk/menubar.py:455 msgid "Enable &hint" msgstr "Разрешить &подсказки" -#: pysollib/tk/menubar.py:349 +#: pysollib/tk/menubar.py:456 msgid "Enable highlight p&iles" msgstr "Разрешить показывать к&учи" -#: pysollib/tk/menubar.py:350 +#: pysollib/tk/menubar.py:457 msgid "Enable highlight &cards" msgstr "Разрешить показывать &карты" -#: pysollib/tk/menubar.py:351 +#: pysollib/tk/menubar.py:458 msgid "Enable highlight same &rank" msgstr "Разрешить показывать карты &одного достоинства" -#: pysollib/tk/menubar.py:352 +#: pysollib/tk/menubar.py:459 msgid "Highlight &no matching" msgstr "Подсветка отсутствия &совпадения" -#: pysollib/tk/menubar.py:354 +#: pysollib/tk/menubar.py:461 msgid "&Show removed tiles (in Mahjongg games)" msgstr "Показывать удаленные (в Маджонг)" -#: pysollib/tk/menubar.py:355 +#: pysollib/tk/menubar.py:462 msgid "Show hint &arrow (in Shisen-Sho games)" msgstr "Показывать стрелку (в Шисен-Сё)" -#: pysollib/tk/menubar.py:357 +#: pysollib/tk/menubar.py:464 msgid "&Sound..." msgstr "&Звук..." -#: pysollib/tk/menubar.py:365 +#: pysollib/tk/menubar.py:472 msgid "Cards&et..." msgstr "Коло&да..." -#: pysollib/tk/menubar.py:366 +#: pysollib/tk/menubar.py:473 msgid "Table t&ile..." msgstr "Игровой &стол..." -#: pysollib/tk/menubar.py:368 +#: pysollib/tk/menubar.py:475 msgid "Card &background" msgstr "&Рубашка карты" -#: pysollib/tk/menubar.py:369 +#: pysollib/tk/menubar.py:476 msgid "Card &view" msgstr "&Вид карты" -#: pysollib/tk/menubar.py:370 +#: pysollib/tk/menubar.py:477 msgid "Card shado&w" msgstr "Тень карты" -#: pysollib/tk/menubar.py:371 +#: pysollib/tk/menubar.py:478 msgid "Shade &legal moves" msgstr "Подсвечивать &разрешенные ходы" -#: pysollib/tk/menubar.py:372 +#: pysollib/tk/menubar.py:479 msgid "&Negative cards bottom" msgstr "&Негативные контуры карты" -#: pysollib/tk/menubar.py:373 +#: pysollib/tk/menubar.py:480 msgid "Shrink face-down cards" msgstr "Сжимать закрытые карты" -#: pysollib/tk/menubar.py:374 +#: pysollib/tk/menubar.py:481 msgid "Shade &filled stacks" msgstr "Затемнять заполненные ячейки" -#: pysollib/tk/menubar.py:375 +#: pysollib/tk/menubar.py:482 msgid "A&nimations" msgstr "Анимаци&я" -#: pysollib/tk/menubar.py:376 +#: pysollib/tk/menubar.py:483 msgid "&None" msgstr "&Нет" -#: pysollib/tk/menubar.py:377 +#: pysollib/tk/menubar.py:484 msgid "&Timer based" msgstr "Базирующаяся на &таймере" -#: pysollib/tk/menubar.py:378 +#: pysollib/tk/menubar.py:485 msgid "&Fast" msgstr "&Быстрая" -#: pysollib/tk/menubar.py:379 +#: pysollib/tk/menubar.py:486 msgid "&Slow" msgstr "&Медленная" -#: pysollib/tk/menubar.py:380 +#: pysollib/tk/menubar.py:487 msgid "&Very slow" msgstr "&Очень медленная" -#: pysollib/tk/menubar.py:381 -msgid "Stick&y mouse" +#: pysollib/tk/menubar.py:488 +msgid "&Mouse" +msgstr "&Мышь" + +#: pysollib/tk/menubar.py:489 +msgid "&Drag-and-Drop" +msgstr "" + +#: pysollib/tk/menubar.py:490 +msgid "&Point-and-Click" +msgstr "" + +#: pysollib/tk/menubar.py:491 +msgid "&Sticky mouse" msgstr "&Липкая мышь" -#: pysollib/tk/menubar.py:382 +#: pysollib/tk/menubar.py:493 msgid "Use mouse for undo/redo" msgstr "Использовать мышь для вперед/назад" -#: pysollib/tk/menubar.py:384 +#: pysollib/tk/menubar.py:495 msgid "&Fonts..." msgstr "&Шрифты..." -#: pysollib/tk/menubar.py:385 +#: pysollib/tk/menubar.py:496 msgid "&Colors..." msgstr "&Цвета..." -#: pysollib/tk/menubar.py:386 +#: pysollib/tk/menubar.py:497 msgid "Time&outs..." msgstr "Тайма&уты..." -#: pysollib/tk/menubar.py:388 +#: pysollib/tk/menubar.py:499 msgid "&Toolbar" msgstr "Панель и&нструментов" -#: pysollib/tk/menubar.py:390 +#: pysollib/tk/menubar.py:501 msgid "Stat&usbar" msgstr "Панель с&остояния" -#: pysollib/tk/menubar.py:391 +#: pysollib/tk/menubar.py:502 msgid "Show &statusbar" msgstr "Показывать панель состояния" -#: pysollib/tk/menubar.py:392 +#: pysollib/tk/menubar.py:503 msgid "Show &number of cards" msgstr "Показывать количество карт" -#: pysollib/tk/menubar.py:393 +#: pysollib/tk/menubar.py:504 msgid "Show &help bar" msgstr "Показывать панель помощи" -#: pysollib/tk/menubar.py:394 +#: pysollib/tk/menubar.py:505 msgid "Save games &geometry" msgstr "Сохранение &геометрии игры" -#: pysollib/tk/menubar.py:395 +#: pysollib/tk/menubar.py:506 msgid "&Demo logo" msgstr "Д&емо лого" -#: pysollib/tk/menubar.py:396 +#: pysollib/tk/menubar.py:507 msgid "Startup splash sc&reen" msgstr "О&кно запуска" -#: pysollib/tk/menubar.py:402 +#: pysollib/tk/menubar.py:513 msgid "&Help" msgstr "&Помощь" -#: pysollib/tk/menubar.py:403 +#: pysollib/tk/menubar.py:514 msgid "&Contents" msgstr "&Содержание" -#: pysollib/tk/menubar.py:404 +#: pysollib/tk/menubar.py:515 msgid "&How to play" msgstr "Как &играть" -#: pysollib/tk/menubar.py:405 +#: pysollib/tk/menubar.py:516 msgid "&Rules for this game" msgstr "&Правила текущей игры" -#: pysollib/tk/menubar.py:406 +#: pysollib/tk/menubar.py:517 msgid "&License terms" msgstr "&Лицензия" -#: pysollib/tk/menubar.py:409 +#: pysollib/tk/menubar.py:520 msgid "&About " msgstr "&О программе " -#: pysollib/tk/menubar.py:521 +#: pysollib/tk/menubar.py:632 msgid "All &games..." msgstr "&Все игры..." -#: pysollib/tk/menubar.py:523 +#: pysollib/tk/menubar.py:634 msgid "Playable pre&view..." msgstr "Играемый &предпросмотр..." -#: pysollib/tk/menubar.py:572 +#: pysollib/tk/menubar.py:683 msgid "&Mahjongg games" msgstr "Игры маджонг" -#: pysollib/tk/menubar.py:610 +#: pysollib/tk/menubar.py:721 msgid "&Popular games" msgstr "&Популярные игры" -#: pysollib/tk/menubar.py:618 +#: pysollib/tk/menubar.py:729 msgid "&French games" msgstr "&Классические игры" -#: pysollib/tk/menubar.py:625 +#: pysollib/tk/menubar.py:736 msgid "&Oriental games" msgstr "&Восточные игры" -#: pysollib/tk/menubar.py:633 +#: pysollib/tk/menubar.py:744 msgid "&Special games" msgstr "&Особые игры" -#: pysollib/tk/menubar.py:639 +#: pysollib/tk/menubar.py:750 msgid "&All games by name" msgstr "&Все игры по имени" -#: pysollib/tk/menubar.py:1000 pysollib/tk/menubar.py:1002 -#: pysollib/tk/selectcardset.py:240 +#: pysollib/tk/menubar.py:1023 data/glade-translations:72 +msgid "Sound settings" +msgstr "Настройка звука" + +#: pysollib/tk/menubar.py:1122 pysollib/tk/menubar.py:1124 +#: pysollib/tk/selectcardset.py:241 msgid "&Load" msgstr "&Загрузить" -#: pysollib/tk/menubar.py:1002 +#: pysollib/tk/menubar.py:1124 msgid "&Info..." msgstr "&Информация..." -#: pysollib/tk/menubar.py:1005 +#: pysollib/tk/menubar.py:1127 msgid "Select " msgstr "Выбрать " -#: pysollib/tk/menubar.py:1066 +#: pysollib/tk/menubar.py:1179 msgid "Select table background" msgstr "Выбрать фоновое изображение" @@ -2662,27 +2688,27 @@ msgstr "Большие колоды" msgid "XLarge cardsets" msgstr "Очень большие колоды" -#: pysollib/tk/selectcardset.py:319 +#: pysollib/tk/selectcardset.py:320 msgid "About cardset" msgstr "О наборе карт" -#: pysollib/tk/selectcardset.py:335 pysollib/tk/selectgame.py:365 +#: pysollib/tk/selectcardset.py:336 pysollib/tk/selectgame.py:365 msgid "Type:" msgstr "Тип:" -#: pysollib/tk/selectcardset.py:336 +#: pysollib/tk/selectcardset.py:337 msgid "Styles:" msgstr "Стиль:" -#: pysollib/tk/selectcardset.py:337 +#: pysollib/tk/selectcardset.py:338 msgid "Nationality:" msgstr "Национальность:" -#: pysollib/tk/selectcardset.py:338 +#: pysollib/tk/selectcardset.py:339 msgid "Year:" msgstr "Год:" -#: pysollib/tk/selectcardset.py:340 +#: pysollib/tk/selectcardset.py:341 msgid "Size:" msgstr "Размер:" @@ -2903,20 +2929,24 @@ msgid "Played:" msgstr "Играл:" #: pysollib/tk/selectgame.py:371 pysollib/tk/tkstats.py:111 -#: pysollib/tk/tkstats.py:163 +#: pysollib/tk/tkstats.py:163 data/glade-translations:9 +#: data/glade-translations:13 msgid "Won:" msgstr "Выиграл:" #: pysollib/tk/selectgame.py:372 pysollib/tk/tkstats.py:112 -#: pysollib/tk/tkstats.py:164 +#: pysollib/tk/tkstats.py:164 data/glade-translations:11 +#: data/glade-translations:14 msgid "Lost:" msgstr "Проиграл:" #: pysollib/tk/selectgame.py:373 pysollib/tk/tkstats.py:805 +#: data/glade-translations:18 msgid "Playing time:" msgstr "Игровое время:" #: pysollib/tk/selectgame.py:374 pysollib/tk/tkstats.py:812 +#: data/glade-translations:19 msgid "Moves:" msgstr "Ходов:" @@ -2964,11 +2994,11 @@ msgstr "Чайный" msgid "All Backgrounds" msgstr "Все фоновые изображения" -#: pysollib/tk/selecttile.py:158 +#: pysollib/tk/selecttile.py:159 msgid "&Solid color..." msgstr "М&онотонный цвет..." -#: pysollib/tk/selecttile.py:177 +#: pysollib/tk/selecttile.py:178 msgid "Select table color" msgstr "Выбрать цвет" @@ -3044,7 +3074,7 @@ msgstr "Игра проиграна" msgid "Perfect game" msgstr "Великолепная игра" -#: pysollib/tk/soundoptionsdialog.py:111 +#: pysollib/tk/soundoptionsdialog.py:111 data/glade-translations:73 msgid "Sound enabled" msgstr "Звук доступен" @@ -3052,15 +3082,15 @@ msgstr "Звук доступен" msgid "Use DirectX for sound playing" msgstr "Использовать DirectX для вывода звука" -#: pysollib/tk/soundoptionsdialog.py:123 +#: pysollib/tk/soundoptionsdialog.py:123 data/glade-translations:74 msgid "Sample volume:" msgstr "Уровень звуков:" -#: pysollib/tk/soundoptionsdialog.py:131 +#: pysollib/tk/soundoptionsdialog.py:131 data/glade-translations:75 msgid "Music volume:" msgstr "Уровень музыки:" -#: pysollib/tk/soundoptionsdialog.py:144 +#: pysollib/tk/soundoptionsdialog.py:144 data/glade-translations:76 msgid "Enable samles" msgstr "Включить звуки" @@ -3088,39 +3118,39 @@ msgstr "Ходов/Всего ходов" msgid "Games played: won/lost" msgstr "Игр: выиграно/проиграно" -#: pysollib/tk/timeoutsdialog.py:65 +#: pysollib/tk/timeoutsdialog.py:65 data/glade-translations:34 msgid "Demo:" msgstr "Демо:" -#: pysollib/tk/timeoutsdialog.py:66 +#: pysollib/tk/timeoutsdialog.py:66 data/glade-translations:35 msgid "Hint:" msgstr "Подсказка:" -#: pysollib/tk/timeoutsdialog.py:67 +#: pysollib/tk/timeoutsdialog.py:67 data/glade-translations:36 msgid "Raise card:" msgstr "Подъем карты:" -#: pysollib/tk/timeoutsdialog.py:69 +#: pysollib/tk/timeoutsdialog.py:69 data/glade-translations:38 msgid "Highlight cards:" msgstr "Подсветка карты:" -#: pysollib/tk/timeoutsdialog.py:70 +#: pysollib/tk/timeoutsdialog.py:70 data/glade-translations:39 msgid "Highlight same rank:" msgstr "Подсветка одинаковых карт:" -#: pysollib/tk/tkconst.py:101 +#: pysollib/tk/tkconst.py:103 msgid "Icons only" msgstr "Только пиктограммы" -#: pysollib/tk/tkconst.py:102 +#: pysollib/tk/tkconst.py:104 msgid "Text below icons" msgstr "Текст под пиктограммами" -#: pysollib/tk/tkconst.py:103 +#: pysollib/tk/tkconst.py:105 msgid "Text beside icons" msgstr "Текст рядом с пиктограммами" -#: pysollib/tk/tkconst.py:104 +#: pysollib/tk/tkconst.py:106 msgid "Text only" msgstr "Только текст" @@ -3160,15 +3190,16 @@ msgstr "" msgid "Unable to service request:\n" msgstr "Невозможно выполнить запрос:\n" -#: pysollib/tk/tkstats.py:95 +#: pysollib/tk/tkstats.py:95 data/glade-translations:16 msgid "Total" msgstr "Всего" -#: pysollib/tk/tkstats.py:97 +#: pysollib/tk/tkstats.py:97 data/glade-translations:12 msgid "Current session" msgstr "Текущая сессия" #: pysollib/tk/tkstats.py:113 pysollib/tk/tkstats.py:165 +#: data/glade-translations:10 data/glade-translations:15 msgid "Total:" msgstr "Всего:" @@ -3309,19 +3340,19 @@ msgstr "N" msgid "Result" msgstr "Результат" -#: pysollib/tk/tkstats.py:797 +#: pysollib/tk/tkstats.py:797 data/glade-translations:21 msgid "Minimum" msgstr "Минимум" -#: pysollib/tk/tkstats.py:798 +#: pysollib/tk/tkstats.py:798 data/glade-translations:22 msgid "Maximum" msgstr "Максимум" -#: pysollib/tk/tkstats.py:799 +#: pysollib/tk/tkstats.py:799 data/glade-translations:23 msgid "Average" msgstr "Среднее" -#: pysollib/tk/tkstats.py:819 +#: pysollib/tk/tkstats.py:819 data/glade-translations:20 msgid "Total moves:" msgstr "Всего ходов:" diff --git a/pysollib/pysolgtk/tkconst.py b/pysollib/pysolgtk/tkconst.py index b0a78d70..5e0ff18c 100644 --- a/pysollib/pysolgtk/tkconst.py +++ b/pysollib/pysolgtk/tkconst.py @@ -50,7 +50,7 @@ EVENT_PROPAGATE = 0 CURSOR_DRAG = gdk.HAND1 CURSOR_WATCH = gdk.WATCH -CURSOR_UP_ARROW = gdk.SB_UP_ARROW +CURSOR_DOWN_ARROW = gdk.SB_DOWN_ARROW TOOLBAR_BUTTONS = ( "new", diff --git a/pysollib/stack.py b/pysollib/stack.py index f1c178e9..175b5ae8 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -100,7 +100,7 @@ from util import ACE, KING, SUITS from util import ANY_SUIT, ANY_COLOR, ANY_RANK, NO_RANK from util import NO_REDEAL, UNLIMITED_REDEALS, VARIABLE_REDEALS from pysoltk import EVENT_HANDLED, EVENT_PROPAGATE -from pysoltk import CURSOR_DRAG, CURSOR_UP_ARROW, ANCHOR_NW, ANCHOR_SE +from pysoltk import CURSOR_DRAG, CURSOR_DOWN_ARROW, ANCHOR_NW, ANCHOR_SE from pysoltk import bind, unbind_destroy from pysoltk import after, after_idle, after_cancel from pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText, MfxCanvasLine @@ -1022,7 +1022,7 @@ class Stack: if self.game.app.opt.mouse_type == 'point-n-click': if self.acceptsCards(self.game.drag.stack, self.game.drag.cards): - self.game.canvas.config(cursor=CURSOR_UP_ARROW) + self.game.canvas.config(cursor=CURSOR_DOWN_ARROW) self.cursor_changed = True else: after_idle(self.canvas, self.game.showHelp, diff --git a/pysollib/tk/tkconst.py b/pysollib/tk/tkconst.py index fdd01cb1..cb514dda 100644 --- a/pysollib/tk/tkconst.py +++ b/pysollib/tk/tkconst.py @@ -39,7 +39,7 @@ __all__ = ['tkversion', 'EVENT_PROPAGATE', 'CURSOR_DRAG', 'CURSOR_WATCH', - 'CURSOR_UP_ARROW', + 'CURSOR_DOWN_ARROW', 'ANCHOR_CENTER', 'ANCHOR_N', 'ANCHOR_NW', @@ -84,7 +84,7 @@ EVENT_PROPAGATE = None CURSOR_DRAG = "hand1" CURSOR_WATCH = "watch" -CURSOR_UP_ARROW = 'sb_up_arrow' +CURSOR_DOWN_ARROW = 'sb_down_arrow' ANCHOR_CENTER = Tkinter.CENTER ANCHOR_N = Tkinter.N diff --git a/scripts/cardset_viewer.py b/scripts/cardset_viewer.py index d9491d9d..aaec984a 100755 --- a/scripts/cardset_viewer.py +++ b/scripts/cardset_viewer.py @@ -177,7 +177,7 @@ def create_widgets(): # root = Tk() # - list_box = Listbox(root) + list_box = Listbox(root, exportselection=False) list_box.grid(row=0, column=0, rowspan=2, sticky=NS) cardsets_list = list(cardsets_dict) cardsets_list.sort() From ee3d33072f33e0d48edd54a10e59e219e2c341a8 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 25 Sep 2006 00:51:47 +0000 Subject: [PATCH 069/266] * bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@71 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/games/beleagueredcastle.py | 3 ++- pysollib/tk/tkwidget.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 26d3e4c9..f0cc3232 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -341,7 +341,7 @@ class CastlesEnd(Bastion): return if not self.texts.info: return - if self.base_rank is None: + if not self.getState(): t = "" else: t = RANKS[self.base_rank] @@ -354,6 +354,7 @@ class CastlesEnd(Bastion): return 0 def _restoreGameHook(self, game): + self.base_rank = game.loadinfo.base_rank for s in self.s.foundations: s.cap.base_rank = game.loadinfo.base_rank diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index a0f6a3c8..776570da 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -172,7 +172,7 @@ class MfxDialog: # ex. _ToplevelDialog def createFrames(self, kw): bottom_frame = Tkinter.Frame(self.top) - bottom_frame.pack(side='bottom', fill='both', expand=1, ipadx=3, ipady=3) + bottom_frame.pack(side='bottom', fill='both', expand=0, ipadx=3, ipady=3) if kw.separatorwidth > 0: separator = Tkinter.Frame(self.top, relief="sunken", height=kw.separatorwidth, width=kw.separatorwidth, From bc799023c4e3a0de7b2d5a1589f696ec24f35d28 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Tue, 26 Sep 2006 21:07:55 +0000 Subject: [PATCH 070/266] * update translation * bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@72 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/ru_pysol.po | 68 +++++++++++++++++++++++------------------------ pysollib/game.py | 5 ++-- pysollib/stack.py | 3 +-- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/po/ru_pysol.po b/po/ru_pysol.po index 6f4b6af4..3d5358e4 100644 --- a/po/ru_pysol.po +++ b/po/ru_pysol.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" "POT-Creation-Date: Thu Sep 21 15:57:22 2006\n" -"PO-Revision-Date: 2006-09-21 15:58+0400\n" +"PO-Revision-Date: 2006-09-26 15:53+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -410,7 +410,7 @@ msgstr "&Начало" #: pysollib/game.py:1753 msgid "Score %6d" -msgstr "Счет %6d" +msgstr "Счёт %6d" #: pysollib/game.py:1852 msgid "&Cool" @@ -418,7 +418,7 @@ msgstr "&Отлично" #: pysollib/game.py:1852 msgid "&Great" -msgstr "&Эдорово" +msgstr "&Здорово" #: pysollib/game.py:1852 msgid "&Wow" @@ -1001,7 +1001,7 @@ msgstr "Раджа" #: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 msgid "Black" -msgstr "Черный" +msgstr "Чёрный" #: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 msgid "Brown" @@ -1013,12 +1013,12 @@ msgstr "Красный" #: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:256 msgid "Yellow" -msgstr "Желтый" +msgstr "Жёлтый" #: pysollib/games/ultra/dashavatara.py:353 pysollib/games/ultra/mughal.py:257 #: pysollib/tk/selecttile.py:86 msgid "Green" -msgstr "Зеленый" +msgstr "Зелёный" #: pysollib/games/ultra/dashavatara.py:354 msgid "Crimson" @@ -1151,7 +1151,7 @@ msgstr "Хризантема" #: pysollib/games/ultra/hanafuda_common.py:69 msgid "Maple" -msgstr "Клен" +msgstr "Клён" #: pysollib/games/ultra/hanafuda_common.py:69 msgid "Paulownia" @@ -1243,11 +1243,11 @@ msgstr "" #: pysollib/help.py:63 msgid "A Python Solitaire Game Collection\n" -msgstr "Коллекция питоновских пасьянсев\n" +msgstr "Коллекция питоновских пасьянсов\n" #: pysollib/help.py:65 msgid "A World Domination Project\n" -msgstr "Всемирный непревзойденный проект\n" +msgstr "Всемирный непревзойдённый проект\n" #: pysollib/help.py:66 msgid "&Credits..." @@ -1359,7 +1359,7 @@ msgid "" "try %s --help for more information" msgstr "" "%s: %s\n" -"попробуйте %s --help для получения более подробной информаци" +"попробуйте %s --help для получения более подробной информации" #: pysollib/main.py:139 #, fuzzy @@ -1379,7 +1379,7 @@ msgid "" " FILE - file name of a saved game\n" " MOD - one of following: pss(default), pygame, oss, win\n" msgstr "" -"Испльзование: %s [OPTIONS] [FILE]\n" +"Использование: %s [OPTIONS] [FILE]\n" " -g --game=GAMENAME начинать с игры GAMENAME\n" " --fg --foreground=COLOR цвет текста\n" " --bg --background=COLOR цвет фона\n" @@ -1388,7 +1388,7 @@ msgstr "" " --noplugins отключить загрузку плагинов\n" " -h --help показать это сообщение и выйти\n" "\n" -" FILE - имя файла сохраненной игры\n" +" FILE - имя файла сохранённой игры\n" #: pysollib/main.py:157 msgid "" @@ -1396,7 +1396,7 @@ msgid "" "try %s --help for more information" msgstr "" "\"%s: слишком много файлов\n" -"попробуйте %s --help для получения более подробной информаци" +"попробуйте %s --help для получения более подробной информации" #: pysollib/main.py:161 msgid "" @@ -1404,7 +1404,7 @@ msgid "" "try %s --help for more information" msgstr "" "%s: неправильное имя файла\n" -"попробуйте %s --help для получения более подробной информаци" +"попробуйте %s --help для получения более подробной информации" #: pysollib/main.py:369 msgid "" @@ -2400,7 +2400,7 @@ msgstr "Подсветка отсутствия &совпадения" #: pysollib/tk/menubar.py:461 msgid "&Show removed tiles (in Mahjongg games)" -msgstr "Показывать удаленные (в Маджонг)" +msgstr "Показывать удалённые (в Маджонг)" #: pysollib/tk/menubar.py:462 msgid "Show hint &arrow (in Shisen-Sho games)" @@ -2432,7 +2432,7 @@ msgstr "Тень карты" #: pysollib/tk/menubar.py:478 msgid "Shade &legal moves" -msgstr "Подсвечивать &разрешенные ходы" +msgstr "Подсвечивать &разрешённые ходы" #: pysollib/tk/menubar.py:479 msgid "&Negative cards bottom" @@ -2488,7 +2488,7 @@ msgstr "&Липкая мышь" #: pysollib/tk/menubar.py:493 msgid "Use mouse for undo/redo" -msgstr "Использовать мышь для вперед/назад" +msgstr "Использовать мышь для вперёд/назад" #: pysollib/tk/menubar.py:495 msgid "&Fonts..." @@ -2629,7 +2629,7 @@ msgstr "Подтверждение выхода" #: pysollib/tk/playeroptionsdialog.py:128 msgid "Update statistics and logs" -msgstr "Обнавлять статистику и лог" +msgstr "Обновлять статистику и лог" #: pysollib/tk/playeroptionsdialog.py:145 msgid "Select name" @@ -2646,7 +2646,7 @@ msgstr "По типу" #: pysollib/tk/selectcardset.py:101 pysollib/tk/selectcardset.py:112 #: pysollib/tk/selectcardset.py:123 msgid "Uncategorized" -msgstr "Неопределенный" +msgstr "Неопределённый" #: pysollib/tk/selectcardset.py:102 msgid "by Style" @@ -2878,7 +2878,7 @@ msgstr "Другие категории" #: pysollib/tk/selectgame.py:206 msgid "Games for Children (very easy)" -msgstr "Игры для детей (очень легкие)" +msgstr "Игры для детей (очень лёгкие)" #: pysollib/tk/selectgame.py:207 msgid "Games with Scoring" @@ -2894,7 +2894,7 @@ msgstr "Открытые игры (все карты видны)" #: pysollib/tk/selectgame.py:210 msgid "Relaxed Variants" -msgstr "Облегченные варианты" +msgstr "Облегчённые варианты" #: pysollib/tk/selectgame.py:349 msgid "About game" @@ -3004,7 +3004,7 @@ msgstr "Выбрать цвет" #: pysollib/tk/soundoptionsdialog.py:75 msgid "Are You Sure" -msgstr "Вы уверены" +msgstr "Вы уверены?" #: pysollib/tk/soundoptionsdialog.py:77 msgid "Deal" @@ -3012,7 +3012,7 @@ msgstr "Сдача" #: pysollib/tk/soundoptionsdialog.py:78 msgid "Deal waste" -msgstr "Сдача на сброс" +msgstr "Выкладывание на сброс" #: pysollib/tk/soundoptionsdialog.py:80 msgid "Turn waste" @@ -3024,15 +3024,15 @@ msgstr "Начало перемещения" #: pysollib/tk/soundoptionsdialog.py:83 msgid "Drop" -msgstr "Сброс карты" +msgstr "Сбрасывание карты" #: pysollib/tk/soundoptionsdialog.py:84 msgid "Drop pair" -msgstr "Сброс двух карт" +msgstr "Сбрасывание двух карт" #: pysollib/tk/soundoptionsdialog.py:85 msgid "Auto drop" -msgstr "Автосброс карты" +msgstr "Автоматический сброс карты" #: pysollib/tk/soundoptionsdialog.py:87 msgid "Flip" @@ -3048,7 +3048,7 @@ msgstr "Перемещение" #: pysollib/tk/soundoptionsdialog.py:90 msgid "No move" -msgstr "Без пермещения" +msgstr "Отмена перемещения" #: pysollib/tk/soundoptionsdialog.py:92 pysollib/tk/toolbar.py:203 msgid "Undo" @@ -3128,7 +3128,7 @@ msgstr "Подсказка:" #: pysollib/tk/timeoutsdialog.py:67 data/glade-translations:36 msgid "Raise card:" -msgstr "Подъем карты:" +msgstr "Подъём карты:" #: pysollib/tk/timeoutsdialog.py:69 data/glade-translations:38 msgid "Highlight cards:" @@ -3164,7 +3164,7 @@ msgstr "Назад" #: pysollib/tk/tkhtml.py:260 msgid "Forward" -msgstr "Вперед" +msgstr "Вперёд" #: pysollib/tk/tkhtml.py:264 msgid "Close" @@ -3382,7 +3382,7 @@ msgid "" "saved game" msgstr "" "Открыть\n" -"сохраненную игру" +"сохранённую игру" #: pysollib/tk/toolbar.py:201 msgid "Save" @@ -3462,7 +3462,7 @@ msgstr "Пики" #: pysollib/util.py:76 msgid "black" -msgstr "черный" +msgstr "чёрный" #: pysollib/util.py:76 msgid "red" @@ -3526,10 +3526,10 @@ msgstr "Настроить шрифт" #~ msgstr "Показывать демо лого" #~ msgid "Show score in statusbar" -#~ msgstr "Показывать счет в строке состояния" +#~ msgstr "Показывать счёт в строке состояния" #~ msgid "Set demo delay in seconds" -#~ msgstr "Установить задуржку демо в секундах" +#~ msgstr "Установить задержку демо в секундах" #~ msgid "Select" #~ msgstr "Выбрать" @@ -3553,7 +3553,7 @@ msgstr "Настроить шрифт" #~ msgstr "Разрешить показывать &отсутствие совпадение карт" #~ msgid "Invalid or damaged " -#~ msgstr "Поврежденный " +#~ msgstr "Повреждённый " #~ msgid "Balance %d/%d" #~ msgstr "Баланс %d/%d" diff --git a/pysollib/game.py b/pysollib/game.py index 82f5f17b..fc1d410f 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1180,7 +1180,7 @@ class Game: # redeal cards (used in RedealTalonStack; all cards already in talon) def redealCards(self): - raise SubclassResponsibility + pass # the actual hint class (or None) Hint_Class = DefaultHint @@ -2159,7 +2159,8 @@ for %d moves. def closeStackMove(self, stack): assert stack am = ACloseStackMove(stack) - self.__storeMove(am) + # don't store this move (???) + ##self.__storeMove(am) am.do(self) # for ArbitraryStack diff --git a/pysollib/stack.py b/pysollib/stack.py index 175b5ae8..dd08257b 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -438,8 +438,7 @@ class Stack: view._position(card) if update: view.updateText() - if not self.game.moves.state == self.game.S_REDO: - self.closeStackMove() + self.closeStackMove() return card def insertCard(self, card, positon, unhide=1, update=1): From 5e588ab8bc547c3e3ccaaac83516045d649315e1 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 27 Sep 2006 21:12:16 +0000 Subject: [PATCH 071/266] - removed `closeStackMove' * bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@73 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/game.py | 10 +--------- pysollib/games/picturegallery.py | 12 +++--------- pysollib/games/pileon.py | 5 +++-- pysollib/games/takeaway.py | 8 ++++++-- pysollib/move.py | 25 ------------------------- pysollib/stack.py | 14 +++++++------- pysollib/tk/menubar.py | 2 +- 7 files changed, 21 insertions(+), 55 deletions(-) diff --git a/pysollib/game.py b/pysollib/game.py index fc1d410f..b52018da 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -60,7 +60,7 @@ from pysoltk import Card from move import AMoveMove, AFlipMove, ATurnStackMove from move import ANextRoundMove, ASaveSeedMove, AShuffleStackMove from move import AUpdateStackMove, AFlipAllMove, ASaveStateMove -from move import ACloseStackMove, ASingleCardMove +from move import ASingleCardMove from hint import DefaultHint from help import help_about @@ -2155,14 +2155,6 @@ for %d moves. am.do(self) ##self.hints.list = None - # move type 10 - def closeStackMove(self, stack): - assert stack - am = ACloseStackMove(stack) - # don't store this move (???) - ##self.__storeMove(am) - am.do(self) - # for ArbitraryStack def singleCardMove(self, from_stack, to_stack, position, frames=-1, shadow=-1): am = ASingleCardMove(from_stack, to_stack, position, frames, shadow) diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py index 8b8a8115..81227b28 100644 --- a/pysollib/games/picturegallery.py +++ b/pysollib/games/picturegallery.py @@ -143,9 +143,10 @@ class PictureGallery_Foundation(RK_FoundationStack): def getBottomImage(self): return self.game.app.images.getLetter(ACE) - def closeStackMove(self): + def closeStack(self): if len(self.cards) == 8: - self.game.flipAllMove(self) + if not self.game.moves.state == self.game.S_REDO: + self.game.flipAllMove(self) def canFlipCard(self): return False @@ -168,13 +169,6 @@ class PictureGallery_TableauStack(SS_RowStack): def getBottomImage(self): return self.game.app.images.getLetter(self.cap.base_rank) -## def closeStackMove(self): -## if len(self.cards) == self.cap.max_cards: -## self.game.closeStackMove(self) -## ##self.game.flipAllMove(self) -## def canFlipCard(self): -## return False - class PictureGallery_RowStack(BasicRowStack): def acceptsCards(self, from_stack, cards): diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index 636eef91..e7df1948 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -50,9 +50,10 @@ class PileOn_RowStack(RK_RowStack): def getBottomImage(self): return self.game.app.images.getReserveBottom() - def closeStackMove(self): + def closeStack(self): if len(self.cards) == 4 and isRankSequence(self.cards, dir=0): - self.game.flipAllMove(self) + if not self.game.moves.state == self.game.S_REDO: + self.game.flipAllMove(self) def canFlipCard(self): return False diff --git a/pysollib/games/takeaway.py b/pysollib/games/takeaway.py index c9773c14..dad95682 100644 --- a/pysollib/games/takeaway.py +++ b/pysollib/games/takeaway.py @@ -46,7 +46,7 @@ class TakeAway_Foundation(AbstractFoundationStack): return (c1.rank == (c2.rank + 1) % mod or c2.rank == (c1.rank + 1) % mod) - def closeStackMove(self): + def closeStack(self): pass @@ -101,9 +101,13 @@ class TakeAway(Game): # // Four Stacks # ************************************************************************/ +class FourStacks_Foundation(AC_FoundationStack): + def closeStack(self): + pass + class FourStacks(TakeAway): RowStack_Class = StackWrapper(AC_RowStack, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS) - Foundation_Class = StackWrapper(AC_FoundationStack, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS, dir=-1) + Foundation_Class = StackWrapper(FourStacks_Foundation, max_move=UNLIMITED_MOVES, max_accept=UNLIMITED_ACCEPTS, dir=-1) shallHighlightMatch = Game._shallHighlightMatch_AC diff --git a/pysollib/move.py b/pysollib/move.py index af78da62..b6064cd2 100644 --- a/pysollib/move.py +++ b/pysollib/move.py @@ -438,31 +438,6 @@ class AShuffleStackMove(AtomicMove): cmp(self.state, other.state)) -# /*********************************************************************** -# // ACloseStackMove -# ************************************************************************/ - -class ACloseStackMove(AtomicMove): - - def __init__(self, stack): - self.stack_id = stack.id - - def redo(self, game): - stack = game.allstacks[self.stack_id] - assert stack.cards - stack.is_filled = True - stack._shadeStack() - - def undo(self, game): - stack = game.allstacks[self.stack_id] - assert stack.cards - stack.is_filled = False - stack._unshadeStack() - - def cmpForRedo(self, other): - return cmp(self.stack_id, other.stack_id) - - # /*********************************************************************** # // ASingleCardMove - move single card from *anyone* position # // (for ArbitraryStack) diff --git a/pysollib/stack.py b/pysollib/stack.py index dd08257b..46099155 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -438,7 +438,7 @@ class Stack: view._position(card) if update: view.updateText() - self.closeStackMove() + self.closeStack() return card def insertCard(self, card, positon, unhide=1, update=1): @@ -454,8 +454,7 @@ class Stack: view._position(c) if update: view.updateText() - if not self.game.moves.state == self.game.S_REDO: - self.closeStackMove() + self.closeStack() return card # Remove a card from the stack. Also update display. {model -> view} @@ -663,7 +662,7 @@ class Stack: def fillStack(self): self.game.fillStack(self) - def closeStackMove(self): + def closeStack(self): pass # @@ -1251,7 +1250,7 @@ class Stack: drag.stack.group.tkraise() - # for closeStackMove + # for closeStack def _shadeStack(self): if not self.game.app.opt.shade_filled_stacks: return @@ -1966,9 +1965,10 @@ class AbstractFoundationStack(OpenStack): def getBaseCard(self): return self._getBaseCard() - def closeStackMove(self): + def closeStack(self): if len(self.cards) == self.cap.max_cards: - self.game.closeStackMove(self) + self.is_filled = True + self._shadeStack() def getHelp(self): return _('Foundation.') diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index cbd315f9..87208604 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -75,7 +75,7 @@ def createToolbarMenu(menubar, menu): submenu = MfxMenu(menu, label=n_('Style'), tearoff=tearoff) for f in os.listdir(data_dir): d = os.path.join(data_dir, f) - if os.path.isdir(d): + if os.path.isdir(d) and os.path.exists(os.path.join(d, 'small')): name = f.replace('_', ' ').capitalize() submenu.add_radiobutton(label=name, variable=menubar.tkopt.toolbar_style, From e7094f7467a0d23b43fe75716d495df5e54e795b Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 29 Sep 2006 23:27:02 +0000 Subject: [PATCH 072/266] * bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@74 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/app.py | 4 ++-- pysollib/games/canfield.py | 10 +++++----- pysollib/games/capricieuse.py | 3 ++- pysollib/games/numerica.py | 13 +++++++++++-- pysollib/games/royalcotillion.py | 4 ++-- pysollib/games/sultan.py | 3 ++- 6 files changed, 24 insertions(+), 13 deletions(-) diff --git a/pysollib/app.py b/pysollib/app.py index d1621159..c1c8329f 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -177,7 +177,7 @@ class Options: 'hintarrow': '#303030', 'not_matching': '#ff0000', } - self.use_default_text_color = True + self.use_default_text_color = False # delays self.timeouts = { 'hint': 1.0, @@ -202,7 +202,7 @@ class Options: self.splashscreen = True self.mouse_type = 'drag-n-drop' # or 'sticky-mouse' or 'point-n-click' self.mouse_undo = False # use mouse for undo/redo - self.negative_bottom = False + self.negative_bottom = True self.randomize_place = False self.cache_carsets = True # defaults & constants diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 97510582..fb43ffff 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -420,20 +420,20 @@ class Gate(Game): l, s = Layout(self), self.s # set window - w, h = l.XM+max(8*l.XS, 6*l.XS+8*l.XOFFSET), l.YM+3*l.YS+12*l.YOFFSET - self.setSize(w, h) + w, h = max(8*l.XS, 6*l.XS+8*l.XOFFSET), l.YM+3*l.YS+12*l.YOFFSET + self.setSize(w+l.XM, h) # create stacks y = l.YM - for x in (l.XM+(w-(l.XM+8*l.XS))/2, w-l.XS-4*l.XOFFSET): + for x in (l.XM, l.XM+w-l.XS-4*l.XOFFSET): stack = OpenStack(x, y, self, max_accept=0) stack.CARD_XOFFSET, stack.CARD_YOFFSET = l.XOFFSET, 0 s.reserves.append(stack) - x, y = l.XM+2*l.XS, l.YM + x, y = l.XM+(w-4*l.XS)/2, l.YM for i in range(4): s.foundations.append(SS_FoundationStack(x, y, self, suit=i)) x += l.XS - x, y = l.XM, l.YM+l.YS + x, y = l.XM+(w-8*l.XS)/2, l.YM+l.YS for i in range(8): s.rows.append(AC_RowStack(x, y, self)) x += l.XS diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py index d6ffc19c..f3351ded 100644 --- a/pysollib/games/capricieuse.py +++ b/pysollib/games/capricieuse.py @@ -154,7 +154,8 @@ class Strata(Game): registerGame(GameInfo(292, Capricieuse, "Capricieuse", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 2, GI.SL_MOSTLY_SKILL)) registerGame(GameInfo(293, Nationale, "Nationale", - GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL)) + GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 0, GI.SL_MOSTLY_SKILL, + altnames=('Zigzag Course',) )) registerGame(GameInfo(606, Strata, "Strata", GI.GT_BAKERS_DOZEN | GI.GT_OPEN, 2, 1, GI.SL_MOSTLY_SKILL, ranks=(0, 6, 7, 8, 9, 10, 11, 12) )) diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index f160deef..7497c5a6 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -679,11 +679,20 @@ class Strategerie(Game): # // Anno Domini # ************************************************************************/ +class Assembly_RowStack(RK_RowStack): + def acceptsCards(self, from_stack, cards): + if not RK_RowStack.acceptsCards(self, from_stack, cards): + return False + if not self.cards: + return from_stack is self.game.s.waste + return True + + class Assembly(Numerica): Hint_Class = DefaultHint Foundation_Class = StackWrapper(RK_FoundationStack, suit=ANY_SUIT) - RowStack_Class = StackWrapper(RK_RowStack, max_move=1) + RowStack_Class = StackWrapper(Assembly_RowStack, max_move=1) def createGame(self): Numerica.createGame(self, waste_max_cards=UNLIMITED_CARDS) @@ -837,7 +846,7 @@ class DoubleMeasure(Measure): # register the game registerGame(GameInfo(257, Numerica, "Numerica", GI.GT_NUMERICA | GI.GT_CONTRIB, 1, 0, GI.SL_BALANCED, - altnames="Sir Tommy")) + altnames=("Sir Tommy",) )) registerGame(GameInfo(171, LadyBetty, "Lady Betty", GI.GT_NUMERICA, 1, 0, GI.SL_BALANCED)) registerGame(GameInfo(355, Frog, "Frog", diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index c6d52e81..0c1e134b 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -914,8 +914,8 @@ registerGame(GameInfo(97, Carpet, "Carpet", GI.GT_1DECK_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(391, BritishConstitution, "British Constitution", GI.GT_2DECK_TYPE, 2, 0, GI.SL_BALANCED, - ranks=range(11) # without Queens and Kings - )) + ranks=range(11), # without Queens and Kings + altnames=("Constitution",) )) registerGame(GameInfo(392, NewBritishConstitution, "New British Constitution", GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0, GI.SL_BALANCED, ranks=range(11) # without Queens and Kings diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index f1d3322e..d59da55e 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -991,7 +991,8 @@ registerGame(GameInfo(559, Marshal, "Marshal", registerGame(GameInfo(565, RoyalAids, "Royal Aids", GI.GT_2DECK_TYPE, 2, UNLIMITED_REDEALS, GI.SL_BALANCED)) registerGame(GameInfo(598, PicturePatience, "Picture Patience", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK)) + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_LUCK, + rules_filename="patriarchs.html")) registerGame(GameInfo(635, CircleEight, "Circle Eight", GI.GT_1DECK_TYPE, 1, 1, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(646, Adela, "Adela", From 6dd4b5cd9d773ed7d036b1864c5059158d4023cb Mon Sep 17 00:00:00 2001 From: skomoroh Date: Sun, 1 Oct 2006 21:09:18 +0000 Subject: [PATCH 073/266] + 2 new games * updated translation * misc. improvements and bugs fixes git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@75 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- po/ru_games.po | 98 +++++++++++++++----------------------- pysollib/games/golf.py | 56 ++++++++++++++++++++-- pysollib/games/gypsy.py | 10 ++-- pysollib/games/klondike.py | 2 + pysollib/stack.py | 1 + 5 files changed, 99 insertions(+), 68 deletions(-) diff --git a/po/ru_games.po b/po/ru_games.po index 208b853a..3558ae23 100644 --- a/po/ru_games.po +++ b/po/ru_games.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PySol 0.0.1\n" "POT-Creation-Date: Thu Sep 21 15:56:22 2006\n" -"PO-Revision-Date: 2006-09-17 17:05+0400\n" +"PO-Revision-Date: 2006-09-30 18:19+0400\n" "Last-Translator: Скоморох \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -47,13 +47,11 @@ msgstr "8 x 8" msgid "Abacus" msgstr "Абак" -#, fuzzy msgid "Accordion" -msgstr "Скорпион" +msgstr "Аккордеон" -#, fuzzy msgid "Aces High" -msgstr "Тузы вверх" +msgstr "Тузы сверху" msgid "Aces Up" msgstr "Тузы вверх" @@ -211,11 +209,10 @@ msgid "Balance" msgstr "Баланс" msgid "Balarama" -msgstr "" +msgstr "Баларама" -#, fuzzy msgid "Baroness" -msgstr "Основа" +msgstr "Баронесса" msgid "Bastille Day" msgstr "День Бастилии" @@ -244,7 +241,6 @@ msgstr "Клюв и ласты" msgid "Beatle" msgstr "Жук" -#, fuzzy msgid "Beetle" msgstr "Жук" @@ -272,9 +268,8 @@ msgstr "Большой Внутренний двор" msgid "Big Deal" msgstr "Большая Расдача" -#, fuzzy msgid "Big Divorce" -msgstr "Большая дыра" +msgstr "Большой разрыв" #, fuzzy msgid "Big Easy" @@ -283,9 +278,8 @@ msgstr "Большая арфа" msgid "Big Flying Dragon" msgstr "Большой Летящий Дракон" -#, fuzzy msgid "Big Forty" -msgstr "Форт" +msgstr "Большие сорок" msgid "Big Harp" msgstr "Большая арфа" @@ -383,12 +377,11 @@ msgstr "Мост" msgid "Bridge 2" msgstr "Мост 2" -#, fuzzy msgid "Bridget's Game" -msgstr "Мост 2" +msgstr "Пасьянс Бриджит" msgid "Bridget's Game Doubled" -msgstr "" +msgstr "Двойной Пасьянс Бриджит" msgid "Brigade" msgstr "Бригада" @@ -518,7 +511,7 @@ msgid "Chelicera" msgstr "Хелицера" msgid "Cheops" -msgstr "" +msgstr "Хеопс" msgid "Chequers" msgstr "Шахматный порядок" @@ -596,9 +589,8 @@ msgstr "Виток" msgid "Corkscrew" msgstr "Штопор" -#, fuzzy msgid "Corner Card" -msgstr "Углы" +msgstr "Угловая карта" msgid "Corner Suite" msgstr "Угловые масти" @@ -907,9 +899,8 @@ msgstr "Восемь квадратов" msgid "Eight Times Eight" msgstr "Восемь раз по восемь" -#, fuzzy msgid "Eight by Eight" -msgstr "Восемь раз по восемь" +msgstr "Восемь на восемь" msgid "Elba" msgstr "Ельба" @@ -991,12 +982,11 @@ msgstr "Очаровательный веер" msgid "Fastness" msgstr "Крепость" -#, fuzzy msgid "Fatimeh's Game" -msgstr "Бабушкина игра" +msgstr "Пасьянс Фатимы" msgid "Fatimeh's Game Relaxed" -msgstr "" +msgstr "Облегчённый Пасьянс Фатимы" #, fuzzy msgid "Fifteen Puzzle" @@ -1030,9 +1020,8 @@ msgstr "Маджонг Fish face" msgid "Five Aces" msgstr "Пять тузов" -#, fuzzy msgid "Five Piles" -msgstr "Пять тузов" +msgstr "Пять кучек" msgid "Five Pyramids" msgstr "Пять пирамид" @@ -1043,9 +1032,8 @@ msgstr "Фламенко" msgid "Floating City" msgstr "Плавающий город" -#, fuzzy msgid "Floradora" -msgstr "Колорадо" +msgstr "Флорадора" msgid "Flower Arrangement" msgstr "Аранжировка цветов" @@ -1392,9 +1380,8 @@ msgstr "Дурацкое удовольствие" msgid "Idle Aces" msgstr "Свободные тузы" -#, fuzzy msgid "Idle Year" -msgstr "Свободные тузы" +msgstr "Свободный год" msgid "IloveU" msgstr "IloveU" @@ -1498,26 +1485,25 @@ msgid "K for Kyodai" msgstr "Маджонг K for Kyodai" msgid "Kali's Game" -msgstr "" +msgstr "Пасьянс Кали" msgid "Kali's Game Doubled" -msgstr "" +msgstr "Двойной Пасьянс Кали" msgid "Kali's Game Relaxed" -msgstr "" +msgstr "Облегчённый Пасьянс Кали" msgid "Kansas" msgstr "Канзас" -#, fuzzy msgid "Katrina's Game" -msgstr "Бабушкина игра" +msgstr "Пасьянс Катрины" msgid "Katrina's Game Doubled" -msgstr "" +msgstr "Двойной Пасьянс Катрины" msgid "Katrina's Game Relaxed" -msgstr "" +msgstr "Облегчённый Пасьянс Катрины" msgid "Khadga" msgstr "Khadga" @@ -1546,9 +1532,8 @@ msgstr "" msgid "Klondike" msgstr "Клондайк" -#, fuzzy msgid "Klondike Plus 16" -msgstr "Клондайк" +msgstr "Клондайк Плюс 16" msgid "Klondike by Threes" msgstr "Клондайк по три" @@ -1660,15 +1645,14 @@ msgstr "Ленивая леди" msgid "Lanes" msgstr "Тропинки" -#, fuzzy msgid "Lara's Game" -msgstr "Бабушкина игра" +msgstr "Пасьянс Лары" msgid "Lara's Game Doubled" -msgstr "" +msgstr "Двойной Пасьянс Лары" msgid "Lara's Game Relaxed" -msgstr "" +msgstr "Облегчённый Пасьянс Лары" msgid "Last Chance" msgstr "Последний шанс" @@ -1713,9 +1697,8 @@ msgstr "Малыш Билли" msgid "Little Easy" msgstr "Малые ворота" -#, fuzzy msgid "Little Forty" -msgstr "Малые ворота" +msgstr "Малые сорок" msgid "Little Gate" msgstr "Малые ворота" @@ -1753,9 +1736,8 @@ msgstr "Счастливые Тринадцать" msgid "Madame" msgstr "Мадам" -#, fuzzy msgid "Mage's Game" -msgstr "Бабушкина игра" +msgstr "Пасьянс Меги" msgid "Mahjongg Altar" msgstr "Маджонг Алтарь" @@ -2701,9 +2683,8 @@ msgstr "Настойчивость" msgid "Phantom Blockade" msgstr "Призрачная блокада" -#, fuzzy msgid "Pharaohs" -msgstr "Патриархи" +msgstr "Фараоны" msgid "Phoenix" msgstr "Феникс" @@ -3042,7 +3023,7 @@ msgid "Senate +" msgstr "Сенат +" msgid "Senior Wrangler" -msgstr "" +msgstr "Сеньор Врангель" msgid "Serpent" msgstr "Змея" @@ -3149,7 +3130,7 @@ msgid "Sixes and Sevens" msgstr "Шестёрки и семёрки" msgid "Skippy" -msgstr "" +msgstr "Попрыгунчик" msgid "Skiz" msgstr "" @@ -3303,7 +3284,7 @@ msgid "Storehouse" msgstr "Сокровищница" msgid "Straight Up" -msgstr "" +msgstr "Прямолинейный" msgid "Strata" msgstr "Пласт" @@ -3326,7 +3307,7 @@ msgstr "Улицы и аллеи" #, fuzzy msgid "Striptease" -msgstr "Пласт" +msgstr "Стриптиз" msgid "Stronghold" msgstr "Твердыня" @@ -3349,9 +3330,8 @@ msgstr "Турецкий султан" msgid "Sumo" msgstr "Сумо" -#, fuzzy msgid "SunMoon" -msgstr "Голубая луна" +msgstr "СолнцеЛуна" msgid "Super Challenge FreeCell" msgstr "Очень Сложная Свободная ячейка" @@ -3502,9 +3482,8 @@ msgstr "Маджонг Totally Random-Made" msgid "Tournament" msgstr "Турнир" -#, fuzzy msgid "Tower of Babel" -msgstr "Ханойская башня" +msgstr "Вавилонская башня" msgid "Tower of Hanoy" msgstr "Ханойская башня" @@ -3622,9 +3601,8 @@ msgstr "" msgid "Vamana" msgstr "" -#, fuzzy msgid "Vanishing Cross" -msgstr "Маджонг Крест" +msgstr "Исчезающий Крест" #, fuzzy msgid "Varaha" @@ -3643,7 +3621,7 @@ msgid "Vertical" msgstr "Вертикаль" msgid "Very Big Divorce" -msgstr "" +msgstr "Очень большой разрыв" msgid "Vi" msgstr "" diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 51eb939a..1e77d66f 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -506,9 +506,6 @@ class Robert(Game): DIAMOND = 3 -class DiamondMine_Foundation(AbstractFoundationStack): - pass - class DiamondMine_RowStack(RK_RowStack): def acceptsCards(self, from_stack, cards): if not RK_RowStack.acceptsCards(self, from_stack, cards): @@ -558,6 +555,55 @@ class DiamondMine(Game): shallHighlightMatch = Game._shallHighlightMatch_RK +# /*********************************************************************** +# // Dolphin +# ************************************************************************/ + +class Dolphin(Game): + + def createGame(self, rows=8, reserves=4, playcards=6): + l, s = Layout(self), self.s + self.setSize(l.XM+rows*l.XS, l.YM+3*l.YS+playcards*l.YOFFSET) + + dx = (self.width-l.XM-(reserves+1)*l.XS)/3 + x, y = l.XM+dx, l.YM + for i in range(reserves): + s.reserves.append(ReserveStack(x, y, self)) + x += l.XS + x += dx + max_cards = 52*self.gameinfo.decks + s.foundations.append(RK_FoundationStack(x, y, self, + base_rank=ANY_RANK, mod=13, max_cards=max_cards)) + x, y = l.XM, l.YM+l.YS + for i in range(rows): + s.rows.append(BasicRowStack(x, y, self)) + x += l.XS + s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) + + l.defaultAll() + + def startGame(self): + for i in range(5): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRowAvail() + + +class DoubleDolphin(Dolphin): + + def createGame(self): + Dolphin.createGame(self, rows=10, reserves=5, playcards=10) + + def startGame(self): + for i in range(9): + self.s.talon.dealRow(frames=0) + self.startDealSample() + self.s.talon.dealRow() + self.s.talon.dealRowAvail() + + + # register the game registerGame(GameInfo(36, Golf, "Golf", GI.GT_GOLF, 1, 0, GI.SL_BALANCED)) @@ -580,4 +626,8 @@ registerGame(GameInfo(432, Robert, "Robert", GI.GT_GOLF, 1, 2, GI.SL_LUCK)) registerGame(GameInfo(551, DiamondMine, "Diamond Mine", GI.GT_1DECK_TYPE, 1, 0, GI.SL_BALANCED)) +registerGame(GameInfo(661, Dolphin, "Dolphin", + GI.GT_GOLF, 1, 0, GI.SL_MOSTLY_SKILL | GI.GT_ORIGINAL)) +registerGame(GameInfo(662, DoubleDolphin, "Double Dolphin", + GI.GT_GOLF, 2, 0, GI.SL_MOSTLY_SKILL | GI.GT_ORIGINAL)) diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index 718cf761..bf59c31a 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -233,7 +233,7 @@ class MissMilligan(Gypsy): l, s = Layout(self), self.s # set window - self.setSize(l.XM + (1+max(8,rows))*l.XS, l.YM + (1+max(4, reserves))*l.YS) + self.setSize(l.XM + (1+max(8,rows))*l.XS, l.YM + (1+max(4, reserves))*l.YS+l.TEXT_HEIGHT) # create stacks x, y = l.XM, l.YM @@ -242,14 +242,14 @@ class MissMilligan(Gypsy): x = x + l.XS s.foundations.append(self.Foundation_Class(x, y, self, suit=i/2)) x, y = l.XM, y + l.YS - rx, ry = x + l.XS - l.XM/2, y - l.YM/2 + rx, ry = x + l.XS - l.CW/2, y - l.CH/2 for i in range(reserves): - s.reserves.append(self.ReserveStack_Class(x, y, self)) + s.reserves.append(self.ReserveStack_Class(x, y+l.TEXT_HEIGHT, self)) y = y + l.YS + l.createText(s.talon, "s") if s.reserves: - self.setRegion(s.reserves, (-999, ry, rx - 1, 999999)) + self.setRegion(s.reserves, (-999, ry+l.TEXT_HEIGHT, rx-1, 999999)) else: - l.createText(s.talon, "s") rx = -999 x, y = l.XM + (8-rows)*l.XS/2, l.YM + l.YS for i in range(rows): diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 155845a5..149912f1 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -168,6 +168,8 @@ class Chinaman(ThumbAndPouch): class Whitehead_RowStack(SS_RowStack): def _isAcceptableSequence(self, cards): return isSameColorSequence(cards, self.cap.mod, self.cap.dir) + def getHelp(self): + return _('Tableau. Build down by color.') class Whitehead(Klondike): RowStack_Class = Whitehead_RowStack diff --git a/pysollib/stack.py b/pysollib/stack.py index 46099155..8a3c900a 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -937,6 +937,7 @@ class Stack: self.game.event_handled = True # for Game.undoHandler if self.game.demo: self.game.stopDemo(event) + return EVENT_HANDLED self.game.interruptSleep() if self.game.busy: return EVENT_HANDLED if self.game.drag.stack and cancel_drag: From be2c60dd0586dbfba59a37f3ca757d3055f7f958 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Mon, 2 Oct 2006 21:13:16 +0000 Subject: [PATCH 074/266] + 1 new game * misc. improvements git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@76 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- pysollib/games/acesup.py | 7 +++++- pysollib/games/bakersgame.py | 2 +- pysollib/games/katzenschwanz.py | 2 +- pysollib/games/montecarlo.py | 44 +++++++++++++++++++++++++++------ pysollib/tk/tkhtml.py | 4 +-- 5 files changed, 47 insertions(+), 12 deletions(-) diff --git a/pysollib/games/acesup.py b/pysollib/games/acesup.py index 823546a5..edcb199e 100644 --- a/pysollib/games/acesup.py +++ b/pysollib/games/acesup.py @@ -174,6 +174,8 @@ class PerpetualMotion_Talon(DealRowTalonStack): def dealCards(self, sound=0): if self.cards: return DealRowTalonStack.dealCards(self, sound=sound) + if sound: + self.game.startDealSample() game, num_cards = self.game, len(self.cards) rows = list(game.s.rows)[:] rows.reverse() @@ -184,7 +186,10 @@ class PerpetualMotion_Talon(DealRowTalonStack): if self.cards[-1].face_up: game.flipMove(self) assert len(self.cards) == num_cards - return DealRowTalonStack.dealCards(self, sound=sound) + n = DealRowTalonStack.dealCards(self, sound=0) + if sound: + self.game.stopSamples() + return n class PerpetualMotion_Foundation(AbstractFoundationStack): diff --git a/pysollib/games/bakersgame.py b/pysollib/games/bakersgame.py index feea47ed..9b031a92 100644 --- a/pysollib/games/bakersgame.py +++ b/pysollib/games/bakersgame.py @@ -208,7 +208,7 @@ class SeahavenTowers(KingOnlyBakersGame): for i in range(10): s.rows.append(self.RowStack_Class(x, y, self)) x = x + l.XS - self.setRegion(s.rows, (-999, y - l.YM / 2, 999999, 999999)) + self.setRegion(s.rows, (-999, y - l.CH / 2, 999999, 999999)) s.talon = InitialDealTalonStack(l.XM, self.height-l.YS, self) # define stack-groups diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index ade7d835..42b2458b 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -92,7 +92,7 @@ class DerKatzenschwanz(Game): s.reserves.append(ReserveStack(x, y, self)) x = x + l.XS x, y = l.XM + (maxrows-rows)*l.XS/2, l.YM + l.YS - self.setRegion(s.reserves, (-999, -999, 999999, y - l.XM / 2)) + self.setRegion(s.reserves, (-999, -999, 999999, y - l.CH / 2)) for i in range(rows): stack = self.RowStack_Class(x, y, self) stack.CARD_XOFFSET = xoffset diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index 5cf198f1..c8e82ae8 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -678,6 +678,7 @@ class DerLetzteMonarch_RowStack(ReserveStack): assert ncards == 1 and to_stack in self.game.s.rows assert len(to_stack.cards) == 1 self._handlePairMove(ncards, to_stack, frames=-1, shadow=0) + self.fillStack() def _handlePairMove(self, n, other_stack, frames=-1, shadow=-1): game = self.game @@ -695,30 +696,42 @@ class DerLetzteMonarch_ReserveStack(ReserveStack): class DerLetzteMonarch(Game): + Talon_Class = InitialDealTalonStack # # game layout # - def createGame(self): + def createGame(self, texts=False): # create layout l, s = Layout(self, card_x_space=4), self.s # set window - self.setSize(l.XM + 13*l.XS, l.YM + 5*l.YS) + decks = self.gameinfo.decks + if decks == 1: + w = l.XM + 13*l.XS + dx = 0 + else: + w = l.XM + 15*l.XS + dx = l.XS + h = l.YM + 5*l.YS + self.setSize(w, h) # create stacks for i in range(4): for j in range(13): - x, y, = l.XM + j*l.XS, l.YM + (i+1)*l.YS + x, y, = dx + l.XM + j*l.XS, l.YM + (i+1)*l.YS s.rows.append(DerLetzteMonarch_RowStack(x, y, self, max_accept=1, max_cards=2)) for i in range(4): x, y, = l.XM + (i+2)*l.XS, l.YM s.reserves.append(DerLetzteMonarch_ReserveStack(x, y, self, max_accept=0)) - for i in range(4): + for i in range(4*decks): x, y, = l.XM + (i+7)*l.XS, l.YM - s.foundations.append(DerLetzteMonarch_Foundation(x, y, self, i, max_move=0)) - s.talon = InitialDealTalonStack(l.XM, l.YM, self) + s.foundations.append(DerLetzteMonarch_Foundation(x, y, self, + suit=i%4, max_move=0)) + s.talon = self.Talon_Class(l.XM, l.YM, self) + if texts: + l.createText(s.talon, 'ne') # define stack-groups (non default) self.sg.talonstacks = [s.talon] @@ -739,7 +752,7 @@ class DerLetzteMonarch(Game): c = 0 for s in self.s.foundations: c = c + len(s.cards) - return c == 51 + return c == self.gameinfo.ncards-1 def getAutoStacks(self, event=None): return ((), self.s.reserves, ()) @@ -765,6 +778,21 @@ class DerLetzteMonarch(Game): return diff in (-13, -1, 1, 13) +class TheLastMonarchII(DerLetzteMonarch): + Talon_Class = TalonStack + + def createGame(self): + DerLetzteMonarch.createGame(self, texts=True) + + def fillStack(self, stack): + if stack in self.s.rows and not stack.cards: + if self.s.talon.cards: + old_state = self.enterState(self.S_FILL) + self.s.talon.flipMove() + self.s.talon.moveMove(1, stack) + self.leaveState(old_state) + + # /*********************************************************************** # // Doublets # ************************************************************************/ @@ -844,4 +872,6 @@ registerGame(GameInfo(368, Vertical, "Vertical", GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(649, DoubletsII, "Doublets II", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) +registerGame(GameInfo(663, TheLastMonarchII, "The last Monarch II", + GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index 04f60a6a..0f8bdcbe 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -269,14 +269,14 @@ class HTMLViewer: # create text widget text_frame = Tkinter.Frame(parent) text_frame.grid(row=1, column=0, columnspan=4, sticky='nsew') + vbar = Tkinter.Scrollbar(text_frame) + vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y) self.text = Tkinter.Text(text_frame, fg='black', bg='white', bd=1, relief='sunken', cursor=self.defcursor, wrap='word', padx=20, pady=20) self.text.pack(side=Tkinter.LEFT, fill=Tkinter.BOTH, expand=1) - vbar = Tkinter.Scrollbar(text_frame) - vbar.pack(side=Tkinter.RIGHT, fill=Tkinter.Y) self.text["yscrollcommand"] = vbar.set vbar["command"] = self.text.yview From e19828c11dfbfeaa8be0c76a3fe37321e9832e93 Mon Sep 17 00:00:00 2001 From: skomoroh Date: Wed, 4 Oct 2006 21:26:46 +0000 Subject: [PATCH 075/266] + added support tile (http://tktable.sourceforge.net/tile) git-svn-id: https://pysolfc.svn.sourceforge.net/svnroot/pysolfc/PySolFC/trunk@77 39dd0a4e-7c14-0410-91b3-c4f2d318f732 --- MANIFEST.in | 2 +- pysol | 17 +- pysollib/games/montecarlo.py | 6 +- pysollib/main.py | 10 +- pysollib/pysolgtk/tkutil.py | 2 - pysollib/pysoltk.py | 72 +- pysollib/settings.py | 5 +- pysollib/tile/Tile.py | 621 ++++++++++++ pysollib/tile/__init__.py | 0 pysollib/tile/card.py | 258 +++++ pysollib/tile/colorsdialog.py | 130 +++ pysollib/tile/edittextdialog.py | 100 ++ pysollib/tile/findcarddialog.py | 220 +++++ pysollib/tile/fontsdialog.py | 212 ++++ pysollib/tile/gameinfodialog.py | 159 +++ pysollib/tile/menubar.py | 1328 ++++++++++++++++++++++++++ pysollib/tile/playeroptionsdialog.py | 186 ++++ pysollib/tile/progressbar.py | 151 +++ pysollib/tile/selectcardset.py | 407 ++++++++ pysollib/tile/selectgame.py | 576 +++++++++++ pysollib/tile/selecttile.py | 209 ++++ pysollib/tile/selecttree.py | 185 ++++ pysollib/tile/soundoptionsdialog.py | 212 ++++ pysollib/tile/statusbar.py | 206 ++++ pysollib/tile/timeoutsdialog.py | 99 ++ pysollib/tile/tkcanvas.py | 394 ++++++++ pysollib/tile/tkconst.py | 123 +++ pysollib/tile/tkhtml.py | 540 +++++++++++ pysollib/tile/tkstats.py | 867 +++++++++++++++++ pysollib/tile/tktree.py | 423 ++++++++ pysollib/tile/tkutil.py | 410 ++++++++ pysollib/tile/tkwidget.py | 722 ++++++++++++++ pysollib/tile/tkwrap.py | 197 ++++ pysollib/tile/toolbar.py | 607 ++++++++++++ pysollib/tk/tkwidget.py | 16 +- setup.py | 1 + 36 files changed, 9626 insertions(+), 47 deletions(-) create mode 100644 pysollib/tile/Tile.py create mode 100644 pysollib/tile/__init__.py create mode 100644 pysollib/tile/card.py create mode 100644 pysollib/tile/colorsdialog.py create mode 100644 pysollib/tile/edittextdialog.py create mode 100644 pysollib/tile/findcarddialog.py create mode 100644 pysollib/tile/fontsdialog.py create mode 100644 pysollib/tile/gameinfodialog.py create mode 100644 pysollib/tile/menubar.py create mode 100644 pysollib/tile/playeroptionsdialog.py create mode 100644 pysollib/tile/progressbar.py create mode 100644 pysollib/tile/selectcardset.py create mode 100644 pysollib/tile/selectgame.py create mode 100644 pysollib/tile/selecttile.py create mode 100644 pysollib/tile/selecttree.py create mode 100644 pysollib/tile/soundoptionsdialog.py create mode 100644 pysollib/tile/statusbar.py create mode 100644 pysollib/tile/timeoutsdialog.py create mode 100644 pysollib/tile/tkcanvas.py create mode 100644 pysollib/tile/tkconst.py create mode 100644 pysollib/tile/tkhtml.py create mode 100644 pysollib/tile/tkstats.py create mode 100644 pysollib/tile/tktree.py create mode 100644 pysollib/tile/tkutil.py create mode 100644 pysollib/tile/tkwidget.py create mode 100644 pysollib/tile/tkwrap.py create mode 100644 pysollib/tile/toolbar.py diff --git a/MANIFEST.in b/MANIFEST.in index 5c619d34..479e3134 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -5,7 +5,7 @@ ## include pysol setup.py setup.cfg MANIFEST.in Makefile COPYING README #recursive-include pysollib *.py -include pysollib/*.py pysollib/tk/*.py pysollib/pysolgtk/*.py +include pysollib/*.py pysollib/tk/*.py pysollib/tile/*.py pysollib/pysolgtk/*.py include pysollib/games/*.py pysollib/games/special/*.py include pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py include scripts/build.bat scripts/create_iss.py scripts/mahjongg_utils.py diff --git a/pysol b/pysol index b53c9be6..4a67e441 100755 --- a/pysol +++ b/pysol @@ -50,18 +50,23 @@ if os.name == 'nt' and not os.environ.has_key('LANG'): import gettext ##locale_dir = 'locale' locale_dir = None -d = os.path.join(sys.path[0], 'locale') +if os.path.isdir(sys.path[0]): + d = os.path.join(sys.path[0], 'locale') +else: + # i.e. library.zip + d = os.path.join(os.path.dirname(sys.path[0]), 'locale') if os.path.exists(d) and os.path.isdir(d): locale_dir = d -if os.name == 'nt': - if sys.path[0] and not os.path.isdir(sys.path[0]): # i.e. library.zip - locale_dir = os.path.join(os.path.split(sys.path[0])[0], 'locale') ##if locale_dir: locale_dir = os.path.normpath(locale_dir) gettext.install('pysol', locale_dir, unicode=True) ## init toolkit -if '--gtk' in sys.argv: - import pysollib.settings +import pysollib.settings +if '--tile' in sys.argv: + #pysollib.settings.TOOLKIT = 'gtk' + pysollib.settings.USE_TILE = True + sys.argv.remove('--tile') +elif '--gtk' in sys.argv: pysollib.settings.TOOLKIT = 'gtk' sys.argv.remove('--gtk') diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index c8e82ae8..c5246ab9 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -859,7 +859,7 @@ registerGame(GameInfo(96, Fourteen, "Fourteen", GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(235, Nestor, "Nestor", GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_LUCK)) -registerGame(GameInfo(152, DerLetzteMonarch, "The last Monarch", +registerGame(GameInfo(152, DerLetzteMonarch, "The Last Monarch", GI.GT_1DECK_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_SKILL, altnames=("Der letzte Monarch",) )) registerGame(GameInfo(328, TheWish, "The Wish", @@ -872,6 +872,6 @@ registerGame(GameInfo(368, Vertical, "Vertical", GI.GT_PAIRING_TYPE | GI.GT_OPEN, 1, 0, GI.SL_MOSTLY_LUCK)) registerGame(GameInfo(649, DoubletsII, "Doublets II", GI.GT_PAIRING_TYPE, 1, 0, GI.SL_MOSTLY_LUCK)) -registerGame(GameInfo(663, TheLastMonarchII, "The last Monarch II", - GI.GT_2DECK_TYPE, 2, 0, GI.SL_MOSTLY_SKILL)) +registerGame(GameInfo(663, TheLastMonarchII, "The Last Monarch II", + GI.GT_2DECK_TYPE | GI.GT_ORIGINAL, 2, 0, GI.SL_MOSTLY_SKILL)) diff --git a/pysollib/main.py b/pysollib/main.py index 78235dae..7785c46c 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -43,7 +43,7 @@ import gettext # PySol imports from mfxutil import destruct, EnvError from util import CARDSET, DataLoader -from settings import PACKAGE, TOOLKIT, VERSION +from settings import PACKAGE, TOOLKIT, VERSION, USE_TILE from resource import Tile from gamedb import GI from app import Application @@ -323,6 +323,14 @@ def pysol_init(app, args): app.top_palette[0] = fg # + if USE_TILE: # for tile + top.option_add('*Toolbar.relief', 'groove') + top.option_add('*Toolbar.borderWidth', 2) + top.option_add('*Toolbar.Button.Pad', 2) + top.option_add('*Toolbar.Button.default', 'disabled') + top.option_add('*Toolbar*takeFocus', 1) + top.option_add('*Tree.background', 'red') + if os.name == "posix": # Unix/X11 top.option_add('*Entry.background', 'white', 60) top.option_add('*Entry.foreground', 'black', 60) diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index 162c2f31..6b35135d 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -36,8 +36,6 @@ import sys, os, string, time, types import gobject import pango, gtk from gtk import gdk -TRUE, FALSE = True, False - # /*********************************************************************** diff --git a/pysollib/pysoltk.py b/pysollib/pysoltk.py index fe126af8..62454e95 100644 --- a/pysollib/pysoltk.py +++ b/pysollib/pysoltk.py @@ -19,33 +19,57 @@ ## ##---------------------------------------------------------------------------## -from settings import TOOLKIT +from settings import TOOLKIT, USE_TILE if TOOLKIT == 'tk': - from tk.tkconst import * - from tk.tkutil import * - from tk.tkcanvas import * - from tk.tkwrap import * - from tk.tkwidget import * - from tk.tkhtml import * - from tk.edittextdialog import * - from tk.tkstats import * - from tk.playeroptionsdialog import * - from tk.soundoptionsdialog import * - from tk.timeoutsdialog import * - from tk.colorsdialog import * - from tk.fontsdialog import * - from tk.findcarddialog import * - from tk.gameinfodialog import * - from tk.toolbar import * - from tk.statusbar import * - from tk.progressbar import * - from tk.menubar import * - from tk.card import * - from tk.selectcardset import * - from tk.selecttree import * + if USE_TILE: + from tile.tkconst import * + from tile.tkutil import * + from tile.tkcanvas import * + from tile.tkwrap import * + from tile.tkwidget import * + from tile.tkhtml import * + from tile.edittextdialog import * + from tile.tkstats import * + from tile.playeroptionsdialog import * + from tile.soundoptionsdialog import * + from tile.timeoutsdialog import * + from tile.colorsdialog import * + from tile.fontsdialog import * + from tile.findcarddialog import * + from tile.gameinfodialog import * + from tile.toolbar import * + from tile.statusbar import * + from tile.progressbar import * + from tile.menubar import * + from tile.card import * + from tile.selectcardset import * + from tile.selecttree import * + else: + from tk.tkconst import * + from tk.tkutil import * + from tk.tkcanvas import * + from tk.tkwrap import * + from tk.tkwidget import * + from tk.tkhtml import * + from tk.edittextdialog import * + from tk.tkstats import * + from tk.playeroptionsdialog import * + from tk.soundoptionsdialog import * + from tk.timeoutsdialog import * + from tk.colorsdialog import * + from tk.fontsdialog import * + from tk.findcarddialog import * + from tk.gameinfodialog import * + from tk.toolbar import * + from tk.statusbar import * + from tk.progressbar import * + from tk.menubar import * + from tk.card import * + from tk.selectcardset import * + from tk.selecttree import * -else: +else: # gtk from pysolgtk.tkconst import * from pysolgtk.tkutil import * from pysolgtk.tkcanvas import * diff --git a/pysollib/settings.py b/pysollib/settings.py index 99f148a3..23f26216 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -32,8 +32,9 @@ VERSION = '4.82' FC_VERSION = '0.9.4' VERSION_TUPLE = (4, 82) -TOOLKIT = 'gtk' -TOOLKIT = 'tk' +TOOLKIT = 'tk' # or 'gtk' +USE_TILE = False +TILE_THEME = 'clam' #'default' # name of tile's theme # data dirs DATA_DIRS = [] diff --git a/pysollib/tile/Tile.py b/pysollib/tile/Tile.py new file mode 100644 index 00000000..bcd9534b --- /dev/null +++ b/pysollib/tile/Tile.py @@ -0,0 +1,621 @@ + + +import Tkinter +from Tkconstants import * + + +BooleanVar = Tkinter.BooleanVar +IntVar = Tkinter.IntVar +DoubleVar = Tkinter.DoubleVar +StringVar = Tkinter.StringVar + +Tk = Tkinter.Tk +Toplevel = Tkinter.Toplevel +Menu = Tkinter.Menu +Message = Tkinter.Message +Listbox = Tkinter.Listbox +Text = Tkinter.Text +Canvas = Tkinter.Canvas + +PhotoImage = Tkinter.PhotoImage +Event = Tkinter.Event +TkVersion = Tkinter.TkVersion +TclError = Tkinter.TclError + + +class Style: + def __init__(self, master): + self.tk = master.tk + + def default(self, style, **kw): + """Sets the default value of the specified option(s) in style""" + pass + + def map_style(self, **kw): + """Sets dynamic values of the specified option(s) in style. See + "STATE MAPS", below.""" + pass + + def layout(self, style, layoutSpec): + """Define the widget layout for style style. See "LAYOUTS" below + for the format of layoutSpec. If layoutSpec is omitted, return the + layout specification for style style. """ + pass + + def element_create(self, name, type, *args): + """Creates a new element in the current theme of type type. The + only built-in element type is image (see image(n)), although + themes may define other element types (see + Ttk_RegisterElementFactory). + """ + pass + + def element_names(self): + """Returns a list of all elements defined in the current theme. """ + pass + + def theme_create(self, name, parent=None, basedon=None): + """Creates a new theme. It is an error if themeName already exists. + If -parent is specified, the new theme will inherit styles, elements, + and layouts from the parent theme basedon. If -settings is present, + script is evaluated in the context of the new theme as per style theme + settings. + """ + pass + + def theme_settings(self, name, script): + """Temporarily sets the current theme to themeName, evaluate script, + then restore the previous theme. Typically script simply defines styles + and elements, though arbitrary Tcl code may appear. + """ + pass + + def theme_names(self): + """Returns a list of the available themes. """ + return self.tk.call("style", "theme", "names") + + def theme_use(self, theme): + """Sets the current theme to themeName, and refreshes all widgets.""" + return self.tk.call("style", "theme", "use", theme) + + def _options(self, cnf): + """Internal function.""" + res = () + for k, v in cnf.items(): + if v is not None: + if k[-1] == '_': k = k[:-1] + res = res + ('-'+k, v) + return res + + def configure(self, style, **kw): + """Sets the default value of the specified option(s) + in style.""" + opts = self._options(kw) + return self.tk.call("style", "configure", style, *opts) + config = configure + + +class Widget(Tkinter.Widget, Style): + def __init__(self, master, widgetName=None, cnf={}, kw={}, extra=()): + if not widgetName: + ## why you would ever want to create a Tile Widget is behond me! + widgetName="ttk::widget" + Tkinter.Widget.__init__(self, master, widgetName, cnf, kw) + + def instate(self, spec=None, script=None): + """Test the widget's state. If script is not specified, returns 1 + if the widget state matches statespec and 0 otherwise. If script + is specified, equivalent to if {[pathName instate stateSpec]} + script. + """ + return self.tk.call(self._w, "instate", spec, script) + + def state(self, spec=None): + """Modify or inquire widget state. If stateSpec is present, sets + the widget state: for each flag in stateSpec, sets the corresponding + flag or clears it if prefixed by an exclamation point. Returns a new + state spec indicating which flags were changed: ''set changes + [pathName state spec] ; pathName state $changes'' will restore + pathName to the original state. If stateSpec is not specified, + returns a list of the currently-enabled state flags. + """ + return self.tk.call(self._w, "state", spec) + + +class Button(Widget, Tkinter.Button): + def __init__(self, master=None, cnf={}, **kw): + for opt in ('bd', 'relief', 'padx', 'pady', 'overrelief',): + if kw.has_key(opt): + del kw[opt] + Widget.__init__(self, master, "ttk::button", cnf, kw) + + +class Checkbutton(Widget, Tkinter.Checkbutton): + def __init__(self, master=None, cnf={}, **kw): + for opt in ('bd', 'anchor', 'selectcolor', 'indicatoron', + 'relief', 'overrelief', 'offrelief', 'padx', 'pady',): + if kw.has_key(opt): + del kw[opt] + Widget.__init__(self, master, "ttk::checkbutton", cnf, kw) + + +class Combobox(Widget, Tkinter.Entry): + def __init__(self, master=None, cnf={}, **kw): + Widget.__init__(self, master, "ttk::combobox", cnf, kw) + + def current(self, index=None): + """If index is supplied, sets the combobox value to the element + at position newIndex in the list of -values. Otherwise, returns + the index of the current value in the list of -values or -1 if + the current value does not appear in the list. + """ + return self.tk.call(self._w, "current", index) + + +class Entry(Widget, Tkinter.Entry): + def __init__(self, master=None, cnf={}, **kw): + if kw.has_key('bg'): + del kw['bg'] + Widget.__init__(self, master, "ttk::entry", cnf, kw) + + def validate(self): + """Force revalidation, independent of the conditions specified by + the -validate option. Returns 0 if the -validatecommand returns a + false value, or 1 if it returns a true value or is not specified. + """ + return self.tk.call(self._w, "validate") + + +class Label(Widget, Tkinter.Label): + def __init__(self, master=None, cnf={}, **kw): + for opt in ('bd', 'bg', 'fg', 'padx', 'pady', 'height', + 'highlightbackground', 'highlightthickness'): + if kw.has_key(opt): + del kw[opt] + Widget.__init__(self, master, "ttk::label", cnf, kw) + + +class Frame(Widget, Tkinter.Frame): + def __init__(self, master=None, cnf={}, **kw): + for opt in ('bd', 'highlightthickness',): + if kw.has_key(opt): + del kw[opt] + Widget.__init__(self, master, "ttk::frame", cnf, kw) + + +class LabelFrame(Widget, Tkinter.Frame): + def __init__(self, master=None, cnf={}, **kw): + Widget.__init__(self, master, "ttk::labelframe", cnf, kw) + + +class Menubutton(Widget, Tkinter.Menubutton): + def __init__(self, master=None, cnf={}, **kw): + Widget.__init__(self, master, "ttk::menubutton", cnf, kw) + + +class Scale(Widget, Tkinter.Scale): + def __init__(self, master=None, cnf={}, **kw): + if kw.has_key('resolution'): + del kw['resolution'] + Widget.__init__(self, master, "ttk::scale", cnf, kw) + + +class Notebook(Widget): + def __init__(self, master=None, cnf={}, **kw): + Widget.__init__(self, master, "ttk::notebook", cnf, kw) + + def add(self, child, cnf=(), **kw): + """Adds a new tab to the notebook. When the tab is selected, the + child window will be displayed. child must be a direct child of + the notebook window. See TAB OPTIONS for the list of available + options. + """ + return self.tk.call((self._w, "add", child) + self._options(cnf, kw)) + + def forget(self, index): + """Removes the tab specified by index, unmaps and unmanages the + associated child window. + """ + return self.tk.call(self._w, "forget", index) + + def index(self, index): + """Returns the numeric index of the tab specified by index, or + the total number of tabs if index is the string "end". + """ + return self.tk.call(self._w, "index") + + def select(self, index): + """Selects the specified tab; the associated child pane will + be displayed, and the previously-selected pane (if different) + is unmapped. + """ + return self.tk.call(self._w, "select", index) + + def tab(self, index, **kw): + """Query or modify the options of the specific tab. If no + -option is specified, returns a dictionary of the tab option + values. If one -option is specified, returns the value of tha + t option. Otherwise, sets the -options to the corresponding + values. See TAB OPTIONS for the available options. + """ + return self.tk.call((self._w, "tab", index) + self._options(kw)) + + def tabs(self): + """Returns a list of all pane windows managed by the widget.""" + return self.tk.call(self._w, "tabs") + + +class Paned(Widget): + """ + WIDGET OPTIONS + Name Database name Database class + -orient orient Orient + Specifies the orientation of the window. If vertical, subpanes + are stacked top-to-bottom; if horizontal, subpanes are stacked + left-to-right. + + PANE OPTIONS + The following options may be specified for each pane: + Name Database name Database class + -weight weight Weight + An integer specifying the relative stretchability of the pane. + When the paned window is resized, the extra space is added or + subracted to each pane proportionally to its -weight + """ + def __init__(self, master=None, cnf={}, **kw): + if not kw.has_key('orient'): + kw['orient'] = 'horizontal' + Widget.__init__(self, master, "ttk::paned", cnf, kw) + + def add(self, subwindow, **kw): + """Adds a new pane to the window. subwindow must be a direct child of + the paned window pathname. See PANE OPTIONS for the list of available + options. + """ + return self.tk.call((self._w, "add", subwindow) + self._options(kw)) + + def forget(self, pane): + """Removes the specified subpane from the widget. pane is either an + integer index or the name of a managed subwindow. + """ + self.tk.call(self._w, "forget", pane) + + def insert(self, pos, subwindow, **kw): + """Inserts a pane at the specified position. pos is either the string + end, an integer index, or the name of a managed subwindow. If subwindow + is already managed by the paned window, moves it to the specified + position. See PANE OPTIONS for the list of available options. + """ + return self.tk.call((self._w, "insert", pos, subwindow) + self._options(kw)) + + def pane(self, pane, **kw): + """Query or modify the options of the specified pane, where pane is + either an integer index or the name of a managed subwindow. If no + -option is specified, returns a dictionary of the pane option values. + If one -option is specified, returns the value of that option. + Otherwise, sets the -options to the corresponding values. + """ + return self.tk.call((self._w, "pane", pane) + self._options(kw)) + +PanedWindow = Paned + + +class Progressbar(Widget): + def __init__(self, master=None, cnf={}, **kw): + Widget.__init__(self, master, "ttk::progressbar", cnf, kw) + + def step(self, amount=1.0): + """Increments the -value by amount. amount defaults to 1.0 + if omitted. """ + return self.tk.call(self._w, "step", amount) + + def start(self): + self.tk.call("tile::progressbar::start", self._w) + + def stop(self): + self.tk.call("tile::progressbar::stop", self._w) + + +class Radiobutton(Widget, Tkinter.Radiobutton): + def __init__(self, master=None, cnf={}, **kw): + Widget.__init__(self, master, "ttk::radiobutton", cnf, kw) + + +class Scrollbar(Widget, Tkinter.Scrollbar): + def __init__(self, master=None, cnf={}, **kw): + Widget.__init__(self, master, "ttk::scrollbar", cnf, kw) + + +class Separator(Widget): + def __init__(self, master=None, cnf={}, **kw): + for opt in ('bd', 'width', 'highlightthickness', 'relief',): + if kw.has_key(opt): + del kw[opt] + Widget.__init__(self, master, "ttk::separator", cnf, kw) + + +class Treeview(Widget, Tkinter.Listbox): + def __init__(self, master=None, cnf={}, **kw): + Widget.__init__(self, master, 'ttk::treeview', cnf, kw) + + def children(self, item, newchildren=None): + """If newchildren is not specified, returns the list of + children belonging to item. + + If newchildren is specified, replaces item's child list + with newchildren. Items in the old child list not present + in the new child list are detached from the tree. None of + the items in newchildren may be an ancestor of item. + """ + return self.tk.call(self._w, "children", item, newchildren) + + def column(self, column, **kw): + """Query or modify the options for the specified column. + If no options are specified, returns a dictionary of + option/value pairs. If a single option is specified, + returns the value of that option. Otherwise, the options + are updated with the specified values. The following + options may be set on each column: + + -id name + The column name. This is a read-only option. For example, + [$pathname column #n -id] returns the data column + associated with data column #n. + -anchor + Specifies how the text in this column should be aligned + with respect to the cell. One of n, ne, e, se, s, sw, w, + nw, or center. + -width w + The width of the column in pixels. Default is something + reasonable, probably 200 or so. + """ + pass + + def delete(self, items): + """Deletes each of the items and all of their descendants. + The root item may not be deleted. See also: detach. + """ + return self.tk.call(self._w, "delete", items) + + def detach(self, items): + """Unlinks all of the specified items from the tree. The + items and all of their descendants are still present and + may be reinserted at another point in the tree but will + not be displayed. The root item may not be detached. See + also: delete. + """ + return self.tk.call(self._w, "detach", items) + + def exists(self, item): + """Returns 1 if the specified item is present in the + tree, 0 otherwise. + """ + return self.tk.call(self._w, "exists", item) + + def focus(self, item=None): + """If item is specified, sets the focus item to item. + Otherwise, returns the current focus item, or {} if there + is none. + """ + return self.tk.call(self._w, "focus", item) + + def heading(self, column, **kw): + """Query or modify the heading options for the specified + column. Valid options are: + + -text text + The text to display in the column heading. + -image imageName + Specifies an image to display to the right of the column heading. + -command script + A script to evaluate when the heading label is pressed. + """ + pass + + def identify(self, x, y): + """Returns a description of the widget component under the point given + by x and y. The return value is a list with one of the following forms: + + heading #n + The column heading for display column #n. + separator #n + The border to the right of display column #n. + cell itemid #n + The data value for item itemid in display column #n. + item itemid element + The tree label for item itemid; element is one of text, image, or + indicator, or another element name depending on the style. + row itemid + The y position is over the item but x does not identify any element + or displayed data value. + nothing + The coordinates are not over any identifiable object. + + See COLUMN IDENTIFIERS for a discussion of display columns and data + columns. + """ + pass + + def index(self, item): + """Returns the integer index of item within its parent's list of + children. + """ + pass + + def insert(self, parent, index, id=None, **kw): + """Creates a new item. parent is the item ID of the parent item, or + the empty string {} to create a new top-level item. index is an + integer, or the value end, specifying where in the list of parent's + children to insert the new item. If index is less than or equal to + zero, the new node is inserted at the beginning; if index is greater + than or equal to the current number of children, it is inserted at the + end. If -id is specified, it is used as the item identifier; id must + not already exist in the tree. Otherwise, a new unique identifier is + generated. + returns the item identifier of the newly created item. See ITEM + OPTIONS for the list of available options. + """ + pass + + def item(item, **kw): + """Query or modify the options for the specified item. If no -option + is specified, returns a dictionary of option/value pairs. If a single + -option is specified, returns the value of that option. Otherwise, the + item's options are updated with the specified values. See ITEM OPTIONS + for the list of available options. + """ + pass + + def move(self, item, parent, index): + """Moves item to position index in parent's list of children. It is + illegal to move an item under one of its descendants. + + If index is less than or equal to zero, item is moved to the + beginning; if greater than or equal to the number of children, it's + moved to the end. + """ + pass + + def next(self, item): + """Returns the identifier of item's next sibling, or {} if item is the + last child of its parent. + """ + pass + + def parent(self, item): + """Returns the ID of the parent of item, or {} if item is at the top + level of the hierarchy. + """ + pass + + def prev(self, item): + """Returns the identifier of item's previous sibling, or {} if item is + the first child of its parent. + """ + pass + + def selection(self): + """Returns the list of selected items""" + pass + + def selection_set(self, items): + """items becomes the new selection. """ + pass + + def selection_add(self, items): + """Add items to the selection """ + pass + + def selection_remove(self, items): + """Remove items from the selection """ + pass + + def selection_toggle(self, items): + """Toggle the selection state of each item in items. """ + pass + + def set(self, item, column, value=None): + """If value is specified, sets the value of column column in item item, + otherwise returns the current value. See COLUMN IDENTIFIERS. + """ + pass + + + +if __name__=="__main__": + def callback(): + print "Hello" + + root = Tkinter.Tk() + root.tk.call("package", "require", "tile") + + b = Button(root, text="Tile Button", command=callback) + b.pack() + + #~ c = Checkbutton(root) + #~ c.pack() + #~ print b.theme_names() + + #~ cb = Combobox(root) + #~ cb.pack() + + #~ e = Entry(root) + #~ e.validate() + #~ e.pack() + + #~ l = Label(root, text="Tile Label") + #~ l.pack() + + + #~ mb = Menubutton(root) + #~ mb.pack() + + + #~ nb = Notebook(root) + + #~ f1 = Label(nb, text="page1") + #~ nb.add(f1, text="Page1") + #~ f1.pack() + + #~ f2 = Label(nb, text="page2") + #~ nb.add(f2, text="Page 2") + #~ f2.pack() + + #~ nb.pack() + + + pb = Progressbar(root, mode="indeterminate") + pb.pack() + + + pb.start() + b = Button(root, text="Start", command=pb.start) + b.pack() + b = Button(root, text="Stop", command=pb.stop) + b.pack() + + #~ rb = Radiobutton(root) + #~ rb.pack() + + #~ text = Tkinter.Text(root) + #~ scrol = Scrollbar(root) + #~ text.pack(side="left", fill="both", expand="yes") + #~ scrol.pack(side="left", fill="y") + #~ text['yscrollcommand'] = scrol.set + #~ scrol['command'] = text.yview + + + #~ l = Label(root, text="Label1") + #~ l.pack() + #~ s = Separator(root) + #~ s.pack(fill="x") + #~ l = Label(root, text="Label2") + #~ l.pack() + + + b.theme_use("default") + + #~ b1 = Tkinter.Button(root, text="Tk Button", command=callback) + #~ b1.pack() + + + panes = Paned(root) + panes.pack(fill="both", expand="yes") + + label1 = Label(panes, text="pane1") + label2 = Label(panes, text="Pane2") + + + panes.add(label1) + panes.add(label2) + + + + + #~ tree = Treeview(root, columns=("One", "Two", "Three")) + + #~ tree.insert(None, "end", text="Hello") + + #~ tree.pack() + + root.mainloop() diff --git a/pysollib/tile/__init__.py b/pysollib/tile/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pysollib/tile/card.py b/pysollib/tile/card.py new file mode 100644 index 00000000..0a18e617 --- /dev/null +++ b/pysollib/tile/card.py @@ -0,0 +1,258 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['Card'] + +# imports + +# PySol imports +from pysollib.acard import AbstractCard + +# Toolkit imports +from tkconst import tkversion, TK_DASH_PATCH +from tkcanvas import MfxCanvasGroup, MfxCanvasImage + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class _HideableCard(AbstractCard): + def hide(self, stack): + if stack is self.hide_stack: + return + self.item.config(state="hidden") + self.hide_stack = stack + ##print "hide:", self.id, self.item.coords() + + def unhide(self): + if self.hide_stack is None: + return 0 + ##print "unhide:", self.id, self.item.coords() + self.item.config(state="normal") + self.hide_stack = None + return 1 + + +# /*********************************************************************** +# // New implemetation since 2.10 +# // +# // We use a single CanvasImage and call CanvasImage.config() to +# // turn the card. +# // This makes turning cards a little bit slower, but dragging cards +# // around is noticeable faster as the total number of images is +# // reduced by half. +# ************************************************************************/ + +class _OneImageCard(_HideableCard): + def __init__(self, id, deck, suit, rank, game, x=0, y=0): + _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y) + self._face_image = game.getCardFaceImage(deck, suit, rank) + self._back_image = game.getCardBackImage(deck, suit, rank) + self._shade_image = game.getCardShadeImage() + self._active_image = self._back_image + self.item = MfxCanvasImage(game.canvas, self.x, self.y, image=self._active_image, anchor="nw") + self.shade_item = None + ##self._setImage = self.item.config + + def _setImage(self, image): + if image is not self._active_image: + self.item.config(image=image) + self._active_image = image + + def showFace(self, unhide=1): + if not self.face_up: + self._setImage(image=self._face_image) + self.tkraise(unhide) + self.face_up = 1 + + def showBack(self, unhide=1): + if self.face_up: + self._setImage(image=self._back_image) + self.tkraise(unhide) + self.face_up = 0 + + def updateCardBackground(self, image): + self._back_image = image + if not self.face_up: + self._setImage(image=image) + + # + # optimized by inlining + # + + def moveBy(self, dx, dy): + dx, dy = int(dx), int(dy) + self.x = self.x + dx + self.y = self.y + dy + item = self.item + item.canvas.tk.call(item.canvas._w, "move", item.id, dx, dy) + + + +# /*********************************************************************** +# // New idea since 3.00 +# // +# // Hide a card by configuring the canvas image to None. +# ************************************************************************/ + +class _OneImageCardWithHideByConfig(_OneImageCard): + def hide(self, stack): + if stack is self.hide_stack: + return + self._setImage(image=None) + self.hide_stack = stack + + def unhide(self): + if self.hide_stack is None: + return 0 + if self.face_up: + self._setImage(image=self._face_image) + else: + self._setImage(image=self._back_image) + self.hide_stack = None + return 1 + + # + # much like in _OneImageCard + # + + def showFace(self, unhide=1): + if not self.face_up: + if unhide: + self._setImage(image=self._face_image) + self.item.tkraise() + self.face_up = 1 + + def showBack(self, unhide=1): + if self.face_up: + if unhide: + self._setImage(image=self._back_image) + self.item.tkraise() + self.face_up = 0 + + def updateCardBackground(self, image): + self._back_image = image + if not self.face_up and not self.hide_stack: + self._setImage(image=image) + + +# /*********************************************************************** +# // Old implemetation prior to 2.10 +# // +# // The card consists of two CanvasImages. To show the card face up, +# // the face item is placed in front of the back. To show it face +# // down, this is reversed. +# ************************************************************************/ + +class _TwoImageCard(_HideableCard): + # Private instance variables: + # __face, __back -- the canvas items making up the card + def __init__(self, id, deck, suit, rank, game, x=0, y=0): + _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y) + self.item = MfxCanvasGroup(game.canvas) + self.__face = MfxCanvasImage(game.canvas, self.x, self.y, image=game.getCardFaceImage(deck, suit, rank), anchor="nw") + self.__back = MfxCanvasImage(game.canvas, self.x, self.y, image=game.getCardBackImage(deck, suit, rank), anchor="nw") + self.__face.addtag(self.item) + self.__back.addtag(self.item) + + def showFace(self, unhide=1): + if not self.face_up: + if TK_DASH_PATCH: + self.__back.config(state="hidden") + self.__face.config(state="normal") + self.__face.tkraise() + self.tkraise(unhide) + self.face_up = 1 + + def showBack(self, unhide=1): + if self.face_up: + if TK_DASH_PATCH: + self.__face.config(state="hidden") + self.__back.config(state="normal") + self.__back.tkraise() + self.tkraise(unhide) + self.face_up = 0 + + def updateCardBackground(self, image): + self.__back.config(image=image) + + +# /*********************************************************************** +# // New idea since 2.90 +# // +# // The card consists of two CanvasImages. Instead of raising +# // one image above the other we move the inactive image out +# // of the visible canvas. +# ************************************************************************/ + +class _TwoImageCardWithHideItem(_HideableCard): + # Private instance variables: + # __face, __back -- the canvas items making up the card + def __init__(self, id, deck, suit, rank, game, x=0, y=0): + _HideableCard.__init__(self, id, deck, suit, rank, game, x=x, y=y) + self.item = MfxCanvasGroup(game.canvas) + self.__face = MfxCanvasImage(game.canvas, self.x, self.y + 11000, image=game.getCardFaceImage(deck, suit, rank), anchor="nw") + self.__back = MfxCanvasImage(game.canvas, self.x, self.y, image=game.getCardBackImage(deck, suit, rank), anchor="nw") + self.__face.addtag(self.item) + self.__back.addtag(self.item) + + def showFace(self, unhide=1): + if not self.face_up: + self.__back.move(0, 10000) + ##self.__face.tkraise() + self.__face.move(0, -11000) + self.tkraise(unhide) + self.face_up = 1 + + def showBack(self, unhide=1): + if self.face_up: + self.__face.move(0, 11000) + ##self.__back.tkraise() + self.__back.move(0, -10000) + self.tkraise(unhide) + self.face_up = 0 + + def updateCardBackground(self, image): + self.__back.config(image=image) + + + +# choose the implementation +Card = _TwoImageCardWithHideItem +Card = _TwoImageCard +Card = _OneImageCardWithHideByConfig +Card = _OneImageCard + diff --git a/pysollib/tile/colorsdialog.py b/pysollib/tile/colorsdialog.py new file mode 100644 index 00000000..4cdb4b8b --- /dev/null +++ b/pysollib/tile/colorsdialog.py @@ -0,0 +1,130 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['ColorsDialog'] + +# imports +import os, sys +import Tkinter as Tk +import Tile as Tkinter +from tkColorChooser import askcolor + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class ColorsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=10) + frame.columnconfigure(0, weight=1) + + self.use_default_var = Tkinter.BooleanVar() + self.use_default_var.set(not app.opt.use_default_text_color) + self.text_var = Tkinter.StringVar() + self.text_var.set(app.opt.colors['text']) + self.piles_var = Tkinter.StringVar() + self.piles_var.set(app.opt.colors['piles']) + self.cards_1_var = Tkinter.StringVar() + self.cards_1_var.set(app.opt.colors['cards_1']) + self.cards_2_var = Tkinter.StringVar() + self.cards_2_var.set(app.opt.colors['cards_2']) + self.samerank_1_var = Tkinter.StringVar() + self.samerank_1_var.set(app.opt.colors['samerank_1']) + self.samerank_2_var = Tkinter.StringVar() + self.samerank_2_var.set(app.opt.colors['samerank_2']) + self.hintarrow_var = Tkinter.StringVar() + self.hintarrow_var.set(app.opt.colors['hintarrow']) + self.not_matching_var = Tkinter.StringVar() + self.not_matching_var.set(app.opt.colors['not_matching']) + # + c = Tkinter.Checkbutton(frame, variable=self.use_default_var, + text=_("Text foreground:"), anchor='w') + c.grid(row=0, column=0, sticky='we') + l = Tk.Label(frame, width=10, height=2, + bg=self.text_var.get(), textvariable=self.text_var) + l.grid(row=0, column=1, padx=5) + b = Tkinter.Button(frame, text=_('Change...'), width=10, + command=lambda l=l: self.selectColor(l)) + b.grid(row=0, column=2) + row = 1 + for title, var in ( + (_('Highlight piles:'), self.piles_var), + (_('Highlight cards 1:'), self.cards_1_var), + (_('Highlight cards 2:'), self.cards_2_var), + (_('Highlight same rank 1:'), self.samerank_1_var), + (_('Highlight same rank 2:'), self.samerank_2_var), + (_('Hint arrow:'), self.hintarrow_var), + (_('Highlight not matching:'), self.not_matching_var), + ): + Tkinter.Label(frame, text=title, anchor='w' + ).grid(row=row, column=0, sticky='we') + l = Tk.Label(frame, width=10, height=2, + bg=var.get(), textvariable=var) + l.grid(row=row, column=1, padx=5) + b = Tkinter.Button(frame, text=_('Change...'), width=10, + command=lambda l=l: self.selectColor(l)) + b.grid(row=row, column=2) + row += 1 + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + # + self.use_default_color = not self.use_default_var.get() + self.text_color = self.text_var.get() + self.piles_color = self.piles_var.get() + self.cards_1_color = self.cards_1_var.get() + self.cards_2_color = self.cards_2_var.get() + self.samerank_1_color = self.samerank_1_var.get() + self.samerank_2_color = self.samerank_2_var.get() + self.hintarrow_color = self.hintarrow_var.get() + self.not_matching_color = self.not_matching_var.get() + + def selectColor(self, label): + c = askcolor(master=self.top, initialcolor=label.cget('bg'), + title=_("Select color")) + if c and c[1]: + label.configure(bg=c[1]) + #label.configure(text=c[1]) # don't work + label.setvar(label.cget('textvariable'), c[1]) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), _("&Cancel")), + default=0, + ) + return MfxDialog.initKw(self, kw) + + + + diff --git a/pysollib/tile/edittextdialog.py b/pysollib/tile/edittextdialog.py new file mode 100644 index 00000000..4752487b --- /dev/null +++ b/pysollib/tile/edittextdialog.py @@ -0,0 +1,100 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['EditTextDialog'] + +# imports +import os, sys +import Tile as Tkinter + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkwidget import MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class EditTextDialog(MfxDialog): + + def __init__(self, parent, title, text, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.text_w = Tkinter.Text(top_frame, bd=1, relief="sunken", + wrap="word", width=64, height=16) + self.text_w.pack(side='left', fill="both", expand=1) + ###self.text_w.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + vbar = Tkinter.Scrollbar(top_frame) + vbar.pack(side='right', fill='y') + self.text_w["yscrollcommand"] = vbar.set + vbar["command"] = self.text_w.yview + # + self.text = "" + if text: + self.text = text + old_state = self.text_w["state"] + self.text_w.config(state="normal") + self.text_w.insert("insert", self.text) + self.text_w.config(state=old_state) + # + focus = self.createButtons(bottom_frame, kw) + focus = self.text_w + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), _("&Cancel")), + default=-1, + resizable=1, + separatorwidth=0, + ) + return MfxDialog.initKw(self, kw) + + def destroy(self): + self.text = self.text_w.get("1.0", "end") + MfxDialog.destroy(self) + + def wmDeleteWindow(self, *event): # ignore + pass + + def mCancel(self, *event): # ignore + pass + + diff --git a/pysollib/tile/findcarddialog.py b/pysollib/tile/findcarddialog.py new file mode 100644 index 00000000..6beda1ed --- /dev/null +++ b/pysollib/tile/findcarddialog.py @@ -0,0 +1,220 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['create_find_card_dialog', + 'connect_game_find_card_dialog', + 'destroy_find_card_dialog', + ] + +# imports +import os +import Tile as Tkinter +import traceback + +# PySol imports + +# Toolkit imports +from tkutil import after, after_cancel +from tkutil import bind, unbind_destroy, makeImage +from tkcanvas import MfxCanvas, MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle + + +# /*********************************************************************** +# // +# ************************************************************************/ + +LARGE_EMBLEMS_SIZE = (38, 34) +SMALL_EMBLEMS_SIZE = (31, 21) + +class FindCardDialog(Tkinter.Toplevel): + CARD_IMAGES = {} # key: (rank, suit) + + def __init__(self, parent, game, dir, size='large'): + Tkinter.Toplevel.__init__(self) + self.title(_('Find card')) + self.wm_resizable(0, 0) + # + ##self.images_dir = dir + if size == 'large': + self.images_dir = os.path.join(dir, 'large') + self.label_width, self.label_height = LARGE_EMBLEMS_SIZE + else: + self.images_dir = os.path.join(dir, 'small') + self.label_width, self.label_height = SMALL_EMBLEMS_SIZE + self.canvas = MfxCanvas(self, bg='white') + ##self.canvas = MfxCanvas(self, bg='black') + self.canvas.pack(expand=True, fill='both') + # + self.groups = [] + self.highlight_items = None + self.busy = False + self.connectGame(game) + # + bind(self, "WM_DELETE_WINDOW", self.destroy) + bind(self, "", self.destroy) + # + ##self.normal_timeout = 400 # in milliseconds + self.normal_timeout = int(1000*game.app.opt.timeouts['highlight_samerank']) + self.hidden_timeout = 200 + self.timer = None + + def createCardLabel(self, suit, rank, x0, y0): + dx, dy = self.label_width, self.label_height + dir = self.images_dir + canvas = self.canvas + group = MfxCanvasGroup(canvas) + # + im = FindCardDialog.CARD_IMAGES.get((rank, suit)) + if im is None: + r = '%02d' % (rank+1) + s = 'cshd'[suit] + fn = os.path.join(dir, r+s+'.gif') + im = makeImage(file=fn) + FindCardDialog.CARD_IMAGES[(rank, suit)] = im + cim = MfxCanvasImage(canvas, x0, y0, image=im, anchor='nw') + cim.addtag(group) + cim.lower() + # + rect_width = 4 + x1, y1 = x0+dx, y0+dy + rect = MfxCanvasRectangle(self.canvas, x0+1, y0+1, x1-1, y1-1, + width=rect_width, + fill=None, + outline='red', + state='hidden' + ) + rect.addtag(group) + # + bind(group, '', + lambda e, suit=suit, rank=rank, rect=rect: + self.enterEvent(suit, rank, rect, group)) + bind(group, '', + lambda e, suit=suit, rank=rank, rect=rect: + self.leaveEvent(suit, rank, rect, group)) + self.groups.append(group) + + def connectGame(self, game): + self.game = game + suits = game.gameinfo.suits + ranks = game.gameinfo.ranks + dx, dy = self.label_width, self.label_height + uniq_suits = [] + i = 0 + for suit in suits: + if suit in uniq_suits: + continue + uniq_suits.append(suit) + j = 0 + for rank in ranks: + x, y = dx*j+2, dy*i+2 + self.createCardLabel(suit=suit, rank=rank, x0=x, y0=y) + j += 1 + i += 1 + w, h = dx*j+2, dy*i+2 + self.canvas.config(width=w, height=h) + + def enterEvent(self, suit, rank, rect, group): + ##print 'enterEvent', suit, rank, self.busy + if self.busy: return + self.busy = True + self.highlight_items = self.game.highlightCard(suit, rank) + if not self.highlight_items: + self.highlight_items = [] + if self.highlight_items: + self.timer = after(self, self.normal_timeout, self.timeoutEvent) + rect.config(state='normal') + self.canvas.update_idletasks() + self.busy = False + + def leaveEvent(self, suit, rank, rect, group): + ##print 'leaveEvent', suit, rank, self.busy + if self.busy: return + self.busy = True + if self.highlight_items: + for i in self.highlight_items: + i.delete() + self.highlight_items = [] + if self.timer: + after_cancel(self.timer) + self.timer = None + rect.config(state='hidden') + if self.game.canvas: + self.game.canvas.update_idletasks() + self.canvas.update_idletasks() + self.busy = False + + + def timeoutEvent(self, *event): + if self.highlight_items: + state = self.highlight_items[0].cget('state') + if state in ('', 'normal'): + state = 'hidden' + self.timer = after(self, self.hidden_timeout, + self.timeoutEvent) + else: + state = 'normal' + self.timer = after(self, self.normal_timeout, + self.timeoutEvent) + for item in self.highlight_items: + item.config(state=state) + + def destroy(self, *args): + for l in self.groups: + unbind_destroy(l) + unbind_destroy(self) + if self.timer: + after_cancel(self.timer) + self.timer = None + self.wm_withdraw() + if self.highlight_items: + for i in self.highlight_items: + i.delete() + Tkinter.Toplevel.destroy(self) + + + +find_card_dialog = None + +def create_find_card_dialog(parent, game, dir): + global find_card_dialog + try: + find_card_dialog.wm_deiconify() + find_card_dialog.tkraise() + except: + ##traceback.print_exc() + find_card_dialog = FindCardDialog(parent, game, dir) + +def connect_game_find_card_dialog(game): + try: + find_card_dialog.connectGame(game) + except: + pass + +def destroy_find_card_dialog(): + global find_card_dialog + try: + find_card_dialog.destroy() + except: + ##traceback.print_exc() + pass + find_card_dialog = None + + diff --git a/pysollib/tile/fontsdialog.py b/pysollib/tile/fontsdialog.py new file mode 100644 index 00000000..63a31233 --- /dev/null +++ b/pysollib/tile/fontsdialog.py @@ -0,0 +1,212 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['FontsDialog'] + +# imports +import os, sys +import types +import Tile as Tkinter +import tkFont + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import MfxDialog +from tkutil import bind + +# /*********************************************************************** +# // +# ************************************************************************/ + +class FontChooserDialog(MfxDialog): + def __init__(self, parent, title, init_font, **kw): + ##print init_font + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + self.font_family = 'Helvetica' + self.font_size = 12 + self.font_weight = 'normal' + self.font_slant = 'roman' + + if not init_font is None: + assert 2 <= len(init_font) <= 4 + assert type(init_font[1]) is types.IntType + self.font_family, self.font_size = init_font[:2] + if len(init_font) > 2: + if init_font[2] in ['bold', 'normal']: + self.font_weight = init_font[2] + elif init_font[2] in ['italic', 'roman']: + self.font_slant = init_font[2] + else: + raise TypeError, 'invalid font style: '+ init_font[2] + if len(init_font) > 3: + if init_font[3] in ['bold', 'normal']: + self.font_weight = init_font[3] + elif init_font[2] in ['italic', 'roman']: + self.font_slant = init_font[3] + else: + raise TypeError, 'invalid font style: '+ init_font[3] + + #self.family_var = Tkinter.StringVar() + self.weight_var = Tkinter.BooleanVar() + self.slant_var = Tkinter.BooleanVar() + self.size_var = Tkinter.IntVar() + + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=10) + frame.columnconfigure(0, weight=1) + #frame.rowconfigure(1, weight=1) + self.entry = Tkinter.Entry(frame, bg='white') + self.entry.grid(row=0, column=0, columnspan=2, sticky='news') + self.entry.insert('end', _('abcdefghABCDEFGH')) + self.list_box = Tkinter.Listbox(frame, width=36, exportselection=False) + sb = Tkinter.Scrollbar(frame) + self.list_box.configure(yscrollcommand=sb.set) + sb.configure(command=self.list_box.yview) + self.list_box.grid(row=1, column=0, sticky='news') # rowspan=4 + sb.grid(row=1, column=1, sticky='ns') + bind(self.list_box, '<>', self.fontupdate) + ##self.list_box.focus() + cb1 = Tkinter.Checkbutton(frame, anchor='w', text=_('Bold'), + command=self.fontupdate, + variable=self.weight_var) + cb1.grid(row=2, column=0, columnspan=2, sticky='we') + cb2 = Tkinter.Checkbutton(frame, anchor='w', text=_('Italic'), + command=self.fontupdate, + variable=self.slant_var) + cb2.grid(row=3, column=0, columnspan=2, sticky='we') + + sc = Tkinter.Scale(frame, from_=6, to=40, resolution=1, + #label='Size', + orient='horizontal', + command=self.fontupdate, variable=self.size_var) + sc.grid(row=4, column=0, columnspan=2, sticky='news') + # + self.size_var.set(self.font_size) + self.weight_var.set(self.font_weight == 'bold') + self.slant_var.set(self.font_slant == 'italic') + font_families = list(tkFont.families()) + font_families.sort() + selected = -1 + n = 0 + self.list_box.insert('end', *font_families) + for font in font_families: + if font.lower() == self.font_family.lower(): + selected = n + break + n += 1 + if selected >= 0: + self.list_box.select_set(selected) + self.list_box.see(selected) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + self.font = (self.font_family, self.font_size, + self.font_slant, self.font_weight) + + def fontupdate(self, *args): + if self.list_box.curselection(): + self.font_family = self.list_box.get(self.list_box.curselection()) + self.font_weight = self.weight_var.get() and 'bold' or 'normal' + self.font_slant = self.slant_var.get() and 'italic' or 'roman' + self.font_size = self.size_var.get() + self.entry.configure(font=(self.font_family, self.font_size, + self.font_slant, self.font_weight)) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), _("&Cancel")), + default=0, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + +# /*********************************************************************** +# // +# ************************************************************************/ + +class FontsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=10) + frame.columnconfigure(0, weight=1) + + self.fonts = {} + row = 0 + for fn, title in (##('default', _('Default')), + ('sans', _('HTML: ')), + ('small', _('Small: ')), + ('fixed', _('Fixed: ')), + ('canvas_default', _('Tableau default: ')), + ('canvas_fixed', _('Tableau fixed: ')), + ('canvas_large', _('Tableau large: ')), + ('canvas_small', _('Tableau small: ')), + ): + font = app.opt.fonts[fn] + self.fonts[fn] = font + Tkinter.Label(frame, text=title, anchor='w' + ).grid(row=row, column=0, sticky='we') + if font: + title = ' '.join([str(i) for i in font if not i in ('roman', 'normal')]) + elif font is None: + title = 'Default' + l = Tkinter.Label(frame, font=font, text=title) + l.grid(row=row, column=1) + b = Tkinter.Button(frame, text=_('Change...'), width=10, + command=lambda l=l, fn=fn: self.selectFont(l, fn)) + b.grid(row=row, column=2) + row += 1 + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + + def selectFont(self, label, fn): + d = FontChooserDialog(self.top, _('Select font'), self.fonts[fn]) + if d.status == 0 and d.button == 0: + self.fonts[fn] = d.font + title = ' '.join([str(i) for i in d.font if not i in ('roman', 'normal')]) + label.configure(font=d.font, text=title) + + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_('&OK'), _('&Cancel')), + default=0, + ) + return MfxDialog.initKw(self, kw) + + + + diff --git a/pysollib/tile/gameinfodialog.py b/pysollib/tile/gameinfodialog.py new file mode 100644 index 00000000..7470fc40 --- /dev/null +++ b/pysollib/tile/gameinfodialog.py @@ -0,0 +1,159 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + + +__all__ = ['GameInfoDialog'] + +# imports +import os, sys +import Tile as Tkinter + +# PySol imports +from pysollib.mfxutil import KwStruct +from pysollib.gamedb import GI + +# Toolkit imports +from tkwidget import MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class GameInfoDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=10) + frame.columnconfigure(0, weight=1) + + game = app.game + gi = game.gameinfo + + # + if gi.redeals == -2: redeals = 'VARIABLE' + elif gi.redeals == -1: redeals = 'UNLIMITED' + else: redeals = str(gi.redeals) + cat = '' + type = '' + flags = [] + for attr in dir(GI): + if attr.startswith('GC_'): + c = getattr(GI, attr) + if gi.category == c: + cat = attr + elif attr.startswith('GT_'): + t = getattr(GI, attr) + if t < (1<<12)-1: + if gi.si.game_type == t: + type = attr + else: + if gi.si.game_flags & t: + flags.append(attr) + # + version = None + for t in GI.GAMES_BY_PYSOL_VERSION: + if gi.id in t[1]: + version = t[0] + break + sl = { + 1: 'SL_LUCK', + 2: 'SL_MOSTLY_LUCK', + 3: 'SL_BALANCED', + 4: 'SL_MOSTLY_SKILL', + 5: 'SL_SKILL', + } + skill_level = sl.get(gi.skill_level) + if game.Hint_Class is None: + hint = None + else: + hint = game.Hint_Class.__name__ + row = 0 + for n, t in (('Name:', gi.name), + ('Short name:', gi.short_name), + ('ID:', gi.id), + ('Alt names:', '\n'.join(gi.altnames)), + ('PySol version:', version), + ('Decks:', gi.decks), + ('Cards:', gi.ncards), + ('Redeals:', redeals), + ('Category:', cat), + ('Type:', type), + ('Flags:', '\n'.join(flags)), + ('Skill level:', skill_level), + ('Rules filename:', gi.rules_filename), + ('Module:', game.__module__), + ('Class:', game.__class__.__name__), + ('Hint:', hint), + ): + if t: + Tkinter.Label(frame, text=n, anchor='w' + ).grid(row=row, column=0, sticky='nw') + Tkinter.Label(frame, text=t, anchor='w', justify='left' + ).grid(row=row, column=1, sticky='nw') + row += 1 + + if game.s.talon: + self.showStacks(frame, row, 'Talon:', game.s.talon) + row += 1 + if game.s.waste: + self.showStacks(frame, row, 'Waste:', game.s.waste) + row += 1 + for t, s in ( + ('Foundations:', game.s.foundations,), + ('Rows:', game.s.rows,), + ('Reserves:', game.s.reserves,), + ): + if s: + self.showStacks(frame, row, t, s) + row += 1 + + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + def showStacks(self, frame, row, title, stacks): + Tkinter.Label(frame, text=title, anchor='w' + ).grid(row=row, column=0, sticky='nw') + if isinstance(stacks, (list, tuple)): + fs = {} + for f in stacks: + cn = f.__class__.__name__ + if fs.has_key(cn): + fs[cn] += 1 + else: + fs[cn] = 1 + t = '\n'.join(['%s (%d)' % (i[0], i[1]) for i in fs.items()]) + else: + t = stacks.__class__.__name__ + Tkinter.Label(frame, text=t, anchor='w', justify='left' + ).grid(row=row, column=1, sticky='nw') + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"),), + default=0, + separatorwidth=2, + ) + return MfxDialog.initKw(self, kw) diff --git a/pysollib/tile/menubar.py b/pysollib/tile/menubar.py new file mode 100644 index 00000000..fb1742df --- /dev/null +++ b/pysollib/tile/menubar.py @@ -0,0 +1,1328 @@ +# -*- coding: koi8-r -*- +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PysolMenubar'] + +# imports +import math, os, re +import Tile as Tkinter +import tkColorChooser, tkFileDialog + +# PySol imports +from pysollib.mfxutil import destruct, Struct, kwdefault +from pysollib.util import CARDSET +from pysollib.settings import PACKAGE +from pysollib.settings import TOP_TITLE +from pysollib.gamedb import GI +from pysollib.actions import PysolMenubarActions + +# toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE, CURSOR_WATCH, COMPOUNDS +from tkutil import bind, after_idle +from selectgame import SelectGameDialog, SelectGameDialogWithPreview +from soundoptionsdialog import SoundOptionsDialog +from selectcardset import SelectCardsetDialogWithPreview +from selecttile import SelectTileDialogWithPreview +from findcarddialog import connect_game_find_card_dialog, destroy_find_card_dialog +from tkwrap import MfxRadioMenuItem, MfxCheckMenuItem, StringVar + +#from toolbar import TOOLBAR_BUTTONS +from tkconst import TOOLBAR_BUTTONS + +gettext = _ +n_ = lambda x: x + + +# /*********************************************************************** +# // +# ************************************************************************/ + +def createToolbarMenu(menubar, menu): + data_dir = os.path.join(menubar.app.dataloader.dir, 'images', 'toolbar') + tearoff = menu.cget('tearoff') + submenu = MfxMenu(menu, label=n_('Style'), tearoff=tearoff) + for f in os.listdir(data_dir): + d = os.path.join(data_dir, f) + if os.path.isdir(d) and os.path.exists(os.path.join(d, 'small')): + name = f.replace('_', ' ').capitalize() + submenu.add_radiobutton(label=name, + variable=menubar.tkopt.toolbar_style, + value=f, command=menubar.mOptToolbarStyle) + +## submenu = MfxMenu(menu, label=n_('Relief'), tearoff=tearoff) +## submenu.add_radiobutton(label=n_('Flat'), +## variable=menubar.tkopt.toolbar_relief, +## value=Tkinter.FLAT, +## command=menubar.mOptToolbarRelief) +## submenu.add_radiobutton(label=n_('Raised'), +## variable=menubar.tkopt.toolbar_relief, +## value=Tkinter.RAISED, +## command=menubar.mOptToolbarRelief) + if Tkinter.TkVersion >= 8.4: + submenu = MfxMenu(menu, label=n_('Compound'), tearoff=tearoff) + for comp, label in COMPOUNDS: + submenu.add_radiobutton( + label=label, variable=menubar.tkopt.toolbar_compound, + value=comp, command=menubar.mOptToolbarCompound) + menu.add_separator() + menu.add_radiobutton(label=n_("Hide"), + variable=menubar.tkopt.toolbar, value=0, + command=menubar.mOptToolbar) + menu.add_radiobutton(label=n_("Top"), + variable=menubar.tkopt.toolbar, value=1, + command=menubar.mOptToolbar) + menu.add_radiobutton(label=n_("Bottom"), + variable=menubar.tkopt.toolbar, value=2, + command=menubar.mOptToolbar) + menu.add_radiobutton(label=n_("Left"), + variable=menubar.tkopt.toolbar, value=3, + command=menubar.mOptToolbar) + menu.add_radiobutton(label=n_("Right"), + variable=menubar.tkopt.toolbar, value=4, + command=menubar.mOptToolbar) + menu.add_separator() + menu.add_radiobutton(label=n_("Small icons"), + variable=menubar.tkopt.toolbar_size, value=0, + command=menubar.mOptToolbarSize) + menu.add_radiobutton(label=n_("Large icons"), + variable=menubar.tkopt.toolbar_size, value=1, + command=menubar.mOptToolbarSize) + # + #return + menu.add_separator() + submenu = MfxMenu(menu, label=n_('Customize toolbar'), tearoff=tearoff) + for w in TOOLBAR_BUTTONS: + submenu.add_checkbutton(label=gettext(w.capitalize()), + variable=menubar.tkopt.toolbar_vars[w], + command=lambda m=menubar, w=w: m.mOptToolbarConfig(w)) + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxMenubar(Tkinter.Menu): + addPath = None + + def __init__(self, master, **kw): + self.name = kw["name"] + tearoff = 0 + self.n = kw["tearoff"] = int(kw.get("tearoff", tearoff)) + apply(Tkinter.Menu.__init__, (self, master, ), kw) + + def labeltoname(self, label): + #print label, type(label) + name = re.sub(r"[^0-9a-zA-Z]", "", label).lower() + label = gettext(label) + underline = -1 + m = re.search(r"^(.*)\&([^\&].*)$", label) + if m: + l1, l2 = m.group(1), m.group(2) + l1 = re.sub(r"\&\&", "&", l1) + l2 = re.sub(r"\&\&", "&", l2) + label = l1 + l2 + underline = len(l1) + return name, label, underline + + def add(self, itemType, cnf={}): + label = cnf.get("label") + if label: + name = cnf.get('name') + try: + del cnf['name'] # TclError: unknown option "-name" + except KeyError: + pass + if not name: + name, label, underline = self.labeltoname(label) + cnf["underline"] = cnf.get("underline", underline) + cnf["label"] = label + if name and self.addPath: + path = str(self._w) + "." + name + self.addPath(path, self, self.n, cnf.get("menu")) + Tkinter.Menu.add(self, itemType, cnf) + self.n = self.n + 1 + + +class MfxMenu(MfxMenubar): + def __init__(self, master, label, underline=None, **kw): + if kw.has_key('name'): + name, label_underline = kw['name'], -1 + else: + name, label, label_underline = self.labeltoname(label) + kwdefault(kw, name=name) + apply(MfxMenubar.__init__, (self, master,), kw) + if underline is None: + underline = label_underline + if master: + master.add_cascade(menu=self, name=name, label=label, underline=underline) + + +# /*********************************************************************** +# // - create menubar +# // - update menubar +# // - menu actions +# ************************************************************************/ + +class PysolMenubar(PysolMenubarActions): + def __init__(self, app, top, progress=None): + PysolMenubarActions.__init__(self, app, top) + self._createTkOpt() + self._setOptions() + # init columnbreak + self.__cb_max = int(self.top.winfo_screenheight()/23) +## sh = self.top.winfo_screenheight() +## self.__cb_max = 22 +## if sh >= 600: self.__cb_max = 27 +## if sh >= 768: self.__cb_max = 32 +## if sh >= 1024: self.__cb_max = 40 + self.progress = progress + # create menus + self.__menubar = None + self.__menupath = {} + self.__keybindings = {} + self._createMenubar() + + if self.progress: self.progress.update(step=1) + + # set the menubar + self.updateBackgroundImagesMenu() + self.top.config(menu=self.__menubar) + + def _createTkOpt(self): + # structure to convert menu-options to Toolkit variables + self.tkopt = Struct( + gameid = MfxRadioMenuItem(self), + gameid_popular = MfxRadioMenuItem(self), + comment = MfxCheckMenuItem(self), + autofaceup = MfxCheckMenuItem(self), + autodrop = MfxCheckMenuItem(self), + autodeal = MfxCheckMenuItem(self), + quickplay = MfxCheckMenuItem(self), + undo = MfxCheckMenuItem(self), + bookmarks = MfxCheckMenuItem(self), + hint = MfxCheckMenuItem(self), + highlight_piles = MfxCheckMenuItem(self), + highlight_cards = MfxCheckMenuItem(self), + highlight_samerank = MfxCheckMenuItem(self), + highlight_not_matching = MfxCheckMenuItem(self), + mahjongg_show_removed = MfxCheckMenuItem(self), + shisen_show_hint = MfxCheckMenuItem(self), + sound = MfxCheckMenuItem(self), + cardback = MfxRadioMenuItem(self), + tabletile = MfxRadioMenuItem(self), + animations = MfxRadioMenuItem(self), + shadow = MfxCheckMenuItem(self), + shade = MfxCheckMenuItem(self), + shade_filled_stacks = MfxCheckMenuItem(self), + shrink_face_down = MfxCheckMenuItem(self), + toolbar = MfxRadioMenuItem(self), + toolbar_style = StringVar(), + toolbar_relief = StringVar(), + toolbar_compound = StringVar(), + toolbar_size = MfxRadioMenuItem(self), + statusbar = MfxCheckMenuItem(self), + num_cards = MfxCheckMenuItem(self), + helpbar = MfxCheckMenuItem(self), + save_games_geometry = MfxCheckMenuItem(self), + splashscreen = MfxCheckMenuItem(self), + demo_logo = MfxCheckMenuItem(self), + mouse_type = StringVar(), + mouse_undo = MfxCheckMenuItem(self), + negative_bottom = MfxCheckMenuItem(self), + pause = MfxCheckMenuItem(self), + toolbar_vars = {}, + ) + for w in TOOLBAR_BUTTONS: + self.tkopt.toolbar_vars[w] = MfxCheckMenuItem(self) + + def _setOptions(self): + tkopt, opt = self.tkopt, self.app.opt + # set state of the menu items + tkopt.autofaceup.set(opt.autofaceup) + tkopt.autodrop.set(opt.autodrop) + tkopt.autodeal.set(opt.autodeal) + tkopt.quickplay.set(opt.quickplay) + tkopt.undo.set(opt.undo) + tkopt.hint.set(opt.hint) + tkopt.bookmarks.set(opt.bookmarks) + tkopt.highlight_piles.set(opt.highlight_piles) + tkopt.highlight_cards.set(opt.highlight_cards) + tkopt.highlight_samerank.set(opt.highlight_samerank) + tkopt.highlight_not_matching.set(opt.highlight_not_matching) + tkopt.shrink_face_down.set(opt.shrink_face_down) + tkopt.shade_filled_stacks.set(opt.shade_filled_stacks) + tkopt.mahjongg_show_removed.set(opt.mahjongg_show_removed) + tkopt.shisen_show_hint.set(opt.shisen_show_hint) + tkopt.sound.set(opt.sound) + tkopt.cardback.set(self.app.cardset.backindex) + tkopt.tabletile.set(self.app.tabletile_index) + tkopt.animations.set(opt.animations) + tkopt.shadow.set(opt.shadow) + tkopt.shade.set(opt.shade) + tkopt.toolbar.set(opt.toolbar) + tkopt.toolbar_style.set(opt.toolbar_style) + tkopt.toolbar_relief.set(opt.toolbar_relief) + tkopt.toolbar_compound.set(opt.toolbar_compound) + tkopt.toolbar_size.set(opt.toolbar_size) + tkopt.toolbar_relief.set(opt.toolbar_relief) + tkopt.statusbar.set(opt.statusbar) + tkopt.num_cards.set(opt.num_cards) + tkopt.helpbar.set(opt.helpbar) + tkopt.save_games_geometry.set(opt.save_games_geometry) + tkopt.demo_logo.set(opt.demo_logo) + tkopt.splashscreen.set(opt.splashscreen) + tkopt.mouse_type.set(opt.mouse_type) + tkopt.mouse_undo.set(opt.mouse_undo) + tkopt.negative_bottom.set(opt.negative_bottom) + for w in TOOLBAR_BUTTONS: + tkopt.toolbar_vars[w].set(opt.toolbar_vars[w]) + + def connectGame(self, game): + self.game = game + if game is None: + return + assert self.app is game.app + tkopt, opt = self.tkopt, self.app.opt + tkopt.gameid.set(game.id) + tkopt.gameid_popular.set(game.id) + tkopt.comment.set(bool(game.gsaveinfo.comment)) + tkopt.pause.set(self.game.pause) + if game.canFindCard(): + connect_game_find_card_dialog(game) + else: + destroy_find_card_dialog() + + # create a GTK-like path + def _addPath(self, path, menu, index, submenu): + if not self.__menupath.has_key(path): + ##print path, menu, index, submenu + self.__menupath[path] = (menu, index, submenu) + + def _getEnabledState(self, enabled): + if enabled: + return "normal" + return "disabled" + + def updateProgress(self): + if self.progress: self.progress.update(step=1) + + + # + # create the menubar + # + + def _createMenubar(self): + MfxMenubar.addPath = self._addPath + kw = { "name": "menubar" } + if 1 and os.name == "posix": + pass + ##kw["relief"] = "groove" + kw["activeborderwidth"] = 1 + kw['bd'] = 1 + self.__menubar = apply(MfxMenubar, (self.top,), kw) + + # init keybindings + bind(self.top, "", self._keyPressHandler) + + m = "Ctrl-" + if os.name == "mac": m = "Cmd-" + + menu = MfxMenu(self.__menubar, n_("&File")) + menu.add_command(label=n_("&New game"), command=self.mNewGame, accelerator="N") + submenu = MfxMenu(menu, label=n_("R&ecent games")) + ##menu.add_command(label=n_("Select &random game"), command=self.mSelectRandomGame, accelerator=m+"R") + submenu = MfxMenu(menu, label=n_("Select &random game")) + submenu.add_command(label=n_("&All games"), command=lambda self=self: self.mSelectRandomGame('all'), accelerator=m+"R") + submenu.add_command(label=n_("Games played and &won"), command=lambda self=self: self.mSelectRandomGame('won')) + submenu.add_command(label=n_("Games played and ¬ won"), command=lambda self=self: self.mSelectRandomGame('not won')) + submenu.add_command(label=n_("Games not &played"), command=lambda self=self: self.mSelectRandomGame('not played')) + menu.add_command(label=n_("Select game by nu&mber..."), command=self.mSelectGameById, accelerator=m+"M") + menu.add_separator() + submenu = MfxMenu(menu, label=n_("Fa&vorite games")) + menu.add_command(label=n_("A&dd to favorites"), command=self.mAddFavor) + menu.add_command(label=n_("R&emove from favorites"), command=self.mDelFavor) + menu.add_separator() + menu.add_command(label=n_("&Open..."), command=self.mOpen, accelerator=m+"O") + menu.add_command(label=n_("&Save"), command=self.mSave, accelerator=m+"S") + menu.add_command(label=n_("Save &as..."), command=self.mSaveAs) + menu.add_separator() + menu.add_command(label=n_("&Hold and quit"), command=self.mHoldAndQuit) + menu.add_command(label=n_("&Quit"), command=self.mQuit, accelerator=m+"Q") + + if self.progress: self.progress.update(step=1) + + menu = MfxMenu(self.__menubar, label=n_("&Select")) + self._addSelectGameMenu(menu) + + if self.progress: self.progress.update(step=1) + + menu = MfxMenu(self.__menubar, label=n_("&Edit")) + menu.add_command(label=n_("&Undo"), command=self.mUndo, accelerator="Z") + menu.add_command(label=n_("&Redo"), command=self.mRedo, accelerator="R") + menu.add_command(label=n_("Redo &all"), command=self.mRedoAll) + + menu.add_separator() + submenu = MfxMenu(menu, label=n_("&Set bookmark")) + for i in range(9): + label = _("Bookmark %d") % (i + 1) + submenu.add_command(label=label, command=lambda self=self, i=i: self.mSetBookmark(i)) + submenu = MfxMenu(menu, label=n_("Go&to bookmark")) + for i in range(9): + label = _("Bookmark %d") % (i + 1) + acc = m + "%d" % (i + 1) + submenu.add_command(label=label, command=lambda self=self, i=i: self.mGotoBookmark(i), accelerator=acc) + menu.add_command(label=n_("&Clear bookmarks"), command=self.mClearBookmarks) + menu.add_separator() + + menu.add_command(label=n_("Restart"), command=self.mRestart, accelerator=m+"G") + + menu = MfxMenu(self.__menubar, label=n_("&Game")) + menu.add_command(label=n_("&Deal cards"), command=self.mDeal, accelerator="D") + menu.add_command(label=n_("&Auto drop"), command=self.mDrop, accelerator="A") + menu.add_checkbutton(label=n_("&Pause"), variable=self.tkopt.pause, command=self.mPause, accelerator="P") + #menu.add_command(label=n_("&Pause"), command=self.mPause, accelerator="P") + menu.add_separator() + menu.add_command(label=n_("S&tatus..."), command=self.mStatus, accelerator="T") + menu.add_checkbutton(label=n_("&Comments..."), variable=self.tkopt.comment, command=self.mEditGameComment) + menu.add_separator() + submenu = MfxMenu(menu, label=n_("&Statistics")) + submenu.add_command(label=n_("Current game..."), command=lambda self=self: self.mPlayerStats(mode=101)) + submenu.add_command(label=n_("All games..."), command=lambda self=self: self.mPlayerStats(mode=102)) + submenu.add_separator() + submenu.add_command(label=n_("Session log..."), command=lambda self=self: self.mPlayerStats(mode=104)) + submenu.add_command(label=n_("Full log..."), command=lambda self=self: self.mPlayerStats(mode=103)) + submenu.add_separator() + submenu.add_command(label=TOP_TITLE+"...", command=self.mTop10, accelerator=m+"T") + submenu = MfxMenu(menu, label=n_("D&emo statistics")) + submenu.add_command(label=n_("Current game..."), command=lambda self=self: self.mPlayerStats(mode=1101)) + submenu.add_command(label=n_("All games..."), command=lambda self=self: self.mPlayerStats(mode=1102)) + + menu = MfxMenu(self.__menubar, label=n_("&Assist")) + menu.add_command(label=n_("&Hint"), command=self.mHint, accelerator="H") + menu.add_command(label=n_("Highlight p&iles"), command=self.mHighlightPiles, accelerator="I") + menu.add_command(label=n_("Find card"), command=self.mFindCard, accelerator="F") + menu.add_separator() + menu.add_command(label=n_("&Demo"), command=self.mDemo, accelerator=m+"D") + menu.add_command(label=n_("Demo (&all games)"), command=self.mMixedDemo) + menu.add_separator() + menu.add_command(label=n_("Piles description"), command=self.mStackDesk, accelerator="F2") + + if self.progress: self.progress.update(step=1) + + menu = MfxMenu(self.__menubar, label=n_("&Options")) + menu.add_command(label=n_("&Player options..."), command=self.mOptPlayerOptions) + submenu = MfxMenu(menu, label=n_("&Automatic play")) + submenu.add_checkbutton(label=n_("Auto &face up"), variable=self.tkopt.autofaceup, command=self.mOptAutoFaceUp) + submenu.add_checkbutton(label=n_("A&uto drop"), variable=self.tkopt.autodrop, command=self.mOptAutoDrop) + submenu.add_checkbutton(label=n_("Auto &deal"), variable=self.tkopt.autodeal, command=self.mOptAutoDeal) + submenu.add_separator() + submenu.add_checkbutton(label=n_("&Quick play"), variable=self.tkopt.quickplay, command=self.mOptQuickPlay) + submenu = MfxMenu(menu, label=n_("Assist &level")) + submenu.add_checkbutton(label=n_("Enable &undo"), variable=self.tkopt.undo, command=self.mOptEnableUndo) + submenu.add_checkbutton(label=n_("Enable &bookmarks"), variable=self.tkopt.bookmarks, command=self.mOptEnableBookmarks) + submenu.add_checkbutton(label=n_("Enable &hint"), variable=self.tkopt.hint, command=self.mOptEnableHint) + submenu.add_checkbutton(label=n_("Enable highlight p&iles"), variable=self.tkopt.highlight_piles, command=self.mOptEnableHighlightPiles) + submenu.add_checkbutton(label=n_("Enable highlight &cards"), variable=self.tkopt.highlight_cards, command=self.mOptEnableHighlightCards) + submenu.add_checkbutton(label=n_("Enable highlight same &rank"), variable=self.tkopt.highlight_samerank, command=self.mOptEnableHighlightSameRank) + submenu.add_checkbutton(label=n_("Highlight &no matching"), variable=self.tkopt.highlight_not_matching, command=self.mOptEnableHighlightNotMatching) + submenu.add_separator() + submenu.add_checkbutton(label=n_("&Show removed tiles (in Mahjongg games)"), variable=self.tkopt.mahjongg_show_removed, command=self.mOptMahjonggShowRemoved) + submenu.add_checkbutton(label=n_("Show hint &arrow (in Shisen-Sho games)"), variable=self.tkopt.shisen_show_hint, command=self.mOptShisenShowHint) + menu.add_separator() + label = n_("&Sound...") + if not self.app.audio.CAN_PLAY_SOUND: + menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSoundDialog, state=Tkinter.DISABLED) + else: + menu.add_checkbutton(label=label, variable=self.tkopt.sound, command=self.mOptSoundDialog) + # cardsets + #manager = self.app.cardset_manager + #n = manager.len() + menu.add_command(label=n_("Cards&et..."), command=self.mSelectCardsetDialog, accelerator=m+"E") + menu.add_command(label=n_("Table t&ile..."), command=self.mSelectTileDialog) + # this submenu will get set by updateBackgroundImagesMenu() + submenu = MfxMenu(menu, label=n_("Card &background")) + submenu = MfxMenu(menu, label=n_("Card &view")) + submenu.add_checkbutton(label=n_("Card shado&w"), variable=self.tkopt.shadow, command=self.mOptShadow) + submenu.add_checkbutton(label=n_("Shade &legal moves"), variable=self.tkopt.shade, command=self.mOptShade) + submenu.add_checkbutton(label=n_("&Negative cards bottom"), variable=self.tkopt.negative_bottom, command=self.mOptNegativeBottom) + submenu.add_checkbutton(label=n_("Shrink face-down cards"), variable=self.tkopt.shrink_face_down, command=self.mOptShrinkFaceDown) + submenu.add_checkbutton(label=n_("Shade &filled stacks"), variable=self.tkopt.shade_filled_stacks, command=self.mOptShadeFilledStacks) + submenu = MfxMenu(menu, label=n_("A&nimations")) + submenu.add_radiobutton(label=n_("&None"), variable=self.tkopt.animations, value=0, command=self.mOptAnimations) + submenu.add_radiobutton(label=n_("&Timer based"), variable=self.tkopt.animations, value=2, command=self.mOptAnimations) + submenu.add_radiobutton(label=n_("&Fast"), variable=self.tkopt.animations, value=1, command=self.mOptAnimations) + submenu.add_radiobutton(label=n_("&Slow"), variable=self.tkopt.animations, value=3, command=self.mOptAnimations) + submenu.add_radiobutton(label=n_("&Very slow"), variable=self.tkopt.animations, value=4, command=self.mOptAnimations) + submenu = MfxMenu(menu, label=n_("&Mouse")) + submenu.add_radiobutton(label=n_("&Drag-and-Drop"), variable=self.tkopt.mouse_type, value='drag-n-drop', command=self.mOptMouseType) + submenu.add_radiobutton(label=n_("&Point-and-Click"), variable=self.tkopt.mouse_type, value='point-n-click', command=self.mOptMouseType) + submenu.add_radiobutton(label=n_("&Sticky mouse"), variable=self.tkopt.mouse_type, value='sticky-mouse', command=self.mOptMouseType) + submenu.add_separator() + submenu.add_checkbutton(label=n_("Use mouse for undo/redo"), variable=self.tkopt.mouse_undo, command=self.mOptMouseUndo) + menu.add_separator() + menu.add_command(label=n_("&Fonts..."), command=self.mOptFonts) + menu.add_command(label=n_("&Colors..."), command=self.mOptColors) + menu.add_command(label=n_("Time&outs..."), command=self.mOptTimeouts) + menu.add_separator() + submenu = MfxMenu(menu, label=n_("&Toolbar")) + createToolbarMenu(self, submenu) + submenu = MfxMenu(menu, label=n_("Stat&usbar")) + submenu.add_checkbutton(label=n_("Show &statusbar"), variable=self.tkopt.statusbar, command=self.mOptStatusbar) + submenu.add_checkbutton(label=n_("Show &number of cards"), variable=self.tkopt.num_cards, command=self.mOptNumCards) + submenu.add_checkbutton(label=n_("Show &help bar"), variable=self.tkopt.helpbar, command=self.mOptHelpbar) + menu.add_checkbutton(label=n_("Save games &geometry"), variable=self.tkopt.save_games_geometry, command=self.mOptSaveGamesGeometry) + menu.add_checkbutton(label=n_("&Demo logo"), variable=self.tkopt.demo_logo, command=self.mOptDemoLogo) + menu.add_checkbutton(label=n_("Startup splash sc&reen"), variable=self.tkopt.splashscreen, command=self.mOptSplashscreen) +### menu.add_separator() +### menu.add_command(label="Save options", command=self.mOptSave) + + if self.progress: self.progress.update(step=1) + + menu = MfxMenu(self.__menubar, label=n_("&Help")) + menu.add_command(label=n_("&Contents"), command=self.mHelp, accelerator=m+"F1") + menu.add_command(label=n_("&How to play"), command=self.mHelpHowToPlay) + menu.add_command(label=n_("&Rules for this game"), command=self.mHelpRules, accelerator="F1") + menu.add_command(label=n_("&License terms"), command=self.mHelpLicense) + ##menu.add_command(label=n_("What's &new ?"), command=self.mHelpNews) + menu.add_separator() + menu.add_command(label=n_("&About ")+PACKAGE+"...", command=self.mHelpAbout) + + MfxMenubar.addPath = None + + ### FIXME: all key bindings should be *added* to keyPressHandler + ctrl = "Control-" + self._bindKey("", "n", self.mNewGame) + self._bindKey("", "g", self.mSelectGameDialog) + self._bindKey("", "v", self.mSelectGameDialogWithPreview) + self._bindKey(ctrl, "r", lambda e, self=self: self.mSelectRandomGame()) + self._bindKey(ctrl, "m", self.mSelectGameById) + self._bindKey(ctrl, "n", self.mNewGameWithNextId) + self._bindKey(ctrl, "o", self.mOpen) + ##self._bindKey("", "F3", self.mOpen) # undocumented + self._bindKey(ctrl, "s", self.mSave) + ##self._bindKey("", "F2", self.mSaveAs) # undocumented + self._bindKey(ctrl, "q", self.mQuit) + self._bindKey("", "z", self.mUndo) + self._bindKey("", "BackSpace", self.mUndo) # undocumented + self._bindKey("", "KP_Enter", self.mUndo) # undocumented + self._bindKey("", "r", self.mRedo) + self._bindKey(ctrl, "g", self.mRestart) + self._bindKey("", "space", self.mDeal) # undocumented + self._bindKey("", "t", self.mStatus) + self._bindKey(ctrl, "t", self.mTop10) + self._bindKey("", "h", self.mHint) + self._bindKey(ctrl, "h", self.mHint1) # undocumented + ##self._bindKey("", "Shift_L", self.mHighlightPiles) + ##self._bindKey("", "Shift_R", self.mHighlightPiles) + self._bindKey("", "i", self.mHighlightPiles) + self._bindKey("", "f", self.mFindCard) + self._bindKey(ctrl, "d", self.mDemo) + self._bindKey(ctrl, "e", self.mSelectCardsetDialog) + self._bindKey(ctrl, "b", self.mOptChangeCardback) # undocumented + self._bindKey(ctrl, "i", self.mOptChangeTableTile) # undocumented + self._bindKey(ctrl, "p", self.mOptPlayerOptions) # undocumented + self._bindKey(ctrl, "F1", self.mHelp) + self._bindKey("", "F1", self.mHelpRules) + self._bindKey("", "Print", self.mScreenshot) + self._bindKey(ctrl, "u", self.mPlayNextMusic) # undocumented + self._bindKey("", "p", self.mPause) + self._bindKey("", "Pause", self.mPause) # undocumented + self._bindKey("", "Escape", self.mIconify) # undocumented + # ASD and LKJ + self._bindKey("", "a", self.mDrop) + self._bindKey(ctrl, "a", self.mDrop1) + self._bindKey("", "s", self.mUndo) + self._bindKey("", "d", self.mDeal) + self._bindKey("", "l", self.mDrop) + self._bindKey(ctrl, "l", self.mDrop1) + self._bindKey("", "k", self.mUndo) + self._bindKey("", "j", self.mDeal) + + self._bindKey("", "F2", self.mStackDesk) + # + self._bindKey("", "slash", self.mGameInfo) # undocumented, devel + + for i in range(9): + self._bindKey(ctrl, str(i+1), lambda event, self=self, i=i: self.mGotoBookmark(i, confirm=0)) + + # undocumented, devel + self._bindKey(ctrl, "End", self.mPlayNextMusic) + self._bindKey(ctrl, "Prior", self.mSelectPrevGameByName) + self._bindKey(ctrl, "Next", self.mSelectNextGameByName) + self._bindKey(ctrl, "Up", self.mSelectPrevGameById) + self._bindKey(ctrl, "Down", self.mSelectNextGameById) + + + # + # key binding utility + # + + def _bindKey(self, modifier, key, func): + if 0 and not modifier and len(key) == 1: + self.__keybindings[key.lower()] = func + self.__keybindings[key.upper()] = func + return + sequence = "<" + modifier + "KeyPress-" + key + ">" + try: + bind(self.top, sequence, func) + if len(key) == 1 and key != key.upper(): + key = key.upper() + sequence = "<" + modifier + "KeyPress-" + key + ">" + bind(self.top, sequence, func) + except: + raise + + + def _keyPressHandler(self, event): + r = EVENT_PROPAGATE + if event and self.game: + ##print event.__dict__ + if self.game.demo: + # stop the demo by setting self.game.demo.keypress + if event.char: # ignore Ctrl/Shift/etc. + self.game.demo.keypress = event.char + r = EVENT_HANDLED + func = self.__keybindings.get(event.char) + if func and (event.state & ~2) == 0: + func(event) + r = EVENT_HANDLED + return r + + # + # Select Game menu creation + # + + def _addSelectGameMenu(self, menu): + #games = map(self.app.gdb.get, self.app.gdb.getGamesIdSortedByShortName()) + games = map(self.app.gdb.get, self.app.gdb.getGamesIdSortedByName()) + ##games = tuple(games) + ###menu = MfxMenu(menu, label="Select &game") + menu.add_command(label=n_("All &games..."), accelerator="G", + command=self.mSelectGameDialog) + menu.add_command(label=n_("Playable pre&view..."), accelerator="V", + command=self.mSelectGameDialogWithPreview) + menu.add_separator() + self._addSelectPopularGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) + self._addSelectFrenchGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) + if self.progress: self.progress.update(step=1) + self._addSelectMahjonggGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) + self._addSelectOrientalGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) + self._addSelectSpecialGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) + menu.add_separator() + if self.progress: self.progress.update(step=1) + self._addSelectAllGameSubMenu(games, menu, self.mSelectGame, + self.tkopt.gameid) + + + def _addSelectGameSubMenu(self, games, menu, select_data, + command, variable): + ##print select_data + need_sep = 0 + for label, select_func in select_data: + if label is None: + need_sep = 1 + continue + g = filter(select_func, games) + if not g: + continue + if need_sep: + menu.add_separator() + need_sep = 0 + submenu = MfxMenu(menu, label=label) + self._addSelectGameSubSubMenu(g, submenu, command, variable) + + def _getNumGames(self, games, select_data): + ngames = 0 + for label, select_func in select_data: + ngames += len(filter(select_func, games)) + return ngames + + def _addSelectMahjonggGameSubMenu(self, games, menu, command, variable): + select_func = lambda gi: gi.si.game_type == GI.GT_MAHJONGG + mahjongg_games = filter(select_func, games) + if len(mahjongg_games) == 0: + return + # + menu = MfxMenu(menu, label=n_("&Mahjongg games")) + + def add_menu(games, c0, c1, menu=menu, + variable=variable, command=command): + if not games: + return + label = c0 + ' - ' + c1 + if c0 == c1: + label = c0 + submenu = MfxMenu(menu, label=label, name=None) + self._addSelectGameSubSubMenu(games, submenu, command, + variable, short_name=True) + + games = {} + for gi in mahjongg_games: + c = gettext(gi.short_name).strip()[0] + if games.has_key(c): + games[c].append(gi) + else: + games[c] = [gi] + games = games.items() + games.sort() + g0 = [] + c0 = c1 = games[0][0] + for c, g1 in games: + if len(g0)+len(g1) >= self.__cb_max: + add_menu(g0, c0, c1) + g0 = g1 + c0 = c1 = c + else: + g0 += g1 + c1 = c + add_menu(g0, c0, c1) + + def _addSelectPopularGameSubMenu(self, games, menu, command, variable): + select_func = lambda gi: gi.si.game_flags & GI.GT_POPULAR + if len(filter(select_func, games)) == 0: + return + data = (n_("&Popular games"), select_func) + self._addSelectGameSubMenu(games, menu, (data, ), + self.mSelectGamePopular, + self.tkopt.gameid_popular) + + def _addSelectFrenchGameSubMenu(self, games, menu, command, variable): + if self._getNumGames(games, GI.SELECT_GAME_BY_TYPE) == 0: + return + submenu = MfxMenu(menu, label=n_("&French games")) + self._addSelectGameSubMenu(games, submenu, GI.SELECT_GAME_BY_TYPE, + self.mSelectGame, self.tkopt.gameid) + + def _addSelectOrientalGameSubMenu(self, games, menu, command, variable): + if self._getNumGames(games, GI.SELECT_ORIENTAL_GAME_BY_TYPE) == 0: + return + submenu = MfxMenu(menu, label=n_("&Oriental games")) + self._addSelectGameSubMenu(games, submenu, + GI.SELECT_ORIENTAL_GAME_BY_TYPE, + self.mSelectGame, self.tkopt.gameid) + + def _addSelectSpecialGameSubMenu(self, games, menu, command, variable): + if self._getNumGames(games, GI.SELECT_ORIENTAL_GAME_BY_TYPE) == 0: + return + submenu = MfxMenu(menu, label=n_("&Special games")) + self._addSelectGameSubMenu(games, submenu, + GI.SELECT_SPECIAL_GAME_BY_TYPE, + self.mSelectGame, self.tkopt.gameid) + + def _addSelectAllGameSubMenu(self, games, menu, command, variable): + menu = MfxMenu(menu, label=n_("&All games by name")) + n, d = 0, self.__cb_max + i = 0 + while True: + if self.progress: self.progress.update(step=1) + columnbreak = i > 0 and (i % d) == 0 + i += 1 + if not games[n:n+d]: + break + m = min(n+d-1, len(games)-1) + label = gettext(games[n].name)[:3]+' - '+gettext(games[m].name)[:3] + submenu = MfxMenu(menu, label=label, name=None) + self._addSelectGameSubSubMenu(games[n:n+d], submenu, + command, variable) + n += d + if columnbreak: + menu.entryconfigure(i, columnbreak=columnbreak) + + def _addSelectGameSubSubMenu(self, games, menu, command, variable, + short_name=False): + ##cb = (25, self.__cb_max) [ len(g) > 4 * 25 ] + ##cb = min(cb, self.__cb_max) + cb = self.__cb_max + for i in range(len(games)): + gi = games[i] + columnbreak = i > 0 and (i % cb) == 0 + if short_name: + label = gi.short_name + else: + label = gi.name + menu.add_radiobutton(command=command, variable=variable, + columnbreak=columnbreak, + value=gi.id, label=label, name=None) + + + # + # Select Game menu actions + # + + def mSelectGame(self, *args): + self._mSelectGame(self.tkopt.gameid.get()) + + def mSelectGamePopular(self, *args): + self._mSelectGame(self.tkopt.gameid_popular.get()) + + def _mSelectGameDialog(self, d): + if d.status == 0 and d.button == 0 and d.gameid != self.game.id: + self.tkopt.gameid.set(d.gameid) + self.tkopt.gameid_popular.set(d.gameid) + if 0: + self._mSelectGame(d.gameid, random=d.random) + else: + # don't ask areYouSure() + self._cancelDrag() + self.game.endGame() + self.game.quitGame(d.gameid, random=d.random) + return EVENT_HANDLED + + def __restoreCursor(self, *event): + self.game.setCursor(cursor=self.app.top_cursor) + + def mSelectGameDialog(self, *event): + if self._cancelDrag(break_pause=False): return + self.game.setCursor(cursor=CURSOR_WATCH) + after_idle(self.top, self.__restoreCursor) + d = SelectGameDialog(self.top, title=_("Select game"), + app=self.app, gameid=self.game.id) + return self._mSelectGameDialog(d) + + def mSelectGameDialogWithPreview(self, *event): + if self._cancelDrag(break_pause=False): return + self.game.setCursor(cursor=CURSOR_WATCH) + bookmark = None + if 0: + # use a bookmark for our preview game + if self.game.setBookmark(-2, confirm=0): + bookmark = self.game.gsaveinfo.bookmarks[-2][0] + del self.game.gsaveinfo.bookmarks[-2] + after_idle(self.top, self.__restoreCursor) + d = SelectGameDialogWithPreview(self.top, title=_("Select game"), + app=self.app, gameid=self.game.id, + bookmark=bookmark) + return self._mSelectGameDialog(d) + + + # + # menubar overrides + # + + def updateFavoriteGamesMenu(self): + gameids = self.app.opt.favorite_gameid + # delete all entries + submenu = self.__menupath[".menubar.file.favoritegames"][2] + submenu.delete(0, "last") + # insert games + games = [] + for id in gameids: + gi = self.app.getGameInfo(id) + if gi: + games.append(gi) + if len(games) > self.__cb_max*4: + games.sort(lambda a, b: cmp(gettext(a.name), gettext(b.name))) + self._addSelectAllGameSubMenu(games, submenu, + command=self.mSelectGame, + variable=self.tkopt.gameid) + else: + self._addSelectGameSubSubMenu(games, submenu, + command=self.mSelectGame, + variable=self.tkopt.gameid) + state = self._getEnabledState + in_favor = self.app.game.id in gameids + menu, index, submenu = self.__menupath[".menubar.file.addtofavorites"] + menu.entryconfig(index, state=state(not in_favor)) + menu, index, submenu = self.__menupath[".menubar.file.removefromfavorites"] + menu.entryconfig(index, state=state(in_favor)) + + + def updateRecentGamesMenu(self, gameids): + # delete all entries + submenu = self.__menupath[".menubar.file.recentgames"][2] + submenu.delete(0, "last") + # insert games + cb = (25, self.__cb_max) [ len(gameids) > 4 * 25 ] + i = 0 + for id in gameids: + gi = self.app.getGameInfo(id) + if not gi: + continue + columnbreak = i > 0 and (i % cb) == 0 + submenu.add_radiobutton(command=self.mSelectGame, + variable=self.tkopt.gameid, + columnbreak=columnbreak, + value=gi.id, label=gi.name) + i = i + 1 + + def updateBookmarkMenuState(self): + state = self._getEnabledState + mp1 = self.__menupath.get(".menubar.edit.setbookmark") + mp2 = self.__menupath.get(".menubar.edit.gotobookmark") + mp3 = self.__menupath.get(".menubar.edit.clearbookmarks") + if mp1 is None or mp2 is None or mp3 is None: + return + x = self.app.opt.bookmarks and self.game.canSetBookmark() + # + menu, index, submenu = mp1 + for i in range(9): + submenu.entryconfig(i, state=state(x)) + menu.entryconfig(index, state=state(x)) + # + menu, index, submenu = mp2 + ms = 0 + for i in range(9): + s = self.game.gsaveinfo.bookmarks.get(i) is not None + submenu.entryconfig(i, state=state(s and x)) + ms = ms or s + menu.entryconfig(index, state=state(ms and x)) + # + menu, index, submenu = mp3 + menu.entryconfig(index, state=state(ms and x)) + + def updateBackgroundImagesMenu(self): + mp = self.__menupath.get(".menubar.options.cardbackground") + # delete all entries + submenu = mp[2] + submenu.delete(0, "last") + # insert new cardbacks + mbacks = self.app.images.getCardbacks() + cb = int(math.ceil(math.sqrt(len(mbacks)))) + for i in range(len(mbacks)): + columnbreak = i > 0 and (i % cb) == 0 + submenu.add_radiobutton(label=mbacks[i].name, image=mbacks[i].menu_image, variable=self.tkopt.cardback, value=i, + command=self.mOptCardback, columnbreak=columnbreak, indicatoron=0, hidemargin=0) + + + # + # menu updates + # + + def setMenuState(self, state, path): + #print state, path + path = ".menubar." + path + mp = self.__menupath.get(path) + menu, index, submenu = mp + s = self._getEnabledState(state) + menu.entryconfig(index, state=s) + + def setToolbarState(self, state, path): + #print state, path + s = self._getEnabledState(state) + w = getattr(self.app.toolbar, path + "_button") + w["state"] = s + + def _setCommentMenu(self, v): + self.tkopt.comment.set(v) + + def _setPauseMenu(self, v): + self.tkopt.pause.set(v) + + + # + # menu actions + # + + DEFAULTEXTENSION = ".pso" + FILETYPES = ((PACKAGE+" files", "*"+DEFAULTEXTENSION), ("All files", "*")) + + def mAddFavor(self, *event): + gameid = self.app.game.id + if gameid not in self.app.opt.favorite_gameid: + self.app.opt.favorite_gameid.append(gameid) + self.updateFavoriteGamesMenu() + + def mDelFavor(self, *event): + gameid = self.app.game.id + if gameid in self.app.opt.favorite_gameid: + self.app.opt.favorite_gameid.remove(gameid) + self.updateFavoriteGamesMenu() + + def mOpen(self, *event): + if self._cancelDrag(break_pause=False): return + filename = self.game.filename + if filename: + idir, ifile = os.path.split(os.path.normpath(filename)) + else: + idir, ifile = "", "" + if not idir: + idir = self.app.dn.savegames + d = tkFileDialog.Open() + filename = d.show(filetypes=self.FILETYPES, + defaultextension=self.DEFAULTEXTENSION, + initialdir=idir, initialfile=ifile) + if filename: + filename = os.path.normpath(filename) + ##filename = os.path.normcase(filename) + if os.path.isfile(filename): + self.game.loadGame(filename) + + def mSaveAs(self, *event): + if self._cancelDrag(break_pause=False): return + if not self.menustate.save_as: + return + filename = self.game.filename + if not filename: + filename = self.app.getGameSaveName(self.game.id) + if os.name == "posix": + filename = filename + "-" + self.game.getGameNumber(format=0) + elif os.path.supports_unicode_filenames: # new in python 2.3 + filename = filename + "-" + self.game.getGameNumber(format=0) + else: + filename = filename + "-01" + filename = filename + self.DEFAULTEXTENSION + idir, ifile = os.path.split(os.path.normpath(filename)) + if not idir: + idir = self.app.dn.savegames + ##print self.game.filename, ifile + d = tkFileDialog.SaveAs() + filename = d.show(filetypes=self.FILETYPES, + defaultextension=self.DEFAULTEXTENSION, + initialdir=idir, initialfile=ifile) + if filename: + filename = os.path.normpath(filename) + ##filename = os.path.normcase(filename) + self.game.saveGame(filename) + self.updateMenus() + + def mPause(self, *args): + if not self.game.pause: + if self._cancelDrag(): return + self.game.doPause() + self.tkopt.pause.set(self.game.pause) + + def mOptSoundDialog(self, *args): + if self._cancelDrag(break_pause=False): return + d = SoundOptionsDialog(self.top, _("Sound settings"), self.app) + self.tkopt.sound.set(self.app.opt.sound) + + def mOptAutoFaceUp(self, *args): + if self._cancelDrag(): return + self.app.opt.autofaceup = self.tkopt.autofaceup.get() + if self.app.opt.autofaceup: + self.game.autoPlay() + + def mOptAutoDrop(self, *args): + if self._cancelDrag(): return + self.app.opt.autodrop = self.tkopt.autodrop.get() + if self.app.opt.autodrop: + self.game.autoPlay() + + def mOptAutoDeal(self, *args): + if self._cancelDrag(): return + self.app.opt.autodeal = self.tkopt.autodeal.get() + if self.app.opt.autodeal: + self.game.autoPlay() + + def mOptQuickPlay(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.quickplay = self.tkopt.quickplay.get() + + def mOptEnableUndo(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.undo = self.tkopt.undo.get() + self.game.updateMenus() + + def mOptEnableBookmarks(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.bookmarks = self.tkopt.bookmarks.get() + self.game.updateMenus() + + def mOptEnableHint(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.hint = self.tkopt.hint.get() + self.game.updateMenus() + + def mOptEnableHighlightPiles(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_piles = self.tkopt.highlight_piles.get() + self.game.updateMenus() + + def mOptEnableHighlightCards(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_cards = self.tkopt.highlight_cards.get() + self.game.updateMenus() + + def mOptEnableHighlightSameRank(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_samerank = self.tkopt.highlight_samerank.get() + ##self.game.updateMenus() + + def mOptEnableHighlightNotMatching(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.highlight_not_matching = self.tkopt.highlight_not_matching.get() + ##self.game.updateMenus() + + def mOptAnimations(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.animations = self.tkopt.animations.get() + + def mOptShadow(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shadow = self.tkopt.shadow.get() + + def mOptShade(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shade = self.tkopt.shade.get() + + def mOptShrinkFaceDown(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shrink_face_down = self.tkopt.shrink_face_down.get() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def mOptShadeFilledStacks(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shade_filled_stacks = self.tkopt.shade_filled_stacks.get() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def mOptMahjonggShowRemoved(self, *args): + if self._cancelDrag(): return + self.app.opt.mahjongg_show_removed = self.tkopt.mahjongg_show_removed.get() + ##self.game.updateMenus() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + def mOptShisenShowHint(self, *args): + if self._cancelDrag(break_pause=False): return + self.app.opt.shisen_show_hint = self.tkopt.shisen_show_hint.get() + ##self.game.updateMenus() + + def mSelectCardsetDialog(self, *event): + if self._cancelDrag(break_pause=False): return + ##strings, default = ("&OK", "&Load", "&Cancel"), 0 + strings, default = (None, _("&Load"), _("&Cancel"),), 1 + ##if os.name == "posix": + strings, default = (None, _("&Load"), _("&Cancel"), _("&Info..."),), 1 + t = CARDSET + key = self.app.nextgame.cardset.index + d = SelectCardsetDialogWithPreview(self.top, title=_("Select ")+t, + app=self.app, manager=self.app.cardset_manager, key=key, + strings=strings, default=default) + cs = self.app.cardset_manager.get(d.key) + if cs is None or d.key == self.app.cardset.index: + return + if d.status == 0 and d.button in (0, 1) and d.key >= 0: + self.app.nextgame.cardset = cs + if d.button == 1: + self._cancelDrag() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + self.app.opt.games_geometry = {} # clear saved games geometry + + def _mOptCardback(self, index): + if self._cancelDrag(break_pause=False): return + cs = self.app.cardset + old_index = cs.backindex + cs.updateCardback(backindex=index) + if cs.backindex == old_index: + return + self.app.updateCardset(self.game.id) + for card in self.game.cards: + image = self.app.images.getBack(card.deck, card.suit, card.rank) + card.updateCardBackground(image=image) + self.app.canvas.update_idletasks() + self.tkopt.cardback.set(cs.backindex) + + def mOptCardback(self, *event): + self._mOptCardback(self.tkopt.cardback.get()) + + def mOptChangeCardback(self, *event): + self._mOptCardback(self.app.cardset.backindex + 1) + +## def mOptTableTile(self, *event): +## if self._cancelDrag(break_pause=False): return +## self._mOptTableTile(self.tkopt.tabletile.get()) + + def mOptChangeTableTile(self, *event): + if self._cancelDrag(break_pause=False): return + n = self.app.tabletile_manager.len() + if n >= 2: + i = (self.tkopt.tabletile.get() + 1) % n + if self.app.setTile(i): + self.tkopt.tabletile.set(i) + + def mSelectTileDialog(self, *event): + if self._cancelDrag(break_pause=False): return + key = self.app.tabletile_index + if key <= 0: + key = self.app.opt.colors['table'] ##.lower() + d = SelectTileDialogWithPreview(self.top, app=self.app, + title=_("Select table background"), + manager=self.app.tabletile_manager, + key=key) + if d.status == 0 and d.button in (0, 1): + if type(d.key) is str: + tile = self.app.tabletile_manager.get(0) + tile.color = d.key + if self.app.setTile(0): + self.tkopt.tabletile.set(0) + elif d.key > 0 and d.key != self.app.tabletile_index: + if self.app.setTile(d.key): + self.tkopt.tabletile.set(d.key) + + def mOptToolbar(self, *event): + ##if self._cancelDrag(break_pause=False): return + self.setToolbarSide(self.tkopt.toolbar.get()) + + def mOptToolbarStyle(self, *event): + ##if self._cancelDrag(break_pause=False): return + self.setToolbarStyle(self.tkopt.toolbar_style.get()) + + def mOptToolbarCompound(self, *event): + ##if self._cancelDrag(break_pause=False): return + self.setToolbarCompound(self.tkopt.toolbar_compound.get()) + + def mOptToolbarSize(self, *event): + ##if self._cancelDrag(break_pause=False): return + self.setToolbarSize(self.tkopt.toolbar_size.get()) + + def mOptToolbarRelief(self, *event): + ##if self._cancelDrag(break_pause=False): return + self.setToolbarRelief(self.tkopt.toolbar_relief.get()) + + def mOptToolbarConfig(self, w): + self.toolbarConfig(w, self.tkopt.toolbar_vars[w].get()) + + def mOptStatusbar(self, *event): + if self._cancelDrag(break_pause=False): return + if not self.app.statusbar: return + side = self.tkopt.statusbar.get() + self.app.opt.statusbar = side + resize = not self.app.opt.save_games_geometry + if self.app.statusbar.show(side, resize=resize): + self.top.update_idletasks() + + def mOptNumCards(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.num_cards = self.tkopt.num_cards.get() + + def mOptHelpbar(self, *event): + if self._cancelDrag(break_pause=False): return + if not self.app.helpbar: return + show = self.tkopt.helpbar.get() + self.app.opt.helpbar = show + resize = not self.app.opt.save_games_geometry + if self.app.helpbar.show(show, resize=resize): + self.top.update_idletasks() + + def mOptSaveGamesGeometry(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.save_games_geometry = self.tkopt.save_games_geometry.get() + + def mOptDemoLogo(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.demo_logo = self.tkopt.demo_logo.get() + + def mOptSplashscreen(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.splashscreen = self.tkopt.splashscreen.get() + + def mOptMouseType(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.mouse_type = self.tkopt.mouse_type.get() + + def mOptMouseUndo(self, *event): + if self._cancelDrag(break_pause=False): return + self.app.opt.mouse_undo = self.tkopt.mouse_undo.get() + + def mOptNegativeBottom(self, *event): + if self._cancelDrag(): return + self.app.opt.negative_bottom = self.tkopt.negative_bottom.get() + self.app.updateCardset() + self.game.endGame(bookmark=1) + self.game.quitGame(bookmark=1) + + + # + # toolbar support + # + + def setToolbarSide(self, side): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar = side + self.tkopt.toolbar.set(side) # update radiobutton + resize = not self.app.opt.save_games_geometry + if self.app.toolbar.show(side, resize=resize): + self.top.update_idletasks() + + def setToolbarSize(self, size): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_size = size + self.tkopt.toolbar_size.set(size) # update radiobutton + dir = self.app.getToolbarImagesDir() + if self.app.toolbar.updateImages(dir, size): + self.game.updateStatus(player=self.app.opt.player) + self.top.update_idletasks() + + def setToolbarStyle(self, style): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_style = style + self.tkopt.toolbar_style.set(style) # update radiobutton + dir = self.app.getToolbarImagesDir() + size = self.app.opt.toolbar_size + if self.app.toolbar.updateImages(dir, size): + ##self.game.updateStatus(player=self.app.opt.player) + self.top.update_idletasks() + + def setToolbarCompound(self, compound): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_compound = compound + self.tkopt.toolbar_compound.set(compound) # update radiobutton + if self.app.toolbar.setCompound(compound): + self.game.updateStatus(player=self.app.opt.player) + self.top.update_idletasks() + + def setToolbarRelief(self, relief): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_relief = relief + self.tkopt.toolbar_relief.set(relief) # update radiobutton + self.app.toolbar.setRelief(relief) + self.top.update_idletasks() + + def toolbarConfig(self, w, v): + if self._cancelDrag(break_pause=False): return + self.app.opt.toolbar_vars[w] = v + self.app.toolbar.config(w, v) + self.top.update_idletasks() + + # + # stacks descriptions + # + + def mStackDesk(self, *event): + if self.game.stackdesc_list: + self.game.deleteStackDesc() + else: + if self._cancelDrag(break_pause=True): return + self.game.showStackDesc() + diff --git a/pysollib/tile/playeroptionsdialog.py b/pysollib/tile/playeroptionsdialog.py new file mode 100644 index 00000000..d6529f30 --- /dev/null +++ b/pysollib/tile/playeroptionsdialog.py @@ -0,0 +1,186 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PlayerOptionsDialog'] + +# imports +import os, sys +import Tile as Tkinter + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import MfxDialog +from tkutil import bind + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class SelectUserNameDialog(MfxDialog): + def __init__(self, parent, title, usernames=[], **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + listbox = Tkinter.Listbox(top_frame) + listbox.pack(side='left', fill='both', expand=1) + scrollbar = Tkinter.Scrollbar(top_frame) + scrollbar.pack(side='right', fill='y') + listbox.configure(yscrollcommand=scrollbar.set) + scrollbar.configure(command=listbox.yview) + + self.username = None + self.listbox = listbox + bind(listbox, '<>', self.updateUserName) + # + for un in usernames: + listbox.insert('end', un) + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + #if listbox.curselection(): + # self.username = listbox.get(listbox.curselection()) + + def updateUserName(self, *args): + self.username = self.listbox.get(self.listbox.curselection()) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), _("&Cancel")), default=0, + separatorwidth=0, + resizable=0, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + + +class PlayerOptionsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + self.app = app + # + self.update_stats_var = Tkinter.BooleanVar() + self.update_stats_var.set(app.opt.update_player_stats != 0) + self.confirm_var = Tkinter.BooleanVar() + self.confirm_var.set(app.opt.confirm != 0) + self.win_animation_var = Tkinter.BooleanVar() + self.win_animation_var.set(app.opt.win_animation != 0) + # + frame = Tkinter.Frame(top_frame) + frame.pack(expand=1, fill='both', padx=5, pady=10) + widget = Tkinter.Label(frame, text=_("\nPlease enter your name"), + #justify='left', anchor='w', + takefocus=0) + widget.grid(row=0, column=0, columnspan=2, sticky='ew', padx=0, pady=5) + w = kw.get("e_width", 30) # width in characters + self.player_var = Tkinter.Entry(frame, exportselection=1, width=w) + self.player_var.insert(0, app.opt.player) + self.player_var.grid(row=1, column=0, sticky='ew', padx=0, pady=5) + widget = Tkinter.Button(frame, text=_('Select...'), + command=self.selectUserName) + widget.grid(row=1, column=1, padx=5, pady=5) + widget = Tkinter.Checkbutton(frame, variable=self.confirm_var, + anchor='w', text=_("Confirm quit")) + widget.grid(row=2, column=0, columnspan=2, sticky='ew', padx=0, pady=5) + widget = Tkinter.Checkbutton(frame, variable=self.update_stats_var, + anchor='w', + text=_("Update statistics and logs")) + widget.grid(row=3, column=0, columnspan=2, sticky='ew', padx=0, pady=5) +### widget = Tkinter.Checkbutton(frame, variable=self.win_animation_var, +### text="Win animation") +### widget.pack(side=Tkinter.TOP, padx=kw.padx, pady=kw.pady) + frame.columnconfigure(0, weight=1) + # + self.player = self.player_var.get() + self.confirm = self.confirm_var.get() + self.update_stats = self.update_stats_var.get() + self.win_animation = self.win_animation_var.get() + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + def selectUserName(self, *args): + names = self.app.getAllUserNames() + d = SelectUserNameDialog(self.top, _("Select name"), names) + if d.status == 0 and d.button == 0 and d.username: + self.player_var.delete(0, 'end') + self.player_var.insert(0, d.username) + + def mDone(self, button): + self.button = button + self.player = self.player_var.get() + self.confirm = self.confirm_var.get() + self.update_stats = self.update_stats_var.get() + self.win_animation = self.win_animation_var.get() + raise SystemExit + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), _("&Cancel")), default=0, + padx=10, pady=10, + ) + return MfxDialog.initKw(self, kw) + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +def playeroptionsdialog_main(args): + from tkutil import wm_withdraw + opt = Struct(player="Test", update_player_stats=1) + app = Struct(opt=opt) + tk = Tkinter.Tk() + wm_withdraw(tk) + tk.update() + d = PlayerOptionsDialog(tk, "Player options", app) + print d.status, d.button, ":", d.player, d.update_stats + return 0 + +if __name__ == "__main__": + import sys + sys.exit(playeroptionsdialog_main(sys.argv)) + diff --git a/pysollib/tile/progressbar.py b/pysollib/tile/progressbar.py new file mode 100644 index 00000000..1dd57c15 --- /dev/null +++ b/pysollib/tile/progressbar.py @@ -0,0 +1,151 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PysolProgressBar'] + +# imports +import os, sys +import Tile as Tkinter + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkutil import makeToplevel, setTransient, wm_set_icon + + +# /*********************************************************************** +# // a simple progress bar +# ************************************************************************/ + +class PysolProgressBar: + def __init__(self, app, parent, title=None, images=None, color="blue", + width=300, height=25, show_text=1, norm=1): + self.parent = parent + self.percent = 0 + self.top = makeToplevel(parent, title=title) + self.top.wm_protocol("WM_DELETE_WINDOW", self.wmDeleteWindow) + self.top.wm_group(parent) + self.top.wm_geometry('400x120') + self.top.wm_minsize(400, 120) + self.top.wm_resizable(0, 0) + self.top.config(cursor="watch") + # + self.frame = Tkinter.Frame(self.top, relief=Tkinter.FLAT, bd=0, + takefocus=0) + self.progress = Tkinter.Progressbar(self.frame, maximum=100) + ##style = Tkinter.Style(self.progress) + ##style.configure('TProgressbar', background=color) + if images: + self.f1 = Tkinter.Label(self.frame, image=images[0]) + self.f1.pack(side='left', ipadx=8, ipady=4) + self.progress.pack(side='left', expand='yes', fill='x') + self.f2 = Tkinter.Label(self.frame, image=images[1]) + self.f2.pack(side='left', ipadx=8, ipady=4) + else: + self.progress.grid(expand='yes', fill='x') + self.frame.pack(expand='yes', fill='both') + if app: + try: + wm_set_icon(self.top, app.dataloader.findIcon()) + except: pass + if 1: + setTransient(self.top, None, relx=0.5, rely=0.5) + else: + self.update(percent=0) + self.norm = norm + self.steps_sum = 0 + + def wmDeleteWindow(self): + return EVENT_HANDLED + + def destroy(self): + if self.top is None: # already destroyed + return + self.top.wm_withdraw() + self.top.quit() + self.top.destroy() + self.top = None + + def reset(self, percent=0): + self.percent = percent + + def update(self, percent=None, step=1): + self.steps_sum += step + ##print self.steps_sum + step = step/self.norm + if self.top is None: # already destroyed + return + if percent is None: + self.percent = self.percent + step + elif percent > self.percent: + self.percent = percent + else: + return + self.percent = min(100, max(0, self.percent)) + self.progress.config(value=self.percent) + self.top.update_idletasks() + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +class TestProgressBar: + def __init__(self, parent): + self.parent = parent + self.progress = PysolProgressBar(None, parent, title="Progress", color="#008200") + self.progress.pack(ipadx=10, ipady=10) + self.progress.frame.after(1000, self.update) + + def update(self, event=None): + if self.progress.percent >= 100: + self.parent.after_idle(self.progress.destroy) + return + self.progress.update(step=1) + self.progress.frame.after(30, self.update) + +def progressbar_main(args): + from tkutil import wm_withdraw + tk = Tkinter.Tk() + wm_withdraw(tk) + pb = TestProgressBar(tk) + tk.mainloop() + return 0 + +if __name__ == "__main__": + import sys + sys.exit(progressbar_main(sys.argv)) + + diff --git a/pysollib/tile/selectcardset.py b/pysollib/tile/selectcardset.py new file mode 100644 index 00000000..6b66f287 --- /dev/null +++ b/pysollib/tile/selectcardset.py @@ -0,0 +1,407 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['SelectCardsetDialogWithPreview'] + +# imports +import os, re, sys, types +import Tile as Tkinter + +# PySol imports +from pysollib.mfxutil import destruct, Struct, KwStruct +from pysollib.util import CARDSET +from pysollib.resource import CSI + +# Toolkit imports +from tkutil import loadImage +from tkwidget import MfxDialog, MfxScrolledCanvas +from tkcanvas import MfxCanvasImage +from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode +from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas + + +# /*********************************************************************** +# // Nodes +# ************************************************************************/ + +class SelectCardsetLeaf(SelectDialogTreeLeaf): + pass + + +class SelectCardsetNode(SelectDialogTreeNode): + def _getContents(self): + contents = [] + for obj in self.tree.data.all_objects: + if self.select_func(obj): + node = SelectCardsetLeaf(self.tree, self, text=obj.name, key=obj.index) + contents.append(node) + return contents or self.tree.data.no_contents + + +# /*********************************************************************** +# // Tree database +# ************************************************************************/ + +class SelectCardsetData(SelectDialogTreeData): + def __init__(self, manager, key): + SelectDialogTreeData.__init__(self) + self.all_objects = manager.getAllSortedByName() + self.all_objects = filter(lambda obj: not obj.error, self.all_objects) + self.no_contents = [ SelectCardsetLeaf(None, None, _("(no cardsets)"), key=None), ] + # + select_by_type = None + items = CSI.TYPE.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + nodes = [] + for key, name in items: + if manager.registered_types.get(key): + nodes.append(SelectCardsetNode(None, name, lambda cs, key=key: key == cs.si.type)) + if nodes: + select_by_type = SelectCardsetNode(None, _("by Type"), tuple(nodes), expanded=1) + # + select_by_style = None + items = CSI.STYLE.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + nodes = [] + for key, name in items: + if manager.registered_styles.get(key): + nodes.append(SelectCardsetNode(None, name, lambda cs, key=key: key in cs.si.styles)) + if nodes: + nodes.append(SelectCardsetNode(None, _("Uncategorized"), lambda cs: not cs.si.styles)) + select_by_style = SelectCardsetNode(None, _("by Style"), tuple(nodes)) + # + select_by_nationality = None + items = CSI.NATIONALITY.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + nodes = [] + for key, name in items: + if manager.registered_nationalities.get(key): + nodes.append(SelectCardsetNode(None, name, lambda cs, key=key: key in cs.si.nationalities)) + if nodes: + nodes.append(SelectCardsetNode(None, _("Uncategorized"), lambda cs: not cs.si.nationalities)) + select_by_nationality = SelectCardsetNode(None, _("by Nationality"), tuple(nodes)) + # + select_by_date = None + items = CSI.DATE.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + nodes = [] + for key, name in items: + if manager.registered_dates.get(key): + nodes.append(SelectCardsetNode(None, name, lambda cs, key=key: key in cs.si.dates)) + if nodes: + nodes.append(SelectCardsetNode(None, _("Uncategorized"), lambda cs: not cs.si.dates)) + select_by_date = SelectCardsetNode(None, _("by Date"), tuple(nodes)) + # + self.rootnodes = filter(None, ( + SelectCardsetNode(None, _("All Cardsets"), lambda cs: 1, expanded=len(self.all_objects)<=12), + SelectCardsetNode(None, _("by Size"), ( + SelectCardsetNode(None, _("Tiny cardsets"), lambda cs: cs.si.size == CSI.SIZE_TINY), + SelectCardsetNode(None, _("Small cardsets"), lambda cs: cs.si.size == CSI.SIZE_SMALL), + SelectCardsetNode(None, _("Medium cardsets"), lambda cs: cs.si.size == CSI.SIZE_MEDIUM), + SelectCardsetNode(None, _("Large cardsets"), lambda cs: cs.si.size == CSI.SIZE_LARGE), + SelectCardsetNode(None, _("XLarge cardsets"), lambda cs: cs.si.size == CSI.SIZE_XLARGE), + ), expanded=1), + select_by_type, + select_by_style, + select_by_date, + select_by_nationality, + )) + + +class SelectCardsetByTypeData(SelectDialogTreeData): + def __init__(self, manager, key): + SelectDialogTreeData.__init__(self) + self.all_objects = manager.getAllSortedByName() + self.no_contents = [ SelectCardsetLeaf(None, None, _("(no cardsets)"), key=None), ] + # + items = CSI.TYPE.items() + items.sort(lambda a, b: cmp(a[1], b[1])) + nodes = [] + for key, name in items: + if manager.registered_types.get(key): + nodes.append(SelectCardsetNode(None, name, lambda cs, key=key: key == cs.si.type)) + select_by_type = SelectCardsetNode(None, _("by Type"), tuple(nodes), expanded=1) + # + self.rootnodes = filter(None, ( + select_by_type, + )) + + +# /*********************************************************************** +# // Canvas that shows the tree +# ************************************************************************/ + +class SelectCardsetTree(SelectDialogTreeCanvas): + data = None + + +class SelectCardsetByTypeTree(SelectDialogTreeCanvas): + data = None + + +# /*********************************************************************** +# // Dialog +# ************************************************************************/ + +class SelectCardsetDialogWithPreview(MfxDialog): + Tree_Class = SelectCardsetTree + TreeDataHolder_Class = SelectCardsetTree + TreeData_Class = SelectCardsetData + + def __init__(self, parent, title, app, manager, key=None, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + if key is None: + key = manager.getSelected() + self.manager = manager + self.key = key + #padx, pady = kw.padx, kw.pady + padx, pady = 5, 5 + if self.TreeDataHolder_Class.data is None: + self.TreeDataHolder_Class.data = self.TreeData_Class(manager, key) + # + self.top.wm_minsize(400, 200) + if self.top.winfo_screenwidth() >= 800: + w1, w2 = 216, 400 + else: + w1, w2 = 200, 300 + if Tkinter.TkVersion >= 8.4: + paned_window = Tkinter.PanedWindow(top_frame) + paned_window.pack(expand=1, fill='both') + left_frame = Tkinter.Frame(paned_window) + right_frame = Tkinter.Frame(paned_window) + paned_window.add(left_frame) + paned_window.add(right_frame) + else: + left_frame = Tkinter.Frame(top_frame) + right_frame = Tkinter.Frame(top_frame) + left_frame.pack(side='left', expand=0, fill='both') + right_frame.pack(side='right', expand=1, fill='both') + font = app.getFont("default") + self.tree = self.Tree_Class(self, left_frame, key=key, + default=kw.default, + font=font, width=w1) + self.tree.frame.pack(fill='both', expand=1, padx=padx, pady=pady) + self.preview = MfxScrolledCanvas(right_frame, width=w2) + self.preview.setTile(app, app.tabletile_index, force=True) + self.preview.pack(fill='both', expand=1, padx=padx, pady=pady) + self.preview.canvas.preview = 1 + # create a preview of the current state + self.preview_key = -1 + self.preview_images = [] + self.updatePreview(key) + # + focus = self.createButtons(bottom_frame, kw) + focus = self.tree.frame + self.mainloop(focus, kw.timeout) + + def destroy(self): + self.tree.updateNodesWithTree(self.tree.rootnodes, None) + self.tree.destroy() + self.preview.unbind_all() + self.preview_images = [] + MfxDialog.destroy(self) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), _("&Load"), _("&Cancel"),), + default=0, + resizable=1, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + def mDone(self, button): + if button in (0, 1): # Ok/Load + self.key = self.tree.selection_key + self.tree.n_expansions = 1 # save xyview in any case + if button in (3, 4): + cs = self.manager.get(self.tree.selection_key) + if not cs: + return + ##title = CARDSET+" "+cs.name + title = CARDSET.capitalize()+" "+cs.name + CardsetInfoDialog(self.top, title=title, cardset=cs, images=self.preview_images) + return + MfxDialog.mDone(self, button) + + def updatePreview(self, key): + if key == self.preview_key: + return + canvas = self.preview.canvas + canvas.deleteAllItems() + self.preview_images = [] + cs = self.manager.get(key) + if not cs: + self.preview_key = -1 + return + names, columns = cs.getPreviewCardNames() + try: + #???names, columns = cs.getPreviewCardNames() + for n in names: + f = os.path.join(cs.dir, n + cs.ext) + self.preview_images.append(loadImage(file=f)) + except: + self.preview_key = -1 + self.preview_images = [] + return + i, x, y, sx, sy, dx, dy = 0, 10, 10, 0, 0, cs.CARDW + 10, cs.CARDH + 10 + for image in self.preview_images: + MfxCanvasImage(canvas, x, y, anchor="nw", image=image) + sx, sy = max(x, sx), max(y, sy) + i = i + 1 + if i % columns == 0: + x, y = 10, y + dy + else: + x = x + dx + canvas.config(scrollregion=(0, 0, sx+dx, sy+dy)) + canvas.config(width=sx+dx, height=sy+dy) + #canvas.config(xscrollincrement=dx, yscrollincrement=dy) +## self.preview.showHbar() +## self.preview.showVbar() + self.preview_key = key + + +class SelectCardsetByTypeDialogWithPreview(SelectCardsetDialogWithPreview): + Tree_Class = SelectCardsetByTypeTree + TreeDataHolder_Class = SelectCardsetByTypeTree + TreeData_Class = SelectCardsetByTypeData + +# /*********************************************************************** +# // Cardset Info +# ************************************************************************/ + +class CardsetInfoDialog(MfxDialog): + def __init__(self, parent, title, cardset, images, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + frame = Tkinter.Frame(top_frame) + frame.pack(fill="both", expand=True, padx=5, pady=10) + # + # + if Tkinter.TkVersion >= 8.4: + info_frame = Tkinter.LabelFrame(frame, text=_('About cardset')) + else: + info_frame = Tkinter.Frame(frame) + info_frame.grid(row=0, column=0, columnspan=2, sticky='ew', + padx=0, pady=5, ipadx=5, ipady=5) + styles = nationalities = year = None + if cardset.si.styles: + styles = '\n'.join([CSI.STYLE[i] for i in cardset.si.styles]) + if cardset.si.nationalities: + nationalities = '\n'.join([CSI.NATIONALITY[i] + for i in cardset.si.nationalities]) + if cardset.year: + year = str(cardset.year) + row = 0 + for n, t in ( + ##('Version:', str(cardset.version)), + (_('Type:'), CSI.TYPE[cardset.type]), + (_('Styles:'), styles), + (_('Nationality:'), nationalities), + (_('Year:'), year), + ##(_('Number of cards:'), str(cardset.ncards)), + (_('Size:'), '%d x %d' % (cardset.CARDW, cardset.CARDH)), + ): + if not t is None: + l = Tkinter.Label(info_frame, text=n, + anchor='w', justify='left') + l.grid(row=row, column=0, sticky='nw') + l = Tkinter.Label(info_frame, text=t, + anchor='w', justify='left') + l.grid(row=row, column=1, sticky='nw') + row += 1 + if images: + try: + from random import choice + im = choice(images) + f = os.path.join(cardset.dir, cardset.backname) + self.back_image = loadImage(file=f) + canvas = Tkinter.Canvas(info_frame, + width=2*im.width()+30, + height=im.height()+2) + canvas.create_image(10, 1, image=im, anchor='nw') + canvas.create_image(im.width()+20, 1, + image=self.back_image, anchor='nw') + canvas.grid(row=0, column=2, rowspan=row+1, sticky='ne') + info_frame.columnconfigure(2, weight=1) + info_frame.rowconfigure(row, weight=1) + except: + pass + ##bg = top_frame["bg"] + bg = 'white' + text_w = Tkinter.Text(frame, bd=1, relief="sunken", wrap="word", + padx=4, width=64, height=16, bg=bg) + text_w.grid(row=1, column=0, sticky='nsew') + sb = Tkinter.Scrollbar(frame) + sb.grid(row=1, column=1, sticky='ns') + text_w.configure(yscrollcommand=sb.set) + sb.configure(command=text_w.yview) + frame.columnconfigure(0, weight=1) + frame.rowconfigure(1, weight=1) + # + text = '' + f = os.path.join(cardset.dir, "COPYRIGHT") + try: + text = open(f).read() + except: + pass + if text: + text_w.config(state="normal") + text_w.insert("insert", text) + text_w.config(state="disabled") + # + focus = self.createButtons(bottom_frame, kw) + #focus = text_w + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"),), + default=0, + resizable=1, + separatorwidth=2, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py new file mode 100644 index 00000000..aeda3ada --- /dev/null +++ b/pysollib/tile/selectgame.py @@ -0,0 +1,576 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import os, re, sys, types +import Tile as Tkinter +from UserList import UserList + +# PySol imports +from pysollib.mfxutil import destruct, Struct, KwStruct +from pysollib.mfxutil import format_time +from pysollib.gamedb import GI +from pysollib.help import help_html +from pysollib.resource import CSI + +# Toolkit imports +from tkutil import unbind_destroy +from tkwidget import MfxDialog, MfxScrolledCanvas +from tkcanvas import MfxCanvasText +from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode +from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas + +gettext = _ + +# /*********************************************************************** +# // Nodes +# ************************************************************************/ + +class SelectGameLeaf(SelectDialogTreeLeaf): + pass + + +class SelectGameNode(SelectDialogTreeNode): + def _getContents(self): + contents = [] + if isinstance(self.select_func, UserList): + # key/value pairs + for id, name in self.select_func: + if id and name: + name = gettext(name) # name of game + node = SelectGameLeaf(self.tree, self, name, key=id) + contents.append(node) + else: + for gi in self.tree.data.all_games_gi: + if gi and self.select_func is None: + # All games + ##name = '%s (%s)' % (gi.name, CSI.TYPE_NAME[gi.category]) + name = gi.name + name = gettext(name) # name of game + node = SelectGameLeaf(self.tree, self, name, key=gi.id) + contents.append(node) + elif gi and self.select_func(gi): + name = gi.name + name = gettext(name) # name of game + node = SelectGameLeaf(self.tree, self, name, key=gi.id) + contents.append(node) + return contents or self.tree.data.no_games + + +# /*********************************************************************** +# // Tree database +# ************************************************************************/ + +class SelectGameData(SelectDialogTreeData): + def __init__(self, app): + SelectDialogTreeData.__init__(self) + self.all_games_gi = map(app.gdb.get, app.gdb.getGamesIdSortedByName()) + self.no_games = [ SelectGameLeaf(None, None, _("(no games)"), None), ] + # + s_by_type = s_oriental = s_special = s_original = s_contrib = s_mahjongg = None + g = [] + for data in (GI.SELECT_GAME_BY_TYPE, + GI.SELECT_ORIENTAL_GAME_BY_TYPE, + GI.SELECT_SPECIAL_GAME_BY_TYPE, + GI.SELECT_ORIGINAL_GAME_BY_TYPE, + GI.SELECT_CONTRIB_GAME_BY_TYPE, + ): + gg = [] + for name, select_func in data: + if name is None or not filter(select_func, self.all_games_gi): + continue + name = gettext(name) + name = name.replace("&", "") + gg.append(SelectGameNode(None, name, select_func)) + g.append(gg) + select_mahjongg_game = lambda gi: gi.si.game_type == GI.GT_MAHJONGG + gg = None + if filter(select_mahjongg_game, self.all_games_gi): + gg = SelectGameNode(None, _("Mahjongg Games"), select_mahjongg_game) + g.append(gg) + if g[0]: + s_by_type = SelectGameNode(None, _("French games"), tuple(g[0]), expanded=1) + if g[1]: + s_oriental = SelectGameNode(None, _("Oriental Games"), tuple(g[1])) + if g[2]: + s_special = SelectGameNode(None, _("Special Games"), tuple(g[2])) + if g[3]: + s_original = SelectGameNode(None, _("Original Games"), tuple(g[3])) +## if g[4]: +## s_contrib = SelectGameNode(None, "Contributed Games", tuple(g[4])) + if g[5]: + s_mahjongg = g[5] + # + s_by_compatibility, gg = None, [] + for name, games in GI.GAMES_BY_COMPATIBILITY: + select_func = lambda gi, games=games: gi.id in games + if name is None or not filter(select_func, self.all_games_gi): + continue + name = gettext(name) + gg.append(SelectGameNode(None, name, select_func)) + if 1 and gg: + s_by_compatibility = SelectGameNode(None, _("by Compatibility"), tuple(gg)) + pass + # + s_by_pysol_version, gg = None, [] + for name, games in GI.GAMES_BY_PYSOL_VERSION: + select_func = lambda gi, games=games: gi.id in games + if name is None or not filter(select_func, self.all_games_gi): + continue + name = _("New games in v.") + name + gg.append(SelectGameNode(None, name, select_func)) + if 1 and gg: + s_by_pysol_version = SelectGameNode(None, _("by PySol version"), tuple(gg)) + pass + # + ul_alternate_names = UserList(list(app.gdb.getGamesTuplesSortedByAlternateName())) + # + self.rootnodes = filter(None, ( + #SelectGameNode(None, "All Games", lambda gi: 1, expanded=0), + SelectGameNode(None, _("All Games"), None, expanded=0), + SelectGameNode(None, _("Alternate Names"), ul_alternate_names), + SelectGameNode(None, _("Popular Games"), lambda gi: gi.si.game_flags & GI.GT_POPULAR, expanded=0), + s_mahjongg, + s_oriental, + s_special, + s_by_type, + SelectGameNode(None, _('by Skill Level'), ( + SelectGameNode(None, _('Luck only'), lambda gi: gi.skill_level == GI.SL_LUCK), + SelectGameNode(None, _('Mostly luck'), lambda gi: gi.skill_level == GI.SL_MOSTLY_LUCK), + SelectGameNode(None, _('Balanced'), lambda gi: gi.skill_level == GI.SL_BALANCED), + SelectGameNode(None, _('Mostly skill'), lambda gi: gi.skill_level == GI.SL_MOSTLY_SKILL), + SelectGameNode(None, _('Skill only'), lambda gi: gi.skill_level == GI.SL_SKILL), + )), + SelectGameNode(None, _("by Game Feature"), ( + SelectGameNode(None, _("by Number of Cards"), ( + SelectGameNode(None, _("32 cards"), lambda gi: gi.si.ncards == 32), + SelectGameNode(None, _("48 cards"), lambda gi: gi.si.ncards == 48), + SelectGameNode(None, _("52 cards"), lambda gi: gi.si.ncards == 52), + SelectGameNode(None, _("64 cards"), lambda gi: gi.si.ncards == 64), + SelectGameNode(None, _("78 cards"), lambda gi: gi.si.ncards == 78), + SelectGameNode(None, _("104 cards"), lambda gi: gi.si.ncards == 104), + SelectGameNode(None, _("144 cards"), lambda gi: gi.si.ncards == 144), + SelectGameNode(None, _("Other number"), lambda gi: gi.si.ncards not in (32, 48, 52, 64, 78, 104, 144)), + )), + SelectGameNode(None, _("by Number of Decks"), ( + SelectGameNode(None, _("1 deck games"), lambda gi: gi.si.decks == 1), + SelectGameNode(None, _("2 deck games"), lambda gi: gi.si.decks == 2), + SelectGameNode(None, _("3 deck games"), lambda gi: gi.si.decks == 3), + SelectGameNode(None, _("4 deck games"), lambda gi: gi.si.decks == 4), + )), + SelectGameNode(None, _("by Number of Redeals"), ( + SelectGameNode(None, _("No redeal"), lambda gi: gi.si.redeals == 0), + SelectGameNode(None, _("1 redeal"), lambda gi: gi.si.redeals == 1), + SelectGameNode(None, _("2 redeals"), lambda gi: gi.si.redeals == 2), + SelectGameNode(None, _("3 redeals"), lambda gi: gi.si.redeals == 3), + SelectGameNode(None, _("Unlimited redeals"), lambda gi: gi.si.redeals == -1), +## SelectGameNode(None, "Variable redeals", lambda gi: gi.si.redeals == -2), + SelectGameNode(None, _("Other number of redeals"), lambda gi: gi.si.redeals not in (-1, 0, 1, 2, 3)), + )), + s_by_compatibility, + )), + s_by_pysol_version, + SelectGameNode(None, _("Other Categories"), ( + SelectGameNode(None, _("Games for Children (very easy)"), lambda gi: gi.si.game_flags & GI.GT_CHILDREN), + SelectGameNode(None, _("Games with Scoring"), lambda gi: gi.si.game_flags & GI.GT_SCORE), + SelectGameNode(None, _("Games with Separate Decks"), lambda gi: gi.si.game_flags & GI.GT_SEPARATE_DECKS), + SelectGameNode(None, _("Open Games (all cards visible)"), lambda gi: gi.si.game_flags & GI.GT_OPEN), + SelectGameNode(None, _("Relaxed Variants"), lambda gi: gi.si.game_flags & GI.GT_RELAXED), + )), + s_original, + s_contrib, + )) + + +# /*********************************************************************** +# // Canvas that shows the tree +# ************************************************************************/ + +class SelectGameTreeWithPreview(SelectDialogTreeCanvas): + data = None + html_viewer = None + + +class SelectGameTree(SelectGameTreeWithPreview): + def singleClick(self, event=None): + self.doubleClick(event) + + +# /*********************************************************************** +# // Dialog +# ************************************************************************/ + +class SelectGameDialog(MfxDialog): + Tree_Class = SelectGameTree + TreeDataHolder_Class = SelectGameTreeWithPreview + TreeData_Class = SelectGameData + + def __init__(self, parent, title, app, gameid, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.app = app + self.gameid = gameid + self.random = None + if self.TreeDataHolder_Class.data is None: + self.TreeDataHolder_Class.data = self.TreeData_Class(app) + # + self.top.wm_minsize(200, 200) + font = app.getFont("default") + self.tree = self.Tree_Class(self, top_frame, key=gameid, + font=font, + default=kw.default) + self.tree.frame.pack(fill=Tkinter.BOTH, expand=1, + padx=kw.padx, pady=kw.pady) + # + focus = self.createButtons(bottom_frame, kw) + focus = self.tree.frame + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(None, None, _("&Cancel"),), default=0, + separatorwidth=2, + resizable=1, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + def destroy(self): + self.app = None + self.tree.updateNodesWithTree(self.tree.rootnodes, None) + self.tree.destroy() + MfxDialog.destroy(self) + + def mDone(self, button): + if button == 0: # Ok or double click + self.gameid = self.tree.selection_key + self.tree.n_expansions = 1 # save xyview in any case + if button == 1: # Rules + doc = self.app.getGameRulesFilename(self.tree.selection_key) + if not doc: + return + dir = os.path.join("html", "rules") + help_html(self.app, doc, dir, self.top) + return + MfxDialog.mDone(self, button) + + +# /*********************************************************************** +# // Dialog +# ************************************************************************/ + +class SelectGameDialogWithPreview(SelectGameDialog): + Tree_Class = SelectGameTreeWithPreview + + def __init__(self, parent, title, app, gameid, bookmark=None, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.app = app + self.gameid = gameid + self.bookmark = bookmark + self.random = None + if self.TreeDataHolder_Class.data is None: + self.TreeDataHolder_Class.data = self.TreeData_Class(app) + # + self.top.wm_minsize(400, 200) + sw = self.top.winfo_screenwidth() + if sw >= 1100: + w1, w2 = 250, 600 + elif sw >= 900: + w1, w2 = 250, 500 + elif sw >= 800: + w1, w2 = 220, 480 + else: + w1, w2 = 200, 300 + ##print sw, w1, w2 + w2 = max(200, min(w2, 10 + 12*(app.subsampled_images.CARDW+10))) + ##print sw, w1, w2 + ##padx, pady = kw.padx, kw.pady + padx, pady = kw.padx/2, kw.pady/2 + # PanedWindow + if Tkinter.TkVersion >= 8.4: + paned_window = Tkinter.PanedWindow(top_frame) + paned_window.pack(expand=1, fill='both') + left_frame = Tkinter.Frame(paned_window) + right_frame = Tkinter.Frame(paned_window) + paned_window.add(left_frame) + paned_window.add(right_frame) + else: + left_frame = Tkinter.Frame(top_frame) + right_frame = Tkinter.Frame(top_frame) + left_frame.pack(side='left', expand=1, fill='both') + right_frame.pack(side='right', expand=1, fill='both') + # Tree + font = app.getFont("default") + self.tree = self.Tree_Class(self, left_frame, key=gameid, + default=kw.default, font=font, width=w1) + self.tree.frame.pack(padx=padx, pady=pady, expand=1, fill='both') + # LabelFrame + if Tkinter.TkVersion >= 8.4: + info_frame = Tkinter.LabelFrame(right_frame, text=_('About game')) + stats_frame = Tkinter.LabelFrame(right_frame, text=_('Statistics')) + else: + info_frame = Tkinter.Frame(right_frame, bd=2, relief='groove') + stats_frame = Tkinter.Frame(right_frame, bd=2, relief='groove') + info_frame.grid(row=0, column=0, padx=padx, pady=pady, + ipadx=padx, ipady=pady, sticky='nws') + stats_frame.grid(row=0, column=1, padx=padx, pady=pady, + ipadx=padx, ipady=pady, sticky='nws') + # Info + self.info_labels = {} + i = 0 + for n, t, f, row in ( + ('name', _('Name:'), info_frame, 0), + ('altnames', _('Alternate names:'), info_frame, 1), + ('category', _('Category:'), info_frame, 2), + ('type', _('Type:'), info_frame, 3), + ('skill_level', _('Skill level:'), info_frame, 4), + ('decks', _('Decks:'), info_frame, 5), + ('redeals', _('Redeals:'), info_frame, 6), + # + ('played', _('Played:'), stats_frame, 0), + ('won', _('Won:'), stats_frame, 1), + ('lost', _('Lost:'), stats_frame, 2), + ('time', _('Playing time:'), stats_frame, 3), + ('moves', _('Moves:'), stats_frame, 4), + ('percent', _('% won:'), stats_frame, 5), + ): + title_label = Tkinter.Label(f, text=t, justify='left', anchor='w') + title_label.grid(row=row, column=0, sticky='nw') + text_label = Tkinter.Label(f, justify='left', anchor='w') + text_label.grid(row=row, column=1, sticky='nw') + self.info_labels[n] = (title_label, text_label) + ##info_frame.columnconfigure(1, weight=1) + info_frame.rowconfigure(6, weight=1) + stats_frame.rowconfigure(6, weight=1) + # Canvas + self.preview = MfxScrolledCanvas(right_frame, width=w2) + self.preview.setTile(app, app.tabletile_index, force=True) + self.preview.grid(row=1, column=0, columnspan=3, + padx=padx, pady=pady, sticky='nsew') + right_frame.columnconfigure(1, weight=1) + right_frame.rowconfigure(1, weight=1) + # + focus = self.createButtons(bottom_frame, kw) + # set the scale factor + self.preview.canvas.preview = 2 + # create a preview of the current game + self.preview_key = -1 + self.preview_game = None + self.preview_app = None + self.updatePreview(gameid, animations=0) + ##focus = self.tree.frame + SelectGameTreeWithPreview.html_viewer = None + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&Select"), _("&Rules"), _("&Cancel"),), + default=0, + ) + return SelectGameDialog.initKw(self, kw) + + def destroy(self): + self.deletePreview(destroy=1) + self.preview.unbind_all() + SelectGameDialog.destroy(self) + + def deletePreview(self, destroy=0): + self.preview_key = -1 + # clean up the canvas + if self.preview: + unbind_destroy(self.preview.canvas) + self.preview.canvas.deleteAllItems() + if destroy: + self.preview.canvas.delete("all") + # + #for l in self.info_labels.values(): + # l.config(text='') + # destruct the game + if self.preview_game: + self.preview_game.endGame() + self.preview_game.destruct() + destruct(self.preview_game) + self.preview_game = None + # destruct the app + if destroy: + if self.preview_app: + destruct(self.preview_app) + self.preview_app = None + + def updatePreview(self, gameid, animations=5): + if gameid == self.preview_key: + return + self.deletePreview() + canvas = self.preview.canvas + # + gi = self.app.gdb.get(gameid) + if not gi: + self.preview_key = -1 + return + # + if self.preview_app is None: + self.preview_app = Struct( + # variables + audio = self.app.audio, + canvas = canvas, + cardset = self.app.cardset.copy(), + comments = self.app.comments.new(), + debug = 0, + gamerandom = self.app.gamerandom, + gdb = self.app.gdb, + gimages = self.app.gimages, + images = self.app.subsampled_images, + menubar = None, + miscrandom = self.app.miscrandom, + opt = self.app.opt.copy(), + startup_opt = self.app.startup_opt, + stats = self.app.stats.new(), + top = None, + top_cursor = self.app.top_cursor, + toolbar = None, + # methods + constructGame = self.app.constructGame, + getFont = self.app.getFont, + ) + self.preview_app.opt.shadow = 0 + self.preview_app.opt.shade = 0 + # + self.preview_app.audio = None # turn off audio for intial dealing + if animations >= 0: + self.preview_app.opt.animations = animations + # + if self.preview_game: + self.preview_game.endGame() + self.preview_game.destruct() + ##self.top.wm_title("Select Game - " + self.app.getGameTitleName(gameid)) + title = self.app.getGameTitleName(gameid) + self.top.wm_title(_("Playable Preview - ") + title) + # + self.preview_game = gi.gameclass(gi) + self.preview_game.createPreview(self.preview_app) + tx, ty = 0, 0 + gw, gh = self.preview_game.width, self.preview_game.height + canvas.config(scrollregion=(-tx, -ty, -tx, -ty)) + canvas.xview_moveto(0) + canvas.yview_moveto(0) + # + random = None + if gameid == self.gameid: + random = self.app.game.random.copy() + if gameid == self.gameid and self.bookmark: + self.preview_game.restoreGameFromBookmark(self.bookmark) + else: + self.preview_game.newGame(random=random, autoplay=1) + canvas.config(scrollregion=(-tx, -ty, gw, gh)) + # + self.preview_app.audio = self.app.audio + if self.app.opt.animations: + self.preview_app.opt.animations = 5 + else: + self.preview_app.opt.animations = 0 + # save seed + self.random = self.preview_game.random.copy() + self.random.origin = self.random.ORIGIN_PREVIEW + self.preview_key = gameid + # + self.updateInfo(gameid) + # + rules_button = self.buttons[1] + if self.app.getGameRulesFilename(gameid): + rules_button.config(state="normal") + else: + rules_button.config(state="disabled") + + def updateInfo(self, gameid): + gi = self.app.gdb.get(gameid) + # info + name = gettext(gi.name) + altnames = '\n'.join([gettext(n) for n in gi.altnames]) + category = gettext(CSI.TYPE[gi.category]) + type = '' + if GI.TYPE_NAMES.has_key(gi.si.game_type): + type = gettext(GI.TYPE_NAMES[gi.si.game_type]) + sl = { + GI.SL_LUCK: _('Luck only'), + GI.SL_MOSTLY_LUCK: _('Mostly luck'), + GI.SL_BALANCED: _('Balanced'), + GI.SL_MOSTLY_SKILL: _('Mostly skill'), + GI.SL_SKILL: _('Skill only'), + } + skill_level = sl.get(gi.skill_level) + if gi.redeals == -2: redeals = _('variable') + elif gi.redeals == -1: redeals = _('unlimited') + else: redeals = str(gi.redeals) + # stats + won, lost, time, moves = self.app.stats.getFullStats(self.app.opt.player, gameid) + if won+lost > 0: percent = "%.1f" % (100.0*won/(won+lost)) + else: percent = "0.0" + time = format_time(time) + moves = str(round(moves, 1)) + for n, t in ( + ('name', name), + ('altnames', altnames), + ('category', category), + ('type', type), + ('skill_level', skill_level), + ('decks', gi.decks), + ('redeals', redeals), + ('played', won+lost), + ('won', won), + ('lost', lost), + ('time', time), + ('moves', moves), + ('percent', percent), + ): + title_label, text_label = self.info_labels[n] + if t == '': + title_label.grid_remove() + text_label.grid_remove() + else: + title_label.grid() + text_label.grid() + text_label.config(text=t) + #self.info_labels[n].config(text=t) + + diff --git a/pysollib/tile/selecttile.py b/pysollib/tile/selecttile.py new file mode 100644 index 00000000..5fc73517 --- /dev/null +++ b/pysollib/tile/selecttile.py @@ -0,0 +1,209 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + + +# imports +import os, string, sys, types +import Tile as Tkinter +import tkColorChooser + +# PySol imports +from pysollib.mfxutil import destruct, Struct, KwStruct +from pysollib.resource import CSI + +# Toolkit imports +from tkutil import loadImage +from tkwidget import MfxDialog, MfxScrolledCanvas +from selecttree import SelectDialogTreeLeaf, SelectDialogTreeNode +from selecttree import SelectDialogTreeData, SelectDialogTreeCanvas + + +# /*********************************************************************** +# // Nodes +# ************************************************************************/ + +class SelectTileLeaf(SelectDialogTreeLeaf): + pass + + +class SelectTileNode(SelectDialogTreeNode): + def _getContents(self): + contents = [] + for obj in self.tree.data.all_objects: + if self.select_func(obj): + node = SelectTileLeaf(self.tree, self, text=obj.name, key=obj.index) + contents.append(node) + return contents or self.tree.data.no_contents + + +# /*********************************************************************** +# // Tree database +# ************************************************************************/ + +class SelectTileData(SelectDialogTreeData): + def __init__(self, manager, key): + SelectDialogTreeData.__init__(self) + self.all_objects = manager.getAllSortedByName() + self.all_objects = filter(lambda obj: not obj.error, self.all_objects) + self.all_objects = filter(lambda tile: tile.index > 0 and tile.filename, self.all_objects) + self.no_contents = [ SelectTileLeaf(None, None, _("(no tiles)"), key=None), ] + e1 = type(key) is types.StringType or len(self.all_objects) <=17 + e2 = 1 + self.rootnodes = ( + SelectTileNode(None, _("Solid Colors"), ( + SelectTileLeaf(None, None, _("Blue"), key="#0082df"), + SelectTileLeaf(None, None, _("Green"), key="#008200"), + SelectTileLeaf(None, None, _("Navy"), key="#000086"), + SelectTileLeaf(None, None, _("Olive"), key="#868200"), + SelectTileLeaf(None, None, _("Orange"), key="#f79600"), + SelectTileLeaf(None, None, _("Teal"), key="#008286"), + ), expanded=e1), + SelectTileNode(None, _("All Backgrounds"), lambda tile: 1, expanded=e2), + ) + + +# /*********************************************************************** +# // Canvas that shows the tree +# ************************************************************************/ + +class SelectTileTree(SelectDialogTreeCanvas): + data = None + + +# /*********************************************************************** +# // Dialog +# ************************************************************************/ + +class SelectTileDialogWithPreview(MfxDialog): + Tree_Class = SelectTileTree + TreeDataHolder_Class = SelectTileTree + TreeData_Class = SelectTileData + + def __init__(self, parent, title, app, manager, key=None, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + if key is None: + key = manager.getSelected() + self.app = app + self.manager = manager + self.key = key + self.table_color = app.opt.colors['table'] + if self.TreeDataHolder_Class.data is None: + self.TreeDataHolder_Class.data = self.TreeData_Class(manager, key) + # + self.top.wm_minsize(400, 200) + if self.top.winfo_screenwidth() >= 800: + w1, w2 = 200, 400 + else: + w1, w2 = 200, 300 + font = app.getFont("default") + self.tree = self.Tree_Class(self, top_frame, key=key, + default=kw.default, + font=font, + width=w1) + self.tree.frame.pack(side="left", fill=Tkinter.BOTH, expand=0, padx=kw.padx, pady=kw.pady) + self.preview = MfxScrolledCanvas(top_frame, width=w2, hbar=0, vbar=0) + self.preview.pack(side="right", fill=Tkinter.BOTH, expand=1, + padx=kw.padx, pady=kw.pady) + self.preview.canvas.preview = 1 + # create a preview of the current state + self.preview_key = -1 + self.updatePreview(key) + # + focus = self.createButtons(bottom_frame, kw) + focus = self.tree.frame + self.mainloop(focus, kw.timeout) + + def destroy(self): + self.tree.updateNodesWithTree(self.tree.rootnodes, None) + self.tree.destroy() + self.preview.unbind_all() + MfxDialog.destroy(self) + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), _("&Solid color..."), _("&Cancel"),), + default=0, + resizable=1, + font=None, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + def mDone(self, button): + if button == 0: # "OK" or double click + if type(self.tree.selection_key) in types.StringTypes: + self.key = str(self.tree.selection_key) + else: + self.key = self.tree.selection_key + self.tree.n_expansions = 1 # save xyview in any case + if button == 1: # "Solid color..." + c = tkColorChooser.askcolor(master=self.top, + initialcolor=self.table_color, + title=_("Select table color")) + if c and c[1]: + color = str(c[1]) + self.key = color.lower() + self.table_color = self.key + self.tree.updateSelection(self.key) + self.updatePreview(self.key) + return + MfxDialog.mDone(self, button) + + def updatePreview(self, key): + ##print key + if key == self.preview_key: + return + canvas = self.preview.canvas + canvas.deleteAllItems() + if type(key) is str: + # solid color + canvas.config(bg=key) + canvas.setTile(None) + canvas.setTextColor(None) + self.preview_key = key + self.table_color = key + else: + # image + tile = self.manager.get(key) + if tile: + if self.preview.setTile(self.app, key): + return + self.preview_key = -1 + diff --git a/pysollib/tile/selecttree.py b/pysollib/tile/selecttree.py new file mode 100644 index 00000000..81a00028 --- /dev/null +++ b/pysollib/tile/selecttree.py @@ -0,0 +1,185 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['SelectDialogTreeData'] + +# imports +import os, re, sys, types +import Tile as Tkinter +import tkFont + +# PySol imports +from pysollib.mfxutil import destruct, Struct, KwStruct, kwdefault + +# Toolkit imports +from tkutil import makeImage +from tkcanvas import MfxCanvas +from tktree import MfxTreeLeaf, MfxTreeNode, MfxTreeInCanvas + + +# /*********************************************************************** +# // Nodes +# ************************************************************************/ + +class SelectDialogTreeLeaf(MfxTreeLeaf): + def drawSymbol(self, x, y, **kw): + if self.tree.nodes.get(self.symbol_id) is not self: + self.symbol_id = self.tree.canvas.create_image(x, y, + image=self.tree.data.img[2+(self.key is None)], anchor="nw") + self.tree.nodes[self.symbol_id] = self + + +class SelectDialogTreeNode(MfxTreeNode): + def __init__(self, tree, text, select_func, expanded=0, parent_node=None): + MfxTreeNode.__init__(self, tree, parent_node, text, key=None, expanded=expanded) + # callable or a tuple/list of MfxTreeNodes + self.select_func = select_func + + def drawSymbol(self, x, y, **kw): + if self.tree.nodes.get(self.symbol_id) is not self: + self.symbol_id = self.tree.canvas.create_image(x, y, + image=self.tree.data.img[self.expanded], anchor="nw") + self.tree.nodes[self.symbol_id] = self + + def getContents(self): + # cached values + if self.subnodes is not None: + return self.subnodes + ##print self.whoami() + if type(self.select_func) in (types.TupleType, types.ListType): + return self.select_func + return self._getContents() + + def _getContents(self): + # subclass + return [] + + +# /*********************************************************************** +# // Tree database +# ************************************************************************/ + +class SelectDialogTreeData: + img = [] # loaded in Application.loadImages3 + def __init__(self): + self.tree_xview = (0.0, 1.0) + self.tree_yview = (0.0, 1.0) + + +# /*********************************************************************** +# // Canvas that shows the tree (left side) +# ************************************************************************/ + +class SelectDialogTreeCanvas(MfxTreeInCanvas): + def __init__(self, dialog, parent, key, default, + font=None, width=-1, height=-1, hbar=2, vbar=3): + self.dialog = dialog + self.default = default + self.n_selections = 0 + self.n_expansions = 0 + # + disty = 16 + if width < 0: + width = 400 + if height < 0: + height = 20 * disty + if parent and parent.winfo_screenheight() >= 600: + height = 25 * disty + if parent and parent.winfo_screenheight() >= 800: + height = 30 * disty + self.lines = height / disty + MfxTreeInCanvas.__init__(self, parent, self.data.rootnodes, + width=width, height=height, + hbar=hbar, vbar=vbar) + self.style.distx = 20 + self.style.disty = disty + self.style.width = 16 # width of symbol + self.style.height = 14 # height of symbol + if font: + self.style.font = font + f = tkFont.Font(parent, font) + h = f.metrics()["linespace"] + self.style.disty = max(self.style.width, h) + + self.draw() + self.updateSelection(key) + if self.hbar: + ##print self.data.tree_yview + ##print self.canvas.xview() + self.canvas.xview_moveto(self.data.tree_xview[0]) + if self.vbar: + ##print self.data.tree_yview + ##print self.canvas.yview() + self.canvas.yview_moveto(self.data.tree_yview[0]) + + def destroy(self): + if self.n_expansions > 0: # must save updated xyview + self.data.tree_xview = self.canvas.xview() + self.data.tree_yview = self.canvas.yview() + MfxTreeInCanvas.destroy(self) + + def getContents(self, node): + return node.getContents() + + def singleClick(self, event=None): + node = self.findNode() + if isinstance(node, MfxTreeLeaf): + if not node.selected and node.key is not None: + oldcur = self.canvas["cursor"] + self.canvas["cursor"] = "watch" + self.canvas.update_idletasks() + self.n_selections = self.n_selections + 1 + self.updateSelection(node.key) + self.dialog.updatePreview(self.selection_key) + self.canvas["cursor"] = oldcur + elif isinstance(node, MfxTreeNode): + self.n_expansions = self.n_expansions + 1 + node.expanded = not node.expanded + self.redraw() + return "break" + + def doubleClick(self, event=None): + node = self.findNode() + if isinstance(node, MfxTreeLeaf): + if node.key is not None: + self.n_selections = self.n_selections + 1 + self.updateSelection(node.key) + self.dialog.mDone(self.default) + elif isinstance(node, MfxTreeNode): + self.n_expansions = self.n_expansions + 1 + node.expanded = not node.expanded + self.redraw() + return "break" + diff --git a/pysollib/tile/soundoptionsdialog.py b/pysollib/tile/soundoptionsdialog.py new file mode 100644 index 00000000..5cd2557f --- /dev/null +++ b/pysollib/tile/soundoptionsdialog.py @@ -0,0 +1,212 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['SoundOptionsDialog'] + +# imports +import os, sys, string +import Tile as Tkinter +import traceback + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct, spawnvp +from pysollib.settings import PACKAGE +from pysollib.pysolaudio import pysolsoundserver + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import MfxDialog, MfxMessageDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class SoundOptionsDialog(MfxDialog): + + def __init__(self, parent, title, app, **kw): + self.app = app + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + self.createBitmaps(top_frame, kw) + # + self.saved_opt = app.opt.copy() + self.sound = Tkinter.BooleanVar() + self.sound.set(app.opt.sound != 0) + self.sound_mode = Tkinter.BooleanVar() + self.sound_mode.set(app.opt.sound_mode != 0) + self.sample_volume = Tkinter.IntVar() + self.sample_volume.set(app.opt.sound_sample_volume) + self.music_volume = Tkinter.IntVar() + self.music_volume.set(app.opt.sound_music_volume) + self.samples = [ + ('areyousure', _('Are You Sure'), Tkinter.BooleanVar()), + + ('deal', _('Deal'), Tkinter.BooleanVar()), + ('dealwaste', _('Deal waste'), Tkinter.BooleanVar()), + + ('turnwaste', _('Turn waste'), Tkinter.BooleanVar()), + ('startdrag', _('Start drag'), Tkinter.BooleanVar()), + + ('drop', _('Drop'), Tkinter.BooleanVar()), + ('droppair', _('Drop pair'), Tkinter.BooleanVar()), + ('autodrop', _('Auto drop'), Tkinter.BooleanVar()), + + ('flip', _('Flip'), Tkinter.BooleanVar()), + ('autoflip', _('Auto flip'), Tkinter.BooleanVar()), + ('move', _('Move'), Tkinter.BooleanVar()), + ('nomove', _('No move'), Tkinter.BooleanVar()), + + ('undo', _('Undo'), Tkinter.BooleanVar()), + ('redo', _('Redo'), Tkinter.BooleanVar()), + + ('autopilotlost', _('Autopilot lost'), Tkinter.BooleanVar()), + ('autopilotwon', _('Autopilot won'), Tkinter.BooleanVar()), + + ('gamefinished', _('Game finished'), Tkinter.BooleanVar()), + ('gamelost', _('Game lost'), Tkinter.BooleanVar()), + ('gamewon', _('Game won'), Tkinter.BooleanVar()), + ('gameperfect', _('Perfect game'), Tkinter.BooleanVar()), + ] + + # + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=5) + frame.columnconfigure(1, weight=1) + # + row = 0 + w = Tkinter.Checkbutton(frame, variable=self.sound, + text=_("Sound enabled"), anchor='w') + w.grid(row=row, column=0, columnspan=2, sticky='ew') + # + if os.name == "nt" and pysolsoundserver: + row += 1 + w = Tkinter.Checkbutton(frame, variable=self.sound_mode, + text=_("Use DirectX for sound playing"), + command=self.mOptSoundDirectX, anchor='w') + w.grid(row=row, column=0, columnspan=2, sticky='ew') + # + if app.audio.CAN_PLAY_MUSIC: # and app.startup_opt.sound_mode > 0: + row += 1 + w = Tkinter.Label(frame, text=_('Sample volume:')) + w.grid(row=row, column=0, sticky='w') + w = Tkinter.Scale(frame, from_=0, to=128, resolution=1, + orient='horizontal', takefocus=0, + length="3i", #label=_('Sample volume'), + variable=self.sample_volume) + w.grid(row=row, column=1, sticky='w', padx=5) + row += 1 + w = Tkinter.Label(frame, text=_('Music volume:')) + w.grid(row=row, column=0, sticky='w', padx=5) + w = Tkinter.Scale(frame, from_=0, to=128, resolution=1, + orient='horizontal', takefocus=0, + length="3i", #label=_('Music volume'), + variable=self.music_volume) + w.grid(row=row, column=1, sticky='w', padx=5) + + else: + # remove "Apply" button + kw.strings[1] = None + # + if Tkinter.TkVersion >= 8.4: + frame = Tkinter.LabelFrame(top_frame, text=_('Enable samles'), + padx=5, pady=5) + else: + frame = Tkinter.Frame(top_frame, bd=2, relief='groove') + frame.pack(expand=1, fill='both', padx=5, pady=5) + frame.columnconfigure(0, weight=1) + frame.columnconfigure(1, weight=1) + # + row = 0 + col = 0 + for n, t, v in self.samples: + v.set(app.opt.sound_samples[n]) + w = Tkinter.Checkbutton(frame, text=t, anchor='w', variable=v) + w.grid(row=row, column=col, sticky='ew') + if col == 1: + col = 0 + row += 1 + else: + col = 1 + # + top_frame.columnconfigure(1, weight=1) + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + + def initKw(self, kw): + strings=[_("&OK"), _("&Apply"), _("&Cancel"),] + kw = KwStruct(kw, + strings=strings, + default=0, + resizable=1, + padx=10, pady=10, + buttonpadx=10, buttonpady=5, + ) + return MfxDialog.initKw(self, kw) + + def mDone(self, button): + if button == 0 or button == 1: + self.app.opt.sound = self.sound.get() + self.app.opt.sound_mode = self.sound_mode.get() + self.app.opt.sound_sample_volume = self.sample_volume.get() + self.app.opt.sound_music_volume = self.music_volume.get() + for n, t, v in self.samples: + self.app.opt.sound_samples[n] = v.get() + elif button == 2: + self.app.opt = self.saved_opt + if self.app.audio: + self.app.audio.updateSettings() + if button == 1: + self.app.audio.playSample("drop", priority=1000) + if button == 1: + return EVENT_HANDLED + return MfxDialog.mDone(self, button) + + def mCancel(self, *event): + return self.mDone(2) + + def wmDeleteWindow(self, *event): + return self.mDone(0) + + def mOptSoundDirectX(self, *event): + ##print self.sound_mode.get() + d = MfxMessageDialog(self.top, title=_("Sound preferences info"), + text=_("""\ +Changing DirectX settings will take effect +the next time you restart """)+PACKAGE, + bitmap="warning", + default=0, strings=(_("&OK"),)) + diff --git a/pysollib/tile/statusbar.py b/pysollib/tile/statusbar.py new file mode 100644 index 00000000..dffb1b9f --- /dev/null +++ b/pysollib/tile/statusbar.py @@ -0,0 +1,206 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['PysolStatusbar', + 'HelpStatusbar'] + +# imports +import os, sys +import Tile as Tkinter + +if __name__ == '__main__': + d = os.path.abspath(os.path.join(sys.path[0], os.pardir, os.pardir)) + sys.path.append(d) + import gettext + gettext.install('pysol', d, unicode=True) + +# PySol imports + +# Toolkit imports +from tkwidget import MfxTooltip + +# /*********************************************************************** +# // +# ************************************************************************/ + +class MfxStatusbar: + def __init__(self, top, row, column, columnspan): + self.top = top + self._show = True + self._widgets = [] + self._tooltips = [] + # + self._row = row + self._column = column + self._columnspan = columnspan + # + self.padx = 1 + self.label_relief = 'sunken' + self.frame = Tkinter.Frame(self.top, bd=1) + self.frame.grid(row=self._row, column=self._column, + columnspan=self._columnspan, sticky='ew', + padx=1, pady=1) + #if os.name == "mac": + # Tkinter.Label(self.frame, width=2).pack(side='right') + if os.name == 'nt': + self.frame.config(relief='raised') + self.padx = 0 + if 0: + self.frame.config(bd=0) + self.label_relief = 'flat' + self.padx = 0 + + # util + def _createLabel(self, name, side='left', + fill='none', expand=0, width=0, + tooltip=None): + if 0: + frame = Tkinter.Frame(self.frame, bd=1, relief=self.label_relief, + highlightbackground='#9e9a9e', + highlightthickness=1) + frame.pack(side=side, fill=fill, padx=self.padx, expand=expand) + label = Tkinter.Label(frame, width=width, bd=0) + label.pack(expand=True, fill='both') + else: + label = Tkinter.Label(self.frame, width=width, + relief=self.label_relief, bd=1, + highlightbackground='black' + ) + label.pack(side=side, fill=fill, padx=self.padx, expand=expand) + setattr(self, name + "_label", label) + self._widgets.append(label) + if tooltip: + b = MfxTooltip(label) + self._tooltips.append(b) + b.setText(tooltip) + return label + + + # + # public methods + # + + def updateText(self, **kw): + for k, v in kw.items(): + label = getattr(self, k + "_label") + #label["text"] = str(v) + label["text"] = unicode(v) + + def configLabel(self, name, **kw): + if kw.has_key('fg'): + del kw['fg'] + label = getattr(self, name + "_label") + apply(label.config, (), kw) + + def show(self, show=True, resize=False): + if self._show == show: + return False + if resize: + self.top.wm_geometry("") # cancel user-specified geometry + if not show: + # hide + self.frame.grid_forget() + else: + # show + self.frame.grid(row=self._row, column=self._column, + columnspan=self._columnspan, sticky='ew') + self._show = show + return True + + def hide(self, resize=False): + self.show(False, resize) + + def destroy(self): + for w in self._tooltips: + if w: w.destroy() + self._tooltips = [] + for w in self._widgets: + if w: w.destroy() + self._widgets = [] + + +class PysolStatusbar(MfxStatusbar): + def __init__(self, top): + MfxStatusbar.__init__(self, top, row=3, column=0, columnspan=3) + # + for n, t, w in ( + ("time", _("Playing time"), 10), + ("moves", _('Moves/Total moves'), 10), + ("gamenumber", _("Game number"), 26), + ("stats", _("Games played: won/lost"), 12), + ): + self._createLabel(n, tooltip=t, width=w) + # + l = self._createLabel("info", fill='both', expand=1) + ##l.config(text="", justify="left", anchor='w') + #~l.config(padx=8) + + +class HelpStatusbar(MfxStatusbar): + def __init__(self, top): + MfxStatusbar.__init__(self, top, row=4, column=0, columnspan=3) + l = self._createLabel("info", fill='both', expand=1) + l.config(justify="left", anchor='w') #~, padx=8) + + +class HtmlStatusbar(MfxStatusbar): + def __init__(self, top, row, column, columnspan): + MfxStatusbar.__init__(self, top, row=row, column=column, columnspan=columnspan) + l = self._createLabel("url", fill='both', expand=1) + l.config(justify="left", anchor='w') #~, padx=8) + + +# /*********************************************************************** +# // +# ************************************************************************/ + + +class TestStatusbar(PysolStatusbar): + def __init__(self, top, args): + PysolStatusbar.__init__(self, top) + # test some settings + self.updateText(moves=999, gamenumber="#0123456789ABCDEF0123") + self.updateText(info="Some info text.") + +def statusbar_main(args): + tk = Tkinter.Tk() + statusbar = TestStatusbar(tk, args) + tk.mainloop() + return 0 + +if __name__ == "__main__": + sys.exit(statusbar_main(sys.argv)) + + diff --git a/pysollib/tile/timeoutsdialog.py b/pysollib/tile/timeoutsdialog.py new file mode 100644 index 00000000..89399b42 --- /dev/null +++ b/pysollib/tile/timeoutsdialog.py @@ -0,0 +1,99 @@ +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +##---------------------------------------------------------------------------## + +__all__ = ['TimeoutsDialog'] + +# imports +import os, sys +import Tile as Tkinter + +# PySol imports +from pysollib.mfxutil import destruct, kwdefault, KwStruct, Struct + +# Toolkit imports +from tkconst import EVENT_HANDLED, EVENT_PROPAGATE +from tkwidget import MfxDialog + +# /*********************************************************************** +# // +# ************************************************************************/ + +class TimeoutsDialog(MfxDialog): + def __init__(self, parent, title, app, **kw): + kw = self.initKw(kw) + MfxDialog.__init__(self, parent, title, kw.resizable, kw.default) + top_frame, bottom_frame = self.createFrames(kw) + #self.createBitmaps(top_frame, kw) + + frame = Tkinter.Frame(top_frame) + frame.pack(expand=True, fill='both', padx=5, pady=10) + frame.columnconfigure(0, weight=1) + + self.demo_sleep_var = Tkinter.DoubleVar() + self.demo_sleep_var.set(app.opt.timeouts['demo']) + self.hint_sleep_var = Tkinter.DoubleVar() + self.hint_sleep_var.set(app.opt.timeouts['hint']) + self.raise_card_sleep_var = Tkinter.DoubleVar() + self.raise_card_sleep_var.set(app.opt.timeouts['raise_card']) + self.highlight_piles_sleep_var = Tkinter.DoubleVar() + self.highlight_piles_sleep_var.set(app.opt.timeouts['highlight_piles']) + self.highlight_cards_sleep_var = Tkinter.DoubleVar() + self.highlight_cards_sleep_var.set(app.opt.timeouts['highlight_cards']) + self.highlight_samerank_sleep_var = Tkinter.DoubleVar() + self.highlight_samerank_sleep_var.set(app.opt.timeouts['highlight_samerank']) + # + #Tkinter.Label(frame, text='Set delays in seconds').grid(row=0, column=0, columnspan=2) + row = 0 + for title, var in ((_('Demo:'), self.demo_sleep_var), + (_('Hint:'), self.hint_sleep_var), + (_('Raise card:'), self.raise_card_sleep_var), + (_('Highlight piles:'), self.highlight_piles_sleep_var), + (_('Highlight cards:'), self.highlight_cards_sleep_var), + (_('Highlight same rank:'), self.highlight_samerank_sleep_var), + ): + Tkinter.Label(frame, text=title, anchor='w' + ).grid(row=row, column=0, sticky='we') + widget = Tkinter.Scale(frame, from_=0.2, to=9.9, + resolution=0.1, orient='horizontal', + length="3i", variable=var, takefocus=0) + widget.grid(row=row, column=1) + row += 1 + # + focus = self.createButtons(bottom_frame, kw) + self.mainloop(focus, kw.timeout) + # + self.demo_timeout = self.demo_sleep_var.get() + self.hint_timeout = self.hint_sleep_var.get() + self.raise_card_timeout = self.raise_card_sleep_var.get() + self.highlight_piles_timeout = self.highlight_piles_sleep_var.get() + self.highlight_cards_timeout = self.highlight_cards_sleep_var.get() + self.highlight_samerank_timeout = self.highlight_samerank_sleep_var.get() + + def initKw(self, kw): + kw = KwStruct(kw, + strings=(_("&OK"), _("&Cancel")), default=0, + padx=10, pady=10, + ) + return MfxDialog.initKw(self, kw) + + + + diff --git a/pysollib/tile/tkcanvas.py b/pysollib/tile/tkcanvas.py new file mode 100644 index 00000000..f2eb5e28 --- /dev/null +++ b/pysollib/tile/tkcanvas.py @@ -0,0 +1,394 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['MfxCanvasGroup', + 'MfxCanvasImage', + 'MfxCanvasText', + 'MfxCanvasLine', + 'MfxCanvasRectangle', + 'MfxCanvas'] + +# imports +import os, sys, types +import Tile as Tkinter +import Canvas +try: + # PIL (Python Image Library) + import Image +except ImportError: + Image = None +else: + import ImageTk + # for py2exe + import GifImagePlugin, PngImagePlugin, JpegImagePlugin, BmpImagePlugin, PpmImagePlugin + Image._initialized=2 + +# Toolkit imports +from tkutil import bind, unbind_destroy, loadImage + + +# /*********************************************************************** +# // canvas items +# ************************************************************************/ + +class MfxCanvasGroup(Canvas.Group): + def __init__(self, canvas, tag=None): + Canvas.Group.__init__(self, canvas=canvas, tag=tag) + # register ourself so that we can unbind from the canvas + assert not self.canvas.items.has_key(self.id) + self.canvas.items[self.id] = self + def addtag(self, tag, option="withtag"): + self.canvas.addtag(tag, option, self.id) + def delete(self): + del self.canvas.items[self.id] + Canvas.Group.delete(self) + def gettags(self): + return self.canvas.tk.splitlist(self._do("gettags")) + +class MfxCanvasImage(Canvas.ImageItem): + def __init__(self, canvas, *args, **kwargs): + group = None + if kwargs.has_key('group'): + group = kwargs['group'] + del kwargs['group'] + if kwargs.has_key('image'): + self._image = kwargs['image'] + Canvas.ImageItem.__init__(self, canvas, *args, **kwargs) + if group: + self.addtag(group) + def moveTo(self, x, y): + c = self.coords() + self.move(x - int(c[0]), y - int(c[1])) + def show(self): + self.config(state='normal') + def hide(self): + self.config(state='hidden') + +MfxCanvasLine = Canvas.Line + +class MfxCanvasRectangle(Canvas.Rectangle): + def __init__(self, canvas, *args, **kwargs): + group = None + if kwargs.has_key('group'): + group = kwargs['group'] + del kwargs['group'] + Canvas.Rectangle.__init__(self, canvas, *args, **kwargs) + if group: + self.addtag(group) + +class MfxCanvasText(Canvas.CanvasText): + def __init__(self, canvas, x, y, preview=-1, **kwargs): + if preview < 0: + preview = canvas.preview + if preview > 1: + return + if not kwargs.has_key("fill"): + kwargs["fill"] = canvas._text_color + group = None + if kwargs.has_key('group'): + group = kwargs['group'] + del kwargs['group'] + Canvas.CanvasText.__init__(self, canvas, x, y, **kwargs) + self.text_format = None + canvas._text_items.append(self) + if group: + self.addtag(group) + + +# /*********************************************************************** +# // canvas +# ************************************************************************/ + +class MfxCanvas(Tkinter.Canvas): + def __init__(self, *args, **kw): + apply(Tkinter.Canvas.__init__, (self,) + args, kw) + self.preview = 0 + # this is also used by lib-tk/Canvas.py + self.items = {} + # private + self.__tileimage = None + self.__tiles = [] # id of canvas items + self.__topimage = None + self.__tops = [] # id of canvas items + # friend MfxCanvasText + self._text_color = "#000000" + self._stretch_bg_image = 0 + self._text_items = [] + # + self.xmargin, self.ymargin = 10, 10 + # resize bg image + self.bind('', lambda e: self.set_bg_image()) + + def set_bg_image(self): + ##print 'set_bg_image', self._bg_img + if not hasattr(self, '_bg_img'): + return + if not self._bg_img: # solid color + return + stretch = self._stretch_bg_image + if Image: + if stretch: + w = max(self.winfo_width(), int(self.cget('width'))) + h = max(self.winfo_height(), int(self.cget('height'))) + im = self._bg_img.resize((w, h)) + image = ImageTk.PhotoImage(im) + else: + image = ImageTk.PhotoImage(self._bg_img) + else: # not Image + stretch = 0 + image = self._bg_img + for id in self.__tiles: + self.delete(id) + self.__tiles = [] + # must keep a reference to the image, otherwise Python will + # garbage collect it... + self.__tileimage = image + if stretch: + # + if self.preview: + dx, dy = 0, 0 + else: + dx, dy = -self.xmargin, -self.ymargin + id = self._x_create("image", dx, dy, image=image, anchor="nw") + self.tag_lower(id) # also see tag_lower above + self.__tiles.append(id) + else: + iw, ih = image.width(), image.height() + #sw = max(self.winfo_screenwidth(), 1024) + #sh = max(self.winfo_screenheight(), 768) + sw = max(self.winfo_width(), int(self.cget('width'))) + sh = max(self.winfo_height(), int(self.cget('height'))) + for x in range(-self.xmargin, sw, iw): + for y in range(-self.ymargin, sh, ih): + id = self._x_create("image", x, y, image=image, anchor="nw") + self.tag_lower(id) # also see tag_lower above + self.__tiles.append(id) + return 1 + + + # + # top-image support + # + + def _x_create(self, itemType, *args, **kw): + return Tkinter.Canvas._create(self, itemType, args, kw) + + def _create(self, itemType, args, kw): + ##print "_create:", itemType, args, kw + id = Tkinter.Canvas._create(self, itemType, args, kw) + if self.__tops: + self.tk.call(self._w, "lower", id, self.__tops[0]) + return id + + def tag_raise(self, id, aboveThis=None): + ##print "tag_raise:", id, aboveThis + if aboveThis is None and self.__tops: + self.tk.call(self._w, "lower", id, self.__tops[0]) + else: + self.tk.call(self._w, "raise", id, aboveThis) + + def tag_lower(self, id, belowThis=None): + ##print "tag_lower:", id, belowThis + if belowThis is None and self.__tiles: + self.tk.call(self._w, "raise", id, self.__tiles[-1]) + else: + self.tk.call(self._w, "lower", id, belowThis) + + + # + # + # + + def setInitialSize(self, width, height): + ##print 'setInitialSize:', width, height + if self.preview: + self.config(width=width, height=height) + self.config(scrollregion=(0, 0, width, height)) + else: + # add margins + ##dx, dy = 40, 40 + dx, dy = self.xmargin, self.ymargin + self.config(width=dx+width+dx, height=dy+height+dy) + self.config(scrollregion=(-dx, -dy, width+dx, height+dy)) + + + # + # + # + + # delete all CanvasItems, but keep the background and top tiles + def deleteAllItems(self): + self._text_items = [] + for id in self.items.keys(): + assert not id in self.__tiles # because the tile is created by id + unbind_destroy(self.items[id]) + self.items[id].delete() + assert self.items == {} + + def findCard(self, stack, event): + if isinstance(stack.cards[0].item, Canvas.Group): + current = self.gettags("current") # get tags + for i in range(len(stack.cards)): + if stack.cards[i].item.tag in current: + return i + else: +## current = self.find("withtag", "current") # get item ids +## for i in range(len(stack.cards)): +## if stack.cards[i].item.id in current: +## return i + x = event.x-self.xmargin+self.xview()[0]*int(self.cget('width')) + y = event.y-self.ymargin+self.yview()[0]*int(self.cget('height')) + ##x, y = event.x, event.y + items = list(self.find_overlapping(x,y,x,y)) + items.reverse() + for item in items: + for i in range(len(stack.cards)): + if stack.cards[i].item.id == item: + return i + return -1 + + def setTextColor(self, color): + if color is None: + c = self.cget("bg") + if type(c) is not types.StringType or c[0] != "#" or len(c) != 7: + return + v = [] + for i in (1, 3, 5): + v.append(int(c[i:i+2], 16)) + luminance = (0.212671 * v[0] + 0.715160 * v[1] + 0.072169 * v[2]) / 255 + ##print c, ":", v, "luminance", luminance + color = ("#000000", "#ffffff") [luminance < 0.3] + if self._text_color != color: + self._text_color = color + for item in self._text_items: + item.config(fill=self._text_color) + + def setTile(self, image, stretch=0): + ##print 'setTile:', image, stretch + if image: + if Image: + try: + self._bg_img = Image.open(image) + except: + return 0 + else: + try: + self._bg_img = loadImage(file=image, dither=1) + except: + return 0 + self._stretch_bg_image = stretch + self.set_bg_image() + else: + for id in self.__tiles: + self.delete(id) + self.__tiles = [] + self._bg_img = None + return 1 + + def setTopImage(self, image, cw=0, ch=0): + try: + if image and type(image) is types.StringType: + image = loadImage(file=image) + except Tkinter.TclError: + return 0 + if len(self.__tops) == 1 and image is self.__tops[0]: + return 1 + for id in self.__tops: + self.delete(id) + self.__tops = [] + # must keep a reference to the image, otherwise Python will + # garbage collect it... + self.__topimage = image + if image is None: + return 1 + iw, ih = image.width(), image.height() + if cw <= 0: + ##cw = max(int(self.cget("width")), self.winfo_width()) + cw = self.winfo_width() + if ch <= 0: + ##ch = max(int(self.cget("height")), self.winfo_height()) + ch = self.winfo_height() + ###print iw, ih, cw, ch + x = (cw-iw)/2-self.xmargin+self.xview()[0]*int(self.cget('width')) + y = (ch-ih)/2-self.ymargin+self.yview()[0]*int(self.cget('height')) + id = self._x_create("image", x, y, image=image, anchor="nw") + self.tk.call(self._w, "raise", id) + self.__tops.append(id) + return 1 + + # + # Pause support + # + + def hideAllItems(self): + for item in self.items.values(): + item.config(state='hidden') + + def showAllItems(self): + for item in self.items.values(): + item.config(state='normal') + + + # + # restricted but fast _bind and _substitute + # + + def _bind(self, what, sequence, func, add, needcleanup=1): + funcid = self._register(func, self._substitute, needcleanup) + cmd = ('%sif {"[%s %s]" == "break"} break\n' % + (add and '+' or '', funcid, "%x %y")) + self.tk.call(what + (sequence, cmd)) + return funcid + + def _substitute(self, *args): + e = Tkinter.Event() + e.x = int(args[0]) + e.y = int(args[1]) + return (e,) + + + # + # debug + # + + def update(self): + ##import mfxutil; print mfxutil.callername() + # ?????? + Tkinter.Canvas.update(self) + + def update_idletasks(self): + ##import mfxutil; print mfxutil.callername() + Tkinter.Canvas.update_idletasks(self) + diff --git a/pysollib/tile/tkconst.py b/pysollib/tile/tkconst.py new file mode 100644 index 00000000..ec3e405d --- /dev/null +++ b/pysollib/tile/tkconst.py @@ -0,0 +1,123 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['tkversion', + 'TK_DASH_PATCH', + 'EVENT_HANDLED', + 'EVENT_PROPAGATE', + 'CURSOR_DRAG', + 'CURSOR_WATCH', + 'CURSOR_DOWN_ARROW', + 'ANCHOR_CENTER', + 'ANCHOR_N', + 'ANCHOR_NW', + 'ANCHOR_NE', + 'ANCHOR_S', + 'ANCHOR_SW', + 'ANCHOR_SE', + 'ANCHOR_W', + 'ANCHOR_E', + 'TOOLBAR_BUTTONS', + ] + +# imports +import sys, os +import Tile as Tkinter + +# Toolkit imports + +n_ = lambda x: x + +# /*********************************************************************** +# // constants +# ************************************************************************/ + +# (major version, minor version, micro version, patchlevel) +tkversion = (8, 0, 0, 0) +try: + m = str(Tkinter._tkinter.TK_VERSION).split(".") + if m: + m = map(int, m) + 4*[0] + tkversion = tuple(m[:4]) + del m +except: + pass + +# experimental +TK_DASH_PATCH = 0 + + +EVENT_HANDLED = "break" +EVENT_PROPAGATE = None + +CURSOR_DRAG = "hand1" +CURSOR_WATCH = "watch" +CURSOR_DOWN_ARROW = 'sb_down_arrow' + +ANCHOR_CENTER = Tkinter.CENTER +ANCHOR_N = Tkinter.N +ANCHOR_NW = Tkinter.NW +ANCHOR_NE = Tkinter.NE +ANCHOR_S = Tkinter.S +ANCHOR_SW = Tkinter.SW +ANCHOR_SE = Tkinter.SE +ANCHOR_W = Tkinter.W +ANCHOR_E = Tkinter.E + +COMPOUNDS = ( + ##(Tkinter.BOTTOM, 'bottom'), + ##(Tkinter.CENTER, 'center'), + ##(Tkinter.RIGHT, 'right'), + (Tkinter.NONE, n_('Icons only')), + (Tkinter.TOP, n_('Text below icons')), + (Tkinter.LEFT, n_('Text beside icons')), + ('text', n_('Text only')), + ) + +TOOLBAR_BUTTONS = ( + "new", + "restart", + "open", + "save", + "undo", + "redo", + "autodrop", + "pause", + "statistics", + "rules", + "quit", + "player", + ) + diff --git a/pysollib/tile/tkhtml.py b/pysollib/tile/tkhtml.py new file mode 100644 index 00000000..6a63c27a --- /dev/null +++ b/pysollib/tile/tkhtml.py @@ -0,0 +1,540 @@ +## vim:ts=4:et:nowrap +## +##---------------------------------------------------------------------------## +## +## PySol -- a Python Solitaire game +## +## Copyright (C) 2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2002 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2001 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1999 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998 Markus Franz Xaver Johannes Oberhumer +## All Rights Reserved. +## +## 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 2 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; see the file COPYING. +## If not, write to the Free Software Foundation, Inc., +## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +## +## Markus F.X.J. Oberhumer +## +## http://www.oberhumer.com/pysol +## +##---------------------------------------------------------------------------## + +__all__ = ['HTMLViewer'] + +# imports +import os, sys, re, types +import htmllib, formatter +import Tile as Tkinter + +if __name__ == '__main__': + d = os.path.abspath(os.path.join(sys.path[0], '..', '..')) + sys.path.append(d) + import gettext + gettext.install('pysol', d, unicode=True) + +# PySol imports +from pysollib.mfxutil import Struct, openURL +from pysollib.settings import PACKAGE + +# Toolkit imports +from tkutil import bind, unbind_destroy, loadImage +from tkwidget import MfxMessageDialog +from statusbar import HtmlStatusbar + + +REMOTE_PROTOCOLS = ("ftp:", "gopher:", "http:", "mailto:", "news:", "telnet:") + + +# /*********************************************************************** +# // +# ************************************************************************/ + +class tkHTMLWriter(formatter.NullWriter): + def __init__(self, text, viewer, app): + formatter.NullWriter.__init__(self) + + self.text = text + self.viewer = viewer + + ## + if app: + font = app.getFont("sans") + fixed = app.getFont("fixed") + else: + font = ('helvetica', 12) + fixed = ('courier', 12) + size = font[1] + sign = 1 + if size < 0: sign = -1 + self.fontmap = { + "h1" : (font[0], size + 12*sign, "bold"), + "h2" : (font[0], size + 8*sign, "bold"), + "h3" : (font[0], size + 6*sign, "bold"), + "h4" : (font[0], size + 4*sign, "bold"), + "h5" : (font[0], size + 2*sign, "bold"), + "h6" : (font[0], size + 1*sign, "bold"), + "bold" : (font[0], size, "bold"), + "italic" : (font[0], size, "italic"), + "pre" : fixed, + } + + self.text.config(cursor=self.viewer.defcursor, font=font) + for f in self.fontmap.keys(): + self.text.tag_config(f, font=self.fontmap[f]) + + self.anchor = None + self.anchor_mark = None + self.font = None + self.font_mark = None + self.indent = "" + + def createCallback(self, href): + class Functor: + def __init__(self, viewer, arg): + self.viewer = viewer + self.arg = arg + def __call__(self, *args): + self.viewer.updateHistoryXYView() + return self.viewer.display(self.arg) + return Functor(self.viewer, href) + + def write(self, data): + self.text.insert("insert", data) + + def anchor_bgn(self, href, name, type): + if href: + ##self.text.update_idletasks() # update display during parsing + self.anchor = (href, name, type) + self.anchor_mark = self.text.index("insert") + + def anchor_end(self): + if self.anchor: + url = self.anchor[0] + tag = "href_" + url + self.text.tag_add(tag, self.anchor_mark, "insert") + self.text.tag_bind(tag, "<1>", self.createCallback(url)) + self.text.tag_bind(tag, "", lambda e: self.anchor_enter(url)) + self.text.tag_bind(tag, "", self.anchor_leave) + fg = 'blue' + u = self.viewer.normurl(url, with_protocol=False) + if u in self.viewer.visited_urls: + fg = '#660099' + self.text.tag_config(tag, foreground=fg, underline=1) + self.anchor = None + + def anchor_enter(self, url): + url = self.viewer.normurl(url) + self.viewer.statusbar.updateText(url=url) + self.text.config(cursor=self.viewer.handcursor) + + def anchor_leave(self, *args): + self.viewer.statusbar.updateText(url='') + self.text.config(cursor=self.viewer.defcursor) + + def new_font(self, font): + # end the current font + if self.font: + ##print "end_font(%s)" % `self.font` + self.text.tag_add(self.font, self.font_mark, "insert") + self.font = None + # start the new font + if font: + ##print "start_font(%s)" % `font` + self.font_mark = self.text.index("insert") + if self.fontmap.has_key(font[0]): + self.font = font[0] + elif font[3]: + self.font = "pre" + elif font[2]: + self.font = "bold" + elif font[1]: + self.font = "italic" + else: + self.font = None + + def new_margin(self, margin, level): + self.indent = " " * level + + def send_label_data(self, data): + ##self.write(self.indent + data + " ") + self.write(self.indent) + if data == '*': #