From dfe790a101ba478733d7e2aa28f869aca6cc024c Mon Sep 17 00:00:00 2001 From: skomoroh Date: Fri, 12 Jun 2009 09:32:43 +0000 Subject: [PATCH] * changed GPL version to 3 * added config-file option sound_sample_buffer_size * bugfixes git-svn-id: file:///home/shlomif/Backup/svn-dumps/PySolFC/svnsync-repos/pysolfc/PySolFC/trunk@234 efabe8c0-fbe8-4139-b769-b5e6d273206e --- COPYING | 842 ++++++++++++++++------- README | 4 +- html-src/hanafuda.html | 6 +- pysollib/__init__.py | 22 + pysollib/acard.py | 28 +- pysollib/actions.py | 28 +- pysollib/app.py | 28 +- pysollib/configobj/__init__.py | 22 + pysollib/configobj/configobj.py | 27 +- pysollib/configobj/validate.py | 28 +- pysollib/customgame.py | 14 +- pysollib/game.py | 28 +- pysollib/gamedb.py | 30 +- pysollib/games/__init__.py | 22 + pysollib/games/acesup.py | 24 +- pysollib/games/algerian.py | 14 +- pysollib/games/auldlangsyne.py | 24 +- pysollib/games/bakersdozen.py | 24 +- pysollib/games/bakersgame.py | 24 +- pysollib/games/beleagueredcastle.py | 24 +- pysollib/games/bisley.py | 14 +- pysollib/games/braid.py | 24 +- pysollib/games/bristol.py | 24 +- pysollib/games/buffalobill.py | 14 +- pysollib/games/calculation.py | 24 +- pysollib/games/camelot.py | 14 +- pysollib/games/canfield.py | 25 +- pysollib/games/capricieuse.py | 14 +- pysollib/games/curdsandwhey.py | 14 +- pysollib/games/dieboesesieben.py | 25 +- pysollib/games/diplomat.py | 24 +- pysollib/games/doublets.py | 24 +- pysollib/games/eiffeltower.py | 24 +- pysollib/games/fan.py | 24 +- pysollib/games/fortythieves.py | 24 +- pysollib/games/freecell.py | 24 +- pysollib/games/glenwood.py | 14 +- pysollib/games/golf.py | 24 +- pysollib/games/grandduchess.py | 14 +- pysollib/games/grandfathersclock.py | 24 +- pysollib/games/gypsy.py | 25 +- pysollib/games/harp.py | 25 +- pysollib/games/headsandtails.py | 14 +- pysollib/games/katzenschwanz.py | 24 +- pysollib/games/klondike.py | 24 +- pysollib/games/labyrinth.py | 14 +- pysollib/games/larasgame.py | 19 +- pysollib/games/mahjongg/__init__.py | 22 + pysollib/games/mahjongg/mahjongg.py | 19 +- pysollib/games/mahjongg/mahjongg1.py | 14 +- pysollib/games/mahjongg/mahjongg2.py | 14 +- pysollib/games/mahjongg/mahjongg3.py | 14 +- pysollib/games/mahjongg/shisensho.py | 14 +- pysollib/games/matriarchy.py | 24 +- pysollib/games/montana.py | 24 +- pysollib/games/montecarlo.py | 24 +- pysollib/games/napoleon.py | 24 +- pysollib/games/needle.py | 14 +- pysollib/games/numerica.py | 25 +- pysollib/games/osmosis.py | 24 +- pysollib/games/parallels.py | 14 +- pysollib/games/pasdedeux.py | 24 +- pysollib/games/picturegallery.py | 24 +- pysollib/games/pileon.py | 24 +- pysollib/games/pushpin.py | 14 +- pysollib/games/pyramid.py | 24 +- pysollib/games/royalcotillion.py | 24 +- pysollib/games/royaleast.py | 24 +- pysollib/games/sanibel.py | 22 +- pysollib/games/siebenbisas.py | 24 +- pysollib/games/simplex.py | 14 +- pysollib/games/special/__init__.py | 22 + pysollib/games/special/hanoi.py | 24 +- pysollib/games/special/memory.py | 24 +- pysollib/games/special/pegged.py | 24 +- pysollib/games/special/poker.py | 24 +- pysollib/games/special/tarock.py | 29 +- pysollib/games/spider.py | 24 +- pysollib/games/sthelena.py | 14 +- pysollib/games/sultan.py | 14 +- pysollib/games/takeaway.py | 14 +- pysollib/games/terrace.py | 24 +- pysollib/games/threepeaks.py | 20 +- pysollib/games/tournament.py | 14 +- pysollib/games/ultra/__init__.py | 22 + pysollib/games/ultra/dashavatara.py | 20 +- pysollib/games/ultra/hanafuda.py | 19 +- pysollib/games/ultra/hanafuda1.py | 19 +- pysollib/games/ultra/hanafuda_common.py | 19 +- pysollib/games/ultra/hexadeck.py | 20 +- pysollib/games/ultra/larasgame.py | 19 +- pysollib/games/ultra/matrix.py | 20 +- pysollib/games/ultra/mughal.py | 19 +- pysollib/games/ultra/tarock.py | 19 +- pysollib/games/unionsquare.py | 24 +- pysollib/games/wavemotion.py | 14 +- pysollib/games/windmill.py | 24 +- pysollib/games/yukon.py | 24 +- pysollib/games/zodiac.py | 14 +- pysollib/help.py | 30 +- pysollib/hint.py | 36 +- pysollib/images.py | 28 +- pysollib/init.py | 25 +- pysollib/layout.py | 28 +- pysollib/macosx/__init__.py | 22 + pysollib/macosx/appSupport.py | 22 + pysollib/main.py | 28 +- pysollib/mfxutil.py | 28 +- pysollib/move.py | 28 +- pysollib/options.py | 20 +- pysollib/pysolaudio.py | 53 +- pysollib/pysolgtk/__init__.py | 22 + pysollib/pysolgtk/card.py | 24 +- pysollib/pysolgtk/colorsdialog.py | 14 +- pysollib/pysolgtk/edittextdialog.py | 28 +- pysollib/pysolgtk/findcarddialog.py | 14 +- pysollib/pysolgtk/fontsdialog.py | 14 +- pysollib/pysolgtk/gameinfodialog.py | 14 +- pysollib/pysolgtk/menubar.py | 24 +- pysollib/pysolgtk/playeroptionsdialog.py | 28 +- pysollib/pysolgtk/progressbar.py | 24 +- pysollib/pysolgtk/pysoltree.py | 14 +- pysollib/pysolgtk/selectcardset.py | 24 +- pysollib/pysolgtk/selectgame.py | 28 +- pysollib/pysolgtk/selecttile.py | 14 +- pysollib/pysolgtk/solverdialog.py | 14 +- pysollib/pysolgtk/soundoptionsdialog.py | 14 +- pysollib/pysolgtk/statusbar.py | 24 +- pysollib/pysolgtk/timeoutsdialog.py | 14 +- pysollib/pysolgtk/tkcanvas.py | 24 +- pysollib/pysolgtk/tkconst.py | 24 +- pysollib/pysolgtk/tkhtml.py | 28 +- pysollib/pysolgtk/tkstats.py | 14 +- pysollib/pysolgtk/tkutil.py | 24 +- pysollib/pysolgtk/tkwidget.py | 24 +- pysollib/pysolgtk/tkwrap.py | 24 +- pysollib/pysolgtk/toolbar.py | 24 +- pysollib/pysolrandom.py | 28 +- pysollib/pysoltk.py | 14 +- pysollib/resource.py | 33 +- pysollib/settings.py | 18 +- pysollib/stack.py | 28 +- pysollib/stats.py | 28 +- pysollib/tile/__init__.py | 22 + pysollib/tile/card.py | 28 +- pysollib/tile/colorsdialog.py | 14 +- pysollib/tile/edittextdialog.py | 28 +- pysollib/tile/findcarddialog.py | 14 +- pysollib/tile/fontsdialog.py | 14 +- pysollib/tile/gameinfodialog.py | 14 +- pysollib/tile/menubar.py | 29 +- pysollib/tile/playeroptionsdialog.py | 28 +- pysollib/tile/progressbar.py | 28 +- pysollib/tile/selectcardset.py | 28 +- pysollib/tile/selectgame.py | 28 +- pysollib/tile/selecttile.py | 28 +- pysollib/tile/selecttree.py | 28 +- pysollib/tile/solverdialog.py | 14 +- pysollib/tile/soundoptionsdialog.py | 28 +- pysollib/tile/statusbar.py | 28 +- pysollib/tile/timeoutsdialog.py | 14 +- pysollib/tile/tkcanvas.py | 28 +- pysollib/tile/tkconst.py | 28 +- pysollib/tile/tkhtml.py | 28 +- pysollib/tile/tkstats.py | 28 +- pysollib/tile/tktree.py | 28 +- pysollib/tile/tkutil.py | 28 +- pysollib/tile/tkwidget.py | 28 +- pysollib/tile/tkwrap.py | 28 +- pysollib/tile/toolbar.py | 28 +- pysollib/tile/ttk.py | 450 ++++++++---- pysollib/tile/wizarddialog.py | 14 +- pysollib/tk/__init__.py | 22 + pysollib/tk/card.py | 28 +- pysollib/tk/colorsdialog.py | 14 +- pysollib/tk/edittextdialog.py | 28 +- pysollib/tk/findcarddialog.py | 14 +- pysollib/tk/fontsdialog.py | 14 +- pysollib/tk/gameinfodialog.py | 14 +- pysollib/tk/menubar.py | 29 +- pysollib/tk/playeroptionsdialog.py | 28 +- pysollib/tk/progressbar.py | 28 +- pysollib/tk/selectcardset.py | 28 +- pysollib/tk/selectgame.py | 28 +- pysollib/tk/selecttile.py | 28 +- pysollib/tk/selecttree.py | 28 +- pysollib/tk/solverdialog.py | 14 +- pysollib/tk/soundoptionsdialog.py | 28 +- pysollib/tk/statusbar.py | 28 +- pysollib/tk/tabpage.py | 25 +- pysollib/tk/timeoutsdialog.py | 14 +- pysollib/tk/tkcanvas.py | 28 +- pysollib/tk/tkconst.py | 28 +- pysollib/tk/tkhtml.py | 28 +- pysollib/tk/tkstats.py | 28 +- pysollib/tk/tktree.py | 28 +- pysollib/tk/tkutil.py | 28 +- pysollib/tk/tkwidget.py | 28 +- pysollib/tk/tkwrap.py | 28 +- pysollib/tk/toolbar.py | 28 +- pysollib/tk/wizarddialog.py | 14 +- pysollib/util.py | 28 +- pysollib/winsystems/__init__.py | 14 +- pysollib/winsystems/aqua.py | 17 +- pysollib/winsystems/common.py | 17 +- pysollib/winsystems/win32.py | 17 +- pysollib/winsystems/x11.py | 17 +- pysollib/wizardpresets.py | 14 +- pysollib/wizardutil.py | 14 +- 209 files changed, 2785 insertions(+), 3100 deletions(-) diff --git a/COPYING b/COPYING index b4951ab7..94a9ed02 100644 --- a/COPYING +++ b/COPYING @@ -1,284 +1,625 @@ GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble - The 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 + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -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. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - To protect your rights, we need to 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. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must 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. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. - 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. + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. - 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. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. - 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. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. - - 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". + TERMS AND CONDITIONS -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. + 0. Definitions. - 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. + "This License" refers to version 3 of the GNU General Public License. -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. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. - 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: + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. - 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. + A "covered work" means either the unmodified Program or a work based +on the Program. - 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. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. -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. + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. -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. + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. - 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: + 1. Source Code. - 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, + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. - 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, + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. - 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 "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. -The 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. + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. -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. + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. - 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. + The Corresponding Source for a work in source code form is that +same work. - 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 + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. - 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 + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -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. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. -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. + 13. Use with the GNU Affero General Public License. -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. + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. -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. + 14. Revised Versions 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 + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program -specifies 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. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. - 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. + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. - NO WARRANTY + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. - 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. + 15. Disclaimer of Warranty. - 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. + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest @@ -287,15 +628,15 @@ 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 +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - Copyright (C) 19yy + Copyright (C) - This program is free software; you can redistribute it and/or modify + 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 + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -304,37 +645,30 @@ the "copyright" line and a pointer to where the full notice is found. 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 - + along with this program. If not, see . 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: + If the program does terminal interaction, 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'. + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, 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. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. - 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. + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README b/README index 890880c5..1799ca34 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ PySol Fan Club edition Requirements. ------------- -- Python (2.3 or later) +- Python (2.4 or later) (NB: python 2.6.0 has a bug, use 2.6.1 instead) - Tkinter (Tcl/Tk 8.4 or later) ** for sound support (optional) ** @@ -16,7 +16,7 @@ Requirements. ** other packages (optional) ** - Tile (ttk): http://tktable.sourceforge.net/tile/ (0.8.0 or later) - PIL (Python Imaging Library): http://www.pythonware.com/products/pil - - Freecell Solver: http://vipe.technion.ac.il/~shlomif/freecell-solver/ + - Freecell Solver: http://fc-solve.berlios.de/ Installation. diff --git a/html-src/hanafuda.html b/html-src/hanafuda.html index a7868375..74b5f1b4 100644 --- a/html-src/hanafuda.html +++ b/html-src/hanafuda.html @@ -5,9 +5,9 @@ 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/ +months of the year. For a good explanation of what the suits are, +try Graham Leonard's Hanafuda and Kabufuda +site.

