From d4e59a62954cf4758dc85f9c85414d5e1c12817c Mon Sep 17 00:00:00 2001 From: Mathieu Comandon Date: Sun, 25 Apr 2010 13:51:50 +0200 Subject: [PATCH] Fixed quidget conflict --- .quickly | 4 +- AUTHORS | 2 +- COPYING | 17 +- Copyright | 14 - LICENSE | 676 ------------------ apport/source_lutris.py | 14 + bin/lutris | 22 +- etc/apport/crashdb.conf.d/lutris-crashdb.conf | 9 + lutris/helpers.py | 36 + lutris/lutrisconfig.py | 10 + nbproject/private/private.properties | 1 - nbproject/private/private.xml | 4 - nbproject/project.properties | 12 - nbproject/project.xml | 13 - quidgets/__init__.py | 17 - quidgets/widgets/__init__.py | 0 quidgets/widgets/asynch_task_progressbox.py | 256 ------- quidgets/widgets/conventions.py | 22 - quidgets/widgets/dictionary_grid.py | 323 --------- quidgets/widgets/grid_column.py | 471 ------------ quidgets/widgets/grid_filter.py | 453 ------------ setup.py | 2 +- 22 files changed, 103 insertions(+), 2275 deletions(-) delete mode 100644 Copyright delete mode 100644 LICENSE create mode 100644 apport/source_lutris.py create mode 100644 etc/apport/crashdb.conf.d/lutris-crashdb.conf create mode 100644 lutris/helpers.py delete mode 100644 nbproject/private/private.properties delete mode 100644 nbproject/private/private.xml delete mode 100644 nbproject/project.properties delete mode 100644 nbproject/project.xml delete mode 100644 quidgets/__init__.py delete mode 100644 quidgets/widgets/__init__.py delete mode 100644 quidgets/widgets/asynch_task_progressbox.py delete mode 100644 quidgets/widgets/conventions.py delete mode 100644 quidgets/widgets/dictionary_grid.py delete mode 100644 quidgets/widgets/grid_column.py delete mode 100644 quidgets/widgets/grid_filter.py diff --git a/.quickly b/.quickly index ef045db8a..9a53dd4c6 100644 --- a/.quickly +++ b/.quickly @@ -1,4 +1,4 @@ project = lutris -template = ubuntu-project -format = 0.2.5 +template = ubuntu-application lp_id = lutris +version = 0.4.1 diff --git a/AUTHORS b/AUTHORS index d4ec9b043..ce7f31392 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1 @@ -# Copyright (C) 2010 Mathieu Comandon +Copyright (C) 2010 Mathieu Comandon diff --git a/COPYING b/COPYING index 10926e87f..443254047 100644 --- a/COPYING +++ b/COPYING @@ -1,11 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The GNU General Public License is a free, copyleft license for software and other kinds of works. @@ -68,7 +69,7 @@ patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. - TERMS AND CONDITIONS + TERMS AND CONDITIONS 0. Definitions. @@ -76,7 +77,7 @@ modification follow. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - + "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. @@ -509,7 +510,7 @@ 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 @@ -618,9 +619,9 @@ 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 + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it diff --git a/Copyright b/Copyright deleted file mode 100644 index e5f0204f9..000000000 --- a/Copyright +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (C) 2010 Mathieu Comandon -### BEGIN AUTOMATIC LICENSE GENERATION -#This program is free software: you can redistribute it and/or modify it -#under the terms of the GNU General Public License version 3, as published -#by the Free Software Foundation. -# -#This program is distributed in the hope that it will be useful, but -#WITHOUT ANY WARRANTY; without even the implied warranties of -#MERCHANTABILITY, SATISFACTORY QUALITY, 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 . -### END AUTOMATIC LICENSE GENERATION diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 443254047..000000000 --- a/LICENSE +++ /dev/null @@ -1,676 +0,0 @@ - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. - diff --git a/apport/source_lutris.py b/apport/source_lutris.py new file mode 100644 index 000000000..9b65e4c1f --- /dev/null +++ b/apport/source_lutris.py @@ -0,0 +1,14 @@ +# Apport integration for lutris +# +# -*- coding: utf-8 -*- +### BEGIN LICENSE +# This file is in the public domain +### END LICENSE +import apport + +def add_info(report): + """add report info""" + + if not apport.packaging.is_distro_package(report['Package'].split()[0]): + report['ThirdParty'] = 'True' + report['CrashDB'] = 'lutris' diff --git a/bin/lutris b/bin/lutris index 6a6c6014a..168f9838e 100755 --- a/bin/lutris +++ b/bin/lutris @@ -18,6 +18,15 @@ import sys import os import gtk + +# optional Launchpad integration +# this shouldn't crash if not found as it is simply used for bug reporting +try: + import LaunchpadIntegration + launchpad_available = True +except: + launchpad_available = False + import gobject # Check if we are working in the source tree or from the installed @@ -32,7 +41,7 @@ else: sys.path.insert(0, os.path.dirname(fullPath)) from coverflow import coverflow -from quidgets.widgets import dictionary_grid +from lutris.gui import dictionary_grid import runners from lutris import constants from lutris import AboutLutrisDialog @@ -74,6 +83,17 @@ class LutrisWindow(gtk.Window): self.builder = builder self.builder.connect_signals(self) + global launchpad_available + if launchpad_available: + # see https://wiki.ubuntu.com/UbuntuDevelopment/Internationalisation/Coding for more information + # about LaunchpadIntegration + helpmenu = self.builder.get_object('menu3') + if helpmenu: + LaunchpadIntegration.set_sourcepackagename('lutris') + LaunchpadIntegration.add_items(helpmenu, 0, False, True) + else: + launchpad_available = False + self.game_cover_image = self.builder.get_object("game_cover_image") self.game_cover_image.set_from_file("data/media/background.png") diff --git a/etc/apport/crashdb.conf.d/lutris-crashdb.conf b/etc/apport/crashdb.conf.d/lutris-crashdb.conf new file mode 100644 index 000000000..b6fdab631 --- /dev/null +++ b/etc/apport/crashdb.conf.d/lutris-crashdb.conf @@ -0,0 +1,9 @@ +### BEGIN LICENSE +# This file is in the public domain +### END LICENSE + +lutris = { + 'impl' : 'launchpad', + 'project' : 'lutris', + 'bug_pattern_base' : None, +} diff --git a/lutris/helpers.py b/lutris/helpers.py new file mode 100644 index 000000000..3cd37a093 --- /dev/null +++ b/lutris/helpers.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +### BEGIN LICENSE +# This file is in the public domain +### END LICENSE + +"""Helpers for an Ubuntu application.""" + +__all__ = [ + 'make_window', + ] + +import os +import gtk + +from lutris.lutrisconfig import get_data_file + +import gettext +from gettext import gettext as _ +gettext.textdomain('lutris') + +def get_builder(builder_file_name): + """Return a fully-instantiated gtk.Builder instance from specified ui + file + + :param builder_file_name: The name of the builder file, without extension. + Assumed to be in the 'ui' directory under the data path. + """ + # Look for the ui file that describes the user interface. + ui_filename = get_data_file('ui', '%s.ui' % (builder_file_name,)) + if not os.path.exists(ui_filename): + ui_filename = None + + builder = gtk.Builder() + builder.set_translation_domain('lutris') + builder.add_from_file(ui_filename) + return builder diff --git a/lutris/lutrisconfig.py b/lutris/lutrisconfig.py index c51012c11..389e8fa9f 100644 --- a/lutris/lutrisconfig.py +++ b/lutris/lutrisconfig.py @@ -22,6 +22,7 @@ # where your project will head for your data (for instance, images and ui files) # by default, this is ../data, relative your trunk layout __lutris_data_directory__ = '../data/' +__license__ = 'GPL-3' import os @@ -29,6 +30,15 @@ import os class project_path_not_found(Exception): pass +def get_data_file(*path_segments): + """Get the full path to a data file. + + Returns the path to a file underneath the data directory (as defined by + `get_data_path`). Equivalent to os.path.join(get_data_path(), + *path_segments). + """ + return os.path.join(getdatapath(), *path_segments) + def getdatapath(): """Retrieve lutris data path diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties deleted file mode 100644 index 58516a21d..000000000 --- a/nbproject/private/private.properties +++ /dev/null @@ -1 +0,0 @@ -application.args=-v diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml deleted file mode 100644 index c1f155a78..000000000 --- a/nbproject/private/private.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 7ceac31ca..000000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,12 +0,0 @@ -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=4 -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=4 -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=8 -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=80 -auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project -auxiliary.org-netbeans-modules-editor-indent.text.x-python.CodeStyle.project.separateFromImps=true -java.lib.path= -lutris.dir=. -main.file=bin/lutris -platform.active=Python_2.6.4+ -python.lib.path= diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 7f40093d2..000000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - org.netbeans.modules.python.project - - - lutris - - - - - - - diff --git a/quidgets/__init__.py b/quidgets/__init__.py deleted file mode 100644 index fcce0144d..000000000 --- a/quidgets/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8 -*- -### BEGIN LICENSE -# Copyright (C) 2010 Mathieu Comandon -#This program is free software: you can redistribute it and/or modify it -#under the terms of the GNU General Public License version 3, as published -#by the Free Software Foundation. -# -#This program is distributed in the hope that it will be useful, but -#WITHOUT ANY WARRANTY; without even the implied warranties of -#MERCHANTABILITY, SATISFACTORY QUALITY, 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 . -### END LICENSE - -from quidgets import * diff --git a/quidgets/widgets/__init__.py b/quidgets/widgets/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/quidgets/widgets/asynch_task_progressbox.py b/quidgets/widgets/asynch_task_progressbox.py deleted file mode 100644 index 7c84cccd9..000000000 --- a/quidgets/widgets/asynch_task_progressbox.py +++ /dev/null @@ -1,256 +0,0 @@ -try: - import pygtk - pygtk.require("2.0") - import gtk - import threading - import time - import gobject -except: - print "couldn't load depencies" - -class AsynchTaskProgressBox( gtk.HBox ): - """AsynchTaskProgressBox: encapsulates a pulstating progressbar, a cancel - button, and a long running task. Use an AsynchTaskProgressBox when you want - a window to perform a long running task in the background without freezing - the UI for the user. - - """ - def __init__(self, run_function, params = None, cancelable = True): - """Create an AsycnTaskProgressBox - - Keyword arguments: - run_function -- the function to run asynchronously - params -- optional dictionary of parameters to be pass into run_function - cancelable -- optional value to determine whether to show cancel button. Defaults to True. - Do not use a value with the key of 'kill' in the params dictionary - - """ - gtk.HBox.__init__( self, False, 2 ) - - self.progressbar = gtk.ProgressBar() - self.progressbar.show() - self.pack_start(self.progressbar, True) - - self.cancel_button = gtk.Button(stock=gtk.STOCK_CANCEL) - if cancelable: - self.cancel_button.show() - self.cancel_button.set_sensitive(False) - self.cancel_button.connect("clicked",self.__stop_clicked) - self.pack_end(self.cancel_button, False) - - self.run_function = run_function - self.pulse_thread = None - self.work_thread = None - self.params = params - - self.connect("destroy", self.__destroy) - - __gsignals__ = {'complete' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, - (gobject.TYPE_PYOBJECT,)), - 'cancelrequested' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, - (gobject.TYPE_PYOBJECT,)) - } - def set_text(self,string): - print string - self.progressbar.set_text(string) - - def start(self, caption = "Working"): - """executes run_function asynchronously and starts pulsating the progressbar - Keyword arguments: - caption -- optional text to display in the progressbar - """ - #Throw an exception if the user tries to start an operating thread - if self.pulse_thread != None: - raise RuntimeError("AsynchTaskProgressBox already started.") - - #Create and start a thread to run the users task - #pass in a callback and the user's params - self.work_thread = KillableThread(self.run_function, self.__on_complete, self.params) - self.work_thread.start() - - #create a thread to display the user feedback - self.pulse_thread = PulseThread(self.progressbar, caption) - self.pulse_thread.start() - - #enable the button so the user can try to kill the task - self.cancel_button.set_sensitive( True ) - - #call back function for after run_function returns - def __on_complete( self, data ): - self.emit("complete", data) - self.kill() - - #call back function for cancel button - def __stop_clicked( self, widget, data = None ): - self.cancel() - - def cancel(self): - self.kill() - #emit the cancelrequested event - #note that this only signals that the kill function was called - #the thread may or may not have actually stopped - self.emit("cancelrequested", self) - - def kill( self ): - """ - Stops pulstating the progressbar if the progressbar is working. - Sets the value of 'kill' to True in the run_function. - - """ - - #stop the pulse_thread and remove a reference to it if there is one - if self.pulse_thread != None: - self.pulse_thread.kill() - self.pulse_thread = None - - #disable the cancel button since the task is about to be told to stop - self.cancel_button.set_sensitive( False ) - #tell the users function tostop if it's thread exists - if self.work_thread != None: - self.work_thread.kill() - - #called when the widget is destroyed, attempts to clean up - #the work thread and the pulse thread - def __destroy(self, widget, data = None): - if self.work_thread != None: - self.work_thread.kill() - if self.pulse_thread != None: - self.pulse_thread.kill() - -class PulseThread ( threading.Thread ): - """Class for use by AsynchTaskProgressBox. Not for general use. - - """ - def __init__(self,progressbar,displaytext = "Working"): - threading.Thread.__init__(self) - self.displaytext = displaytext - self.setDaemon(False) - self.progressbar = progressbar - self.__kill = False - - def kill(self): - self.__kill = True - - #As a subclass of Thread, this function runs when start() is called - #It will cause the progressbar to pulse, showing that a task is running - def run ( self ): - self.progressbar.set_text(self.displaytext) - #keep running until the __kill flag is set to True - while not self.__kill: - time.sleep(.1) - #get ahold of the UI thread and command the progress bar to pulse - gtk.gdk.threads_enter() - self.progressbar.pulse() - gtk.gdk.threads_leave() - #before exiting, reset the progressbar to show that no task is running - self.progressbar.set_fraction(0) - #self.progressbar.set_text("") - -class KillableThread( threading.Thread ): - """Class for use by AsynchTaskProgressBox. Not for general use. - - """ - def __init__(self,run_function, on_complete, params = None): - threading.Thread.__init__(self) - self.setDaemon(False) - self.run_function = run_function - self.params = params - self.on_complete = on_complete - - #As a subclass of Thread, this function runs when start() is called - #It will run the user's function on this thread - def run( self ): - #set up params and include the kill flag - if self.params == None: - self.params = {} - self.params["kill"] = False - #tell the function to run - data = self.run_function(self.params) - #return any data from the function so it can be sent in the complete signal - self.on_complete(data) - - #Tell the user's function that it should stop - #Note the user's function may not check this - def kill( self ): - self.params["kill"] = True - -class TestWindow(gtk.Window): - """For testing and demonstrating AsycnTaskProgressBox. - - """ - def __init__(self): - #create a window a VBox to hold the controls - gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL) - self.set_title("AsynchTaskProgressBox Test Window") - windowbox = gtk.VBox(False, 2) - windowbox.show() - self.add(windowbox) - - #create params for use by the function that should run asynchronously - params = {"start": 100, "stop": 110} - - #pass in the function and the params, then add to the window - self.thread_progressbox = AsynchTaskProgressBox(self.asynch_function, params) - self.thread_progressbox.show() - windowbox.add(self.thread_progressbox) - - #start the task, and set the text for the progressbar to "Testing" - #This will start the function and start the progressbar pulsating - self.thread_progressbox.start("Testing") - - #connect to the complete event to respond when the task is complete - self.thread_progressbox.connect("complete",self.complete_function) - - #connect to the cancel requested event for demonstration purposes - self.thread_progressbox.connect("cancelrequested", self.canceled_function) - - #create a button for starting the task and add it to the window - start_button = gtk.Button(stock=gtk.STOCK_EXECUTE) - start_button.show() - windowbox.add(start_button) - start_button.connect("clicked",self.start_clicked) - self.show() - - #finish wiring up the window - self.connect("destroy", self.destroy) - - #start up gtk.main in a threaded environment - gtk.gdk.threads_init() - gtk.gdk.threads_enter() - gtk.main() - gtk.gdk.threads_leave() - - #called when the window is destroyed - def destroy(self, widget, data = None): - gtk.main_quit() - - #start the AsynchTaskProgressBox when the button is clicked - def start_clicked(self, widget, data = None): - self.thread_progressbox.start("Testing") - - #The function to run asynchronously - def asynch_function( self, params ): - #pull values from the params that were set above - for x in range(params["start"],params["stop"]): - #check if to see if the user has told the task to stop - if params["kill"] == True: - #return a string if the user stopped the task - return "stopped at " + str(x) - else: - #if the user did not try to stop the task, go ahead and do something - print x - #this is a processor intensive task, so - #sleep the loop to keep the UI from bogging down - time.sleep(.5) - #if the loop completes, return a string - return "counted all" - - #called when the task completes - def complete_function(self, widget, data = None): - print "returned " + str(data) - - def canceled_function(self, widget, data=None): - print "cancel requested" -if __name__== "__main__": - test = TestWindow() - diff --git a/quidgets/widgets/conventions.py b/quidgets/widgets/conventions.py deleted file mode 100644 index 14117d6d3..000000000 --- a/quidgets/widgets/conventions.py +++ /dev/null @@ -1,22 +0,0 @@ -import gtk -import gobject -from grid_column import StringColumn, CurrencyColumn, CheckColumn -from grid_column import IntegerColumn, TagsColumn - -def get_column(key, index, dictionary_index, editable): - if key.lower() == "id": - return IntegerColumn(key, index, dictionary_index, editable) - elif key.endswith("?"): - return CheckColumn(key, index, dictionary_index, editable) - elif key.lower() == "price": - return CurrencyColumn(key, index, dictionary_index, editable) - elif key.lower() == "tags": - return TagsColumn(key, index, dictionary_index, editable) - elif key.lower().endswith(" count"): - return IntegerColumn(key, index, dictionary_index, editable) - else: - return StringColumn(key, index, dictionary_index, editable) - - - - diff --git a/quidgets/widgets/dictionary_grid.py b/quidgets/widgets/dictionary_grid.py deleted file mode 100644 index 0b956a971..000000000 --- a/quidgets/widgets/dictionary_grid.py +++ /dev/null @@ -1,323 +0,0 @@ -# -*- coding: utf-8 -*- -### BEGIN LICENSE -# Copyright (C) 2010 Mathieu Comandon -#This program is free software: you can redistribute it and/or modify it -#under the terms of the GNU General Public License version 3, as published -#by the Free Software Foundation. -# -#This program is distributed in the hope that it will be useful, but -#WITHOUT ANY WARRANTY; without even the implied warranties of -#MERCHANTABILITY, SATISFACTORY QUALITY, 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 . -### END LICENSE -"""A Treeview for Dictionaries""" - -import gtk -import gobject -import conventions -from grid_column import StringColumn - -class DictionaryGrid(gtk.TreeView): - def __init__(self, dictionaries=None, keys=None, type_hints=None): - """Create a new Couchwidget - arguments: - dict - - keys - - """ - gtk.TreeView.__init__(self) - self.list_store = None - self.__keys = keys - self.__editable = False - if dictionaries == None: - self.__dictionaries = [] - else: - self.__dictionaries = dictionaries - if type_hints == None: - self.__type_hints={} - else: - self.__type_hints=type_hints - #self.get_selection().set_mode(gtk.SELECTION_MULTIPLE) - self.__populate_treeview() - - self.connect("cursor_changed", self.__selection_changed) - self.connect("move-cursor", self.__cursor_moved) - self.connect("select-all", self.__selection_all) - self.connect("select-cursor-row", self.__selection_changed) - self.connect("unselect-all", self.__selection_none) - self.connect("toggle-cursor-row", self.__selection_changed) - - #signal handlers to track selection in the treeview - #utlmiately these all emit the "selection_changed signal - def __cursor_moved(self, grid, step, count, data=None): - self.__selection_changed(self) - - def __selection_all(self, treeview, data=None): - self.emit("selection-changed", self.rows) - - def __selection_none(self, treeview, data=None): - self.emit("selection-changed", []) - - def __selection_changed(self, treeview, data=None): - self.emit("selection-changed", self.selected_rows) - - @property - def keys(self): - """ set keys - A list of strings to act as keys for the - TreeView. - - Setting this property will cause the widget to reload. - - """ - - return self.__keys - - @keys.setter - def keys(self, keys): - self.__keys = keys - self.__populate_treeview() - - @property - def editable(self): - """editable - bool value, True to make editable - If set to True, changes are immediately - persisted to the database. - - """ - return self.__editable - - @editable.setter - def editable(self, editable): - self.__editable = editable - - #refresh the treeview if possible - self.__populate_treeview() - - def get_dictionaries_copy(self): - """returns a reference to the dictionaries in the - dictionary grid. Note that - - """ - return self.__dictionaries[:] - - def __populate_treeview(self): - #if keys are already set, set up titles and columns - if self.keys is not None: - self.__reset_model() - - #if keys aren't set, infer them from the collection - if len(self.__dictionaries) > 0 and self.keys is None: - key_collector = [] - for r in self.__dictionaries: - for k in r.keys(): - if k not in key_collector and not k.startswith("__"): - key_collector.append(k) - - self.keys = key_collector - self.__reset_model() - - for dictionary in self.__dictionaries: - #lists have to match the list_store columns in length - #so we have to make rows as long as the headerings - #note that the last value is reserved for extra data - self.append_row(dictionary) - - #apply the model to the Treeview if possible - if self.list_store != None: - self.set_model(self.list_store) - - def append_row(self, dictionary): - """append_row: add a row to the TreeView. If keys are already set up - only the the keys in the dictionary matching the keys used - for columns will be used. If no keys are set up, and this is the - first row, keys will be inferred from the dictionary keys. - - arguments: - dictionary - a dictionary to the TreeView. - - """ - new_row = [] - - for i, k in enumerate(self.keys): - if k in dictionary: - display_val = self.__columns_map[k].display_val(dictionary[k]) - real_val = self.__columns_map[k].real_val(dictionary[k]) - #TODO: store a "real_val" instead of display val - #that was "converted_val" - dictionary[k] = real_val - else: - display_val = self.__columns_map[k].default_display_val() - new_row.append(display_val) - new_row.append(dictionary) - self.list_store.append(new_row) - - @property - def rows(self): - """ rows - returns a list of dictionaries - for each row in the grid. - - This property is read only. - """ - model = self.get_model() - rows = [] #list of rows to return - model.foreach(self.__append_dict, rows) - return rows - - def __append_dict(self, model, path, iter, rows): - row = model.get_value(iter,len(self.keys)) - rows.append(row) - - @property - def selected_rows(self): - """ selected_rows - returns a list of dictionaries - for each row selected. - - This property is read only. - """ - - #get the selected rows in the ListStore - selection = self.get_selection() - model, model_rows = selection.get_selected_rows() - - rows = [] #list of rows to return - - for mr in model_rows: - row = {} #a row to be added to the list of rows - iter = model.get_iter(mr) - - row = model.get_value(iter,len(self.keys)) - rows.append(row) - return rows - - def remove_selected_rows(self): - #get the selected rows, and return if nothing is selected - model, rows = self.get_selection().get_selected_rows() - if len(rows) == 0: - return - - #store the last selected row to reselect after removal - next_to_select = rows[-1][0] + 1 - len(rows) - - #loop through and remove - iters = [model.get_iter(path) for path in rows] - for i in iters: - self.get_model().remove(i) - - #select a row for the user, nicer that way - rows_remaining = len(self.get_model()) - - #don't try to select anything if there are no rows left - if rows_remaining < 1: - return - - #select the next row down, unless it's out of range - #in which case just select the last row - if next_to_select < rows_remaining: - self.get_selection().select_path(next_to_select) - else: - self.get_selection().select_path(rows_remaining - 1) - - - def __reset_model(self): - """ __reset_model - internal funciton, do not call directly. - This function is typically called when properties are set - - """ - - #remove the current columns from the TreeView - cols = self.get_columns() - for c in cols: - self.remove_column(c) - - #reinitialize the column variables - col_count = len(self.keys) + 1 - col_types = [] - self.__columns_map = {} - - #create a column for each key - for i, k in enumerate(self.keys): - #use any supllied columns - if k in self.__type_hints: - column = self.__type_hints[k](k,i,len(self.keys)) - else: - #no column supplied, use conventions to get a column - column = conventions.get_column(k,i,len(self.keys), self.editable) - - #add the created column, and remember it's key - self.append_column(column) - self.__columns_map[k] = column - - #store the into for creating the list store - col_types.append(column.column_type) - - #create the liststore with the designated types - #the last column is always for storing the backing dict - col_types.append(gobject.TYPE_PYOBJECT) - self.list_store = gtk.ListStore(*col_types) - - #now tell the columns what list_store to use if edited - for c in self.get_columns(): - self.__last_sorted_col = None - c.list_store = self.list_store - c.connect("clicked",self.__remove_sort_icon) - - def __remove_sort_icon(self, column): - if self.__last_sorted_col is not None: - if self.__last_sorted_col is not column: - self.__last_sorted_col.set_sort_indicator(False) - self.__last_sorted_col = column - - __gsignals__ = {'selection-changed' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, - (gobject.TYPE_PYOBJECT,)), - } - - -def __show_selected(widget, selected_rows, data): - tv, dg = data - tv.get_buffer().set_text(str(selected_rows)) - -if __name__ == "__main__": - """creates a test CouchGrid if called directly""" - - dicts = [{"key?": True, "price":0.00,"tags" : "aaa bbb ccc","_foo":"bar","bing count":20}, - {"ID": 11, "key?": False, "price":2.00,"tags" : "bbb ccc ddd","_foo":"bar"}, - {"key?": True, "price":33.00,"tags" : "ccc ddd eee","_foo":"bar","bing count":15}, - {"ID": 3, "tags" : "ddd eee fff","_foo":"bar"}, - {"ID": 4, "price":5.00,"_foo":"bar"}] - #create and show a test window - win = gtk.Window(gtk.WINDOW_TOPLEVEL) - win.set_title("DictionaryGrid Test Window") - win.connect("destroy",gtk.main_quit) - win.show() - - #create a top level container - vbox = gtk.VBox(False, False) - vbox.show() - win.add(vbox) - - #create a test widget with test database values - grid = DictionaryGrid(dicts, ["ID","tags","price","bing count","key?"]) - - #allow editing - grid.editable = True - - #show the control, add it to the window, and run the main loop - grid.show() - vbox.pack_start(grid, False, True) - - #create a test display area - hbox = gtk.HBox(False, 5) - hbox.show() - tv = gtk.TextView() - tv.show() - grid.connect("selection-changed",__show_selected, (tv,grid)) - - hbox.pack_start(tv, False, False) - vbox.pack_end(hbox, False, False) - - #run the test app - gtk.main() - diff --git a/quidgets/widgets/grid_column.py b/quidgets/widgets/grid_column.py deleted file mode 100644 index f32d79ed6..000000000 --- a/quidgets/widgets/grid_column.py +++ /dev/null @@ -1,471 +0,0 @@ -# -*- coding: utf-8 -*- -import sys -try: - import pygtk - pygtk.require("2.0") - import gtk - import gobject - import grid_filter - -except Exception, inst: - print "some dependencies for GridFilter are not available" - raise inst - -class StringColumn( gtk.TreeViewColumn ): - """GridFilter: A widget that provides a user interface for filtering a - treeview. A GridFilter hosts one ore more GridRows, which in turn host - an active filter. - - """ - column_type = gobject.TYPE_STRING - __sort_order = None - default_filter = grid_filter.StringFilterCombo - def __init__(self, key, index, dictionary_index, editable=True, format_function = None ): - """Create a GridFilter for filtering an associated treeview. - This class is used by BugsPane. - - arguments: - headings -- a tuple of lists of column headers associated with the - treeview. Each list includes a string for the column title, a constructor - for a widget that supports filtering (such as StringFilter or NumericFilter) - and a zero-based position index for the specific column in the treeview that - will position the header. - treeview -- the treeview to be filtered. - - """ - self.index = index - self.key = key - self.list_store = None - self.dictionary_index = dictionary_index - self.initialize_renderer(editable, index) - - gtk.TreeViewColumn.__init__( self, key, self.renderer, text=index) - if format_function is not None: - self.set_cell_data_func(self.renderer, self.on_format, format_function) - - self.set_clickable(True) - self.connect('clicked', self.sort_rows) - self.set_resizable(True) - - def sort_rows(self, widget): - sort_order = widget.get_sort_order() - - rows = [tuple(r) + (i,) for i, r in enumerate(self.list_store)] - if sort_order == gtk.SORT_ASCENDING: - sort_order = gtk.SORT_DESCENDING - - else: - sort_order = gtk.SORT_ASCENDING - - self.set_sort_indicator(True) - self.set_sort_order(sort_order) - - if sort_order == gtk.SORT_ASCENDING: - rows.sort(self.sort_ascending) - else: - rows.sort(self.sort_descending) - - self.list_store.reorder([r[-1] for r in rows]) - - - def sort_ascending(self, x, y): - x = x[self.index] - y = y[self.index] - if x > y: - return 1 - elif x == y: - return 0 - elif x < y: - return -1 - - def sort_descending(self, x, y): - x = x[self.index] - y = y[self.index] - if x > y: - return -1 - elif x == y: - return 0 - elif x < y: - return 1 - - - - def on_format(self,column, cell_renderer, tree_model, iter, format_function): - string = format_function(tree_model.get_value(iter, self.index), cell_renderer) - if string != None: - cell_renderer.set_property('text', string) - - def initialize_renderer( self, editable, index ): - self.renderer = gtk.CellRendererText() - self.renderer.mode = gtk.CELL_RENDERER_MODE_EDITABLE - self.renderer.set_property("editable", editable) - self.renderer.connect("edited", self.cell_edited) - - def cell_edited(self, cellrenderertext, path, new_text, data=None): - """ __edited - internal signal handler. - Updates the dictionary if a cell in the Treeview - has been edited. - - """ - - #get an iterator that points to the edited row - if self.list_store is not None: - iter = self.list_store.get_iter(path) - #update the ListStore with the new text - self.list_store.set_value(iter, self.index, self.display_val(new_text)) - - dictionary = self.list_store.get_value(iter,self.dictionary_index) - dictionary[self.key] = self.real_val(new_text) - - def display_val(self, val): - if val == None: - return self.default_val() - else: - return str(val) - - def real_val(self, val): - return self.display_val(val) - - def default_display_val(self): - return "" - -class CurrencyColumn( StringColumn ): - """GridFilter: A widget that provides a user interface for filtering a - treeview. A GridFilter hosts one ore more GridRows, which in turn host - an active filter. - - """ - column_type = gobject.TYPE_STRING - default_filter = grid_filter.NumericFilterCombo - def __init__(self, key, index,dictionary_index, editable=True ): - """Create a GridFilter for filtering an associated treeview. - This class is used by BugsPane. - - arguments: - headings -- a tuple of lists of column headers associated with the - treeview. Each list includes a string for the column title, a constructor - for a widget that supports filtering (such as StringFilter or NumericFilter) - and a zero-based position index for the specific column in the treeview that - will position the header. - treeview -- the treeview to be filtered. - - """ - - StringColumn.__init__( self, key, index, dictionary_index, editable, self.currency_format) - - def initialize_renderer( self, editable, index ): - self.renderer = gtk.CellRendererSpin() - adj = gtk.Adjustment(0,-10000000000,10000000000,1) - self.renderer.set_property("adjustment", adj) - self.renderer.set_property("editable", editable) - self.renderer.set_property("digits",2) - self.renderer.connect("edited", self.cell_edited) - - #make sure the value was edited to something that can be - #turned into an int - try: - float(new_text) - except: - return - - #get an iterator that points to the edited row - if self.list_store is not None: - - iter = self.list_store.get_iter(path) - #update the ListStore with the new text - self.list_store.set_value(iter, self.index, self.display_val(new_text)) - dictionary = self.list_store.get_value(iter,self.dictionary_index) - dictionary[self.key] = self.real_val(new_text) - - - def display_val(self, val): - try: - return str(float(val)) - except: - return "" - - def real_val(self, val): - try: - return float(val) - except: - return 0.0 - - def default_display_val(self): - return "" - - def sort_ascending(self, x, y): - x = x[self.index] - y = y[self.index] - if x == "" and y == "": - return 0 - if x == "" and y != "": - return -1 - if x != "" and y == "": - return 1 - - x = float(x) - y = float(y) - if x > y: - return 1 - elif x == y: - return 0 - elif x < y: - return -1 - - def sort_descending(self, x, y): - x = x[self.index] - y = y[self.index] - if x == "" and y == "": - return 0 - if x == "" and y != "": - return 1 - if x != "" and y == "": - return -1 - - x = float(x) - y = float(y) - if x > y: - return -1 - elif x == y: - return 0 - elif x < y: - return 1 - - def currency_format(self, val, cell_renderer): - try: - return "%.2f" % float(val) - except: - return "" - -class TagsColumn( StringColumn ): - column_type = gobject.TYPE_STRING - default_filter = grid_filter.TagsFilterCombo - - -class IntegerColumn( StringColumn ): - column_type = gobject.TYPE_STRING - default_filter = grid_filter.NumericFilterCombo - - def __init__(self, key, index, dictionary_index, editable=True ): - """Create a GridFilter for filtering an associated treeview. - This class is used by BugsPane. - - arguments: - headings -- a tuple of lists of column headers associated with the - treeview. Each list includes a string for the column title, a constructor - for a widget that supports filtering (such as StringFilter or NumericFilter) - and a zero-based position index for the specific column in the treeview that - will position the header. - treeview -- the treeview to be filtered. - - """ - StringColumn.__init__( self, key, index, dictionary_index, editable) - - def initialize_renderer( self, editable, index ): - self.renderer = gtk.CellRendererSpin() - adj = gtk.Adjustment(0,-10000000000,10000000000,1) - self.renderer.set_property("adjustment", adj) - self.renderer.set_property("editable", editable) - self.renderer.connect("edited", self.cell_edited) - - def cell_edited(self, cellrenderertext, path, new_text, data=None): - """ __edited - internal signal handler. - Updates the dictionary if a cell in the Treeview - has been edited. - - """ - - #make sure the value was edited to something that can be - #turned into an int - try: - int(new_text) - except: - return - - #get an iterator that points to the edited row - if self.list_store is not None: - - iter = self.list_store.get_iter(path) - #update the ListStore with the new text - self.list_store.set_value(iter, self.index, self.display_val(new_text)) - dictionary = self.list_store.get_value(iter,self.dictionary_index) - dictionary[self.key] = self.real_val(new_text) - - - def display_val(self, val): - try: - return str(int(val)) - except: - return "" - - def real_val(self, val): - try: - return int(val) - except: - return 0 - - - def default_display_val(self): - return "" - - def sort_ascending(self, x, y): - x = x[self.index] - y = y[self.index] - if x == "" and y == "": - return 0 - if x == "" and y != "": - return -1 - if x != "" and y == "": - return 1 - - x = int(x) - y = int(y) - if x > y: - return 1 - elif x == y: - return 0 - elif x < y: - return -1 - - def sort_descending(self, x, y): - x = x[self.index] - y = y[self.index] - if x == "" and y == "": - return 0 - if x == "" and y != "": - return 1 - if x != "" and y == "": - return -1 - - x = int(x) - y = int(y) - if x > y: - return -1 - elif x == y: - return 0 - elif x < y: - return 1 - - -class CheckColumn( gtk.TreeViewColumn ): - """GridFilter: A widget that provides a user interface for filtering a - treeview. A GridFilter hosts one ore more GridRows, which in turn host - an active filter. - - """ - - column_type = gobject.TYPE_INT - default_filter = grid_filter.CheckFilterCombo - - def __init__(self, key, index, dictionary_index, editable=True, format_function = None ): - self.index = index - self.key = key - self.initialize_renderer(editable, index) - self.list_store = None - self.dictionary_index = dictionary_index - - gtk.TreeViewColumn.__init__( self, key, self.renderer) - - self.set_clickable(True) - self.connect('clicked', self.sort_rows) - self.set_cell_data_func(self.renderer, self.on_format) - self.extra_format_function = format_function - - self.set_resizable(True) - - def sort_rows(self, widget): - sort_order = widget.get_sort_order() - - rows = [tuple(r) + (i,) for i, r in enumerate(self.list_store)] - if sort_order == gtk.SORT_ASCENDING: - sort_order = gtk.SORT_DESCENDING - - else: - sort_order = gtk.SORT_ASCENDING - - self.set_sort_order(sort_order) - self.set_sort_indicator(True) - - if sort_order == gtk.SORT_ASCENDING: - rows.sort(self.sort_ascending) - else: - rows.sort(self.sort_descending) - - self.list_store.reorder([r[-1] for r in rows]) - - def sort_ascending(self, x, y): - x = x[self.index] - y = y[self.index] - return y - x - - def sort_descending(self, x, y): - x = x[self.index] - y = y[self.index] - return x - y - - def on_format(self,column, cell_renderer, tree_model, iter): - cell_val = tree_model.get_value(iter, self.index) - cell_renderer.set_property('inconsistent', False) - if cell_val == 1: - cell_renderer.set_active(True) - elif cell_val == 0: - cell_renderer.set_active(False) - else: - cell_renderer.set_property('inconsistent', True) - #TODO: show it checked, unchecked, inconsistent ... based (-1,0,1) - if self.extra_format_function != None: - self.extra_format_function() - - def initialize_renderer( self, editable, index ): - self.renderer = gtk.CellRendererToggle() - self.renderer.set_property("activatable", editable) - col = gtk.TreeViewColumn(self.key, self.renderer, active=index) - self.renderer.connect("toggled", self.toggled) - - def toggled(self, cell, path, data=None): - #get an iterator that points to the edited row - new_val = not cell.get_active() - if self.list_store is not None: - iter = self.list_store.get_iter(path) - #update the ListStore with the new text - self.list_store.set_value(iter, self.index, new_val) - - dictionary = self.list_store.get_value(iter,self.dictionary_index) - dictionary[self.key] = new_val - - def display_val(self, val): - """use conventions to infer the boolean value to use when the value - is not a boolean type. - - """ - if type(val) is type(True): - if val: - return 1 - else: - return 0 - elif type(val) is type("a"): - if val.lower() == "yes": - return 1 - else: - return 0 - else: - return bool(val) - - def default_display_val(self): - return -1 - - - def real_val(self, val): - """use conventions to infer the boolean value to use when the value - is not a boolean type. - - """ - if type(val) is type(True): - return val - elif type(val) is type("a"): - if val.lower() == "yes": - return True - else: - return False - else: - return bool(val) diff --git a/quidgets/widgets/grid_filter.py b/quidgets/widgets/grid_filter.py deleted file mode 100644 index 26dee49ad..000000000 --- a/quidgets/widgets/grid_filter.py +++ /dev/null @@ -1,453 +0,0 @@ -# -*- coding: utf-8 -*- -import sys -try: - import pygtk - pygtk.require("2.0") - import gtk - import gobject - -except Exception, inst: - print "some dependencies for GridFilter are not available" - raise inst - -class GridFilter( gtk.VBox ): - """GridFilter: A widget that provides a user interface for filtering a - treeview. A GridFilter hosts one ore more GridRows, which in turn host - an active filter. - - """ - def __init__(self, grid, filter_hints={} ): - """Create a GridFilter for filtering an associated treeview. - This class is used by BugsPane. - - arguments: - headings -- a tuple of lists of column headers associated with the - treeview. Each list includes a string for the column title, a constructor - for a widget that supports filtering (such as StringFilter or NumericFilter) - and a zero-based position index for the specific column in the treeview that - will position the header. - treeview -- the treeview to be filtered. - """ - - gtk.VBox.__init__( self, False, 10 ) - self.grid = grid - self.store = grid.get_model() - self.filter_hints = filter_hints - - #create the and/or radio buttons - radio_box = gtk.HBox(False,2) - radio_box.show() - self.pack_start(radio_box, False, False) - self.and_button = gtk.RadioButton(None,"M_atch All of the following", True) - self.and_button.show() - self.and_button.connect("toggled",self.__filter_changed) - radio_box.pack_start(self.and_button, False, False) - or_button = gtk.RadioButton(self.and_button,"Match any _of the following", True) - or_button.show() - radio_box.pack_start(or_button, False, False) - self.rows = [] - self.add_row(self) - - def add_row(self, widget, data=None): - """add_row: signal handler that receives a request from a FilterRow to - add a new row. Sets up and adds the row to the GridFilter. - - """ - - row = FilterRow(self.grid, len(self.rows) > 0, self.filter_hints ) - row.connect('add_row_requested',self.add_row) - row.connect('remove_row_requested',self.remove_row) - row.connect('refilter_requested',self.__filter_changed) - row.show() - self.rows.append(row) - self.pack_start(row, False, False) - - def remove_row(self, widget, none): - """remove_row: signal handler that receives a request from a FilterRow - to remove itself from the GridFilter. - - """ - self.rows.remove(widget) - self.remove(widget) - self.__filter_changed(self) - - #TODO: call this and iterate through each filter row - #create a signal handler for changes to filter in filter rows - #from the handler call the filter_list function which ... - #iterates through each row getting a true or false - def __filter_changed(self,widget, data=None): - """__filter_changed: signal handler that handles requests to reapply the - fitlers in the GridFilter's FilterRows. - - """ - filt = self.store.filter_new() - sort_mod = gtk.TreeModelSort(filt) - filt.set_visible_func(self.__filter_func, data ) - filt.refilter() - self.grid.set_model(sort_mod) - - def __filter_func(self, model, iter, data): - """filter_func: called for each row in the treeview model in response to - a __filter_changed signal. Determines for each row whether it should be - visible based on the FilterRows in the GridFilter. - - """ - #determine whether this is an "and" or an "or" filter - match_all = self.and_button.get_active() - - for r in self.rows: - rez = r.is_match(iter.copy(),model) #check the result of each filter - if match_all: #if it's an "and" filter - if not rez: #and if the filter does not match - return False #then the row should not be visible - else: #but if it's an "or" filter - if rez: #and it is a match - return True #return that the row should be visible - return match_all #all filters match an "and" or none matched an "or" - -class FilterRow( gtk.HBox): - """FilterRow: A widget that displays a single filter in a GridFilter. - Typically, this class will not be used directly, but only via a GridFilter. - - """ - wait_for_input = False - - def __init__(self, grid, removable=True, filter_hints={}): - """Create a FilterRow to be used in a GridFilter. - A FitlerRow is comprised of a combo that lists the treeview headings. - The combo stores the string to display for the heading, as well as - the widget that is used to filter each heading. When the user changes - the value in the dropdown, the FilterRow retrieves the correct filter from - the combo, and displays that filter to the user. - - The FilterRow also handles offering UI for the user to add and remove - FilterRows for the GridFilter containing it. - - arguments: - headings -- a tuple of lists of column headers associated with the - treeview. Each list includes a string for the column title, a constructor - for a widget that supports filtering (such as StringFilter or NumericFilter) - and a zero-based position index for the specific column in the treeview that - will position the header. - treeview -- the treeview to be filtered. - - keyword arguments: - removable -- bool if the row should be able to be removed from the GridFilter - Typicall False for the first row. - """ - gtk.HBox.__init__( self, False, 10 ) - self.store = grid.get_model() - self.grid = grid - - heading_combo_store = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_PYOBJECT,gobject.TYPE_INT) - - #apply default combos - for i, k in enumerate(self.grid.keys): - if k in filter_hints: - filt_combo = filter_hints[k] - else: - filt_combo = grid.get_columns()[i].default_filter() - - heading_combo_store.append([k,filt_combo,i]) - - filt_combo.connect("changed",self.__filter_changed) - filt_combo.show() - - self.column_combo = gtk.ComboBox(heading_combo_store) - cell = gtk.CellRendererText() - self.column_combo.pack_start(cell, True) - self.column_combo.add_attribute(cell, 'text', 0) - - self.filter_space = gtk.HBox(False,1) - self.filter_space.show() - - self.filter_entry = gtk.Entry() - self.filter_entry.show() - self.filter_entry.connect("changed",self.__filter_changed) - - self.column_combo.show() - self.pack_start(self.column_combo,False, False) - self.column_combo.connect("changed",self.__column_changed) - self.column_combo.set_active(0) - - self.pack_start(self.filter_space, False, False) - self.pack_start(self.filter_entry, False) - - - button_box = gtk.HBox(False,2) - button_box.show() - self.pack_start(button_box,False,False) - - #add a button that can create a new row in the grid filter - add_button = gtk.Button(stock = gtk.STOCK_ADD) - add_button.show() - button_box.pack_start(add_button) - add_button.connect("clicked",lambda x: self.emit('add_row_requested',self) ) - - #add a button to remove the row if applicable - if removable: - rm_button = gtk.Button(stock = gtk.STOCK_REMOVE) - rm_button.show() - rm_button.connect('clicked', lambda x: self.emit("remove_row_requested",self) ) - button_box.pack_start(rm_button) - - __gsignals__ = {'add_row_requested' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, - (gobject.TYPE_PYOBJECT,)), - 'remove_row_requested' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, - (gobject.TYPE_PYOBJECT,)), - 'refilter_requested' : (gobject.SIGNAL_RUN_LAST, gobject.TYPE_NONE, - (gobject.TYPE_PYOBJECT,)) - } - - def __column_changed(self, widget, data = None): - """column_changed: signal handler for the user changing the combo for the - column that they wish to apply the filter to. - removes the other filter widgets and replaces them widgets stored in - the filter widget. - - """ - - if len(self.filter_space.get_children()) > 0: - self.filter_space.remove(self.filter_space.get_children()[0]) - iter = widget.get_model().get_iter(widget.get_active()) - combo = widget.get_model().get_value(iter,1) - print combo.requires_input - if combo.requires_input: - self.filter_entry.show() - self.wait_for_input = True - else: - self.filter_entry.hide() - self.wait_for_input = False - self.filter_space.pack_start(combo, False, False) - - def __filter_changed(self,widget, data=None): - """filter_changed: signal handler called when the FilterRow has changed. - Used to tell the GridFilter to refilter. Only emits if the filter is - active (a heading is selected in the combo and the user has entered - text in the filter. - - """ - - if self.filter_entry.get_text() != "" or not self.wait_for_input: - if self.__get_current_filter_combo().get_active > -1: - self.emit('refilter_requested',self) - - def __get_current_filter_combo(self): - """get_current_filter_combo: retrieves the combobox stored - for the filter for the user selected treeview column. - - """ - iter = self.column_combo.get_model().get_iter(self.column_combo.get_active()) - return self.column_combo.get_model().get_value(iter,1) - - def is_match(self, store_iter, model): - """is_match: returns true if the filter set in the FilterRow matches - the value specified in the column and row. Used to determine whether - to hide or show a row. - Typically called for each treeview row and each FilterRow in response - to a change in one of the FilterRows. - - arguments: - store_iter: the iter pointing the the row in the treeview to test - model: the treeview model containing the rows being tested - - """ - #get the filter combo - col_iter = self.column_combo.get_model().get_iter(self.column_combo.get_active()) - combo = self.column_combo.get_model().get_value(col_iter,1) - - #return if now combo is set - if combo.get_active() < 0: - return True - - #return if wating for input - if self.wait_for_input and self.filter_entry.get_text() == "": - return True - - - #get the filter function from the selection in the fitler combo - filt_iter = combo.get_model().get_iter(combo.get_active()) - filt_func = combo.get_model().get_value(filt_iter,1) - - #find the column in the treeview to look in - treeview_col = self.column_combo.get_model().get_value(col_iter,2) - - #pull the value out of the store - orig_val = model.get_value(store_iter.copy(), treeview_col) - if orig_val == None: - orig_val = "" - return filt_func(orig_val, self.filter_entry.get_text()) - -class BlankFilterCombo( gtk.ComboBox): - requires_input = True - def __init__(self): - """create a NumericFilterCombo - - """ - - self.__combo_store = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_PYOBJECT) - gtk.ComboBox.__init__( self, self.__combo_store) - cell = gtk.CellRendererText() - self.pack_start(cell, True) - self.add_attribute(cell, 'text', 0) - - def append(self, text, func): - self.__combo_store.append([text, func]) - - -class StringFilterCombo( BlankFilterCombo ): - """StringFilterCombo: A default string filter class for use in a FilterRow. - - Lets the user specify if the row should be displayed based on - containing, not containing, starting with, or ending with a user specified - string. - - Stores a string describing how the filter will aapply, and a function - for doing the actual filtering. The filter row currently manages a - text field for the user to enter strings. - - Currently, this manner of presenting a filter is hardcoded into FilterRow, - so any custom Filters should work on the same manner. - - """ - def __init__(self): - """create a StringFilterCombo. - - """ - BlankFilterCombo.__init__(self) - self.append("contains",lambda x,y: x.find(y) > -1) - self.append("does not contain",lambda x,y: x.find(y) == -1) - self.append("starts with",lambda x,y: x.startswith(y)) - self.append("ends with",lambda x,y: x.endswith(y)) - -class TagsFilterCombo( BlankFilterCombo ): - """TagsFilterCombo: A default tag filter class for use in a FilterRow. - - Lets the user specify if the row should be displayed based on - containing a one tag or all tags. - - Stores a string describing how the filter will apply, and a function - for doing the actual filtering. The filter row currently manages a - text field for the user to enter strings. - - Currently, this manner of presenting a filter is hardcoded into FilterRow, - so any custom Filters should work on the same manner. - - """ - def __init__(self): - BlankFilterCombo.__init__(self) - - def filter_any(bug_tags_s, filter_tags): - tags_on_bug = bug_tags_s.split() - tags_in_filter = filter_tags.split() - - for tag in tags_in_filter: - if tag in tags_on_bug: - return True - return False - - def filter_all(bug_tags_s, filter_tags): - tags_on_bug = bug_tags_s.split() - tags_in_filter = filter_tags.split() - - for tag in tags_in_filter: - if tag not in tags_on_bug: - return False - return True - - def filter_not(bug_tags_s, filter_tags): - tags_on_bug = bug_tags_s.split() - tags_in_filter = filter_tags.split() - - for tag in tags_in_filter: - if tag not in tags_on_bug: - return True - return False - - def filter_not_all(bug_tags_s, filter_tags): - tags_on_bug = bug_tags_s.split() - tags_in_filter = filter_tags.split() - - for tag in tags_in_filter: - if tag in tags_on_bug: - return False - return True - - self.append("has any of these tags", filter_any) - self.append("has all of these tags", filter_all) - self.append("does not have one of these tags", filter_not) - self.append("does not have any of these tags", filter_not_all) - -class CheckFilterCombo( BlankFilterCombo ): - def __init__(self): - """create a CheckFilterCombo - - """ - BlankFilterCombo.__init__( self ) - self.append("checked",lambda x,y: x == 1 ) - self.append("not Checked",lambda x,y: x ==0 ) - self.append("unset",lambda x,y: x == -1 ) - self.requires_input = False - -class NumericFilterCombo( BlankFilterCombo ): - """NumericFilterCombo: A default number filter class for use in a FilterRow. - - Lets the user specify if the row should be displayed based on numeric - relationships to a number specified by the user. - - Stores a string describing how the filter will aapply, and a function - for doing the actual filtering. The filter row currently manages a - text field for the user to enter numbers. - - Currently, this manner of presenting a filter is hardcoded into Filt - print len(self.filter_hints)erRow, - so any custom Filters should work on the same manner. - - """ - - - def __init__(self): - """create a NumericFilterCombo - - """ - BlankFilterCombo.__init__( self ) - self.append("=",lambda x,y: float(x) == float(y) ) - self.append("<",lambda x,y: float(x) < float(y) ) - self.append(">",lambda x,y: float(x) > float(y) ) - self.append("<=",lambda x,y: float(x) <= float(y) ) - self.append(">=",lambda x,y:float(x) >= float(y) ) - - -if __name__ == "__main__": - """creates a test CouchGrid if called directly""" - from dictionary_grid import DictionaryGrid - - #create and show a test window - win = gtk.Window(gtk.WINDOW_TOPLEVEL) - win.set_title("DictionaryGrid Test Window") - win.connect("destroy",gtk.main_quit) - win.show() - - #create a top level container - vbox = gtk.VBox(False, False) - vbox.show() - win.add(vbox) - - #create a test widget with test database values - dicts = [{"ID": 0, "key?": True, "tags": "aaa bbb ccc"}, - {"ID": 1, "key?": False, "tags": "bbb ccc ddd"}, - {"ID": 2, "key?": True, "tags": "ccc ddd eee"}, - {"ID": 3, "key?": False, "tags": "ddd eee fff"}, - {"ID": 4, "key?": True, "tags": "eee fff ggg"}] - - hints = {} - grid = DictionaryGrid(dicts) - grid.show() - - filt = GridFilter(grid,hints) - filt.show() - vbox.pack_start(filt, False, True) - vbox.pack_end(grid, False, True) - - gtk.main() - diff --git a/setup.py b/setup.py index 554499df6..08f2756de 100644 --- a/setup.py +++ b/setup.py @@ -93,7 +93,7 @@ class InstallAndUpdateDataDirectory(DistUtilsExtra.auto.install_auto): DistUtilsExtra.auto.setup( name='lutris', - version='0.2~public2', + version='0.2-public2', license='GPL-3', author='Mathieu Comandon', author_email='strycore@gmail.com',