diff options
83 files changed, 2220 insertions, 2251 deletions
@@ -8,13 +8,18 @@ Tiago de Oliveira Corrêa <tcorreabr@gmail.com> Translations: -Riccardo Traverso <gr3yfox.fw@gmail.com> -Magnun Leno <magnun@codecommunity.org> -Kim Boram <Boramism@gmail.com> -Eduardo Anabalon <lalo1412@gmail.com> -Grégoire Bellon-Gervais <greggbg@gmail.com> -Alex Maxime <cad.maxime@gmail.com> -Eugene Roskin <pams@imail.ru> -Ting Zhou <tzhou@haverford.edu> -Martin Dinov <martindinov@yahoo.com> -Gabriel Dubatti <gdubatti@gmail.com> +Simon Schneegans <code@simonschneegans.de> (DE EN) +Riccardo Traverso <gr3yfox.fw@gmail.com> (IT) +Magnun Leno <magnun@codecommunity.org> (PT-BR) +Kim Boram <Boramism@gmail.com> (KO) +Eduardo Anabalon <lalo1412@gmail.com> (ES) +Moo <hazap@hotmail.com> (LT) +Gabriel Dubatti <gdubatti@gmail.com> (ES) +Grégoire Bellon-Gervais <greggbg@gmail.com> (FR) +Raphaël Rochet <raphael@rri.fr> (FR) +Alex Maxime <cad.maxime@gmail.com> (FR) +Eugene Roskin <pams@imail.ru> (RU) +Ashed <craysy@gmail.com> (RU) +Ting Zhou <tzhou@haverford.edu> (ZH-CN) +Martin Dinov <martindinov@yahoo.com> (BG) +Heimen Stoffels <vistausss@outlook.com> (NL-NL) @@ -1,674 +1,20 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +Copyright 2011-2018 Simon Schneegans + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -34,10 +34,23 @@ If you can’t afford the time to do the stuff mentioned above, but still want t ## License -Copyright (C) 2011-2017 Simon Schneegans <code@simonschneegans.de> - -This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. +Copyright 2011-2018 Simon Schneegans <code@simonschneegans.de> + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/debian/changelog b/debian/changelog index ffa8524..469c60b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gnome-pie (0.7.2-1) unstable; urgency=medium + + * New upstream release: + - Refresh debian/patches/0105-spelling_errors.patch. + - Remove upstream applied debian/patches/0100-fix-ftbfs_vala_0_42.patch. + + -- Jörg Frings-Fürst <debian@jff.email> Fri, 21 Dec 2018 13:23:35 +0100 + gnome-pie (0.7.1-2) unstable; urgency=high * New debian/patches/0100-fix-ftbfs_vala_0_42.patch to fix FTBFS @@ -5,7 +13,7 @@ gnome-pie (0.7.1-2) unstable; urgency=high * Switch to Ayatana AppIndicator (Closes: #907551): - New debian/patches/0700-ayatana-appindicator.patch. - debian/control: - + Switch build depends from libappindicator3-dev to + + Switch build depends from libappindicator3-dev to libayatana-appindicator3-dev. Thanks to Mike Gabriel <mike.gabriel@das-netzwerkteam.de>. * Change to my new email address. diff --git a/debian/patches/0105-spelling_errors.patch b/debian/patches/0105-spelling_errors.patch index 3fefbb5..9b14dc9 100644 --- a/debian/patches/0105-spelling_errors.patch +++ b/debian/patches/0105-spelling_errors.patch @@ -4,582 +4,11 @@ Forwarded: https://github.com/Simmesimme/Gnome-Pie/issues/165 Last-Update: 2018-09-07 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/resources/locale/bg/LC_MESSAGES/bg.po -=================================================================== ---- trunk.orig/resources/locale/bg/LC_MESSAGES/bg.po -+++ trunk/resources/locale/bg/LC_MESSAGES/bg.po -@@ -377,28 +377,28 @@ msgid "" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:451 -@@ -584,7 +584,7 @@ msgstr "" - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "" - -Index: trunk/resources/locale/de/LC_MESSAGES/de.po -=================================================================== ---- trunk.orig/resources/locale/de/LC_MESSAGES/de.po -+++ trunk/resources/locale/de/LC_MESSAGES/de.po -@@ -416,18 +416,18 @@ msgstr "" - "oder in dein Dock ziehen, um einen Starter zu erstellen!" - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "Das neue Design wurde erfolgreich imprtiert!" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "" - "Beim Importieren ist ein Fehler aufgetreten: Das Design konnte nicht " - "entpackt werden!" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "" - "Beim Importieren ist ein Fehler aufgetreten: Es existiert bereits ein Design " -@@ -435,7 +435,7 @@ msgstr "" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - "Beim Importieren ist ein Fehler aufgetreten: Das gwählte Archiv enthält kein " -@@ -443,7 +443,7 @@ msgstr "" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "" - "Beim Importieren ist ein Fehler aufgetreten: Das Archive konnte nicht " - "gelesen werden!" -@@ -629,7 +629,7 @@ msgstr "Das Design \"%s\" wurde erfolgre - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "" - "Beim Exportieren des Designs \"%s\" ist ein Fehler aufgetreten! Weitere " -Index: trunk/resources/locale/es/LC_MESSAGES/es.po -=================================================================== ---- trunk.orig/resources/locale/es/LC_MESSAGES/es.po -+++ trunk/resources/locale/es/LC_MESSAGES/es.po -@@ -410,23 +410,23 @@ msgstr "" - "Pastel." - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "El nuevo tema fue correctamente importado!" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "Ocurrió un error al importar el tema: Falló la extracción del tema!" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "" - "Ocurrió un error al importar el tema: Ya existe un tema con ese nombre!" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - "Ocurrió un error al importar el tema: El archivo no contiene un tema " -@@ -434,7 +434,7 @@ msgstr "" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "" - "Ocurrió un error al importar el tema: El archivo del tema no pudo ser " - "abierto!" -@@ -622,7 +622,7 @@ msgstr "El tema %s fue exportado correct - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "" - "Ocurrió un error al exportar el tema %s! Por favor verifique la consola." -Index: trunk/resources/locale/fr/LC_MESSAGES/fr.po -=================================================================== ---- trunk.orig/resources/locale/fr/LC_MESSAGES/fr.po -+++ trunk/resources/locale/fr/LC_MESSAGES/fr.po -@@ -416,18 +416,18 @@ msgstr "" - "bureau ou votre dock pour créer un lanceur." - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "Nouveau thème importé avec succès !" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "" - "Une erreur est survenue pendant l'importation du thème : impossible " - "d'extraire le thème !" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "" - "Une erreur est survenue pendant l'importation du thème : Un thème avec ce " -@@ -435,7 +435,7 @@ msgstr "" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - "Une erreur est survenue pendant l'importation du thème : L'archive ne " -@@ -443,7 +443,7 @@ msgstr "" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "" - "Une erreur est survenue pendant l'importation du thème : Impossible d'ouvrir " - "l'archive !" -@@ -632,7 +632,7 @@ msgstr "Thème \"%s\" exporté avec succ - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "" - "Une erreur est survenue pendant l'importation du thème \"%s\" : Plus " -Index: trunk/resources/locale/it/LC_MESSAGES/it.po -=================================================================== ---- trunk.orig/resources/locale/it/LC_MESSAGES/it.po -+++ trunk/resources/locale/it/LC_MESSAGES/it.po -@@ -378,28 +378,28 @@ msgid "" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:451 -@@ -589,7 +589,7 @@ msgstr "" - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "" - -Index: trunk/resources/locale/ko/LC_MESSAGES/ko.po -=================================================================== ---- trunk.orig/resources/locale/ko/LC_MESSAGES/ko.po -+++ trunk/resources/locale/ko/LC_MESSAGES/ko.po -@@ -367,28 +367,28 @@ msgid "" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:451 -@@ -571,7 +571,7 @@ msgstr "" - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "" - -Index: trunk/resources/locale/lt/LC_MESSAGES/lt.po -=================================================================== ---- trunk.orig/resources/locale/lt/LC_MESSAGES/lt.po -+++ trunk/resources/locale/lt/LC_MESSAGES/lt.po -@@ -417,29 +417,29 @@ msgstr "" - "sukurtumėte šio pyrago leistuką." - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "Nauja tema buvo sėkmingai importuota!" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "Importuojant temą, įvyko klaida: Nepavyko išskleisti temos!" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "Importuojant temą, įvyko klaida: Tema tokiu pavadinimu jau yra!" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - "Importuojant temą, įvyko klaida: Temos archyve nėra taisyklingos temos!" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "Importuojant temą, įvyko klaida: Nepavyko atverti temos archyvo!" - - #: ../../src/gui/preferencesWindow.vala:451 -@@ -624,7 +624,7 @@ msgstr "\"%s\" tema buvo sėkmingai eksp - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "Eksportuojant \"%s\" temą, įvyko klaida! Prašome žiūrėti pulto išvestį." - -Index: trunk/resources/locale/pl/LC_MESSAGES/pl.po -=================================================================== ---- trunk.orig/resources/locale/pl/LC_MESSAGES/pl.po -+++ trunk/resources/locale/pl/LC_MESSAGES/pl.po -@@ -386,28 +386,28 @@ msgid "" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:451 -@@ -588,7 +588,7 @@ msgstr "" - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "" - -Index: trunk/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po -=================================================================== ---- trunk.orig/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po -+++ trunk/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po -@@ -376,28 +376,28 @@ msgid "" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:451 -@@ -582,7 +582,7 @@ msgstr "" - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "" - -Index: trunk/resources/locale/ru/LC_MESSAGES/ru.po -=================================================================== ---- trunk.orig/resources/locale/ru/LC_MESSAGES/ru.po -+++ trunk/resources/locale/ru/LC_MESSAGES/ru.po -@@ -408,29 +408,29 @@ msgstr "" - "чтобы создать ярлык запуска для этого Пая." - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "Успешно импортирована новая тема!" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "При импорте темы произошла ошибка: Не удалось извлечь тему!" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "При импорте темы произошла ошибка: тема с этим именем уже существует!" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - "При импорте темы произошла ошибка: в архиве темы нет действительной темы!" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "При импорте темы произошла ошибка: Не удалось открыть тему!" - - #: ../../src/gui/preferencesWindow.vala:451 -@@ -616,7 +616,7 @@ msgstr "Тема экспортиров - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "При экспорте темы произошла ошибка \"%s\"! Проверьте вывод консоли." - -Index: trunk/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po -=================================================================== ---- trunk.orig/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po -+++ trunk/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po -@@ -367,28 +367,28 @@ msgid "" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:401 --msgid "Sucessfully imported new theme!" -+msgid "Successfully imported new theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:415 --msgid "An error occured while importing the theme: Failed to extract theme!" -+msgid "An error occurred while importing the theme: Failed to extract theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:419 - msgid "" --"An error occured while importing the theme: A theme with this name does " -+"An error occurred while importing the theme: A theme with this name does " - "already exist!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:423 - msgid "" --"An error occured while importing the theme: Theme archive does not contain a " -+"An error occurred while importing the theme: Theme archive does not contain a " - "valid theme!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:427 - msgid "" --"An error occured while importing the theme: Failed to open theme archive!" -+"An error occurred while importing the theme: Failed to open theme archive!" - msgstr "" - - #: ../../src/gui/preferencesWindow.vala:451 -@@ -571,7 +571,7 @@ msgstr "" - - #: ../../src/themes/theme.vala:176 - msgid "" --"An error occured while exporting the theme \"%s\"! Please check the console " -+"An error occurred while exporting the theme \"%s\"! Please check the console " - "output." - msgstr "" - -Index: trunk/src/gui/preferencesWindow.vala -=================================================================== ---- trunk.orig/src/gui/preferencesWindow.vala -+++ trunk/src/gui/preferencesWindow.vala -@@ -398,7 +398,7 @@ public class PreferencesWindow : GLib.Ob - dialog.filter.add_pattern ("*.tar.gz"); - - var result = Gtk.MessageType.INFO; -- var message = _("Sucessfully imported new theme!"); -+ var message = _("Successfully imported new theme!"); - - dialog.response.connect((d, r) => { - if (r == Gtk.ResponseType.ACCEPT) { -@@ -412,19 +412,19 @@ public class PreferencesWindow : GLib.Ob - Config.global.load_themes(a.theme_name); - this.theme_list.reload(); - } else { -- message = _("An error occured while importing the theme: Failed to extract theme!"); -+ message = _("An error occurred while importing the theme: Failed to extract theme!"); - result = Gtk.MessageType.ERROR; - } - } else { -- message = _("An error occured while importing the theme: A theme with this name does already exist!"); -+ message = _("An error occurred while importing the theme: A theme with this name does already exist!"); - result = Gtk.MessageType.ERROR; - } - } else { -- message = _("An error occured while importing the theme: Theme archive does not contain a valid theme!"); -+ message = _("An error occurred while importing the theme: Theme archive does not contain a valid theme!"); - result = Gtk.MessageType.ERROR; - } - } else { -- message = _("An error occured while importing the theme: Failed to open theme archive!"); -+ message = _("An error occurred while importing the theme: Failed to open theme archive!"); - result = Gtk.MessageType.ERROR; - } - a.close(); Index: trunk/src/themes/theme.vala =================================================================== --- trunk.orig/src/themes/theme.vala +++ trunk/src/themes/theme.vala -@@ -173,7 +173,7 @@ public class Theme : GLib.Object { +@@ -179,7 +179,7 @@ public class Theme : GLib.Object { dialog.destroy(); } else { diff --git a/debian/patches/series b/debian/patches/series index 5d085d7..e0a3e26 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ #0500_bamf3-vapi.patch 0700-ayatana-appindicator.patch 0105-spelling_errors.patch -0100-fix-ftbfs_vala_0_42.patch +#0100-fix-ftbfs_vala_0_42.patch diff --git a/resources/locale/bg/LC_MESSAGES/bg.po b/resources/locale/bg/LC_MESSAGES/bg.po index 1d46538..04ec32f 100644 --- a/resources/locale/bg/LC_MESSAGES/bg.po +++ b/resources/locale/bg/LC_MESSAGES/bg.po @@ -377,28 +377,28 @@ msgid "" msgstr "" #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "" #: ../../src/gui/preferencesWindow.vala:451 @@ -584,7 +584,7 @@ msgstr "" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "" diff --git a/resources/locale/de/LC_MESSAGES/de.po b/resources/locale/de/LC_MESSAGES/de.po index c62a4c1..58dcaf9 100644 --- a/resources/locale/de/LC_MESSAGES/de.po +++ b/resources/locale/de/LC_MESSAGES/de.po @@ -416,18 +416,18 @@ msgstr "" "oder in dein Dock ziehen, um einen Starter zu erstellen!" #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "Das neue Design wurde erfolgreich imprtiert!" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "" "Beim Importieren ist ein Fehler aufgetreten: Das Design konnte nicht " "entpackt werden!" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "" "Beim Importieren ist ein Fehler aufgetreten: Es existiert bereits ein Design " @@ -435,7 +435,7 @@ msgstr "" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" "Beim Importieren ist ein Fehler aufgetreten: Das gwählte Archiv enthält kein " @@ -443,7 +443,7 @@ msgstr "" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "" "Beim Importieren ist ein Fehler aufgetreten: Das Archive konnte nicht " "gelesen werden!" @@ -629,7 +629,7 @@ msgstr "Das Design \"%s\" wurde erfolgreich importiert!" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "" "Beim Exportieren des Designs \"%s\" ist ein Fehler aufgetreten! Weitere " diff --git a/resources/locale/es/LC_MESSAGES/es.po b/resources/locale/es/LC_MESSAGES/es.po index 78655af..c8ffcd0 100644 --- a/resources/locale/es/LC_MESSAGES/es.po +++ b/resources/locale/es/LC_MESSAGES/es.po @@ -410,23 +410,23 @@ msgstr "" "Pastel." #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "El nuevo tema fue correctamente importado!" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "Ocurrió un error al importar el tema: Falló la extracción del tema!" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "" "Ocurrió un error al importar el tema: Ya existe un tema con ese nombre!" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" "Ocurrió un error al importar el tema: El archivo no contiene un tema " @@ -434,7 +434,7 @@ msgstr "" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "" "Ocurrió un error al importar el tema: El archivo del tema no pudo ser " "abierto!" @@ -622,7 +622,7 @@ msgstr "El tema %s fue exportado correctamente!" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "" "Ocurrió un error al exportar el tema %s! Por favor verifique la consola." diff --git a/resources/locale/fr/LC_MESSAGES/fr.po b/resources/locale/fr/LC_MESSAGES/fr.po index 49cb690..9a738e5 100644 --- a/resources/locale/fr/LC_MESSAGES/fr.po +++ b/resources/locale/fr/LC_MESSAGES/fr.po @@ -416,18 +416,18 @@ msgstr "" "bureau ou votre dock pour créer un lanceur." #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "Nouveau thème importé avec succès !" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "" "Une erreur est survenue pendant l'importation du thème : impossible " "d'extraire le thème !" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "" "Une erreur est survenue pendant l'importation du thème : Un thème avec ce " @@ -435,7 +435,7 @@ msgstr "" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" "Une erreur est survenue pendant l'importation du thème : L'archive ne " @@ -443,7 +443,7 @@ msgstr "" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "" "Une erreur est survenue pendant l'importation du thème : Impossible d'ouvrir " "l'archive !" @@ -632,7 +632,7 @@ msgstr "Thème \"%s\" exporté avec succès !" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "" "Une erreur est survenue pendant l'importation du thème \"%s\" : Plus " diff --git a/resources/locale/it/LC_MESSAGES/it.po b/resources/locale/it/LC_MESSAGES/it.po index 1f2d15e..346a2a4 100644 --- a/resources/locale/it/LC_MESSAGES/it.po +++ b/resources/locale/it/LC_MESSAGES/it.po @@ -378,28 +378,28 @@ msgid "" msgstr "" #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "" #: ../../src/gui/preferencesWindow.vala:451 @@ -589,7 +589,7 @@ msgstr "" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "" diff --git a/resources/locale/ko/LC_MESSAGES/ko.po b/resources/locale/ko/LC_MESSAGES/ko.po index 1faa206..50994c0 100644 --- a/resources/locale/ko/LC_MESSAGES/ko.po +++ b/resources/locale/ko/LC_MESSAGES/ko.po @@ -367,28 +367,28 @@ msgid "" msgstr "" #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "" #: ../../src/gui/preferencesWindow.vala:451 @@ -571,7 +571,7 @@ msgstr "" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "" diff --git a/resources/locale/lt/LC_MESSAGES/lt.po b/resources/locale/lt/LC_MESSAGES/lt.po index 3b093e0..c2786e7 100644 --- a/resources/locale/lt/LC_MESSAGES/lt.po +++ b/resources/locale/lt/LC_MESSAGES/lt.po @@ -417,29 +417,29 @@ msgstr "" "sukurtumėte šio pyrago leistuką." #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "Nauja tema buvo sėkmingai importuota!" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "Importuojant temą, įvyko klaida: Nepavyko išskleisti temos!" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "Importuojant temą, įvyko klaida: Tema tokiu pavadinimu jau yra!" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" "Importuojant temą, įvyko klaida: Temos archyve nėra taisyklingos temos!" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "Importuojant temą, įvyko klaida: Nepavyko atverti temos archyvo!" #: ../../src/gui/preferencesWindow.vala:451 @@ -624,7 +624,7 @@ msgstr "\"%s\" tema buvo sėkmingai eksportuota!" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "Eksportuojant \"%s\" temą, įvyko klaida! Prašome žiūrėti pulto išvestį." diff --git a/resources/locale/nl_NL/LC_MESSAGES/nl_NL.po b/resources/locale/nl_NL/LC_MESSAGES/nl_NL.po new file mode 100644 index 0000000..487fbc7 --- /dev/null +++ b/resources/locale/nl_NL/LC_MESSAGES/nl_NL.po @@ -0,0 +1,766 @@ +# Dutch translations for gnomepie package +# Nederlandse vertalingen voor het pakket gnomepie. +# Copyright (C) 2018 Simon Schneegans <code@simonschneegans.de> +# This file is distributed under the same license as the gnomepie package. +# Heimen Stoffels <vistausss@outlook.com>, 2018. +# +msgid "" +msgstr "" +"Project-Id-Version: gnomepie 0.4\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2018-05-19 12:10+0200\n" +"PO-Revision-Date: 2018-05-19 13:47+0200\n" +"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n" +"Language-Team: Dutch\n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.0.6\n" + +#: ../ui/icon_select.ui:9 +msgid "Select an icon" +msgstr "Selecteer een pictogram" + +#: ../ui/icon_select.ui:89 +msgid "Icon Theme" +msgstr "Pictogramthema" + +#: ../ui/icon_select.ui:109 +msgid "Custom Icon" +msgstr "Aangepast pictogram" + +#: ../ui/slice_select.ui:8 +msgid "Slice Options" +msgstr "Segmentopties" + +#: ../ui/slice_select.ui:137 +msgid "There are no options for this Slice type." +msgstr "Er zijn geen opties voor dit segmenttype." + +#: ../ui/slice_select.ui:163 +msgid "URI to open" +msgstr "Te openen URI" + +#: ../ui/slice_select.ui:201 +msgid "Command to execute" +msgstr "Uit te voeren opdracht" + +#: ../ui/slice_select.ui:230 +msgid "Hotkey to press" +msgstr "Te gebruiken sneltoets" + +#: ../ui/slice_select.ui:259 +msgid "Pie to open" +msgstr "Te openen cirkel" + +#: ../ui/slice_select.ui:288 +msgid "Name of the Slice " +msgstr "Naam van het segment " + +#: ../ui/slice_select.ui:326 +msgid "Is Quick Action" +msgstr "Is een snelle actie" + +#: ../ui/slice_select.ui:365 +msgid "Clipboard history length" +msgstr "Lengte van klembordgeschiedenis" + +#: ../ui/slice_select.ui:405 +msgid "Current workspace only" +msgstr "Alleen huidige werkblad" + +#: ../ui/slice_select.ui:448 +msgid "Slice options" +msgstr "Segmentopties" + +#: ../ui/pie_options.ui:53 +msgid "Activation Settings" +msgstr "Activatie-instellingen" + +#: ../ui/pie_options.ui:150 +msgid "Unamed Pie" +msgstr "Naamloze cirkel" + +#: ../ui/pie_options.ui:199 +msgid "ID:" +msgstr "ID:" + +#: ../ui/pie_options.ui:217 +msgid "It's possible to bind mouse buttons as well!" +msgstr "Het is ook mogelijk om muisknoppen toe te wijzen!" + +#: ../ui/pie_options.ui:257 +msgid "Turbo mode" +msgstr "Turbomodus" + +#: ../ui/pie_options.ui:262 ../ui/pie_options.ui:263 +msgid "If checked, the Pie will close when you release the chosen hot key." +msgstr "" +"Als dit wordt ingeschakeld, dan zal de cirkel sluiten na het loslaten van de " +"gekozen sneltoets." + +#: ../ui/pie_options.ui:275 +msgid "Long press for activation" +msgstr "Lang indrukken om te activeren" + +#: ../ui/pie_options.ui:280 ../ui/pie_options.ui:281 +msgid "" +"If checked, the Pie will only open if you press this hot key a bit longer." +msgstr "" +"Als dit wordt ingeschakeld, dan zal de cirkel openen als je deze sneltoets " +"iets langer ingedrukt houdt." + +#: ../ui/pie_options.ui:293 +msgid "Open Pie centered on the screen" +msgstr "Cirkel gecentreerd op scherm openen" + +#: ../ui/pie_options.ui:298 ../ui/pie_options.ui:299 +msgid "" +"If checked, the Pie will open in the middle of your screen. Else it will pop " +"up at your pointer." +msgstr "" +"Als dit wordt ingeschakeld, dan zal de cirkel openen op het midden van het " +"scherm i.p.v. op de locatie van je cursor." + +#: ../ui/pie_options.ui:311 +msgid "Warp mouse pointer to center of Pie" +msgstr "Cursor automatisch op midden van cirkel plaatsen" + +#: ../ui/pie_options.ui:316 ../ui/pie_options.ui:317 +msgid "" +"If checked, the mouse pointer will be warped to the center of the Pie. This " +"allows for quick selections even if the Pie is opened at the screen's " +"boundary." +msgstr "" +"Als dit wordt ingeschakeld, dan zal de cursor automatisch op het midden van " +"de cirkel worden geplaatst. Dit zorgt voor snellere selecties, zelfs als de " +"cirkel geopend wordt ter hoogte van de schermrand." + +#: ../ui/pie_options.ui:335 +msgid "Activation options" +msgstr "Activatie-opties" + +#: ../ui/pie_options.ui:517 +msgid "Automatically select the best pie shape" +msgstr "Automatisch beste cirkelvorm kiezen" + +#: ../ui/pie_options.ui:521 +msgid "" +"If checked, the shape will be automatically selected to minimize mouse " +"travelling." +msgstr "" +"Als dit wordt ingeschakeld, dan zal de vorm automatisch worden gekozen om de " +"cursor zo min mogelijk te hoeven verplaatsen." + +#: ../ui/pie_options.ui:540 +msgid "Pie shape" +msgstr "Cirkelvorm" + +#: ../ui/preferences.ui:7 ../../src/gui/preferencesWindow.vala:79 +msgid "Gnome-Pie Settings" +msgstr "Gnome-Pie-instellingen" + +#: ../ui/preferences.ui:41 +msgid "Start Gnome-Pie on login" +msgstr "Gnome-Pie automatisch opstarten" + +#: ../ui/preferences.ui:46 ../ui/preferences.ui:47 +msgid "If checked, Gnome-Pie will start silently everytime you log in." +msgstr "" +"Als dit wordt ingeschakeld, dan zal Gnome-Pie automatisch opstarten als je " +"de computer opstart." + +#: ../ui/preferences.ui:59 +msgid "Display panel icon " +msgstr "Systeemvakpictogram tonen " + +#: ../ui/preferences.ui:64 ../ui/preferences.ui:65 +msgid "" +"If not checked, you can access this menu by launching Gnome-Pie a second " +"time." +msgstr "" +"Als dit niet wordt ingeschakeld, dan kun je dit menu oproepen door Gnome-Pie " +"voor de tweede keer te starten." + +#: ../ui/preferences.ui:77 +msgid "Select Slices by typing their names" +msgstr "Segmenten selecteren door hun resp. naam te typen" + +#: ../ui/preferences.ui:82 ../ui/preferences.ui:83 +msgid "" +"If checked, you can select items in a Pie by typing their names. Otherwise " +"you can activate them with a hotkey (which can be displayed by pressing ALT " +"when a Pie is openened)." +msgstr "" +"Als dit wordt ingeschakeld, dan kun je items selecteren door de " +"respectievelijke naam te typen. Als dit niet wordt ingeschakeld, dan kun je " +"ze activeren met een sneltoets (welke kan worden getoond door op ALT te " +"drukken in een geopend segment)." + +#: ../ui/preferences.ui:95 +msgid "Display Slice labels" +msgstr "Segmentlabels tonen" + +#: ../ui/preferences.ui:100 ../ui/preferences.ui:101 +msgid "" +"Displays the name of each Slice next to it. Only available if supported by " +"the theme." +msgstr "" +"Toont de naam van elk segment naast het pictogram. Alleen beschikbaar als " +"het gekozen thema dit ondersteunt." + +#: ../ui/preferences.ui:135 +msgid "Activation radius" +msgstr "Activatieradius" + +#: ../ui/preferences.ui:175 +msgid "Global scale" +msgstr "Globale schaal" + +#: ../ui/preferences.ui:215 +msgid "Maximum slices per pie" +msgstr "Maximum aantal segmenten per cirkel" + +#: ../ui/preferences.ui:298 +msgid "Import a theme from a file." +msgstr "Importeer een thema vanuit een bestand." + +#: ../ui/preferences.ui:320 +msgid "Reload all themes." +msgstr "Herlaad alle thema's." + +#: ../ui/preferences.ui:369 +msgid "Delete the selected theme." +msgstr "Verwijder het geselecteerde thema." + +#: ../ui/preferences.ui:391 +msgid "Export the selected theme for sharing." +msgstr "Exporteer het geselecteerde thema zodat het kan worden gedeeld." + +#: ../ui/preferences.ui:440 +msgid "Open the theme's files in your file browser." +msgstr "Open de themabestanden in je bestandsbeheerder." + +#: ../ui/preferences.ui:489 +msgid "Open a tutorial on how to create new themes for Gnome-Pie." +msgstr "" +"Start de rondleiding, zodat je kunt zien hoe je thema's kunt creëren voor " +"Gnome-Pie." + +#: ../ui/preferences.ui:539 ../../src/gui/preferencesWindow.vala:110 +msgid "General Settings" +msgstr "Algemene instellingen" + +#: ../ui/preferences.ui:732 +msgid "" +"<b><big>This Pie is empty!</big>\n" +"\n" +"Start adding Slices to it!</b> This can be done by dragging stuff to the " +"plus sign below. You can try a lot! For example application launchers or " +"folders. Even URLs from your browser are possible...\n" +"\n" +"For manual and advanced configuration click on the plus sign." +msgstr "" +"<b><big>Deze cirkel is leeg!</big>\n" +"\n" +"Voeg er segmenten aan toe!</b> Dit kan door dingen te verslepen naar het " +"plus-teken hieronder. Je kunt van alles proberen, bijv. applicatiestarters " +"of mappen. Zelfs URL's vanuit je webbrowser zijn mogelijk...\n" +"\n" +"Klik op het plus-teken voor handmatige en geavanceerde configuratie." + +#: ../ui/preferences.ui:755 +msgid "" +"<b><big>You have no Pies!</big>\n" +"\n" +"Start by creating one! </b> This can be done by clicking on the tiny little " +"plus sign in the lower left corner." +msgstr "" +"<b><big>Je hebt geen cirkels!</big>\n" +"\n" +"Creëer er één! </b> Dit kan je doen door te klikken op het kleine plus-teken " +"in de hoek linksonder." + +#: ../ui/preferences.ui:847 ../../src/gui/preferencesWindow.vala:111 +msgid "Pie Settings" +msgstr "Cirkelinstellingen" + +#: ../../src/actionGroups/sessionGroup.vala:35 +msgid "Group: Session Control" +msgstr "Groep: sessiebeheer" + +#: ../../src/actionGroups/sessionGroup.vala:37 +msgid "Shows a Slice for Shutdown, Reboot, and Hibernate." +msgstr "Toont een segment voor Afsluiten, Herstarten en Slaapstand." + +#: ../../src/actionGroups/sessionGroup.vala:60 +msgid "Shutdown" +msgstr "Afsluiten" + +#: ../../src/actionGroups/sessionGroup.vala:63 +msgid "Logout" +msgstr "Afmelden" + +#: ../../src/actionGroups/sessionGroup.vala:66 +msgid "Reboot" +msgstr "Herstarten" + +#: ../../src/actionGroups/menuGroup.vala:35 +msgid "Group: Main menu" +msgstr "Groep: hoofdmenu" + +#: ../../src/actionGroups/menuGroup.vala:37 +msgid "Displays your main menu structure." +msgstr "Toon de structuur van je hoofdmenu." + +#: ../../src/actionGroups/windowListGroup.vala:39 +msgid "Group: Window List" +msgstr "Groep: vensterlijst" + +#: ../../src/actionGroups/windowListGroup.vala:41 +msgid "Shows a Slice for each of your opened Windows. Almost like Alt-Tab." +msgstr "" +"Toont een segment met alle geopende vensters, vergelijkbaar met Alt-Tab." + +#: ../../src/actionGroups/bookmarkGroup.vala:36 +msgid "Group: Bookmarks" +msgstr "Groep: bladwijzers" + +#: ../../src/actionGroups/bookmarkGroup.vala:38 +msgid "Shows a Slice for each of your directory Bookmarks." +msgstr "Toont een segment met al je favoriete mappen." + +#: ../../src/actionGroups/devicesGroup.vala:35 +msgid "Group: Devices" +msgstr "Groep: apparaten" + +#: ../../src/actionGroups/devicesGroup.vala:37 +msgid "Shows a Slice for each plugged in devices, like USB-Sticks." +msgstr "" +"Toont een segment met alle aangekoppelde apparaten, zoals bijv. USB-schijven." + +#: ../../src/actionGroups/devicesGroup.vala:85 +msgid "Root" +msgstr "Computer" + +#: ../../src/actionGroups/clipboardGroup.vala:77 +msgid "Image data" +msgstr "Afbeeldingsgegevens" + +#: ../../src/actionGroups/clipboardGroup.vala:108 +msgid "Group: Clipboard" +msgstr "Groep: klembord" + +#: ../../src/actionGroups/clipboardGroup.vala:110 +msgid "Manages your Clipboard." +msgstr "Beheert je klembord." + +#: ../../src/actions/uriAction.vala:34 +msgid "Open URI" +msgstr "URI openen" + +#: ../../src/actions/uriAction.vala:36 +msgid "Opens a given location. You may use URL's or files paths." +msgstr "Opent een opgegeven locatie. Je kunt URL's opgeven of bestandspaden." + +#: ../../src/actions/keyAction.vala:34 +msgid "Press hotkey" +msgstr "Druk op een sneltoets" + +#: ../../src/actions/keyAction.vala:36 +msgid "Simulates the activation of a hotkey." +msgstr "Simuleert de activatie van een sneltoets." + +#: ../../src/actions/appAction.vala:34 +msgid "Launch application" +msgstr "Applicatie starten" + +#: ../../src/actions/appAction.vala:36 +msgid "Executes the given command." +msgstr "Voert de opgegeven opdracht uit." + +#: ../../src/actions/pieAction.vala:34 +msgid "Open Pie" +msgstr "Cirkel openen" + +#: ../../src/actions/pieAction.vala:36 +msgid "Opens another Pie of Gnome-Pie. You may create sub menus this way." +msgstr "" +"Opent een andere cirkel van Gnome-Pie. Je kunt op deze manier submenu's " +"creëren." + +#: ../../src/actions/actionRegistry.vala:119 +msgid "Trash" +msgstr "Prullenbak" + +#: ../../src/gui/newsWindow.vala:64 +msgid "_Close" +msgstr "Sl_uiten" + +#: ../../src/gui/preferencesWindow.vala:80 +msgid "bake your pies!" +msgstr "creëer je cirkels!" + +#: ../../src/gui/preferencesWindow.vala:238 +msgid "Pies can be opened with the terminal command \"gnome-pie --open=ID\"." +msgstr "" +"Cirkels kunnen worden geopend met de terminalopdracht \"gnome-pie --open=ID" +"\"." + +#: ../../src/gui/preferencesWindow.vala:239 +msgid "Feel free to visit Gnome-Pie's homepage at %s!" +msgstr "Bezoek ook eens de Gnome-Pie-website op %s!" + +#: ../../src/gui/preferencesWindow.vala:240 +msgid "If you want to give some feedback, please write an e-mail to %s!" +msgstr "Als je feedback wilt geven, verstuur dan een e-mail naar %s!" + +#: ../../src/gui/preferencesWindow.vala:241 +msgid "You can support the development of Gnome-Pie by donating via %s." +msgstr "Je kunt de ontwikkeling van Gnome-Pie steunen door te doneren via %s." + +#: ../../src/gui/preferencesWindow.vala:242 +msgid "" +"Translating Gnome-Pie to your language is easy. Translations are managed at " +"%s." +msgstr "" +"Het vertalen van Gnome-Pie naar je eigen taal is eenvoudig. Vertalingen " +"worden beheerd op %s." + +#: ../../src/gui/preferencesWindow.vala:243 +msgid "" +"It's easy to create new themes for Gnome-Pie. Read the <a " +"href='%s'>Tutorial</a> online." +msgstr "" +"Het is eenvoudig om nieuwe thema's te creëren voor Gnome-Pie. Volg de online " +"<a href='%s'>Handleiding</a>." + +#: ../../src/gui/preferencesWindow.vala:244 +msgid "It's usually a good practice to have at most twelve slices per pie." +msgstr "" +"Het is meestal het beste als je maximaal twaalf segmenten per cirkel hebt." + +#: ../../src/gui/preferencesWindow.vala:245 +msgid "You can export themes you created and share them with the community!" +msgstr "" +"Je kunt door jouw gecreëerde thema's exporteren en deze delen met de " +"gemeenschap!" + +#: ../../src/gui/preferencesWindow.vala:246 +msgid "The source code of Gnome-Pie is available on %s." +msgstr "De broncode van Gnome-Pie is beschikbaar op %s." + +#: ../../src/gui/preferencesWindow.vala:247 +msgid "Bugs can be reported at %s!" +msgstr "Fouten (bugs) kunnen worden gerapporteerd op %s!" + +#: ../../src/gui/preferencesWindow.vala:248 +msgid "Suggestions can be posted on %s!" +msgstr "Suggesties kunnen worden gegeven op %s!" + +#: ../../src/gui/preferencesWindow.vala:249 +msgid "" +"An awesome companion of Gnome-Pie is %s. It will make using your computer " +"feel like magic!" +msgstr "" +"Een fantastische hulpje van Gnome-Pie is %s. Het zal je computer veranderen " +"in een magisch iets!" + +#: ../../src/gui/preferencesWindow.vala:250 +msgid "You can drag'n'drop applications from your main menu to the pie above." +msgstr "" +"Je kunt applicaties verslepen van je hoofdmenu naar de cirkel hierboven." + +#: ../../src/gui/preferencesWindow.vala:251 +msgid "" +"You may drag'n'drop URLs and bookmarks from your internet browser to the pie " +"above." +msgstr "" +"Je kunt URL's en bladwijzers verslepen van je webbrowser naar de cirkel " +"hierboven." + +#: ../../src/gui/preferencesWindow.vala:252 +msgid "" +"You can drag'n'drop files and folders from your file browser to the pie " +"above." +msgstr "" +"Je kunt bestanden en mappen verslepen van je bestandsbeheerder naar de " +"cirkel hierboven." + +#: ../../src/gui/preferencesWindow.vala:253 +msgid "" +"You can drag'n'drop pies from the list on the left into other pies in order " +"to create sub-pies." +msgstr "" +"Je kunt cirkels verslepen van de lijst aan de linkerkant naar andere cirkels " +"om subcirkels te creëren." + +#: ../../src/gui/preferencesWindow.vala:254 +msgid "" +"You can drag'n'drop pies from the list on the left to your desktop or dock " +"to create a launcher for this pie." +msgstr "" +"Je kunt cirkels verslepen van de lijst aan de linkerkant naar je bureaublad " +"of dock om een starter te creëren voor deze cirkel." + +#: ../../src/gui/preferencesWindow.vala:401 +msgid "Successfully imported new theme!" +msgstr "Het nieuwe thema is succesvol geïmporteerd!" + +#: ../../src/gui/preferencesWindow.vala:415 +msgid "An error occurred while importing the theme: Failed to extract theme!" +msgstr "" +"Er is een fout opgetreden tijdens het importeren van het thema: het thema " +"kan niet worden uitgepakt!" + +#: ../../src/gui/preferencesWindow.vala:419 +msgid "" +"An error occurred while importing the theme: A theme with this name does " +"already exist!" +msgstr "" +"Er is een fout opgetreden tijdens het uitpakken van het thema: er bestaat al " +"een thema met deze naam!" + +#: ../../src/gui/preferencesWindow.vala:423 +msgid "" +"An error occurred while importing the theme: Theme archive does not contain a " +"valid theme!" +msgstr "" +"Er is een fout opgetreden tijdens het uitpakken van het thema: het thema-" +"archief bevat geen geldig thema!" + +#: ../../src/gui/preferencesWindow.vala:427 +msgid "" +"An error occurred while importing the theme: Failed to open theme archive!" +msgstr "" +"Er is een fout opgetreden tijdens het uitpakken van het thema: het thema-" +"archief kan niet worden geopend!" + +#: ../../src/gui/preferencesWindow.vala:451 +msgid "Do you really want to delete the selected theme from %s?" +msgstr "Weet je zeker dat je het geselecteerde thema wilt verwijderen uit %s?" + +#: ../../src/gui/preferencesWindow.vala:551 +msgid "New Pie" +msgstr "Nieuwe cirkel" + +#: ../../src/gui/preferencesWindow.vala:566 +msgid "" +"Do you really want to delete the selected Pie with all contained Slices?" +msgstr "" +"Weet je zeker dat je de geselecteerde cirkel met al zijn segmenten wilt " +"verwijderen?" + +#: ../../src/gui/newSliceWindow.vala:328 +msgid "Rename me!" +msgstr "Wijzig mijn naam!" + +#: ../../src/gui/triggerSelectButton.vala:64 +msgid "Press a hotkey ..." +msgstr "Druk op een sneltoets ..." + +#: ../../src/gui/piePreviewRenderer.vala:419 +msgid "Click to edit" +msgstr "Klik om te bewerken" + +#: ../../src/gui/piePreviewRenderer.vala:419 +#: ../../src/gui/piePreviewRenderer.vala:434 +msgid "Drag to move" +msgstr "Versleep om te verplaatsen" + +#: ../../src/gui/piePreviewRenderer.vala:422 +msgid "Click to add a new Slice" +msgstr "Klik om een nieuw segment toe te voegen" + +#: ../../src/gui/piePreviewRenderer.vala:426 +msgid "Drop to add as new Slice" +msgstr "Laat los om toe te voegen als nieuw segment" + +#: ../../src/gui/piePreviewRenderer.vala:429 +msgid "Drop to move Slice" +msgstr "Laat los om segment te verplaatsen" + +#: ../../src/gui/piePreviewRenderer.vala:434 +msgid "Click to delete" +msgstr "Klik om te verwijderen" + +#: ../../src/gui/indicator.vala:109 +msgid "_Preferences" +msgstr "_Voorkeuren" + +#: ../../src/gui/indicator.vala:118 +msgid "_About" +msgstr "_Over" + +#: ../../src/gui/indicator.vala:133 +msgid "_Quit" +msgstr "_Afsluiten" + +#: ../../src/gui/piePreview.vala:149 +msgid "Do you really want to delete this Slice?" +msgstr "Weet je zeker dat je dit segment wilt verwijderen?" + +#: ../../src/gui/pieList.vala:77 +msgid "Pies" +msgstr "Cirkels" + +#: ../../src/gui/themeList.vala:59 +msgid "Themes" +msgstr "Thema's" + +#: ../../src/gui/themeList.vala:108 +msgid "by" +msgstr "door" + +#: ../../src/gui/sliceTypeList.vala:60 +msgid "Slice types" +msgstr "Segmenttypes" + +#: ../../src/gui/pieOptionsWindow.vala:207 +msgid "" +"Keybindings and some other options are not supported on Wayland. However, " +"you can use the terminial command \"gnome-pie --open %s\" to open this pie. " +"Create a global hotkey in your system settings which executes this command!" +msgstr "" +"Sneltoetsen en sommige andere opties worden niet ondersteund op Wayland. Je " +"kunt de terminalopdracht \"gnome-pie --open %s\" gebruiken om deze cirkel te " +"openen. Creëer een globale sneltoets in de systeeminstellingen om deze " +"opdracht uit te voeren!" + +#: ../../src/gui/pieOptionsWindow.vala:293 +msgid "" +"This hotkey is already assigned to the pie \"%s\"! \n" +"\n" +"Please select another one or cancel your selection." +msgstr "" +"Deze sneltoets is al toegewezen aan de cirkel \"%s\"!\n" +"\n" +"Selecteer een andere of stop de selectie." + +#: ../../src/gui/iconSelectWindow.vala:220 +msgid "All supported image formats" +msgstr "Alle ondersteunde afbeeldingsformaten" + +#: ../../src/utilities/trigger.vala:188 +msgid "Button %i" +msgstr "Knop %i" + +#: ../../src/utilities/trigger.vala:191 +msgid "LeftButton" +msgstr "LinkerKnop" + +#: ../../src/utilities/trigger.vala:193 +msgid "RightButton" +msgstr "RechterKnop" + +#: ../../src/utilities/trigger.vala:195 +msgid "MiddleButton" +msgstr "MiddelsteKnop" + +#: ../../src/utilities/trigger.vala:201 ../../src/utilities/trigger.vala:286 +#: ../../src/utilities/trigger.vala:287 +#: ../../src/utilities/bindingManager.vala:200 ../../src/utilities/key.vala:69 +msgid "Not bound" +msgstr "Niet toegewezen" + +#: ../../src/utilities/trigger.vala:222 +msgid "Turbo" +msgstr "Turbo" + +#: ../../src/utilities/trigger.vala:226 ../../src/utilities/trigger.vala:228 +msgid "Delayed" +msgstr "Vertraagd" + +#: ../../src/utilities/trigger.vala:232 ../../src/utilities/trigger.vala:234 +msgid "Centered" +msgstr "Gecentreerd" + +#: ../../src/utilities/trigger.vala:238 ../../src/utilities/trigger.vala:240 +msgid "Warp" +msgstr "Centreren" + +#: ../../src/utilities/trigger.vala:244 ../../src/utilities/trigger.vala:246 +msgid "Auto-shaped" +msgstr "Automatische vorm" + +#: ../../src/utilities/trigger.vala:249 ../../src/utilities/trigger.vala:251 +msgid "Quarter pie" +msgstr "Kwartcirkel" + +#: ../../src/utilities/trigger.vala:255 ../../src/utilities/trigger.vala:257 +msgid "Half pie" +msgstr "Halve cirkel" + +#: ../../src/themes/theme.vala:169 +msgid "Successfully exported the theme \"%s\"!" +msgstr "Het thema \"%s\" is succesvol geëxporteerd!" + +#: ../../src/themes/theme.vala:176 +msgid "" +"An error occured while exporting the theme \"%s\"! Please check the console " +"output." +msgstr "" +"Er is een fout opgetreden tijdens het exporteren van het thema \"%s\"! " +"Controleer de terminaluitvoer." + +#: ../../src/pies/defaultConfig.vala:29 +msgid "Multimedia" +msgstr "Multimedia" + +#: ../../src/pies/defaultConfig.vala:30 +msgid "Next Track" +msgstr "Volgende nummer" + +#: ../../src/pies/defaultConfig.vala:31 +msgid "Stop" +msgstr "Stoppen" + +#: ../../src/pies/defaultConfig.vala:32 +msgid "Previous Track" +msgstr "Vorige nummer" + +#: ../../src/pies/defaultConfig.vala:33 +msgid "Play/Pause" +msgstr "Afspelen/Pauzeren" + +#: ../../src/pies/defaultConfig.vala:36 +msgid "Applications" +msgstr "Applicaties" + +#: ../../src/pies/defaultConfig.vala:45 +msgid "Bookmarks" +msgstr "Bladwijzers" + +#: ../../src/pies/defaultConfig.vala:50 +msgid "Session" +msgstr "Sessie" + +#: ../../src/pies/defaultConfig.vala:54 +msgid "Main Menu" +msgstr "Hoofdmenu" + +#: ../../src/pies/defaultConfig.vala:58 +msgid "Window" +msgstr "Venster" + +#: ../../src/pies/defaultConfig.vala:59 +msgid "Scale" +msgstr "Schaal" + +#: ../../src/pies/defaultConfig.vala:60 +msgid "Minimize" +msgstr "Minimaliseren" + +#: ../../src/pies/defaultConfig.vala:61 +msgid "Close" +msgstr "Sluiten" + +#: ../../src/pies/defaultConfig.vala:62 +msgid "Maximize" +msgstr "Maximaliseren" + +#: ../../src/pies/defaultConfig.vala:63 +msgid "Restore" +msgstr "Herstellen" diff --git a/resources/locale/pl/LC_MESSAGES/pl.po b/resources/locale/pl/LC_MESSAGES/pl.po index 0b5bfd8..141ce8d 100644 --- a/resources/locale/pl/LC_MESSAGES/pl.po +++ b/resources/locale/pl/LC_MESSAGES/pl.po @@ -386,28 +386,28 @@ msgid "" msgstr "" #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "" #: ../../src/gui/preferencesWindow.vala:451 @@ -588,7 +588,7 @@ msgstr "" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "" diff --git a/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po b/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po index 1b2dc2a..7dd52ef 100644 --- a/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po +++ b/resources/locale/pt_BR/LC_MESSAGES/pt_BR.po @@ -376,28 +376,28 @@ msgid "" msgstr "" #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "" #: ../../src/gui/preferencesWindow.vala:451 @@ -582,7 +582,7 @@ msgstr "" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "" diff --git a/resources/locale/ru/LC_MESSAGES/ru.po b/resources/locale/ru/LC_MESSAGES/ru.po index 81f0fd9..ed9a8c6 100644 --- a/resources/locale/ru/LC_MESSAGES/ru.po +++ b/resources/locale/ru/LC_MESSAGES/ru.po @@ -408,29 +408,29 @@ msgstr "" "чтобы создать ярлык запуска для этого Пая." #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "Успешно импортирована новая тема!" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "При импорте темы произошла ошибка: Не удалось извлечь тему!" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "При импорте темы произошла ошибка: тема с этим именем уже существует!" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" "При импорте темы произошла ошибка: в архиве темы нет действительной темы!" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "При импорте темы произошла ошибка: Не удалось открыть тему!" #: ../../src/gui/preferencesWindow.vala:451 @@ -616,7 +616,7 @@ msgstr "Тема экспортирована успешно \"%s\"!" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "При экспорте темы произошла ошибка \"%s\"! Проверьте вывод консоли." diff --git a/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po b/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po index a8aa575..17c7f4c 100644 --- a/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po +++ b/resources/locale/zh_CN/LC_MESSAGES/zh_CN.po @@ -367,28 +367,28 @@ msgid "" msgstr "" #: ../../src/gui/preferencesWindow.vala:401 -msgid "Sucessfully imported new theme!" +msgid "Successfully imported new theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:415 -msgid "An error occured while importing the theme: Failed to extract theme!" +msgid "An error occurred while importing the theme: Failed to extract theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:419 msgid "" -"An error occured while importing the theme: A theme with this name does " +"An error occurred while importing the theme: A theme with this name does " "already exist!" msgstr "" #: ../../src/gui/preferencesWindow.vala:423 msgid "" -"An error occured while importing the theme: Theme archive does not contain a " +"An error occurred while importing the theme: Theme archive does not contain a " "valid theme!" msgstr "" #: ../../src/gui/preferencesWindow.vala:427 msgid "" -"An error occured while importing the theme: Failed to open theme archive!" +"An error occurred while importing the theme: Failed to open theme archive!" msgstr "" #: ../../src/gui/preferencesWindow.vala:451 @@ -571,7 +571,7 @@ msgstr "" #: ../../src/themes/theme.vala:176 msgid "" -"An error occured while exporting the theme \"%s\"! Please check the console " +"An error occurred while exporting the theme \"%s\"! Please check the console " "output." msgstr "" diff --git a/src/actionGroups/actionGroup.vala b/src/actionGroups/actionGroup.vala index cb3f125..37319d7 100644 --- a/src/actionGroups/actionGroup.vala +++ b/src/actionGroups/actionGroup.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actionGroups/bookmarkGroup.vala b/src/actionGroups/bookmarkGroup.vala index dc859fa..43a5a79 100644 --- a/src/actionGroups/bookmarkGroup.vala +++ b/src/actionGroups/bookmarkGroup.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actionGroups/clipboardGroup.vala b/src/actionGroups/clipboardGroup.vala index 63bb093..817efd2 100644 --- a/src/actionGroups/clipboardGroup.vala +++ b/src/actionGroups/clipboardGroup.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actionGroups/devicesGroup.vala b/src/actionGroups/devicesGroup.vala index a9164f5..76d783f 100644 --- a/src/actionGroups/devicesGroup.vala +++ b/src/actionGroups/devicesGroup.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actionGroups/groupRegistry.vala b/src/actionGroups/groupRegistry.vala index eaaab24..95f3790 100644 --- a/src/actionGroups/groupRegistry.vala +++ b/src/actionGroups/groupRegistry.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actionGroups/menuGroup.vala b/src/actionGroups/menuGroup.vala index 92071d0..88ff2ed 100644 --- a/src/actionGroups/menuGroup.vala +++ b/src/actionGroups/menuGroup.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actionGroups/sessionGroup.vala b/src/actionGroups/sessionGroup.vala index f044a72..f176745 100644 --- a/src/actionGroups/sessionGroup.vala +++ b/src/actionGroups/sessionGroup.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actionGroups/windowListGroup.vala b/src/actionGroups/windowListGroup.vala index c572f75..ba5ea2b 100644 --- a/src/actionGroups/windowListGroup.vala +++ b/src/actionGroups/windowListGroup.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actions/action.vala b/src/actions/action.vala index 6293302..ee13b39 100644 --- a/src/actions/action.vala +++ b/src/actions/action.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actions/actionRegistry.vala b/src/actions/actionRegistry.vala index 1640a1e..b5831c0 100644 --- a/src/actions/actionRegistry.vala +++ b/src/actions/actionRegistry.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actions/appAction.vala b/src/actions/appAction.vala index 4b55f91..b376796 100644 --- a/src/actions/appAction.vala +++ b/src/actions/appAction.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actions/keyAction.vala b/src/actions/keyAction.vala index 99418cd..36d9707 100644 --- a/src/actions/keyAction.vala +++ b/src/actions/keyAction.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actions/pieAction.vala b/src/actions/pieAction.vala index fe266dd..919ea81 100644 --- a/src/actions/pieAction.vala +++ b/src/actions/pieAction.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actions/sigAction.vala b/src/actions/sigAction.vala index fb241ca..4469a16 100644 --- a/src/actions/sigAction.vala +++ b/src/actions/sigAction.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/actions/uriAction.vala b/src/actions/uriAction.vala index 74b3a15..731de73 100644 --- a/src/actions/uriAction.vala +++ b/src/actions/uriAction.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/daemon.vala b/src/daemon.vala index 32f7e11..ba3ae91 100644 --- a/src/daemon.vala +++ b/src/daemon.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -49,7 +55,7 @@ public class Daemon : GLib.Application { ///////////////////////////////////////////////////////////////////// public static int main(string[] args) { - version = "0.7.1"; + version = "0.7.2"; // disable overlay scrollbar --- hacky workaround for black / // transparent background @@ -121,8 +127,13 @@ public class Daemon : GLib.Application { Intl.textdomain("gnomepie"); // connect SigHandlers +#if VALA_0_40 + Posix.signal(Posix.Signal.INT, sig_handler); + Posix.signal(Posix.Signal.TERM, sig_handler); +#else Posix.signal(Posix.SIGINT, sig_handler); Posix.signal(Posix.SIGTERM, sig_handler); +#endif this.startup.connect(()=>{ diff --git a/src/gui/aboutWindow.vala b/src/gui/aboutWindow.vala index da72417..054d1ee 100644 --- a/src/gui/aboutWindow.vala +++ b/src/gui/aboutWindow.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -53,7 +59,8 @@ public class AboutWindow: Gtk.AboutDialog { "Eugene Roskin <pams@imail.ru> (RU)", "Ashed <craysy@gmail.com> (RU)", "Ting Zhou <tzhou@haverford.edu> (ZH-CN)", - "Martin Dinov <martindinov@yahoo.com> (BG)" + "Martin Dinov <martindinov@yahoo.com> (BG)", + "Heimen Stoffels <vistausss@outlook.com> (NL-NL)" }; // sort translators @@ -73,7 +80,7 @@ public class AboutWindow: Gtk.AboutDialog { artists : artists, authors : devs, translator_credits : translator_string, - copyright : "Copyright (C) 2011-2017 Simon Schneegans <code@simonschneegans.de>", + copyright : "Copyright 2011-2018 Simon Schneegans <code@simonschneegans.de>", program_name: "Gnome-Pie", logo_icon_name: "gnome-pie", website: "http://simmesimme.github.io/gnome-pie.html", diff --git a/src/gui/commandComboList.vala b/src/gui/commandComboList.vala index 640c7b7..ee03aa7 100644 --- a/src/gui/commandComboList.vala +++ b/src/gui/commandComboList.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/iconSelectWindow.vala b/src/gui/iconSelectWindow.vala index 6776288..1c312f8 100644 --- a/src/gui/iconSelectWindow.vala +++ b/src/gui/iconSelectWindow.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/indicator.vala b/src/gui/indicator.vala index ddd101b..9d39b00 100644 --- a/src/gui/indicator.vala +++ b/src/gui/indicator.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -106,7 +112,7 @@ public class Indicator : GLib.Object { this.prefs = new PreferencesWindow(); // preferences item - var item = new Gtk.ImageMenuItem.with_mnemonic(_("_Preferences")); + var item = new Gtk.MenuItem.with_mnemonic(_("_Preferences")); item.activate.connect(() => { this.prefs.show(); }); @@ -115,7 +121,7 @@ public class Indicator : GLib.Object { menu.append(item); // about item - item = new Gtk.ImageMenuItem.with_mnemonic(_("_About")); + item = new Gtk.MenuItem.with_mnemonic(_("_About")); item.show(); item.activate.connect(() => { var about = new AboutWindow(); @@ -130,7 +136,7 @@ public class Indicator : GLib.Object { menu.append(sepa); // quit item - item = new Gtk.ImageMenuItem.with_mnemonic(_("_Quit")); + item = new Gtk.MenuItem.with_mnemonic(_("_Quit")); item.activate.connect(()=>{ GLib.Application.get_default().release(); }); diff --git a/src/gui/newSliceWindow.vala b/src/gui/newSliceWindow.vala index 6ea25d5..026a0ac 100644 --- a/src/gui/newSliceWindow.vala +++ b/src/gui/newSliceWindow.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/newsWindow.vala b/src/gui/newsWindow.vala index f359ae9..b646208 100644 --- a/src/gui/newsWindow.vala +++ b/src/gui/newsWindow.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/pieComboList.vala b/src/gui/pieComboList.vala index 96230c0..87694d7 100644 --- a/src/gui/pieComboList.vala +++ b/src/gui/pieComboList.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/pieList.vala b/src/gui/pieList.vala index 1f6ccec..78d96cf 100644 --- a/src/gui/pieList.vala +++ b/src/gui/pieList.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/pieOptionsWindow.vala b/src/gui/pieOptionsWindow.vala index ea50a53..a4a12cb 100644 --- a/src/gui/pieOptionsWindow.vala +++ b/src/gui/pieOptionsWindow.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/piePreview.vala b/src/gui/piePreview.vala index 6c23590..0c4907c 100644 --- a/src/gui/piePreview.vala +++ b/src/gui/piePreview.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/piePreviewAddSign.vala b/src/gui/piePreviewAddSign.vala index 2674879..aa29f3a 100644 --- a/src/gui/piePreviewAddSign.vala +++ b/src/gui/piePreviewAddSign.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/gui/piePreviewCenter.vala b/src/gui/piePreviewCenter.vala index 2e9923e..0b5d5a7 100644 --- a/src/gui/piePreviewCenter.vala +++ b/src/gui/piePreviewCenter.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; @@ -74,10 +80,12 @@ public class PiePreviewCenter : GLib.Object { if (text != this.current_text) { var style = parent.parent.get_style_context(); + Pango.FontDescription font; + style.get(Gtk.StateFlags.NORMAL, "font", out font); this.old_text = this.text; this.text = new RenderedText.with_markup( - text, 180, 180, style.get_font(Gtk.StateFlags.NORMAL).get_family()+" 10", + text, 180, 180, font.get_family()+" 10", new Color.from_gdk(style.get_color(Gtk.StateFlags.NORMAL)), 1.0); this.current_text = text; diff --git a/src/gui/piePreviewDeleteSign.vala b/src/gui/piePreviewDeleteSign.vala index 0b63aa6..03ccc16 100644 --- a/src/gui/piePreviewDeleteSign.vala +++ b/src/gui/piePreviewDeleteSign.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/gui/piePreviewRenderer.vala b/src/gui/piePreviewRenderer.vala index d7dad25..f7c4675 100644 --- a/src/gui/piePreviewRenderer.vala +++ b/src/gui/piePreviewRenderer.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/gui/piePreviewSliceRenderer.vala b/src/gui/piePreviewSliceRenderer.vala index 622e0dd..69d8229 100644 --- a/src/gui/piePreviewSliceRenderer.vala +++ b/src/gui/piePreviewSliceRenderer.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/gui/preferencesWindow.vala b/src/gui/preferencesWindow.vala index 8c6c66c..259a3a4 100644 --- a/src/gui/preferencesWindow.vala +++ b/src/gui/preferencesWindow.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -398,7 +404,7 @@ public class PreferencesWindow : GLib.Object { dialog.filter.add_pattern ("*.tar.gz"); var result = Gtk.MessageType.INFO; - var message = _("Sucessfully imported new theme!"); + var message = _("Successfully imported new theme!"); dialog.response.connect((d, r) => { if (r == Gtk.ResponseType.ACCEPT) { @@ -412,19 +418,19 @@ public class PreferencesWindow : GLib.Object { Config.global.load_themes(a.theme_name); this.theme_list.reload(); } else { - message = _("An error occured while importing the theme: Failed to extract theme!"); + message = _("An error occurred while importing the theme: Failed to extract theme!"); result = Gtk.MessageType.ERROR; } } else { - message = _("An error occured while importing the theme: A theme with this name does already exist!"); + message = _("An error occurred while importing the theme: A theme with this name does already exist!"); result = Gtk.MessageType.ERROR; } } else { - message = _("An error occured while importing the theme: Theme archive does not contain a valid theme!"); + message = _("An error occurred while importing the theme: Theme archive does not contain a valid theme!"); result = Gtk.MessageType.ERROR; } } else { - message = _("An error occured while importing the theme: Failed to open theme archive!"); + message = _("An error occurred while importing the theme: Failed to open theme archive!"); result = Gtk.MessageType.ERROR; } a.close(); diff --git a/src/gui/sliceTypeList.vala b/src/gui/sliceTypeList.vala index cec9ce3..aad4992 100644 --- a/src/gui/sliceTypeList.vala +++ b/src/gui/sliceTypeList.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/themeList.vala b/src/gui/themeList.vala index 022b57d..c3c161e 100644 --- a/src/gui/themeList.vala +++ b/src/gui/themeList.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/tipViewer.vala b/src/gui/tipViewer.vala index 24b4ccc..2fbca32 100644 --- a/src/gui/tipViewer.vala +++ b/src/gui/tipViewer.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/gui/triggerSelectButton.vala b/src/gui/triggerSelectButton.vala index c70f1cd..0a88244 100644 --- a/src/gui/triggerSelectButton.vala +++ b/src/gui/triggerSelectButton.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/images/icon.vala b/src/images/icon.vala index 7933e81..110436f 100644 --- a/src/images/icon.vala +++ b/src/images/icon.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/images/image.vala b/src/images/image.vala index 9a00f45..a489d88 100644 --- a/src/images/image.vala +++ b/src/images/image.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/images/renderedText.vala b/src/images/renderedText.vala index cae6ee3..0c45c02 100644 --- a/src/images/renderedText.vala +++ b/src/images/renderedText.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/images/themedIcon.vala b/src/images/themedIcon.vala index 6ab5741..e057f47 100644 --- a/src/images/themedIcon.vala +++ b/src/images/themedIcon.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/pies/defaultConfig.vala b/src/pies/defaultConfig.vala index d832347..8d815e0 100644 --- a/src/pies/defaultConfig.vala +++ b/src/pies/defaultConfig.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/pies/load.vala b/src/pies/load.vala index 976d818..8c4d9e4 100644 --- a/src/pies/load.vala +++ b/src/pies/load.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/pies/pie.vala b/src/pies/pie.vala index ef5549c..2945ec2 100644 --- a/src/pies/pie.vala +++ b/src/pies/pie.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/pies/pieManager.vala b/src/pies/pieManager.vala index 6951508..960ab7e 100644 --- a/src/pies/pieManager.vala +++ b/src/pies/pieManager.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/pies/save.vala b/src/pies/save.vala index 2c5e191..b544493 100644 --- a/src/pies/save.vala +++ b/src/pies/save.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/renderers/centerRenderer.vala b/src/renderers/centerRenderer.vala index 65a28fa..c28d7d4 100644 --- a/src/renderers/centerRenderer.vala +++ b/src/renderers/centerRenderer.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/renderers/pieRenderer.vala b/src/renderers/pieRenderer.vala index 47d8b8e..2f8aaf4 100644 --- a/src/renderers/pieRenderer.vala +++ b/src/renderers/pieRenderer.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; @@ -428,19 +434,20 @@ public class PieRenderer : GLib.Object { /// Activates the currently active slice. ///////////////////////////////////////////////////////////////////// - public void activate(uint32 time_stamp) { + public void activate(uint32 time_stamp, bool fade_out) { if (this.active_slice >= this.first_slice_idx && this.active_slice < this.first_slice_idx+this.visible_slice_count) { slices[active_slice].activate(time_stamp); } - //foreach (var slice in this.slices) - // slice.fade_out(); - for (int i= 0; i < this.visible_slice_count; ++i) { - this.slices[ i+this.first_slice_idx ].fade_out(); - } + if (fade_out) + { + for (int i= 0; i < this.visible_slice_count; ++i) { + this.slices[ i+this.first_slice_idx ].fade_out(); + } - center.fade_out(); + center.fade_out(); + } } ///////////////////////////////////////////////////////////////////// @@ -448,8 +455,6 @@ public class PieRenderer : GLib.Object { ///////////////////////////////////////////////////////////////////// public void cancel() { - //foreach (var slice in this.slices) - // slice.fade_out(); for (int i= 0; i < this.visible_slice_count; ++i) { this.slices[ i+this.first_slice_idx ].fade_out(); } diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala index a5142df..6d258d8 100644 --- a/src/renderers/pieWindow.vala +++ b/src/renderers/pieWindow.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; @@ -131,16 +137,6 @@ public class PieWindow : Gtk.Window { this.has_compositing = true; } - //add_events() call was removed because it causes that gnome-pie sometimes enter - //and infinte loop while processing some mouse-motion events. - //(this was seen in Ubuntu 14.04.2 64/32-bits -Glib 2.19- and in MATE 14.04.2) - // set up event filter - // this.add_events(Gdk.EventMask.BUTTON_RELEASE_MASK | - // Gdk.EventMask.KEY_RELEASE_MASK | - // Gdk.EventMask.KEY_PRESS_MASK | - // Gdk.EventMask.POINTER_MOTION_MASK | - // Gdk.EventMask.SCROLL_MASK ); - // activate on left click this.button_release_event.connect ((e) => { if (e.button == 1 || PieManager.get_is_turbo(this.renderer.id)) this.activate_slice(e.time); @@ -185,6 +181,11 @@ public class PieWindow : Gtk.Window { PieManager.bindings.disconnect(connection_id); }); + this.focus_out_event.connect((w, e) => { + this.cancel(); + return true; + }); + // notify the renderer of mouse move events this.motion_notify_event.connect((e) => { this.renderer.on_mouse_move(); @@ -258,8 +259,8 @@ public class PieWindow : Gtk.Window { int monitor_y = screen.get_height(); #endif - //allow some window movement from the screen borders - //(some panels moves the window after it was realized) + // allow some window movement from the screen borders + // (some panels moves the window after it was realized) int dx = this.panel_sz - this.back_x; if (dx > 0) this.back_sz_x += dx; @@ -278,13 +279,13 @@ public class PieWindow : Gtk.Window { this.back_y -= dy; } - //also tolerate some mouse movement + // also tolerate some mouse movement this.back_x -= this.mouse_move; this.back_sz_x += this.mouse_move*2; this.back_y -= this.mouse_move; this.back_sz_y += this.mouse_move*2; - //make sure we don't go outside the screen + // make sure we don't go outside the screen if (this.back_x < 0) { this.back_sz_x += this.back_x; this.back_x = 0; @@ -332,7 +333,7 @@ public class PieWindow : Gtk.Window { ///////////////////////////////////////////////////////////////////// public void get_center_pos(out int out_x, out int out_y) { - int x=0, y=0; //width=0, height=0; + int x = 0, y = 0; this.get_position(out x, out y); out_x = x + renderer.center_x; out_y = y + renderer.center_y; @@ -455,21 +456,33 @@ public class PieWindow : Gtk.Window { private void activate_slice(uint32 time_stamp) { if (!this.closing) { - this.closing = true; - this.on_closing(); - FocusGrabber.ungrab(); + + bool should_close = true; + + // do not close when ctrl or shift is held down + if ((Key.get_modifiers() & + (Gdk.ModifierType.CONTROL_MASK | Gdk.ModifierType.SHIFT_MASK)) > 0 && + !PieManager.get_is_turbo(this.renderer.id)) { + should_close = false; + } GLib.Timeout.add(10, () => { - this.renderer.activate(time_stamp); + this.renderer.activate(time_stamp, should_close); return false; }); - GLib.Timeout.add((uint)(Config.global.theme.fade_out_time*1000), () => { - this.closed = true; - this.on_closed(); - this.destroy(); - return false; - }); + if (should_close) { + this.closing = true; + this.on_closing(); + FocusGrabber.ungrab(); + + GLib.Timeout.add((uint)(Config.global.theme.fade_out_time*1000), () => { + this.closed = true; + this.on_closed(); + this.destroy(); + return false; + }); + } } } diff --git a/src/renderers/sliceRenderer.vala b/src/renderers/sliceRenderer.vala index c370b10..1041b7a 100644 --- a/src/renderers/sliceRenderer.vala +++ b/src/renderers/sliceRenderer.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/themes/centerLayer.vala b/src/themes/centerLayer.vala index 8bd61e2..b71ed86 100644 --- a/src/themes/centerLayer.vala +++ b/src/themes/centerLayer.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/themes/sliceLayer.vala b/src/themes/sliceLayer.vala index be196dd..d3f8cfd 100644 --- a/src/themes/sliceLayer.vala +++ b/src/themes/sliceLayer.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/themes/theme.vala b/src/themes/theme.vala index 4a1806d..f9a9cdd 100644 --- a/src/themes/theme.vala +++ b/src/themes/theme.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/themes/themeImporter.vala b/src/themes/themeImporter.vala index 5a373a6..e6c9e64 100644 --- a/src/themes/themeImporter.vala +++ b/src/themes/themeImporter.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/utilities/animatedValue.vala b/src/utilities/animatedValue.vala index 3dc0685..975b7c3 100644 --- a/src/utilities/animatedValue.vala +++ b/src/utilities/animatedValue.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/utilities/archiveReader.vala b/src/utilities/archiveReader.vala index df248cf..0200c8a 100644 --- a/src/utilities/archiveReader.vala +++ b/src/utilities/archiveReader.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -84,9 +90,14 @@ public class ArchiveReader : GLib.Object { if (entry.size() > 0) { while (true) { size_t offset, size; - void *buff; +#if VALA_0_42 + uint8[] buff; + r = this.archive.read_data_block(out buff, out offset); +#else + void* buff; r = this.archive.read_data_block(out buff, out size, out offset); +#endif if (r == Archive.Result.EOF) { break; } @@ -96,7 +107,11 @@ public class ArchiveReader : GLib.Object { return false; } +#if VALA_0_42 + this.writer.write_data_block(buff, offset); +#else this.writer.write_data_block(buff, size, offset); +#endif } } diff --git a/src/utilities/archiveWriter.vala b/src/utilities/archiveWriter.vala index 2a18154..2244fd1 100644 --- a/src/utilities/archiveWriter.vala +++ b/src/utilities/archiveWriter.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -112,13 +118,17 @@ public class ArchiveWriter : GLib.Object { if (this.archive.write_header(entry) == Archive.Result.OK) { try { var reader = File.new_for_path(path).read(); - uint8 buffer[4096]; + uint8[] buffer = new uint8[4096]; - var len = reader.read(buffer); + buffer.length = (int) reader.read(buffer); - while(len > 0) { - this.archive.write_data(buffer, len); - len = reader.read(buffer); + while(buffer.length > 0) { +#if VALA_0_42 + this.archive.write_data(buffer); +#else + this.archive.write_data(buffer, buffer.length); +#endif + buffer.length = (int) reader.read(buffer); } this.archive.finish_entry(); diff --git a/src/utilities/bindingManager.vala b/src/utilities/bindingManager.vala index 82b6334..832fb88 100644 --- a/src/utilities/bindingManager.vala +++ b/src/utilities/bindingManager.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -183,7 +189,10 @@ public class BindingManager : GLib.Object { } bindings.remove_all(remove_bindings); - display.flush(); + + if (!wayland) { + display.flush(); + } } ///////////////////////////////////////////////////////////////////// diff --git a/src/utilities/color.vala b/src/utilities/color.vala index cc65434..fca8a57 100644 --- a/src/utilities/color.vala +++ b/src/utilities/color.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// using GLib.Math; diff --git a/src/utilities/config.vala b/src/utilities/config.vala index 1d3fde4..642eb52 100644 --- a/src/utilities/config.vala +++ b/src/utilities/config.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/utilities/focusGrabber.vala b/src/utilities/focusGrabber.vala index 8424f12..34a0d0b 100644 --- a/src/utilities/focusGrabber.vala +++ b/src/utilities/focusGrabber.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/utilities/key.vala b/src/utilities/key.vala index 93e18b5..c831b99 100644 --- a/src/utilities/key.vala +++ b/src/utilities/key.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -141,8 +147,9 @@ public class Key : GLib.Object { /// Helper method returning currently hold down modifier keys. ///////////////////////////////////////////////////////////////////// - private Gdk.ModifierType get_modifiers() { - return (Gdk.ModifierType)Gdk.Keymap.get_default().get_modifier_state(); + public static Gdk.ModifierType get_modifiers() { + return (Gdk.ModifierType)Gdk.Keymap.get_for_display( + Gdk.Display.get_default()).get_modifier_state(); } ///////////////////////////////////////////////////////////////////// diff --git a/src/utilities/logger.vala b/src/utilities/logger.vala index 48f27c6..2696224 100644 --- a/src/utilities/logger.vala +++ b/src/utilities/logger.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/src/utilities/paths.vala b/src/utilities/paths.vala index f076ddc..a6e01ef 100644 --- a/src/utilities/paths.vala +++ b/src/utilities/paths.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { @@ -39,13 +45,6 @@ public class Paths : GLib.Object { public static string log { get; private set; default=""; } ///////////////////////////////////////////////////////////////////// - /// The statistics file, - /// usually ~/.config/gnome-pie/gnome-pie.stats. - ///////////////////////////////////////////////////////////////////// - - public static string stats { get; private set; default=""; } - - ///////////////////////////////////////////////////////////////////// /// The settings file, /// usually ~/.config/gnome-pie/gnome-pie.conf. ///////////////////////////////////////////////////////////////////// @@ -232,7 +231,6 @@ public class Paths : GLib.Object { pie_config = config_file.get_path(); settings = config_dir.get_path() + "/gnome-pie.conf"; log = config_dir.get_path() + "/gnome-pie.log"; - stats = config_dir.get_path() + "/gnome-pie.stats"; if (!GLib.File.new_for_path(log).query_exists()) { try { @@ -242,14 +240,6 @@ public class Paths : GLib.Object { } } - if (!GLib.File.new_for_path(stats).query_exists()) { - try { - FileUtils.set_contents(stats, ""); - } catch (GLib.FileError e) { - error(e.message); - } - } - // autostart file name autostart = GLib.Path.build_filename(GLib.Environment.get_user_config_dir(), "autostart", "gnome-pie.desktop", null); @@ -264,9 +254,6 @@ public class Paths : GLib.Object { if (!GLib.File.new_for_path(log).query_exists()) warning("Failed to find log file \"gnome-pie.log\"!"); - if (!GLib.File.new_for_path(stats).query_exists()) - warning("Failed to find statistics file \"gnome-pie.stats\"!"); - if (!GLib.File.new_for_path(local_themes).query_exists()) warning("Failed to find local themes directory!"); diff --git a/src/utilities/trigger.vala b/src/utilities/trigger.vala index ac236cd..71defdf 100644 --- a/src/utilities/trigger.vala +++ b/src/utilities/trigger.vala @@ -1,18 +1,24 @@ ///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ///////////////////////////////////////////////////////////////////////// namespace GnomePie { diff --git a/update_copy_notice.sh b/update_copy_notice.sh index b25872d..f958a6e 100755 --- a/update_copy_notice.sh +++ b/update_copy_notice.sh @@ -3,20 +3,26 @@ shopt -s globstar text="///////////////////////////////////////////////////////////////////////// -// Copyright (c) 2011-2017 by Simon Schneegans +// Copyright 2011-2018 Simon Schneegans // -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or (at -// your option) any later version. -// -// This program is distributed in the hope that it will be useful, but -// WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see <http://www.gnu.org/licenses/>. +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// \"Software\"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. /////////////////////////////////////////////////////////////////////////" types=( @@ -38,7 +44,7 @@ do if grep -q "Simon Schneegans" ${file} then echo "Reformatting ${file} ..." - sed -e '1,16d' ${file} > /tmp/copyright_tmp && mv /tmp/copyright_tmp ${file} + sed -e '1,22d' ${file} > /tmp/copyright_tmp && mv /tmp/copyright_tmp ${file} echo "${text}" > /tmp/copyright_tmp cat ${file} >> /tmp/copyright_tmp && mv /tmp/copyright_tmp ${file} fi |