Most of the flower card solitaire games are played like western deck games diff --git a/pysollib/__init__.py b/pysollib/__init__.py index e69de29b..49ecb276 100644 --- a/pysollib/__init__.py +++ b/pysollib/__init__.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## diff --git a/pysollib/acard.py b/pysollib/acard.py index f2ac72a5..dadcf3a1 100644 --- a/pysollib/acard.py +++ b/pysollib/acard.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/actions.py b/pysollib/actions.py index e5b1a2d4..ea5afcc9 100644 --- a/pysollib/actions.py +++ b/pysollib/actions.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/app.py b/pysollib/app.py index dc0dd33e..57410b3e 100644 --- a/pysollib/app.py +++ b/pysollib/app.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/configobj/__init__.py b/pysollib/configobj/__init__.py index e69de29b..49ecb276 100644 --- a/pysollib/configobj/__init__.py +++ b/pysollib/configobj/__init__.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## diff --git a/pysollib/configobj/configobj.py b/pysollib/configobj/configobj.py index df6a8b7a..6258f8fb 100644 --- a/pysollib/configobj/configobj.py +++ b/pysollib/configobj/configobj.py @@ -1,8 +1,25 @@ -# configobj.py -# A config file reader/writer that supports nested sections in config files. -# Copyright (C) 2005-2006 Michael Foord, Nicola Larosa -# E-mail: fuzzyman AT voidspace DOT org DOT uk -# nico AT tekNico DOT net +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## # ConfigObj 4 # http://www.voidspace.org.uk/python/configobj.html diff --git a/pysollib/configobj/validate.py b/pysollib/configobj/validate.py index 605d3c2c..36516f9f 100644 --- a/pysollib/configobj/validate.py +++ b/pysollib/configobj/validate.py @@ -1,9 +1,25 @@ -# validate.py -# A Validator object -# Copyright (C) 2005 Michael Foord, Mark Andrews, Nicola Larosa -# E-mail: fuzzyman AT voidspace DOT org DOT uk -# mark AT la-la DOT com -# nico AT tekNico DOT net +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## # This software is licensed under the terms of the BSD license. # http://www.voidspace.org.uk/python/license.shtml diff --git a/pysollib/customgame.py b/pysollib/customgame.py index 15c800ec..1567d59e 100644 --- a/pysollib/customgame.py +++ b/pysollib/customgame.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/game.py b/pysollib/game.py index 2ef455fe..17907d4f 100644 --- a/pysollib/game.py +++ b/pysollib/game.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/gamedb.py b/pysollib/gamedb.py index c019a6a6..965903ab 100644 --- a/pysollib/gamedb.py +++ b/pysollib/gamedb.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -366,7 +354,7 @@ class GI: ('fc-0.9.4', tuple(range(661, 671))), ('fc-1.0', tuple(range(671, 711))), ('fc-1.1', tuple(range(711, 759))), - ('fc-1.2', tuple(range(11011, 11014))), + ('fc-2.0', tuple(range(11011, 11014)) + tuple(range(759, 767)) ), ) # deprecated - the correct way is to or a GI.GT_XXX flag diff --git a/pysollib/games/__init__.py b/pysollib/games/__init__.py index 5bb03ec7..ce23f9fe 100644 --- a/pysollib/games/__init__.py +++ b/pysollib/games/__init__.py @@ -1,3 +1,25 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## import acesup import algerian import auldlangsyne diff --git a/pysollib/games/acesup.py b/pysollib/games/acesup.py index d7aecc7f..4fa5a12e 100644 --- a/pysollib/games/acesup.py +++ b/pysollib/games/acesup.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/algerian.py b/pysollib/games/algerian.py index 3f383199..841dee18 100644 --- a/pysollib/games/algerian.py +++ b/pysollib/games/algerian.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/auldlangsyne.py b/pysollib/games/auldlangsyne.py index 8eba1e75..77a287e1 100644 --- a/pysollib/games/auldlangsyne.py +++ b/pysollib/games/auldlangsyne.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/bakersdozen.py b/pysollib/games/bakersdozen.py index 9b4512e2..60fd2be9 100644 --- a/pysollib/games/bakersdozen.py +++ b/pysollib/games/bakersdozen.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/bakersgame.py b/pysollib/games/bakersgame.py index 8b4d95be..53d5f4ce 100644 --- a/pysollib/games/bakersgame.py +++ b/pysollib/games/bakersgame.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/beleagueredcastle.py b/pysollib/games/beleagueredcastle.py index 99a8d01b..bfd2bb9a 100644 --- a/pysollib/games/beleagueredcastle.py +++ b/pysollib/games/beleagueredcastle.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/bisley.py b/pysollib/games/bisley.py index 8a0b75f2..e8bf2f79 100644 --- a/pysollib/games/bisley.py +++ b/pysollib/games/bisley.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/braid.py b/pysollib/games/braid.py index 9b25ffda..61cbbed5 100644 --- a/pysollib/games/braid.py +++ b/pysollib/games/braid.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/bristol.py b/pysollib/games/bristol.py index 118b44c5..d8bfcd26 100644 --- a/pysollib/games/bristol.py +++ b/pysollib/games/bristol.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/buffalobill.py b/pysollib/games/buffalobill.py index 24c0ebd4..976244e5 100644 --- a/pysollib/games/buffalobill.py +++ b/pysollib/games/buffalobill.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/calculation.py b/pysollib/games/calculation.py index 72b118a6..5ae7de89 100644 --- a/pysollib/games/calculation.py +++ b/pysollib/games/calculation.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/camelot.py b/pysollib/games/camelot.py index cfb8bb4a..5f75e270 100644 --- a/pysollib/games/camelot.py +++ b/pysollib/games/camelot.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/canfield.py b/pysollib/games/canfield.py index 79b5aa48..5828f3b6 100644 --- a/pysollib/games/canfield.py +++ b/pysollib/games/canfield.py @@ -1,17 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -20,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/capricieuse.py b/pysollib/games/capricieuse.py index 73d0c955..925327b2 100644 --- a/pysollib/games/capricieuse.py +++ b/pysollib/games/capricieuse.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/curdsandwhey.py b/pysollib/games/curdsandwhey.py index 8bdf5286..df0a78e2 100644 --- a/pysollib/games/curdsandwhey.py +++ b/pysollib/games/curdsandwhey.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/dieboesesieben.py b/pysollib/games/dieboesesieben.py index 1bbdeb63..65aa1250 100644 --- a/pysollib/games/dieboesesieben.py +++ b/pysollib/games/dieboesesieben.py @@ -1,17 +1,14 @@ -## -*- coding: utf-8 -*- -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -20,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/diplomat.py b/pysollib/games/diplomat.py index 88176fb5..748622e0 100644 --- a/pysollib/games/diplomat.py +++ b/pysollib/games/diplomat.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/doublets.py b/pysollib/games/doublets.py index 49150621..3b8798df 100644 --- a/pysollib/games/doublets.py +++ b/pysollib/games/doublets.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/eiffeltower.py b/pysollib/games/eiffeltower.py index 1586a996..559b0424 100644 --- a/pysollib/games/eiffeltower.py +++ b/pysollib/games/eiffeltower.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/fan.py b/pysollib/games/fan.py index 8b3e5cb3..4eaa12b6 100644 --- a/pysollib/games/fan.py +++ b/pysollib/games/fan.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/fortythieves.py b/pysollib/games/fortythieves.py index 33292e4f..00b04543 100644 --- a/pysollib/games/fortythieves.py +++ b/pysollib/games/fortythieves.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/freecell.py b/pysollib/games/freecell.py index 047b64f6..59df3fcb 100644 --- a/pysollib/games/freecell.py +++ b/pysollib/games/freecell.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/glenwood.py b/pysollib/games/glenwood.py index def1e643..4e320650 100644 --- a/pysollib/games/glenwood.py +++ b/pysollib/games/glenwood.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/golf.py b/pysollib/games/golf.py index 51613a2b..14af14a4 100644 --- a/pysollib/games/golf.py +++ b/pysollib/games/golf.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/grandduchess.py b/pysollib/games/grandduchess.py index 0336f7eb..c00c0852 100644 --- a/pysollib/games/grandduchess.py +++ b/pysollib/games/grandduchess.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/grandfathersclock.py b/pysollib/games/grandfathersclock.py index 5f0a1167..0229be9e 100644 --- a/pysollib/games/grandfathersclock.py +++ b/pysollib/games/grandfathersclock.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/gypsy.py b/pysollib/games/gypsy.py index 00b3b3c9..76d351c9 100644 --- a/pysollib/games/gypsy.py +++ b/pysollib/games/gypsy.py @@ -1,17 +1,14 @@ -## -*- coding: utf-8 -*- -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -20,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/harp.py b/pysollib/games/harp.py index 00b124b7..42a54f2f 100644 --- a/pysollib/games/harp.py +++ b/pysollib/games/harp.py @@ -1,17 +1,14 @@ -# -*- mode: python; coding: utf-8 -*- -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -20,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/headsandtails.py b/pysollib/games/headsandtails.py index 18912d13..10d321ef 100644 --- a/pysollib/games/headsandtails.py +++ b/pysollib/games/headsandtails.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/katzenschwanz.py b/pysollib/games/katzenschwanz.py index e45ba8b3..ae8e8231 100644 --- a/pysollib/games/katzenschwanz.py +++ b/pysollib/games/katzenschwanz.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/klondike.py b/pysollib/games/klondike.py index 659711e2..605d2959 100644 --- a/pysollib/games/klondike.py +++ b/pysollib/games/klondike.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/labyrinth.py b/pysollib/games/labyrinth.py index 4df100ff..6826786d 100644 --- a/pysollib/games/labyrinth.py +++ b/pysollib/games/labyrinth.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/larasgame.py b/pysollib/games/larasgame.py index d39eea3c..fb9ef7eb 100644 --- a/pysollib/games/larasgame.py +++ b/pysollib/games/larasgame.py @@ -1,15 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## Ultrasol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -18,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/mahjongg/__init__.py b/pysollib/games/mahjongg/__init__.py index f92860b0..e4974a50 100644 --- a/pysollib/games/mahjongg/__init__.py +++ b/pysollib/games/mahjongg/__init__.py @@ -1,3 +1,25 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## import mahjongg1 import mahjongg2 import mahjongg3 diff --git a/pysollib/games/mahjongg/mahjongg.py b/pysollib/games/mahjongg/mahjongg.py index 3ec33e66..43c00ba6 100644 --- a/pysollib/games/mahjongg/mahjongg.py +++ b/pysollib/games/mahjongg/mahjongg.py @@ -1,15 +1,14 @@ -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -18,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/mahjongg/mahjongg1.py b/pysollib/games/mahjongg/mahjongg1.py index cc4c4eed..44be9d48 100644 --- a/pysollib/games/mahjongg/mahjongg1.py +++ b/pysollib/games/mahjongg/mahjongg1.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/mahjongg/mahjongg2.py b/pysollib/games/mahjongg/mahjongg2.py index 8e08db59..39cd344b 100644 --- a/pysollib/games/mahjongg/mahjongg2.py +++ b/pysollib/games/mahjongg/mahjongg2.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/mahjongg/mahjongg3.py b/pysollib/games/mahjongg/mahjongg3.py index 8d7c3797..f233f92d 100644 --- a/pysollib/games/mahjongg/mahjongg3.py +++ b/pysollib/games/mahjongg/mahjongg3.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/mahjongg/shisensho.py b/pysollib/games/mahjongg/shisensho.py index 8ebb8052..3298a511 100644 --- a/pysollib/games/mahjongg/shisensho.py +++ b/pysollib/games/mahjongg/shisensho.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/matriarchy.py b/pysollib/games/matriarchy.py index aa595dce..38c89bf8 100644 --- a/pysollib/games/matriarchy.py +++ b/pysollib/games/matriarchy.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/montana.py b/pysollib/games/montana.py index 633bd911..a003ee99 100644 --- a/pysollib/games/montana.py +++ b/pysollib/games/montana.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/montecarlo.py b/pysollib/games/montecarlo.py index e68331f6..cf91dc4e 100644 --- a/pysollib/games/montecarlo.py +++ b/pysollib/games/montecarlo.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/napoleon.py b/pysollib/games/napoleon.py index 00d87944..a0014bc4 100644 --- a/pysollib/games/napoleon.py +++ b/pysollib/games/napoleon.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/needle.py b/pysollib/games/needle.py index 71f5129b..1b3b8d9b 100644 --- a/pysollib/games/needle.py +++ b/pysollib/games/needle.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/numerica.py b/pysollib/games/numerica.py index 95e7aa2c..4d313ec1 100644 --- a/pysollib/games/numerica.py +++ b/pysollib/games/numerica.py @@ -1,17 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -20,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/osmosis.py b/pysollib/games/osmosis.py index be30d1b9..c70b3077 100644 --- a/pysollib/games/osmosis.py +++ b/pysollib/games/osmosis.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/parallels.py b/pysollib/games/parallels.py index 7fea31e0..f3f77ae2 100644 --- a/pysollib/games/parallels.py +++ b/pysollib/games/parallels.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/pasdedeux.py b/pysollib/games/pasdedeux.py index a0672d0b..9742d197 100644 --- a/pysollib/games/pasdedeux.py +++ b/pysollib/games/pasdedeux.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/picturegallery.py b/pysollib/games/picturegallery.py index 7d44973b..9cf0c768 100644 --- a/pysollib/games/picturegallery.py +++ b/pysollib/games/picturegallery.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/pileon.py b/pysollib/games/pileon.py index bad14e55..a408558d 100644 --- a/pysollib/games/pileon.py +++ b/pysollib/games/pileon.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/pushpin.py b/pysollib/games/pushpin.py index 5edbcba9..54aa25eb 100644 --- a/pysollib/games/pushpin.py +++ b/pysollib/games/pushpin.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/pyramid.py b/pysollib/games/pyramid.py index 70ff8173..ccba850c 100644 --- a/pysollib/games/pyramid.py +++ b/pysollib/games/pyramid.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/royalcotillion.py b/pysollib/games/royalcotillion.py index 78995c30..6eedba3c 100644 --- a/pysollib/games/royalcotillion.py +++ b/pysollib/games/royalcotillion.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/royaleast.py b/pysollib/games/royaleast.py index 14c40ba8..dbf4818f 100644 --- a/pysollib/games/royaleast.py +++ b/pysollib/games/royaleast.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/sanibel.py b/pysollib/games/sanibel.py index 0a57d0ec..a311b306 100644 --- a/pysollib/games/sanibel.py +++ b/pysollib/games/sanibel.py @@ -1,14 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game -## Copyright (C) 1998-2000 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## Sanibel -## Copyright (C) 1998,2000 John Stoneham -## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -17,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/siebenbisas.py b/pysollib/games/siebenbisas.py index a74eb6bf..ecbbb5b0 100644 --- a/pysollib/games/siebenbisas.py +++ b/pysollib/games/siebenbisas.py @@ -1,18 +1,14 @@ #!/usr/bin/env python -# -*- mode: python; coding: iso8859-1; -*- -## vim:ts=4:et:nowrap -## +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -21,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/simplex.py b/pysollib/games/simplex.py index 1eae92aa..bc3ea846 100644 --- a/pysollib/games/simplex.py +++ b/pysollib/games/simplex.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/special/__init__.py b/pysollib/games/special/__init__.py index 98a5e348..5486a9c7 100644 --- a/pysollib/games/special/__init__.py +++ b/pysollib/games/special/__init__.py @@ -1,3 +1,25 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## import hanoi import memory import pegged diff --git a/pysollib/games/special/hanoi.py b/pysollib/games/special/hanoi.py index d790c60d..92d00b4c 100644 --- a/pysollib/games/special/hanoi.py +++ b/pysollib/games/special/hanoi.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/special/memory.py b/pysollib/games/special/memory.py index b39c87a4..23597b6a 100644 --- a/pysollib/games/special/memory.py +++ b/pysollib/games/special/memory.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/special/pegged.py b/pysollib/games/special/pegged.py index eba92f25..491099d5 100644 --- a/pysollib/games/special/pegged.py +++ b/pysollib/games/special/pegged.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/special/poker.py b/pysollib/games/special/poker.py index 4257b8e7..114680e0 100644 --- a/pysollib/games/special/poker.py +++ b/pysollib/games/special/poker.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/special/tarock.py b/pysollib/games/special/tarock.py index 3ec65eef..d8a3ed94 100644 --- a/pysollib/games/special/tarock.py +++ b/pysollib/games/special/tarock.py @@ -1,17 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -20,17 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/spider.py b/pysollib/games/spider.py index 1ba5b236..f8b22fae 100644 --- a/pysollib/games/spider.py +++ b/pysollib/games/spider.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/sthelena.py b/pysollib/games/sthelena.py index 2316bb42..9acd1c03 100644 --- a/pysollib/games/sthelena.py +++ b/pysollib/games/sthelena.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/sultan.py b/pysollib/games/sultan.py index 9c093390..258a7ebc 100644 --- a/pysollib/games/sultan.py +++ b/pysollib/games/sultan.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/takeaway.py b/pysollib/games/takeaway.py index 6071a156..c360a6c8 100644 --- a/pysollib/games/takeaway.py +++ b/pysollib/games/takeaway.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/terrace.py b/pysollib/games/terrace.py index a63c7d34..62ad99b6 100644 --- a/pysollib/games/terrace.py +++ b/pysollib/games/terrace.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/threepeaks.py b/pysollib/games/threepeaks.py index 27dd9f30..1c7345b3 100644 --- a/pysollib/games/threepeaks.py +++ b/pysollib/games/threepeaks.py @@ -1,16 +1,14 @@ -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/tournament.py b/pysollib/games/tournament.py index 246873f7..8df400d6 100644 --- a/pysollib/games/tournament.py +++ b/pysollib/games/tournament.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/ultra/__init__.py b/pysollib/games/ultra/__init__.py index ee1f0273..cac373cd 100644 --- a/pysollib/games/ultra/__init__.py +++ b/pysollib/games/ultra/__init__.py @@ -1,3 +1,25 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## import dashavatara import hanafuda import hanafuda1 diff --git a/pysollib/games/ultra/dashavatara.py b/pysollib/games/ultra/dashavatara.py index e169eef8..5eef5d20 100644 --- a/pysollib/games/ultra/dashavatara.py +++ b/pysollib/games/ultra/dashavatara.py @@ -1,16 +1,14 @@ -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## Ultrasol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/ultra/hanafuda.py b/pysollib/games/ultra/hanafuda.py index 066ef94b..d48694ad 100644 --- a/pysollib/games/ultra/hanafuda.py +++ b/pysollib/games/ultra/hanafuda.py @@ -1,15 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## Ultrasol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -18,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/ultra/hanafuda1.py b/pysollib/games/ultra/hanafuda1.py index 088aa641..0341dd5b 100644 --- a/pysollib/games/ultra/hanafuda1.py +++ b/pysollib/games/ultra/hanafuda1.py @@ -1,15 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## Ultrasol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -18,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/ultra/hanafuda_common.py b/pysollib/games/ultra/hanafuda_common.py index 7eefe6db..e95abfae 100644 --- a/pysollib/games/ultra/hanafuda_common.py +++ b/pysollib/games/ultra/hanafuda_common.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -110,6 +112,11 @@ class Flower_FoundationStack(AbstractFoundationStack): b = 2 return a, b + def getBaseCard(self): + return '' # FIXME + def getHelp(self): + return '' # FIXME + class Hanafuda_SS_FoundationStack(Flower_FoundationStack): diff --git a/pysollib/games/ultra/hexadeck.py b/pysollib/games/ultra/hexadeck.py index 5a961494..300eb367 100644 --- a/pysollib/games/ultra/hexadeck.py +++ b/pysollib/games/ultra/hexadeck.py @@ -1,16 +1,14 @@ -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/ultra/larasgame.py b/pysollib/games/ultra/larasgame.py index df55f21b..b68cb660 100644 --- a/pysollib/games/ultra/larasgame.py +++ b/pysollib/games/ultra/larasgame.py @@ -1,15 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## Ultrasol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -18,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/ultra/matrix.py b/pysollib/games/ultra/matrix.py index 2e635667..8e966f11 100644 --- a/pysollib/games/ultra/matrix.py +++ b/pysollib/games/ultra/matrix.py @@ -1,16 +1,14 @@ -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/ultra/mughal.py b/pysollib/games/ultra/mughal.py index f100657e..04b518a4 100644 --- a/pysollib/games/ultra/mughal.py +++ b/pysollib/games/ultra/mughal.py @@ -1,15 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## Ultrasol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -18,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/ultra/tarock.py b/pysollib/games/ultra/tarock.py index b846beb2..681f07f7 100644 --- a/pysollib/games/ultra/tarock.py +++ b/pysollib/games/ultra/tarock.py @@ -1,15 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## Ultrasol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -18,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/unionsquare.py b/pysollib/games/unionsquare.py index 4fc3ad23..fe801680 100644 --- a/pysollib/games/unionsquare.py +++ b/pysollib/games/unionsquare.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/wavemotion.py b/pysollib/games/wavemotion.py index 96a66331..27daf034 100644 --- a/pysollib/games/wavemotion.py +++ b/pysollib/games/wavemotion.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/windmill.py b/pysollib/games/windmill.py index c19fa969..3065ebef 100644 --- a/pysollib/games/windmill.py +++ b/pysollib/games/windmill.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/yukon.py b/pysollib/games/yukon.py index 0753b511..9af22b48 100644 --- a/pysollib/games/yukon.py +++ b/pysollib/games/yukon.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/games/zodiac.py b/pysollib/games/zodiac.py index 48717945..73aef51d 100644 --- a/pysollib/games/zodiac.py +++ b/pysollib/games/zodiac.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/help.py b/pysollib/help.py index 4fc01fa0..13a3dbf9 100644 --- a/pysollib/help.py +++ b/pysollib/help.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -65,7 +53,7 @@ def help_about(app, timeout=0, sound=True): Copyright (C) 1998 - 2003 Markus F.X.J. Oberhumer. Copyright (C) 2003 Mt. Hood Playing Card Co. -Copyright (C) 2005 - 2007 Skomoroh. +Copyright (C) 2005 - 2009 Skomoroh. All Rights Reserved. PySol is free software distributed under the terms diff --git a/pysollib/hint.py b/pysollib/hint.py index 198e0486..1ae2316d 100644 --- a/pysollib/hint.py +++ b/pysollib/hint.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -37,6 +25,7 @@ # imports import os import time +import subprocess # PySol imports from settings import DEBUG, FCS_COMMAND @@ -852,7 +841,12 @@ class FreeCellSolver_Hint: command = FCS_COMMAND+' '+' '.join([str(i) for i in args]) if DEBUG: print command - pin, pout, perr = os.popen3(command) + p = subprocess.Popen(command, shell=True, + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + close_fds=True) + pin, pout, perr = p.stdin, p.stdout, p.stderr pin.write(board) pin.close() # diff --git a/pysollib/images.py b/pysollib/images.py index babf8214..f9cbe04a 100644 --- a/pysollib/images.py +++ b/pysollib/images.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/init.py b/pysollib/init.py index 334b7f2a..e39425d0 100644 --- a/pysollib/init.py +++ b/pysollib/init.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,13 +17,11 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## -import sys, os, locale +import sys, os, locale, subprocess import traceback import gettext @@ -153,14 +155,15 @@ def init(): ##os.environ['FREECELL_SOLVER_PRESETRC'] = f # defined in prefix.h if os.name in ('posix', 'nt'): try: - pin, pout, perr = os.popen3(settings.FCS_COMMAND+' --help') - if pout.readline().startswith('fc-solve'): + p = subprocess.Popen(settings.FCS_COMMAND+' --help', shell=True, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, close_fds=True) + if p.stdout.readline().startswith('fc-solve'): settings.USE_FREECELL_SOLVER = True - del pin, pout, perr if os.name == 'posix': os.wait() # kill zombi except: - ##traceback.print_exc() + traceback.print_exc() pass os.environ['FREECELL_SOLVER_QUIET'] = '1' diff --git a/pysollib/layout.py b/pysollib/layout.py index 6294b0b8..a5f2ff14 100644 --- a/pysollib/layout.py +++ b/pysollib/layout.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/macosx/__init__.py b/pysollib/macosx/__init__.py index e69de29b..49ecb276 100644 --- a/pysollib/macosx/__init__.py +++ b/pysollib/macosx/__init__.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## diff --git a/pysollib/macosx/appSupport.py b/pysollib/macosx/appSupport.py index ce8cb090..4814a222 100644 --- a/pysollib/macosx/appSupport.py +++ b/pysollib/macosx/appSupport.py @@ -1,3 +1,25 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## """ A number of function that enhance PySol on MacOSX when it used as a normal GUI application (as opposed to an X11 application). diff --git a/pysollib/main.py b/pysollib/main.py index 9916072d..e0e8df42 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/mfxutil.py b/pysollib/mfxutil.py index 9ada5a26..203474af 100644 --- a/pysollib/mfxutil.py +++ b/pysollib/mfxutil.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/move.py b/pysollib/move.py index 44c17391..dee37dc4 100644 --- a/pysollib/move.py +++ b/pysollib/move.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/options.py b/pysollib/options.py index 03504c22..f4e4d225 100644 --- a/pysollib/options.py +++ b/pysollib/options.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -95,7 +97,7 @@ save_games_geometry = boolean sound = boolean sound_mode = integer(0, 1) sound_sample_volume = integer(0, 128) -sound_music_volume = integer(0, 128) +sound_sample_buffer_size = integer(1, 4) tabletile_name = string recent_gameid = int_list favorite_gameid = int_list @@ -225,6 +227,7 @@ class Options: ('sound_mode', 'int'), ('sound_sample_volume', 'int'), ('sound_music_volume', 'int'), + ('sound_sample_buffer_size', 'int'), ('tabletile_name', 'str'), ('translate_game_names', 'bool'), #('toolbar_vars', 'list'), @@ -259,7 +262,7 @@ class Options: self.mahjongg_create_solvable = 2 # 0 - none, 1 - easy, 2 - hard self.shisen_show_hint = True self.shisen_show_matching = False - self.animations = 2 # default to Fast + self.animations = 3 # default to Medium self.redeal_animation = True self.win_animation = True self.flip_animation = True @@ -294,6 +297,7 @@ class Options: self.sound_mode = 1 self.sound_sample_volume = 80 self.sound_music_volume = 100 + self.sound_sample_buffer_size = 1 # 1 - 4 (1024 - 4096 bytes) self.sound_samples = { 'areyousure' : True, 'autodrop' : True, diff --git a/pysollib/pysolaudio.py b/pysollib/pysolaudio.py index 8bb1ce64..c5cf7560 100644 --- a/pysollib/pysolaudio.py +++ b/pysollib/pysolaudio.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -430,6 +418,18 @@ class PyGameAudioClient(AbstractAudioClient): # for py2exe import pygame.base, pygame.rwobject, pygame.mixer_music self.mixer = pygame.mixer + self.time = pygame.time + self.music = self.mixer.music + self.audiodev = self.mixer + self.sound = None + self.sound_channel = None + self.sound_priority = -1 + + def startServer(self): + pass + + def connectServer(self, app): + AbstractAudioClient.connectServer(self, app) ## http://www.pygame.org/docs/ref/mixer.html ## NOTE: there is currently a bug on some windows machines which ## makes sound play back 'scratchy'. There is not enough cpu in @@ -439,17 +439,10 @@ class PyGameAudioClient(AbstractAudioClient): ## play the sound and when it gets played. Try calling this before ## the pygame.init or pygame.mixer.init calls. ## pygame.mixer.pre_init(44100,-16,2, 1024 * 3) - self.mixer.pre_init(44100, -16, 2, 1024 * 3) + #self.mixer.pre_init(44100, -16, 2, 1024 * 3) + buff_size = self.app.opt.sound_sample_buffer_size + self.mixer.pre_init(44100, -16, 2, 1024*buff_size) self.mixer.init() - self.music = self.mixer.music - self.time = pygame.time - 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 diff --git a/pysollib/pysolgtk/__init__.py b/pysollib/pysolgtk/__init__.py index e69de29b..49ecb276 100644 --- a/pysollib/pysolgtk/__init__.py +++ b/pysollib/pysolgtk/__init__.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/card.py b/pysollib/pysolgtk/card.py index 860a6460..39333461 100644 --- a/pysollib/pysolgtk/card.py +++ b/pysollib/pysolgtk/card.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/colorsdialog.py b/pysollib/pysolgtk/colorsdialog.py index a4bcf30f..c772f6d7 100644 --- a/pysollib/pysolgtk/colorsdialog.py +++ b/pysollib/pysolgtk/colorsdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/edittextdialog.py b/pysollib/pysolgtk/edittextdialog.py index 60fc06a5..02b15fea 100644 --- a/pysollib/pysolgtk/edittextdialog.py +++ b/pysollib/pysolgtk/edittextdialog.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/findcarddialog.py b/pysollib/pysolgtk/findcarddialog.py index ee358356..42babea9 100644 --- a/pysollib/pysolgtk/findcarddialog.py +++ b/pysollib/pysolgtk/findcarddialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/fontsdialog.py b/pysollib/pysolgtk/fontsdialog.py index e07edf5f..f12d052e 100644 --- a/pysollib/pysolgtk/fontsdialog.py +++ b/pysollib/pysolgtk/fontsdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/gameinfodialog.py b/pysollib/pysolgtk/gameinfodialog.py index fba75120..27f0c2a8 100644 --- a/pysollib/pysolgtk/gameinfodialog.py +++ b/pysollib/pysolgtk/gameinfodialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/menubar.py b/pysollib/pysolgtk/menubar.py index 79bb8add..23062106 100644 --- a/pysollib/pysolgtk/menubar.py +++ b/pysollib/pysolgtk/menubar.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/playeroptionsdialog.py b/pysollib/pysolgtk/playeroptionsdialog.py index 3b14fee0..187a488d 100644 --- a/pysollib/pysolgtk/playeroptionsdialog.py +++ b/pysollib/pysolgtk/playeroptionsdialog.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/progressbar.py b/pysollib/pysolgtk/progressbar.py index 378b45ee..b55e0d41 100644 --- a/pysollib/pysolgtk/progressbar.py +++ b/pysollib/pysolgtk/progressbar.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/pysoltree.py b/pysollib/pysolgtk/pysoltree.py index 430eb945..2f3d465a 100644 --- a/pysollib/pysolgtk/pysoltree.py +++ b/pysollib/pysolgtk/pysoltree.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/selectcardset.py b/pysollib/pysolgtk/selectcardset.py index 03594a27..dfcccf18 100644 --- a/pysollib/pysolgtk/selectcardset.py +++ b/pysollib/pysolgtk/selectcardset.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/selectgame.py b/pysollib/pysolgtk/selectgame.py index d4f4acdc..78f405f6 100644 --- a/pysollib/pysolgtk/selectgame.py +++ b/pysollib/pysolgtk/selectgame.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/selecttile.py b/pysollib/pysolgtk/selecttile.py index 4d6ace67..ccd51e80 100644 --- a/pysollib/pysolgtk/selecttile.py +++ b/pysollib/pysolgtk/selecttile.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/solverdialog.py b/pysollib/pysolgtk/solverdialog.py index cd6831fd..4206dbb7 100644 --- a/pysollib/pysolgtk/solverdialog.py +++ b/pysollib/pysolgtk/solverdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/soundoptionsdialog.py b/pysollib/pysolgtk/soundoptionsdialog.py index 5b0c13d4..a61b23b8 100644 --- a/pysollib/pysolgtk/soundoptionsdialog.py +++ b/pysollib/pysolgtk/soundoptionsdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/statusbar.py b/pysollib/pysolgtk/statusbar.py index ee92037c..34136fd4 100644 --- a/pysollib/pysolgtk/statusbar.py +++ b/pysollib/pysolgtk/statusbar.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/timeoutsdialog.py b/pysollib/pysolgtk/timeoutsdialog.py index 57d0aed0..0aeb2791 100644 --- a/pysollib/pysolgtk/timeoutsdialog.py +++ b/pysollib/pysolgtk/timeoutsdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/tkcanvas.py b/pysollib/pysolgtk/tkcanvas.py index 6e505d7c..7af354d2 100644 --- a/pysollib/pysolgtk/tkcanvas.py +++ b/pysollib/pysolgtk/tkcanvas.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/tkconst.py b/pysollib/pysolgtk/tkconst.py index 49192e31..313cf629 100644 --- a/pysollib/pysolgtk/tkconst.py +++ b/pysollib/pysolgtk/tkconst.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/tkhtml.py b/pysollib/pysolgtk/tkhtml.py index 13dcdadd..cad465ab 100644 --- a/pysollib/pysolgtk/tkhtml.py +++ b/pysollib/pysolgtk/tkhtml.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/tkstats.py b/pysollib/pysolgtk/tkstats.py index cf5e8d9d..403a3b93 100644 --- a/pysollib/pysolgtk/tkstats.py +++ b/pysollib/pysolgtk/tkstats.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/tkutil.py b/pysollib/pysolgtk/tkutil.py index 531ea6f0..97bf55ae 100644 --- a/pysollib/pysolgtk/tkutil.py +++ b/pysollib/pysolgtk/tkutil.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/tkwidget.py b/pysollib/pysolgtk/tkwidget.py index 67c8663b..7575d238 100644 --- a/pysollib/pysolgtk/tkwidget.py +++ b/pysollib/pysolgtk/tkwidget.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/tkwrap.py b/pysollib/pysolgtk/tkwrap.py index 1a0d2e84..e6917cda 100644 --- a/pysollib/pysolgtk/tkwrap.py +++ b/pysollib/pysolgtk/tkwrap.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolgtk/toolbar.py b/pysollib/pysolgtk/toolbar.py index 4218aa71..d8e4b100 100644 --- a/pysollib/pysolgtk/toolbar.py +++ b/pysollib/pysolgtk/toolbar.py @@ -1,16 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -19,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysolrandom.py b/pysollib/pysolrandom.py index 29669162..0ae56d0f 100644 --- a/pysollib/pysolrandom.py +++ b/pysollib/pysolrandom.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/pysoltk.py b/pysollib/pysoltk.py index e4c75e44..68940ea5 100644 --- a/pysollib/pysoltk.py +++ b/pysollib/pysoltk.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/resource.py b/pysollib/resource.py index d739c557..bac770a0 100644 --- a/pysollib/resource.py +++ b/pysollib/resource.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -402,8 +390,9 @@ class CardsetManager(ResourceManager): cs.ranks = range(13) cs.suits = "cshd" elif s == CSI.TYPE_HANAFUDA: - cs.ranks = range(12) - cs.suits = "cshd" + cs.nbottoms = 15 + cs.ranks = range(4) + cs.suits = "abcdefghijkl" elif s == CSI.TYPE_TAROCK: cs.nbottoms = 8 cs.ranks = range(14) diff --git a/pysollib/settings.py b/pysollib/settings.py index 7836b229..9f5bd7b4 100644 --- a/pysollib/settings.py +++ b/pysollib/settings.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -28,8 +30,8 @@ PACKAGE = 'PySolFC' TITLE = 'PySol' PACKAGE_URL = 'http://pysolfc.sourceforge.net/' -VERSION = '1.1.1' -VERSION_TUPLE = (1, 1, 1) +VERSION = '2.0' +VERSION_TUPLE = (2, 0) # Tk windowing system (auto set up in init.py) WIN_SYSTEM = 'x11' # win32, x11, aqua, classic diff --git a/pysollib/stack.py b/pysollib/stack.py index 45b36377..bcbb5afd 100644 --- a/pysollib/stack.py +++ b/pysollib/stack.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/stats.py b/pysollib/stats.py index b93715bf..48ecd5cc 100644 --- a/pysollib/stats.py +++ b/pysollib/stats.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/__init__.py b/pysollib/tile/__init__.py index e69de29b..49ecb276 100644 --- a/pysollib/tile/__init__.py +++ b/pysollib/tile/__init__.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## diff --git a/pysollib/tile/card.py b/pysollib/tile/card.py index ad9fce62..acba753e 100644 --- a/pysollib/tile/card.py +++ b/pysollib/tile/card.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/colorsdialog.py b/pysollib/tile/colorsdialog.py index 6ecdd8e8..dab7e894 100644 --- a/pysollib/tile/colorsdialog.py +++ b/pysollib/tile/colorsdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/edittextdialog.py b/pysollib/tile/edittextdialog.py index b5309138..12f299bb 100644 --- a/pysollib/tile/edittextdialog.py +++ b/pysollib/tile/edittextdialog.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/findcarddialog.py b/pysollib/tile/findcarddialog.py index 26f9e4c0..8309a997 100644 --- a/pysollib/tile/findcarddialog.py +++ b/pysollib/tile/findcarddialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/fontsdialog.py b/pysollib/tile/fontsdialog.py index 30602da2..d55e5091 100644 --- a/pysollib/tile/fontsdialog.py +++ b/pysollib/tile/fontsdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/gameinfodialog.py b/pysollib/tile/gameinfodialog.py index ee0c9344..eb303492 100644 --- a/pysollib/tile/gameinfodialog.py +++ b/pysollib/tile/gameinfodialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/menubar.py b/pysollib/tile/menubar.py index 07517902..ef7347cc 100644 --- a/pysollib/tile/menubar.py +++ b/pysollib/tile/menubar.py @@ -1,21 +1,14 @@ -# -*- coding: koi8-r -*- -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -24,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/playeroptionsdialog.py b/pysollib/tile/playeroptionsdialog.py index 75279b5a..5d25c62a 100644 --- a/pysollib/tile/playeroptionsdialog.py +++ b/pysollib/tile/playeroptionsdialog.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/progressbar.py b/pysollib/tile/progressbar.py index 2cd08c5e..d781a120 100644 --- a/pysollib/tile/progressbar.py +++ b/pysollib/tile/progressbar.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/selectcardset.py b/pysollib/tile/selectcardset.py index 3362f3ba..7db38413 100644 --- a/pysollib/tile/selectcardset.py +++ b/pysollib/tile/selectcardset.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/selectgame.py b/pysollib/tile/selectgame.py index 0d1617d6..75c3d468 100644 --- a/pysollib/tile/selectgame.py +++ b/pysollib/tile/selectgame.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/selecttile.py b/pysollib/tile/selecttile.py index 626314ed..7d5912d7 100644 --- a/pysollib/tile/selecttile.py +++ b/pysollib/tile/selecttile.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/selecttree.py b/pysollib/tile/selecttree.py index 31aafc5d..fa2855bd 100644 --- a/pysollib/tile/selecttree.py +++ b/pysollib/tile/selecttree.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/solverdialog.py b/pysollib/tile/solverdialog.py index cb0378c6..c75c0215 100644 --- a/pysollib/tile/solverdialog.py +++ b/pysollib/tile/solverdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/soundoptionsdialog.py b/pysollib/tile/soundoptionsdialog.py index cdbe0d12..32c0a9fb 100644 --- a/pysollib/tile/soundoptionsdialog.py +++ b/pysollib/tile/soundoptionsdialog.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/statusbar.py b/pysollib/tile/statusbar.py index a650b708..edb1f4a2 100644 --- a/pysollib/tile/statusbar.py +++ b/pysollib/tile/statusbar.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/timeoutsdialog.py b/pysollib/tile/timeoutsdialog.py index e5edc93e..f4de902e 100644 --- a/pysollib/tile/timeoutsdialog.py +++ b/pysollib/tile/timeoutsdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/tkcanvas.py b/pysollib/tile/tkcanvas.py index 173f4235..f4719232 100644 --- a/pysollib/tile/tkcanvas.py +++ b/pysollib/tile/tkcanvas.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/tkconst.py b/pysollib/tile/tkconst.py index 7e215a65..c7fb4ec1 100644 --- a/pysollib/tile/tkconst.py +++ b/pysollib/tile/tkconst.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/tkhtml.py b/pysollib/tile/tkhtml.py index 78facadf..f0a2371d 100644 --- a/pysollib/tile/tkhtml.py +++ b/pysollib/tile/tkhtml.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/tkstats.py b/pysollib/tile/tkstats.py index 278a5d65..a647e91c 100644 --- a/pysollib/tile/tkstats.py +++ b/pysollib/tile/tkstats.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/tktree.py b/pysollib/tile/tktree.py index d7071483..ae5e95ec 100644 --- a/pysollib/tile/tktree.py +++ b/pysollib/tile/tktree.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/tkutil.py b/pysollib/tile/tkutil.py index d8e43389..84ba18e5 100644 --- a/pysollib/tile/tkutil.py +++ b/pysollib/tile/tkutil.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/tkwidget.py b/pysollib/tile/tkwidget.py index a5c3dab0..0f145423 100644 --- a/pysollib/tile/tkwidget.py +++ b/pysollib/tile/tkwidget.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/tkwrap.py b/pysollib/tile/tkwrap.py index a71b462d..b93e9d9c 100644 --- a/pysollib/tile/tkwrap.py +++ b/pysollib/tile/tkwrap.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/toolbar.py b/pysollib/tile/toolbar.py index 226a8d58..f0e399ae 100644 --- a/pysollib/tile/toolbar.py +++ b/pysollib/tile/toolbar.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tile/ttk.py b/pysollib/tile/ttk.py index 6f6723e1..4baf1b58 100644 --- a/pysollib/tile/ttk.py +++ b/pysollib/tile/ttk.py @@ -1,3 +1,25 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## """Ttk wrapper. This module provides classes to allow using Tk themed widget set. @@ -12,7 +34,7 @@ maintaining the widget state and invoking callbacks, all aspects of the widgets appearance lies at Themes. """ -__version__ = "0.1.2" +__version__ = "0.3" __author__ = "Guilherme Polo " @@ -21,7 +43,9 @@ __all__ = ["Button", "Checkbutton", "Combobox", "Entry", "Frame", "Label", "PanedWindow", "Progressbar", "Radiobutton", "Scale", "Scrollbar", "Separator", "Sizegrip", "Style", "Treeview", # Extensions - "LabeledScale", "OptionMenu"] + "LabeledScale", "OptionMenu", + # functions + "tclobjs_to_py"] import Tkinter @@ -52,7 +76,7 @@ def _loadttk(loadtk): Tkinter.Tk._loadtk = _loadttk(Tkinter.Tk._loadtk) def _format_optdict(optdict, script=False, ignore=None): - """Formats optdict to pass it to tk.call. + """Formats optdict to a tuple to pass it to tk.call. E.g. (script=False): {'foreground': 'blue', 'padding': [1, 2, 3, 4]} returns: @@ -71,13 +95,18 @@ def _format_optdict(optdict, script=False, ignore=None): v.append(unicode(val) if val else '{}') else: v.append(str(val)) - value = format % ' '.join(v) + + # format v according to the script option, but also check for + # space in any value in v in order to group them correctly + value = format % ' '.join( + ('{%s}' if ' ' in val else '%s') % val for val in v) if script and value == '': value = '{}' # empty string in Python is equivalent to {} in Tcl opts.append(("-%s" % opt, value)) + # Remember: _flatten skips over None return _flatten(opts) def _format_mapdict(mapdict, script=False): @@ -155,7 +184,7 @@ def _format_elemcreate(etype, script=False, *args, **kw): return spec, opts -def _format_layoutlist(layout, indent=2, indent_size=2): +def _format_layoutlist(layout, indent=0, indent_size=2): """Formats a layout list so we can pass the result to ttk::style layout and ttk::style settings. Note that the layout doesn't has to be a list necessarily. @@ -194,7 +223,8 @@ def _format_layoutlist(layout, indent=2, indent_size=2): if "children" in opts: script.append(head + " -children {") indent += indent_size - newscript, indent = _format_layoutlist(opts['children'], indent) + newscript, indent = _format_layoutlist(opts['children'], indent, + indent_size) script.append(newscript) indent -= indent_size script.append('%s}' % (' ' * indent)) @@ -213,11 +243,11 @@ def _script_from_settings(settings): for name, opts in settings.iteritems(): # will format specific keys according to Tcl code if opts.get('configure'): # format 'configure' - s = ' '.join(map(str, _format_optdict(opts['configure'], True))) + s = ' '.join(map(unicode, _format_optdict(opts['configure'], True))) script.append("ttk::style configure %s %s;" % (name, s)) if opts.get('map'): # format 'map' - s = ' '.join(map(str, _format_mapdict(opts['map'], True))) + s = ' '.join(map(unicode, _format_mapdict(opts['map'], True))) script.append("ttk::style map %s %s;" % (name, s)) if 'layout' in opts: # format 'layout' which may be empty @@ -251,37 +281,29 @@ def _dict_from_tcltuple(ttuple, cut_minus=True): be removed. ttuple is expected to contain an even number of elements.""" - opts = [] opt_start = 1 if cut_minus else 0 + retdict = {} for opt, val in zip(iter(ttuple[::2]), iter(ttuple[1::2])): - if isinstance(val, basestring): - try: - if ' ' in val: # could be the padding option - val = map(int, val.split()) - elif val.isdigit(): - val = int(val) - except ValueError: # leave val untouched for now - pass + retdict[str(opt)[opt_start:]] = val - elif val and hasattr(val, '__len__') and hasattr(val[0], 'typename'): - # could be a statespec - val = _list_from_statespec(val) - - elif hasattr(val, 'typename'): - # some other Tcl object - val = str(val) - - opts.append((str(opt)[opt_start:], val)) - - return dict(opts) + return tclobjs_to_py(retdict) def _list_from_statespec(stuple): """Construct a list from the given statespec tuple according to the accepted statespec accepted by _format_mapdict.""" - split_it = lambda ob: getattr(ob, 'typename', None) == 'StateSpec' - val = [str(val).split() if split_it(val) else val for val in stuple] - return [_flatten(spec) for spec in zip(iter(val[::2]), iter(val[1::2]))] + nval = [] + for val in stuple: + typename = getattr(val, 'typename', None) + if typename is None: + nval.append(val) + else: # this is a Tcl object + val = str(val) + if typename == 'StateSpec': + val = val.split() + nval.append(val) + + return [_flatten(spec) for spec in zip(iter(nval[::2]), iter(nval[1::2]))] def _list_from_layouttuple(ltuple): """Construct a list from the tuple returned by ttk::layout, this is @@ -326,6 +348,33 @@ def _val_or_dict(options, func, *args): return _dict_from_tcltuple(res) +def _convert_stringval(value): + """Converts a value to, hopefully, a more appropriate Python object.""" + value = unicode(value) + try: + value = int(value) + except (ValueError, TypeError): + pass + + return value + +def tclobjs_to_py(adict): + """Returns adict with its values converted from Tcl objects to Python + objects.""" + for opt, val in adict.iteritems(): + if val and hasattr(val, '__len__') and not isinstance(val, basestring): + if getattr(val[0], 'typename', None) == 'StateSpec': + val = _list_from_statespec(val) + else: + val = map(_convert_stringval, val) + + elif hasattr(val, 'typename'): # some other (single) Tcl object + val = _convert_stringval(val) + + adict[opt] = val + + return adict + class Style(object): """Manipulate style database.""" @@ -333,12 +382,15 @@ class Style(object): _name = "ttk::style" def __init__(self, master=None): - if not master: - if not Tkinter._default_root: - Tkinter._default_root = Tkinter.Tk() - master = Tkinter._default_root + if master is None: + if Tkinter._support_default_root: + master = Tkinter._default_root or Tkinter.Tk() + else: + raise RuntimeError("No master specified and Tkinter is " + "configured to not support default master") - self.tk = master.tk + self.master = master + self.tk = self.master.tk def configure(self, style, query_opt=None, **kw): @@ -347,12 +399,9 @@ class Style(object): Each key in kw is an option and each value is either a string or a sequence identifying the value for that option.""" - if query_opt: - query_opt = ('' if query_opt.startswith('-') else '-') + query_opt - return self.tk.call(self._name, "configure", style, query_opt) - - return _dict_from_tcltuple(self.tk.call(self._name, "configure", style, - *(_format_optdict(kw)))) + if query_opt is not None: + kw[query_opt] = None + return _val_or_dict(kw, self.tk.call, self._name, "configure", style) def map(self, style, query_opt=None, **kw): @@ -363,13 +412,12 @@ class Style(object): tuple (usually) containing statespecs grouped in tuples, or list, or something else of your preference. A statespec is compound of one or more states and then a value.""" - if query_opt: - query_opt = ('' if query_opt.startswith('-') else '-') + query_opt - return _list_from_statespec(self.tk.call(self._name, "map", style, - query_opt)) + if query_opt is not None: + return _list_from_statespec( + self.tk.call(self._name, "map", style, '-%s' % query_opt)) - return _dict_from_tcltuple(self.tk.call(self._name, "map", style, - *(_format_mapdict(kw)))) + return _dict_from_tcltuple( + self.tk.call(self._name, "map", style, *(_format_mapdict(kw)))) def lookup(self, style, option, state=None, default=None): @@ -379,9 +427,9 @@ class Style(object): or more states. If the default argument is set, it is used as a fallback value in case no specification for option is found.""" state = ' '.join(state) if state else '' - option = ('-' if not option.startswith('-') else '') + option - return self.tk.call(self._name, "lookup", style, option, state, default) + return self.tk.call(self._name, "lookup", style, '-%s' % option, + state, default) def layout(self, style, layoutspec=None): @@ -423,15 +471,15 @@ class Style(object): lspec = "null" # could be any other word, but this may make sense # when calling layout(style) later - return _list_from_layouttuple(self.tk.call(self._name, "layout", style, - lspec)) + return _list_from_layouttuple( + self.tk.call(self._name, "layout", style, lspec)) def element_create(self, elementname, etype, *args, **kw): """Create a new element in the current theme of given etype.""" spec, opts = _format_elemcreate(etype, False, *args, **kw) self.tk.call(self._name, "element", "create", elementname, etype, - spec, *opts) + spec, *opts) def element_names(self): @@ -455,10 +503,10 @@ class Style(object): if parent: self.tk.call(self._name, "theme", "create", themename, - "-parent", parent, "-settings", script) + "-parent", parent, "-settings", script) else: self.tk.call(self._name, "theme", "create", themename, - "-settings", script) + "-settings", script) def theme_settings(self, themename, settings): @@ -478,9 +526,19 @@ class Style(object): return self.tk.call(self._name, "theme", "names") - def theme_use(self, themename): - """Sets the current theme to themename and refreshes all widgets.""" - self.tk.call(self._name, "theme", "use", themename) + def theme_use(self, themename=None): + """If themename is None, returns the theme in use, otherwise, set + the current theme to themename, refreshes all widgets and emits + a <> event.""" + if themename is None: + # Starting on Tk 8.6, checking this global is no longer needed + # since it allows doing self.tk.call(self._name, "theme", "use") + return self.tk.eval("return $ttk::currentTheme") + + # using "ttk::setTheme" instead of "ttk::style theme use" causes + # the variable currentTheme to be updated, also, ttk::setTheme calls + # "ttk::style theme use" in order to change theme. + self.tk.call("ttk::setTheme", themename) class Widget(Tkinter.Widget): @@ -520,15 +578,15 @@ class Widget(Tkinter.Widget): def instate(self, statespec, callback=None, *args, **kw): """Test the widget's state. - If callback is not specified, returns 1 if the widget state - matches statespec and 0 otherwise. If callback is specified, + If callback is not specified, returns True if the widget state + matches statespec and False otherwise. If callback is specified, then it will be invoked with *args, **kw if the widget state matches statespec. statespec is expected to be a sequence.""" ret = self.tk.call(self._w, "instate", ' '.join(statespec)) if ret and callback: return callback(*args, **kw) - return ret + return bool(ret) def state(self, statespec=None): @@ -538,10 +596,10 @@ class Widget(Tkinter.Widget): set according to the statespec flags and then a new state spec is returned indicating which flags were changed. statespec is expected to be a sequence.""" - statespec = statespec or '' + if statespec is not None: + statespec = ' '.join(statespec) - return self.tk.splitlist( - str(self.tk.call(self._w, "state", ' '.join(statespec)))) + return self.tk.splitlist(str(self.tk.call(self._w, "state", statespec))) class Button(Widget): @@ -634,9 +692,9 @@ class Entry(Widget, Tkinter.Entry): def validate(self): """Force revalidation, independent of the conditions specified - by the validate option. Returns 0 if validation fails, 1 if it - succeeds. Sets or clears the invalid state accordingly.""" - return self.tk.call(self._w, "validate") + by the validate option. Returns False if validation fails, True + if it succeeds. Sets or clears the invalid state accordingly.""" + return bool(self.tk.call(self._w, "validate")) class Combobox(Entry): @@ -655,9 +713,30 @@ class Combobox(Entry): exportselection, justify, height, postcommand, state, textvariable, values, width """ + # The "values" option may need special formatting, so leave to + # _format_optdict the responsability to format it + if "values" in kw: + kw["values"] = _format_optdict({'v': kw["values"]})[1] + Entry.__init__(self, master, "ttk::combobox", **kw) + def __setitem__(self, item, value): + if item == "values": + value = _format_optdict({item: value})[1] + + Entry.__setitem__(self, item, value) + + + def configure(self, cnf=None, **kw): + """Custom Combobox configure, created to properly format the values + option.""" + if "values" in kw: + kw["values"] = _format_optdict({'v': kw["values"]})[1] + + return Entry.configure(self, cnf, **kw) + + def current(self, newindex=None): """If newindex is supplied, sets the combobox value to the element at position newindex in the list of values. Otherwise, @@ -839,18 +918,20 @@ class Notebook(Widget): return self.tk.call(self._w, "select", tab_id) - def tab(self, tab_id, **kw): - """Query or modify the options of the specific tab. + def tab(self, tab_id, option=None, **kw): + """Query or modify the options of the specific tab_id. - If no option is specified, returns a dictionary of the tab option - values. If one option is specified, returns the value of that - option. Otherwise, sets the options to the corresponding values.""" + If kw is not given, returns a dict of the tab option values. If option + is specified, returns the value of that option. Otherwise, sets the + options to the corresponding values.""" + if option is not None: + kw[option] = None return _val_or_dict(kw, self.tk.call, self._w, "tab", tab_id) def tabs(self): """Returns a list of windows managed by the notebook.""" - return self.tk.call(self._w, "tabs") + return self.tk.call(self._w, "tabs") or () def enable_traversal(self): @@ -901,6 +982,9 @@ class Panedwindow(Widget, Tkinter.PanedWindow): Widget.__init__(self, master, "ttk::panedwindow", kw) + forget = Tkinter.PanedWindow.forget # overrides Pack.forget + + def insert(self, pos, child, **kw): """Inserts a pane at the specified positions. @@ -910,13 +994,15 @@ class Panedwindow(Widget, Tkinter.PanedWindow): self.tk.call(self._w, "insert", pos, child, *(_format_optdict(kw))) - def pane(self, pane, **kw): + def pane(self, pane, option=None, **kw): """Query or modify the options of the specified pane. - pane is either an integer index or the name of a managed - subwindow. If no options are specified, returns a dict of the - pane option values, if an option is specified without a value, - returns the value of that option. Otherwise, the options are set.""" + pane is either an integer index or the name of a managed subwindow. + If kw is not given, returns a dict of the pane option values. If + option is specified then the value for that option is returned. + Otherwise, sets the options to the correspoding values.""" + if option is not None: + kw[option] = None return _val_or_dict(kw, self.tk.call, self._w, "pane", pane) @@ -1021,6 +1107,18 @@ class Scale(Widget, Tkinter.Scale): Widget.__init__(self, master, "ttk::scale", kw) + def configure(self, cnf=None, **kw): + """Modify or query scale options. + + Setting a value for any of the "from", "from_" or "to" options + generates a <> event.""" + if cnf: + kw.update(cnf) + Widget.configure(self, **kw) + if any(['from' in kw, 'from_' in kw, 'to' in kw]): + self.event_generate('<>') + + def get(self, x=None, y=None): """Get the current value of the value option, or the value corresponding to the coordinates x, y if they are specified. @@ -1119,12 +1217,14 @@ class Treeview(Widget): return self.tk.call(self._w, "bbox", item, column) - def get_children(self, item): - """Returns a tuple of children belonging to item.""" - return self.tk.call(self._w, "children", item) + def get_children(self, item=None): + """Returns a tuple of children belonging to item. + + If item is not specified, returns root children.""" + return self.tk.call(self._w, "children", item or '') or () - def set_children(self, item, newchildren): + def set_children(self, item, *newchildren): """Replaces item's child with newchildren. Children present in item that are not present in newchildren @@ -1133,13 +1233,14 @@ class Treeview(Widget): self.tk.call(self._w, "children", item, newchildren) - def column(self, column, **kw): + def column(self, column, option=None, **kw): """Query or modify the options for the specified column. - If no options are specified, returns a dictionary of option/value - pairs. If an option is specified with value None, returns the - value of that option. Otherwise, the options are updated with the - specified values.""" + If kw is not given, returns a dict of the column option values. If + option is specified then the value for that option is returned. + Otherwise, sets the options to the corresponding values.""" + if option is not None: + kw[option] = None return _val_or_dict(kw, self.tk.call, self._w, "column", column) @@ -1149,7 +1250,7 @@ class Treeview(Widget): self.tk.call(self._w, "delete", items) - def detach(self, 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 @@ -1159,9 +1260,9 @@ class Treeview(Widget): def exists(self, item): - """Returns 1 if the specified item is present in the three, - 0 otherwise.""" - return self.tk.call(self._w, "exists", item) + """Returns True if the specified item is present in the three, + False otherwise.""" + return bool(self.tk.call(self._w, "exists", item)) def focus(self, item=None): @@ -1170,9 +1271,13 @@ class Treeview(Widget): return self.tk.call(self._w, "focus", item) - def heading(self, column, **kw): + def heading(self, column, option=None, **kw): """Query or modify the heading options for the specified column. + If kw is not given, returns a dict of the heading option values. If + option is specified then the value for that option is returned. + Otherwise, sets the options to the corresponding values. + Valid options/values are: text: text The text to display in the column heading @@ -1192,6 +1297,9 @@ class Treeview(Widget): # callback not registered yet, do it now kw['command'] = self.master.register(cmd, self._substitute) + if option is not None: + kw[option] = None + return _val_or_dict(kw, self.tk.call, self._w, 'heading', column) @@ -1214,6 +1322,25 @@ class Treeview(Widget): return self.identify("column", x, 0) + def identify_region(self, x, y): + """Returns one of: + + heading: Tree heading area. + separator: Space between two columns headings; + tree: The tree area. + cell: A data cell. + + * Availability: Tk 8.6""" + return self.identify("region", x, y) + + + def identify_element(self, x, y): + """Returns the element at position x, y. + + * Availability: Tk 8.6""" + return self.identify("element", x, y) + + def index(self, item): """Returns the integer index of item within its parent's list of children.""" @@ -1233,28 +1360,24 @@ class Treeview(Widget): is specified, it is used as the item identifier, iid must not already exist in the tree. Otherwise, a new unique identifier is generated.""" - opts, values = _format_optdict(kw, ignore='values'), kw.get('values') - # values may need special formatting if any value contains a space - if values: - values = map(unicode, values) - opts += ("-values", - ' '.join(('{%s}' if ' ' in v else '%s') % v for v in values)) + opts = _format_optdict(kw) if iid: - res = self.tk.call(self._w, "insert", parent, index, "-id", iid, - *opts) + res = self.tk.call(self._w, "insert", parent, index, + "-id", iid, *opts) else: res = self.tk.call(self._w, "insert", parent, index, *opts) return res - def item(self, item, **kw): + def item(self, item, option=None, **kw): """Query or modify the options for the specified item. - If no options are specified, returns a dictionary of option/value - pairs. If a single option is specified with value None, returns - the value of that option. Otherwise, the item's options are - updated with the specified values.""" + If kw is not given, returns a dict of item option values. If option + is specified then the value for that option is returned. Otherwise, + sets the options to the corresponding values.""" + if option is not None: + kw[option] = None return _val_or_dict(kw, self.tk.call, self._w, "item", item) @@ -1341,17 +1464,26 @@ class Treeview(Widget): self._bind((self._w, "tag", "bind", tagname), sequence, callback, add=0) - def tag_configure(self, tagname, **kw): + def tag_configure(self, tagname, option=None, **kw): """Query or modify the options for the specified tagname. - If one or more option/value pairs are specified, sets the value - of those options for the specified tag. If a single option - is specified with value None, returns the value of that option - (or the empty string if the option has not been specified for - tagname). With no additional arguments, returns a dictionary of - the option settings for tagname.""" + If kw is not given, returns a dict of the option settings for tagname. + If option is specified, returns the value for that option for the + specified tagname. Otherwise, sets the options to the corresponding + values for the given tagname.""" + if option is not None: + kw[option] = None return _val_or_dict(kw, self.tk.call, self._w, "tag", "configure", - tagname) + tagname) + + + def tag_has(self, tagname, item=None): + """If item is specified, returns 1 or 0 depending on whether the + specified item has the given tagname. Otherwise, returns a list of + all items which have the specified tag. + + * Availability: Tk 8.6""" + return self.tk.call(self._w, "tag", "has", tagname, item) def xview(self, *args): @@ -1367,17 +1499,17 @@ class Treeview(Widget): # Extensions class LabeledScale(Frame, object): - """A Ttk Scale widget with a Ttk Label widget over it indicating its + """A Ttk Scale widget with a Ttk Label widget indicating its current value. The Ttk Scale can be accessed through instance.scale, and Ttk Label can be accessed through instance.label""" def __init__(self, master=None, variable=None, from_=0, to=10, **kw): - """Construct a LabeledScale with parent master, a variable to be - associated with the Ttk Scale widget and its range. If variable is - not specified, a Tkinter.IntVar is created. - + """Construct an horizontal LabeledScale with parent master, a + variable to be associated with the Ttk Scale widget and its range. + If variable is not specified, a Tkinter.IntVar is created. + WIDGET-SPECIFIC OPTIONS compound: 'top' or 'bottom' @@ -1385,11 +1517,15 @@ class LabeledScale(Frame, object): Defaults to 'top'. """ self._label_top = kw.pop('compound', 'top') == 'top' + Frame.__init__(self, master, **kw) - self._variable = variable or Tkinter.IntVar(master, value=from_) + self._variable = variable or Tkinter.IntVar(master) + self._variable.set(from_) + self._last_valid = from_ self.label = Label(self) self.scale = Scale(self, variable=self._variable, from_=from_, to=to) + self.scale.bind('<>', self._adjust) # position scale and label according to the compound option scale_side = 'bottom' if self._label_top else 'top' @@ -1399,28 +1535,43 @@ class LabeledScale(Frame, object): self.label.place(anchor='n' if label_side == 'top' else 's') # update the label as scale or variable changes - self._variable.trace_variable('w', self._adjust) - self.scale.bind('', self._adjust) - self.scale.bind('', self._adjust) + self.__tracecb = self._variable.trace_variable('w', self._adjust) + self.bind('', self._adjust) + self.bind('', self._adjust) + + + def destroy(self): + """Destroy this widget and possibly its associated variable.""" + self._variable.trace_vdelete('w', self.__tracecb) + del self._variable + Frame.destroy(self) def _adjust(self, *args): """Adjust the label position according to the scale.""" + def adjust_label(): + self.update_idletasks() # "force" scale redraw + + x, y = self.scale.coords() + if self._label_top: + y = self.scale.winfo_y() - self.label.winfo_reqheight() + else: + y = self.scale.winfo_reqheight() + self.label.winfo_reqheight() + + self.label.place_configure(x=x, y=y) + + from_, to = self.scale['from'], self.scale['to'] + if to < from_: + from_, to = to, from_ newval = self._variable.get() - if not self.scale['from'] <= newval <= self.scale['to']: + if not from_ <= newval <= to: + # value outside range, set value back to the last valid one + self.value = self._last_valid return - self.update() + self._last_valid = newval self.label['text'] = newval - - x, y = self.scale.coords() - if self._label_top: - y = self.scale.winfo_y() - self.label.winfo_reqheight() - else: - y = self.scale.winfo_reqheight() + self.label.winfo_reqheight() - x = x + self.scale.winfo_x() - - self.label.place_configure(x=x, y=y) + self.after_idle(adjust_label) def _get_value(self): @@ -1437,32 +1588,41 @@ class LabeledScale(Frame, object): class OptionMenu(Menubutton): - """Themed OptionMenu which allows the user to select a value from a - menu.""" + """Themed OptionMenu, based after Tkinter's OptionMenu, which allows + the user to select a value from a menu.""" def __init__(self, master, variable, default=None, *values, **kwargs): - """Construct a themed OptionMenu widget with the parent master, + """Construct a themed OptionMenu widget with master as the parent, the resource textvariable set to variable, the initially selected - value specified by the default parameter, the other menu values - given by *values and an additional keyword argument command.""" + value specified by the default parameter, the menu values given by + *values and additional keywords. + + WIDGET-SPECIFIC OPTIONS + + style: stylename + Menubutton style. + direction: 'above', 'below', 'left', 'right', or 'flush' + Menubutton direction. + command: callback + A callback that will be invoked after selecting an item. + """ kw = {'textvariable': variable, 'style': kwargs.pop('style', None), 'direction': kwargs.pop('direction', None)} Menubutton.__init__(self, master, **kw) + self['menu'] = Tkinter.Menu(self, tearoff=False) - self._menu = Tkinter.Menu(self, name="menu", tearoff=0) - self._callback = kwargs.pop('command', None) self._variable = variable + self._callback = kwargs.pop('command', None) if kwargs: raise Tkinter.TclError('unknown option -%s' % ( kwargs.iterkeys().next())) - self['menu'] = self._menu - self.set_menu(default, *((default, ) + values)) + self.set_menu(default, *values) def __getitem__(self, item): if item == 'menu': - return self._menu + return self.nametowidget(Menubutton.__getitem__(self, item)) return Menubutton.__getitem__(self, item) @@ -1481,6 +1641,6 @@ class OptionMenu(Menubutton): def destroy(self): - """Destroy this widget and the associated menu.""" + """Destroy this widget and its associated variable.""" + del self._variable Menubutton.destroy(self) - self._menu = None diff --git a/pysollib/tile/wizarddialog.py b/pysollib/tile/wizarddialog.py index a17b6ac2..fbc02051 100644 --- a/pysollib/tile/wizarddialog.py +++ b/pysollib/tile/wizarddialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/__init__.py b/pysollib/tk/__init__.py index e69de29b..49ecb276 100644 --- a/pysollib/tk/__init__.py +++ b/pysollib/tk/__init__.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## diff --git a/pysollib/tk/card.py b/pysollib/tk/card.py index ad9fce62..acba753e 100644 --- a/pysollib/tk/card.py +++ b/pysollib/tk/card.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/colorsdialog.py b/pysollib/tk/colorsdialog.py index 5c10314f..e15da00c 100644 --- a/pysollib/tk/colorsdialog.py +++ b/pysollib/tk/colorsdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/edittextdialog.py b/pysollib/tk/edittextdialog.py index 2a423908..c4d32ed4 100644 --- a/pysollib/tk/edittextdialog.py +++ b/pysollib/tk/edittextdialog.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/findcarddialog.py b/pysollib/tk/findcarddialog.py index 88e3e649..70076441 100644 --- a/pysollib/tk/findcarddialog.py +++ b/pysollib/tk/findcarddialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/fontsdialog.py b/pysollib/tk/fontsdialog.py index 8b7cd931..3b81997c 100644 --- a/pysollib/tk/fontsdialog.py +++ b/pysollib/tk/fontsdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/gameinfodialog.py b/pysollib/tk/gameinfodialog.py index a54d4f79..61200aa6 100644 --- a/pysollib/tk/gameinfodialog.py +++ b/pysollib/tk/gameinfodialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/menubar.py b/pysollib/tk/menubar.py index 3746ec4a..0d374aa1 100644 --- a/pysollib/tk/menubar.py +++ b/pysollib/tk/menubar.py @@ -1,21 +1,14 @@ -# -*- coding: koi8-r -*- -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -24,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/playeroptionsdialog.py b/pysollib/tk/playeroptionsdialog.py index 4b5b2134..925990f4 100644 --- a/pysollib/tk/playeroptionsdialog.py +++ b/pysollib/tk/playeroptionsdialog.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/progressbar.py b/pysollib/tk/progressbar.py index ef1c0c32..792f8b11 100644 --- a/pysollib/tk/progressbar.py +++ b/pysollib/tk/progressbar.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/selectcardset.py b/pysollib/tk/selectcardset.py index b0cf3320..2e3e4ace 100644 --- a/pysollib/tk/selectcardset.py +++ b/pysollib/tk/selectcardset.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/selectgame.py b/pysollib/tk/selectgame.py index 799684f0..d904d072 100644 --- a/pysollib/tk/selectgame.py +++ b/pysollib/tk/selectgame.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/selecttile.py b/pysollib/tk/selecttile.py index ec3846b6..f71eddc8 100644 --- a/pysollib/tk/selecttile.py +++ b/pysollib/tk/selecttile.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/selecttree.py b/pysollib/tk/selecttree.py index 31aafc5d..fa2855bd 100644 --- a/pysollib/tk/selecttree.py +++ b/pysollib/tk/selecttree.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/solverdialog.py b/pysollib/tk/solverdialog.py index cd3a2f99..8cd42fbf 100644 --- a/pysollib/tk/solverdialog.py +++ b/pysollib/tk/solverdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/soundoptionsdialog.py b/pysollib/tk/soundoptionsdialog.py index 0a2b3205..2d1f1be4 100644 --- a/pysollib/tk/soundoptionsdialog.py +++ b/pysollib/tk/soundoptionsdialog.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/statusbar.py b/pysollib/tk/statusbar.py index 93ce7a68..3458c636 100644 --- a/pysollib/tk/statusbar.py +++ b/pysollib/tk/statusbar.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/tabpage.py b/pysollib/tk/tabpage.py index 56a1e643..09ec1e0b 100644 --- a/pysollib/tk/tabpage.py +++ b/pysollib/tk/tabpage.py @@ -1,6 +1,25 @@ -# -# This file is part of IDLE project - http://www.python.org/idle/ -# +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- +##---------------------------------------------------------------------------## +## +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +##---------------------------------------------------------------------------## """ a couple of classes for implementing partial tabbed-page like behaviour """ diff --git a/pysollib/tk/timeoutsdialog.py b/pysollib/tk/timeoutsdialog.py index a9077a43..d0ac5564 100644 --- a/pysollib/tk/timeoutsdialog.py +++ b/pysollib/tk/timeoutsdialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/tkcanvas.py b/pysollib/tk/tkcanvas.py index a6a4d8c8..0c219943 100644 --- a/pysollib/tk/tkcanvas.py +++ b/pysollib/tk/tkcanvas.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/tkconst.py b/pysollib/tk/tkconst.py index 7e215a65..c7fb4ec1 100644 --- a/pysollib/tk/tkconst.py +++ b/pysollib/tk/tkconst.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/tkhtml.py b/pysollib/tk/tkhtml.py index a5be8340..491cce1f 100644 --- a/pysollib/tk/tkhtml.py +++ b/pysollib/tk/tkhtml.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/tkstats.py b/pysollib/tk/tkstats.py index e7b81f95..2d8ffc8a 100644 --- a/pysollib/tk/tkstats.py +++ b/pysollib/tk/tkstats.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/tktree.py b/pysollib/tk/tktree.py index f3fbcc14..6fcf7e77 100644 --- a/pysollib/tk/tktree.py +++ b/pysollib/tk/tktree.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/tkutil.py b/pysollib/tk/tkutil.py index d8e43389..84ba18e5 100644 --- a/pysollib/tk/tkutil.py +++ b/pysollib/tk/tkutil.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/tkwidget.py b/pysollib/tk/tkwidget.py index 1260e0b9..c61b89ec 100644 --- a/pysollib/tk/tkwidget.py +++ b/pysollib/tk/tkwidget.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/tkwrap.py b/pysollib/tk/tkwrap.py index a71b462d..b93e9d9c 100644 --- a/pysollib/tk/tkwrap.py +++ b/pysollib/tk/tkwrap.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/toolbar.py b/pysollib/tk/toolbar.py index aaa9a583..8c63646a 100644 --- a/pysollib/tk/toolbar.py +++ b/pysollib/tk/toolbar.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/tk/wizarddialog.py b/pysollib/tk/wizarddialog.py index 34c727fc..eba44dff 100644 --- a/pysollib/tk/wizarddialog.py +++ b/pysollib/tk/wizarddialog.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/util.py b/pysollib/util.py index 8c651421..19d17584 100644 --- a/pysollib/util.py +++ b/pysollib/util.py @@ -1,20 +1,14 @@ -## vim:ts=4:et:nowrap -## +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## 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 +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -23,13 +17,7 @@ ## 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 +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/winsystems/__init__.py b/pysollib/winsystems/__init__.py index b5bcac53..0847533c 100644 --- a/pysollib/winsystems/__init__.py +++ b/pysollib/winsystems/__init__.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/winsystems/aqua.py b/pysollib/winsystems/aqua.py index bc9aadd8..8a4596d0 100644 --- a/pysollib/winsystems/aqua.py +++ b/pysollib/winsystems/aqua.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -23,7 +25,8 @@ import sys, os import Tkinter from pysollib.settings import TOOLKIT, USE_TILE -from pysollib.tile import ttk +if USE_TILE: + from pysollib.tile import ttk from pysollib.macosx.appSupport import hideTkConsole from common import base_init_root_window, BaseTkSettings diff --git a/pysollib/winsystems/common.py b/pysollib/winsystems/common.py index 5c38f34f..a5c093ca 100644 --- a/pysollib/winsystems/common.py +++ b/pysollib/winsystems/common.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -26,7 +28,8 @@ from pysollib.settings import VERSION from pysollib.settings import TOOLKIT, USE_TILE from pysollib.settings import DEBUG from pysollib.mfxutil import print_err -from pysollib.tile import ttk +if USE_TILE: + from pysollib.tile import ttk def init_tile(app, top): diff --git a/pysollib/winsystems/win32.py b/pysollib/winsystems/win32.py index 2cc0ad54..cbbb3978 100644 --- a/pysollib/winsystems/win32.py +++ b/pysollib/winsystems/win32.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,16 +17,15 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## import sys, os from pysollib.settings import TOOLKIT, USE_TILE -from pysollib.tile import ttk +if USE_TILE: + from pysollib.tile import ttk from common import base_init_root_window, BaseTkSettings diff --git a/pysollib/winsystems/x11.py b/pysollib/winsystems/x11.py index 1d86dcf6..a1789fab 100644 --- a/pysollib/winsystems/x11.py +++ b/pysollib/winsystems/x11.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## @@ -26,7 +28,8 @@ import tkFont from pysollib.settings import TITLE from pysollib.settings import TOOLKIT, USE_TILE -from pysollib.tile import ttk +if USE_TILE: + from pysollib.tile import ttk from common import base_init_root_window, BaseTkSettings, get_font_name diff --git a/pysollib/wizardpresets.py b/pysollib/wizardpresets.py index 260d26fb..ee471527 100644 --- a/pysollib/wizardpresets.py +++ b/pysollib/wizardpresets.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------## diff --git a/pysollib/wizardutil.py b/pysollib/wizardutil.py index 454a1b27..f13f9350 100644 --- a/pysollib/wizardutil.py +++ b/pysollib/wizardutil.py @@ -1,10 +1,14 @@ +#!/usr/bin/env python +# -*- mode: python; coding: utf-8; -*- ##---------------------------------------------------------------------------## ## -## PySol -- a Python Solitaire game +## Copyright (C) 1998-2003 Markus Franz Xaver Johannes Oberhumer +## Copyright (C) 2003 Mt. Hood Playing Card Co. +## Copyright (C) 2005-2009 Skomoroh ## -## This program is free software; you can redistribute it and/or modify +## 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 +## the Free Software Foundation, either version 3 of the License, or ## (at your option) any later version. ## ## This program is distributed in the hope that it will be useful, @@ -13,9 +17,7 @@ ## 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. +## along with this program. If not, see . ## ##---------------------------------------------------------------------------##