diff --git a/C++StandardHeaderFile.txt b/C++StandardHeaderFile.txt index 5eddb684..f55fd459 100644 --- a/C++StandardHeaderFile.txt +++ b/C++StandardHeaderFile.txt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/ChangeLog.html b/ChangeLog.html deleted file mode 100644 index 90b9da53..00000000 --- a/ChangeLog.html +++ /dev/null @@ -1,804 +0,0 @@ - - Release Notes - Sankoré - Version 1.40.b.07 - Release Date: 30/May/12 -

Bug -

- - - Release Notes - Sankoré - Version 1.40.b.06 - Release Date: ??/??/12 -

Bug -

- - -

Improvement -

- - -

New Feature -

- - - - - Release Notes - Sankoré - Version 1.40.b.05 - Release Date: 27/Mar/12 - -

Bug -

- - - - - Release Notes - Sankoré - Version 1.40.b.04 - Release Date: ??/??/12 - -

Bug -

- - -

Improvement -

- - -

New Feature -

- - -

Story -

- - - - Release Notes - Sankoré - Version 1.40.b.02 - Release Date: 11/Jan/12 - -

Bug -

- - -

Improvement -

- - -

New Feature -

- - - - - Release Notes - Sankoré - Version 1.40.b.00 - Release Date: 07/Dec/11 - -

Bug -

- - -

Epic -

- - -

Improvement -

- - -

New Feature -

- - -

Story -

- - -

Task -

- - -

Sub-task -

- - -

Technical task -

- - - - - Release Notes - Sankoré - Version 1.30.00 - Release Date: 05/Dec/11 - -

Bug -

- - -

Improvement -

- - -

Sub-task -

- - - - Release Notes - Sankoré - Version 1.30.b.00 - Release Date: 06/Dec/11 - -

Bug -

- - -

Epic -

- - -

Improvement -

- - -

Story -

- - -

Task -

- - -

Sub-task -

- - - - - Release Notes - Sankoré - Version 1.21.00 - Release Date: 30/Aug/11 - -

Bug -

- - -

New Feature -

- - -

Story -

- - - - Release Notes - Sankoré - Version 1.10.00 - Release Date: 16/Aug/12 - -

Bug -

- - -

Story -

- - -

Task -

- - -

Sub-task -

- - - - - Release Notes - Sankoré - Version 1.00.00 - Release Date: 17/Jul/11 - -

Bug -

- - -

Improvement -

- - -

New Feature -

- - -

Story -

- - - Release Notes - Sankoré - Version 1.06.b.00 - Release Date: 10/Jun/12 - -

Bug -

- - - - - Release Notes - Sankoré - Version 1.05.b.00 - Release Date: 30/May/11 - -

Bug -

- - -

Task -

- - -

Sub-task -

- - - - - Release Notes - Sankoré - Version 1.04.b.00 - Release Date: 20/May/11 - -

Bug -

- - - - Release Notes - Sankoré - Version 1.01.b.00.184M - Release Date: 06/May/11 - -

Bug -

- - diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..c60ab7c9 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,687 @@ +Copyright (C) 2013 Groupement d'Intert Public pour l'Education Numrique en Afrique (GIP ENA) + +Open-Sankor is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, version 3 of the License, +with a specific linking exception for the OpenSSL project's +"OpenSSL" library (or with modified versions of it that use the +same license as the "OpenSSL" library). + +Here is the full text of the GNU General Public License version 3. + +--8<---------------cut here---------------start------------->8--- + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. +--8<---------------cut here---------------end--------------->8--- diff --git a/Open-Sankore.packproj b/Open-Sankore.packproj index a616aae8..f443040f 100644 --- a/Open-Sankore.packproj +++ b/Open-Sankore.packproj @@ -28,7 +28,7 @@ Mode 1 Path - COPYING + LICENSE.txt Path Type 2 diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index f1908440..bd80f275 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -9,9 +9,9 @@ CONFIG += debug_and_release \ VERSION_MAJ = 2 -VERSION_MIN = 00 +VERSION_MIN = 00 VERSION_TYPE = r # a = alpha, b = beta, r = release, other => error -VERSION_PATCH = 02 +VERSION_PATCH = 05 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") @@ -128,10 +128,10 @@ win32 { } macx { - LIBS += -framework Foundation + LIBS += -framework Foundation LIBS += -lcrypto #commented because Sankore crashes on Java Script. It seems to backends dependencies. - #LIBS += -framework AppKit + #LIBS += -framework AppKit #LIBS += -framework WebKit CONFIG(release, debug|release):CONFIG += x86 @@ -351,7 +351,7 @@ macx { TRANSLATION_mg.path = "$$RESOURCES_DIR/mg.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_mg } - + QMAKE_BUNDLE_DATA += UB_ETC \ UB_LIBRARY \ UB_FONTS \ diff --git a/buildDebianPackage.sh b/buildDebianPackage.sh index e2be330f..877f4f8c 100755 --- a/buildDebianPackage.sh +++ b/buildDebianPackage.sh @@ -19,6 +19,15 @@ # functions #********************** +checkUser() +{ + if [ `id -u` -ne 0 ]; then + echo "Please run the script as root, may be using fakeroot command as follow" + echo "fakeroot ./buildDebianPackage.sh [options]" + exit 1 + fi +} + initializeVariables() { MAKE_TAG=true @@ -120,6 +129,7 @@ buildWithStandardQt(){ #********************** # script #********************** +checkUser initializeVariables buildWithStandardQt @@ -375,12 +385,13 @@ chmod 755 "$BASE_WORKING_DIR/DEBIAN/postint" mkdir -p "install/linux" DEBIAN_PACKAGE_NAME="Open-Sankore_${VERSION}_$ARCHITECTURE.deb" -fakeroot chown -R root:root $BASE_WORKING_DIR +chown -R root:root $BASE_WORKING_DIR dpkg -b "$BASE_WORKING_DIR" "install/linux/$DEBIAN_PACKAGE_NAME" -notifyProgress "Open-Sankore" "Package built" #clean up mess -fakeroot rm -rf $BASE_WORKING_DIR +rm -rf $BASE_WORKING_DIR + +notifyProgress "Open-Sankore" "Package built" if [ $CREATE_DIENA_DISTRIBUTION_ZIP == true ]; then @@ -392,3 +403,4 @@ if [ $CREATE_DIENA_DISTRIBUTION_ZIP == true ]; then notifyProgress "Open-Sankore" "Build Diena zip file for distribution" fi +exit 0 diff --git a/plugins/cffadaptor/src/UBCFFAdaptor.cpp b/plugins/cffadaptor/src/UBCFFAdaptor.cpp index 431c46e8..b9a135a4 100644 --- a/plugins/cffadaptor/src/UBCFFAdaptor.cpp +++ b/plugins/cffadaptor/src/UBCFFAdaptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/plugins/cffadaptor/src/UBCFFAdaptor.h b/plugins/cffadaptor/src/UBCFFAdaptor.h index 93eb6166..10ac6366 100644 --- a/plugins/cffadaptor/src/UBCFFAdaptor.h +++ b/plugins/cffadaptor/src/UBCFFAdaptor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -100,7 +100,7 @@ private: bool parseUBZPolygon(const QDomElement &element, QMultiMap &dstSvgList); bool parseUBZPolyline(const QDomElement &element, QMultiMap &dstSvgList); - bool parseUBZLine(const QDomElement &element, QMultiMap &dstSvgList); + bool parseUBZLine(const QDomElement &element, QMultiMap &dstSvgList); void addSVGElementToResultModel(const QDomElement &element, QMultiMap &dstList, int layer = DEFAULT_LAYER); void addIWBElementToResultModel(const QDomElement &element); diff --git a/plugins/cffadaptor/src/UBCFFAdaptor_global.h b/plugins/cffadaptor/src/UBCFFAdaptor_global.h index 182a649a..3f060b96 100644 --- a/plugins/cffadaptor/src/UBCFFAdaptor_global.h +++ b/plugins/cffadaptor/src/UBCFFAdaptor_global.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/plugins/cffadaptor/src/UBCFFConstants.h b/plugins/cffadaptor/src/UBCFFConstants.h index 7d03d55f..588ea699 100644 --- a/plugins/cffadaptor/src/UBCFFConstants.h +++ b/plugins/cffadaptor/src/UBCFFConstants.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/plugins/cffadaptor/src/UBGlobals.h b/plugins/cffadaptor/src/UBGlobals.h index 309004c2..1c2864d3 100644 --- a/plugins/cffadaptor/src/UBGlobals.h +++ b/plugins/cffadaptor/src/UBGlobals.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/release.linux.sh b/release.linux.sh deleted file mode 100755 index c0060155..00000000 --- a/release.linux.sh +++ /dev/null @@ -1,362 +0,0 @@ -#!/bin/bash -# -------------------------------------------------------------------- -# This program is free software: you can 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 . -# --------------------------------------------------------------------- - - -####################################################################### -# functions # -####################################################################### -notifyError(){ - notify-send -t 0 "Error occoured" "An error occours during the sankore build:\n\t$1" -i /usr/share/icons/oxygen/64x64/status/dialog-error.png - exit 1 -} - -checkExecutable(){ - if [ ! -x $1 ]; then - notify-send "$1 executable not found" - fi -} - -checkDirectory(){ - if [ ! -d $1 ]; then - notify-send "$1 directory not found" - fi -} - -####################################################################### -# path definition # -####################################################################### -QT_PATH="/usr/local/Trolltech/Qt-4.7.3" -QT_PLUGINS_PATH="$QT_PATH/plugins" -RELEASE_DIR=build/linux/release -BUILD_DIR=$RELEASE_DIR/product -GUI_TRANSLATIONS_DIRECTORY_PATH="../Qt-sankore3.1/translations" -QT_LIBRARY_SOURCE_PATH="$QT_PATH/lib" -SANKORE_SRC_PLUGINS_PATH="plugins" -SANKORE_DST_PLUGINS_PATH=build/linux/release/product/plugins -CFF_ADAPTOR_SRC_PLUGIN_PATH=$SANKORE_SRC_PLUGINS_PATH/cffadaptor/build/linux/release/lib - -QMAKE_PATH="$QT_PATH/bin/qmake" -LRELEASE="../Qt-sankore3.1/bin/lrelease" -#LRELEASE="/usr/local/Trolltech/Qt-4.7.3/bin/lrelease" - -ARCHITECTURE=`uname -m` - -####################################################################### -# initials checks # -####################################################################### -checkExecutable $QMAKE_PATH -checkExecutable $LRELEASE - -checkDirectory $GUI_TRANSLATIONS_DIRECTORY_PATH -checkDirectory $QT_PLUGINS_PATH -checkDirectory $QT_LIBRARY_SOURCE_PATH - -checkDirectory $CFF_ADAPTOR_PLUGIN_PATH - -####################################################################### -# cleaning # -####################################################################### -#rm -rf $RELEASE_DIR - - -####################################################################### -# Internalization # -####################################################################### -notify-send "QT" "Internalization ..." - -cd $GUI_TRANSLATIONS_DIRECTORY_PATH -$LRELEASE translations.pro -cd - -if [ ! -e $BUILD_DIR/i18n ]; then - mkdir -p $BUILD_DIR/i18n -fi -#copying qt gui translation -cp $GUI_TRANSLATIONS_DIRECTORY_PATH/qt_??.qm $BUILD_DIR/i18n/ - - -$LRELEASE Sankore_3.1.pro - - -####################################################################### -# building # -####################################################################### -notify-send "Open-Sankore" "Building Open-Sankore ..." - -if [ "$ARCHITECTURE" == "x86_64" ]; then - $QMAKE_PATH -spec linux-g++-64 -else - $QMAKE_PATH -spec linux-g++ -fi - -checkDirectory $BUILD_DIR - -make -j 4 release-install - - -####################################################################### -# github tag # -####################################################################### -notify-send "Git Hub" "Make a tag of the delivered version" -VERSION=`cat $RELEASE_DIR/version` -if [ ! -f $RELEASE_DIR/version ]; then - notifyError "version not found" - exit 1 -else - LAST_COMMITED_VERSION="`git describe $(git rev-list --tags --max-count=1)`" - if [ "v$VERSION" != "$LAST_COMMITED_VERSION" ]; then - echo creating a tag with the version $VERSION - git tag -a "v$VERSION" -m "Generating setup for v$VERSION" - git push origin --tags - fi -fi - -####################################################################### -# coping resources # -####################################################################### -cp resources/linux/run.sh $BUILD_DIR -chmod +x $BUILD_DIR/run.sh - -cp -R resources/linux/qtlinux/* $BUILD_DIR - -cp -R resources/customizations $BUILD_DIR - -notify-send "Sankore" "Copying plugins..." -mkdir "$SANKORE_DST_PLUGINS_PATH" -mkdir "$SANKORE_DST_PLUGINS_PATH/cffadaptor" -cp -R $CFF_ADAPTOR_SRC_PLUGIN_PATH/*.so* "$SANKORE_DST_PLUGINS_PATH/cffadaptor" - -notify-send "QT" "Coping plugins and library ..." -cp -R $QT_PLUGINS_PATH $BUILD_DIR - -#copying custom qt library -QT_LIBRARY_DEST_PATH="$BUILD_DIR/qtlib" -mkdir $QT_LIBRARY_DEST_PATH - -copyQtLibrary(){ - if [ ! -e "$QT_LIBRARY_SOURCE_PATH/$1.so.4" ]; then - notifyError "$1 library not found in path: $QT_LIBRARY_SOURCE_PATH" - fi - cp $QT_LIBRARY_SOURCE_PATH/$1.so.4.* $QT_LIBRARY_DEST_PATH/ -} - -copyQtLibrary libphonon -copyQtLibrary libQtWebKit -copyQtLibrary libQtDBus -copyQtLibrary libQtScript -copyQtLibrary libQtSvg -copyQtLibrary libQtXmlPatterns -copyQtLibrary libQtNetwork -copyQtLibrary libQtXml -copyQtLibrary libQtGui -copyQtLibrary libQtCore -# uncomment for Qt 4.8 -#copyQtLibrary libQtOpenGL - -####################################################################### -# Removing unwanted files # -####################################################################### -cd $BUILD_DIR - -#Removing .svn directories ... -find . -name .svn -exec rm -rf {} \; 2> /dev/null - -cd - -notify-send "Building Sankore" "Finished to build Sankore building the package" - -####################################################################### -# build debian # -####################################################################### -BASE_WORKING_DIR="packageBuildDir" - -#creating package directory -mkdir $BASE_WORKING_DIR -mkdir "$BASE_WORKING_DIR/DEBIAN" -mkdir -p "$BASE_WORKING_DIR/usr/share/applications" -mkdir -p "$BASE_WORKING_DIR/usr/local" - - -cat > "$BASE_WORKING_DIR/DEBIAN/prerm" << EOF -#!/bin/bash -# -------------------------------------------------------------------- -# This program is free software: you can 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 . -# --------------------------------------------------------------------- - -xdg-desktop-menu uninstall /usr/share/applications/Open-Sankore.desktop -exit 0 -#DEBHELPER# -EOF - -cat > "$BASE_WORKING_DIR/DEBIAN/postint" << EOF -#!/bin/bash -# -------------------------------------------------------------------- -# This program is free software: you can 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 . -# --------------------------------------------------------------------- - -xdg-desktop-menu install --novendor /usr/share/applications/Open-Sankore.desktop -exit 0 -#DEBHELPER# -EOF - - -SANKORE_DIRECTORY_NAME="Open-Sankore-$VERSION" -SANKORE_PACKAGE_DIRECTORY="$BASE_WORKING_DIR/usr/local/$SANKORE_DIRECTORY_NAME" -#move sankore build directory to packages directory -cp -R $BUILD_DIR $SANKORE_PACKAGE_DIRECTORY - - -cat > $BASE_WORKING_DIR/usr/local/$SANKORE_DIRECTORY_NAME/run.sh << EOF -!/bin/bash -# -------------------------------------------------------------------- -# This program is free software: you can 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 . -# --------------------------------------------------------------------- - -env LD_LIBRARY_PATH=/usr/local/$SANKORE_DIRECTORY_NAME/qtlib:$LD_LIBRARY_PATH /usr/local/$SANKORE_DIRECTORY_NAME/Open-Sankore -EOF - - -CHANGE_LOG_FILE="$BASE_WORKING_DIR/DEBIAN/changelog-sankore-$VERSION.txt" -CONTROL_FILE="$BASE_WORKING_DIR/DEBIAN/control" -CHANGE_LOG_TEXT="changelog.txt" - -if [ "$ARCHITECTURE" == "x86_64" ]; then - ARCHITECTURE="amd64" -fi - -if [ "$ARCHITECTURE" == "i686" ]; then - ARCHITECTURE="i386" -fi - -echo "Open-Sankore ($VERSION) $ARCHITECTURE; urgency=low" > "$CHANGE_LOG_FILE" -echo >> "$CHANGE_LOG_FILE" -cat $CHANGE_LOG_TEXT >> "$CHANGE_LOG_FILE" -echo >> "$CHANGE_LOG_FILE" -echo "-- Claudio Valerio `date`" >> "$CHANGE_LOG_FILE" - -echo "Package: open-sankore" > "$CONTROL_FILE" -echo "Version: $VERSION" >> "$CONTROL_FILE" -echo "Section: education" >> "$CONTROL_FILE" -echo "Priority: optional" >> "$CONTROL_FILE" -echo "Architecture: $ARCHITECTURE" >> "$CONTROL_FILE" -echo "Essential: no" >> "$CONTROL_FILE" -echo "Installed-Size: `du -s $SANKORE_PACKAGE_DIRECTORY | awk '{ print $1 }'`" >> "$CONTROL_FILE" -echo "Maintainer: Open-Sankore Developers team " >> "$CONTROL_FILE" -echo "Homepage: http://dev.open-sankore.org" >> "$CONTROL_FILE" -echo -n "Depends: " >> "$CONTROL_FILE" -unset tab -declare -a tab -let count=0 -for l in `objdump -p $SANKORE_PACKAGE_DIRECTORY/Open-Sankore | grep NEEDED | awk '{ print $2 }'`; do - for lib in `dpkg -S $l | awk -F":" '{ print $1 }'`; do - #echo $lib - presence=`echo ${tab[*]} | grep -c "$lib"`; - if [ "$presence" == "0" ]; then - tab[$count]=$lib; - ((count++)); - fi; - done; -done; - -#additional dependencies -tab[$count]="gtk2-engines-pixbuf" -((count++)) -tab[$count]="ttf-mscorefonts-installer" -((count++)) - -for ((i=0;i<${#tab[@]};i++)); do - if [ $i -ne "0" ]; then - echo -n ", " >> "$CONTROL_FILE" - fi - echo -n "${tab[$i]} (>= "`dpkg -p ${tab[$i]} | grep "Version: " | awk '{ print $2 }'`") " >> "$CONTROL_FILE" -done -echo "" >> "$CONTROL_FILE" -echo "Description: This a interactive white board that uses a free standard format." >> "$CONTROL_FILE" - -find $BASE_WORKING_DIR/usr/ -exec md5sum {} > $BASE_WORKING_DIR/DEBIAN/md5sums 2>/dev/null \; -SANKORE_SHORTCUT="$BASE_WORKING_DIR/usr/share/applications/Open-Sankore.desktop" -echo "[Desktop Entry]" > $SANKORE_SHORTCUT -echo "Version=$VERSION" >> $SANKORE_SHORTCUT -echo "Encoding=UTF-8" >> $SANKORE_SHORTCUT -echo "Name=Open-Sankore ($VERSION)" >> $SANKORE_SHORTCUT -echo "GenericName=Open-Sankore" >> $SANKORE_SHORTCUT -echo "Comment=Logiciel de creation de presentations pour tableau numerique interactif (TNI)" >> $SANKORE_SHORTCUT -echo "Exec=/usr/local/$SANKORE_DIRECTORY_NAME/run.sh" >> $SANKORE_SHORTCUT -echo "Icon=/usr/local/$SANKORE_DIRECTORY_NAME/sankore.png" >> $SANKORE_SHORTCUT -echo "StartupNotify=true" >> $SANKORE_SHORTCUT -echo "Terminal=false" >> $SANKORE_SHORTCUT -echo "Type=Application" >> $SANKORE_SHORTCUT -echo "Categories=Education" >> $SANKORE_SHORTCUT -echo "Name[fr_FR]=Open-Sankore ($VERSION)" >> $SANKORE_SHORTCUT -cp "resources/images/uniboard.png" "$SANKORE_PACKAGE_DIRECTORY/sankore.png" -chmod 755 "$BASE_WORKING_DIR/DEBIAN" -chmod 755 "$BASE_WORKING_DIR/DEBIAN/prerm" -chmod 755 "$BASE_WORKING_DIR/DEBIAN/postint" - -mkdir -p "install/linux" - -rm install/linux/Open-Sankore_*.deb - -fakeroot chown -R root:root $BASE_WORKING_DIR -dpkg -b "$BASE_WORKING_DIR" install/linux/Open-Sankore_${VERSION}_$ARCHITECTURE.deb -notify-send "Open-Sankore" "Package built" - -#clean up mess -fakeroot rm -rf $BASE_WORKING_DIR - - -####################################################################### -# tar.gz # -####################################################################### -echo `pwd` -cp -R $RELEASE_DIR/product $RELEASE_DIR/Open-Sankore.$VERSION -cd $RELEASE_DIR - -rm ../../../install/linux/Open-Sankore.tar.gz - -tar cvzf ../../../install/linux/Open-Sankore.tar.gz Open-Sankore.$VERSION -C . -notify-send "Open-Sankore" "tar.gz Build done" diff --git a/resources/customizations/fonts/ALPHONET.TTF b/resources/customizations/fonts/ALPHONET.TTF deleted file mode 100644 index 9917987f..00000000 Binary files a/resources/customizations/fonts/ALPHONET.TTF and /dev/null differ diff --git a/resources/customizations/fonts/AlphoneticGB.ttf b/resources/customizations/fonts/AlphoneticGB.ttf deleted file mode 100644 index caa9a297..00000000 Binary files a/resources/customizations/fonts/AlphoneticGB.ttf and /dev/null differ diff --git a/resources/customizations/fonts/AndBasR.ttf b/resources/customizations/fonts/AndBasR.ttf deleted file mode 100755 index d785cc9d..00000000 Binary files a/resources/customizations/fonts/AndBasR.ttf and /dev/null differ diff --git a/resources/customizations/fonts/Cursive standard Bold.ttf b/resources/customizations/fonts/Cursive standard Bold.ttf deleted file mode 100755 index 10d2f039..00000000 Binary files a/resources/customizations/fonts/Cursive standard Bold.ttf and /dev/null differ diff --git a/resources/customizations/fonts/Cursive standard.ttf b/resources/customizations/fonts/Cursive standard.ttf deleted file mode 100755 index e1333541..00000000 Binary files a/resources/customizations/fonts/Cursive standard.ttf and /dev/null differ diff --git a/resources/customizations/fonts/GinSSB60.ttf b/resources/customizations/fonts/GinSSB60.ttf deleted file mode 100644 index 924f1fe7..00000000 Binary files a/resources/customizations/fonts/GinSSB60.ttf and /dev/null differ diff --git a/resources/customizations/fonts/SCRIPTCA.TTF b/resources/customizations/fonts/SCRIPTCA.TTF deleted file mode 100644 index b991f68f..00000000 Binary files a/resources/customizations/fonts/SCRIPTCA.TTF and /dev/null differ diff --git a/resources/customizations/fonts/SCRIPTCO.TTF b/resources/customizations/fonts/SCRIPTCO.TTF deleted file mode 100644 index f5fad5c6..00000000 Binary files a/resources/customizations/fonts/SCRIPTCO.TTF and /dev/null differ diff --git a/resources/customizations/fonts/ScriptEcole2.ttf b/resources/customizations/fonts/ScriptEcole2.ttf deleted file mode 100644 index 196aea5f..00000000 Binary files a/resources/customizations/fonts/ScriptEcole2.ttf and /dev/null differ diff --git a/resources/customizations/fonts/ec.ttf b/resources/customizations/fonts/ec.ttf deleted file mode 100644 index 972828c7..00000000 Binary files a/resources/customizations/fonts/ec.ttf and /dev/null differ diff --git a/resources/customizations/fonts/ec_co_pt.ttf b/resources/customizations/fonts/ec_co_pt.ttf deleted file mode 100644 index 8d7fbfff..00000000 Binary files a/resources/customizations/fonts/ec_co_pt.ttf and /dev/null differ diff --git a/resources/customizations/fonts/ec_cour.ttf b/resources/customizations/fonts/ec_cour.ttf deleted file mode 100644 index 571571e3..00000000 Binary files a/resources/customizations/fonts/ec_cour.ttf and /dev/null differ diff --git a/resources/customizations/fonts/ec_cp.ttf b/resources/customizations/fonts/ec_cp.ttf deleted file mode 100644 index 68421072..00000000 Binary files a/resources/customizations/fonts/ec_cp.ttf and /dev/null differ diff --git a/resources/customizations/fonts/ec_cp_pt.ttf b/resources/customizations/fonts/ec_cp_pt.ttf deleted file mode 100644 index 8528df7b..00000000 Binary files a/resources/customizations/fonts/ec_cp_pt.ttf and /dev/null differ diff --git a/resources/customizations/fonts/ecl.ttf b/resources/customizations/fonts/ecl.ttf deleted file mode 100644 index 6fbafb90..00000000 Binary files a/resources/customizations/fonts/ecl.ttf and /dev/null differ diff --git a/resources/customizations/fonts/ecl_cour.ttf b/resources/customizations/fonts/ecl_cour.ttf deleted file mode 100644 index af61c8e8..00000000 Binary files a/resources/customizations/fonts/ecl_cour.ttf and /dev/null differ diff --git a/resources/customizations/fonts/eclcopt.ttf b/resources/customizations/fonts/eclcopt.ttf deleted file mode 100644 index 811df3cc..00000000 Binary files a/resources/customizations/fonts/eclcopt.ttf and /dev/null differ diff --git a/resources/forms/preferences.ui b/resources/forms/preferences.ui index 9bce9d39..942f7bfa 100644 --- a/resources/forms/preferences.ui +++ b/resources/forms/preferences.ui @@ -24,7 +24,7 @@ - 0 + 5 @@ -794,7 +794,7 @@ p, li { white-space: pre-wrap; } - 0 + 4 @@ -2084,7 +2084,7 @@ Public License instead of this License. - Copyright (C) 2012 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) + Copyright (C) 2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) Open-Sankoré is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -2788,77 +2788,6 @@ Public License instead of this License. But first, please read Credits - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Crédits police scolaire Open-Sankoré : </span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">La police Andika Basic dispose d'une licence Open Font License </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Sil international</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;id=andika</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Licence OFL (traduction française non officielle) http://fontforge.sourceforge.net/OFL-Unofficial-fr.html</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence OFL : </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier Court </span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier Ligne Court</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Ecolier suivantes sont l'oeuvre de Jean-Marie Douteau et disposent d'une licence Creative Commons BY NC ND :</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Ecolier lignes pointillés</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier pointillés</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier CP</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">- Écolier CP pointillés</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Jean-Marie Douteau (douteau.ecolier@sfr.fr)</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://douteau.ecolier.perso.sfr.fr/page_ecolier.htm</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Cursive sont l'oeuvre d'Antoine Fetet (antoine.fetet@laposte.net) à partir d'une police proposée par Jean-Claude Gineau</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://lps13.free.fr/contenu/construire/Cursive_standard.zip et http://fr.fontriver.com/font/gino_school_script/</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">L'auteur en autorise l'utilisation dans le cadre du logiciel open-Sankoré pour un usage non commercial</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Les polices Script (Ecole et CaseEcole) sont l'oeuvre d'Henri Rogelet</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/SCRIPTCO.zip</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/SCRIPTCA.zip</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Autorisation pour un usage non commercial</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices.html</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu'; font-size:10pt;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"><br /></span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">La police phonétique, Alphonet est l'oeuvre d'Henri Rogelet</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices/ALPHONET.zip</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;"> © Henri Rogelet &lt;h.rogelet@free.fr&gt;</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Autorisation pour un usage non commercial</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">Source : http://pointecole.free.fr/polices.html</span></p></body></html> - - - Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse - - - true - - - false - - - diff --git a/resources/library/animations/Biologie/coeur.swf b/resources/library/animations/Biologie/coeur.swf deleted file mode 100755 index bd81caec..00000000 Binary files a/resources/library/animations/Biologie/coeur.swf and /dev/null differ diff --git a/resources/library/animations/Biologie/os et muscles.swf b/resources/library/animations/Biologie/os et muscles.swf deleted file mode 100755 index 0f484931..00000000 Binary files a/resources/library/animations/Biologie/os et muscles.swf and /dev/null differ diff --git a/resources/library/animations/Biologie/systeme circulatoire.swf b/resources/library/animations/Biologie/systeme circulatoire.swf deleted file mode 100755 index 39fd98da..00000000 Binary files a/resources/library/animations/Biologie/systeme circulatoire.swf and /dev/null differ diff --git a/resources/library/animations/Biologie/systeme nerveux.swf b/resources/library/animations/Biologie/systeme nerveux.swf deleted file mode 100755 index bc4fcd30..00000000 Binary files a/resources/library/animations/Biologie/systeme nerveux.swf and /dev/null differ diff --git a/resources/library/animations/Biologie/systeme sanguin.swf b/resources/library/animations/Biologie/systeme sanguin.swf deleted file mode 100755 index 4d6db18a..00000000 Binary files a/resources/library/animations/Biologie/systeme sanguin.swf and /dev/null differ diff --git a/resources/library/animations/Biologie/systemes.swf b/resources/library/animations/Biologie/systemes.swf deleted file mode 100755 index f602a1f7..00000000 Binary files a/resources/library/animations/Biologie/systemes.swf and /dev/null differ diff --git a/resources/library/animations/Jeux/chat-noir.swf b/resources/library/animations/Jeux/chat-noir.swf deleted file mode 100755 index 2626ea9a..00000000 Binary files a/resources/library/animations/Jeux/chat-noir.swf and /dev/null differ diff --git a/resources/library/animations/Jeux/echec IA.swf b/resources/library/animations/Jeux/echec IA.swf deleted file mode 100755 index 05db0d7d..00000000 Binary files a/resources/library/animations/Jeux/echec IA.swf and /dev/null differ diff --git a/resources/library/animations/Jeux/echec simple.swf b/resources/library/animations/Jeux/echec simple.swf deleted file mode 100755 index b7bf827e..00000000 Binary files a/resources/library/animations/Jeux/echec simple.swf and /dev/null differ diff --git a/resources/library/animations/Jeux/line-rider.swf b/resources/library/animations/Jeux/line-rider.swf deleted file mode 100755 index f86368de..00000000 Binary files a/resources/library/animations/Jeux/line-rider.swf and /dev/null differ diff --git a/resources/library/animations/Jeux/reversi.swf b/resources/library/animations/Jeux/reversi.swf deleted file mode 100755 index 0f063d3b..00000000 Binary files a/resources/library/animations/Jeux/reversi.swf and /dev/null differ diff --git a/resources/library/animations/Maths/boulier_sesamath.swf b/resources/library/animations/Maths/boulier_sesamath.swf deleted file mode 100755 index 5530a11b..00000000 Binary files a/resources/library/animations/Maths/boulier_sesamath.swf and /dev/null differ diff --git a/resources/library/animations/Maths/rapporteur-interactif.swf b/resources/library/animations/Maths/rapporteur-interactif.swf deleted file mode 100755 index 8d43b76b..00000000 Binary files a/resources/library/animations/Maths/rapporteur-interactif.swf and /dev/null differ diff --git a/resources/library/animations/Sciences/horloge-interactive.swf b/resources/library/animations/Sciences/horloge-interactive.swf deleted file mode 100755 index 8a82734d..00000000 Binary files a/resources/library/animations/Sciences/horloge-interactive.swf and /dev/null differ diff --git a/resources/library/animations/Sciences/thermometre-interactif.swf b/resources/library/animations/Sciences/thermometre-interactif.swf deleted file mode 100755 index 0023fb47..00000000 Binary files a/resources/library/animations/Sciences/thermometre-interactif.swf and /dev/null differ diff --git a/resources/library/audios/Animaux/insectes/abeilles.mp3 b/resources/library/audios/Animaux/insectes/abeilles.mp3 deleted file mode 100755 index dff1b31e..00000000 Binary files a/resources/library/audios/Animaux/insectes/abeilles.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/insectes/moustique.mp3 b/resources/library/audios/Animaux/insectes/moustique.mp3 deleted file mode 100755 index ccb68d74..00000000 Binary files a/resources/library/audios/Animaux/insectes/moustique.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes domestiques/chat.mp3 b/resources/library/audios/Animaux/mammiferes domestiques/chat.mp3 deleted file mode 100755 index d09e140e..00000000 Binary files a/resources/library/audios/Animaux/mammiferes domestiques/chat.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes domestiques/chien.mp3 b/resources/library/audios/Animaux/mammiferes domestiques/chien.mp3 deleted file mode 100755 index 0cd1dd24..00000000 Binary files a/resources/library/audios/Animaux/mammiferes domestiques/chien.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes domestiques/cochon.mp3 b/resources/library/audios/Animaux/mammiferes domestiques/cochon.mp3 deleted file mode 100755 index adcc400d..00000000 Binary files a/resources/library/audios/Animaux/mammiferes domestiques/cochon.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes domestiques/mouton.mp3 b/resources/library/audios/Animaux/mammiferes domestiques/mouton.mp3 deleted file mode 100755 index 94a7ed79..00000000 Binary files a/resources/library/audios/Animaux/mammiferes domestiques/mouton.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes domestiques/vache.mp3 b/resources/library/audios/Animaux/mammiferes domestiques/vache.mp3 deleted file mode 100755 index b6fb5f08..00000000 Binary files a/resources/library/audios/Animaux/mammiferes domestiques/vache.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes sauvages/chimpanze.mp3 b/resources/library/audios/Animaux/mammiferes sauvages/chimpanze.mp3 deleted file mode 100755 index e1af0d60..00000000 Binary files a/resources/library/audios/Animaux/mammiferes sauvages/chimpanze.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes sauvages/elephant.mp3 b/resources/library/audios/Animaux/mammiferes sauvages/elephant.mp3 deleted file mode 100755 index d5fe2340..00000000 Binary files a/resources/library/audios/Animaux/mammiferes sauvages/elephant.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes sauvages/leopard.mp3 b/resources/library/audios/Animaux/mammiferes sauvages/leopard.mp3 deleted file mode 100755 index 7b983c64..00000000 Binary files a/resources/library/audios/Animaux/mammiferes sauvages/leopard.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes sauvages/lion.mp3 b/resources/library/audios/Animaux/mammiferes sauvages/lion.mp3 deleted file mode 100755 index 7aa1b81e..00000000 Binary files a/resources/library/audios/Animaux/mammiferes sauvages/lion.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes sauvages/rhinoceros.mp3 b/resources/library/audios/Animaux/mammiferes sauvages/rhinoceros.mp3 deleted file mode 100755 index 3c50ced9..00000000 Binary files a/resources/library/audios/Animaux/mammiferes sauvages/rhinoceros.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/mammiferes sauvages/singes.mp3 b/resources/library/audios/Animaux/mammiferes sauvages/singes.mp3 deleted file mode 100755 index 582cb8ba..00000000 Binary files a/resources/library/audios/Animaux/mammiferes sauvages/singes.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/oiseaux/cardinal.mp3 b/resources/library/audios/Animaux/oiseaux/cardinal.mp3 deleted file mode 100755 index 259717ad..00000000 Binary files a/resources/library/audios/Animaux/oiseaux/cardinal.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/oiseaux/chouette.mp3 b/resources/library/audios/Animaux/oiseaux/chouette.mp3 deleted file mode 100755 index 80042289..00000000 Binary files a/resources/library/audios/Animaux/oiseaux/chouette.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/oiseaux/coq.mp3 b/resources/library/audios/Animaux/oiseaux/coq.mp3 deleted file mode 100755 index b10249c9..00000000 Binary files a/resources/library/audios/Animaux/oiseaux/coq.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/oiseaux/corneille.mp3 b/resources/library/audios/Animaux/oiseaux/corneille.mp3 deleted file mode 100755 index b1057ae3..00000000 Binary files a/resources/library/audios/Animaux/oiseaux/corneille.mp3 and /dev/null differ diff --git a/resources/library/audios/Animaux/oiseaux/poulets.mp3 b/resources/library/audios/Animaux/oiseaux/poulets.mp3 deleted file mode 100755 index 514ca7ee..00000000 Binary files a/resources/library/audios/Animaux/oiseaux/poulets.mp3 and /dev/null differ diff --git a/resources/library/audios/Bruitages/eau dans verre.mp3 b/resources/library/audios/Bruitages/eau dans verre.mp3 deleted file mode 100755 index 5eb7a8ce..00000000 Binary files a/resources/library/audios/Bruitages/eau dans verre.mp3 and /dev/null differ diff --git a/resources/library/audios/Bruitages/klaxon.mp3 b/resources/library/audios/Bruitages/klaxon.mp3 deleted file mode 100755 index a9e628de..00000000 Binary files a/resources/library/audios/Bruitages/klaxon.mp3 and /dev/null differ diff --git a/resources/library/pictures/Actions/Coiffure/coiffure 1.png b/resources/library/pictures/Actions/Coiffure/coiffure 1.png deleted file mode 100755 index 5ae0e886..00000000 Binary files a/resources/library/pictures/Actions/Coiffure/coiffure 1.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Coiffure/coiffure 2.png b/resources/library/pictures/Actions/Coiffure/coiffure 2.png deleted file mode 100755 index 39deaf98..00000000 Binary files a/resources/library/pictures/Actions/Coiffure/coiffure 2.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Coiffure/coiffure 3.png b/resources/library/pictures/Actions/Coiffure/coiffure 3.png deleted file mode 100755 index 48806aac..00000000 Binary files a/resources/library/pictures/Actions/Coiffure/coiffure 3.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Coiffure/coiffure 4.png b/resources/library/pictures/Actions/Coiffure/coiffure 4.png deleted file mode 100755 index 056d70db..00000000 Binary files a/resources/library/pictures/Actions/Coiffure/coiffure 4.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Extraire l'huile/huile_palme_1.png b/resources/library/pictures/Actions/Extraire l'huile/huile_palme_1.png deleted file mode 100755 index e823db55..00000000 Binary files a/resources/library/pictures/Actions/Extraire l'huile/huile_palme_1.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Extraire l'huile/huile_palme_2.png b/resources/library/pictures/Actions/Extraire l'huile/huile_palme_2.png deleted file mode 100755 index bfdc75ee..00000000 Binary files a/resources/library/pictures/Actions/Extraire l'huile/huile_palme_2.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Extraire l'huile/huile_palme_3.png b/resources/library/pictures/Actions/Extraire l'huile/huile_palme_3.png deleted file mode 100755 index a9f6e712..00000000 Binary files a/resources/library/pictures/Actions/Extraire l'huile/huile_palme_3.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Extraire l'huile/huile_palme_4.png b/resources/library/pictures/Actions/Extraire l'huile/huile_palme_4.png deleted file mode 100755 index 5e044fea..00000000 Binary files a/resources/library/pictures/Actions/Extraire l'huile/huile_palme_4.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Extraire l'huile/huile_palme_5.png b/resources/library/pictures/Actions/Extraire l'huile/huile_palme_5.png deleted file mode 100755 index f05c090c..00000000 Binary files a/resources/library/pictures/Actions/Extraire l'huile/huile_palme_5.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Fatou dessine/dessin_1.png b/resources/library/pictures/Actions/Fatou dessine/dessin_1.png deleted file mode 100755 index 0819c1fc..00000000 Binary files a/resources/library/pictures/Actions/Fatou dessine/dessin_1.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Fatou dessine/dessin_2.png b/resources/library/pictures/Actions/Fatou dessine/dessin_2.png deleted file mode 100755 index 7bc52ccd..00000000 Binary files a/resources/library/pictures/Actions/Fatou dessine/dessin_2.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Fatou dessine/dessin_3.png b/resources/library/pictures/Actions/Fatou dessine/dessin_3.png deleted file mode 100755 index 18230316..00000000 Binary files a/resources/library/pictures/Actions/Fatou dessine/dessin_3.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Fatou dessine/dessin_4.png b/resources/library/pictures/Actions/Fatou dessine/dessin_4.png deleted file mode 100755 index fa801471..00000000 Binary files a/resources/library/pictures/Actions/Fatou dessine/dessin_4.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Fatou dessine/dessin_5.png b/resources/library/pictures/Actions/Fatou dessine/dessin_5.png deleted file mode 100755 index 6573ca1b..00000000 Binary files a/resources/library/pictures/Actions/Fatou dessine/dessin_5.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Fatou dessine/dessin_6.png b/resources/library/pictures/Actions/Fatou dessine/dessin_6.png deleted file mode 100755 index 1f30dd21..00000000 Binary files a/resources/library/pictures/Actions/Fatou dessine/dessin_6.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Ines malade/Microbes_1.png b/resources/library/pictures/Actions/Ines malade/Microbes_1.png deleted file mode 100755 index 4ceebf3f..00000000 Binary files a/resources/library/pictures/Actions/Ines malade/Microbes_1.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Ines malade/Microbes_2.png b/resources/library/pictures/Actions/Ines malade/Microbes_2.png deleted file mode 100755 index 1263db8d..00000000 Binary files a/resources/library/pictures/Actions/Ines malade/Microbes_2.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Ines malade/Microbes_3.png b/resources/library/pictures/Actions/Ines malade/Microbes_3.png deleted file mode 100755 index 4648ded1..00000000 Binary files a/resources/library/pictures/Actions/Ines malade/Microbes_3.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Ines malade/Microbes_4.png b/resources/library/pictures/Actions/Ines malade/Microbes_4.png deleted file mode 100755 index 20e048f9..00000000 Binary files a/resources/library/pictures/Actions/Ines malade/Microbes_4.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Ines malade/bacterie.svg b/resources/library/pictures/Actions/Ines malade/bacterie.svg deleted file mode 100644 index 7f17909c..00000000 --- a/resources/library/pictures/Actions/Ines malade/bacterie.svg +++ /dev/null @@ -1,701 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Actions/Jan court/jan_chien_court1.png b/resources/library/pictures/Actions/Jan court/jan_chien_court1.png deleted file mode 100755 index ac72e9fb..00000000 Binary files a/resources/library/pictures/Actions/Jan court/jan_chien_court1.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jan court/jan_chien_court2.png b/resources/library/pictures/Actions/Jan court/jan_chien_court2.png deleted file mode 100755 index 69b93521..00000000 Binary files a/resources/library/pictures/Actions/Jan court/jan_chien_court2.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jan court/jan_chien_court3.png b/resources/library/pictures/Actions/Jan court/jan_chien_court3.png deleted file mode 100755 index b74110f2..00000000 Binary files a/resources/library/pictures/Actions/Jan court/jan_chien_court3.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jan court/jan_chien_court4.png b/resources/library/pictures/Actions/Jan court/jan_chien_court4.png deleted file mode 100755 index 8eee4837..00000000 Binary files a/resources/library/pictures/Actions/Jan court/jan_chien_court4.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jeu de mains/main_1_doigt.png b/resources/library/pictures/Actions/Jeu de mains/main_1_doigt.png deleted file mode 100755 index da14bfb8..00000000 Binary files a/resources/library/pictures/Actions/Jeu de mains/main_1_doigt.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jeu de mains/main_2_doigt.png b/resources/library/pictures/Actions/Jeu de mains/main_2_doigt.png deleted file mode 100755 index 7fd435a7..00000000 Binary files a/resources/library/pictures/Actions/Jeu de mains/main_2_doigt.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jeu de mains/main_3_doigt.png b/resources/library/pictures/Actions/Jeu de mains/main_3_doigt.png deleted file mode 100755 index 96cedae2..00000000 Binary files a/resources/library/pictures/Actions/Jeu de mains/main_3_doigt.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jeu de mains/main_4_doigt.png b/resources/library/pictures/Actions/Jeu de mains/main_4_doigt.png deleted file mode 100755 index 48bea15c..00000000 Binary files a/resources/library/pictures/Actions/Jeu de mains/main_4_doigt.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jeu de mains/main_5_doigt.png b/resources/library/pictures/Actions/Jeu de mains/main_5_doigt.png deleted file mode 100755 index d3a6fbcd..00000000 Binary files a/resources/library/pictures/Actions/Jeu de mains/main_5_doigt.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jeu de mains/main_droite_dessus.png b/resources/library/pictures/Actions/Jeu de mains/main_droite_dessus.png deleted file mode 100755 index e9ba0562..00000000 Binary files a/resources/library/pictures/Actions/Jeu de mains/main_droite_dessus.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jeu de mains/main_droite_paume.png b/resources/library/pictures/Actions/Jeu de mains/main_droite_paume.png deleted file mode 100755 index 46df1285..00000000 Binary files a/resources/library/pictures/Actions/Jeu de mains/main_droite_paume.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jeu de mains/main_gauche_dessus.png b/resources/library/pictures/Actions/Jeu de mains/main_gauche_dessus.png deleted file mode 100755 index 5b35f9e1..00000000 Binary files a/resources/library/pictures/Actions/Jeu de mains/main_gauche_dessus.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Jeu de mains/main_gauche_paume.png b/resources/library/pictures/Actions/Jeu de mains/main_gauche_paume.png deleted file mode 100755 index 9e82b9e5..00000000 Binary files a/resources/library/pictures/Actions/Jeu de mains/main_gauche_paume.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Lavage mains/lavage1.png b/resources/library/pictures/Actions/Lavage mains/lavage1.png deleted file mode 100755 index e29c5633..00000000 Binary files a/resources/library/pictures/Actions/Lavage mains/lavage1.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Lavage mains/lavage2.png b/resources/library/pictures/Actions/Lavage mains/lavage2.png deleted file mode 100755 index ead39065..00000000 Binary files a/resources/library/pictures/Actions/Lavage mains/lavage2.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Lavage mains/lavage3.png b/resources/library/pictures/Actions/Lavage mains/lavage3.png deleted file mode 100755 index 292889d0..00000000 Binary files a/resources/library/pictures/Actions/Lavage mains/lavage3.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Lavage mains/lavage4.png b/resources/library/pictures/Actions/Lavage mains/lavage4.png deleted file mode 100755 index fc6e5e31..00000000 Binary files a/resources/library/pictures/Actions/Lavage mains/lavage4.png and /dev/null differ diff --git a/resources/library/pictures/Actions/Lavage mains/lavage5.png b/resources/library/pictures/Actions/Lavage mains/lavage5.png deleted file mode 100755 index 74b74ffb..00000000 Binary files a/resources/library/pictures/Actions/Lavage mains/lavage5.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/ane.png b/resources/library/pictures/Animaux/ane.png deleted file mode 100755 index c3f811ff..00000000 Binary files a/resources/library/pictures/Animaux/ane.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/antilope.png b/resources/library/pictures/Animaux/antilope.png deleted file mode 100755 index 34d48974..00000000 Binary files a/resources/library/pictures/Animaux/antilope.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/autruche.png b/resources/library/pictures/Animaux/autruche.png deleted file mode 100755 index 03b1da1e..00000000 Binary files a/resources/library/pictures/Animaux/autruche.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/becasse.png b/resources/library/pictures/Animaux/becasse.png deleted file mode 100755 index a0a14717..00000000 Binary files a/resources/library/pictures/Animaux/becasse.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/boeuf.png b/resources/library/pictures/Animaux/boeuf.png deleted file mode 100755 index 07981322..00000000 Binary files a/resources/library/pictures/Animaux/boeuf.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/buffle.png b/resources/library/pictures/Animaux/buffle.png deleted file mode 100755 index a3eca582..00000000 Binary files a/resources/library/pictures/Animaux/buffle.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/cameleon.png b/resources/library/pictures/Animaux/cameleon.png deleted file mode 100755 index dc7e9f68..00000000 Binary files a/resources/library/pictures/Animaux/cameleon.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/canard.png b/resources/library/pictures/Animaux/canard.png deleted file mode 100755 index 06532861..00000000 Binary files a/resources/library/pictures/Animaux/canard.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/chacal.png b/resources/library/pictures/Animaux/chacal.png deleted file mode 100755 index 4a854c06..00000000 Binary files a/resources/library/pictures/Animaux/chacal.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/chat.png b/resources/library/pictures/Animaux/chat.png deleted file mode 100755 index 0257053e..00000000 Binary files a/resources/library/pictures/Animaux/chat.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/chenille.png b/resources/library/pictures/Animaux/chenille.png deleted file mode 100755 index f856ec7a..00000000 Binary files a/resources/library/pictures/Animaux/chenille.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/cheval.png b/resources/library/pictures/Animaux/cheval.png deleted file mode 100755 index 7f0d3ace..00000000 Binary files a/resources/library/pictures/Animaux/cheval.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/chien.png b/resources/library/pictures/Animaux/chien.png deleted file mode 100755 index 2fd5d19f..00000000 Binary files a/resources/library/pictures/Animaux/chien.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/cochon.png b/resources/library/pictures/Animaux/cochon.png deleted file mode 100755 index 035f706c..00000000 Binary files a/resources/library/pictures/Animaux/cochon.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/coq.png b/resources/library/pictures/Animaux/coq.png deleted file mode 100755 index 172b0a38..00000000 Binary files a/resources/library/pictures/Animaux/coq.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/corbeau.png b/resources/library/pictures/Animaux/corbeau.png deleted file mode 100755 index 576320bb..00000000 Binary files a/resources/library/pictures/Animaux/corbeau.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/crapaud.png b/resources/library/pictures/Animaux/crapaud.png deleted file mode 100755 index 87ef006f..00000000 Binary files a/resources/library/pictures/Animaux/crapaud.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/crocodile.png b/resources/library/pictures/Animaux/crocodile.png deleted file mode 100755 index f63e39e1..00000000 Binary files a/resources/library/pictures/Animaux/crocodile.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/elephant.png b/resources/library/pictures/Animaux/elephant.png deleted file mode 100755 index f7a64f20..00000000 Binary files a/resources/library/pictures/Animaux/elephant.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/flamand_rose.png b/resources/library/pictures/Animaux/flamand_rose.png deleted file mode 100755 index b2b450ee..00000000 Binary files a/resources/library/pictures/Animaux/flamand_rose.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/girafe.png b/resources/library/pictures/Animaux/girafe.png deleted file mode 100755 index c1228003..00000000 Binary files a/resources/library/pictures/Animaux/girafe.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/gnou.png b/resources/library/pictures/Animaux/gnou.png deleted file mode 100755 index fcc09515..00000000 Binary files a/resources/library/pictures/Animaux/gnou.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/grenouille.png b/resources/library/pictures/Animaux/grenouille.png deleted file mode 100755 index cc832f16..00000000 Binary files a/resources/library/pictures/Animaux/grenouille.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/guepard.png b/resources/library/pictures/Animaux/guepard.png deleted file mode 100755 index b59363bd..00000000 Binary files a/resources/library/pictures/Animaux/guepard.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/hippopotame.png b/resources/library/pictures/Animaux/hippopotame.png deleted file mode 100755 index a4db6e64..00000000 Binary files a/resources/library/pictures/Animaux/hippopotame.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/hyene.png b/resources/library/pictures/Animaux/hyene.png deleted file mode 100755 index aa6e92a4..00000000 Binary files a/resources/library/pictures/Animaux/hyene.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/jument.png b/resources/library/pictures/Animaux/jument.png deleted file mode 100755 index dc199853..00000000 Binary files a/resources/library/pictures/Animaux/jument.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/lapin.png b/resources/library/pictures/Animaux/lapin.png deleted file mode 100755 index 16a438f6..00000000 Binary files a/resources/library/pictures/Animaux/lapin.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/leopard.png b/resources/library/pictures/Animaux/leopard.png deleted file mode 100755 index f01ac8a8..00000000 Binary files a/resources/library/pictures/Animaux/leopard.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/lezard.png b/resources/library/pictures/Animaux/lezard.png deleted file mode 100755 index 73a45c9e..00000000 Binary files a/resources/library/pictures/Animaux/lezard.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/lion.png b/resources/library/pictures/Animaux/lion.png deleted file mode 100755 index ec3e0d77..00000000 Binary files a/resources/library/pictures/Animaux/lion.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/mangouste.png b/resources/library/pictures/Animaux/mangouste.png deleted file mode 100755 index 15e11742..00000000 Binary files a/resources/library/pictures/Animaux/mangouste.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/moineau.png b/resources/library/pictures/Animaux/moineau.png deleted file mode 100755 index b57e1a2b..00000000 Binary files a/resources/library/pictures/Animaux/moineau.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/mouche.png b/resources/library/pictures/Animaux/mouche.png deleted file mode 100755 index 9ca5792a..00000000 Binary files a/resources/library/pictures/Animaux/mouche.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/moustique.png b/resources/library/pictures/Animaux/moustique.png deleted file mode 100755 index 7624c97c..00000000 Binary files a/resources/library/pictures/Animaux/moustique.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/mouton.png b/resources/library/pictures/Animaux/mouton.png deleted file mode 100755 index 96feab2b..00000000 Binary files a/resources/library/pictures/Animaux/mouton.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/ouistiti.png b/resources/library/pictures/Animaux/ouistiti.png deleted file mode 100755 index 5597c04f..00000000 Binary files a/resources/library/pictures/Animaux/ouistiti.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/panthere.png b/resources/library/pictures/Animaux/panthere.png deleted file mode 100755 index e8610ce3..00000000 Binary files a/resources/library/pictures/Animaux/panthere.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/pelican.png b/resources/library/pictures/Animaux/pelican.png deleted file mode 100755 index baa99e04..00000000 Binary files a/resources/library/pictures/Animaux/pelican.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/perroquet.png b/resources/library/pictures/Animaux/perroquet.png deleted file mode 100755 index d034ce37..00000000 Binary files a/resources/library/pictures/Animaux/perroquet.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/phacochere.png b/resources/library/pictures/Animaux/phacochere.png deleted file mode 100755 index e6fcbc77..00000000 Binary files a/resources/library/pictures/Animaux/phacochere.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/pintade.png b/resources/library/pictures/Animaux/pintade.png deleted file mode 100755 index 345ad2f7..00000000 Binary files a/resources/library/pictures/Animaux/pintade.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/poule.png b/resources/library/pictures/Animaux/poule.png deleted file mode 100755 index e2530bd6..00000000 Binary files a/resources/library/pictures/Animaux/poule.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/poule2.png b/resources/library/pictures/Animaux/poule2.png deleted file mode 100755 index a0804039..00000000 Binary files a/resources/library/pictures/Animaux/poule2.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/python.png b/resources/library/pictures/Animaux/python.png deleted file mode 100755 index 7adddb51..00000000 Binary files a/resources/library/pictures/Animaux/python.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/ratel.png b/resources/library/pictures/Animaux/ratel.png deleted file mode 100755 index 0f05edbe..00000000 Binary files a/resources/library/pictures/Animaux/ratel.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/sauterelle.png b/resources/library/pictures/Animaux/sauterelle.png deleted file mode 100755 index 328e2264..00000000 Binary files a/resources/library/pictures/Animaux/sauterelle.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/souris.png b/resources/library/pictures/Animaux/souris.png deleted file mode 100755 index bbbdf622..00000000 Binary files a/resources/library/pictures/Animaux/souris.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/tigre.png b/resources/library/pictures/Animaux/tigre.png deleted file mode 100755 index 1d0ac143..00000000 Binary files a/resources/library/pictures/Animaux/tigre.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/tortue.png b/resources/library/pictures/Animaux/tortue.png deleted file mode 100755 index cf10c193..00000000 Binary files a/resources/library/pictures/Animaux/tortue.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/vache.png b/resources/library/pictures/Animaux/vache.png deleted file mode 100755 index 988f5734..00000000 Binary files a/resources/library/pictures/Animaux/vache.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/vache2.png b/resources/library/pictures/Animaux/vache2.png deleted file mode 100755 index b60f75c2..00000000 Binary files a/resources/library/pictures/Animaux/vache2.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/varan.png b/resources/library/pictures/Animaux/varan.png deleted file mode 100755 index 232f78fe..00000000 Binary files a/resources/library/pictures/Animaux/varan.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/vautour.png b/resources/library/pictures/Animaux/vautour.png deleted file mode 100755 index 685fc134..00000000 Binary files a/resources/library/pictures/Animaux/vautour.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/zebre.png b/resources/library/pictures/Animaux/zebre.png deleted file mode 100755 index 2f561267..00000000 Binary files a/resources/library/pictures/Animaux/zebre.png and /dev/null differ diff --git a/resources/library/pictures/Animaux/zebre_bebe.png b/resources/library/pictures/Animaux/zebre_bebe.png deleted file mode 100755 index 4b84ed47..00000000 Binary files a/resources/library/pictures/Animaux/zebre_bebe.png and /dev/null differ diff --git a/resources/library/pictures/Cartes/Afrique/Afrique satellite.jpg b/resources/library/pictures/Cartes/Afrique/Afrique satellite.jpg deleted file mode 100755 index a594ccdd..00000000 Binary files a/resources/library/pictures/Cartes/Afrique/Afrique satellite.jpg and /dev/null differ diff --git a/resources/library/pictures/Cartes/Afrique/afrique contours.gif b/resources/library/pictures/Cartes/Afrique/afrique contours.gif deleted file mode 100755 index e8641c20..00000000 Binary files a/resources/library/pictures/Cartes/Afrique/afrique contours.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/Afrique/afrique hydrographie.gif b/resources/library/pictures/Cartes/Afrique/afrique hydrographie.gif deleted file mode 100755 index 5eb700c9..00000000 Binary files a/resources/library/pictures/Cartes/Afrique/afrique hydrographie.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/Afrique/afrique limites villes.gif b/resources/library/pictures/Cartes/Afrique/afrique limites villes.gif deleted file mode 100755 index 73582a76..00000000 Binary files a/resources/library/pictures/Cartes/Afrique/afrique limites villes.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/Afrique/afrique lmites.gif b/resources/library/pictures/Cartes/Afrique/afrique lmites.gif deleted file mode 100755 index f3991989..00000000 Binary files a/resources/library/pictures/Cartes/Afrique/afrique lmites.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/Afrique/carte_afrique.gif b/resources/library/pictures/Cartes/Afrique/carte_afrique.gif deleted file mode 100755 index a6f40e92..00000000 Binary files a/resources/library/pictures/Cartes/Afrique/carte_afrique.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/Europe/Europe_pays_muette.png b/resources/library/pictures/Cartes/Europe/Europe_pays_muette.png deleted file mode 100755 index 0aa904f7..00000000 Binary files a/resources/library/pictures/Cartes/Europe/Europe_pays_muette.png and /dev/null differ diff --git a/resources/library/pictures/Cartes/Europe/Europe_satellite.jpg b/resources/library/pictures/Cartes/Europe/Europe_satellite.jpg deleted file mode 100755 index 5aa687f6..00000000 Binary files a/resources/library/pictures/Cartes/Europe/Europe_satellite.jpg and /dev/null differ diff --git a/resources/library/pictures/Cartes/France/France satellite.jpg b/resources/library/pictures/Cartes/France/France satellite.jpg deleted file mode 100755 index c015dc45..00000000 Binary files a/resources/library/pictures/Cartes/France/France satellite.jpg and /dev/null differ diff --git a/resources/library/pictures/Cartes/France/france departements.gif b/resources/library/pictures/Cartes/France/france departements.gif deleted file mode 100755 index 862927c2..00000000 Binary files a/resources/library/pictures/Cartes/France/france departements.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/France/france hydrographie.gif b/resources/library/pictures/Cartes/France/france hydrographie.gif deleted file mode 100755 index 52eacc1b..00000000 Binary files a/resources/library/pictures/Cartes/France/france hydrographie.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/France/france regions.gif b/resources/library/pictures/Cartes/France/france regions.gif deleted file mode 100755 index 18ca5bec..00000000 Binary files a/resources/library/pictures/Cartes/France/france regions.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/France/france vierge.gif b/resources/library/pictures/Cartes/France/france vierge.gif deleted file mode 100755 index e70a1c5b..00000000 Binary files a/resources/library/pictures/Cartes/France/france vierge.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/France/france villes.gif b/resources/library/pictures/Cartes/France/france villes.gif deleted file mode 100755 index 1e938ba3..00000000 Binary files a/resources/library/pictures/Cartes/France/france villes.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/Monde/pays couleurs.gif b/resources/library/pictures/Cartes/Monde/pays couleurs.gif deleted file mode 100755 index f6921f5c..00000000 Binary files a/resources/library/pictures/Cartes/Monde/pays couleurs.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/Monde/pays.gif b/resources/library/pictures/Cartes/Monde/pays.gif deleted file mode 100755 index fcec5a5f..00000000 Binary files a/resources/library/pictures/Cartes/Monde/pays.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/Monde/vierge.gif b/resources/library/pictures/Cartes/Monde/vierge.gif deleted file mode 100755 index 3c6ee28b..00000000 Binary files a/resources/library/pictures/Cartes/Monde/vierge.gif and /dev/null differ diff --git a/resources/library/pictures/Cartes/Monde/worldmap.svg b/resources/library/pictures/Cartes/Monde/worldmap.svg deleted file mode 100644 index 010403fa..00000000 --- a/resources/library/pictures/Cartes/Monde/worldmap.svg +++ /dev/null @@ -1,18335 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Decors/bananiers.jpg b/resources/library/pictures/Decors/bananiers.jpg deleted file mode 100644 index 69eab8af..00000000 Binary files a/resources/library/pictures/Decors/bananiers.jpg and /dev/null differ diff --git a/resources/library/pictures/Decors/campagne.png b/resources/library/pictures/Decors/campagne.png deleted file mode 100755 index f89b95e5..00000000 Binary files a/resources/library/pictures/Decors/campagne.png and /dev/null differ diff --git a/resources/library/pictures/Decors/case1.png b/resources/library/pictures/Decors/case1.png deleted file mode 100755 index d63fde99..00000000 Binary files a/resources/library/pictures/Decors/case1.png and /dev/null differ diff --git a/resources/library/pictures/Decors/case2.png b/resources/library/pictures/Decors/case2.png deleted file mode 100755 index d29170a1..00000000 Binary files a/resources/library/pictures/Decors/case2.png and /dev/null differ diff --git a/resources/library/pictures/Decors/case_fenetre.png b/resources/library/pictures/Decors/case_fenetre.png deleted file mode 100755 index f6017694..00000000 Binary files a/resources/library/pictures/Decors/case_fenetre.png and /dev/null differ diff --git a/resources/library/pictures/Decors/champs.png b/resources/library/pictures/Decors/champs.png deleted file mode 100755 index 7f83eba5..00000000 Binary files a/resources/library/pictures/Decors/champs.png and /dev/null differ diff --git a/resources/library/pictures/Decors/champs_haiti.jpg b/resources/library/pictures/Decors/champs_haiti.jpg deleted file mode 100644 index 86620a03..00000000 Binary files a/resources/library/pictures/Decors/champs_haiti.jpg and /dev/null differ diff --git a/resources/library/pictures/Decors/chemin.png b/resources/library/pictures/Decors/chemin.png deleted file mode 100755 index 9884dcc2..00000000 Binary files a/resources/library/pictures/Decors/chemin.png and /dev/null differ diff --git a/resources/library/pictures/Decors/chemin2.png b/resources/library/pictures/Decors/chemin2.png deleted file mode 100755 index 712665b6..00000000 Binary files a/resources/library/pictures/Decors/chemin2.png and /dev/null differ diff --git a/resources/library/pictures/Decors/flamboyant.jpg b/resources/library/pictures/Decors/flamboyant.jpg deleted file mode 100644 index cc5c2c85..00000000 Binary files a/resources/library/pictures/Decors/flamboyant.jpg and /dev/null differ diff --git a/resources/library/pictures/Decors/lac.jpg b/resources/library/pictures/Decors/lac.jpg deleted file mode 100644 index 6567e873..00000000 Binary files a/resources/library/pictures/Decors/lac.jpg and /dev/null differ diff --git a/resources/library/pictures/Decors/lac.png b/resources/library/pictures/Decors/lac.png deleted file mode 100755 index 2d5fa2f1..00000000 Binary files a/resources/library/pictures/Decors/lac.png and /dev/null differ diff --git a/resources/library/pictures/Decors/maison_riviere.jpg b/resources/library/pictures/Decors/maison_riviere.jpg deleted file mode 100644 index 8a067935..00000000 Binary files a/resources/library/pictures/Decors/maison_riviere.jpg and /dev/null differ diff --git a/resources/library/pictures/Decors/marigot.jpg b/resources/library/pictures/Decors/marigot.jpg deleted file mode 100644 index 6ca5ae30..00000000 Binary files a/resources/library/pictures/Decors/marigot.jpg and /dev/null differ diff --git a/resources/library/pictures/Decors/palmiers.jpg b/resources/library/pictures/Decors/palmiers.jpg deleted file mode 100644 index e74609d9..00000000 Binary files a/resources/library/pictures/Decors/palmiers.jpg and /dev/null differ diff --git a/resources/library/pictures/Decors/plage.png b/resources/library/pictures/Decors/plage.png deleted file mode 100755 index d98e6f92..00000000 Binary files a/resources/library/pictures/Decors/plage.png and /dev/null differ diff --git a/resources/library/pictures/Decors/porte_ouverte.png b/resources/library/pictures/Decors/porte_ouverte.png deleted file mode 100755 index c9b0d676..00000000 Binary files a/resources/library/pictures/Decors/porte_ouverte.png and /dev/null differ diff --git a/resources/library/pictures/Decors/village.jpg b/resources/library/pictures/Decors/village.jpg deleted file mode 100644 index 3cec5fb5..00000000 Binary files a/resources/library/pictures/Decors/village.jpg and /dev/null differ diff --git a/resources/library/pictures/Decors/village_haiti.jpg b/resources/library/pictures/Decors/village_haiti.jpg deleted file mode 100644 index 9bb4237c..00000000 Binary files a/resources/library/pictures/Decors/village_haiti.jpg and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Algerie.svg b/resources/library/pictures/Drapeaux/Algerie.svg deleted file mode 100644 index 4247aa7f..00000000 --- a/resources/library/pictures/Drapeaux/Algerie.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Belgique.png b/resources/library/pictures/Drapeaux/Belgique.png deleted file mode 100755 index bfe80bb3..00000000 Binary files a/resources/library/pictures/Drapeaux/Belgique.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Benin.png b/resources/library/pictures/Drapeaux/Benin.png deleted file mode 100755 index 8bb76796..00000000 Binary files a/resources/library/pictures/Drapeaux/Benin.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Burkina_Faso.png b/resources/library/pictures/Drapeaux/Burkina_Faso.png deleted file mode 100755 index 73b25611..00000000 Binary files a/resources/library/pictures/Drapeaux/Burkina_Faso.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Burundi.svg b/resources/library/pictures/Drapeaux/Burundi.svg deleted file mode 100644 index b4a7cd59..00000000 --- a/resources/library/pictures/Drapeaux/Burundi.svg +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Cameroun.svg b/resources/library/pictures/Drapeaux/Cameroun.svg deleted file mode 100644 index 8c01757e..00000000 --- a/resources/library/pictures/Drapeaux/Cameroun.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Canada.svg b/resources/library/pictures/Drapeaux/Canada.svg deleted file mode 100644 index 4322c034..00000000 --- a/resources/library/pictures/Drapeaux/Canada.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Drapeaux/Centre-Afrique.svg b/resources/library/pictures/Drapeaux/Centre-Afrique.svg deleted file mode 100644 index b721e956..00000000 --- a/resources/library/pictures/Drapeaux/Centre-Afrique.svg +++ /dev/null @@ -1,8 +0,0 @@ -Flag of the Central African Republic - - - - - - - diff --git a/resources/library/pictures/Drapeaux/Comores.svg b/resources/library/pictures/Drapeaux/Comores.svg deleted file mode 100644 index 30b29df0..00000000 --- a/resources/library/pictures/Drapeaux/Comores.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Congo.svg b/resources/library/pictures/Drapeaux/Congo.svg deleted file mode 100644 index d5623f57..00000000 --- a/resources/library/pictures/Drapeaux/Congo.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Cote_d'Ivoire.png b/resources/library/pictures/Drapeaux/Cote_d'Ivoire.png deleted file mode 100755 index 24719db2..00000000 Binary files a/resources/library/pictures/Drapeaux/Cote_d'Ivoire.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Djibouti.svg b/resources/library/pictures/Drapeaux/Djibouti.svg deleted file mode 100644 index 456186bd..00000000 --- a/resources/library/pictures/Drapeaux/Djibouti.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/library/pictures/Drapeaux/Europe.png b/resources/library/pictures/Drapeaux/Europe.png deleted file mode 100755 index 316696a2..00000000 Binary files a/resources/library/pictures/Drapeaux/Europe.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/France.png b/resources/library/pictures/Drapeaux/France.png deleted file mode 100755 index 10006670..00000000 Binary files a/resources/library/pictures/Drapeaux/France.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Gabon.svg b/resources/library/pictures/Drapeaux/Gabon.svg deleted file mode 100644 index f338c846..00000000 --- a/resources/library/pictures/Drapeaux/Gabon.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Guinee equatoriale.svg b/resources/library/pictures/Drapeaux/Guinee equatoriale.svg deleted file mode 100644 index 24803a76..00000000 --- a/resources/library/pictures/Drapeaux/Guinee equatoriale.svg +++ /dev/null @@ -1,58 +0,0 @@ - - - - Flag of Equatorial Guinea - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Drapeaux/Guinee.svg b/resources/library/pictures/Drapeaux/Guinee.svg deleted file mode 100644 index ad80df0e..00000000 --- a/resources/library/pictures/Drapeaux/Guinee.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/library/pictures/Drapeaux/Haiti.svg b/resources/library/pictures/Drapeaux/Haiti.svg deleted file mode 100644 index e49e9ab9..00000000 --- a/resources/library/pictures/Drapeaux/Haiti.svg +++ /dev/null @@ -1,226 +0,0 @@ - -Flag of Haiti - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Drapeaux/Liban.svg b/resources/library/pictures/Drapeaux/Liban.svg deleted file mode 100644 index 42d9486a..00000000 --- a/resources/library/pictures/Drapeaux/Liban.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Luxembourg.svg b/resources/library/pictures/Drapeaux/Luxembourg.svg deleted file mode 100644 index 67a651e8..00000000 --- a/resources/library/pictures/Drapeaux/Luxembourg.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - diff --git a/resources/library/pictures/Drapeaux/Madagascar.png b/resources/library/pictures/Drapeaux/Madagascar.png deleted file mode 100755 index 99a00456..00000000 Binary files a/resources/library/pictures/Drapeaux/Madagascar.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Mali.png b/resources/library/pictures/Drapeaux/Mali.png deleted file mode 100755 index 8bc48f6f..00000000 Binary files a/resources/library/pictures/Drapeaux/Mali.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Maroc.svg b/resources/library/pictures/Drapeaux/Maroc.svg deleted file mode 100644 index e187998c..00000000 --- a/resources/library/pictures/Drapeaux/Maroc.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/resources/library/pictures/Drapeaux/Maurice.png b/resources/library/pictures/Drapeaux/Maurice.png deleted file mode 100755 index 347cc101..00000000 Binary files a/resources/library/pictures/Drapeaux/Maurice.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Mauritanie.svg b/resources/library/pictures/Drapeaux/Mauritanie.svg deleted file mode 100644 index 6e992728..00000000 --- a/resources/library/pictures/Drapeaux/Mauritanie.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Monaco.svg b/resources/library/pictures/Drapeaux/Monaco.svg deleted file mode 100644 index 56ee2e7d..00000000 --- a/resources/library/pictures/Drapeaux/Monaco.svg +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/resources/library/pictures/Drapeaux/Niger.png b/resources/library/pictures/Drapeaux/Niger.png deleted file mode 100755 index eaf5dcb8..00000000 Binary files a/resources/library/pictures/Drapeaux/Niger.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Nouveau_Brunswick.svg b/resources/library/pictures/Drapeaux/Nouveau_Brunswick.svg deleted file mode 100644 index 5820dd2a..00000000 --- a/resources/library/pictures/Drapeaux/Nouveau_Brunswick.svg +++ /dev/null @@ -1,242 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Drapeaux/Ontario.svg b/resources/library/pictures/Drapeaux/Ontario.svg deleted file mode 100644 index 678c3335..00000000 --- a/resources/library/pictures/Drapeaux/Ontario.svg +++ /dev/null @@ -1,254 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Quebec.svg b/resources/library/pictures/Drapeaux/Quebec.svg deleted file mode 100755 index 44a881fe..00000000 --- a/resources/library/pictures/Drapeaux/Quebec.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Republique democratique du Congo.svg b/resources/library/pictures/Drapeaux/Republique democratique du Congo.svg deleted file mode 100644 index 0e3bd107..00000000 --- a/resources/library/pictures/Drapeaux/Republique democratique du Congo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Drapeaux/Rwanda.svg b/resources/library/pictures/Drapeaux/Rwanda.svg deleted file mode 100644 index bdfb60d7..00000000 --- a/resources/library/pictures/Drapeaux/Rwanda.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - -Flag of Rwanda - - - - - - - - - - - - diff --git a/resources/library/pictures/Drapeaux/Senegal.png b/resources/library/pictures/Drapeaux/Senegal.png deleted file mode 100755 index d31f52e3..00000000 Binary files a/resources/library/pictures/Drapeaux/Senegal.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Suisse.png b/resources/library/pictures/Drapeaux/Suisse.png deleted file mode 100755 index 744bca27..00000000 Binary files a/resources/library/pictures/Drapeaux/Suisse.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Tchad.png b/resources/library/pictures/Drapeaux/Tchad.png deleted file mode 100755 index c70b0355..00000000 Binary files a/resources/library/pictures/Drapeaux/Tchad.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Togo.png b/resources/library/pictures/Drapeaux/Togo.png deleted file mode 100755 index 3192f7a4..00000000 Binary files a/resources/library/pictures/Drapeaux/Togo.png and /dev/null differ diff --git a/resources/library/pictures/Drapeaux/Tunisie.svg b/resources/library/pictures/Drapeaux/Tunisie.svg deleted file mode 100644 index 0b0bfe2b..00000000 --- a/resources/library/pictures/Drapeaux/Tunisie.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Fonds/Calendriers/Calendrier 2013.png b/resources/library/pictures/Fonds/Calendriers/Calendrier 2013.png deleted file mode 100644 index 480be198..00000000 Binary files a/resources/library/pictures/Fonds/Calendriers/Calendrier 2013.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Calendriers/Calendrier 2014.png b/resources/library/pictures/Fonds/Calendriers/Calendrier 2014.png deleted file mode 100644 index 18a2bb91..00000000 Binary files a/resources/library/pictures/Fonds/Calendriers/Calendrier 2014.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Calendriers/Calendrier 2015.png b/resources/library/pictures/Fonds/Calendriers/Calendrier 2015.png deleted file mode 100644 index 4f3e70c0..00000000 Binary files a/resources/library/pictures/Fonds/Calendriers/Calendrier 2015.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Calendriers/blank_timeline.svg b/resources/library/pictures/Fonds/Calendriers/blank_timeline.svg deleted file mode 100644 index 84213caa..00000000 --- a/resources/library/pictures/Fonds/Calendriers/blank_timeline.svg +++ /dev/null @@ -1,402 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Fonds/Calendriers/calendrier_2012.png b/resources/library/pictures/Fonds/Calendriers/calendrier_2012.png deleted file mode 100755 index 0a65d446..00000000 Binary files a/resources/library/pictures/Fonds/Calendriers/calendrier_2012.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Calendriers/semainier.svg b/resources/library/pictures/Fonds/Calendriers/semainier.svg deleted file mode 100644 index e92e6d39..00000000 --- a/resources/library/pictures/Fonds/Calendriers/semainier.svg +++ /dev/null @@ -1,301 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - - - 7:00 AM - - 8:00 AM - - 9:00 AM - - 10:00 AM - - 11:00 AM - - 12:00 PM - - 1:00 PM - - 2:00 PM - - 3:00 PM - - 4:00 PM - - 5:00 PM - - 6:00 PM - - 7:00 PM - - 8:00 PM - - 9:00 PM - - -SUNDAY -MONDAY -TUESDAY -WEDNESDAY -THURSDAY -FRIDAY -SATURDAY - diff --git a/resources/library/pictures/Fonds/Carroyage et lignes/Grille points noirs.gif b/resources/library/pictures/Fonds/Carroyage et lignes/Grille points noirs.gif deleted file mode 100755 index a5e7c0b7..00000000 Binary files a/resources/library/pictures/Fonds/Carroyage et lignes/Grille points noirs.gif and /dev/null differ diff --git a/resources/library/pictures/Fonds/Carroyage et lignes/lignes bleues.png b/resources/library/pictures/Fonds/Carroyage et lignes/lignes bleues.png deleted file mode 100755 index fa955003..00000000 Binary files a/resources/library/pictures/Fonds/Carroyage et lignes/lignes bleues.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Carroyage et lignes/maternelle.png b/resources/library/pictures/Fonds/Carroyage et lignes/maternelle.png deleted file mode 100755 index c40f9488..00000000 Binary files a/resources/library/pictures/Fonds/Carroyage et lignes/maternelle.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Carroyage et lignes/quadrille grand noir.png b/resources/library/pictures/Fonds/Carroyage et lignes/quadrille grand noir.png deleted file mode 100755 index b8569bc2..00000000 Binary files a/resources/library/pictures/Fonds/Carroyage et lignes/quadrille grand noir.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Carroyage et lignes/quadrille grand vert.png b/resources/library/pictures/Fonds/Carroyage et lignes/quadrille grand vert.png deleted file mode 100755 index 44791ab8..00000000 Binary files a/resources/library/pictures/Fonds/Carroyage et lignes/quadrille grand vert.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Carroyage et lignes/quadrille petit bleu.png b/resources/library/pictures/Fonds/Carroyage et lignes/quadrille petit bleu.png deleted file mode 100755 index cc86eb6a..00000000 Binary files a/resources/library/pictures/Fonds/Carroyage et lignes/quadrille petit bleu.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Carroyage et lignes/seyes demi feuille.gif b/resources/library/pictures/Fonds/Carroyage et lignes/seyes demi feuille.gif deleted file mode 100755 index 96545a30..00000000 Binary files a/resources/library/pictures/Fonds/Carroyage et lignes/seyes demi feuille.gif and /dev/null differ diff --git a/resources/library/pictures/Fonds/Carroyage et lignes/seyes4.png b/resources/library/pictures/Fonds/Carroyage et lignes/seyes4.png deleted file mode 100755 index b971daaf..00000000 Binary files a/resources/library/pictures/Fonds/Carroyage et lignes/seyes4.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Fonds colores/jaune.png b/resources/library/pictures/Fonds/Fonds colores/jaune.png deleted file mode 100755 index 03a06d8c..00000000 Binary files a/resources/library/pictures/Fonds/Fonds colores/jaune.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Fonds colores/jaune_pale.png b/resources/library/pictures/Fonds/Fonds colores/jaune_pale.png deleted file mode 100755 index a644e961..00000000 Binary files a/resources/library/pictures/Fonds/Fonds colores/jaune_pale.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Fonds colores/rouge.png b/resources/library/pictures/Fonds/Fonds colores/rouge.png deleted file mode 100755 index 09efc5b7..00000000 Binary files a/resources/library/pictures/Fonds/Fonds colores/rouge.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Fonds colores/rouge_pale.png b/resources/library/pictures/Fonds/Fonds colores/rouge_pale.png deleted file mode 100755 index 0091ebbb..00000000 Binary files a/resources/library/pictures/Fonds/Fonds colores/rouge_pale.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Fonds colores/vert.png b/resources/library/pictures/Fonds/Fonds colores/vert.png deleted file mode 100755 index 5630c245..00000000 Binary files a/resources/library/pictures/Fonds/Fonds colores/vert.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Fonds colores/vert_pale.png b/resources/library/pictures/Fonds/Fonds colores/vert_pale.png deleted file mode 100755 index 31929e91..00000000 Binary files a/resources/library/pictures/Fonds/Fonds colores/vert_pale.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Fonds colores/violet.png b/resources/library/pictures/Fonds/Fonds colores/violet.png deleted file mode 100755 index 576ac68c..00000000 Binary files a/resources/library/pictures/Fonds/Fonds colores/violet.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Fonds colores/violet_pale.png b/resources/library/pictures/Fonds/Fonds colores/violet_pale.png deleted file mode 100755 index 782ded6e..00000000 Binary files a/resources/library/pictures/Fonds/Fonds colores/violet_pale.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Horloges/4 horloges.png b/resources/library/pictures/Fonds/Horloges/4 horloges.png deleted file mode 100644 index 876af304..00000000 Binary files a/resources/library/pictures/Fonds/Horloges/4 horloges.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Horloges/horloge.png b/resources/library/pictures/Fonds/Horloges/horloge.png deleted file mode 100644 index 4a72b01e..00000000 Binary files a/resources/library/pictures/Fonds/Horloges/horloge.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Mathematiques/axes 3D.svg b/resources/library/pictures/Fonds/Mathematiques/axes 3D.svg deleted file mode 100755 index b24adf39..00000000 --- a/resources/library/pictures/Fonds/Mathematiques/axes 3D.svg +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Fonds/Mathematiques/grille 2D.svg b/resources/library/pictures/Fonds/Mathematiques/grille 2D.svg deleted file mode 100755 index 21225536..00000000 --- a/resources/library/pictures/Fonds/Mathematiques/grille 2D.svg +++ /dev/null @@ -1,383 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Fonds/Mathematiques/grille 3D.svg b/resources/library/pictures/Fonds/Mathematiques/grille 3D.svg deleted file mode 100755 index 7bbac66c..00000000 --- a/resources/library/pictures/Fonds/Mathematiques/grille 3D.svg +++ /dev/null @@ -1,229 +0,0 @@ - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Fonds/Musique/cle de fa.png b/resources/library/pictures/Fonds/Musique/cle de fa.png deleted file mode 100755 index 85ec2cf3..00000000 Binary files a/resources/library/pictures/Fonds/Musique/cle de fa.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Musique/cle de sol.png b/resources/library/pictures/Fonds/Musique/cle de sol.png deleted file mode 100755 index 146d69c5..00000000 Binary files a/resources/library/pictures/Fonds/Musique/cle de sol.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Musique/musique.svg b/resources/library/pictures/Fonds/Musique/musique.svg deleted file mode 100755 index f60cbdc6..00000000 --- a/resources/library/pictures/Fonds/Musique/musique.svg +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Fonds/Musique/piano.png b/resources/library/pictures/Fonds/Musique/piano.png deleted file mode 100755 index 8ac82aef..00000000 Binary files a/resources/library/pictures/Fonds/Musique/piano.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Plateaux jeux/Alquerque.svg b/resources/library/pictures/Fonds/Plateaux jeux/Alquerque.svg deleted file mode 100644 index b1b93c09..00000000 --- a/resources/library/pictures/Fonds/Plateaux jeux/Alquerque.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Fonds/Plateaux jeux/jeu d'echec.svg b/resources/library/pictures/Fonds/Plateaux jeux/jeu d'echec.svg deleted file mode 100755 index 859f5cc3..00000000 --- a/resources/library/pictures/Fonds/Plateaux jeux/jeu d'echec.svg +++ /dev/null @@ -1,600 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/library/pictures/Fonds/Plateaux jeux/jeu d'echelle.jpg b/resources/library/pictures/Fonds/Plateaux jeux/jeu d'echelle.jpg deleted file mode 100755 index 20860a87..00000000 Binary files a/resources/library/pictures/Fonds/Plateaux jeux/jeu d'echelle.jpg and /dev/null differ diff --git a/resources/library/pictures/Fonds/Plateaux jeux/jeu de dames.gif b/resources/library/pictures/Fonds/Plateaux jeux/jeu de dames.gif deleted file mode 100644 index 2b575f66..00000000 Binary files a/resources/library/pictures/Fonds/Plateaux jeux/jeu de dames.gif and /dev/null differ diff --git a/resources/library/pictures/Fonds/Plateaux jeux/jeu de petits chevaux.jpg b/resources/library/pictures/Fonds/Plateaux jeux/jeu de petits chevaux.jpg deleted file mode 100755 index dad9cb5b..00000000 Binary files a/resources/library/pictures/Fonds/Plateaux jeux/jeu de petits chevaux.jpg and /dev/null differ diff --git a/resources/library/pictures/Fonds/Plateaux jeux/labyrinthe-gout3a.jpg b/resources/library/pictures/Fonds/Plateaux jeux/labyrinthe-gout3a.jpg deleted file mode 100755 index 14ee8195..00000000 Binary files a/resources/library/pictures/Fonds/Plateaux jeux/labyrinthe-gout3a.jpg and /dev/null differ diff --git a/resources/library/pictures/Fonds/Terrains Sports/Basketball.png b/resources/library/pictures/Fonds/Terrains Sports/Basketball.png deleted file mode 100755 index 270ac5c0..00000000 Binary files a/resources/library/pictures/Fonds/Terrains Sports/Basketball.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Terrains Sports/Handball.JPG b/resources/library/pictures/Fonds/Terrains Sports/Handball.JPG deleted file mode 100755 index 0cc0fb90..00000000 Binary files a/resources/library/pictures/Fonds/Terrains Sports/Handball.JPG and /dev/null differ diff --git a/resources/library/pictures/Fonds/Terrains Sports/Rugby.png b/resources/library/pictures/Fonds/Terrains Sports/Rugby.png deleted file mode 100755 index 5b16322d..00000000 Binary files a/resources/library/pictures/Fonds/Terrains Sports/Rugby.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Terrains Sports/football.png b/resources/library/pictures/Fonds/Terrains Sports/football.png deleted file mode 100755 index 11716a23..00000000 Binary files a/resources/library/pictures/Fonds/Terrains Sports/football.png and /dev/null differ diff --git a/resources/library/pictures/Fonds/Terrains Sports/hockey_sur_glace.svg b/resources/library/pictures/Fonds/Terrains Sports/hockey_sur_glace.svg deleted file mode 100644 index 93da2a27..00000000 --- a/resources/library/pictures/Fonds/Terrains Sports/hockey_sur_glace.svg +++ /dev/null @@ -1,107 +0,0 @@ - - - - - \ No newline at end of file diff --git a/resources/library/pictures/Meteo/couvert.png b/resources/library/pictures/Meteo/couvert.png deleted file mode 100755 index cbebae12..00000000 Binary files a/resources/library/pictures/Meteo/couvert.png and /dev/null differ diff --git a/resources/library/pictures/Meteo/neige.png b/resources/library/pictures/Meteo/neige.png deleted file mode 100755 index ce9d66a8..00000000 Binary files a/resources/library/pictures/Meteo/neige.png and /dev/null differ diff --git a/resources/library/pictures/Meteo/nuageux.png b/resources/library/pictures/Meteo/nuageux.png deleted file mode 100755 index 46440816..00000000 Binary files a/resources/library/pictures/Meteo/nuageux.png and /dev/null differ diff --git a/resources/library/pictures/Meteo/orage.png b/resources/library/pictures/Meteo/orage.png deleted file mode 100755 index 96f5e91a..00000000 Binary files a/resources/library/pictures/Meteo/orage.png and /dev/null differ diff --git a/resources/library/pictures/Meteo/pluie.png b/resources/library/pictures/Meteo/pluie.png deleted file mode 100755 index b1edfc8a..00000000 Binary files a/resources/library/pictures/Meteo/pluie.png and /dev/null differ diff --git a/resources/library/pictures/Meteo/soleil.png b/resources/library/pictures/Meteo/soleil.png deleted file mode 100755 index e10b5889..00000000 Binary files a/resources/library/pictures/Meteo/soleil.png and /dev/null differ diff --git a/resources/library/pictures/Objets/objet_ballon.png b/resources/library/pictures/Objets/objet_ballon.png deleted file mode 100755 index cd09bdbb..00000000 Binary files a/resources/library/pictures/Objets/objet_ballon.png and /dev/null differ diff --git a/resources/library/pictures/Objets/objet_reveil.png b/resources/library/pictures/Objets/objet_reveil.png deleted file mode 100755 index 866d1fd1..00000000 Binary files a/resources/library/pictures/Objets/objet_reveil.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/Moussa_vieux.png b/resources/library/pictures/Personnages/Moussa_vieux.png deleted file mode 100755 index fd6ee76e..00000000 Binary files a/resources/library/pictures/Personnages/Moussa_vieux.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/abdou.png b/resources/library/pictures/Personnages/abdou.png deleted file mode 100755 index 54670a20..00000000 Binary files a/resources/library/pictures/Personnages/abdou.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ali__en_tailleur.png b/resources/library/pictures/Personnages/ali__en_tailleur.png deleted file mode 100755 index 110506fb..00000000 Binary files a/resources/library/pictures/Personnages/ali__en_tailleur.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ali_attends.png b/resources/library/pictures/Personnages/ali_attends.png deleted file mode 100755 index c0eb8e62..00000000 Binary files a/resources/library/pictures/Personnages/ali_attends.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ali_ballon.png b/resources/library/pictures/Personnages/ali_ballon.png deleted file mode 100755 index 59504961..00000000 Binary files a/resources/library/pictures/Personnages/ali_ballon.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ali_bananes.png b/resources/library/pictures/Personnages/ali_bananes.png deleted file mode 100755 index 50d64316..00000000 Binary files a/resources/library/pictures/Personnages/ali_bananes.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ali_barbu.png b/resources/library/pictures/Personnages/ali_barbu.png deleted file mode 100755 index 294e980b..00000000 Binary files a/resources/library/pictures/Personnages/ali_barbu.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ali_jupe.png b/resources/library/pictures/Personnages/ali_jupe.png deleted file mode 100755 index de58a5ed..00000000 Binary files a/resources/library/pictures/Personnages/ali_jupe.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ali_parle_orange.png b/resources/library/pictures/Personnages/ali_parle_orange.png deleted file mode 100755 index aef37882..00000000 Binary files a/resources/library/pictures/Personnages/ali_parle_orange.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ali_parle_violet.png b/resources/library/pictures/Personnages/ali_parle_violet.png deleted file mode 100755 index 1f96abd7..00000000 Binary files a/resources/library/pictures/Personnages/ali_parle_violet.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ali_porte.png b/resources/library/pictures/Personnages/ali_porte.png deleted file mode 100755 index 8947123a..00000000 Binary files a/resources/library/pictures/Personnages/ali_porte.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ali_sac_ecole.png b/resources/library/pictures/Personnages/ali_sac_ecole.png deleted file mode 100755 index c76e9f48..00000000 Binary files a/resources/library/pictures/Personnages/ali_sac_ecole.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ana_bras_ecarte.png b/resources/library/pictures/Personnages/ana_bras_ecarte.png deleted file mode 100755 index 010848ea..00000000 Binary files a/resources/library/pictures/Personnages/ana_bras_ecarte.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ana_main_croise_gd.png b/resources/library/pictures/Personnages/ana_main_croise_gd.png deleted file mode 100755 index b2eff2f3..00000000 Binary files a/resources/library/pictures/Personnages/ana_main_croise_gd.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/ana_presentation.png b/resources/library/pictures/Personnages/ana_presentation.png deleted file mode 100755 index fa32fc2a..00000000 Binary files a/resources/library/pictures/Personnages/ana_presentation.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/fatou_assise.png b/resources/library/pictures/Personnages/fatou_assise.png deleted file mode 100755 index 7c074545..00000000 Binary files a/resources/library/pictures/Personnages/fatou_assise.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/fatou_bras_leve.png b/resources/library/pictures/Personnages/fatou_bras_leve.png deleted file mode 100755 index 65003064..00000000 Binary files a/resources/library/pictures/Personnages/fatou_bras_leve.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/fatou_debout.png b/resources/library/pictures/Personnages/fatou_debout.png deleted file mode 100755 index 3f3863a0..00000000 Binary files a/resources/library/pictures/Personnages/fatou_debout.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/fratrie.png b/resources/library/pictures/Personnages/fratrie.png deleted file mode 100755 index 0e644ac4..00000000 Binary files a/resources/library/pictures/Personnages/fratrie.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/jan_bras_ecarte.png b/resources/library/pictures/Personnages/jan_bras_ecarte.png deleted file mode 100755 index 52540177..00000000 Binary files a/resources/library/pictures/Personnages/jan_bras_ecarte.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/jan_presentation.png b/resources/library/pictures/Personnages/jan_presentation.png deleted file mode 100755 index 69e853e7..00000000 Binary files a/resources/library/pictures/Personnages/jan_presentation.png and /dev/null differ diff --git a/resources/library/pictures/Personnages/medecin.png b/resources/library/pictures/Personnages/medecin.png deleted file mode 100755 index d4c6e8f9..00000000 Binary files a/resources/library/pictures/Personnages/medecin.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/oeil.png b/resources/library/pictures/Pictogrammes/oeil.png deleted file mode 100755 index 27f123d9..00000000 Binary files a/resources/library/pictures/Pictogrammes/oeil.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/oeil_barre.png b/resources/library/pictures/Pictogrammes/oeil_barre.png deleted file mode 100755 index 39a3ccd6..00000000 Binary files a/resources/library/pictures/Pictogrammes/oeil_barre.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/oreille.png b/resources/library/pictures/Pictogrammes/oreille.png deleted file mode 100755 index 19db3f59..00000000 Binary files a/resources/library/pictures/Pictogrammes/oreille.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/oreille_barre.png b/resources/library/pictures/Pictogrammes/oreille_barre.png deleted file mode 100755 index 647c0e3a..00000000 Binary files a/resources/library/pictures/Pictogrammes/oreille_barre.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_choisis.png b/resources/library/pictures/Pictogrammes/picto_choisis.png deleted file mode 100755 index 2969ae22..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_choisis.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_deplace.png b/resources/library/pictures/Pictogrammes/picto_deplace.png deleted file mode 100755 index 328a3121..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_deplace.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_ecoute.png b/resources/library/pictures/Pictogrammes/picto_ecoute.png deleted file mode 100755 index 7fdf9ce4..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_ecoute.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_ecrit.png b/resources/library/pictures/Pictogrammes/picto_ecrit.png deleted file mode 100755 index e7bf7f81..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_ecrit.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_explore.png b/resources/library/pictures/Pictogrammes/picto_explore.png deleted file mode 100755 index 1de6400a..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_explore.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_livre.png b/resources/library/pictures/Pictogrammes/picto_livre.png deleted file mode 100755 index 71dfdc2d..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_livre.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_livre2.png b/resources/library/pictures/Pictogrammes/picto_livre2.png deleted file mode 100755 index 933e14bc..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_livre2.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_parle.png b/resources/library/pictures/Pictogrammes/picto_parle.png deleted file mode 100755 index a408caee..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_parle.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_regarde.png b/resources/library/pictures/Pictogrammes/picto_regarde.png deleted file mode 100755 index a7a1c32c..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_regarde.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_regarde_ecoute.png b/resources/library/pictures/Pictogrammes/picto_regarde_ecoute.png deleted file mode 100755 index d97d25f0..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_regarde_ecoute.png and /dev/null differ diff --git a/resources/library/pictures/Pictogrammes/picto_reperer.png b/resources/library/pictures/Pictogrammes/picto_reperer.png deleted file mode 100755 index 773366ac..00000000 Binary files a/resources/library/pictures/Pictogrammes/picto_reperer.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/Bananier.png b/resources/library/pictures/Vegetaux/Bananier.png deleted file mode 100755 index 907ca923..00000000 Binary files a/resources/library/pictures/Vegetaux/Bananier.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/avocat.png b/resources/library/pictures/Vegetaux/avocat.png deleted file mode 100755 index ac15ce91..00000000 Binary files a/resources/library/pictures/Vegetaux/avocat.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/avocatier.png b/resources/library/pictures/Vegetaux/avocatier.png deleted file mode 100755 index ea8ea966..00000000 Binary files a/resources/library/pictures/Vegetaux/avocatier.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/banane.png b/resources/library/pictures/Vegetaux/banane.png deleted file mode 100755 index 052c769e..00000000 Binary files a/resources/library/pictures/Vegetaux/banane.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/croissance_avocat.png b/resources/library/pictures/Vegetaux/croissance_avocat.png deleted file mode 100755 index ab370d22..00000000 Binary files a/resources/library/pictures/Vegetaux/croissance_avocat.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/croissance_bananne.png b/resources/library/pictures/Vegetaux/croissance_bananne.png deleted file mode 100755 index 0b1ce79f..00000000 Binary files a/resources/library/pictures/Vegetaux/croissance_bananne.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/croissance_goyave.png b/resources/library/pictures/Vegetaux/croissance_goyave.png deleted file mode 100755 index e5ae6805..00000000 Binary files a/resources/library/pictures/Vegetaux/croissance_goyave.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/croissance_mangue.png b/resources/library/pictures/Vegetaux/croissance_mangue.png deleted file mode 100755 index 0b3849e0..00000000 Binary files a/resources/library/pictures/Vegetaux/croissance_mangue.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/goyave.png b/resources/library/pictures/Vegetaux/goyave.png deleted file mode 100755 index fc22f16a..00000000 Binary files a/resources/library/pictures/Vegetaux/goyave.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/goyavier.png b/resources/library/pictures/Vegetaux/goyavier.png deleted file mode 100755 index 78ec9b49..00000000 Binary files a/resources/library/pictures/Vegetaux/goyavier.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/mangue.png b/resources/library/pictures/Vegetaux/mangue.png deleted file mode 100755 index 2c61014d..00000000 Binary files a/resources/library/pictures/Vegetaux/mangue.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/manguier_mangue.png b/resources/library/pictures/Vegetaux/manguier_mangue.png deleted file mode 100755 index 999a8f63..00000000 Binary files a/resources/library/pictures/Vegetaux/manguier_mangue.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/manioc.png b/resources/library/pictures/Vegetaux/manioc.png deleted file mode 100755 index 669fc475..00000000 Binary files a/resources/library/pictures/Vegetaux/manioc.png and /dev/null differ diff --git a/resources/library/pictures/Vegetaux/piment.png b/resources/library/pictures/Vegetaux/piment.png deleted file mode 100755 index 7869f338..00000000 Binary files a/resources/library/pictures/Vegetaux/piment.png and /dev/null differ diff --git a/resources/library/pictures/open-sankore.svg b/resources/library/pictures/open-sankore.svg deleted file mode 100644 index 70c17fd1..00000000 --- a/resources/library/pictures/open-sankore.svg +++ /dev/null @@ -1,1015 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/resources/library/videos/Sciences/video_bourgeon.mpg b/resources/library/videos/Sciences/video_bourgeon.mpg deleted file mode 100644 index 17419195..00000000 Binary files a/resources/library/videos/Sciences/video_bourgeon.mpg and /dev/null differ diff --git a/src/adaptors/UBCFFSubsetAdaptor.cpp b/src/adaptors/UBCFFSubsetAdaptor.cpp index 6f26472d..73a81c5b 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.cpp +++ b/src/adaptors/UBCFFSubsetAdaptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBCFFSubsetAdaptor.h b/src/adaptors/UBCFFSubsetAdaptor.h index 5e6e7df3..68f741e9 100644 --- a/src/adaptors/UBCFFSubsetAdaptor.h +++ b/src/adaptors/UBCFFSubsetAdaptor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportAdaptor.cpp b/src/adaptors/UBExportAdaptor.cpp index 787d95da..d36de637 100644 --- a/src/adaptors/UBExportAdaptor.cpp +++ b/src/adaptors/UBExportAdaptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportAdaptor.h b/src/adaptors/UBExportAdaptor.h index 38c896fd..a4986137 100644 --- a/src/adaptors/UBExportAdaptor.h +++ b/src/adaptors/UBExportAdaptor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportCFF.cpp b/src/adaptors/UBExportCFF.cpp index aebd5341..3d3b94c9 100644 --- a/src/adaptors/UBExportCFF.cpp +++ b/src/adaptors/UBExportCFF.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportCFF.h b/src/adaptors/UBExportCFF.h index 82c08e31..62743aa3 100644 --- a/src/adaptors/UBExportCFF.h +++ b/src/adaptors/UBExportCFF.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportDocument.cpp b/src/adaptors/UBExportDocument.cpp index d06a2a55..745cf998 100644 --- a/src/adaptors/UBExportDocument.cpp +++ b/src/adaptors/UBExportDocument.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -76,8 +76,6 @@ void UBExportDocument::persist(UBDocumentProxy* pDocumentProxy) void UBExportDocument::persistsDocument(UBDocumentProxy* pDocumentProxy, QString filename) { - QString documentPath(pDocumentProxy->persistencePath()); - QuaZip zip(filename); zip.setFileNameCodec("UTF-8"); if(!zip.open(QuaZip::mdCreate)) diff --git a/src/adaptors/UBExportDocument.h b/src/adaptors/UBExportDocument.h index 43a62cec..9fbb5b69 100644 --- a/src/adaptors/UBExportDocument.h +++ b/src/adaptors/UBExportDocument.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportFullPDF.cpp b/src/adaptors/UBExportFullPDF.cpp index ce416bce..b68b92da 100644 --- a/src/adaptors/UBExportFullPDF.cpp +++ b/src/adaptors/UBExportFullPDF.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportFullPDF.h b/src/adaptors/UBExportFullPDF.h index a1fc9111..a3110c14 100644 --- a/src/adaptors/UBExportFullPDF.h +++ b/src/adaptors/UBExportFullPDF.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportPDF.cpp b/src/adaptors/UBExportPDF.cpp index 6b4aa685..b62d35c7 100644 --- a/src/adaptors/UBExportPDF.cpp +++ b/src/adaptors/UBExportPDF.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportPDF.h b/src/adaptors/UBExportPDF.h index a598c10f..537c8d81 100644 --- a/src/adaptors/UBExportPDF.h +++ b/src/adaptors/UBExportPDF.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportWeb.cpp b/src/adaptors/UBExportWeb.cpp index b026da75..ad9e0c89 100644 --- a/src/adaptors/UBExportWeb.cpp +++ b/src/adaptors/UBExportWeb.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBExportWeb.h b/src/adaptors/UBExportWeb.h index 74bf309e..bf52cc1c 100644 --- a/src/adaptors/UBExportWeb.h +++ b/src/adaptors/UBExportWeb.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportAdaptor.cpp b/src/adaptors/UBImportAdaptor.cpp index 22716f70..0a842f3e 100644 --- a/src/adaptors/UBImportAdaptor.cpp +++ b/src/adaptors/UBImportAdaptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportAdaptor.h b/src/adaptors/UBImportAdaptor.h index c5854f23..a99a991c 100644 --- a/src/adaptors/UBImportAdaptor.h +++ b/src/adaptors/UBImportAdaptor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportCFF.cpp b/src/adaptors/UBImportCFF.cpp index f8b2cca6..4845e653 100644 --- a/src/adaptors/UBImportCFF.cpp +++ b/src/adaptors/UBImportCFF.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportCFF.h b/src/adaptors/UBImportCFF.h index 7748f5f3..d06b9d18 100644 --- a/src/adaptors/UBImportCFF.h +++ b/src/adaptors/UBImportCFF.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportDocument.cpp b/src/adaptors/UBImportDocument.cpp index 14b33ccf..f155385d 100644 --- a/src/adaptors/UBImportDocument.cpp +++ b/src/adaptors/UBImportDocument.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportDocument.h b/src/adaptors/UBImportDocument.h index d2b7ed6b..8ac246fd 100644 --- a/src/adaptors/UBImportDocument.h +++ b/src/adaptors/UBImportDocument.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportImage.cpp b/src/adaptors/UBImportImage.cpp index 1ddfbd01..ce0648e3 100644 --- a/src/adaptors/UBImportImage.cpp +++ b/src/adaptors/UBImportImage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportImage.h b/src/adaptors/UBImportImage.h index 24acd3bc..c7273086 100644 --- a/src/adaptors/UBImportImage.h +++ b/src/adaptors/UBImportImage.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportPDF.cpp b/src/adaptors/UBImportPDF.cpp index 1114fa7e..4f76c50e 100644 --- a/src/adaptors/UBImportPDF.cpp +++ b/src/adaptors/UBImportPDF.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportPDF.h b/src/adaptors/UBImportPDF.h index 6eb777c8..bed1ada9 100644 --- a/src/adaptors/UBImportPDF.h +++ b/src/adaptors/UBImportPDF.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBImportVirtualPrinter.cpp b/src/adaptors/UBImportVirtualPrinter.cpp index 54344060..68fd5376 100644 --- a/src/adaptors/UBImportVirtualPrinter.cpp +++ b/src/adaptors/UBImportVirtualPrinter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBIniFileParser.cpp b/src/adaptors/UBIniFileParser.cpp index 62672d76..67e2bf38 100644 --- a/src/adaptors/UBIniFileParser.cpp +++ b/src/adaptors/UBIniFileParser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBIniFileParser.h b/src/adaptors/UBIniFileParser.h index 6bd5fd05..b60178ab 100644 --- a/src/adaptors/UBIniFileParser.h +++ b/src/adaptors/UBIniFileParser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp index 217c93a2..676bbca8 100644 --- a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp +++ b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBMetadataDcSubsetAdaptor.h b/src/adaptors/UBMetadataDcSubsetAdaptor.h index 10c34175..303c8f3e 100644 --- a/src/adaptors/UBMetadataDcSubsetAdaptor.h +++ b/src/adaptors/UBMetadataDcSubsetAdaptor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBSvgSubsetAdaptor.cpp b/src/adaptors/UBSvgSubsetAdaptor.cpp index 6bc5da91..bb5cf7be 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.cpp +++ b/src/adaptors/UBSvgSubsetAdaptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -383,13 +383,16 @@ UBSvgSubsetAdaptor::UBSvgSubsetReader::UBSvgSubsetReader(UBDocumentProxy* pProxy UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() { + qDebug() << "loadScene() : starting reading..."; + QTime time; + time.start(); mScene = 0; UBGraphicsWidgetItem *currentWidget = 0; mFileVersion = 40100; // default to 4.1.0 - UBGraphicsStroke* annotationGroup = 0; UBGraphicsStrokesGroup* strokesGroup = 0; + UBGraphicsStroke* currentStroke = 0; while (!mXmlReader.atEnd()) { @@ -513,16 +516,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() } else if (mXmlReader.name() == "g") { - // Create new stroke, if its NULL or already has polygons - if (annotationGroup) - { - if (!annotationGroup->polygons().empty()) - annotationGroup = new UBGraphicsStroke(); - } - else - annotationGroup = new UBGraphicsStroke(); - - strokesGroup = new UBGraphicsStrokesGroup(); graphicsItemFromSvg(strokesGroup); @@ -553,6 +546,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() UBGraphicsPolygonItem* polygonItem = 0; QString parentId = mXmlReader.attributes().value(mNamespaceUri, "parent").toString(); + if (mXmlReader.name() == "polygon") polygonItem = polygonItemFromPolygonSvg(mScene->isDarkBackground() ? Qt::white : Qt::black); else if (mXmlReader.name() == "line") @@ -561,21 +555,13 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if(parentId.isEmpty() && strokesGroup) parentId = strokesGroup->uuid().toString(); - Q_ASSERT(!parentId.isEmpty()); + if(parentId.isEmpty()) + parentId = QUuid::createUuid().toString(); if (polygonItem) { polygonItem->setUuid(uuidFromSvg); - if (annotationGroup) - polygonItem->setStroke(annotationGroup); - - - if(strokesGroup){ - polygonItem->setTransform(strokesGroup->transform()); - strokesGroup->addToGroup(polygonItem); - polygonItem->setStrokesGroup(strokesGroup); - } polygonItem->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Graphic)); @@ -583,10 +569,17 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if(!mStrokesList.contains(parentId)){ group = new UBGraphicsStrokesGroup(); mStrokesList.insert(parentId,group); + currentStroke = new UBGraphicsStroke(); } else group = mStrokesList.value(parentId); + if(polygonItem->transform().isIdentity()) + polygonItem->setTransform(group->transform()); + group->addToGroup(polygonItem); + polygonItem->setStrokesGroup(group); + polygonItem->setStroke(currentStroke); + polygonItem->show(); group->addToGroup(polygonItem); @@ -597,38 +590,29 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() QList polygonItems = polygonItemsFromPolylineSvg(mScene->isDarkBackground() ? Qt::white : Qt::black); - QString newParentId = QUuid::createUuid().toString(); + QString parentId = QUuid::createUuid().toString(); foreach(UBGraphicsPolygonItem* polygonItem, polygonItems) { - if (annotationGroup) - polygonItem->setStroke(annotationGroup); - - - if(strokesGroup){ - polygonItem->setTransform(strokesGroup->transform()); - strokesGroup->addToGroup(polygonItem); - polygonItem->setStrokesGroup(strokesGroup); - } - polygonItem->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Graphic)); - QString parentId = mXmlReader.attributes().value(mNamespaceUri, "parent").toString(); - - if(parentId.isEmpty()) - parentId = newParentId; - - Q_ASSERT(!parentId.isEmpty()); UBGraphicsStrokesGroup* group; if(!mStrokesList.contains(parentId)){ group = new UBGraphicsStrokesGroup(); mStrokesList.insert(parentId,group); + currentStroke = new UBGraphicsStroke(); } else group = mStrokesList.value(parentId); + if(polygonItem->transform().isIdentity()) + polygonItem->setTransform(group->transform()); group->addToGroup(polygonItem); + polygonItem->setStrokesGroup(group); + polygonItem->setStroke(currentStroke); + polygonItem->show(); + group->addToGroup(polygonItem); } } @@ -990,11 +974,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() { if (mXmlReader.name() == "g") { - if (annotationGroup) - { - if (!annotationGroup->polygons().empty()) - annotationGroup = 0; - } mGroupHasInfo = false; mGroupDarkBackgroundColor = QColor(); mGroupLightBackgroundColor = QColor(); @@ -1009,7 +988,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() } qDebug() << "Number of detected strokes: " << mStrokesList.count(); - QMapIterator iterator(mStrokesList); + QHashIterator iterator(mStrokesList); while (iterator.hasNext()) { iterator.next(); qDebug() << "Number of polygons : " << (int)(((UBGraphicsStrokesGroup*)iterator.value())->childItems().count()); @@ -1019,12 +998,9 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() if (mScene) mScene->setModified(false); - if (annotationGroup && annotationGroup->polygons().empty()){ - delete annotationGroup; - annotationGroup = 0; - } - mScene->enableUndoRedoStack(); + qDebug() << "loadScene() : created scene and read file"; + qDebug() << "spent milliseconds: " << time.elapsed(); return mScene; } @@ -1032,9 +1008,14 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene() UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() { UBGraphicsGroupContainerItem *group = new UBGraphicsGroupContainerItem(); -// QMultiMap strokesGroupsContainer; QList groupContainer; + QString id = mXmlReader.attributes().value(aId).toString(); + id = id.mid(1,id.length()-2); + bool shouldSkipSubElements = false; + if(mStrokesList.contains(id)) + shouldSkipSubElements = true; + mXmlReader.readNext(); while (!mXmlReader.atEnd()) { @@ -1044,34 +1025,18 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() } else if (mXmlReader.isStartElement()) { if (mXmlReader.name() == tGroup) { - qDebug() << "came across the group id is" << mXmlReader.attributes().value(aId); UBGraphicsGroupContainerItem *curGroup = readGroup(); if (curGroup) groupContainer.append(curGroup); - else - qDebug() << "this is an error"; } - else if (mXmlReader.name() == tElement) { + else if (mXmlReader.name() == tElement && !shouldSkipSubElements) { QString id = mXmlReader.attributes().value(aId).toString(); -// QString itemId = id.right(QUuid().toString().size()); -// QString groupId = id.left(QUuid().toString().size()); - QGraphicsItem *curItem = readElementFromGroup(); -// UBGraphicsPolygonItem *curPolygon = qgraphicsitem_cast(curItem); -// -// if (curPolygon && !groupId.isEmpty() && !itemId.isEmpty() && itemId != groupId) { -// strokesGroupsContainer.insert(groupId, curPolygon); -// } -// else {// item - // Explanation: the second condition discriminate the old storage version that should // not be interpreted anymore if(curItem && id.count("{") < 2) groupContainer.append(curItem); - else - qDebug() << "this is an error"; -// } } else { mXmlReader.skipCurrentElement(); @@ -1082,39 +1047,6 @@ UBGraphicsGroupContainerItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::readGroup() } } -// foreach (QString key, strokesGroupsContainer.keys().toSet()) -// { -// UBGraphicsStrokesGroup* pStrokesGroup = new UBGraphicsStrokesGroup(); -// UBGraphicsStroke *currentStroke = new UBGraphicsStroke(); -// foreach(UBGraphicsPolygonItem* poly, strokesGroupsContainer.values(key)) -// { -// if (poly) -// { -// mScene->removeItem(poly); -// mScene->removeItemFromDeletion(poly); -// poly->setStrokesGroup(pStrokesGroup); -// poly->setStroke(currentStroke); -// pStrokesGroup->addToGroup(poly); -// } -// } -// if (currentStroke->polygons().empty()) -// delete currentStroke; - -// if (pStrokesGroup->childItems().count()) -// mScene->addItem(pStrokesGroup); -// else -// delete pStrokesGroup; - -// if (pStrokesGroup) -// { -// QGraphicsItem *strokeGroup = qgraphicsitem_cast(pStrokesGroup); -// if(strokeGroup) -// groupContainer.append(strokeGroup); -// else -// qDebug() << "this is an error"; -// } -// } - foreach(QGraphicsItem* item, groupContainer) group->addToGroup(item); @@ -1165,8 +1097,6 @@ QGraphicsItem *UBSvgSubsetAdaptor::UBSvgSubsetReader::readElementFromGroup() if(!result) result = mStrokesList.take(uuid.replace("}","").replace("{","")); - //Q_ASSERT(result); - mXmlReader.skipCurrentElement(); mXmlReader.readNext(); @@ -1254,9 +1184,20 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) // Get the items from the scene QList items = mScene->items(); + int strokes = 0; int polygons = 0; + foreach(QGraphicsItem *item, items) { + if (item->type() == UBGraphicsPolygonItem::Type) { + polygons++; + } else if (item->type() == UBGraphicsStrokesGroup::Type) { + strokes++; + } + } + qDebug() << "---Strokes count" << strokes << "Polygons count" << polygons; + qSort(items.begin(), items.end(), itemZIndexComp); UBGraphicsStroke *openStroke = 0; + int nextStroke = 0; bool groupHoldsInfo = false; @@ -1265,18 +1206,35 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex) QGraphicsItem *item = items.takeFirst(); // Is the item a strokes group? - UBGraphicsStrokesGroup* strokesGroupItem = qgraphicsitem_cast(item); if(strokesGroupItem && strokesGroupItem->isVisible()){ // Add the polygons - foreach(QGraphicsItem* item, strokesGroupItem->childItems()){ + //parsing number of polygons into one polygon + qDebug() << "parsing stroke number" << nextStroke++; + UBGraphicsPolygonItem *resultPoly = 0; + foreach(QGraphicsItem* item, strokesGroupItem->childItems()) { UBGraphicsPolygonItem* poly = qgraphicsitem_cast(item); - if(NULL != poly){ - polygonItemToSvgPolygon(poly, true); - items.removeOne(poly); + if (!poly) { + continue; + } else if (!resultPoly) { + resultPoly = poly; + continue; } + QPolygonF newPolygon = poly->sceneTransform().map(poly->polygon()); + QPainterPath strokePainterPath; + strokePainterPath.addPolygon(resultPoly->sceneTransform().map(resultPoly->polygon())); + QPolygonF oldPolygons = strokePainterPath.simplified().toFillPolygon(resultPoly->sceneTransform().inverted()); + newPolygon = oldPolygons.united(newPolygon); + resultPoly->setPolygon(newPolygon); + + // + items.removeOne(poly); + } + if (resultPoly) { + polygonItemToSvgPolygon(resultPoly, true); + items.removeOne(resultPoly); } } @@ -1561,12 +1519,12 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistGroupToDom(QGraphicsItem *gro if (!tmpUuid.isNull()) { if (item->type() == UBGraphicsGroupContainerItem::Type && item->childItems().count()) persistGroupToDom(item, curParent, groupDomDocument); - else { - QDomElement curSubElement = groupDomDocument->createElement(tElement); + } + else { + QDomElement curSubElement = groupDomDocument->createElement(tElement); - curSubElement.setAttribute(aId, tmpUuid); - curGroupElement.appendChild(curSubElement); - } + curSubElement.setAttribute(aId, tmpUuid); + curGroupElement.appendChild(curSubElement); } } } @@ -2501,15 +2459,12 @@ qreal UBSvgSubsetAdaptor::UBSvgSubsetReader::getZValueFromSvg() QUuid UBSvgSubsetAdaptor::UBSvgSubsetReader::getUuidFromSvg() { - QUuid result; - QString strUuid = mXmlReader.attributes().value(mNamespaceUri, "uuid").toString(); QUuid uuid = QUuid(strUuid); - if (!uuid.isNull()) { - result = uuid; - } + if (!uuid.isNull()) + return uuid; - return result; + return QUuid::createUuid(); } diff --git a/src/adaptors/UBSvgSubsetAdaptor.h b/src/adaptors/UBSvgSubsetAdaptor.h index 0d7d2c38..8805cd80 100644 --- a/src/adaptors/UBSvgSubsetAdaptor.h +++ b/src/adaptors/UBSvgSubsetAdaptor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -174,7 +174,7 @@ class UBSvgSubsetAdaptor QString mNamespaceUri; UBGraphicsScene *mScene; - QMap mStrokesList; + QHash mStrokesList; }; class UBSvgSubsetWriter diff --git a/src/adaptors/UBThumbnailAdaptor.cpp b/src/adaptors/UBThumbnailAdaptor.cpp index bd1a6acc..97c53852 100644 --- a/src/adaptors/UBThumbnailAdaptor.cpp +++ b/src/adaptors/UBThumbnailAdaptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -120,8 +120,10 @@ void UBThumbnailAdaptor::load(UBDocumentProxy* proxy, QList& lis updateDocumentToHandleZeroPage(proxy); generateMissingThumbnails(proxy); - foreach(const QPixmap* pm, list) + foreach(const QPixmap* pm, list){ delete pm; + pm = NULL; + } list.clear(); for(int i=0; ipageCount(); i++) list.append(get(proxy, i)); diff --git a/src/adaptors/UBThumbnailAdaptor.h b/src/adaptors/UBThumbnailAdaptor.h index 52305dc1..88c39bf7 100644 --- a/src/adaptors/UBThumbnailAdaptor.h +++ b/src/adaptors/UBThumbnailAdaptor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/UBWebPublisher.cpp b/src/adaptors/UBWebPublisher.cpp index d6cbf653..a979515a 100644 --- a/src/adaptors/UBWebPublisher.cpp +++ b/src/adaptors/UBWebPublisher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -53,8 +53,6 @@ void UBWebPublisher::persist(UBDocumentProxy* pDocumentProxy) if (!pDocumentProxy) return; - QString documentPath(pDocumentProxy->persistencePath()); - UBDocumentPublisher* publisher = new UBDocumentPublisher(pDocumentProxy, this); // the publisher will self delete when publication finishes publisher->publish(); diff --git a/src/adaptors/UBWebPublisher.h b/src/adaptors/UBWebPublisher.h index f47516d8..99409373 100644 --- a/src/adaptors/UBWebPublisher.h +++ b/src/adaptors/UBWebPublisher.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/publishing/UBDocumentPublisher.cpp b/src/adaptors/publishing/UBDocumentPublisher.cpp index 33e9b58e..4edeffdf 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.cpp +++ b/src/adaptors/publishing/UBDocumentPublisher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/publishing/UBDocumentPublisher.h b/src/adaptors/publishing/UBDocumentPublisher.h index 6b4b5f27..5e8768bf 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.h +++ b/src/adaptors/publishing/UBDocumentPublisher.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/publishing/UBSvgSubsetRasterizer.cpp b/src/adaptors/publishing/UBSvgSubsetRasterizer.cpp index 98eb2cfc..458eb1c9 100644 --- a/src/adaptors/publishing/UBSvgSubsetRasterizer.cpp +++ b/src/adaptors/publishing/UBSvgSubsetRasterizer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/adaptors/publishing/UBSvgSubsetRasterizer.h b/src/adaptors/publishing/UBSvgSubsetRasterizer.h index a208c121..fcc40cff 100644 --- a/src/adaptors/publishing/UBSvgSubsetRasterizer.h +++ b/src/adaptors/publishing/UBSvgSubsetRasterizer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/api/UBLibraryAPI.cpp b/src/api/UBLibraryAPI.cpp index bd69bb4b..94f4908d 100644 --- a/src/api/UBLibraryAPI.cpp +++ b/src/api/UBLibraryAPI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/api/UBLibraryAPI.h b/src/api/UBLibraryAPI.h index 9fbdce19..0a55c943 100644 --- a/src/api/UBLibraryAPI.h +++ b/src/api/UBLibraryAPI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/api/UBW3CWidgetAPI.cpp b/src/api/UBW3CWidgetAPI.cpp index a1a4b7e3..3295ba03 100644 --- a/src/api/UBW3CWidgetAPI.cpp +++ b/src/api/UBW3CWidgetAPI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/api/UBW3CWidgetAPI.h b/src/api/UBW3CWidgetAPI.h index 3778c647..cd41cbdb 100644 --- a/src/api/UBW3CWidgetAPI.h +++ b/src/api/UBW3CWidgetAPI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/api/UBWidgetMessageAPI.cpp b/src/api/UBWidgetMessageAPI.cpp index 94ae18c9..674aec7c 100644 --- a/src/api/UBWidgetMessageAPI.cpp +++ b/src/api/UBWidgetMessageAPI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/api/UBWidgetMessageAPI.h b/src/api/UBWidgetMessageAPI.h index 5e0d3747..366dbe96 100644 --- a/src/api/UBWidgetMessageAPI.h +++ b/src/api/UBWidgetMessageAPI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/api/UBWidgetUniboardAPI.cpp b/src/api/UBWidgetUniboardAPI.cpp index e9ff6996..69eb953c 100644 --- a/src/api/UBWidgetUniboardAPI.cpp +++ b/src/api/UBWidgetUniboardAPI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/api/UBWidgetUniboardAPI.h b/src/api/UBWidgetUniboardAPI.h index e022af4e..76758fa9 100644 --- a/src/api/UBWidgetUniboardAPI.h +++ b/src/api/UBWidgetUniboardAPI.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp index b975eef2..33afb520 100644 --- a/src/board/UBBoardController.cpp +++ b/src/board/UBBoardController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -539,8 +539,6 @@ void UBBoardController::duplicateScene(int nIndex) setActiveDocumentScene(nIndex + 1); QApplication::restoreOverrideCursor(); - - emit pageChanged(); } void UBBoardController::duplicateScene() @@ -918,7 +916,6 @@ void UBBoardController::previousScene() } updateActionStates(); - emit pageChanged(); } @@ -933,7 +930,6 @@ void UBBoardController::nextScene() } updateActionStates(); - emit pageChanged(); } @@ -948,7 +944,6 @@ void UBBoardController::firstScene() } updateActionStates(); - emit pageChanged(); } @@ -963,7 +958,6 @@ void UBBoardController::lastScene() } updateActionStates(); - emit pageChanged(); } void UBBoardController::groupButtonClicked() @@ -1537,16 +1531,10 @@ void UBBoardController::setActiveDocumentScene(UBDocumentProxy* pDocumentProxy, updateBackgroundState(); if(documentChange) - { UBGraphicsTextItem::lastUsedTextColor = QColor(); - } - if (sceneChange) - { emit activeSceneChanged(); - emit pageChanged(); - } } @@ -2078,7 +2066,9 @@ void UBBoardController::grabScene(const QRectF& pSceneRect) mActiveScene->render(&painter, targetRect, pSceneRect); mActiveScene->setRenderingContext(UBGraphicsScene::Screen); - mActiveScene->setRenderingQuality(UBItem::RenderingQualityNormal); +// mActiveScene->setRenderingQuality(UBItem::RenderingQualityNormal); + mActiveScene->setRenderingQuality(UBItem::RenderingQualityHigh); + mPaletteManager->addItem(QPixmap::fromImage(image)); selectedDocument()->setMetaData(UBSettings::documentUpdatedAt, UBStringUtils::toUtcIsoDateTime(QDateTime::currentDateTime())); @@ -2474,7 +2464,7 @@ void UBBoardController::importPage() void UBBoardController::notifyPageChanged() { - emit pageChanged(); + emit activeSceneChanged(); } void UBBoardController::onDownloadModalFinished() diff --git a/src/board/UBBoardController.h b/src/board/UBBoardController.h index 10be4e81..66dd1de3 100644 --- a/src/board/UBBoardController.h +++ b/src/board/UBBoardController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -245,7 +245,6 @@ class UBBoardController : public UBDocumentContainer void backgroundChanged(); void cacheEnabled(); void cacheDisabled(); - void pageChanged(); void documentReorganized(int index); void displayMetadata(QMap metadata); void pageSelectionChanged(int index); diff --git a/src/board/UBBoardPaletteManager.cpp b/src/board/UBBoardPaletteManager.cpp index 2595dc98..fa3eb218 100644 --- a/src/board/UBBoardPaletteManager.cpp +++ b/src/board/UBBoardPaletteManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/board/UBBoardPaletteManager.h b/src/board/UBBoardPaletteManager.h index 7526e081..416a1374 100644 --- a/src/board/UBBoardPaletteManager.h +++ b/src/board/UBBoardPaletteManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/board/UBBoardView.cpp b/src/board/UBBoardView.cpp index 01a6ad2f..bef60522 100644 --- a/src/board/UBBoardView.cpp +++ b/src/board/UBBoardView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -122,10 +122,12 @@ UBBoardView::UBBoardView (UBBoardController* pController, int pStartLayer, int p mLongPressTimer.setSingleShot(true); } -UBBoardView::~UBBoardView () { - //NOOP - if (suspendedMousePressEvent) +UBBoardView::~UBBoardView () +{ + if (suspendedMousePressEvent){ delete suspendedMousePressEvent; + suspendedMousePressEvent = NULL; + } } void UBBoardView::init () @@ -169,28 +171,24 @@ void UBBoardView::init () mWidgetMoved = false; } -UBGraphicsScene* -UBBoardView::scene () +UBGraphicsScene* UBBoardView::scene () { return qobject_cast (QGraphicsView::scene ()); } -void -UBBoardView::hideEvent (QHideEvent * event) +void UBBoardView::hideEvent (QHideEvent * event) { Q_UNUSED (event); emit hidden (); } -void -UBBoardView::showEvent (QShowEvent * event) +void UBBoardView::showEvent (QShowEvent * event) { Q_UNUSED (event); emit shown (); } -void -UBBoardView::keyPressEvent (QKeyEvent *event) +void UBBoardView::keyPressEvent (QKeyEvent *event) { // send to the scene anyway QApplication::sendEvent (scene (), event); @@ -303,20 +301,14 @@ UBBoardView::keyPressEvent (QKeyEvent *event) void UBBoardView::keyReleaseEvent(QKeyEvent *event) { - // if (!event->isAccepted ()) - { - if (Qt::Key_Shift == event->key() - ||Qt::Key_Control == event->key()) - { - setMultiselection(false); - } - } + + if (Qt::Key_Shift == event->key() ||Qt::Key_Control == event->key()) + setMultiselection(false); QGraphicsView::keyReleaseEvent(event); } -bool -UBBoardView::event (QEvent * e) +bool UBBoardView::event (QEvent * e) { if (e->type () == QEvent::Gesture) { @@ -461,14 +453,13 @@ bool UBBoardView::itemHaveParentWithType(QGraphicsItem *item, int type) return itemHaveParentWithType(item->parentItem(), type); } + bool UBBoardView::isUBItem(QGraphicsItem *item) { if ((UBGraphicsItemType::UserTypesCount > item->type()) && (item->type() > QGraphicsItem::UserType)) return true; - else - { - return false; - } + + return false; } bool UBBoardView::isCppTool(QGraphicsItem *item) @@ -761,9 +752,8 @@ void UBBoardView::handleItemMousePress(QMouseEvent *event) if (isMultipleSelectionEnabled()) return; - if (itemShouldReceiveMousePressEvent(movingItem)) { + if (itemShouldReceiveMousePressEvent(movingItem)) QGraphicsView::mousePressEvent (event); - } else { if (movingItem) { @@ -864,13 +854,81 @@ void UBBoardView::setMultiselection(bool enable) mMultipleSelectionIsEnabled = enable; } +// work around for handling tablet events on MAC OS with Qt 4.8.0 and above +#if defined(Q_WS_MACX) +bool UBBoardView::directTabletEvent(QEvent *event) +{ + QTabletEvent *tEvent = static_cast(event); + tEvent = new QTabletEvent(tEvent->type() + , mapFromGlobal(tEvent->pos()) + , tEvent->globalPos() + , tEvent->hiResGlobalPos() + , tEvent->device() + , tEvent->pointerType() + , tEvent->pressure() + , tEvent->xTilt() + , tEvent->yTilt() + , tEvent->tangentialPressure() + , tEvent->rotation() + , tEvent->z() + , tEvent->modifiers() + , tEvent->uniqueId()); + + if (geometry().contains(tEvent->pos())) + { + if (NULL == widgetForTabletEvent(this->parentWidget(), tEvent->pos())) + { + tabletEvent(tEvent); + return true; + } + } + return false; +} + +QWidget *UBBoardView::widgetForTabletEvent(QWidget *w, const QPoint &pos) +{ + Q_ASSERT(w); + + // it should work that, but it doesn't. So we check if it is control view. + //UBBoardView *board = qobject_cast(w); + UBBoardView *board = UBApplication::boardController->controlView(); + + QWidget *childAtPos = NULL; + + QList childs = w->children(); + foreach(QObject *child, childs) + { + QWidget *childWidget = qobject_cast(child); + if (childWidget) + { + if (childWidget->isVisible() && childWidget->geometry().contains(pos)) + { + QWidget *lastChild = widgetForTabletEvent(childWidget, pos); + + if (board && board->viewport() == lastChild) + continue; + + if (NULL != lastChild) + childAtPos = lastChild; + else + childAtPos = childWidget; + + break; + } + else + childAtPos = NULL; + } + } + return childAtPos; +} +#endif + void UBBoardView::longPressEvent() { UBDrawingController *drawingController = UBDrawingController::drawingController(); UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool (); - - disconnect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent())); + disconnect(&mLongPressTimer, SIGNAL(timeout()), this, SLOT(longPressEvent())); if (UBStylusTool::Selector == currentTool) { @@ -949,9 +1007,9 @@ void UBBoardView::mousePressEvent (QMouseEvent *event) if (!movingItem) { // Rubberband selection implementation - if (!mUBRubberBand) { + if (!mUBRubberBand) mUBRubberBand = new UBRubberBand(QRubberBand::Rectangle, this); - } + mUBRubberBand->setGeometry (QRect (mMouseDownPos, QSize ())); mUBRubberBand->show(); } @@ -1029,13 +1087,10 @@ void UBBoardView::mousePressEvent (QMouseEvent *event) } } -void -UBBoardView::mouseMoveEvent (QMouseEvent *event) +void UBBoardView::mouseMoveEvent (QMouseEvent *event) { if(!mIsDragInProgress && ((mapToScene(event->pos()) - mLastPressedMousePos).manhattanLength() < QApplication::startDragDistance())) - { return; - } mIsDragInProgress = true; UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool (); @@ -1108,8 +1163,7 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event) handleItemMouseMove(event); } - else if ((UBDrawingController::drawingController()->isDrawingTool()) - && !mMouseButtonIsPressed) + else if ((UBDrawingController::drawingController()->isDrawingTool()) && !mMouseButtonIsPressed) { QGraphicsView::mouseMoveEvent (event); } @@ -1138,8 +1192,7 @@ UBBoardView::mouseMoveEvent (QMouseEvent *event) mWidgetMoved = true; } -void -UBBoardView::mouseReleaseEvent (QMouseEvent *event) +void UBBoardView::mouseReleaseEvent (QMouseEvent *event) { UBStylusTool::Enum currentTool = (UBStylusTool::Enum)UBDrawingController::drawingController ()->stylusTool (); @@ -1299,8 +1352,7 @@ UBBoardView::mouseReleaseEvent (QMouseEvent *event) mLongPressTimer.stop(); } -void -UBBoardView::forcedTabletRelease () +void UBBoardView::forcedTabletRelease () { if (mMouseButtonIsPressed || mTabletStylusIsPressed || mPendingStylusReleaseEvent) @@ -1319,26 +1371,14 @@ UBBoardView::forcedTabletRelease () } } -void -UBBoardView::mouseDoubleClickEvent (QMouseEvent *event) +void UBBoardView::mouseDoubleClickEvent (QMouseEvent *event) { // We don't want a double click, we want two clicks mousePressEvent (event); } -void -UBBoardView::wheelEvent (QWheelEvent *wheelEvent) +void UBBoardView::wheelEvent (QWheelEvent *wheelEvent) { - if (isInteractive () && wheelEvent->orientation () == Qt::Vertical) - { - // Too many wheelEvent are sent, how should we handle them to "smoothly" zoom ? - // something like zoom( pow(zoomFactor, event->delta() / 120) ) - - // use DateTime man, store last event time, and if if less than 300ms than this is one big scroll - // and move scroll with one const speed. - // so, you no will related with scroll event count - } - QList selItemsList = scene()->selectedItems(); // if NO have selected items, than no need process mouse wheel. just exist if( selItemsList.count() > 0 ) @@ -1350,8 +1390,8 @@ UBBoardView::wheelEvent (QWheelEvent *wheelEvent) QPointF scenePos = mapToScene(wheelEvent->pos()); QList itemsList = scene()->items(scenePos); - QBool isSlectedAndMouseHower = itemsList.contains(selItem); - if(isSlectedAndMouseHower) + QBool isSelectedAndMouseHower = itemsList.contains(selItem); + if(isSelectedAndMouseHower) { QGraphicsView::wheelEvent(wheelEvent); wheelEvent->accept(); @@ -1361,8 +1401,7 @@ UBBoardView::wheelEvent (QWheelEvent *wheelEvent) } -void -UBBoardView::leaveEvent (QEvent * event) +void UBBoardView::leaveEvent (QEvent * event) { if (scene ()) scene ()->leaveEvent (event); @@ -1370,15 +1409,10 @@ UBBoardView::leaveEvent (QEvent * event) QGraphicsView::leaveEvent (event); } -void -UBBoardView::drawItems (QPainter *painter, int numItems, - QGraphicsItem* items[], - const QStyleOptionGraphicsItem options[]) +void UBBoardView::drawItems (QPainter *painter, int numItems, QGraphicsItem* items[], const QStyleOptionGraphicsItem options[]) { if (!mFilterZIndex) - { QGraphicsView::drawItems (painter, numItems, items, options); - } else { int count = 0; @@ -1433,8 +1467,7 @@ void UBBoardView::dropEvent (QDropEvent *event) } } -void -UBBoardView::resizeEvent (QResizeEvent * event) +void UBBoardView::resizeEvent (QResizeEvent * event) { const qreal maxWidth = width () * 10; const qreal maxHeight = height () * 10; @@ -1445,8 +1478,7 @@ UBBoardView::resizeEvent (QResizeEvent * event) emit resized (event); } -void -UBBoardView::drawBackground (QPainter *painter, const QRectF &rect) +void UBBoardView::drawBackground (QPainter *painter, const QRectF &rect) { if (testAttribute (Qt::WA_TranslucentBackground)) { @@ -1528,8 +1560,7 @@ UBBoardView::drawBackground (QPainter *painter, const QRectF &rect) } } -void -UBBoardView::settingChanged (QVariant newValue) +void UBBoardView::settingChanged (QVariant newValue) { Q_UNUSED (newValue); @@ -1562,14 +1593,12 @@ bool UBBoardView::isAbsurdPoint(QPoint point) return !isValidPoint; } -void -UBBoardView::focusOutEvent (QFocusEvent * event) +void UBBoardView::focusOutEvent (QFocusEvent * event) { Q_UNUSED (event); } -void -UBBoardView::setToolCursor (int tool) +void UBBoardView::setToolCursor (int tool) { QWidget *controlViewport = viewport (); switch (tool) diff --git a/src/board/UBBoardView.h b/src/board/UBBoardView.h index fe709991..4f86e02f 100644 --- a/src/board/UBBoardView.h +++ b/src/board/UBBoardView.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -20,7 +20,6 @@ */ - #ifndef UBBOARDVIEW_H_ #define UBBOARDVIEW_H_ @@ -54,7 +53,11 @@ class UBBoardView : public QGraphicsView void setMultiselection(bool enable); bool isMultipleSelectionEnabled() { return mMultipleSelectionIsEnabled; } - +// work around for handling tablet events on MAC OS with Qt 4.8.0 and above +#if defined(Q_WS_MACX) + bool directTabletEvent(QEvent *event); + QWidget *widgetForTabletEvent(QWidget *w, const QPoint &pos); +#endif signals: void resized(QResizeEvent* event); @@ -153,7 +156,7 @@ class UBBoardView : public QGraphicsView bool moveRubberBand; UBRubberBand *mUBRubberBand; - + QList mRubberedItems; QSet mJustSelectedItems; diff --git a/src/board/UBDrawingController.cpp b/src/board/UBDrawingController.cpp index c07fcbd7..667d044f 100644 --- a/src/board/UBDrawingController.cpp +++ b/src/board/UBDrawingController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/board/UBDrawingController.h b/src/board/UBDrawingController.h index 1e6a8af3..d3f5586f 100644 --- a/src/board/UBDrawingController.h +++ b/src/board/UBDrawingController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/board/UBFeaturesController.cpp b/src/board/UBFeaturesController.cpp index 12dc9b96..fe44b8c1 100644 --- a/src/board/UBFeaturesController.cpp +++ b/src/board/UBFeaturesController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/board/UBFeaturesController.h b/src/board/UBFeaturesController.h index 667fd83f..f2b0f774 100644 --- a/src/board/UBFeaturesController.h +++ b/src/board/UBFeaturesController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UB.h b/src/core/UB.h index 2f8615dc..5661abc1 100644 --- a/src/core/UB.h +++ b/src/core/UB.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index d24bb14b..bcb0194c 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -321,9 +321,9 @@ int UBApplication::exec(const QString& pFileToImport) UBDrawingController::drawingController()->setStylusTool((int)UBStylusTool::Pen); - applicationController = new UBApplicationController(boardController->controlView(), - boardController->displayView(), - mainWindow, + applicationController = new UBApplicationController(boardController->controlView(), + boardController->displayView(), + mainWindow, staticMemoryCleaner, boardController->paletteManager()->rightPalette()); diff --git a/src/core/UBApplication.h b/src/core/UBApplication.h index 618538b0..6f76c1db 100644 --- a/src/core/UBApplication.h +++ b/src/core/UBApplication.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index b24daa25..49b2f698 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -68,9 +68,9 @@ #include "core/memcheck.h" -UBApplicationController::UBApplicationController(UBBoardView *pControlView, +UBApplicationController::UBApplicationController(UBBoardView *pControlView, UBBoardView *pDisplayView, - UBMainWindow* pMainWindow, + UBMainWindow* pMainWindow, QObject* parent, UBRightPalette* rightPalette) : QObject(parent) @@ -371,7 +371,7 @@ void UBApplicationController::showBoard() UBPlatformUtils::setDesktopMode(false); mUninoteController->hideWindow(); - + mMainWindow->show(); emit mainModeChanged(Board); @@ -515,12 +515,12 @@ void UBApplicationController::showTutorial() void UBApplicationController::checkUpdate() { - if(mHttp) - delete mHttp; - QUrl url("http://ftp.open-sankore.org/update.json"); - mHttp = new QHttp(url.host()); - connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool))); - mHttp->get(url.path()); +// if(mHttp) +// delete mHttp; +// QUrl url("http://ftp.open-sankore.org/update.json"); +// mHttp = new QHttp(url.host()); +// connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool))); +// mHttp->get(url.path()); } void UBApplicationController::updateRequestFinished(int id, bool error) diff --git a/src/core/UBApplicationController.h b/src/core/UBApplicationController.h index 189dfe55..b94655d6 100644 --- a/src/core/UBApplicationController.h +++ b/src/core/UBApplicationController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBDisplayManager.cpp b/src/core/UBDisplayManager.cpp index 7f648b6d..f1d3a865 100644 --- a/src/core/UBDisplayManager.cpp +++ b/src/core/UBDisplayManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -20,15 +20,13 @@ */ - #include "UBDisplayManager.h" #include "frameworks/UBPlatformUtils.h" -#include "UBApplication.h" -#include "UBApplicationController.h" - -#include "UBSettings.h" +#include "core/UBApplication.h" +#include "core/UBApplicationController.h" +#include "core/UBSettings.h" #include "board/UBBoardView.h" @@ -68,7 +66,7 @@ void UBDisplayManager::initScreenIndexes() mControlScreenIndex = mDesktop->primaryScreen(); if (UBSettings::settings()->swapControlAndDisplayScreens->get().toBool()) { - mControlScreenIndex = mControlScreenIndex^1; + mControlScreenIndex = mControlScreenIndex^1; } mScreenIndexesRoles << Control; @@ -92,13 +90,13 @@ void UBDisplayManager::initScreenIndexes() if (screenCount > 2) { - for(int i = 2; i < screenCount; i++) - { - if(mControlScreenIndex == i) - mPreviousScreenIndexes.append(1); - else - mPreviousScreenIndexes.append(i); - } + for(int i = 2; i < screenCount; i++) + { + if(mControlScreenIndex == i) + mPreviousScreenIndexes.append(1); + else + mPreviousScreenIndexes.append(i); + } } } diff --git a/src/core/UBDisplayManager.h b/src/core/UBDisplayManager.h index 2ce27459..9f5283a9 100644 --- a/src/core/UBDisplayManager.h +++ b/src/core/UBDisplayManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBDocumentManager.cpp b/src/core/UBDocumentManager.cpp index b7566eed..bfaa2368 100644 --- a/src/core/UBDocumentManager.cpp +++ b/src/core/UBDocumentManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBDocumentManager.h b/src/core/UBDocumentManager.h index 99e1fb23..d20baae0 100644 --- a/src/core/UBDocumentManager.h +++ b/src/core/UBDocumentManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBDownloadManager.cpp b/src/core/UBDownloadManager.cpp index cb3f8735..d631917e 100644 --- a/src/core/UBDownloadManager.cpp +++ b/src/core/UBDownloadManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBDownloadManager.h b/src/core/UBDownloadManager.h index f4992ce7..77afad84 100644 --- a/src/core/UBDownloadManager.h +++ b/src/core/UBDownloadManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBDownloadThread.cpp b/src/core/UBDownloadThread.cpp index 0dabd5dd..48e158bf 100644 --- a/src/core/UBDownloadThread.cpp +++ b/src/core/UBDownloadThread.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBDownloadThread.h b/src/core/UBDownloadThread.h index 301ace12..a9b38630 100644 --- a/src/core/UBDownloadThread.h +++ b/src/core/UBDownloadThread.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBIdleTimer.cpp b/src/core/UBIdleTimer.cpp index 223db330..cc214d4c 100644 --- a/src/core/UBIdleTimer.cpp +++ b/src/core/UBIdleTimer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBIdleTimer.h b/src/core/UBIdleTimer.h index 7916cf96..e0963f68 100644 --- a/src/core/UBIdleTimer.h +++ b/src/core/UBIdleTimer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBMimeData.cpp b/src/core/UBMimeData.cpp index 3d0da1e7..42a835fc 100644 --- a/src/core/UBMimeData.cpp +++ b/src/core/UBMimeData.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBMimeData.h b/src/core/UBMimeData.h index efb2b4f6..2e01d32f 100644 --- a/src/core/UBMimeData.h +++ b/src/core/UBMimeData.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBPersistenceManager.cpp b/src/core/UBPersistenceManager.cpp index 156709b9..9001d17d 100644 --- a/src/core/UBPersistenceManager.cpp +++ b/src/core/UBPersistenceManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBPersistenceManager.h b/src/core/UBPersistenceManager.h index 3d840ff1..a8e17bff 100644 --- a/src/core/UBPersistenceManager.h +++ b/src/core/UBPersistenceManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp index 84b4b369..b10e85cc 100644 --- a/src/core/UBPreferencesController.cpp +++ b/src/core/UBPreferencesController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBPreferencesController.h b/src/core/UBPreferencesController.h index 23656086..3ba0ae96 100644 --- a/src/core/UBPreferencesController.h +++ b/src/core/UBPreferencesController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBSceneCache.cpp b/src/core/UBSceneCache.cpp index 67593360..bb2f2189 100644 --- a/src/core/UBSceneCache.cpp +++ b/src/core/UBSceneCache.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBSceneCache.h b/src/core/UBSceneCache.h index 561982b7..116a0bfd 100644 --- a/src/core/UBSceneCache.h +++ b/src/core/UBSceneCache.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBSetting.cpp b/src/core/UBSetting.cpp index 08242dc8..23f12fee 100644 --- a/src/core/UBSetting.cpp +++ b/src/core/UBSetting.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBSetting.h b/src/core/UBSetting.h index c8cc4054..0c545157 100644 --- a/src/core/UBSetting.h +++ b/src/core/UBSetting.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 00d005a7..73ba20a5 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -70,7 +70,7 @@ QString UBSettings::uniboardApplicationNamespaceUri = "http://uniboard.mnemis.co const int UBSettings::sDefaultFontPixelSize = 36; const char *UBSettings::sDefaultFontFamily = "Arial"; -QString UBSettings::currentFileVersion = "4.6.0"; +QString UBSettings::currentFileVersion = "4.8.0"; QColor UBSettings::crossDarkBackground = QColor(44, 44, 44, 200); QColor UBSettings::crossLightBackground = QColor(165, 225, 255); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index 745d2970..74e89691 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/main.cpp b/src/core/main.cpp index 20e3402d..af7c60e1 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/core/memcheck.h b/src/core/memcheck.h index 5a4ac095..2c90405e 100644 --- a/src/core/memcheck.h +++ b/src/core/memcheck.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/customWidgets/UBActionableWidget.cpp b/src/customWidgets/UBActionableWidget.cpp index 8ec8043b..ba334aca 100644 --- a/src/customWidgets/UBActionableWidget.cpp +++ b/src/customWidgets/UBActionableWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/customWidgets/UBActionableWidget.h b/src/customWidgets/UBActionableWidget.h index 44f16561..cdc8e767 100644 --- a/src/customWidgets/UBActionableWidget.h +++ b/src/customWidgets/UBActionableWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/customWidgets/UBMediaWidget.cpp b/src/customWidgets/UBMediaWidget.cpp index 221ce6a8..fc57d6ed 100644 --- a/src/customWidgets/UBMediaWidget.cpp +++ b/src/customWidgets/UBMediaWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/customWidgets/UBMediaWidget.h b/src/customWidgets/UBMediaWidget.h index ea524c67..973b9226 100644 --- a/src/customWidgets/UBMediaWidget.h +++ b/src/customWidgets/UBMediaWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBCustomCaptureWindow.cpp b/src/desktop/UBCustomCaptureWindow.cpp index bb0606a5..7c5cbd2f 100644 --- a/src/desktop/UBCustomCaptureWindow.cpp +++ b/src/desktop/UBCustomCaptureWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBCustomCaptureWindow.h b/src/desktop/UBCustomCaptureWindow.h index a53d14d3..65703593 100644 --- a/src/desktop/UBCustomCaptureWindow.h +++ b/src/desktop/UBCustomCaptureWindow.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBDesktopAnnotationController.cpp b/src/desktop/UBDesktopAnnotationController.cpp index 82ff1440..64e49223 100644 --- a/src/desktop/UBDesktopAnnotationController.cpp +++ b/src/desktop/UBDesktopAnnotationController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBDesktopAnnotationController.h b/src/desktop/UBDesktopAnnotationController.h index 02f345de..bb2c8b1d 100644 --- a/src/desktop/UBDesktopAnnotationController.h +++ b/src/desktop/UBDesktopAnnotationController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBDesktopPalette.cpp b/src/desktop/UBDesktopPalette.cpp index e1e68fd8..4a531322 100644 --- a/src/desktop/UBDesktopPalette.cpp +++ b/src/desktop/UBDesktopPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBDesktopPalette.h b/src/desktop/UBDesktopPalette.h index 321bbfc7..0d9bb593 100644 --- a/src/desktop/UBDesktopPalette.h +++ b/src/desktop/UBDesktopPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBDesktopPropertyPalette.cpp b/src/desktop/UBDesktopPropertyPalette.cpp index 436f6ab9..f5d88bc8 100644 --- a/src/desktop/UBDesktopPropertyPalette.cpp +++ b/src/desktop/UBDesktopPropertyPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBDesktopPropertyPalette.h b/src/desktop/UBDesktopPropertyPalette.h index 9acd05f7..dc3c7963 100644 --- a/src/desktop/UBDesktopPropertyPalette.h +++ b/src/desktop/UBDesktopPropertyPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBWindowCapture.h b/src/desktop/UBWindowCapture.h index 9adc3735..77375042 100644 --- a/src/desktop/UBWindowCapture.h +++ b/src/desktop/UBWindowCapture.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBWindowCaptureDelegate_win.cpp b/src/desktop/UBWindowCaptureDelegate_win.cpp index b93c193a..1b63803a 100644 --- a/src/desktop/UBWindowCaptureDelegate_win.cpp +++ b/src/desktop/UBWindowCaptureDelegate_win.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBWindowCaptureDelegate_win.h b/src/desktop/UBWindowCaptureDelegate_win.h index f6b104bd..081e1e68 100644 --- a/src/desktop/UBWindowCaptureDelegate_win.h +++ b/src/desktop/UBWindowCaptureDelegate_win.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBWindowCapture_linux.cpp b/src/desktop/UBWindowCapture_linux.cpp index 3e099850..e7c22c63 100644 --- a/src/desktop/UBWindowCapture_linux.cpp +++ b/src/desktop/UBWindowCapture_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBWindowCapture_mac.mm b/src/desktop/UBWindowCapture_mac.mm index 62a60b40..4d0b802a 100644 --- a/src/desktop/UBWindowCapture_mac.mm +++ b/src/desktop/UBWindowCapture_mac.mm @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/desktop/UBWindowCapture_win.cpp b/src/desktop/UBWindowCapture_win.cpp index 526b3d96..4394698a 100644 --- a/src/desktop/UBWindowCapture_win.cpp +++ b/src/desktop/UBWindowCapture_win.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/document/UBDocumentContainer.cpp b/src/document/UBDocumentContainer.cpp index cb92fb67..b2ba4664 100644 --- a/src/document/UBDocumentContainer.cpp +++ b/src/document/UBDocumentContainer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/document/UBDocumentContainer.h b/src/document/UBDocumentContainer.h index d2b7b045..681fdae3 100644 --- a/src/document/UBDocumentContainer.h +++ b/src/document/UBDocumentContainer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/document/UBDocumentController.cpp b/src/document/UBDocumentController.cpp index d06c11cc..d24282a4 100644 --- a/src/document/UBDocumentController.cpp +++ b/src/document/UBDocumentController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -1412,7 +1412,7 @@ bool UBDocumentController::isOKToOpenDocument(UBDocumentProxy* proxy) if (docVersion.isEmpty() || docVersion.startsWith("4.1") || docVersion.startsWith("4.2") || docVersion.startsWith("4.3") || docVersion.startsWith("4.4") || docVersion.startsWith("4.5") - || docVersion.startsWith("4.6")) // TODO UB 4.7 update if necessary + || docVersion.startsWith("4.6") || docVersion.startsWith("4.8")) // TODO UB 4.7 update if necessary { return true; } diff --git a/src/document/UBDocumentController.h b/src/document/UBDocumentController.h index a77c05e6..75608f41 100644 --- a/src/document/UBDocumentController.h +++ b/src/document/UBDocumentController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/document/UBDocumentProxy.cpp b/src/document/UBDocumentProxy.cpp index 707cc1e5..05360dd7 100644 --- a/src/document/UBDocumentProxy.cpp +++ b/src/document/UBDocumentProxy.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/document/UBDocumentProxy.h b/src/document/UBDocumentProxy.h index dd55fdb4..43adc634 100644 --- a/src/document/UBDocumentProxy.h +++ b/src/document/UBDocumentProxy.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBAbstractUndoCommand.cpp b/src/domain/UBAbstractUndoCommand.cpp index f1ecd8aa..54083211 100644 --- a/src/domain/UBAbstractUndoCommand.cpp +++ b/src/domain/UBAbstractUndoCommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBAbstractUndoCommand.h b/src/domain/UBAbstractUndoCommand.h index 95133cf4..15c25ae3 100644 --- a/src/domain/UBAbstractUndoCommand.h +++ b/src/domain/UBAbstractUndoCommand.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBDocumentUndoCommand.cpp b/src/domain/UBDocumentUndoCommand.cpp index 75376836..880afcd6 100644 --- a/src/domain/UBDocumentUndoCommand.cpp +++ b/src/domain/UBDocumentUndoCommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBDocumentUndoCommand.h b/src/domain/UBDocumentUndoCommand.h index a393d015..a839b153 100644 --- a/src/domain/UBDocumentUndoCommand.h +++ b/src/domain/UBDocumentUndoCommand.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsDelegateFrame.cpp b/src/domain/UBGraphicsDelegateFrame.cpp index dddc56b4..9305d018 100644 --- a/src/domain/UBGraphicsDelegateFrame.cpp +++ b/src/domain/UBGraphicsDelegateFrame.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsDelegateFrame.h b/src/domain/UBGraphicsDelegateFrame.h index 0afcfa65..296846aa 100644 --- a/src/domain/UBGraphicsDelegateFrame.h +++ b/src/domain/UBGraphicsDelegateFrame.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -39,8 +39,7 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject UBGraphicsDelegateFrame(UBGraphicsItemDelegate* pDelegate, QRectF pRect, qreal pFrameWidth, bool respectRatio = true); virtual ~UBGraphicsDelegateFrame(); - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget); + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget); QPainterPath shape() const; @@ -54,7 +53,7 @@ class UBGraphicsDelegateFrame: public QGraphicsRectItem, public QObject void positionHandles(); void setVisible(bool visible); - virtual void setAntiScale(qreal pAntiScale); + virtual void setAntiScale(qreal pAntiScale); enum OperationMode {Scaling, Resizing, ResizingHorizontally}; void setOperationMode(OperationMode pMode) {mOperationMode = pMode;} diff --git a/src/domain/UBGraphicsGroupContainerItem.cpp b/src/domain/UBGraphicsGroupContainerItem.cpp index 9d72432a..8d55177c 100644 --- a/src/domain/UBGraphicsGroupContainerItem.cpp +++ b/src/domain/UBGraphicsGroupContainerItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsGroupContainerItem.h b/src/domain/UBGraphicsGroupContainerItem.h index ef92b253..0912b85d 100644 --- a/src/domain/UBGraphicsGroupContainerItem.h +++ b/src/domain/UBGraphicsGroupContainerItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp index 4f533b9b..b0922814 100644 --- a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp +++ b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsGroupContainerItemDelegate.h b/src/domain/UBGraphicsGroupContainerItemDelegate.h index 00523236..2494ee8d 100644 --- a/src/domain/UBGraphicsGroupContainerItemDelegate.h +++ b/src/domain/UBGraphicsGroupContainerItemDelegate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsItemDelegate.cpp b/src/domain/UBGraphicsItemDelegate.cpp index a6a93f12..a52f868c 100644 --- a/src/domain/UBGraphicsItemDelegate.cpp +++ b/src/domain/UBGraphicsItemDelegate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -56,6 +56,7 @@ #include "core/memcheck.h" +class UBGraphicsParaschoolEditorWidgetItem; DelegateButton::DelegateButton(const QString & fileName, QGraphicsItem* pDelegated, QGraphicsItem * parent, Qt::WindowFrameSection section) : QGraphicsSvgItem(fileName, parent) @@ -234,6 +235,8 @@ UBGraphicsItemDelegate::~UBGraphicsItemDelegate() // the mMimeData is owned by QDrag since the setMimeData call as specified in the documentation } + + QVariant UBGraphicsItemDelegate::itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) { if (change == QGraphicsItem::ItemSelectedHasChanged) { @@ -284,8 +287,6 @@ bool UBGraphicsItemDelegate::mousePressEvent(QGraphicsSceneMouseEvent *event) { mDragStartPosition = event->pos(); - mMoved = false; - startUndoStep(); if (!delegated()->isSelected()) @@ -315,7 +316,6 @@ bool UBGraphicsItemDelegate::mouseMoveEvent(QGraphicsSceneMouseEvent *event) } mDrag->exec(); mDragPixmap = QPixmap(); - mMoved = true; return true; } return false; @@ -359,17 +359,13 @@ bool UBGraphicsItemDelegate::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void UBGraphicsItemDelegate::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { Q_UNUSED(event) -// if (!mDelegated->isSelected()) { -// setZOrderButtonsVisible(true); -// } + } void UBGraphicsItemDelegate::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { Q_UNUSED(event) -// if (!mDelegated->isSelected()) { -// setZOrderButtonsVisible(false); -// } + } QGraphicsItem *UBGraphicsItemDelegate::delegated() @@ -407,7 +403,9 @@ void UBGraphicsItemDelegate::positionHandles() foreach(DelegateButton* button, mButtons) button->hide(); - mFrame->hide(); + if(mFrame) + mFrame->hide(); + if (mToolBarItem) mToolBarItem->hide(); } @@ -446,15 +444,15 @@ void UBGraphicsItemDelegate::remove(bool canUndo) if (mFrame && !mFrame->scene() && mDelegated->scene()) { mDelegated->scene()->addItem(mFrame); - } - mFrame->setAntiScale(mAntiScaleRatio); - mFrame->positionHandles(); - updateButtons(true); + mFrame->setAntiScale(mAntiScaleRatio); + mFrame->positionHandles(); + updateButtons(true); - foreach(DelegateButton* button, mButtons) { - scene->removeItem(button); + foreach(DelegateButton* button, mButtons) { + scene->removeItem(button); + } + scene->removeItem(mFrame); } - scene->removeItem(mFrame); /* this is performed because when removing delegated from scene while it contains flash content, segfault happens because of QGraphicsScene::removeItem() */ UBGraphicsWidgetItem *mDelegated_casted = dynamic_cast(mDelegated); @@ -692,9 +690,7 @@ bool UBGraphicsItemDelegate::isFlippable() void UBGraphicsItemDelegate::updateFrame() { if (mFrame && !mFrame->scene() && mDelegated->scene()) - { mDelegated->scene()->addItem(mFrame); - } mFrame->setAntiScale(mAntiScaleRatio); mFrame->positionHandles(); @@ -722,7 +718,7 @@ void UBGraphicsItemDelegate::updateButtons(bool showUpdated) mDelegated->scene()->addItem(mDeleteButton); } - if (showUpdated) + if (showUpdated /*&& mFrame->isResizing()*/) mDeleteButton->show(); int i = 1, j = 0, k = 0; @@ -773,6 +769,7 @@ UBGraphicsToolBarItem::UBGraphicsToolBarItem(QGraphicsItem * parent) : rect.setWidth(parent->boundingRect().width()); this->setRect(rect); + // setBrush(QColor(UBSettings::paletteColor)); setPen(Qt::NoPen); hide(); @@ -813,29 +810,25 @@ MediaTimer::MediaTimer(QGraphicsItem * parent): QGraphicsRectItem(parent) { val = 0; smallPoint = false; - setNumDigits(6); + setNumDigits(4); } MediaTimer::~MediaTimer() {} -void MediaTimer::positionHandles() -{ - digitSpace = smallPoint ? 2 : 1; - ySegLen = rect().height()*5/12; - xSegLen = ySegLen*2/3; - segLen = xSegLen; - xAdvance = segLen*(5 + digitSpace)/5; - xOffset = (rect().width() - ndigits*xAdvance + segLen/5)/2; - yOffset = rect().height() - ySegLen*2; - - setRect(rect().x(), rect().y(), xOffset + xAdvance*ndigits, rect().height()); -} - void MediaTimer::drawString(const QString &s, QPainter &p, QBitArray *newPoints, bool newString) { QPoint pos; + + int digitSpace = smallPoint ? 2 : 1; + int xSegLen = (rect().width()/1)*5/(ndigits*(5 + digitSpace) + digitSpace); + int ySegLen = rect().height()*5/12; + int segLen = ySegLen > xSegLen ? xSegLen : ySegLen; + int xAdvance = segLen*(5 + digitSpace)/5; + int xOffset = rect().x() + (rect().width()/1 - ndigits*xAdvance + segLen/5)/2; + int yOffset = (rect().height() - segLen*2)/2; + for (int i=0; ifont(); + f.setPointSizeF(f.pointSizeF()); + p->setFont(f); + if (smallPoint) drawString(digitStr, *p, &points, false); else @@ -1165,7 +1162,7 @@ void MediaTimer::setNumDigits(int numDigits) numDigits = 0; } if (digitStr.isNull()) { // from constructor - ndigits = numDigits + numDigits/2 - 1; + ndigits = numDigits; digitStr.fill(QLatin1Char(' '), ndigits); points.fill(0, ndigits); digitStr[ndigits - 1] = QLatin1Char('0'); // "0" is the default number @@ -1195,7 +1192,6 @@ void MediaTimer::setNumDigits(int numDigits) ndigits = numDigits; update(); } - positionHandles(); } DelegateMediaControl::DelegateMediaControl(UBGraphicsMediaItem* pDelegated, QGraphicsItem * parent) @@ -1226,6 +1222,13 @@ void DelegateMediaControl::paint(QPainter *painter, QPainterPath path; + mLCDTimerArea.setHeight(rect().height()); + mLCDTimerArea.setWidth(rect().height()); + + mSeecArea.setWidth(rect().width()-mLCDTimerArea.width()-2); + mSeecArea.setHeight(rect().height()-2*mSeecAreaBorderHeight); + mSeecArea.setY(mSeecAreaBorderHeight); + path.addRoundedRect(mSeecArea, mSeecArea.height()/2, mSeecArea.height()/2); painter->fillPath(path, brush()); @@ -1255,59 +1258,28 @@ QPainterPath DelegateMediaControl::shape() const void DelegateMediaControl::positionHandles() { - QRectF selfRect = rect(); - selfRect.setHeight(parentItem()->boundingRect().height()); - setRect(selfRect); - - QTime tTotal; - tTotal = tTotal.addMSecs(mTotalTimeInMs); - + mLCDTimerArea.setWidth(parentItem()->boundingRect().height()); mLCDTimerArea.setHeight(parentItem()->boundingRect().height()); - - int digitsCount = 2; - int timerWidth = mLCDTimerArea.height(); - - mDisplayFormat = "ss"; - - if (tTotal.minute() > 0) - { - mDisplayFormat = "mm:" + mDisplayFormat; - digitsCount += 3; - timerWidth += mLCDTimerArea.height()*0.5; - } - - if (tTotal.hour() > 0) - { - mDisplayFormat = "hh:" + mDisplayFormat; - digitsCount += 3; - timerWidth += mLCDTimerArea.height(); - } - - lcdTimer->setNumDigits(digitsCount); - - mLCDTimerArea.setWidth(timerWidth); - lcdTimer->setRect(mLCDTimerArea); - - // not the best solution, but it works. - lcdTimer->positionHandles(); - mLCDTimerArea = lcdTimer->rect(); - // ------------------------------------- - - lcdTimer->setPos(rect().width() - mLCDTimerArea.width(), 0); + lcdTimer->setPos(mSeecArea.width()-mLCDTimerArea.width(),0); mSeecAreaBorderHeight = rect().height()/20; mSeecArea.setWidth(rect().width()-mLCDTimerArea.width()-2); mSeecArea.setHeight(rect().height()-2*mSeecAreaBorderHeight); mSeecArea.setY(mSeecAreaBorderHeight); + + QRectF selfRect = rect(); + selfRect.setHeight(parentItem()->boundingRect().height()); + setRect(selfRect); + + lcdTimer->setPos(rect().width() - mLCDTimerArea.width(), 0); } void DelegateMediaControl::update() { - QTime tCurrent; - tCurrent = tCurrent.addMSecs(mCurrentTimeInMs < 0 ? 0 : mCurrentTimeInMs); - - lcdTimer->display(tCurrent.toString(mDisplayFormat)); + QTime t; + t = t.addMSecs(mCurrentTimeInMs < 0 ? 0 : mCurrentTimeInMs); + lcdTimer->display(t.toString("m:ss")); QGraphicsRectItem::update(); } @@ -1321,12 +1293,8 @@ void DelegateMediaControl::updateTicker(qint64 time ) void DelegateMediaControl::totalTimeChanged(qint64 newTotalTime) { - if (mTotalTimeInMs != newTotalTime) - { - mTotalTimeInMs = newTotalTime; - positionHandles(); - update(); - } + mTotalTimeInMs = newTotalTime; + update(); } @@ -1363,7 +1331,7 @@ void DelegateMediaControl::seekToMousePos(QPointF mousePos) qreal frameWidth = rect().height() / 2; minX = frameWidth; - length = mSeecArea.width() - mSeecArea.height(); + length = mSeecArea.width() - lcdTimer->rect().width(); qreal mouseX = mousePos.x(); if (mouseX >= (mSeecArea.width() - mSeecArea.height()/2)) diff --git a/src/domain/UBGraphicsItemDelegate.h b/src/domain/UBGraphicsItemDelegate.h index 2d3acab1..a3f0f24d 100644 --- a/src/domain/UBGraphicsItemDelegate.h +++ b/src/domain/UBGraphicsItemDelegate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -256,7 +256,7 @@ class UBGraphicsItemDelegate : public QObject void startUndoStep(); void commitUndoStep(); - UBGraphicsDelegateFrame* frame() { return mFrame; } + UBGraphicsDelegateFrame* frame() {return mFrame;} bool canRotate() const { return mCanRotate; } bool isLocked() const; diff --git a/src/domain/UBGraphicsItemGroupUndoCommand.cpp b/src/domain/UBGraphicsItemGroupUndoCommand.cpp index d640359b..25a3ebed 100644 --- a/src/domain/UBGraphicsItemGroupUndoCommand.cpp +++ b/src/domain/UBGraphicsItemGroupUndoCommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsItemGroupUndoCommand.h b/src/domain/UBGraphicsItemGroupUndoCommand.h index 0f7ff1e5..981ebb33 100644 --- a/src/domain/UBGraphicsItemGroupUndoCommand.h +++ b/src/domain/UBGraphicsItemGroupUndoCommand.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsItemTransformUndoCommand.cpp b/src/domain/UBGraphicsItemTransformUndoCommand.cpp index dd6a5fed..a40d9919 100644 --- a/src/domain/UBGraphicsItemTransformUndoCommand.cpp +++ b/src/domain/UBGraphicsItemTransformUndoCommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsItemTransformUndoCommand.h b/src/domain/UBGraphicsItemTransformUndoCommand.h index ab68c90e..aa586ec2 100644 --- a/src/domain/UBGraphicsItemTransformUndoCommand.h +++ b/src/domain/UBGraphicsItemTransformUndoCommand.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsItemUndoCommand.cpp b/src/domain/UBGraphicsItemUndoCommand.cpp index 1b70b76c..1fb1bd3d 100644 --- a/src/domain/UBGraphicsItemUndoCommand.cpp +++ b/src/domain/UBGraphicsItemUndoCommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsItemUndoCommand.h b/src/domain/UBGraphicsItemUndoCommand.h index 72404a68..f349938f 100644 --- a/src/domain/UBGraphicsItemUndoCommand.h +++ b/src/domain/UBGraphicsItemUndoCommand.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsMediaItem.cpp b/src/domain/UBGraphicsMediaItem.cpp index 87356f38..be0c7112 100644 --- a/src/domain/UBGraphicsMediaItem.cpp +++ b/src/domain/UBGraphicsMediaItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsMediaItem.h b/src/domain/UBGraphicsMediaItem.h index 880725bc..b512beb2 100644 --- a/src/domain/UBGraphicsMediaItem.h +++ b/src/domain/UBGraphicsMediaItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsMediaItemDelegate.cpp b/src/domain/UBGraphicsMediaItemDelegate.cpp index 17a14152..4d36e134 100644 --- a/src/domain/UBGraphicsMediaItemDelegate.cpp +++ b/src/domain/UBGraphicsMediaItemDelegate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsMediaItemDelegate.h b/src/domain/UBGraphicsMediaItemDelegate.h index ad04e168..9ac65c93 100644 --- a/src/domain/UBGraphicsMediaItemDelegate.h +++ b/src/domain/UBGraphicsMediaItemDelegate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsPDFItem.cpp b/src/domain/UBGraphicsPDFItem.cpp index 09379e98..0acc8abe 100644 --- a/src/domain/UBGraphicsPDFItem.cpp +++ b/src/domain/UBGraphicsPDFItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsPDFItem.h b/src/domain/UBGraphicsPDFItem.h index 0a49bf29..9a1a42da 100644 --- a/src/domain/UBGraphicsPDFItem.h +++ b/src/domain/UBGraphicsPDFItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsPixmapItem.cpp b/src/domain/UBGraphicsPixmapItem.cpp index e46149a5..69e28e7e 100644 --- a/src/domain/UBGraphicsPixmapItem.cpp +++ b/src/domain/UBGraphicsPixmapItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsPixmapItem.h b/src/domain/UBGraphicsPixmapItem.h index 1c66bebb..3ef6b846 100644 --- a/src/domain/UBGraphicsPixmapItem.h +++ b/src/domain/UBGraphicsPixmapItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsPolygonItem.cpp b/src/domain/UBGraphicsPolygonItem.cpp index f4b761a8..52b09954 100644 --- a/src/domain/UBGraphicsPolygonItem.cpp +++ b/src/domain/UBGraphicsPolygonItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -65,6 +65,18 @@ UBGraphicsPolygonItem::UBGraphicsPolygonItem (const QLineF& pLine, qreal pWidth) initialize(); } +UBGraphicsPolygonItem::UBGraphicsPolygonItem (const QLineF& pLine, qreal pStartWidth, qreal pEndWidth) + : QGraphicsPolygonItem(UBGeometryUtils::lineToPolygon(pLine, pStartWidth, pEndWidth)) + , mOriginalLine(pLine) + , mOriginalWidth(pEndWidth) + , mIsNominalLine(true) + , mStroke(0) +{ + // NOOP + initialize(); +} + + void UBGraphicsPolygonItem::initialize() { setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::DrawingItem)); //Necessary to set if we want z value to be assigned correctly @@ -157,11 +169,11 @@ QColor UBGraphicsPolygonItem::color() const UBItem* UBGraphicsPolygonItem::deepCopy() const -{ +{ UBGraphicsPolygonItem* copy = new UBGraphicsPolygonItem(polygon(), 0); UBGraphicsStroke *stroke = new UBGraphicsStroke(); - + copyItemParameters(copy); copy->setStroke(stroke); @@ -186,7 +198,6 @@ void UBGraphicsPolygonItem::copyItemParameters(UBItem *copy) const cp->setColorOnDarkBackground(this->colorOnDarkBackground()); cp->setColorOnLightBackground(this->colorOnLightBackground()); - //cp->setTransform(transform()); cp->setData(UBGraphicsItemData::ItemLayerType, this->data(UBGraphicsItemData::ItemLayerType)); } @@ -195,9 +206,9 @@ void UBGraphicsPolygonItem::copyItemParameters(UBItem *copy) const void UBGraphicsPolygonItem::paint ( QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget) { if(mHasAlpha && scene() && scene()->isLightBackground()) - { painter->setCompositionMode(QPainter::CompositionMode_Darken); - } + + painter->setRenderHints(QPainter::Antialiasing); QGraphicsPolygonItem::paint(painter, option, widget); } @@ -209,10 +220,6 @@ QPainterPath UBGraphicsPolygonItem::shape() const path.addRect(boundingRect()); return path; - -// static QPainterPath shapePath = QGraphicsPolygonItem::shape(); - -// return shapePath; } diff --git a/src/domain/UBGraphicsPolygonItem.h b/src/domain/UBGraphicsPolygonItem.h index d93ac1e0..78c973b8 100644 --- a/src/domain/UBGraphicsPolygonItem.h +++ b/src/domain/UBGraphicsPolygonItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -42,6 +42,7 @@ class UBGraphicsPolygonItem : public QGraphicsPolygonItem, public UBItem UBGraphicsPolygonItem(QGraphicsItem * parent = 0 ); UBGraphicsPolygonItem(const QLineF& line, qreal pWidth); + UBGraphicsPolygonItem(const QLineF& pLine, qreal pStartWidth, qreal pEndWidth); UBGraphicsPolygonItem(const QPolygonF & polygon, QGraphicsItem * parent = 0); ~UBGraphicsPolygonItem(); diff --git a/src/domain/UBGraphicsProxyWidget.cpp b/src/domain/UBGraphicsProxyWidget.cpp index 4bc4e331..250304ea 100644 --- a/src/domain/UBGraphicsProxyWidget.cpp +++ b/src/domain/UBGraphicsProxyWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsProxyWidget.h b/src/domain/UBGraphicsProxyWidget.h index af43ac7b..37c13d94 100644 --- a/src/domain/UBGraphicsProxyWidget.h +++ b/src/domain/UBGraphicsProxyWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsScene.cpp b/src/domain/UBGraphicsScene.cpp index 61330bf6..f9a68f0d 100644 --- a/src/domain/UBGraphicsScene.cpp +++ b/src/domain/UBGraphicsScene.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -286,6 +286,7 @@ UBGraphicsScene::UBGraphicsScene(UBDocumentProxy* parent, bool enableUndoRedoSta , magniferDisplayViewWidget(0) , mZLayerController(new UBZLayerController(this)) , mpLastPolygon(NULL) + , mCurrentPolygon(0) { UBCoreGraphicsScene::setObjectName("BoardScene"); #ifdef __ppc__ @@ -500,7 +501,7 @@ bool UBGraphicsScene::inputDeviceMove(const QPointF& scenePos, const qreal& pres mPreviousPoint.x() + radiusLength * cos((angle * PI) / 180), mPreviousPoint.y() - radiusLength * sin((angle * PI) / 180)); QLineF chord(position, newPosition); - if (chord.length() < qMin((int)16, (int)(radiusLength / 20))) + if (chord.length() < qMin((int)16, (int)(radiusLength / 20))) position = newPosition; } @@ -532,18 +533,6 @@ bool UBGraphicsScene::inputDeviceMove(const QPointF& scenePos, const qreal& pres bool UBGraphicsScene::inputDeviceRelease() { - /* - if (mMesure1Ms > 0 || mMesure2Ms > 0) - { - qWarning() << "---------------------------"; - qWarning() << "mMesure1Ms: " << mMesure1Ms; - qWarning() << "mMesure2Ms: " << mMesure2Ms; - - mMesure1Ms = 0; - mMesure2Ms = 0; - } - */ - bool accepted = false; if (mPointer) @@ -603,6 +592,7 @@ bool UBGraphicsScene::inputDeviceRelease() delete mCurrentStroke; mCurrentStroke = 0; } + mCurrentPolygon = 0; } } @@ -713,7 +703,9 @@ void UBGraphicsScene::drawLineTo(const QPointF &pEndPoint, const qreal &pWidth, if (mPreviousWidth == -1.0) mPreviousWidth = pWidth; - UBGraphicsPolygonItem *polygonItem = lineToPolygonItem(QLineF(mPreviousPoint, pEndPoint), pWidth); + // UBGraphicsPolygonItem *polygonItem = lineToPolygonItem(QLineF(mPreviousPoint, pEndPoint), pWidth); + + UBGraphicsPolygonItem *polygonItem = lineToPolygonItem(QLineF(mPreviousPoint, pEndPoint), mPreviousWidth,pWidth); if (!polygonItem->brush().isOpaque()) { @@ -727,6 +719,7 @@ void UBGraphicsScene::drawLineTo(const QPointF &pEndPoint, const qreal &pWidth, } } + if (bLineStyle) { QSetIterator itItems(mAddedItems); @@ -739,18 +732,39 @@ void UBGraphicsScene::drawLineTo(const QPointF &pEndPoint, const qreal &pWidth, mAddedItems.clear(); } - mpLastPolygon = polygonItem; - mAddedItems.insert(polygonItem); - - // Here we add the item to the scene - addItem(polygonItem); - if (!mCurrentStroke) mCurrentStroke = new UBGraphicsStroke(); - polygonItem->setStroke(mCurrentStroke); - mPreviousPolygonItems.append(polygonItem); + QPolygonF newPolygon = UBGeometryUtils::lineToPolygon(QLineF(mPreviousPoint, pEndPoint), mPreviousWidth, pWidth); + + if (!mCurrentPolygon) + { + mCurrentPolygon = new UBGraphicsPolygonItem(); + mCurrentPolygon->setPolygon(newPolygon); + initPolygonItem(mCurrentPolygon); + addItem(mCurrentPolygon); + mAddedItems.insert(mCurrentPolygon); + mCurrentPolygon->setStroke(mCurrentStroke); + mpLastPolygon = mCurrentPolygon; + } + + + //newPolygon = newPolygon.united(mCurrentPolygon->polygon()); + + QPainterPath strokePainterPath; + + + strokePainterPath.addPolygon(mCurrentPolygon->sceneTransform().map(mCurrentPolygon->polygon())); + + //QList + QPolygonF oldPolygons = strokePainterPath.simplified().toFillPolygon(mCurrentPolygon->sceneTransform().inverted()); + newPolygon = oldPolygons.united(newPolygon); + + mpLastPolygon = mCurrentPolygon; + + mCurrentPolygon->setPolygon(newPolygon); + if (!bLineStyle) { @@ -955,6 +969,16 @@ UBGraphicsPolygonItem* UBGraphicsScene::lineToPolygonItem(const QLineF &pLine, c return polygonItem; } + +UBGraphicsPolygonItem* UBGraphicsScene::lineToPolygonItem(const QLineF &pLine, const qreal &pStartWidth, const qreal &pEndWidth) +{ + UBGraphicsPolygonItem *polygonItem = new UBGraphicsPolygonItem(pLine, pStartWidth, pEndWidth); + + initPolygonItem(polygonItem); + + return polygonItem; +} + void UBGraphicsScene::initPolygonItem(UBGraphicsPolygonItem* polygonItem) { QColor colorOnDarkBG; @@ -1105,9 +1129,6 @@ void UBGraphicsScene::clearContent(clearCase pCase) case clearAnnotations : foreach(QGraphicsItem* item, items()) { - bool isGroup = item->type() == UBGraphicsGroupContainerItem::Type; - bool isStrokesGroup = item->type() == UBGraphicsStrokesGroup::Type; - UBGraphicsGroupContainerItem *itemGroup = item->parentItem() ? qgraphicsitem_cast(item->parentItem()) : 0; @@ -1116,6 +1137,9 @@ void UBGraphicsScene::clearContent(clearCase pCase) continue; } + bool isGroup = item->type() == UBGraphicsGroupContainerItem::Type; + bool isStrokesGroup = item->type() == UBGraphicsStrokesGroup::Type; + bool shouldDelete = false; switch (static_cast(pCase)) { case clearAnnotations : diff --git a/src/domain/UBGraphicsScene.h b/src/domain/UBGraphicsScene.h index 2f3d3624..2dc79fb7 100644 --- a/src/domain/UBGraphicsScene.h +++ b/src/domain/UBGraphicsScene.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -149,7 +149,7 @@ class UBGraphicsScene: public UBCoreGraphicsScene, public UBItem UBGraphicsW3CWidgetItem* addW3CWidget(const QUrl& pWidgetUrl, const QPointF& pPos = QPointF(0, 0)); void addGraphicsWidget(UBGraphicsWidgetItem* graphicsWidget, const QPointF& pPos = QPointF(0, 0)); - + UBGraphicsMediaItem* addMedia(const QUrl& pMediaFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0)); UBGraphicsMediaItem* addVideo(const QUrl& pVideoFileUrl, bool shouldPlayAsap, const QPointF& pPos = QPointF(0, 0)); @@ -320,10 +320,10 @@ public slots: void setDrawingMode(bool bModeDesktop); void deselectAllItems(); - UBGraphicsPixmapItem* addPixmap(const QPixmap& pPixmap, + UBGraphicsPixmapItem* addPixmap(const QPixmap& pPixmap, QGraphicsItem* replaceFor, - const QPointF& pPos = QPointF(0,0), - qreal scaleFactor = 1.0, + const QPointF& pPos = QPointF(0,0), + qreal scaleFactor = 1.0, bool pUseAnimation = false); void textUndoCommandAdded(UBGraphicsTextItem *textItem); @@ -346,6 +346,8 @@ public slots: protected: UBGraphicsPolygonItem* lineToPolygonItem(const QLineF& pLine, const qreal& pWidth); + UBGraphicsPolygonItem* lineToPolygonItem(const QLineF &pLine, const qreal &pStartWidth, const qreal &pEndWidth); + UBGraphicsPolygonItem* arcToPolygonItem(const QLineF& pStartRadius, qreal pSpanAngle, qreal pWidth); void initPolygonItem(UBGraphicsPolygonItem*); @@ -424,7 +426,7 @@ public slots: UBGraphicsPolygonItem* mpLastPolygon; bool mDrawWithCompass; - + UBGraphicsPolygonItem *mCurrentPolygon; }; diff --git a/src/domain/UBGraphicsStroke.cpp b/src/domain/UBGraphicsStroke.cpp index 130243f5..8cf92cbe 100644 --- a/src/domain/UBGraphicsStroke.cpp +++ b/src/domain/UBGraphicsStroke.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsStroke.h b/src/domain/UBGraphicsStroke.h index ed9c3168..6d246d76 100644 --- a/src/domain/UBGraphicsStroke.h +++ b/src/domain/UBGraphicsStroke.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsStrokesGroup.cpp b/src/domain/UBGraphicsStrokesGroup.cpp index b6169e6f..8ccf622b 100644 --- a/src/domain/UBGraphicsStrokesGroup.cpp +++ b/src/domain/UBGraphicsStrokesGroup.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -206,7 +206,7 @@ QPainterPath UBGraphicsStrokesGroup::shape () const foreach(QGraphicsItem* item, childItems()) { path.addPath(item->shape()); - } + } } return path; diff --git a/src/domain/UBGraphicsStrokesGroup.h b/src/domain/UBGraphicsStrokesGroup.h index 0009da13..846051df 100644 --- a/src/domain/UBGraphicsStrokesGroup.h +++ b/src/domain/UBGraphicsStrokesGroup.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsSvgItem.cpp b/src/domain/UBGraphicsSvgItem.cpp index 5b45b460..adfbac33 100644 --- a/src/domain/UBGraphicsSvgItem.cpp +++ b/src/domain/UBGraphicsSvgItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsSvgItem.h b/src/domain/UBGraphicsSvgItem.h index d4e319cc..ef805bd6 100644 --- a/src/domain/UBGraphicsSvgItem.h +++ b/src/domain/UBGraphicsSvgItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsTextItem.cpp b/src/domain/UBGraphicsTextItem.cpp index e5f4dc6d..a45b74bd 100644 --- a/src/domain/UBGraphicsTextItem.cpp +++ b/src/domain/UBGraphicsTextItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -55,12 +55,10 @@ UBGraphicsTextItem::UBGraphicsTextItem(QGraphicsItem * parent) : setData(UBGraphicsItemData::ItemLayerType, UBItemLayerType::Object); -// setData(UBGraphicsItemData::ItemEditable, QVariant(true)); setData(UBGraphicsItemData::itemLayerType, QVariant(itemLayerType::ObjectItem)); //Necessary to set if we want z value to be assigned correctly setFlag(QGraphicsItem::ItemIsSelectable, true); -// setFlag(QGraphicsItem::ItemIsMovable, true); setFlag(QGraphicsItem::ItemSendsGeometryChanges, true); setTextInteractionFlags(Qt::TextEditorInteraction); @@ -91,8 +89,8 @@ QVariant UBGraphicsTextItem::itemChange(GraphicsItemChange change, const QVarian void UBGraphicsTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { - // scene()->itemAt(pos) returns 0 if pos is not over text, but over text item, but mouse press comes. - // It is a cludge... + // scene()->itemAt(pos) returns 0 if pos is not over text, but over text item, but mouse press comes. + // It is a cludge... if (UBStylusTool::Play == UBDrawingController::drawingController()->stylusTool()) { event->accept(); @@ -110,13 +108,13 @@ void UBGraphicsTextItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { QGraphicsItem *curItem = group->getCurrentItem(); if (curItem && this != curItem) - { - group->deselectCurrentItem(); - } + { + group->deselectCurrentItem(); + } group->setCurrentItem(this); this->setSelected(true); Delegate()->positionHandles(); - } + } } else @@ -178,8 +176,8 @@ void UBGraphicsTextItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void UBGraphicsTextItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { - // scene()->itemAt(pos) returns 0 if pos is not over text, but over text item, but mouse press comes. - // It is a cludge... + // scene()->itemAt(pos) returns 0 if pos is not over text, but over text item, but mouse press comes. + // It is a cludge... if (UBStylusTool::Play == UBDrawingController::drawingController()->stylusTool()) { event->accept(); diff --git a/src/domain/UBGraphicsTextItem.h b/src/domain/UBGraphicsTextItem.h index 0eeaadb1..06d4133b 100644 --- a/src/domain/UBGraphicsTextItem.h +++ b/src/domain/UBGraphicsTextItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsTextItemDelegate.cpp b/src/domain/UBGraphicsTextItemDelegate.cpp index 8cd054d9..17b4dd28 100644 --- a/src/domain/UBGraphicsTextItemDelegate.cpp +++ b/src/domain/UBGraphicsTextItemDelegate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -87,14 +87,8 @@ QFont UBGraphicsTextItemDelegate::createDefaultFont() textFormat.setFontItalic(true); QFont font(fFamily, -1, bold ? QFont::Bold : -1, italic); -// int pixSize = UBSettings::settings()->fontPixelSize(); -// if (pixSize > 0) { -// mLastFontPixelSize = pixSize; -// font.setPixelSize(pixSize); -// } int pointSize = UBSettings::settings()->fontPointSize(); if (pointSize > 0) { -// mLastFontPixelSize = pointSize; font.setPointSize(pointSize); } @@ -227,8 +221,6 @@ void UBGraphicsTextItemDelegate::pickColor() { QColor selectedColor = colorDialog.selectedColor(); delegated()->setDefaultTextColor(selectedColor); -// delegated()->setColorOnDarkBackground(selectedColor); -// delegated()->setColorOnLightBackground(selectedColor); QTextCursor curCursor = delegated()->textCursor(); QTextCharFormat format; format.setForeground(QBrush(selectedColor)); @@ -257,6 +249,7 @@ UBGraphicsTextItem* UBGraphicsTextItemDelegate::delegated() { return static_cast(mDelegated); } + void UBGraphicsTextItemDelegate::setEditable(bool editable) { if (editable) { @@ -271,6 +264,7 @@ void UBGraphicsTextItemDelegate::setEditable(bool editable) mDelegated->setData(UBGraphicsItemData::ItemEditable, QVariant(false)); } } + void UBGraphicsTextItemDelegate::remove(bool canUndo) { UBGraphicsItemDelegate::remove(canUndo); @@ -280,6 +274,7 @@ bool UBGraphicsTextItemDelegate::isEditable() { return mDelegated->data(UBGraphicsItemData::ItemEditable).toBool(); } + void UBGraphicsTextItemDelegate::decorateMenu(QMenu *menu) { UBGraphicsItemDelegate::decorateMenu(menu); @@ -289,23 +284,25 @@ void UBGraphicsTextItemDelegate::decorateMenu(QMenu *menu) mEditableAction->setChecked(isEditable()); } + void UBGraphicsTextItemDelegate::updateMenuActionState() { UBGraphicsItemDelegate::updateMenuActionState(); } + void UBGraphicsTextItemDelegate::positionHandles() { UBGraphicsItemDelegate::positionHandles(); - if (mDelegated->isSelected() || (mDelegated->parentItem() && UBGraphicsGroupContainerItem::Type == mDelegated->parentItem()->type())) + if (mDelegated->isSelected() || (mDelegated->parentItem() && UBGraphicsGroupContainerItem::Type == mDelegated->parentItem()->type())) { if (mToolBarItem->isVisibleOnBoard()) { - qreal AntiScaleRatio = 1 / (UBApplication::boardController->systemScaleFactor() * UBApplication::boardController->currentZoom()); + qreal AntiScaleRatio = 1 / (UBApplication::boardController->systemScaleFactor() * UBApplication::boardController->currentZoom()); mToolBarItem->setScale(AntiScaleRatio); QRectF toolBarRect = mToolBarItem->rect(); toolBarRect.setWidth(delegated()->boundingRect().width()/AntiScaleRatio); - mToolBarItem->setRect(toolBarRect); + mToolBarItem->setRect(toolBarRect); mToolBarItem->positionHandles(); mToolBarItem->update(); if (mToolBarItem->isShifting()) @@ -374,9 +371,9 @@ void UBGraphicsTextItemDelegate::ChangeTextSize(qreal factor, textChangeMode cha // we search continuous blocks of the text with the same PointSize and allpy new settings for them. cursor.setPosition (startPos, QTextCursor::MoveAnchor); while(iCursorPos < endPos) - { + { bEndofTheSameBlock = false; - iBlockLen = 0; + iBlockLen = 0; cursor.setPosition (iCursorPos+1, QTextCursor::KeepAnchor); iPointSize = cursor.charFormat().font().pointSize(); diff --git a/src/domain/UBGraphicsTextItemDelegate.h b/src/domain/UBGraphicsTextItemDelegate.h index 44b718b3..8d62c278 100644 --- a/src/domain/UBGraphicsTextItemDelegate.h +++ b/src/domain/UBGraphicsTextItemDelegate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsTextItemUndoCommand.cpp b/src/domain/UBGraphicsTextItemUndoCommand.cpp index ef937def..879626b4 100644 --- a/src/domain/UBGraphicsTextItemUndoCommand.cpp +++ b/src/domain/UBGraphicsTextItemUndoCommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsTextItemUndoCommand.h b/src/domain/UBGraphicsTextItemUndoCommand.h index 5d736d1f..5b1d8c53 100644 --- a/src/domain/UBGraphicsTextItemUndoCommand.h +++ b/src/domain/UBGraphicsTextItemUndoCommand.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsVideoItemDelegate.cpp b/src/domain/UBGraphicsVideoItemDelegate.cpp deleted file mode 100644 index fc7ee6ba..00000000 --- a/src/domain/UBGraphicsVideoItemDelegate.cpp +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (C) 2012 Webdoc SA - * - * This file is part of Open-Sankoré. - * - * Open-Sankoré is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License, - * with a specific linking exception for the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the - * same license as the "OpenSSL" library). - * - * Open-Sankoré is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Open-Sankoré. If not, see . - */ - - diff --git a/src/domain/UBGraphicsVideoItemDelegate.h b/src/domain/UBGraphicsVideoItemDelegate.h deleted file mode 100644 index 29ffd4f5..00000000 --- a/src/domain/UBGraphicsVideoItemDelegate.h +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright (C) 2012 Webdoc SA - * - * This file is part of Open-Sankoré. - * - * Open-Sankoré is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License, - * with a specific linking exception for the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the - * same license as the "OpenSSL" library). - * - * Open-Sankoré is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Open-Sankoré. If not, see . - */ - - - -#ifndef UBGRAPHICSVIDEOITEMDELEGATE_H_ -#define UBGRAPHICSVIDEOITEMDELEGATE_H_ - -#include -#include - -#include "core/UB.h" -#include "UBGraphicsItemDelegate.h" - -class QGraphicsSceneMouseEvent; -class QGraphicsItem; -class UBGraphicsVideoItem; - -class DelegateVideoControl: public QGraphicsRectItem -{ - public: - - DelegateVideoControl(UBGraphicsVideoItem* pDelegated, QGraphicsItem * parent = 0); - - virtual ~DelegateVideoControl() - { - // NOOP - } - - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, - QWidget *widget); - - QPainterPath shape() const; - - void setAntiScale(qreal antiScale){ mAntiScale = antiScale; } - - virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); - - void updateTicker(qint64 time); - void totalTimeChanged( qint64 newTotalTime); - - protected: - - - void seekToMousePos(QPointF mousePos); - - UBGraphicsVideoItem* mDelegate; - bool mDisplayCurrentTime; - - qreal mAntiScale; - qint64 mCurrentTimeInMs; - qint64 mTotalTimeInMs; - - private: - int mStartWidth; - QRectF mBalloon; -}; - - -class UBGraphicsVideoItemDelegate : public UBGraphicsItemDelegate -{ - Q_OBJECT - - public: - UBGraphicsVideoItemDelegate(UBGraphicsVideoItem* pDelegated, Phonon::MediaObject* pMedia, QObject * parent = 0); - virtual ~UBGraphicsVideoItemDelegate(); - - virtual void positionHandles(); - - public slots: - - void toggleMute(); - void updateTicker(qint64 time); - - protected slots: - - virtual void remove(bool canUndo = true); - - void togglePlayPause(); - - void mediaStateChanged ( Phonon::State newstate, Phonon::State oldstate ); - - void updatePlayPauseState(); - - void totalTimeChanged( qint64 newTotalTime); - - protected: - - virtual void buildButtons(); - - private: - - UBGraphicsVideoItem* delegated(); - - DelegateButton* mPlayPauseButton; - DelegateButton* mStopButton; - DelegateButton* mMuteButton; - DelegateVideoControl *mVideoControl; - - Phonon::MediaObject* mMedia; -}; - - -#endif /* UBGRAPHICSVIDEOITEMDELEGATE_H_ */ diff --git a/src/domain/UBGraphicsWidgetItem.cpp b/src/domain/UBGraphicsWidgetItem.cpp index 62e5b891..2f30d47b 100644 --- a/src/domain/UBGraphicsWidgetItem.cpp +++ b/src/domain/UBGraphicsWidgetItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsWidgetItem.h b/src/domain/UBGraphicsWidgetItem.h index eaf28f76..65da2bd7 100644 --- a/src/domain/UBGraphicsWidgetItem.h +++ b/src/domain/UBGraphicsWidgetItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsWidgetItemDelegate.cpp b/src/domain/UBGraphicsWidgetItemDelegate.cpp index 2964fff7..840da663 100644 --- a/src/domain/UBGraphicsWidgetItemDelegate.cpp +++ b/src/domain/UBGraphicsWidgetItemDelegate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBGraphicsWidgetItemDelegate.h b/src/domain/UBGraphicsWidgetItemDelegate.h index ac4e1f87..642dbfea 100644 --- a/src/domain/UBGraphicsWidgetItemDelegate.h +++ b/src/domain/UBGraphicsWidgetItemDelegate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBItem.cpp b/src/domain/UBItem.cpp index 712a7cbe..ffa3962a 100644 --- a/src/domain/UBItem.cpp +++ b/src/domain/UBItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBItem.h b/src/domain/UBItem.h index 31834df3..0aea3a23 100644 --- a/src/domain/UBItem.h +++ b/src/domain/UBItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBPageSizeUndoCommand.cpp b/src/domain/UBPageSizeUndoCommand.cpp index 47ab6693..adde99e1 100644 --- a/src/domain/UBPageSizeUndoCommand.cpp +++ b/src/domain/UBPageSizeUndoCommand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBPageSizeUndoCommand.h b/src/domain/UBPageSizeUndoCommand.h index d18b3b65..35e46bda 100644 --- a/src/domain/UBPageSizeUndoCommand.h +++ b/src/domain/UBPageSizeUndoCommand.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBResizableGraphicsItem.cpp b/src/domain/UBResizableGraphicsItem.cpp index 944ab4f7..a16884c1 100644 --- a/src/domain/UBResizableGraphicsItem.cpp +++ b/src/domain/UBResizableGraphicsItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/domain/UBResizableGraphicsItem.h b/src/domain/UBResizableGraphicsItem.h index 0002d8e4..74f4ed87 100644 --- a/src/domain/UBResizableGraphicsItem.h +++ b/src/domain/UBResizableGraphicsItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/MacUtils.h b/src/frameworks/MacUtils.h index b43f7150..b8d4cedd 100644 --- a/src/frameworks/MacUtils.h +++ b/src/frameworks/MacUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBBase32.cpp b/src/frameworks/UBBase32.cpp index 12dae141..0dc02f42 100644 --- a/src/frameworks/UBBase32.cpp +++ b/src/frameworks/UBBase32.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBBase32.h b/src/frameworks/UBBase32.h index 591f2707..dbbc64f8 100644 --- a/src/frameworks/UBBase32.h +++ b/src/frameworks/UBBase32.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBCoreGraphicsScene.cpp b/src/frameworks/UBCoreGraphicsScene.cpp index 03637a22..3f590f0c 100644 --- a/src/frameworks/UBCoreGraphicsScene.cpp +++ b/src/frameworks/UBCoreGraphicsScene.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -40,9 +40,16 @@ UBCoreGraphicsScene::~UBCoreGraphicsScene() { //we must delete removed items that are no more in any scene //at groups deleting some items can be added to mItemsToDelete, so we need to use iterators. - foreach(QGraphicsItem* item, mItemsToDelete){ - if (item && item->type() != UBGraphicsItemType::PolygonItemType && item->type() != QGraphicsItem::UserType && item->type() != UBGraphicsItemType::groupContainerType && (item->scene() == NULL || item->scene() == this)) - delete item; + foreach(QGraphicsItem* item, mItemsToDelete) + { + if (item) + { + if (item->scene() == NULL || item->scene() == this) + { + delete item; + item = NULL; + } + } } mItemsToDelete.clear(); } diff --git a/src/frameworks/UBCoreGraphicsScene.h b/src/frameworks/UBCoreGraphicsScene.h index 5e99f60b..5e4f8104 100644 --- a/src/frameworks/UBCoreGraphicsScene.h +++ b/src/frameworks/UBCoreGraphicsScene.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBCryptoUtils.cpp b/src/frameworks/UBCryptoUtils.cpp index c62cdff6..b5df8ccd 100644 --- a/src/frameworks/UBCryptoUtils.cpp +++ b/src/frameworks/UBCryptoUtils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBCryptoUtils.h b/src/frameworks/UBCryptoUtils.h index f514ab91..c286f70b 100644 --- a/src/frameworks/UBCryptoUtils.h +++ b/src/frameworks/UBCryptoUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBFileSystemUtils.cpp b/src/frameworks/UBFileSystemUtils.cpp index 17268d63..49f37cbd 100644 --- a/src/frameworks/UBFileSystemUtils.cpp +++ b/src/frameworks/UBFileSystemUtils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBFileSystemUtils.h b/src/frameworks/UBFileSystemUtils.h index 610018be..70f543f0 100644 --- a/src/frameworks/UBFileSystemUtils.h +++ b/src/frameworks/UBFileSystemUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBGeometryUtils.cpp b/src/frameworks/UBGeometryUtils.cpp index d1cc1fe2..d35ba652 100644 --- a/src/frameworks/UBGeometryUtils.cpp +++ b/src/frameworks/UBGeometryUtils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -81,6 +81,49 @@ QPolygonF UBGeometryUtils::lineToPolygon(const QLineF& pLine, const qreal& pWidt return painterPath.toFillPolygon(); } + + +QPolygonF UBGeometryUtils::lineToPolygon(const QLineF& pLine, const qreal& pStartWidth, const qreal& pEndWidth) +{ + qreal x1 = pLine.x1(); + qreal y1 = pLine.y1(); + + qreal x2 = pLine.x2(); + qreal y2 = pLine.y2(); + + qreal alpha = (90.0 - pLine.angle()) * PI / 180.0; + qreal startHypothenuse = pStartWidth / 2; + qreal endHypothenuse = pEndWidth / 2; + + // TODO UB 4.x PERF cache sin/cos table + qreal startOpposite = sin(alpha) * startHypothenuse; + qreal startAdjacent = cos(alpha) * startHypothenuse; + + qreal endOpposite = sin(alpha) * endHypothenuse; + qreal endAdjacent = cos(alpha) * endHypothenuse; + + QPointF p1a(x1 - startAdjacent, y1 - startOpposite); + QPointF p1b(x1 + startAdjacent, y1 + startOpposite); + + QPointF p2a(x2 - endAdjacent, y2 - endOpposite); + QPointF p2b(x2 + endAdjacent, y2 + endOpposite); + + QPainterPath painterPath; + painterPath.moveTo(p1a); + painterPath.lineTo(p2a); + + painterPath.arcTo(x2 - endHypothenuse, y2 - endHypothenuse, pEndWidth, pEndWidth, (90.0 + pLine.angle()), -180.0); + + //painterPath.lineTo(p2b); + painterPath.lineTo(p1b); + + painterPath.arcTo(x1 - startHypothenuse, y1 - startHypothenuse, pStartWidth, pStartWidth, -1 * (90.0 - pLine.angle()), -180.0); + + painterPath.closeSubpath(); + + return painterPath.toFillPolygon(); +} + QPolygonF UBGeometryUtils::lineToPolygon(const QPointF& pStart, const QPointF& pEnd, const qreal& pStartWidth, const qreal& pEndWidth) { diff --git a/src/frameworks/UBGeometryUtils.h b/src/frameworks/UBGeometryUtils.h index 383b7547..6cf68d31 100644 --- a/src/frameworks/UBGeometryUtils.h +++ b/src/frameworks/UBGeometryUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -34,6 +34,7 @@ class UBGeometryUtils public: static QPolygonF lineToPolygon(const QLineF& pLine, const qreal& pWidth); + static QPolygonF lineToPolygon(const QLineF& pLine, const qreal& pStartWidth, const qreal& pEndWidth); static QRectF lineToInnerRect(const QLineF& pLine, const qreal& pWidth); static QPolygonF arcToPolygon(const QLineF& startRadius, qreal spanAngle, qreal width); diff --git a/src/frameworks/UBPlatformUtils.cpp b/src/frameworks/UBPlatformUtils.cpp index 40e9a1e1..dbfc9d2f 100644 --- a/src/frameworks/UBPlatformUtils.cpp +++ b/src/frameworks/UBPlatformUtils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBPlatformUtils.h b/src/frameworks/UBPlatformUtils.h index e9c681cb..27b3ed34 100644 --- a/src/frameworks/UBPlatformUtils.h +++ b/src/frameworks/UBPlatformUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBPlatformUtils_linux.cpp b/src/frameworks/UBPlatformUtils_linux.cpp index 45cc853b..e9fd62e3 100644 --- a/src/frameworks/UBPlatformUtils_linux.cpp +++ b/src/frameworks/UBPlatformUtils_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBPlatformUtils_mac.mm b/src/frameworks/UBPlatformUtils_mac.mm index 02782e5f..517e38d2 100644 --- a/src/frameworks/UBPlatformUtils_mac.mm +++ b/src/frameworks/UBPlatformUtils_mac.mm @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBPlatformUtils_win.cpp b/src/frameworks/UBPlatformUtils_win.cpp index 2436edf7..e56974f4 100644 --- a/src/frameworks/UBPlatformUtils_win.cpp +++ b/src/frameworks/UBPlatformUtils_win.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBStringUtils.cpp b/src/frameworks/UBStringUtils.cpp index 849d01e5..1e17b01e 100644 --- a/src/frameworks/UBStringUtils.cpp +++ b/src/frameworks/UBStringUtils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBStringUtils.h b/src/frameworks/UBStringUtils.h index 070fdbbb..587a628a 100644 --- a/src/frameworks/UBStringUtils.h +++ b/src/frameworks/UBStringUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBVersion.cpp b/src/frameworks/UBVersion.cpp index 332600a4..854101dd 100644 --- a/src/frameworks/UBVersion.cpp +++ b/src/frameworks/UBVersion.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/frameworks/UBVersion.h b/src/frameworks/UBVersion.h index ed132384..b2aed9bc 100644 --- a/src/frameworks/UBVersion.h +++ b/src/frameworks/UBVersion.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/globals/UBGlobals.h b/src/globals/UBGlobals.h index 643ca5bc..6072d27c 100644 --- a/src/globals/UBGlobals.h +++ b/src/globals/UBGlobals.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBActionPalette.cpp b/src/gui/UBActionPalette.cpp index 53fd25e1..a6c061fe 100644 --- a/src/gui/UBActionPalette.cpp +++ b/src/gui/UBActionPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBActionPalette.h b/src/gui/UBActionPalette.h index 8307fc97..ab53b573 100644 --- a/src/gui/UBActionPalette.h +++ b/src/gui/UBActionPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBBlackoutWidget.cpp b/src/gui/UBBlackoutWidget.cpp index 476e9639..da2aef3b 100644 --- a/src/gui/UBBlackoutWidget.cpp +++ b/src/gui/UBBlackoutWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBBlackoutWidget.h b/src/gui/UBBlackoutWidget.h index 551d05e6..bb606fdb 100644 --- a/src/gui/UBBlackoutWidget.h +++ b/src/gui/UBBlackoutWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBCachePropertiesWidget.cpp b/src/gui/UBCachePropertiesWidget.cpp index 8c87effe..f97043bf 100644 --- a/src/gui/UBCachePropertiesWidget.cpp +++ b/src/gui/UBCachePropertiesWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -142,7 +142,7 @@ UBCachePropertiesWidget::UBCachePropertiesWidget(QWidget *parent, const char *na connect(mpCircleButton, SIGNAL(clicked()), this, SLOT(updateShapeButtons())); connect(mpSquareButton, SIGNAL(clicked()), this, SLOT(updateShapeButtons())); connect(mpSizeSlider, SIGNAL(valueChanged(int)), this, SLOT(onSizeChanged(int))); - connect(UBApplication::boardController, SIGNAL(pageChanged()), this, SLOT(updateCurrentCache())); + connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), this, SLOT(updateCurrentCache())); connect(UBApplication::boardController, SIGNAL(cacheEnabled()), this, SLOT(onCacheEnabled())); } @@ -372,4 +372,3 @@ void UBCachePropertiesWidget::onCacheEnabled() { emit showTab(this); } - diff --git a/src/gui/UBCachePropertiesWidget.h b/src/gui/UBCachePropertiesWidget.h index 3cb6d101..0660576a 100644 --- a/src/gui/UBCachePropertiesWidget.h +++ b/src/gui/UBCachePropertiesWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBCircleFrame.cpp b/src/gui/UBCircleFrame.cpp index fc77105d..e4cfe83c 100644 --- a/src/gui/UBCircleFrame.cpp +++ b/src/gui/UBCircleFrame.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBCircleFrame.h b/src/gui/UBCircleFrame.h index cfc7cfa8..d7ee9b22 100644 --- a/src/gui/UBCircleFrame.h +++ b/src/gui/UBCircleFrame.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBClockPalette.h b/src/gui/UBClockPalette.h index c35aceca..efb517ff 100644 --- a/src/gui/UBClockPalette.h +++ b/src/gui/UBClockPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBColorPicker.cpp b/src/gui/UBColorPicker.cpp index 99e6dccc..38f9fa90 100644 --- a/src/gui/UBColorPicker.cpp +++ b/src/gui/UBColorPicker.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBColorPicker.h b/src/gui/UBColorPicker.h index 02ceb488..008a0d0b 100644 --- a/src/gui/UBColorPicker.h +++ b/src/gui/UBColorPicker.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDockDownloadWidget.cpp b/src/gui/UBDockDownloadWidget.cpp index 08f0765d..191c8a39 100644 --- a/src/gui/UBDockDownloadWidget.cpp +++ b/src/gui/UBDockDownloadWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDockDownloadWidget.h b/src/gui/UBDockDownloadWidget.h index 6f64a28b..5aac7f7e 100644 --- a/src/gui/UBDockDownloadWidget.h +++ b/src/gui/UBDockDownloadWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDockPalette.cpp b/src/gui/UBDockPalette.cpp index 4b857220..f9c218e6 100644 --- a/src/gui/UBDockPalette.cpp +++ b/src/gui/UBDockPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDockPalette.h b/src/gui/UBDockPalette.h index 5b1f48ac..297b3ebc 100644 --- a/src/gui/UBDockPalette.h +++ b/src/gui/UBDockPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDockPaletteWidget.cpp b/src/gui/UBDockPaletteWidget.cpp index 25a5e73a..4ffbbcf8 100644 --- a/src/gui/UBDockPaletteWidget.cpp +++ b/src/gui/UBDockPaletteWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDockPaletteWidget.h b/src/gui/UBDockPaletteWidget.h index 5d2b3015..64e86ecf 100644 --- a/src/gui/UBDockPaletteWidget.h +++ b/src/gui/UBDockPaletteWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDockTeacherGuideWidget.cpp b/src/gui/UBDockTeacherGuideWidget.cpp index db28bc92..7a1401a9 100644 --- a/src/gui/UBDockTeacherGuideWidget.cpp +++ b/src/gui/UBDockTeacherGuideWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDockTeacherGuideWidget.h b/src/gui/UBDockTeacherGuideWidget.h index 5c223c60..fe33410c 100644 --- a/src/gui/UBDockTeacherGuideWidget.h +++ b/src/gui/UBDockTeacherGuideWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDocumentNavigator.cpp b/src/gui/UBDocumentNavigator.cpp index 1a7e6289..ccf5d518 100644 --- a/src/gui/UBDocumentNavigator.cpp +++ b/src/gui/UBDocumentNavigator.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDocumentNavigator.h b/src/gui/UBDocumentNavigator.h index c7696595..ad5fcf31 100644 --- a/src/gui/UBDocumentNavigator.h +++ b/src/gui/UBDocumentNavigator.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDocumentThumbnailWidget.cpp b/src/gui/UBDocumentThumbnailWidget.cpp index f21df274..667e91f3 100644 --- a/src/gui/UBDocumentThumbnailWidget.cpp +++ b/src/gui/UBDocumentThumbnailWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDocumentThumbnailWidget.h b/src/gui/UBDocumentThumbnailWidget.h index 364e1ba4..2a7e1e8a 100644 --- a/src/gui/UBDocumentThumbnailWidget.h +++ b/src/gui/UBDocumentThumbnailWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDocumentToolsPalette.cpp b/src/gui/UBDocumentToolsPalette.cpp index 9ba2941b..18f2738d 100644 --- a/src/gui/UBDocumentToolsPalette.cpp +++ b/src/gui/UBDocumentToolsPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDocumentToolsPalette.h b/src/gui/UBDocumentToolsPalette.h index 4032dee7..8796f106 100644 --- a/src/gui/UBDocumentToolsPalette.h +++ b/src/gui/UBDocumentToolsPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDocumentTreeWidget.cpp b/src/gui/UBDocumentTreeWidget.cpp index 3688618c..6c1409f6 100644 --- a/src/gui/UBDocumentTreeWidget.cpp +++ b/src/gui/UBDocumentTreeWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDocumentTreeWidget.h b/src/gui/UBDocumentTreeWidget.h index a0577539..e0ffd216 100644 --- a/src/gui/UBDocumentTreeWidget.h +++ b/src/gui/UBDocumentTreeWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDownloadWidget.cpp b/src/gui/UBDownloadWidget.cpp index b83aac8b..d097c481 100644 --- a/src/gui/UBDownloadWidget.cpp +++ b/src/gui/UBDownloadWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBDownloadWidget.h b/src/gui/UBDownloadWidget.h index eb457c06..6f9a53f1 100644 --- a/src/gui/UBDownloadWidget.h +++ b/src/gui/UBDownloadWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBFavoriteToolPalette.cpp b/src/gui/UBFavoriteToolPalette.cpp index ce4ca385..114fba33 100644 --- a/src/gui/UBFavoriteToolPalette.cpp +++ b/src/gui/UBFavoriteToolPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBFavoriteToolPalette.h b/src/gui/UBFavoriteToolPalette.h index 0c52860a..8c6341a7 100644 --- a/src/gui/UBFavoriteToolPalette.h +++ b/src/gui/UBFavoriteToolPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBFeaturesActionBar.cpp b/src/gui/UBFeaturesActionBar.cpp index 3c31d21f..19627e28 100644 --- a/src/gui/UBFeaturesActionBar.cpp +++ b/src/gui/UBFeaturesActionBar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBFeaturesActionBar.h b/src/gui/UBFeaturesActionBar.h index 812d359a..cddb9c84 100644 --- a/src/gui/UBFeaturesActionBar.h +++ b/src/gui/UBFeaturesActionBar.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBFeaturesWidget.cpp b/src/gui/UBFeaturesWidget.cpp index 831a4a94..812405e5 100644 --- a/src/gui/UBFeaturesWidget.cpp +++ b/src/gui/UBFeaturesWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBFeaturesWidget.h b/src/gui/UBFeaturesWidget.h index eef4321d..1320ee5c 100644 --- a/src/gui/UBFeaturesWidget.h +++ b/src/gui/UBFeaturesWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBFloatingPalette.cpp b/src/gui/UBFloatingPalette.cpp index 7b566283..fe380c6c 100644 --- a/src/gui/UBFloatingPalette.cpp +++ b/src/gui/UBFloatingPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBFloatingPalette.h b/src/gui/UBFloatingPalette.h index 2586dedd..7f21b9aa 100644 --- a/src/gui/UBFloatingPalette.h +++ b/src/gui/UBFloatingPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBIconButton.cpp b/src/gui/UBIconButton.cpp index 08c54140..335db35a 100644 --- a/src/gui/UBIconButton.cpp +++ b/src/gui/UBIconButton.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBIconButton.h b/src/gui/UBIconButton.h index 32a86791..710e637d 100644 --- a/src/gui/UBIconButton.h +++ b/src/gui/UBIconButton.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBKeyboardPalette.cpp b/src/gui/UBKeyboardPalette.cpp index fe8301bc..d287bc0d 100644 --- a/src/gui/UBKeyboardPalette.cpp +++ b/src/gui/UBKeyboardPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBKeyboardPalette.h b/src/gui/UBKeyboardPalette.h index 1b5d59b9..5267f7cb 100644 --- a/src/gui/UBKeyboardPalette.h +++ b/src/gui/UBKeyboardPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBKeyboardPalette_linux.cpp b/src/gui/UBKeyboardPalette_linux.cpp index 7e4e9f8a..13c95a25 100644 --- a/src/gui/UBKeyboardPalette_linux.cpp +++ b/src/gui/UBKeyboardPalette_linux.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBKeyboardPalette_mac.cpp b/src/gui/UBKeyboardPalette_mac.cpp index 119a31b7..06c43528 100644 --- a/src/gui/UBKeyboardPalette_mac.cpp +++ b/src/gui/UBKeyboardPalette_mac.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBKeyboardPalette_win.cpp b/src/gui/UBKeyboardPalette_win.cpp index d30236c2..fb9a65de 100644 --- a/src/gui/UBKeyboardPalette_win.cpp +++ b/src/gui/UBKeyboardPalette_win.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBLeftPalette.cpp b/src/gui/UBLeftPalette.cpp index 6f63e176..c2f6ea15 100644 --- a/src/gui/UBLeftPalette.cpp +++ b/src/gui/UBLeftPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBLeftPalette.h b/src/gui/UBLeftPalette.h index 5925cfbc..6ba12c91 100644 --- a/src/gui/UBLeftPalette.h +++ b/src/gui/UBLeftPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBMagnifer.cpp b/src/gui/UBMagnifer.cpp index 76796b77..e40752e3 100644 --- a/src/gui/UBMagnifer.cpp +++ b/src/gui/UBMagnifer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBMagnifer.h b/src/gui/UBMagnifer.h index f69a4610..3f2b8fd9 100644 --- a/src/gui/UBMagnifer.h +++ b/src/gui/UBMagnifer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBMainWindow.cpp b/src/gui/UBMainWindow.cpp index d707a345..61f77f9d 100644 --- a/src/gui/UBMainWindow.cpp +++ b/src/gui/UBMainWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -27,6 +27,10 @@ #include "core/UBApplication.h" #include "core/UBApplicationController.h" #include "board/UBBoardController.h" +// work around for handling tablet events on MAC OS with Qt 4.8.0 and above +#if defined(Q_WS_MACX) +#include "board/UBBoardView.h" +#endif #include "core/memcheck.h" @@ -145,6 +149,34 @@ void UBMainWindow::closeEvent(QCloseEvent *event) emit closeEvent_Signal(event); } +// work around for handling tablet events on MAC OS with Qt 4.8.0 and above +#if defined(Q_WS_MACX) +bool UBMainWindow::event(QEvent *event) +{ + bool bRes = QMainWindow::event(event); + + if (NULL != UBApplication::boardController) + { + UBBoardView *controlV = UBApplication::boardController->controlView(); + if (controlV && controlV->isVisible()) + { + switch (event->type()) + { + case QEvent::TabletEnterProximity: + case QEvent::TabletLeaveProximity: + case QEvent::TabletMove: + case QEvent::TabletPress: + case QEvent::TabletRelease: + { + return controlV->directTabletEvent(event); + } + } + } + } + return bRes; +} +#endif + void UBMainWindow::onExportDone() { // HACK : When opening the file save dialog during the document exportation, diff --git a/src/gui/UBMainWindow.h b/src/gui/UBMainWindow.h index 2c3e75f6..c5cbc9b6 100644 --- a/src/gui/UBMainWindow.h +++ b/src/gui/UBMainWindow.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * @@ -83,6 +83,10 @@ class UBMainWindow : public QMainWindow, public Ui::MainWindow QWidget *mDocumentsWidget; private: +// work around for handling tablet events on MAC OS with Qt 4.8.0 and above +#if defined(Q_WS_MACX) + bool event(QEvent *event); +#endif UBDownloadWidget* mpDownloadWidget; }; diff --git a/src/gui/UBMessageWindow.cpp b/src/gui/UBMessageWindow.cpp index 73a1a60c..16b467f3 100644 --- a/src/gui/UBMessageWindow.cpp +++ b/src/gui/UBMessageWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBMessageWindow.h b/src/gui/UBMessageWindow.h index 0522b815..33e7d4d0 100644 --- a/src/gui/UBMessageWindow.h +++ b/src/gui/UBMessageWindow.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBMessagesDialog.cpp b/src/gui/UBMessagesDialog.cpp index fad98a3b..09fd9045 100644 --- a/src/gui/UBMessagesDialog.cpp +++ b/src/gui/UBMessagesDialog.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBMessagesDialog.h b/src/gui/UBMessagesDialog.h index 79b361bf..cefce272 100644 --- a/src/gui/UBMessagesDialog.h +++ b/src/gui/UBMessagesDialog.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBMousePressFilter.cpp b/src/gui/UBMousePressFilter.cpp index 6da92f13..a1a74e9c 100644 --- a/src/gui/UBMousePressFilter.cpp +++ b/src/gui/UBMousePressFilter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBMousePressFilter.h b/src/gui/UBMousePressFilter.h index d9220d25..4dc6f90c 100644 --- a/src/gui/UBMousePressFilter.h +++ b/src/gui/UBMousePressFilter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBNavigatorPalette.cpp b/src/gui/UBNavigatorPalette.cpp index 5be18c8e..6ad9505d 100644 --- a/src/gui/UBNavigatorPalette.cpp +++ b/src/gui/UBNavigatorPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBNavigatorPalette.h b/src/gui/UBNavigatorPalette.h index 060252e3..b09cd08a 100644 --- a/src/gui/UBNavigatorPalette.h +++ b/src/gui/UBNavigatorPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBPageNavigationWidget.cpp b/src/gui/UBPageNavigationWidget.cpp index 7366709e..9d1646ee 100644 --- a/src/gui/UBPageNavigationWidget.cpp +++ b/src/gui/UBPageNavigationWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBPageNavigationWidget.h b/src/gui/UBPageNavigationWidget.h index 1ff4aab0..1299a9f4 100644 --- a/src/gui/UBPageNavigationWidget.h +++ b/src/gui/UBPageNavigationWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBPropertyPalette.cpp b/src/gui/UBPropertyPalette.cpp index 15871037..b085b355 100644 --- a/src/gui/UBPropertyPalette.cpp +++ b/src/gui/UBPropertyPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBPropertyPalette.h b/src/gui/UBPropertyPalette.h index 69798c2d..1388bad2 100644 --- a/src/gui/UBPropertyPalette.h +++ b/src/gui/UBPropertyPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBResources.cpp b/src/gui/UBResources.cpp index 08869868..02e23bfe 100644 --- a/src/gui/UBResources.cpp +++ b/src/gui/UBResources.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBResources.h b/src/gui/UBResources.h index 180f6304..5d5455c5 100644 --- a/src/gui/UBResources.h +++ b/src/gui/UBResources.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBRightPalette.cpp b/src/gui/UBRightPalette.cpp index 0724b87e..4363d5f5 100644 --- a/src/gui/UBRightPalette.cpp +++ b/src/gui/UBRightPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBRightPalette.h b/src/gui/UBRightPalette.h index f1ae40f8..fea60ec9 100644 --- a/src/gui/UBRightPalette.h +++ b/src/gui/UBRightPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBRubberBand.cpp b/src/gui/UBRubberBand.cpp index a889f8af..ee9d430c 100644 --- a/src/gui/UBRubberBand.cpp +++ b/src/gui/UBRubberBand.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBRubberBand.h b/src/gui/UBRubberBand.h index 968b0d28..931639e9 100644 --- a/src/gui/UBRubberBand.h +++ b/src/gui/UBRubberBand.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBScreenMirror.cpp b/src/gui/UBScreenMirror.cpp index 12d090bd..285c5ec8 100644 --- a/src/gui/UBScreenMirror.cpp +++ b/src/gui/UBScreenMirror.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBScreenMirror.h b/src/gui/UBScreenMirror.h index 15db32fc..1ab9fbae 100644 --- a/src/gui/UBScreenMirror.h +++ b/src/gui/UBScreenMirror.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBSpinningWheel.cpp b/src/gui/UBSpinningWheel.cpp index 46cbe9fa..828293fc 100644 --- a/src/gui/UBSpinningWheel.cpp +++ b/src/gui/UBSpinningWheel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBSpinningWheel.h b/src/gui/UBSpinningWheel.h index 310bc0d2..5dfec9cd 100644 --- a/src/gui/UBSpinningWheel.h +++ b/src/gui/UBSpinningWheel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBStylusPalette.cpp b/src/gui/UBStylusPalette.cpp index a6fe1f7f..1cf47b63 100644 --- a/src/gui/UBStylusPalette.cpp +++ b/src/gui/UBStylusPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBStylusPalette.h b/src/gui/UBStylusPalette.h index 4af6ee56..b3542667 100644 --- a/src/gui/UBStylusPalette.h +++ b/src/gui/UBStylusPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBTeacherGuideWidget.cpp b/src/gui/UBTeacherGuideWidget.cpp index 025466fe..09520118 100644 --- a/src/gui/UBTeacherGuideWidget.cpp +++ b/src/gui/UBTeacherGuideWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBTeacherGuideWidget.h b/src/gui/UBTeacherGuideWidget.h index b25e4a74..5c445cec 100644 --- a/src/gui/UBTeacherGuideWidget.h +++ b/src/gui/UBTeacherGuideWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBTeacherGuideWidgetsTools.cpp b/src/gui/UBTeacherGuideWidgetsTools.cpp index 4a96d7b7..87c0c722 100644 --- a/src/gui/UBTeacherGuideWidgetsTools.cpp +++ b/src/gui/UBTeacherGuideWidgetsTools.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBTeacherGuideWidgetsTools.h b/src/gui/UBTeacherGuideWidgetsTools.h index 9ed6252c..ba944ddd 100644 --- a/src/gui/UBTeacherGuideWidgetsTools.h +++ b/src/gui/UBTeacherGuideWidgetsTools.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBThumbnailView.cpp b/src/gui/UBThumbnailView.cpp index 6ad45336..e77c940e 100644 --- a/src/gui/UBThumbnailView.cpp +++ b/src/gui/UBThumbnailView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBThumbnailView.h b/src/gui/UBThumbnailView.h index 68673c42..1e585480 100644 --- a/src/gui/UBThumbnailView.h +++ b/src/gui/UBThumbnailView.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBThumbnailWidget.cpp b/src/gui/UBThumbnailWidget.cpp index 4ef5af24..905fa15e 100644 --- a/src/gui/UBThumbnailWidget.cpp +++ b/src/gui/UBThumbnailWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBThumbnailWidget.h b/src/gui/UBThumbnailWidget.h index bf235c61..e4bf3ec0 100644 --- a/src/gui/UBThumbnailWidget.h +++ b/src/gui/UBThumbnailWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBToolWidget.cpp b/src/gui/UBToolWidget.cpp index ae80bb78..4f9667e6 100644 --- a/src/gui/UBToolWidget.cpp +++ b/src/gui/UBToolWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBToolWidget.h b/src/gui/UBToolWidget.h index b12a22c3..699fc47c 100644 --- a/src/gui/UBToolWidget.h +++ b/src/gui/UBToolWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBToolbarButtonGroup.cpp b/src/gui/UBToolbarButtonGroup.cpp index e2696d59..4a4a17f5 100644 --- a/src/gui/UBToolbarButtonGroup.cpp +++ b/src/gui/UBToolbarButtonGroup.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBToolbarButtonGroup.h b/src/gui/UBToolbarButtonGroup.h index 1826df3b..74398e1d 100644 --- a/src/gui/UBToolbarButtonGroup.h +++ b/src/gui/UBToolbarButtonGroup.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBUpdateDlg.cpp b/src/gui/UBUpdateDlg.cpp index f17ca9a5..76af8c25 100644 --- a/src/gui/UBUpdateDlg.cpp +++ b/src/gui/UBUpdateDlg.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBUpdateDlg.h b/src/gui/UBUpdateDlg.h index 7b0b1e1f..fdf509d6 100644 --- a/src/gui/UBUpdateDlg.h +++ b/src/gui/UBUpdateDlg.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBVideoPlayer.cpp b/src/gui/UBVideoPlayer.cpp index e78a1248..e1831895 100644 --- a/src/gui/UBVideoPlayer.cpp +++ b/src/gui/UBVideoPlayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBVideoPlayer.h b/src/gui/UBVideoPlayer.h index d0d567b2..27c5f575 100644 --- a/src/gui/UBVideoPlayer.h +++ b/src/gui/UBVideoPlayer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBWebToolsPalette.cpp b/src/gui/UBWebToolsPalette.cpp index d7a7a3ae..797c4501 100644 --- a/src/gui/UBWebToolsPalette.cpp +++ b/src/gui/UBWebToolsPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBWebToolsPalette.h b/src/gui/UBWebToolsPalette.h index f1cde31d..974d2f6e 100644 --- a/src/gui/UBWebToolsPalette.h +++ b/src/gui/UBWebToolsPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBWidgetMirror.cpp b/src/gui/UBWidgetMirror.cpp index 7bcc4301..4d833d3e 100644 --- a/src/gui/UBWidgetMirror.cpp +++ b/src/gui/UBWidgetMirror.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBWidgetMirror.h b/src/gui/UBWidgetMirror.h index e172c28b..dee30378 100644 --- a/src/gui/UBWidgetMirror.h +++ b/src/gui/UBWidgetMirror.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBZoomPalette.cpp b/src/gui/UBZoomPalette.cpp index f5e4b1c6..c3bce63a 100644 --- a/src/gui/UBZoomPalette.cpp +++ b/src/gui/UBZoomPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/gui/UBZoomPalette.h b/src/gui/UBZoomPalette.h index 20bb50fb..f8c3fc92 100644 --- a/src/gui/UBZoomPalette.h +++ b/src/gui/UBZoomPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/interfaces/IDataStorage.h b/src/interfaces/IDataStorage.h index d3ce687a..35921dbc 100644 --- a/src/interfaces/IDataStorage.h +++ b/src/interfaces/IDataStorage.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBAutoSaver.cpp b/src/network/UBAutoSaver.cpp index e81a7c35..b2760e1c 100644 --- a/src/network/UBAutoSaver.cpp +++ b/src/network/UBAutoSaver.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBAutoSaver.h b/src/network/UBAutoSaver.h index 15904fa1..d886f1fa 100644 --- a/src/network/UBAutoSaver.h +++ b/src/network/UBAutoSaver.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBCookieJar.cpp b/src/network/UBCookieJar.cpp index 01559402..4ec2d58e 100644 --- a/src/network/UBCookieJar.cpp +++ b/src/network/UBCookieJar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBCookieJar.h b/src/network/UBCookieJar.h index 8ed99139..0a4cea14 100644 --- a/src/network/UBCookieJar.h +++ b/src/network/UBCookieJar.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBHttpFileDownloader.cpp b/src/network/UBHttpFileDownloader.cpp index 8948ccef..35ea75e4 100644 --- a/src/network/UBHttpFileDownloader.cpp +++ b/src/network/UBHttpFileDownloader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBHttpFileDownloader.h b/src/network/UBHttpFileDownloader.h index 91fd7009..5bc4c3dd 100644 --- a/src/network/UBHttpFileDownloader.h +++ b/src/network/UBHttpFileDownloader.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBHttpGet.cpp b/src/network/UBHttpGet.cpp index 0fcb5a2f..30c09419 100644 --- a/src/network/UBHttpGet.cpp +++ b/src/network/UBHttpGet.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBHttpGet.h b/src/network/UBHttpGet.h index 5a00b67d..08a0abd2 100644 --- a/src/network/UBHttpGet.h +++ b/src/network/UBHttpGet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBNetworkAccessManager.cpp b/src/network/UBNetworkAccessManager.cpp index 3c6b9073..71f8d0c9 100644 --- a/src/network/UBNetworkAccessManager.cpp +++ b/src/network/UBNetworkAccessManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBNetworkAccessManager.h b/src/network/UBNetworkAccessManager.h index 6b6e32e2..cc4e578c 100644 --- a/src/network/UBNetworkAccessManager.h +++ b/src/network/UBNetworkAccessManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBServerXMLHttpRequest.cpp b/src/network/UBServerXMLHttpRequest.cpp index a5088e38..b3ae2b9f 100644 --- a/src/network/UBServerXMLHttpRequest.cpp +++ b/src/network/UBServerXMLHttpRequest.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/network/UBServerXMLHttpRequest.h b/src/network/UBServerXMLHttpRequest.h index 1e34b32e..6905bcf7 100644 --- a/src/network/UBServerXMLHttpRequest.h +++ b/src/network/UBServerXMLHttpRequest.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/ASCII85Decode.cpp b/src/pdf-merger/ASCII85Decode.cpp index 634ecb0e..fd26a4c4 100644 --- a/src/pdf-merger/ASCII85Decode.cpp +++ b/src/pdf-merger/ASCII85Decode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/ASCII85Decode.h b/src/pdf-merger/ASCII85Decode.h index b605e2a0..85c1ecd5 100644 --- a/src/pdf-merger/ASCII85Decode.h +++ b/src/pdf-merger/ASCII85Decode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/ASCIIHexDecode.cpp b/src/pdf-merger/ASCIIHexDecode.cpp index 84b127d5..c2c6bbae 100644 --- a/src/pdf-merger/ASCIIHexDecode.cpp +++ b/src/pdf-merger/ASCIIHexDecode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/ASCIIHexDecode.h b/src/pdf-merger/ASCIIHexDecode.h index 60ca682e..ef0a89d2 100644 --- a/src/pdf-merger/ASCIIHexDecode.h +++ b/src/pdf-merger/ASCIIHexDecode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/AbstractBoxElementHandler.h b/src/pdf-merger/AbstractBoxElementHandler.h index 9e315088..9e662623 100644 --- a/src/pdf-merger/AbstractBoxElementHandler.h +++ b/src/pdf-merger/AbstractBoxElementHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/AnnotsHandler.cpp b/src/pdf-merger/AnnotsHandler.cpp index 83aa94e2..34794b5c 100644 --- a/src/pdf-merger/AnnotsHandler.cpp +++ b/src/pdf-merger/AnnotsHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/AnnotsHandler.h b/src/pdf-merger/AnnotsHandler.h index 93c5a4fa..8f7270f9 100644 --- a/src/pdf-merger/AnnotsHandler.h +++ b/src/pdf-merger/AnnotsHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/CCITTFaxDecode.cpp b/src/pdf-merger/CCITTFaxDecode.cpp index 7793af87..7da883c4 100644 --- a/src/pdf-merger/CCITTFaxDecode.cpp +++ b/src/pdf-merger/CCITTFaxDecode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/CCITTFaxDecode.h b/src/pdf-merger/CCITTFaxDecode.h index 24a5c5a0..a69b2a0b 100644 --- a/src/pdf-merger/CCITTFaxDecode.h +++ b/src/pdf-merger/CCITTFaxDecode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Config.h b/src/pdf-merger/Config.h index a443a915..dac1d4cf 100644 --- a/src/pdf-merger/Config.h +++ b/src/pdf-merger/Config.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/ContentHandler.cpp b/src/pdf-merger/ContentHandler.cpp index de376906..973cda88 100644 --- a/src/pdf-merger/ContentHandler.cpp +++ b/src/pdf-merger/ContentHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/ContentHandler.h b/src/pdf-merger/ContentHandler.h index 2cec0640..b8e4a022 100644 --- a/src/pdf-merger/ContentHandler.h +++ b/src/pdf-merger/ContentHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/CropBoxElementHandler.h b/src/pdf-merger/CropBoxElementHandler.h index bd053b3e..4b9881c4 100644 --- a/src/pdf-merger/CropBoxElementHandler.h +++ b/src/pdf-merger/CropBoxElementHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/DCTDecode.cpp b/src/pdf-merger/DCTDecode.cpp index 5dbd64b1..029dc62b 100644 --- a/src/pdf-merger/DCTDecode.cpp +++ b/src/pdf-merger/DCTDecode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/DCTDecode.h b/src/pdf-merger/DCTDecode.h index 47d4636b..06ff0f6e 100644 --- a/src/pdf-merger/DCTDecode.h +++ b/src/pdf-merger/DCTDecode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Decoder.h b/src/pdf-merger/Decoder.h index bd1afaaf..2988b2b0 100644 --- a/src/pdf-merger/Decoder.h +++ b/src/pdf-merger/Decoder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Document.cpp b/src/pdf-merger/Document.cpp index 372e3ba4..175436a3 100644 --- a/src/pdf-merger/Document.cpp +++ b/src/pdf-merger/Document.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Document.h b/src/pdf-merger/Document.h index ed8a0924..227bfc27 100644 --- a/src/pdf-merger/Document.h +++ b/src/pdf-merger/Document.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Exception.h b/src/pdf-merger/Exception.h index 415018c6..c83c6e8b 100644 --- a/src/pdf-merger/Exception.h +++ b/src/pdf-merger/Exception.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/FileIsAbsentException.h b/src/pdf-merger/FileIsAbsentException.h index 36b2198a..b6649714 100644 --- a/src/pdf-merger/FileIsAbsentException.h +++ b/src/pdf-merger/FileIsAbsentException.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Filter.cpp b/src/pdf-merger/Filter.cpp index 3e1b9e57..3800bf04 100644 --- a/src/pdf-merger/Filter.cpp +++ b/src/pdf-merger/Filter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Filter.h b/src/pdf-merger/Filter.h index 85932e98..0a1f2029 100644 --- a/src/pdf-merger/Filter.h +++ b/src/pdf-merger/Filter.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/FilterPredictor.cpp b/src/pdf-merger/FilterPredictor.cpp index 0b595821..a31d0231 100644 --- a/src/pdf-merger/FilterPredictor.cpp +++ b/src/pdf-merger/FilterPredictor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/FilterPredictor.h b/src/pdf-merger/FilterPredictor.h index d826e9b7..28afbd6d 100644 --- a/src/pdf-merger/FilterPredictor.h +++ b/src/pdf-merger/FilterPredictor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/FlateDecode.cpp b/src/pdf-merger/FlateDecode.cpp index 49f6229e..a2215c48 100644 --- a/src/pdf-merger/FlateDecode.cpp +++ b/src/pdf-merger/FlateDecode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/FlateDecode.h b/src/pdf-merger/FlateDecode.h index a9a4dd70..8ec75e91 100644 --- a/src/pdf-merger/FlateDecode.h +++ b/src/pdf-merger/FlateDecode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/JBIG2Decode.cpp b/src/pdf-merger/JBIG2Decode.cpp index b4826754..92f1c7d9 100644 --- a/src/pdf-merger/JBIG2Decode.cpp +++ b/src/pdf-merger/JBIG2Decode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/JBIG2Decode.h b/src/pdf-merger/JBIG2Decode.h index e31ed2b1..4d9b72fc 100644 --- a/src/pdf-merger/JBIG2Decode.h +++ b/src/pdf-merger/JBIG2Decode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/LZWDecode.cpp b/src/pdf-merger/LZWDecode.cpp index 5ef46779..ad1b486f 100644 --- a/src/pdf-merger/LZWDecode.cpp +++ b/src/pdf-merger/LZWDecode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/LZWDecode.h b/src/pdf-merger/LZWDecode.h index c7ce79ea..748e65dc 100644 --- a/src/pdf-merger/LZWDecode.h +++ b/src/pdf-merger/LZWDecode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/MediaBoxElementHandler.h b/src/pdf-merger/MediaBoxElementHandler.h index e5479624..b1d390c0 100644 --- a/src/pdf-merger/MediaBoxElementHandler.h +++ b/src/pdf-merger/MediaBoxElementHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/MergePageDescription.h b/src/pdf-merger/MergePageDescription.h index 6ad7af77..f9fee166 100644 --- a/src/pdf-merger/MergePageDescription.h +++ b/src/pdf-merger/MergePageDescription.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Merger.cpp b/src/pdf-merger/Merger.cpp index ab607b5a..8ba52d33 100644 --- a/src/pdf-merger/Merger.cpp +++ b/src/pdf-merger/Merger.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Merger.h b/src/pdf-merger/Merger.h index 5b004d01..34172baf 100644 --- a/src/pdf-merger/Merger.h +++ b/src/pdf-merger/Merger.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Object.cpp b/src/pdf-merger/Object.cpp index 00f88647..93439cd4 100644 --- a/src/pdf-merger/Object.cpp +++ b/src/pdf-merger/Object.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Object.h b/src/pdf-merger/Object.h index e1bdad6a..ff742c40 100644 --- a/src/pdf-merger/Object.h +++ b/src/pdf-merger/Object.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/OverlayDocumentParser.cpp b/src/pdf-merger/OverlayDocumentParser.cpp index e237a252..956cec82 100644 --- a/src/pdf-merger/OverlayDocumentParser.cpp +++ b/src/pdf-merger/OverlayDocumentParser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/OverlayDocumentParser.h b/src/pdf-merger/OverlayDocumentParser.h index 7829a0d6..14775a90 100644 --- a/src/pdf-merger/OverlayDocumentParser.h +++ b/src/pdf-merger/OverlayDocumentParser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Page.cpp b/src/pdf-merger/Page.cpp index e92a7e66..7dfbfd81 100644 --- a/src/pdf-merger/Page.cpp +++ b/src/pdf-merger/Page.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Page.h b/src/pdf-merger/Page.h index 4b67cfdb..fba3dfea 100644 --- a/src/pdf-merger/Page.h +++ b/src/pdf-merger/Page.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/PageElementHandler.cpp b/src/pdf-merger/PageElementHandler.cpp index 4b6bff77..f45544f7 100644 --- a/src/pdf-merger/PageElementHandler.cpp +++ b/src/pdf-merger/PageElementHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/PageElementHandler.h b/src/pdf-merger/PageElementHandler.h index b12060a6..e927d3cf 100644 --- a/src/pdf-merger/PageElementHandler.h +++ b/src/pdf-merger/PageElementHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/PageParser.h b/src/pdf-merger/PageParser.h index b8f9c7a7..f723cb29 100644 --- a/src/pdf-merger/PageParser.h +++ b/src/pdf-merger/PageParser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Parser.cpp b/src/pdf-merger/Parser.cpp index 426efb22..78f9fe92 100644 --- a/src/pdf-merger/Parser.cpp +++ b/src/pdf-merger/Parser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Parser.h b/src/pdf-merger/Parser.h index 92673277..89917146 100644 --- a/src/pdf-merger/Parser.h +++ b/src/pdf-merger/Parser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Rectangle.cpp b/src/pdf-merger/Rectangle.cpp index 674fb8d7..722a45d8 100644 --- a/src/pdf-merger/Rectangle.cpp +++ b/src/pdf-merger/Rectangle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Rectangle.h b/src/pdf-merger/Rectangle.h index 0d3fad63..db14d5b0 100644 --- a/src/pdf-merger/Rectangle.h +++ b/src/pdf-merger/Rectangle.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/RemoveHimSelfHandler.h b/src/pdf-merger/RemoveHimSelfHandler.h index 69a436b2..64e41ada 100644 --- a/src/pdf-merger/RemoveHimSelfHandler.h +++ b/src/pdf-merger/RemoveHimSelfHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/RemoveHimselfHandler.cpp b/src/pdf-merger/RemoveHimselfHandler.cpp index 0bc91cab..2abc473b 100644 --- a/src/pdf-merger/RemoveHimselfHandler.cpp +++ b/src/pdf-merger/RemoveHimselfHandler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/RotationHandler.h b/src/pdf-merger/RotationHandler.h index 10dcbd34..bbba9b6d 100644 --- a/src/pdf-merger/RotationHandler.h +++ b/src/pdf-merger/RotationHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/RunLengthDecode.cpp b/src/pdf-merger/RunLengthDecode.cpp index 223b8735..48da4cda 100644 --- a/src/pdf-merger/RunLengthDecode.cpp +++ b/src/pdf-merger/RunLengthDecode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/RunLengthDecode.h b/src/pdf-merger/RunLengthDecode.h index 6bc76b1b..b29b01e0 100644 --- a/src/pdf-merger/RunLengthDecode.h +++ b/src/pdf-merger/RunLengthDecode.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Transformation.h b/src/pdf-merger/Transformation.h index 67f2e4a7..9be96d2f 100644 --- a/src/pdf-merger/Transformation.h +++ b/src/pdf-merger/Transformation.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/TypeElementHandler.h b/src/pdf-merger/TypeElementHandler.h index f9ed9843..7c01456b 100644 --- a/src/pdf-merger/TypeElementHandler.h +++ b/src/pdf-merger/TypeElementHandler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Utils.cpp b/src/pdf-merger/Utils.cpp index 926e90f8..305c8e07 100644 --- a/src/pdf-merger/Utils.cpp +++ b/src/pdf-merger/Utils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf-merger/Utils.h b/src/pdf-merger/Utils.h index af5f54b5..2857df8e 100644 --- a/src/pdf-merger/Utils.h +++ b/src/pdf-merger/Utils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf/GraphicsPDFItem.cpp b/src/pdf/GraphicsPDFItem.cpp index 2bbbc232..b4c71edc 100644 --- a/src/pdf/GraphicsPDFItem.cpp +++ b/src/pdf/GraphicsPDFItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf/GraphicsPDFItem.h b/src/pdf/GraphicsPDFItem.h index 5045e487..3c4b6f38 100644 --- a/src/pdf/GraphicsPDFItem.h +++ b/src/pdf/GraphicsPDFItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf/PDFRenderer.cpp b/src/pdf/PDFRenderer.cpp index d2def0ed..16b8821f 100644 --- a/src/pdf/PDFRenderer.cpp +++ b/src/pdf/PDFRenderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf/PDFRenderer.h b/src/pdf/PDFRenderer.h index feb12a80..0daa0e03 100644 --- a/src/pdf/PDFRenderer.h +++ b/src/pdf/PDFRenderer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf/UBWebPluginPDFWidget.cpp b/src/pdf/UBWebPluginPDFWidget.cpp index 1867cde4..0419713b 100644 --- a/src/pdf/UBWebPluginPDFWidget.cpp +++ b/src/pdf/UBWebPluginPDFWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf/UBWebPluginPDFWidget.h b/src/pdf/UBWebPluginPDFWidget.h index d409dfed..681f2237 100644 --- a/src/pdf/UBWebPluginPDFWidget.h +++ b/src/pdf/UBWebPluginPDFWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf/XPDFRenderer.cpp b/src/pdf/XPDFRenderer.cpp index 6bb666f6..d50e559e 100644 --- a/src/pdf/XPDFRenderer.cpp +++ b/src/pdf/XPDFRenderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/pdf/XPDFRenderer.h b/src/pdf/XPDFRenderer.h index 4254773f..ab9f3de2 100644 --- a/src/pdf/XPDFRenderer.h +++ b/src/pdf/XPDFRenderer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/UBAbstractVideoEncoder.cpp b/src/podcast/UBAbstractVideoEncoder.cpp index 1475e5b1..d038fd11 100644 --- a/src/podcast/UBAbstractVideoEncoder.cpp +++ b/src/podcast/UBAbstractVideoEncoder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/UBAbstractVideoEncoder.h b/src/podcast/UBAbstractVideoEncoder.h index 312856e9..cd7bb9d3 100644 --- a/src/podcast/UBAbstractVideoEncoder.h +++ b/src/podcast/UBAbstractVideoEncoder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/UBPodcastController.cpp b/src/podcast/UBPodcastController.cpp index 90b00dcb..01fd9246 100644 --- a/src/podcast/UBPodcastController.cpp +++ b/src/podcast/UBPodcastController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/UBPodcastController.h b/src/podcast/UBPodcastController.h index 5b02c7f8..14ae312e 100644 --- a/src/podcast/UBPodcastController.h +++ b/src/podcast/UBPodcastController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/UBPodcastRecordingPalette.cpp b/src/podcast/UBPodcastRecordingPalette.cpp index 220f3529..bbea18c1 100644 --- a/src/podcast/UBPodcastRecordingPalette.cpp +++ b/src/podcast/UBPodcastRecordingPalette.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/UBPodcastRecordingPalette.h b/src/podcast/UBPodcastRecordingPalette.h index 44eb9944..aece20c6 100644 --- a/src/podcast/UBPodcastRecordingPalette.h +++ b/src/podcast/UBPodcastRecordingPalette.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/intranet/UBIntranetPodcastPublisher.cpp b/src/podcast/intranet/UBIntranetPodcastPublisher.cpp index 7e914441..512d087d 100644 --- a/src/podcast/intranet/UBIntranetPodcastPublisher.cpp +++ b/src/podcast/intranet/UBIntranetPodcastPublisher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/intranet/UBIntranetPodcastPublisher.h b/src/podcast/intranet/UBIntranetPodcastPublisher.h index 26652e38..5a764aa7 100644 --- a/src/podcast/intranet/UBIntranetPodcastPublisher.h +++ b/src/podcast/intranet/UBIntranetPodcastPublisher.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/quicktime/UBAudioQueueRecorder.cpp b/src/podcast/quicktime/UBAudioQueueRecorder.cpp index 1f5c11f5..46d7d9b9 100644 --- a/src/podcast/quicktime/UBAudioQueueRecorder.cpp +++ b/src/podcast/quicktime/UBAudioQueueRecorder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/quicktime/UBAudioQueueRecorder.h b/src/podcast/quicktime/UBAudioQueueRecorder.h index c5744abb..31e7aa80 100644 --- a/src/podcast/quicktime/UBAudioQueueRecorder.h +++ b/src/podcast/quicktime/UBAudioQueueRecorder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/quicktime/UBQuickTimeFile.cpp b/src/podcast/quicktime/UBQuickTimeFile.cpp index b47198f8..8b6451de 100644 --- a/src/podcast/quicktime/UBQuickTimeFile.cpp +++ b/src/podcast/quicktime/UBQuickTimeFile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/quicktime/UBQuickTimeFile.h b/src/podcast/quicktime/UBQuickTimeFile.h index be5ef9ed..996e25a9 100644 --- a/src/podcast/quicktime/UBQuickTimeFile.h +++ b/src/podcast/quicktime/UBQuickTimeFile.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp b/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp index 03f9a192..a43849fb 100644 --- a/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp +++ b/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/quicktime/UBQuickTimeVideoEncoder.h b/src/podcast/quicktime/UBQuickTimeVideoEncoder.h index 6127d2db..67262d62 100644 --- a/src/podcast/quicktime/UBQuickTimeVideoEncoder.h +++ b/src/podcast/quicktime/UBQuickTimeVideoEncoder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/windowsmedia/UBWaveRecorder.cpp b/src/podcast/windowsmedia/UBWaveRecorder.cpp index 527426cd..c347093e 100644 --- a/src/podcast/windowsmedia/UBWaveRecorder.cpp +++ b/src/podcast/windowsmedia/UBWaveRecorder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/windowsmedia/UBWaveRecorder.h b/src/podcast/windowsmedia/UBWaveRecorder.h index a7cce208..d136c579 100644 --- a/src/podcast/windowsmedia/UBWaveRecorder.h +++ b/src/podcast/windowsmedia/UBWaveRecorder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/windowsmedia/UBWindowsMediaFile.cpp b/src/podcast/windowsmedia/UBWindowsMediaFile.cpp index 7011e21f..3b8f6b98 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaFile.cpp +++ b/src/podcast/windowsmedia/UBWindowsMediaFile.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/windowsmedia/UBWindowsMediaFile.h b/src/podcast/windowsmedia/UBWindowsMediaFile.h index 97278ce7..2bcb20ad 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaFile.h +++ b/src/podcast/windowsmedia/UBWindowsMediaFile.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp index f814485b..659f1cf2 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp +++ b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h index f5f55fba..adb24a23 100644 --- a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h +++ b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/youtube/UBYouTubePublisher.cpp b/src/podcast/youtube/UBYouTubePublisher.cpp index 10342d2f..e6d22126 100644 --- a/src/podcast/youtube/UBYouTubePublisher.cpp +++ b/src/podcast/youtube/UBYouTubePublisher.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/podcast/youtube/UBYouTubePublisher.h b/src/podcast/youtube/UBYouTubePublisher.h index 7381649a..9b0a52d0 100644 --- a/src/podcast/youtube/UBYouTubePublisher.h +++ b/src/podcast/youtube/UBYouTubePublisher.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBAbstractDrawRuler.cpp b/src/tools/UBAbstractDrawRuler.cpp index dab62567..b5aad3bd 100644 --- a/src/tools/UBAbstractDrawRuler.cpp +++ b/src/tools/UBAbstractDrawRuler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBAbstractDrawRuler.h b/src/tools/UBAbstractDrawRuler.h index 7015f708..d286ed87 100644 --- a/src/tools/UBAbstractDrawRuler.h +++ b/src/tools/UBAbstractDrawRuler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsCache.cpp b/src/tools/UBGraphicsCache.cpp index 537e17e7..bd923d78 100644 --- a/src/tools/UBGraphicsCache.cpp +++ b/src/tools/UBGraphicsCache.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsCache.h b/src/tools/UBGraphicsCache.h index 89510b66..2aa87bbd 100644 --- a/src/tools/UBGraphicsCache.h +++ b/src/tools/UBGraphicsCache.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsCompass.cpp b/src/tools/UBGraphicsCompass.cpp index d9b7a47d..c575e16d 100644 --- a/src/tools/UBGraphicsCompass.cpp +++ b/src/tools/UBGraphicsCompass.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsCompass.h b/src/tools/UBGraphicsCompass.h index 2af6c2e7..7f08c65e 100644 --- a/src/tools/UBGraphicsCompass.h +++ b/src/tools/UBGraphicsCompass.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsCurtainItem.cpp b/src/tools/UBGraphicsCurtainItem.cpp index 116205f3..30f92eee 100644 --- a/src/tools/UBGraphicsCurtainItem.cpp +++ b/src/tools/UBGraphicsCurtainItem.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsCurtainItem.h b/src/tools/UBGraphicsCurtainItem.h index 2dbd4d62..1d0ce652 100644 --- a/src/tools/UBGraphicsCurtainItem.h +++ b/src/tools/UBGraphicsCurtainItem.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsCurtainItemDelegate.cpp b/src/tools/UBGraphicsCurtainItemDelegate.cpp index 06f24a27..0a3da8d9 100644 --- a/src/tools/UBGraphicsCurtainItemDelegate.cpp +++ b/src/tools/UBGraphicsCurtainItemDelegate.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsCurtainItemDelegate.h b/src/tools/UBGraphicsCurtainItemDelegate.h index 40bf047d..36040ba9 100644 --- a/src/tools/UBGraphicsCurtainItemDelegate.h +++ b/src/tools/UBGraphicsCurtainItemDelegate.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsProtractor.cpp b/src/tools/UBGraphicsProtractor.cpp index 26f01f39..ae54063d 100644 --- a/src/tools/UBGraphicsProtractor.cpp +++ b/src/tools/UBGraphicsProtractor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsProtractor.h b/src/tools/UBGraphicsProtractor.h index d47e5bae..1fd8929c 100644 --- a/src/tools/UBGraphicsProtractor.h +++ b/src/tools/UBGraphicsProtractor.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsRuler.cpp b/src/tools/UBGraphicsRuler.cpp index 801f829a..cdccebde 100644 --- a/src/tools/UBGraphicsRuler.cpp +++ b/src/tools/UBGraphicsRuler.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsRuler.h b/src/tools/UBGraphicsRuler.h index 9a4f3066..8201045d 100644 --- a/src/tools/UBGraphicsRuler.h +++ b/src/tools/UBGraphicsRuler.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsTriangle.cpp b/src/tools/UBGraphicsTriangle.cpp index 262c657a..5dbba7c5 100644 --- a/src/tools/UBGraphicsTriangle.cpp +++ b/src/tools/UBGraphicsTriangle.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBGraphicsTriangle.h b/src/tools/UBGraphicsTriangle.h index 7fd83c55..e8a2fdb0 100644 --- a/src/tools/UBGraphicsTriangle.h +++ b/src/tools/UBGraphicsTriangle.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBToolsManager.cpp b/src/tools/UBToolsManager.cpp index 64125be0..f6c4cb17 100644 --- a/src/tools/UBToolsManager.cpp +++ b/src/tools/UBToolsManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/tools/UBToolsManager.h b/src/tools/UBToolsManager.h index 0da57e90..a7aa539e 100644 --- a/src/tools/UBToolsManager.h +++ b/src/tools/UBToolsManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBOEmbedParser.cpp b/src/web/UBOEmbedParser.cpp index 8c60e167..8f8b5a63 100644 --- a/src/web/UBOEmbedParser.cpp +++ b/src/web/UBOEmbedParser.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBOEmbedParser.h b/src/web/UBOEmbedParser.h index 98107f2a..2be41508 100644 --- a/src/web/UBOEmbedParser.h +++ b/src/web/UBOEmbedParser.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBTrapFlashController.cpp b/src/web/UBTrapFlashController.cpp index 6fb6f7d0..1487f91c 100644 --- a/src/web/UBTrapFlashController.cpp +++ b/src/web/UBTrapFlashController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBTrapFlashController.h b/src/web/UBTrapFlashController.h index 4491e164..7fa4d060 100644 --- a/src/web/UBTrapFlashController.h +++ b/src/web/UBTrapFlashController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp index 3a36c2c6..7eaacecf 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBWebController.h b/src/web/UBWebController.h index 15d7c7bb..6bba430a 100644 --- a/src/web/UBWebController.h +++ b/src/web/UBWebController.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBWebKitUtils.cpp b/src/web/UBWebKitUtils.cpp index 514f4a6d..fad27116 100644 --- a/src/web/UBWebKitUtils.cpp +++ b/src/web/UBWebKitUtils.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBWebKitUtils.h b/src/web/UBWebKitUtils.h index fbda8b73..c00fcf22 100644 --- a/src/web/UBWebKitUtils.h +++ b/src/web/UBWebKitUtils.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBWebPage.cpp b/src/web/UBWebPage.cpp index d48666ae..6597317b 100644 --- a/src/web/UBWebPage.cpp +++ b/src/web/UBWebPage.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBWebPage.h b/src/web/UBWebPage.h index d8340dbd..e470039e 100644 --- a/src/web/UBWebPage.h +++ b/src/web/UBWebPage.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBWebPluginWidget.cpp b/src/web/UBWebPluginWidget.cpp index a8d120ee..7128b460 100644 --- a/src/web/UBWebPluginWidget.cpp +++ b/src/web/UBWebPluginWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/UBWebPluginWidget.h b/src/web/UBWebPluginWidget.h index 0a752a2b..333783ba 100644 --- a/src/web/UBWebPluginWidget.h +++ b/src/web/UBWebPluginWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBBrowserWindow.cpp b/src/web/browser/WBBrowserWindow.cpp index 2649da32..74286edc 100644 --- a/src/web/browser/WBBrowserWindow.cpp +++ b/src/web/browser/WBBrowserWindow.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBBrowserWindow.h b/src/web/browser/WBBrowserWindow.h index e4885148..a26530a8 100644 --- a/src/web/browser/WBBrowserWindow.h +++ b/src/web/browser/WBBrowserWindow.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBChaseWidget.cpp b/src/web/browser/WBChaseWidget.cpp index 582d0ac3..7d7c841c 100644 --- a/src/web/browser/WBChaseWidget.cpp +++ b/src/web/browser/WBChaseWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBChaseWidget.h b/src/web/browser/WBChaseWidget.h index 0577c449..7252fe8f 100644 --- a/src/web/browser/WBChaseWidget.h +++ b/src/web/browser/WBChaseWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBDownloadManager.cpp b/src/web/browser/WBDownloadManager.cpp index cfad8b50..6692cc48 100644 --- a/src/web/browser/WBDownloadManager.cpp +++ b/src/web/browser/WBDownloadManager.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBDownloadManager.h b/src/web/browser/WBDownloadManager.h index d1af7a36..16fdb961 100644 --- a/src/web/browser/WBDownloadManager.h +++ b/src/web/browser/WBDownloadManager.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBEditTableView.cpp b/src/web/browser/WBEditTableView.cpp index f7357f16..88bede00 100644 --- a/src/web/browser/WBEditTableView.cpp +++ b/src/web/browser/WBEditTableView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBEditTableView.h b/src/web/browser/WBEditTableView.h index 7b0ff700..691d44cf 100644 --- a/src/web/browser/WBEditTableView.h +++ b/src/web/browser/WBEditTableView.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBHistory.cpp b/src/web/browser/WBHistory.cpp index 2d46dce0..7cd455f5 100644 --- a/src/web/browser/WBHistory.cpp +++ b/src/web/browser/WBHistory.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBHistory.h b/src/web/browser/WBHistory.h index 9510da9d..e8a6afd6 100644 --- a/src/web/browser/WBHistory.h +++ b/src/web/browser/WBHistory.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBModelMenu.cpp b/src/web/browser/WBModelMenu.cpp index 66da00d6..4561baa5 100644 --- a/src/web/browser/WBModelMenu.cpp +++ b/src/web/browser/WBModelMenu.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBModelMenu.h b/src/web/browser/WBModelMenu.h index 50c794a4..71a58bf2 100644 --- a/src/web/browser/WBModelMenu.h +++ b/src/web/browser/WBModelMenu.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBSearchLineEdit.cpp b/src/web/browser/WBSearchLineEdit.cpp index 8562fb71..a74d12d1 100644 --- a/src/web/browser/WBSearchLineEdit.cpp +++ b/src/web/browser/WBSearchLineEdit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBSearchLineEdit.h b/src/web/browser/WBSearchLineEdit.h index 2b1d2d7f..af160508 100644 --- a/src/web/browser/WBSearchLineEdit.h +++ b/src/web/browser/WBSearchLineEdit.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBSqueezeLabel.cpp b/src/web/browser/WBSqueezeLabel.cpp index fa8041d1..e1de11d1 100644 --- a/src/web/browser/WBSqueezeLabel.cpp +++ b/src/web/browser/WBSqueezeLabel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBSqueezeLabel.h b/src/web/browser/WBSqueezeLabel.h index 96105ead..f1ac5305 100644 --- a/src/web/browser/WBSqueezeLabel.h +++ b/src/web/browser/WBSqueezeLabel.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBTabWidget.cpp b/src/web/browser/WBTabWidget.cpp index d4e85e6a..141e73c1 100644 --- a/src/web/browser/WBTabWidget.cpp +++ b/src/web/browser/WBTabWidget.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBTabWidget.h b/src/web/browser/WBTabWidget.h index 15292389..bb416cbf 100644 --- a/src/web/browser/WBTabWidget.h +++ b/src/web/browser/WBTabWidget.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBToolBarSearch.cpp b/src/web/browser/WBToolBarSearch.cpp index f78ebe81..d21f98cc 100644 --- a/src/web/browser/WBToolBarSearch.cpp +++ b/src/web/browser/WBToolBarSearch.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBToolBarSearch.h b/src/web/browser/WBToolBarSearch.h index ac465334..e639118b 100644 --- a/src/web/browser/WBToolBarSearch.h +++ b/src/web/browser/WBToolBarSearch.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBUrlLineEdit.cpp b/src/web/browser/WBUrlLineEdit.cpp index 0649f806..50df2226 100644 --- a/src/web/browser/WBUrlLineEdit.cpp +++ b/src/web/browser/WBUrlLineEdit.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBUrlLineEdit.h b/src/web/browser/WBUrlLineEdit.h index dcd5490a..a98dfa9b 100644 --- a/src/web/browser/WBUrlLineEdit.h +++ b/src/web/browser/WBUrlLineEdit.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBWebTrapWebView.cpp b/src/web/browser/WBWebTrapWebView.cpp index 30373cf9..3b06ce89 100644 --- a/src/web/browser/WBWebTrapWebView.cpp +++ b/src/web/browser/WBWebTrapWebView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBWebTrapWebView.h b/src/web/browser/WBWebTrapWebView.h index b838f9b5..0167be14 100644 --- a/src/web/browser/WBWebTrapWebView.h +++ b/src/web/browser/WBWebTrapWebView.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBWebView.cpp b/src/web/browser/WBWebView.cpp index ec5d1b7a..e943e5ff 100644 --- a/src/web/browser/WBWebView.cpp +++ b/src/web/browser/WBWebView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/src/web/browser/WBWebView.h b/src/web/browser/WBWebView.h index d9119e84..413506f0 100644 --- a/src/web/browser/WBWebView.h +++ b/src/web/browser/WBWebView.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012 Webdoc SA + * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA) * * This file is part of Open-Sankoré. * diff --git a/tools/CrashReportViewer/Bug.icns b/tools/CrashReportViewer/Bug.icns deleted file mode 100644 index 07c91b54..00000000 Binary files a/tools/CrashReportViewer/Bug.icns and /dev/null differ diff --git a/tools/CrashReportViewer/CrashReportViewer.pro b/tools/CrashReportViewer/CrashReportViewer.pro deleted file mode 100644 index 5a08f6e8..00000000 --- a/tools/CrashReportViewer/CrashReportViewer.pro +++ /dev/null @@ -1,28 +0,0 @@ -TEMPLATE = app -VERSION = 1.0 -TARGET = "Crash Report Viewer" - -DESTDIR = "build/macx" -OBJECTS_DIR = "build/macx/objects" -MOC_DIR = "build/macx/moc" -RCC_DIR = "build/macx/rcc" -UI_DIR = "build/macx/ui" - -INCLUDEPATH += ../../thirdparty/google-breakpad/r318/include/google_breakpad -LIBS += "-L../../thirdparty/google-breakpad/r318/lib/macx" "-lbreakpad" - -SOURCES = main.cpp \ - CrashWindow.cpp \ - CrashReporterSymbolSupplier.cpp - -HEADERS += CrashWindow.h \ - CrashReporterSymbolSupplier.h - -FORMS += CrashReportViewer.ui - -QMAKE_INFO_PLIST = Info.plist - -ICON.files = "Bug.icns" -ICON.path = "Contents/Resources" - -QMAKE_BUNDLE_DATA = "ICON" diff --git a/tools/CrashReportViewer/CrashReportViewer.ui b/tools/CrashReportViewer/CrashReportViewer.ui deleted file mode 100644 index dd8e9f1a..00000000 --- a/tools/CrashReportViewer/CrashReportViewer.ui +++ /dev/null @@ -1,106 +0,0 @@ - - - UniboardCrashreporter - - - - 0 - 0 - 874 - 515 - - - - Uniboard Crash Reporter - - - - - - - - - - - - Dump File Path - - - - - - - UB Sym File Path - - - - - - - - - - - - - - - - - - - - - - - - - - - ... - - - - - - - ... - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - View report - - - - - - - - - - - - - diff --git a/tools/CrashReportViewer/CrashReporterSymbolSupplier.cpp b/tools/CrashReportViewer/CrashReporterSymbolSupplier.cpp deleted file mode 100644 index 4b126d98..00000000 --- a/tools/CrashReportViewer/CrashReporterSymbolSupplier.cpp +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright (C) 2012 Webdoc SA - * - * This file is part of Open-Sankoré. - * - * Open-Sankoré is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License, - * with a specific linking exception for the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the - * same license as the "OpenSSL" library). - * - * Open-Sankoré is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Open-Sankoré. If not, see . - */ - - -#include -#include -#include - -#include "CrashReporterSymbolSupplier.h" -#include "google_breakpad/processor/basic_source_line_resolver.h" -#include "google_breakpad/processor/minidump.h" -#include "google_breakpad/processor/system_info.h" -#include "processor/pathname_stripper.h" - - - -CrashReporterSymbolSupplier::CrashReporterSymbolSupplier(QString pUniboardSymFiles) { - mUniboardSymFile.setFileName(pUniboardSymFiles); -} -// Returns the path to the symbol file for the given module. -google_breakpad::SymbolSupplier::SymbolResult CrashReporterSymbolSupplier::GetSymbolFile(const google_breakpad::CodeModule *module, - const google_breakpad::SystemInfo *system_info, - string *symbol_file) -{ - QString moduleName = QString::fromStdString(module->code_file()); - if (moduleName.contains("Uniboard")) - { - *symbol_file = mUniboardSymFile.fileName().toStdString(); - return FOUND; - } - return NOT_FOUND; -} - -// Returns the path to the symbol file for the given module. -google_breakpad::SymbolSupplier::SymbolResult CrashReporterSymbolSupplier::GetSymbolFile(const google_breakpad::CodeModule *module, - const google_breakpad::SystemInfo *system_info, - string *symbol_file, - string *symbol_data) -{ - SymbolSupplier::SymbolResult s = GetSymbolFile(module, - system_info, - symbol_file); - - - if (s == FOUND) { - std::ifstream in(symbol_file->c_str()); - getline(in, *symbol_data, std::string::traits_type::to_char_type( - std::string::traits_type::eof())); - in.close(); - } - - return s; -} diff --git a/tools/CrashReportViewer/CrashReporterSymbolSupplier.h b/tools/CrashReportViewer/CrashReporterSymbolSupplier.h deleted file mode 100644 index db0095df..00000000 --- a/tools/CrashReportViewer/CrashReporterSymbolSupplier.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2012 Webdoc SA - * - * This file is part of Open-Sankoré. - * - * Open-Sankoré is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License, - * with a specific linking exception for the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the - * same license as the "OpenSSL" library). - * - * Open-Sankoré is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Open-Sankoré. If not, see . - */ - - -#ifndef CRASHREPORTERSYMBOLSUPPLIER_H_ -#define CRASHREPORTERSYMBOLSUPPLIER_H_ - -#include -#include "google_breakpad/processor/symbol_supplier.h" - -using std::string; - -class CrashReporterSymbolSupplier : public google_breakpad::SymbolSupplier -{ -public: - CrashReporterSymbolSupplier(QString pUniboardSymFiles); - virtual ~CrashReporterSymbolSupplier() {} - - // Returns the path to the symbol file for the given module. - SymbolResult GetSymbolFile(const google_breakpad::CodeModule *module, - const google_breakpad::SystemInfo *system_info, - string *symbol_file); - - // Returns the path to the symbol file for the given module. - SymbolResult GetSymbolFile(const google_breakpad::CodeModule *module, - const google_breakpad::SystemInfo *system_info, - string *symbol_file, - string *symbol_data); - -private: - QFile mUniboardSymFile; - -}; -#endif /* CRASHREPORTERSYMBOLSUPPLIER_H_ */ diff --git a/tools/CrashReportViewer/CrashWindow.cpp b/tools/CrashReportViewer/CrashWindow.cpp deleted file mode 100644 index d5c93f0c..00000000 --- a/tools/CrashReportViewer/CrashWindow.cpp +++ /dev/null @@ -1,325 +0,0 @@ -/* - * Copyright (C) 2012 Webdoc SA - * - * This file is part of Open-Sankoré. - * - * Open-Sankoré is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License, - * with a specific linking exception for the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the - * same license as the "OpenSSL" library). - * - * Open-Sankoré is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Open-Sankoré. If not, see . - */ - - -#include "CrashWindow.h" -#include "ui_CrashReportViewer.h" -#include "CrashReporterSymbolSupplier.h" - -CrashWindow::CrashWindow(QWidget* parent) : QDialog(parent) -{ - mCrashReporterUi = new Ui::UniboardCrashreporter(); - mCrashReporterUi->setupUi(this); - mCrashReporterUi->crashReportResult->setFont(QFont("Monaco", 11)); - - connect(mCrashReporterUi->viewReportButton, SIGNAL(clicked(bool)), this, SLOT(showReport())); - connect(mCrashReporterUi->dumpFileButton, SIGNAL(clicked(bool)), this, SLOT(chooseDumpFile())); - connect(mCrashReporterUi->symFileButton, SIGNAL(clicked(bool)), this, SLOT(chooseSymboleFile())); -} - -CrashWindow::~CrashWindow() -{ - // NOOP -} - -void CrashWindow::setDumpFilePath(const QString &fileName) -{ - mCrashReporterUi->dumpFilePath->setText(fileName); -} - -void CrashWindow::chooseDumpFile() -{ - QSettings settings("Mnemis", "CrashReporter"); - QString dumpFileName = QDesktopServices::storageLocation(QDesktopServices::HomeLocation); - if (settings.contains("DumpFileName")) - { - dumpFileName = settings.value("DumpFileName").toString(); - } - QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), - dumpFileName, - tr("Dump file (*.dmp)")); - settings.setValue("DumpFileName", QVariant(fileName)); - setDumpFilePath(fileName); -} - -void CrashWindow::chooseSymboleFile() -{ - QSettings settings("Mnemis", "CrashReporter"); - QString symFileName = QDesktopServices::storageLocation(QDesktopServices::HomeLocation); - if (settings.contains("SymFileName")) - { - symFileName = settings.value("SymFileName").toString(); - } - QString fileName = QFileDialog::getOpenFileName(this, tr("Open File"), - symFileName, - tr("Symbol file (*.sym)")); - settings.setValue("SymFileName", QVariant(fileName)); - mCrashReporterUi->symFilePath->setText(fileName); -} - -//============================================================================= -int CrashWindow::PrintRegister(const char *name, u_int32_t value, int sequence) { - if (sequence % 4 == 0) { - mReport.append("\n"); - } - // string should not exceed 200 byte!!! - size_t BufSize = 2000; - char buf[BufSize]; - - snprintf(buf, BufSize, "%6s = 0x%08x ", name, value); - QString str = QString::fromAscii(buf); - mReport.append(str); - return ++sequence; -} - -//============================================================================= -void CrashWindow::PrintStack(const CallStack* stack, const string &cpu) { - int frame_count = stack->frames()->size(); - char buffer[1024]; - - for (int frame_index = 0; frame_index < frame_count; ++frame_index) { - const StackFrame *frame = stack->frames()->at(frame_index); - const CodeModule *module = frame->module; - // string should not exceed 200 byte!!! - size_t BufSize = 2000; - char buf[BufSize]; - snprintf(buf, BufSize, "%2d ", frame_index); - mReport.append(QString::fromAscii(buf)); - - if (module) { - // Module name (20 chars max) - strcpy(buffer, PathnameStripper::File(module->code_file()).c_str()); - int maxStr = 20; - buffer[maxStr] = 0; - snprintf(buf, BufSize, "%-*s", maxStr, buffer); - mReport.append(QString::fromAscii(buf)); - - - strcpy(buffer, module->version().c_str()); - buffer[maxStr] = 0; - snprintf(buf, BufSize, "%-*s",maxStr, buffer); - mReport.append(QString::fromAscii(buf)); - - u_int64_t instruction = frame->instruction; - - // PPC only: Adjust the instruction to match that of Crash reporter. The - // instruction listed is actually the return address. See the detailed - // comments in stackwalker_ppc.cc for more information. - if (cpu == "ppc" && frame_index) - instruction += 4; - snprintf(buf, BufSize, " 0x%08llx ", instruction); - mReport.append(QString::fromAscii(buf)); - - // Function name - if (!frame->function_name.empty()) { - snprintf(buf, BufSize, "%s", frame->function_name.c_str()); - mReport.append(QString::fromAscii(buf)); - if (!frame->source_file_name.empty()) { - string source_file = PathnameStripper::File(frame->source_file_name); - snprintf(buf, BufSize, " + 0x%llx (%s:%d)", - instruction - frame->source_line_base, - source_file.c_str(), frame->source_line); - mReport.append(QString::fromAscii(buf)); - } else { - snprintf(buf, BufSize, " + 0x%llx", instruction - frame->function_base); - mReport.append(QString::fromAscii(buf)); - } - } - } - mReport.append("\n"); - } -} - -//============================================================================= -void CrashWindow::PrintRegisters(const CallStack *stack, const string &cpu) { - int sequence = 0; - const StackFrame *frame = stack->frames()->at(0); - if (cpu == "x86") { - const StackFrameX86 *frame_x86 = - reinterpret_cast(frame); - - if (frame_x86->context_validity & StackFrameX86::CONTEXT_VALID_EIP) - sequence = PrintRegister("eip", frame_x86->context.eip, sequence); - if (frame_x86->context_validity & StackFrameX86::CONTEXT_VALID_ESP) - sequence = PrintRegister("esp", frame_x86->context.esp, sequence); - if (frame_x86->context_validity & StackFrameX86::CONTEXT_VALID_EBP) - sequence = PrintRegister("ebp", frame_x86->context.ebp, sequence); - if (frame_x86->context_validity & StackFrameX86::CONTEXT_VALID_EBX) - sequence = PrintRegister("ebx", frame_x86->context.ebx, sequence); - if (frame_x86->context_validity & StackFrameX86::CONTEXT_VALID_ESI) - sequence = PrintRegister("esi", frame_x86->context.esi, sequence); - if (frame_x86->context_validity & StackFrameX86::CONTEXT_VALID_EDI) - sequence = PrintRegister("edi", frame_x86->context.edi, sequence); - if (frame_x86->context_validity == StackFrameX86::CONTEXT_VALID_ALL) { - sequence = PrintRegister("eax", frame_x86->context.eax, sequence); - sequence = PrintRegister("ecx", frame_x86->context.ecx, sequence); - sequence = PrintRegister("edx", frame_x86->context.edx, sequence); - sequence = PrintRegister("efl", frame_x86->context.eflags, sequence); - } - } else if (cpu == "ppc") { - const StackFramePPC *frame_ppc = - reinterpret_cast(frame); - - if (frame_ppc->context_validity & StackFramePPC::CONTEXT_VALID_ALL == - StackFramePPC::CONTEXT_VALID_ALL) { - sequence = PrintRegister("srr0", frame_ppc->context.srr0, sequence); - sequence = PrintRegister("srr1", frame_ppc->context.srr1, sequence); - sequence = PrintRegister("cr", frame_ppc->context.cr, sequence); - sequence = PrintRegister("xer", frame_ppc->context.xer, sequence); - sequence = PrintRegister("lr", frame_ppc->context.lr, sequence); - sequence = PrintRegister("ctr", frame_ppc->context.ctr, sequence); - sequence = PrintRegister("mq", frame_ppc->context.mq, sequence); - sequence = PrintRegister("vrsave", frame_ppc->context.vrsave, sequence); - - sequence = 0; - char buffer[5]; - for (int i = 0; i < MD_CONTEXT_PPC_GPR_COUNT; ++i) { - sprintf(buffer, "r%d", i); - sequence = PrintRegister(buffer, frame_ppc->context.gpr[i], sequence); - } - } else { - if (frame_ppc->context_validity & StackFramePPC::CONTEXT_VALID_SRR0) - sequence = PrintRegister("srr0", frame_ppc->context.srr0, sequence); - if (frame_ppc->context_validity & StackFramePPC::CONTEXT_VALID_GPR1) - sequence = PrintRegister("r1", frame_ppc->context.gpr[1], sequence); - } - } - - mReport.append("\n"); -} - -void CrashWindow::PrintModules(const CodeModules *modules) { - if (!modules) - return; - - mReport.append("\n"); - mReport.append("Loaded modules:\n"); - - u_int64_t main_address = 0; - const CodeModule *main_module = modules->GetMainModule(); - if (main_module) { - main_address = main_module->base_address(); - } - - unsigned int module_count = modules->module_count(); - for (unsigned int module_sequence = 0; - module_sequence < module_count; - ++module_sequence) { - const CodeModule *module = modules->GetModuleAtSequence(module_sequence); - assert(module); - u_int64_t base_address = module->base_address(); - // string should not exceed 200 byte!!! - size_t BufSize = 2000; - char buf[BufSize]; - - snprintf(buf, BufSize, "0x%08llx - 0x%08llx %s %s%s %s\n", - base_address, base_address + module->size() - 1, - PathnameStripper::File(module->code_file()).c_str(), - module->version().empty() ? "???" : module->version().c_str(), - main_module != NULL && base_address == main_address ? - " (main)" : "", - module->code_file().c_str()); - mReport.append(QString::fromAscii(buf)); - } -} - -void CrashWindow::showReport() -{ - qDebug() << "compute report"; - mReport.clear(); - QString minidump_file = mCrashReporterUi->dumpFilePath->text(); - BasicSourceLineResolver resolver; - - scoped_ptr symbol_supplier( - - new CrashReporterSymbolSupplier(mCrashReporterUi->symFilePath->text())); - scoped_ptr - minidump_processor(new MinidumpProcessor(symbol_supplier.get(), &resolver)); - ProcessState process_state; - if (minidump_processor->Process(minidump_file.toStdString(), &process_state) != - MinidumpProcessor::PROCESS_OK) { - mReport += "MinidumpProcessor::Process failed\n"; - return; - } - const SystemInfo *system_info = process_state.system_info(); - string cpu = system_info->cpu; - // Convert the time to a string - u_int32_t time_date_stamp = process_state.time_date_stamp(); - struct tm timestruct; - gmtime_r(reinterpret_cast(&time_date_stamp), ×truct); - char timestr[20]; - // string should not exceed 200 byte!!! - size_t BufSize = 2000; - char buf[BufSize]; - strftime(timestr, 20, "%Y-%m-%d %H:%M:%S", ×truct); - snprintf(buf, BufSize, "Date: %s GMT\n", timestr); - mReport.append(QString::fromAscii(buf)); - snprintf(buf, BufSize, "Operating system: %s (%s)\n", system_info->os.c_str(), - system_info->os_version.c_str()); - mReport.append(QString::fromAscii(buf)); - snprintf(buf, BufSize, "Architecture: %s\n", cpu.c_str()); - mReport.append(QString::fromAscii(buf)); - - if (process_state.crashed()) { - snprintf(buf, BufSize, "Crash reason: %s\n", process_state.crash_reason().c_str()); - mReport.append(QString::fromAscii(buf)); - snprintf(buf, BufSize, "Crash address: 0x%llx\n", process_state.crash_address()); - mReport.append(QString::fromAscii(buf)); - } else { - mReport.append("No crash\n"); - } - - int requesting_thread = process_state.requesting_thread(); - if (requesting_thread != -1) { - mReport.append("\n"); - snprintf(buf, BufSize, "Thread %d (%s)\n", - requesting_thread, - process_state.crashed() ? "crashed" : - "requested dump, did not crash"); - mReport.append(QString::fromAscii(buf)); - PrintStack(process_state.threads()->at(requesting_thread), cpu); - } - - // Print all of the threads in the dump. - int thread_count = process_state.threads()->size(); - for (int thread_index = 0; thread_index < thread_count; ++thread_index) { - if (thread_index != requesting_thread) { - // Don't print the crash thread again, it was already printed. - mReport.append("\n"); - snprintf(buf, BufSize,"Thread %d\n", thread_index); - mReport.append(QString::fromAscii(buf)); - PrintStack(process_state.threads()->at(thread_index), cpu); - } - } - - // Print the crashed registers - if (requesting_thread != -1) { - snprintf(buf, BufSize,"\nThread %d:", requesting_thread); - mReport.append(QString::fromAscii(buf)); - PrintRegisters(process_state.threads()->at(requesting_thread), cpu); - } - - // Print information about modules - PrintModules(process_state.modules()); - mCrashReporterUi->crashReportResult->setPlainText(mReport); -} - - diff --git a/tools/CrashReportViewer/CrashWindow.h b/tools/CrashReportViewer/CrashWindow.h deleted file mode 100644 index 89a5907a..00000000 --- a/tools/CrashReportViewer/CrashWindow.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2012 Webdoc SA - * - * This file is part of Open-Sankoré. - * - * Open-Sankoré is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License, - * with a specific linking exception for the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the - * same license as the "OpenSSL" library). - * - * Open-Sankoré is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Open-Sankoré. If not, see . - */ - - -#ifndef CRASHWINDOW_H_ -#define CRASHWINDOW_H_ - -#include -#include "google_breakpad/processor/basic_source_line_resolver.h" -#include "google_breakpad/processor/call_stack.h" -#include "google_breakpad/processor/code_module.h" -#include "google_breakpad/processor/minidump.h" -#include "google_breakpad/processor/minidump_processor.h" -#include "google_breakpad/processor/process_state.h" -#include "google_breakpad/processor/stack_frame_cpu.h" -#include "google_breakpad/processor/system_info.h" -#include "processor/pathname_stripper.h" -#include "processor/scoped_ptr.h" -#include "processor/simple_symbol_supplier.h" - -using std::string; - -using google_breakpad::BasicSourceLineResolver; -using google_breakpad::CallStack; -using google_breakpad::CodeModule; -using google_breakpad::CodeModules; -using google_breakpad::MinidumpProcessor; -using google_breakpad::PathnameStripper; -using google_breakpad::ProcessState; -using google_breakpad::scoped_ptr; -using google_breakpad::StackFrame; -using google_breakpad::StackFramePPC; -using google_breakpad::StackFrameX86; -using google_breakpad::SystemInfo; - -namespace Ui -{ - class UniboardCrashreporter; -} - -class CrashWindow : public QDialog -{ - Q_OBJECT; -public: - CrashWindow(QWidget* parent = 0); - virtual ~CrashWindow(); - - void setDumpFilePath(const QString &fileName); - -private slots: - void showReport(); - void chooseDumpFile(); - void chooseSymboleFile(); - -private: - int PrintRegister(const char *name, u_int32_t value, int sequence); - void PrintStack(const CallStack* stack, const string &cpu); - void PrintRegisters(const CallStack *stack, const string &cpu); - void PrintModules(const CodeModules *modules); - Ui::UniboardCrashreporter* mCrashReporterUi; - QString mReport; -}; - -#endif /* CRASHWINDOW_H_ */ diff --git a/tools/CrashReportViewer/Info.plist b/tools/CrashReportViewer/Info.plist deleted file mode 100644 index 25a3d4b6..00000000 --- a/tools/CrashReportViewer/Info.plist +++ /dev/null @@ -1,35 +0,0 @@ - - - - - CFBundleDocumentTypes - - - CFBundleTypeName - com.microsoft.minidump - CFBundleTypeRole - Viewer - LSHandlerRank - Alternate - CFBundleTypeExtensions - - dmp - - - - CFBundleExecutable - Crash Report Viewer - CFBundleGetInfoString - Crash Report Viewer 1.0 - CFBundleIconFile - Bug.icns - CFBundleIdentifier - com.mnemis.uniboard.CrashReportViewer - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - UBCv - - diff --git a/tools/CrashReportViewer/main.cpp b/tools/CrashReportViewer/main.cpp deleted file mode 100644 index a3a00122..00000000 --- a/tools/CrashReportViewer/main.cpp +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (C) 2012 Webdoc SA - * - * This file is part of Open-Sankoré. - * - * Open-Sankoré is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License, - * with a specific linking exception for the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the - * same license as the "OpenSSL" library). - * - * Open-Sankoré is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Open-Sankoré. If not, see . - */ - - -#include -#include "CrashWindow.h" -#include "client/mac/handler/exception_handler.h" - -class CRVApplication : public QApplication -{ -public: - - CRVApplication(int &argc, char **argv) : QApplication(argc, argv) {} - - bool event(QEvent *e) - { - if (e->type() == QEvent::FileOpen) - { - window.setDumpFilePath(static_cast(e)->file()); - return true; - } - return QApplication::event(e); - } - - CrashWindow window; -}; - -int main(int argc, char *argv[]) -{ - CRVApplication app(argc, argv); - - app.window.show(); - - app.exec(); -} diff --git a/tools/CrashReportViewer/release.macx.sh b/tools/CrashReportViewer/release.macx.sh deleted file mode 100644 index c6e6247c..00000000 --- a/tools/CrashReportViewer/release.macx.sh +++ /dev/null @@ -1,69 +0,0 @@ -# -------------------------------------------------------------------- -# This program is free software: you can 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 . -# --------------------------------------------------------------------- - -#!/bin/bash - -# Qt base directory -QTDIR=/usr/local/Trolltech/Qt-4.6.1 - -# Executables -MACDEPLOYQT="$QTDIR/bin/macdeployqt" -QMAKE="$QTDIR/bin/qmake" - -# Directories -BUILD_DIR="build/macx" - -function abort { - printf "\033[31merror:\033[0m $1\n" - exit 1 -} - -function warn { - if [ $testMode == 1 ]; then - printf "\033[33mwarning:\033[0m $1\n" - else - abort "$1" - fi -} - -function checkExecutable { - if [ ! -x "$1" ]; then - abort "$1 not found" - fi -} - -# Check for executables -checkExecutable "$MACDEPLOYQT" -checkExecutable "$QMAKE" - - -# delete the build directory -rm -rf "$BUILD_DIR" - -# generate Makefile (makefile.macx) -$QMAKE -spec macx-g++ -config release - -# build -make - -if [ $? != 0 ]; then - abort "compilation failed" -fi - -APP="$BUILD_DIR/Crash Report Viewer.app" - -# bundle Qt Frameorks (/Library/Framworks) into the app bundle -$MACDEPLOYQT "$APP" - diff --git a/tools/pdf2image/core/UBPlatformUtils.cpp b/tools/pdf2image/core/UBPlatformUtils.cpp deleted file mode 100644 index 8a09fd5e..00000000 --- a/tools/pdf2image/core/UBPlatformUtils.cpp +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2012 Webdoc SA - * - * This file is part of Open-Sankoré. - * - * Open-Sankoré is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License, - * with a specific linking exception for the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the - * same license as the "OpenSSL" library). - * - * Open-Sankoré is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Open-Sankoré. If not, see . - */ - - -#include - -#include "UBPlatformUtils.h" - - -QString UBPlatformUtils::applicationResourcesDirectory() -{ - return QCoreApplication::applicationDirPath() + "/resources"; -} diff --git a/tools/pdf2image/core/UBPlatformUtils.h b/tools/pdf2image/core/UBPlatformUtils.h deleted file mode 100644 index 58739593..00000000 --- a/tools/pdf2image/core/UBPlatformUtils.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (C) 2012 Webdoc SA - * - * This file is part of Open-Sankoré. - * - * Open-Sankoré is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License, - * with a specific linking exception for the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the - * same license as the "OpenSSL" library). - * - * Open-Sankoré is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Open-Sankoré. If not, see . - */ - - -#include - -class UBPlatformUtils -{ - public: - static QString applicationResourcesDirectory(); -}; diff --git a/tools/pdf2image/pdf2image.cpp b/tools/pdf2image/pdf2image.cpp deleted file mode 100644 index ae47b5f8..00000000 --- a/tools/pdf2image/pdf2image.cpp +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (C) 2012 Webdoc SA - * - * This file is part of Open-Sankoré. - * - * Open-Sankoré is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, version 3 of the License, - * with a specific linking exception for the OpenSSL project's - * "OpenSSL" library (or with modified versions of it that use the - * same license as the "OpenSSL" library). - * - * Open-Sankoré is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Open-Sankoré. If not, see . - */ - - -#include -#include -#include "core/UBPlatformUtils.h" - -void usage(QString progName) -{ - qDebug() << "usage:" << progName << "pdfFile pageNumber width height outputDir [imageFormat=png]"; - qDebug() << "pdfFile is the path to the pdf file"; - qDebug() << "imageFormat must be one of " << QImageWriter::supportedImageFormats(); -} - -int main(int argc, char *argv[]) -{ - QCoreApplication app(argc, argv); - - QPixmapCache::setCacheLimit(0); - - QStringList args = app.arguments(); - - qreal width, height; - QString pdfFile; - QString imageFormat = "png"; - QString outputDir = "."; - int pageNumber = 1; - qDebug() << UBPlatformUtils::applicationResourcesDirectory(); - if (args.count() >= 6 && args.count() <= 7) { - pdfFile = args.at(1); - pageNumber = args.at(2).toInt(); - width = args.at(3).toDouble(); - height = args.at(4).toDouble(); - outputDir = args.at(5); - if (args.count() == 7) { - imageFormat = args.at(6); - } - } else { - usage(args.at(0)); - return 1; - } - - QString fileName = QFileInfo(pdfFile).completeBaseName(); - - if (!QImageWriter::supportedImageFormats().contains(imageFormat.toAscii())) { - usage(args.at(0)); - return 1; - } - - XPDFRenderer pdf(pdfFile); - - if (!pdf.isValid()) { - qCritical() << fileName << "appears to be an invalid pdf file"; - return 1; - } - - if (pageNumber < 1 || pageNumber > pdf.pageCount()) { - qCritical() << fileName << "has" << pdf.pageCount() << "pages"; - return 1; - } - - //qDebug() << "Converting" << pdfFile << "(" << pageNumber << ") into" << imageFormat; - - QImage image(width, height, QImage::Format_ARGB32); - - QPainter p(&image); - - p.setBackground(Qt::transparent); - p.eraseRect(0, 0, width, height); - - qreal pdfWidth = pdf.pageSize(pageNumber).width(); - qreal pdfHeight = pdf.pageSize(pageNumber).height(); - qreal ratio = qMin(width / pdfWidth, height / pdfHeight); - p.scale(ratio, ratio); - if (width > pdfWidth) { - p.translate((pdfWidth - (width / ratio)) / -2, 0); - } - if (height > pdfHeight) { - p.translate(0, (pdfHeight - (height / ratio)) / -2); - } - pdf.render(&p, pageNumber); - - QString pageStr = QString("%1").arg(pageNumber, 5, 10, QChar('0')); - QString outputPath = outputDir + "/" + fileName + pageStr + "." + imageFormat; - bool ok = image.save(outputPath, imageFormat.toAscii().constData()); - - return ok ? 0 : 1; -} diff --git a/tools/pdf2image/pdf2image.pro b/tools/pdf2image/pdf2image.pro deleted file mode 100644 index 3ef307a4..00000000 --- a/tools/pdf2image/pdf2image.pro +++ /dev/null @@ -1,40 +0,0 @@ -TARGET = "pdf2image.bin" -TEMPLATE = app -CONFIG += console warn_off - -UNIBOARD_SRC = ../../src -DESTDIR = "build/Product" -OBJECTS_DIR = "build/objects" -MOC_DIR = "build/moc" -RCC_DIR = "build/rcc" -UI_DIR = "build/ui" - -PDF_FONTS.path = $$DESTDIR/resources -PDF_FONTS.files = ../../resources/fonts - -SCRIPT.path = $$DESTDIR -SCRIPT.files = resources/** - -QT_CORE.path = $$DESTDIR -QT_CORE.files = /home/mnemis/qtsdk-2009.02/qt/lib/libQtCore.so.4.5.1 - -QT_GUI.path = $$DESTDIR/ -QT_GUI.files = /home/mnemis/qtsdk-2009.02/qt/lib/libQtGui.so.4.5.1 - -SOURCES = pdf2image.cpp \ - core/UBPlatformUtils.cpp \ - $$UNIBOARD_SRC/pdf/PDFRenderer.cpp \ - $$UNIBOARD_SRC/pdf/XPDFRenderer.cpp - -HEADERS = $$UNIBOARD_SRC/pdf/PDFRenderer.h \ - $$UNIBOARD_SRC/pdf/XPDFRenderer.h - -include(../../thirdparty/libs.pri) - -INCLUDEPATH += $$UNIBOARD_SRC/pdf - -macx { - CONFIG -= app_bundle -} - -INSTALLS = PDF_FONTS QT_CORE QT_GUI SCRIPT diff --git a/tools/pdf2image/resources/pdf2image b/tools/pdf2image/resources/pdf2image deleted file mode 100644 index 6e0f9b1b..00000000 --- a/tools/pdf2image/resources/pdf2image +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -LD_LIBRARY_PATH=`dirname $0`:$LD_LIBRARY_PATH -export LD_LIBRARY_PATH -`dirname $0`/pdf2image $*