diff --git a/resources/forms/preferences.ui b/resources/forms/preferences.ui index 2d694d52..86686f3c 100644 --- a/resources/forms/preferences.ui +++ b/resources/forms/preferences.ui @@ -626,9 +626,9 @@ <!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:'Ubuntu'; 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-size:9pt; color:#1a1a1a;">The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit.</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-size:9pt; color:#1a1a1a;">See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL please contact </span><a href="mailto:openssl-core@openssl.org"><span style=" font-size:9pt; text-decoration: underline; color:#0000ff;">openssl-core@openssl.org</span></a><span style=" font-size:9pt; color:#1a1a1a;">.</span><span style=" font-size:9pt;"> </span></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:9pt; 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=" color:#1a1a1a;">The OpenSSL toolkit stays under a dual license, i.e. both the conditions of the OpenSSL License and the original SSLeay license apply to the toolkit.</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=" color:#1a1a1a;">See below for the actual license texts. Actually both licenses are BSD-style Open Source licenses. In case of any license issues related to OpenSSL please contact </span><a href="mailto:openssl-core@openssl.org"><span style=" text-decoration: underline; color:#0000ff;">openssl-core@openssl.org</span></a><span style=" color:#1a1a1a;">.</span> </p></body></html> @@ -645,8 +645,8 @@ p, li { white-space: pre-wrap; } <!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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler</span><span style=" font-size:12pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#1a1a1a;"> 3. This notice may not be removed or altered from any source distribution.</span><span style=" font-size:9pt;"> </span></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#1a1a1a;">Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler</span><span style=" font-size:12pt;"><br /><br /></span><span style=" color:#1a1a1a;"> This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.</span><br /><br /><span style=" color:#1a1a1a;"> Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:</span><br /><br /><span style=" color:#1a1a1a;"> 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.</span><br /><span style=" color:#1a1a1a;"> 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.</span><br /><span style=" color:#1a1a1a;"> 3. This notice may not be removed or altered from any source distribution.</span> </p></body></html> @@ -663,8 +663,8 @@ p, li { white-space: pre-wrap; } <!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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#000000;">Xpdf is licensed under the GNU General Public License (GPL), version 2.</span></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#000000;">Xpdf is licensed under the GNU General Public License (GPL), version 2.</span></p></body></html> @@ -681,8 +681,8 @@ p, li { white-space: pre-wrap; } <!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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">GNU Library or Lesser General Public License (LGPL), zlib/libpng License</span></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">GNU Library or Lesser General Public License (LGPL), zlib/libpng License</p></body></html> @@ -699,178 +699,178 @@ p, li { white-space: pre-wrap; } <!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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">SANKORE3.1 is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version. You can find the source code of this software at &lt;https://adullact.net/projects/sankore/&gt;</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">SANKORE3.1 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> GNU LESSER GENERAL PUBLIC LICENSE</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Version 3, 29 June 2007</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Everyone is permitted to copy and distribute verbatim copies</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> of this license document, but changing it is not allowed.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> This version of the GNU Lesser General Public License incorporates</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">the terms and conditions of version 3 of the GNU General Public</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">License, supplemented by the additional permissions listed below.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> 0. Additional Definitions.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> As used herein, &quot;this License&quot; refers to version 3 of the GNU Lesser</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">General Public License, and the &quot;GNU GPL&quot; refers to version 3 of the GNU</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">General Public License.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> &quot;The Library&quot; refers to a covered work governed by this License,</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">other than an Application or a Combined Work as defined below.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> An &quot;Application&quot; is any work that makes use of an interface provided</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">by the Library, but which is not otherwise based on the Library.</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">Defining a subclass of a class defined by the Library is deemed a mode</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">of using an interface provided by the Library.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> A &quot;Combined Work&quot; is a work produced by combining or linking an</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">Application with the Library. The particular version of the Library</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">with which the Combined Work was made is also called the &quot;Linked</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">Version&quot;.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> The &quot;Minimal Corresponding Source&quot; for a Combined Work means the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">Corresponding Source for the Combined Work, excluding any source code</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">for portions of the Combined Work that, considered in isolation, are</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">based on the Application, and not on the Linked Version.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> The &quot;Corresponding Application Code&quot; for a Combined Work means the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">object code and/or source code for the Application, including any data</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">and utility programs needed for reproducing the Combined Work from the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">Application, but excluding the System Libraries of the Combined Work.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> 1. Exception to Section 3 of the GNU GPL.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> You may convey a covered work under sections 3 and 4 of this License</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">without being bound by section 3 of the GNU GPL.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> 2. Conveying Modified Versions.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> If you modify a copy of the Library, and, in your modifications, a</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">facility refers to a function or data to be supplied by an Application</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">that uses the facility (other than as an argument passed when the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">facility is invoked), then you may convey a copy of the modified</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">version:</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> a) under this License, provided that you make a good faith effort to</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> ensure that, in the event an Application does not supply the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> function or data, the facility still operates, and performs</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> whatever part of its purpose remains meaningful, or</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> b) under the GNU GPL, with none of the additional permissions of</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> this License applicable to that copy.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> 3. Object Code Incorporating Material from Library Header Files.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> The object code form of an Application may incorporate material from</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">a header file that is part of the Library. You may convey such object</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">code under terms of your choice, provided that, if the incorporated</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">material is not limited to numerical parameters, data structure</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">layouts and accessors, or small macros, inline functions and templates</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">(ten or fewer lines in length), you do both of the following:</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> a) Give prominent notice with each copy of the object code that the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Library is used in it and that the Library and its use are</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> covered by this License.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> b) Accompany the object code with a copy of the GNU GPL and this license</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> document.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> 4. Combined Works.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> You may convey a Combined Work under terms of your choice that,</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">taken together, effectively do not restrict modification of the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">portions of the Library contained in the Combined Work and reverse</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">engineering for debugging such modifications, if you also do each of</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">the following:</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> a) Give prominent notice with each copy of the Combined Work that</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> the Library is used in it and that the Library and its use are</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> covered by this License.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> b) Accompany the Combined Work with a copy of the GNU GPL and this license</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> document.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> c) For a Combined Work that displays copyright notices during</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> execution, include the copyright notice for the Library among</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> these notices, as well as a reference directing the user to the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> copies of the GNU GPL and this license document.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> d) Do one of the following:</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> 0) Convey the Minimal Corresponding Source under the terms of this</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> License, and the Corresponding Application Code in a form</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> suitable for, and under terms that permit, the user to</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> recombine or relink the Application with a modified version of</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> the Linked Version to produce a modified Combined Work, in the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> manner specified by section 6 of the GNU GPL for conveying</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Corresponding Source.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> 1) Use a suitable shared library mechanism for linking with the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Library. A suitable mechanism is one that (a) uses at run time</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> a copy of the Library already present on the user's computer</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> system, and (b) will operate properly with a modified version</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> of the Library that is interface-compatible with the Linked</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Version.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> e) Provide Installation Information, but only if you would otherwise</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> be required to provide such information under section 6 of the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> GNU GPL, and only to the extent that such information is</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> necessary to install and execute a modified version of the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Combined Work produced by recombining or relinking the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Application with a modified version of the Linked Version. (If</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> you use option 4d0, the Installation Information must accompany</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> the Minimal Corresponding Source and Corresponding Application</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Code. If you use option 4d1, you must provide the Installation</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Information in the manner specified by section 6 of the GNU GPL</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> for conveying Corresponding Source.)</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> 5. Combined Libraries.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> You may place library facilities that are a work based on the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">Library side by side in a single library together with other library</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">facilities that are not Applications and are not covered by this</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">License, and convey such a combined library under terms of your</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">choice, if you do both of the following:</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> a) Accompany the combined library with a copy of the same work based</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> on the Library, uncombined with any other library facilities,</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> conveyed under the terms of this License.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> b) Give prominent notice with the combined library that part of it</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> is a work based on the Library, and explaining where to find the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> accompanying uncombined form of the same work.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> 6. Revised Versions of the GNU Lesser General Public License.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> The Free Software Foundation may publish revised and/or new versions</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">of the GNU Lesser General Public License from time to time. Such new</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">versions will be similar in spirit to the present version, but may</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">differ in detail to address new problems or concerns.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> Each version is given a distinguishing version number. If the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">Library as you received it specifies that a certain numbered version</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">of the GNU Lesser General Public License &quot;or any later version&quot;</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">applies to it, you have the option of following the terms and</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">conditions either of that published version or of any later version</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">published by the Free Software Foundation. If the Library as you</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">received it does not specify a version number of the GNU Lesser</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">General Public License, you may choose any version of the GNU Lesser</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">General Public License ever published by the Free Software Foundation.</span></p> -<p align="justify" 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-size:9pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;"> If the Library as you received it specifies that a proxy can decide</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">whether future versions of the GNU Lesser General Public License shall</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">apply, that proxy's public statement of acceptance of any version is</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">permanent authorization for you to choose that version for the</span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">Library.</span></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SANKORE3.1 is free software: you can redistribute it and/or modify it under the terms of the Lesser GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version. You can find the source code of this software at &lt;https://adullact.net/projects/sankore/&gt;</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">SANKORE3.1 is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License below for more details.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> GNU LESSER GENERAL PUBLIC LICENSE</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Version 3, 29 June 2007</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Copyright (C) 2007 Free Software Foundation, Inc. &lt;http://fsf.org/&gt;</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Everyone is permitted to copy and distribute verbatim copies</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> of this license document, but changing it is not allowed.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> This version of the GNU Lesser General Public License incorporates</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the terms and conditions of version 3 of the GNU General Public</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">License, supplemented by the additional permissions listed below.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 0. Additional Definitions.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> As used herein, &quot;this License&quot; refers to version 3 of the GNU Lesser</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">General Public License, and the &quot;GNU GPL&quot; refers to version 3 of the GNU</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">General Public License.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> &quot;The Library&quot; refers to a covered work governed by this License,</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">other than an Application or a Combined Work as defined below.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> An &quot;Application&quot; is any work that makes use of an interface provided</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">by the Library, but which is not otherwise based on the Library.</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Defining a subclass of a class defined by the Library is deemed a mode</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">of using an interface provided by the Library.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> A &quot;Combined Work&quot; is a work produced by combining or linking an</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Application with the Library. The particular version of the Library</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">with which the Combined Work was made is also called the &quot;Linked</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Version&quot;.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> The &quot;Minimal Corresponding Source&quot; for a Combined Work means the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Corresponding Source for the Combined Work, excluding any source code</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">for portions of the Combined Work that, considered in isolation, are</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">based on the Application, and not on the Linked Version.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> The &quot;Corresponding Application Code&quot; for a Combined Work means the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">object code and/or source code for the Application, including any data</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">and utility programs needed for reproducing the Combined Work from the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Application, but excluding the System Libraries of the Combined Work.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 1. Exception to Section 3 of the GNU GPL.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> You may convey a covered work under sections 3 and 4 of this License</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">without being bound by section 3 of the GNU GPL.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 2. Conveying Modified Versions.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> If you modify a copy of the Library, and, in your modifications, a</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">facility refers to a function or data to be supplied by an Application</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">that uses the facility (other than as an argument passed when the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">facility is invoked), then you may convey a copy of the modified</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">version:</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> a) under this License, provided that you make a good faith effort to</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> ensure that, in the event an Application does not supply the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> function or data, the facility still operates, and performs</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> whatever part of its purpose remains meaningful, or</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> b) under the GNU GPL, with none of the additional permissions of</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> this License applicable to that copy.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 3. Object Code Incorporating Material from Library Header Files.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> The object code form of an Application may incorporate material from</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">a header file that is part of the Library. You may convey such object</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">code under terms of your choice, provided that, if the incorporated</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">material is not limited to numerical parameters, data structure</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">layouts and accessors, or small macros, inline functions and templates</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(ten or fewer lines in length), you do both of the following:</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> a) Give prominent notice with each copy of the object code that the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Library is used in it and that the Library and its use are</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> covered by this License.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> b) Accompany the object code with a copy of the GNU GPL and this license</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> document.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 4. Combined Works.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> You may convey a Combined Work under terms of your choice that,</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">taken together, effectively do not restrict modification of the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">portions of the Library contained in the Combined Work and reverse</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">engineering for debugging such modifications, if you also do each of</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">the following:</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> a) Give prominent notice with each copy of the Combined Work that</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> the Library is used in it and that the Library and its use are</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> covered by this License.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> b) Accompany the Combined Work with a copy of the GNU GPL and this license</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> document.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> c) For a Combined Work that displays copyright notices during</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> execution, include the copyright notice for the Library among</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> these notices, as well as a reference directing the user to the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> copies of the GNU GPL and this license document.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> d) Do one of the following:</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 0) Convey the Minimal Corresponding Source under the terms of this</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> License, and the Corresponding Application Code in a form</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> suitable for, and under terms that permit, the user to</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> recombine or relink the Application with a modified version of</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> the Linked Version to produce a modified Combined Work, in the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> manner specified by section 6 of the GNU GPL for conveying</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Corresponding Source.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 1) Use a suitable shared library mechanism for linking with the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Library. A suitable mechanism is one that (a) uses at run time</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> a copy of the Library already present on the user's computer</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> system, and (b) will operate properly with a modified version</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> of the Library that is interface-compatible with the Linked</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Version.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> e) Provide Installation Information, but only if you would otherwise</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> be required to provide such information under section 6 of the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> GNU GPL, and only to the extent that such information is</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> necessary to install and execute a modified version of the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Combined Work produced by recombining or relinking the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Application with a modified version of the Linked Version. (If</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> you use option 4d0, the Installation Information must accompany</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> the Minimal Corresponding Source and Corresponding Application</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Code. If you use option 4d1, you must provide the Installation</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Information in the manner specified by section 6 of the GNU GPL</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> for conveying Corresponding Source.)</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 5. Combined Libraries.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> You may place library facilities that are a work based on the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Library side by side in a single library together with other library</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">facilities that are not Applications and are not covered by this</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">License, and convey such a combined library under terms of your</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">choice, if you do both of the following:</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> a) Accompany the combined library with a copy of the same work based</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> on the Library, uncombined with any other library facilities,</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> conveyed under the terms of this License.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> b) Give prominent notice with the combined library that part of it</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> is a work based on the Library, and explaining where to find the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> accompanying uncombined form of the same work.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> 6. Revised Versions of the GNU Lesser General Public License.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> The Free Software Foundation may publish revised and/or new versions</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">of the GNU Lesser General Public License from time to time. Such new</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">versions will be similar in spirit to the present version, but may</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">differ in detail to address new problems or concerns.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> Each version is given a distinguishing version number. If the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Library as you received it specifies that a certain numbered version</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">of the GNU Lesser General Public License &quot;or any later version&quot;</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">applies to it, you have the option of following the terms and</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">conditions either of that published version or of any later version</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">published by the Free Software Foundation. If the Library as you</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">received it does not specify a version number of the GNU Lesser</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">General Public License, you may choose any version of the GNU Lesser</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">General Public License ever published by the Free Software Foundation.</p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> If the Library as you received it specifies that a proxy can decide</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">whether future versions of the GNU Lesser General Public License shall</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">apply, that proxy's public statement of acceptance of any version is</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">permanent authorization for you to choose that version for the</p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Library.</p></body></html> @@ -894,13 +894,13 @@ p, li { white-space: pre-wrap; } <!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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#1a1a1a;">Sankoré 3.1 version , Copyright (C) 2010 Sankoré 3.1 comes with ABSOLUTELY NO WARRANTY.</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#35382a;"> </span></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#35382a;">This program is free software: you can 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.</span></p> -<p align="justify" 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-size:9pt; color:#35382a;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#35382a;">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</span></p> -<p align="justify" 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-size:9pt; color:#35382a;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#35382a;">You should have received a copy of the GNU General Public License along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</span></p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#1a1a1a;">Sankoré 3.1 version , Copyright (C) 2010 Sankoré 3.1 comes with ABSOLUTELY NO WARRANTY.</span><br /><span style=" color:#35382a;"> </span></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#35382a;">This program is free software: you can 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.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#35382a;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#35382a;">This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.</span></p> +<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; color:#35382a;"></p> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#35382a;">You should have received a copy of the GNU General Public License along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.</span></p></body></html> @@ -910,9 +910,9 @@ p, li { white-space: pre-wrap; } <!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:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;"> <p align="justify" 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-size:10pt;"></p> -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt; color:#3c3c3c;">GIPENA</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#3c3c3c;">Délégation Interministérielle à l'Education Numérique en Afrique</span><span style=" font-size:9pt;"><br /></span><span style=" font-size:9pt; color:#3c3c3c;">20 Avenue Ségur Paris 75007</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#3c3c3c;">Téléphone : 01 43 17 68 08</span><span style=" font-size:9pt;"><br /><br /></span><span style=" font-size:9pt; color:#3c3c3c;">email: </span><a href="mailto:contact@sankore.org"><span style=" font-size:9pt; text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a><span style=" font-size:9pt;"> </span></p></body></html> +<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" color:#3c3c3c;">GIPENA</span><br /><span style=" color:#3c3c3c;">Délégation Interministérielle à l'Education Numérique en Afrique</span><br /><span style=" color:#3c3c3c;">20 Avenue Ségur Paris 75007</span><br /><br /><span style=" color:#3c3c3c;">Téléphone : 01 43 17 68 08</span><br /><br /><span style=" color:#3c3c3c;">email: </span><a href="mailto:contact@sankore.org"><span style=" text-decoration: underline; color:#0000ff;">contact@sankore.org</span></a> </p></body></html> @@ -956,7 +956,7 @@ p, li { white-space: pre-wrap; } - + Network diff --git a/resources/library/interactive/Anyembed.wgt/index.html b/resources/library/interactive/Anyembed.wgt/index.html index d488498e..e4e1b194 100644 --- a/resources/library/interactive/Anyembed.wgt/index.html +++ b/resources/library/interactive/Anyembed.wgt/index.html @@ -6,13 +6,8 @@ ubwidget - - - - - @@ -27,7 +22,6 @@
- \ No newline at end of file diff --git a/resources/library/interactive/Anyembed.wgt/js/ubw-main.js b/resources/library/interactive/Anyembed.wgt/js/ubw-main.js index 91a1632f..d5800fa5 100644 --- a/resources/library/interactive/Anyembed.wgt/js/ubw-main.js +++ b/resources/library/interactive/Anyembed.wgt/js/ubw-main.js @@ -1,3 +1,17 @@ +/* + * This program is free software: you can 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 . +*/ function init(){ var embed; @@ -50,15 +64,18 @@ function init(){ submit.click(function(){ $("#ubwidget").append(loadWindow) embed = inputBox.val(); - ////////////!!!1///////// ïîïðîáîâàòü ñ ðåàäè searchWrap.hide(); - loadWindow.append(embed); - //alert($("#ubwidget").html()); - $("#ubwidget embed").attr("wmode", "transparent"); - var ubwidget_html = $("#ubwidget").html(); - alert(ubwidget_html); - setTimeOut(alert); - $("#ubwidget").empty().html(ubwidget_html); + + if(/. +*/ + function addChar(input, character) { if(input.value == null || input.value == "0") input.value = character diff --git a/resources/library/interactive/Calculator.wgt/js/ubw-main.js b/resources/library/interactive/Calculator.wgt/js/ubw-main.js index 23dc7f29..7e08d0dc 100644 --- a/resources/library/interactive/Calculator.wgt/js/ubw-main.js +++ b/resources/library/interactive/Calculator.wgt/js/ubw-main.js @@ -1,3 +1,18 @@ +/* + * This program is free software: you can 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 . +*/ + function init(){ var h = 292; var w = 160; diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Algeria.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Algeria.gif deleted file mode 100644 index 0995fff6..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Algeria.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Algeria.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Algeria.png new file mode 100644 index 00000000..ef6919af Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Algeria.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Angola.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Angola.png similarity index 55% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Angola.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Angola.png index db1f284b..c869fc29 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Angola.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Angola.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Benin.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Benin.gif deleted file mode 100644 index 3a8d0d18..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Benin.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Benin.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Benin.png new file mode 100644 index 00000000..cf60f60c Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Benin.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Botswana.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Botswana.gif deleted file mode 100644 index d6f973ee..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Botswana.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Botswana.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Botswana.png new file mode 100644 index 00000000..aa42bcc9 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Botswana.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burkina_Faso.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burkina_Faso.gif deleted file mode 100644 index 41d7df56..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burkina_Faso.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burkina_Faso.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burkina_Faso.png new file mode 100644 index 00000000..fd4270f7 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burkina_Faso.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burundi.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burundi.gif deleted file mode 100644 index 8f469a9e..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burundi.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burundi.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burundi.png new file mode 100644 index 00000000..14a03e32 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Burundi.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cameroon.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cameroon.gif deleted file mode 100644 index 419bf3b1..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cameroon.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cameroon.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cameroon.png new file mode 100644 index 00000000..c9cc419f Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cameroon.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Chad.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Chad.gif deleted file mode 100644 index 7cf4dcfb..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Chad.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Chad.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Chad.png new file mode 100644 index 00000000..a4934dcf Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Chad.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cote_d'Ivoire.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cote_d'Ivoire.gif deleted file mode 100644 index 174e3cbe..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cote_d'Ivoire.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cote_d'Ivoire.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cote_d'Ivoire.png new file mode 100644 index 00000000..5da33621 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Cote_d'Ivoire.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Djibouti.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Djibouti.png similarity index 52% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Djibouti.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Djibouti.png index 97aef62e..595e8350 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Djibouti.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Djibouti.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Egypt.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Egypt.gif deleted file mode 100644 index 1c8053a2..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Egypt.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Egypt.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Egypt.png new file mode 100644 index 00000000..724dcdcc Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Egypt.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Equatorial_Guinea.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Equatorial_Guinea.gif deleted file mode 100644 index 134f42d4..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Equatorial_Guinea.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Equatorial_Guinea.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Equatorial_Guinea.png new file mode 100644 index 00000000..6d65e7a2 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Equatorial_Guinea.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Eritrea.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Eritrea.gif deleted file mode 100644 index 04be4a46..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Eritrea.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Eritrea.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Eritrea.png new file mode 100644 index 00000000..906c4acd Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Eritrea.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ethiopia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ethiopia.gif deleted file mode 100644 index 97b9903f..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ethiopia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ethiopia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ethiopia.png new file mode 100644 index 00000000..be3fb9f8 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ethiopia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Gabon.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Gabon.gif deleted file mode 100644 index e282f611..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Gabon.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Gabon.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Gabon.png new file mode 100644 index 00000000..62ae83a5 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Gabon.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ghana.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ghana.gif deleted file mode 100644 index f81bc954..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ghana.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ghana.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ghana.png new file mode 100644 index 00000000..4a16ab93 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Ghana.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea-Bissau.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea-Bissau.gif deleted file mode 100644 index 386c19f3..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea-Bissau.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea-Bissau.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea-Bissau.png new file mode 100644 index 00000000..411f49bf Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea-Bissau.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea.gif deleted file mode 100644 index 69ccb4ff..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea.png new file mode 100644 index 00000000..7f21aa1a Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Guinea.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Kenya.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Kenya.gif deleted file mode 100644 index cabbf507..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Kenya.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Kenya.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Kenya.png new file mode 100644 index 00000000..a62356d8 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Kenya.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Lesotho.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Lesotho.gif deleted file mode 100644 index cd865dab..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Lesotho.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Lesotho.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Lesotho.png new file mode 100644 index 00000000..613380c5 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Lesotho.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Liberia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Liberia.gif deleted file mode 100644 index 6a82ade3..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Liberia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Liberia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Liberia.png new file mode 100644 index 00000000..b32431d3 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Liberia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Libya.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Libya.gif deleted file mode 100644 index 5634659b..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Libya.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Libya.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Libya.png new file mode 100644 index 00000000..bfb23e4c Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Libya.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Madagascar.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Madagascar.gif deleted file mode 100644 index 038c59d8..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Madagascar.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Madagascar.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Madagascar.png new file mode 100644 index 00000000..0efe8634 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Madagascar.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Malawi.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Malawi.png similarity index 58% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Malawi.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Malawi.png index 14cb777c..bf6d849e 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Malawi.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Malawi.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mali.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mali.gif deleted file mode 100644 index 756e40cd..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mali.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mali.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mali.png new file mode 100644 index 00000000..a36a6f7e Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mali.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mauritania.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mauritania.gif deleted file mode 100644 index 769e1857..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mauritania.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mauritania.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mauritania.png new file mode 100644 index 00000000..5965bcea Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mauritania.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Morocco.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Morocco.png similarity index 51% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Morocco.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Morocco.png index becd63f0..e7eeb5cc 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Morocco.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Morocco.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mozambique.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mozambique.gif deleted file mode 100644 index d06c35f9..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mozambique.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mozambique.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mozambique.png new file mode 100644 index 00000000..b03533e5 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Mozambique.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Namibia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Namibia.gif deleted file mode 100644 index 8aed8471..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Namibia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Namibia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Namibia.png new file mode 100644 index 00000000..c4def545 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Namibia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Niger.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Niger.gif deleted file mode 100644 index 876481b3..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Niger.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Niger.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Niger.png new file mode 100644 index 00000000..d30bdf4c Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Niger.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Nigeria.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Nigeria.gif deleted file mode 100644 index 74f32c10..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Nigeria.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Nigeria.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Nigeria.png new file mode 100644 index 00000000..066a4c30 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Nigeria.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Rwanda.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Rwanda.png similarity index 51% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Rwanda.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Rwanda.png index 0981a92e..bf223842 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Rwanda.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Rwanda.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Senegal.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Senegal.gif deleted file mode 100644 index 2f781446..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Senegal.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Senegal.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Senegal.png new file mode 100644 index 00000000..79dee278 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Senegal.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sierra_Leone.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sierra_Leone.gif deleted file mode 100644 index ef96c3b0..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sierra_Leone.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sierra_Leone.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sierra_Leone.png new file mode 100644 index 00000000..0c3c16d0 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sierra_Leone.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Somalia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Somalia.gif deleted file mode 100644 index 8c8b1567..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Somalia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Somalia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Somalia.png new file mode 100644 index 00000000..60347f8d Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Somalia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_South_Africa.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_South_Africa.gif deleted file mode 100644 index 5ffe4278..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_South_Africa.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_South_Africa.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_South_Africa.png new file mode 100644 index 00000000..ece18935 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_South_Africa.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sudan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sudan.gif deleted file mode 100644 index ba50965e..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sudan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sudan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sudan.png new file mode 100644 index 00000000..fb590c25 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Sudan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Swaziland.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Swaziland.gif deleted file mode 100644 index 3aa880d9..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Swaziland.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Swaziland.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Swaziland.png new file mode 100644 index 00000000..37504b8e Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Swaziland.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tanzania.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tanzania.gif deleted file mode 100644 index 34ae66bb..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tanzania.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tanzania.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tanzania.png new file mode 100644 index 00000000..5739507d Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tanzania.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_The_Gambia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_The_Gambia.gif deleted file mode 100644 index 0f7267c4..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_The_Gambia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_The_Gambia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_The_Gambia.png new file mode 100644 index 00000000..32a30bd9 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_The_Gambia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Togo.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Togo.gif deleted file mode 100644 index ae214a83..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Togo.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Togo.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Togo.png new file mode 100644 index 00000000..583c7ebf Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Togo.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tunisia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tunisia.gif deleted file mode 100644 index 9cf72bf8..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tunisia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tunisia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tunisia.png new file mode 100644 index 00000000..e73c69d7 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Tunisia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Uganda.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Uganda.gif deleted file mode 100644 index 12591d6d..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Uganda.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Uganda.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Uganda.png new file mode 100644 index 00000000..a7be3d8f Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Uganda.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zambia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zambia.gif deleted file mode 100644 index 778f2c4f..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zambia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zambia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zambia.png new file mode 100644 index 00000000..a6a8e309 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zambia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zimbabwe.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zimbabwe.gif deleted file mode 100644 index 1feade6d..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zimbabwe.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zimbabwe.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zimbabwe.png new file mode 100644 index 00000000..1d9a33fb Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_Zimbabwe.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Central_African_Republic.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Central_African_Republic.gif deleted file mode 100644 index b205500b..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Central_African_Republic.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Central_African_Republic.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Central_African_Republic.png new file mode 100644 index 00000000..c909f3c5 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Central_African_Republic.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Democratic_Republic_of_the_Congo.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Democratic_Republic_of_the_Congo.gif deleted file mode 100644 index 665602b1..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Democratic_Republic_of_the_Congo.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Democratic_Republic_of_the_Congo.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Democratic_Republic_of_the_Congo.png new file mode 100644 index 00000000..b61e2680 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Democratic_Republic_of_the_Congo.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Republic_of_the_Congo.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Republic_of_the_Congo.gif deleted file mode 100644 index c15ea7ab..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Republic_of_the_Congo.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Republic_of_the_Congo.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Republic_of_the_Congo.png new file mode 100644 index 00000000..3c5d13cb Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Afrique/Flag_of_the_Republic_of_the_Congo.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Belize.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Belize.gif deleted file mode 100644 index fa73134b..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Belize.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Belize.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Belize.png new file mode 100644 index 00000000..3280bfe3 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Belize.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Canada.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Canada.gif deleted file mode 100644 index 4312d66d..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Canada.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Canada.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Canada.png new file mode 100644 index 00000000..db25bfe1 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Canada.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Costa_Rica.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Costa_Rica.gif deleted file mode 100644 index 690b0b5a..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Costa_Rica.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Costa_Rica.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Costa_Rica.png new file mode 100644 index 00000000..3b0fe497 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Costa_Rica.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Cuba.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Cuba.gif deleted file mode 100644 index 5014f1dc..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Cuba.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Cuba.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Cuba.png new file mode 100644 index 00000000..223702a1 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Cuba.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_El_Salvador.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_El_Salvador.gif deleted file mode 100644 index b693d2f2..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_El_Salvador.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_El_Salvador.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_El_Salvador.png new file mode 100644 index 00000000..571884bd Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_El_Salvador.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Greenland.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Greenland.gif deleted file mode 100644 index 3b76afa5..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Greenland.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Greenland.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Greenland.png new file mode 100644 index 00000000..2933186d Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Greenland.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Guatemala.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Guatemala.png similarity index 57% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Guatemala.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Guatemala.png index 3de78b6b..77871e24 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Guatemala.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Guatemala.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Haiti.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Haiti.png similarity index 57% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Haiti.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Haiti.png index a8474c23..b45f5a14 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Haiti.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Haiti.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Honduras.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Honduras.gif deleted file mode 100644 index 76a6fd2a..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Honduras.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Honduras.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Honduras.png new file mode 100644 index 00000000..6383b0ed Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Honduras.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Jamaica.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Jamaica.gif deleted file mode 100644 index 1b1c13c5..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Jamaica.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Jamaica.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Jamaica.png new file mode 100644 index 00000000..66cb7bf4 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Jamaica.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Mexico.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Mexico.gif deleted file mode 100644 index 24ee8f8d..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Mexico.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Mexico.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Mexico.png new file mode 100644 index 00000000..43eb18ee Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Mexico.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Nicaragua.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Nicaragua.gif deleted file mode 100644 index 648cedec..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Nicaragua.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Nicaragua.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Nicaragua.png new file mode 100644 index 00000000..bc1b3620 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Nicaragua.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Panama.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Panama.gif deleted file mode 100644 index c3b1de63..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Panama.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Panama.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Panama.png new file mode 100644 index 00000000..08466103 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_Panama.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Bahamas.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Bahamas.gif deleted file mode 100644 index ba17cb3c..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Bahamas.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Bahamas.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Bahamas.png new file mode 100644 index 00000000..e39a74a7 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Bahamas.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Dominican_Republic.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Dominican_Republic.gif deleted file mode 100644 index 33f6fee3..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Dominican_Republic.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Dominican_Republic.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Dominican_Republic.png new file mode 100644 index 00000000..d50f8c08 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_Dominican_Republic.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_United_States.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_United_States.gif deleted file mode 100644 index 0689a3f2..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_United_States.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_United_States.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_United_States.png new file mode 100644 index 00000000..cf946d73 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueNord/Flag_of_the_United_States.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Argentina.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Argentina.gif deleted file mode 100644 index 5e31c2e3..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Argentina.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Argentina.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Argentina.png new file mode 100644 index 00000000..5eeb5e0e Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Argentina.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Bolivia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Bolivia.gif deleted file mode 100644 index a6b6b44d..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Bolivia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Bolivia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Bolivia.png new file mode 100644 index 00000000..ce3f8ea0 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Bolivia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Brazil.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Brazil.gif deleted file mode 100644 index 6a6f31ed..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Brazil.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Brazil.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Brazil.png new file mode 100644 index 00000000..a5ba9006 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Brazil.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Chile.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Chile.gif deleted file mode 100644 index 9fb61127..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Chile.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Chile.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Chile.png new file mode 100644 index 00000000..5ab69d45 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Chile.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Colombia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Colombia.gif deleted file mode 100644 index c6730e54..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Colombia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Colombia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Colombia.png new file mode 100644 index 00000000..21877342 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Colombia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Ecuador.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Ecuador.gif deleted file mode 100644 index e799888e..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Ecuador.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Ecuador.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Ecuador.png new file mode 100644 index 00000000..94d756a0 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Ecuador.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_France.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_France.gif deleted file mode 100644 index e2e9ebc6..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_France.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_France.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_France.png new file mode 100644 index 00000000..96de3237 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_France.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Guyana.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Guyana.gif deleted file mode 100644 index ec923dbc..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Guyana.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Guyana.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Guyana.png new file mode 100644 index 00000000..a8ebf39e Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Guyana.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Paraguay.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Paraguay.gif deleted file mode 100644 index f5f9e3d4..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Paraguay.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Paraguay.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Paraguay.png new file mode 100644 index 00000000..b5654eba Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Paraguay.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Peru.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Peru.gif deleted file mode 100644 index 75c6344e..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Peru.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Peru.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Peru.png new file mode 100644 index 00000000..fba4e20e Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Peru.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Suriname.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Suriname.gif deleted file mode 100644 index 65d207f1..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Suriname.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Suriname.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Suriname.png new file mode 100644 index 00000000..00aae8fd Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Suriname.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Uruguay.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Uruguay.png similarity index 54% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Uruguay.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Uruguay.png index 897f28c8..cbebbff6 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Uruguay.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Uruguay.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Venezuela.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Venezuela.gif deleted file mode 100644 index eddea9b7..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Venezuela.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Venezuela.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Venezuela.png new file mode 100644 index 00000000..a023791f Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/AmeriqueSud/Flag_of_Venezuela.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Afghanistan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Afghanistan.gif deleted file mode 100644 index 21f96ae3..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Afghanistan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Afghanistan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Afghanistan.png new file mode 100644 index 00000000..8b32aa6c Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Afghanistan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bahrain.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bahrain.png similarity index 56% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bahrain.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bahrain.png index feed947b..fda166bb 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bahrain.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bahrain.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bangladesh.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bangladesh.gif deleted file mode 100644 index a229e9e9..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bangladesh.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bangladesh.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bangladesh.png new file mode 100644 index 00000000..d870e26f Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bangladesh.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bhutan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bhutan.gif deleted file mode 100644 index d4b19040..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bhutan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bhutan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bhutan.png new file mode 100644 index 00000000..b59ebbe0 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Bhutan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Brunei.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Brunei.gif deleted file mode 100644 index 851742fb..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Brunei.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Brunei.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Brunei.png new file mode 100644 index 00000000..f01569e7 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Brunei.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Cambodia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Cambodia.gif deleted file mode 100644 index 247a25d2..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Cambodia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Cambodia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Cambodia.png new file mode 100644 index 00000000..245b273e Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Cambodia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_East_Timor.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_East_Timor.gif deleted file mode 100644 index 0dbbc6c6..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_East_Timor.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_East_Timor.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_East_Timor.png new file mode 100644 index 00000000..4b8ca8bd Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_East_Timor.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_India.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_India.gif deleted file mode 100644 index 3857483c..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_India.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_India.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_India.png new file mode 100644 index 00000000..cc50dd85 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_India.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Indonesia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Indonesia.gif deleted file mode 100644 index d8841d9f..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Indonesia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Indonesia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Indonesia.png new file mode 100644 index 00000000..bcd1f637 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Indonesia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iran.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iran.gif deleted file mode 100644 index 07d7752e..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iran.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iran.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iran.png new file mode 100644 index 00000000..83e29c8b Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iran.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iraq.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iraq.gif deleted file mode 100644 index 8130c5ca..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iraq.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iraq.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iraq.png new file mode 100644 index 00000000..144c9e28 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Iraq.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Israel.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Israel.gif deleted file mode 100644 index acce7bdc..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Israel.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Israel.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Israel.png new file mode 100644 index 00000000..a4658a1a Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Israel.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Japan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Japan.gif deleted file mode 100644 index 5cb7770d..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Japan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Japan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Japan.png new file mode 100644 index 00000000..e4ea9376 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Japan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Jordan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Jordan.gif deleted file mode 100644 index 34567833..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Jordan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Jordan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Jordan.png new file mode 100644 index 00000000..b2dfc3b4 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Jordan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kazakhstan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kazakhstan.gif deleted file mode 100644 index 10d84a4f..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kazakhstan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kazakhstan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kazakhstan.png new file mode 100644 index 00000000..1dcc7165 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kazakhstan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kuwait.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kuwait.gif deleted file mode 100644 index d79ed196..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kuwait.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kuwait.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kuwait.png new file mode 100644 index 00000000..b1f49e64 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kuwait.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kyrgyzstan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kyrgyzstan.gif deleted file mode 100644 index d1e8d383..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kyrgyzstan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kyrgyzstan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kyrgyzstan.png new file mode 100644 index 00000000..d3c295b8 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Kyrgyzstan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Laos.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Laos.gif deleted file mode 100644 index 3877c05c..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Laos.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Laos.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Laos.png new file mode 100644 index 00000000..e43fffac Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Laos.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Lebanon.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Lebanon.gif deleted file mode 100644 index 306aad17..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Lebanon.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Lebanon.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Lebanon.png new file mode 100644 index 00000000..7e2a48b8 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Lebanon.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Malaysia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Malaysia.gif deleted file mode 100644 index 0a0afc01..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Malaysia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Malaysia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Malaysia.png new file mode 100644 index 00000000..9594777f Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Malaysia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Maldives.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Maldives.gif deleted file mode 100644 index 79e4b846..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Maldives.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Maldives.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Maldives.png new file mode 100644 index 00000000..4dd6608a Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Maldives.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Mongolia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Mongolia.gif deleted file mode 100644 index 9f6c9199..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Mongolia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Mongolia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Mongolia.png new file mode 100644 index 00000000..e5091dfa Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Mongolia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Myanmar.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Myanmar.gif deleted file mode 100644 index 9740d61c..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Myanmar.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Myanmar.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Myanmar.png new file mode 100644 index 00000000..e2cd529b Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Myanmar.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Nepal.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Nepal.gif deleted file mode 100644 index 9f2d049e..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Nepal.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Nepal.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Nepal.png new file mode 100644 index 00000000..33f6f012 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Nepal.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_North_Korea.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_North_Korea.gif deleted file mode 100644 index d5a1f549..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_North_Korea.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_North_Korea.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_North_Korea.png new file mode 100644 index 00000000..b645acad Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_North_Korea.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Oman.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Oman.gif deleted file mode 100644 index 3818960c..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Oman.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Oman.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Oman.png new file mode 100644 index 00000000..637198b2 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Oman.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Pakistan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Pakistan.gif deleted file mode 100644 index 6f48c9d3..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Pakistan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Pakistan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Pakistan.png new file mode 100644 index 00000000..eecf5743 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Pakistan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Qatar.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Qatar.png similarity index 55% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Qatar.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Qatar.png index a2be3639..916e756c 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Qatar.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Qatar.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Russia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Russia.gif deleted file mode 100644 index e4030615..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Russia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Russia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Russia.png new file mode 100644 index 00000000..40acd108 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Russia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Saudi_Arabia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Saudi_Arabia.gif deleted file mode 100644 index 76a78e3e..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Saudi_Arabia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Saudi_Arabia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Saudi_Arabia.png new file mode 100644 index 00000000..15064bd8 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Saudi_Arabia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Singapore.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Singapore.gif deleted file mode 100644 index 0314db0a..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Singapore.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Singapore.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Singapore.png new file mode 100644 index 00000000..6a0950f0 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Singapore.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_South_Korea.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_South_Korea.gif deleted file mode 100644 index fe734e45..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_South_Korea.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_South_Korea.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_South_Korea.png new file mode 100644 index 00000000..e9c91eef Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_South_Korea.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Sri_Lanka.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Sri_Lanka.gif deleted file mode 100644 index c77312e7..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Sri_Lanka.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Sri_Lanka.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Sri_Lanka.png new file mode 100644 index 00000000..f8fe52c1 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Sri_Lanka.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Syria.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Syria.gif deleted file mode 100644 index 143644d2..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Syria.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Syria.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Syria.png new file mode 100644 index 00000000..f9715a77 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Syria.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Tajikistan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Tajikistan.gif deleted file mode 100644 index fefbfacd..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Tajikistan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Tajikistan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Tajikistan.png new file mode 100644 index 00000000..cb7fc945 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Tajikistan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Thailand.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Thailand.gif deleted file mode 100644 index 739b41ac..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Thailand.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Thailand.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Thailand.png new file mode 100644 index 00000000..332c3cab Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Thailand.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Turkmenistan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Turkmenistan.gif deleted file mode 100644 index 4089a11c..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Turkmenistan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Turkmenistan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Turkmenistan.png new file mode 100644 index 00000000..732a82a9 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Turkmenistan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Uzbekistan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Uzbekistan.gif deleted file mode 100644 index 2c59ad91..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Uzbekistan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Uzbekistan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Uzbekistan.png new file mode 100644 index 00000000..f1c74347 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Uzbekistan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Vietnam.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Vietnam.gif deleted file mode 100644 index 385884fa..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Vietnam.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Vietnam.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Vietnam.png new file mode 100644 index 00000000..3e02b2ef Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Vietnam.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Yemen.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Yemen.gif deleted file mode 100644 index 7e42d8bb..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Yemen.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Yemen.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Yemen.png new file mode 100644 index 00000000..db542015 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_Yemen.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_People's_Republic_of_China.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_People's_Republic_of_China.gif deleted file mode 100644 index b9467425..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_People's_Republic_of_China.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_People's_Republic_of_China.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_People's_Republic_of_China.png new file mode 100644 index 00000000..3ed465f6 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_People's_Republic_of_China.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_Philippines.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_Philippines.gif deleted file mode 100644 index ae4b2588..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_Philippines.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_Philippines.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_Philippines.png new file mode 100644 index 00000000..82ee2fab Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_Philippines.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_United_Arab_Emirates.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_United_Arab_Emirates.gif deleted file mode 100644 index ab56be32..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_United_Arab_Emirates.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_United_Arab_Emirates.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_United_Arab_Emirates.png new file mode 100644 index 00000000..4059b672 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Asie/Flag_of_the_United_Arab_Emirates.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Albania.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Albania.gif deleted file mode 100644 index 57ec0c5d..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Albania.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Albania.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Albania.png new file mode 100644 index 00000000..b32e2987 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Albania.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Andorra.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Andorra.gif deleted file mode 100644 index 88ac2b48..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Andorra.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Andorra.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Andorra.png new file mode 100644 index 00000000..4e0c6366 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Andorra.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Armenia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Armenia.gif deleted file mode 100644 index f591b2f8..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Armenia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Armenia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Armenia.png new file mode 100644 index 00000000..dce693b4 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Armenia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Austria.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Austria.gif deleted file mode 100644 index e7ec4261..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Austria.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Austria.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Austria.png new file mode 100644 index 00000000..b1dde031 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Austria.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Azerbaijan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Azerbaijan.gif deleted file mode 100644 index 0f153b1c..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Azerbaijan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Azerbaijan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Azerbaijan.png new file mode 100644 index 00000000..3d6ae432 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Azerbaijan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belarus.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belarus.gif deleted file mode 100644 index c2da3404..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belarus.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belarus.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belarus.png new file mode 100644 index 00000000..be885298 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belarus.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belgium.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belgium.gif deleted file mode 100644 index 7af6ad5e..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belgium.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belgium.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belgium.png new file mode 100644 index 00000000..6bb24bf2 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Belgium.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bosnia_and_Herzegovina.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bosnia_and_Herzegovina.gif deleted file mode 100644 index 386362df..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bosnia_and_Herzegovina.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bosnia_and_Herzegovina.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bosnia_and_Herzegovina.png new file mode 100644 index 00000000..292db9f9 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bosnia_and_Herzegovina.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bulgaria.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bulgaria.gif deleted file mode 100644 index c7ebb3c9..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bulgaria.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bulgaria.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bulgaria.png new file mode 100644 index 00000000..e30395f5 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Bulgaria.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Croatia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Croatia.gif deleted file mode 100644 index ef10cd3d..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Croatia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Croatia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Croatia.png new file mode 100644 index 00000000..471f4d5e Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Croatia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Cyprus.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Cyprus.png similarity index 60% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Cyprus.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Cyprus.png index 33ff68ca..d4a8af0c 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Cyprus.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Cyprus.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Denmark.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Denmark.gif deleted file mode 100644 index bdda40ab..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Denmark.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Denmark.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Denmark.png new file mode 100644 index 00000000..e5d63d7f Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Denmark.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Estonia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Estonia.gif deleted file mode 100644 index 9374f972..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Estonia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Estonia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Estonia.png new file mode 100644 index 00000000..ec72ee77 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Estonia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Finland.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Finland.gif deleted file mode 100644 index f4b76867..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Finland.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Finland.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Finland.png new file mode 100644 index 00000000..6e7d61c2 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Finland.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_France.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_France.gif deleted file mode 100644 index e2e9ebc6..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_France.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_France.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_France.png new file mode 100644 index 00000000..96de3237 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_France.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Georgia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Georgia.gif deleted file mode 100644 index 2cdfd67f..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Georgia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Georgia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Georgia.png new file mode 100644 index 00000000..4e236244 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Georgia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Germany.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Germany.gif deleted file mode 100644 index deff4f14..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Germany.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Germany.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Germany.png new file mode 100644 index 00000000..797f43eb Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Germany.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Greece.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Greece.gif deleted file mode 100644 index b0b48f65..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Greece.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Greece.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Greece.png new file mode 100644 index 00000000..d7e35a89 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Greece.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Hungary.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Hungary.gif deleted file mode 100644 index 5d685fcc..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Hungary.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Hungary.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Hungary.png new file mode 100644 index 00000000..2116860e Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Hungary.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Iceland.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Iceland.gif deleted file mode 100644 index bd192f3f..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Iceland.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Iceland.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Iceland.png new file mode 100644 index 00000000..981e87ce Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Iceland.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ireland.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ireland.gif deleted file mode 100644 index 016b6653..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ireland.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ireland.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ireland.png new file mode 100644 index 00000000..d4b1f247 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ireland.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Italy.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Italy.gif deleted file mode 100644 index 433579fb..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Italy.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Italy.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Italy.png new file mode 100644 index 00000000..de4b7eae Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Italy.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Kazakhstan.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Kazakhstan.gif deleted file mode 100644 index 10d84a4f..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Kazakhstan.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Kazakhstan.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Kazakhstan.png new file mode 100644 index 00000000..1dcc7165 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Kazakhstan.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Latvia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Latvia.gif deleted file mode 100644 index 5443b48d..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Latvia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Latvia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Latvia.png new file mode 100644 index 00000000..d2fdb745 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Latvia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Liechtenstein.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Liechtenstein.png similarity index 61% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Liechtenstein.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Liechtenstein.png index f4565af6..4fcbbd0c 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Liechtenstein.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Liechtenstein.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Lithuania.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Lithuania.gif deleted file mode 100644 index f36e9900..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Lithuania.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Lithuania.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Lithuania.png new file mode 100644 index 00000000..ad3700c7 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Lithuania.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Luxembourg.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Luxembourg.gif deleted file mode 100644 index e04703d9..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Luxembourg.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Luxembourg.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Luxembourg.png new file mode 100644 index 00000000..40b46998 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Luxembourg.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Macedonia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Macedonia.gif deleted file mode 100644 index c3d18798..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Macedonia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Macedonia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Macedonia.png new file mode 100644 index 00000000..c62db0c6 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Macedonia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Malta.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Malta.gif deleted file mode 100644 index b37b54f7..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Malta.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Malta.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Malta.png new file mode 100644 index 00000000..4629b931 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Malta.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Moldova.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Moldova.gif deleted file mode 100644 index d00fb1bc..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Moldova.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Moldova.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Moldova.png new file mode 100644 index 00000000..15241b92 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Moldova.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Monaco.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Monaco.gif deleted file mode 100644 index 93a8f1dd..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Monaco.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Monaco.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Monaco.png new file mode 100644 index 00000000..560512fd Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Monaco.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Montenegro.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Montenegro.gif deleted file mode 100644 index e816a0cf..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Montenegro.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Montenegro.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Montenegro.png new file mode 100644 index 00000000..2381d17f Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Montenegro.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Norway.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Norway.gif deleted file mode 100644 index 5d68dc38..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Norway.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Norway.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Norway.png new file mode 100644 index 00000000..a5b0e2bf Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Norway.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Poland.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Poland.gif deleted file mode 100644 index 9e0e924b..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Poland.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Poland.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Poland.png new file mode 100644 index 00000000..2d3d825e Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Poland.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Portugal.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Portugal.gif deleted file mode 100644 index 44c96b87..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Portugal.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Portugal.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Portugal.png new file mode 100644 index 00000000..b7bc48dc Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Portugal.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Romania.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Romania.gif deleted file mode 100644 index 0aff47e9..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Romania.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Romania.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Romania.png new file mode 100644 index 00000000..9297004a Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Romania.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Russia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Russia.gif deleted file mode 100644 index e4030615..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Russia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Russia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Russia.png new file mode 100644 index 00000000..40acd108 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Russia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_San_Marino.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_San_Marino.gif deleted file mode 100644 index da58d7ae..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_San_Marino.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_San_Marino.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_San_Marino.png new file mode 100644 index 00000000..1d3ab8e8 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_San_Marino.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Serbia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Serbia.gif deleted file mode 100644 index e3e73054..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Serbia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Serbia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Serbia.png new file mode 100644 index 00000000..4cf7aa83 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Serbia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovakia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovakia.png similarity index 51% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovakia.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovakia.png index f7a78102..f7b97410 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovakia.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovakia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovenia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovenia.gif deleted file mode 100644 index 56c75029..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovenia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovenia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovenia.png new file mode 100644 index 00000000..9377c77a Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Slovenia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Spain.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Spain.gif deleted file mode 100644 index f4f6e2d1..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Spain.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Spain.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Spain.png new file mode 100644 index 00000000..431b5152 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Spain.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Sweden.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Sweden.gif deleted file mode 100644 index d35b1937..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Sweden.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Sweden.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Sweden.png new file mode 100644 index 00000000..0f74437a Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Sweden.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Switzerland.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Switzerland.gif deleted file mode 100644 index 3950a3df..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Switzerland.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Switzerland.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Switzerland.png new file mode 100644 index 00000000..6b092d9f Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Switzerland.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Turkey.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Turkey.png similarity index 53% rename from resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Turkey.gif rename to resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Turkey.png index 47f76f84..7dc9c6f8 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Turkey.gif and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Turkey.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ukraine.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ukraine.gif deleted file mode 100644 index b35c9c36..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ukraine.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ukraine.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ukraine.png new file mode 100644 index 00000000..4680b42d Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_Ukraine.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Czech_Republic.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Czech_Republic.gif deleted file mode 100644 index 3ddb35c4..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Czech_Republic.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Czech_Republic.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Czech_Republic.png new file mode 100644 index 00000000..d211dc0f Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Czech_Republic.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Netherlands.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Netherlands.gif deleted file mode 100644 index 06991085..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Netherlands.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Netherlands.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Netherlands.png new file mode 100644 index 00000000..1bba3d4a Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Netherlands.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_United_Kingdom.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_United_Kingdom.gif deleted file mode 100644 index 1513ce00..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_United_Kingdom.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_United_Kingdom.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_United_Kingdom.png new file mode 100644 index 00000000..551d81e1 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_United_Kingdom.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Vatican_City.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Vatican_City.gif deleted file mode 100644 index 040d3529..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Vatican_City.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Vatican_City.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Vatican_City.png new file mode 100644 index 00000000..886ecf41 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Europe/Flag_of_the_Vatican_City.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Australia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Australia.gif deleted file mode 100644 index 04e6192a..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Australia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Australia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Australia.png new file mode 100644 index 00000000..389efdef Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Australia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_France.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_France.gif deleted file mode 100644 index e2e9ebc6..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_France.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_France.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_France.png new file mode 100644 index 00000000..96de3237 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_France.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Indonesia.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Indonesia.gif deleted file mode 100644 index d8841d9f..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Indonesia.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Indonesia.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Indonesia.png new file mode 100644 index 00000000..bcd1f637 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Indonesia.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_New_Zealand.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_New_Zealand.gif deleted file mode 100644 index 1d51f2ed..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_New_Zealand.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_New_Zealand.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_New_Zealand.png new file mode 100644 index 00000000..797181cc Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_New_Zealand.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Papua_New_Guinea.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Papua_New_Guinea.gif deleted file mode 100644 index b1184ac2..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Papua_New_Guinea.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Papua_New_Guinea.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Papua_New_Guinea.png new file mode 100644 index 00000000..5e5bd119 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Papua_New_Guinea.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Vanuatu.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Vanuatu.gif deleted file mode 100644 index 579ac39b..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Vanuatu.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Vanuatu.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Vanuatu.png new file mode 100644 index 00000000..0d1f0258 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_Vanuatu.png differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_the_Solomon_Islands.gif b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_the_Solomon_Islands.gif deleted file mode 100644 index ffcafd29..00000000 Binary files a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_the_Solomon_Islands.gif and /dev/null differ diff --git a/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_the_Solomon_Islands.png b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_the_Solomon_Islands.png new file mode 100644 index 00000000..8b8e5b50 Binary files /dev/null and b/resources/library/interactive/GeoInfo.wgt/images/Drapeaux/Oceanie/Flag_of_the_Solomon_Islands.png differ diff --git a/resources/library/interactive/GoogleMap.wgt/index.html b/resources/library/interactive/GoogleMap.wgt/index.html index b2a598d0..6f17c525 100644 --- a/resources/library/interactive/GoogleMap.wgt/index.html +++ b/resources/library/interactive/GoogleMap.wgt/index.html @@ -15,6 +15,21 @@ - diff --git a/resources/library/interactive/Stopwatch.wgt/js/ubw-main.js b/resources/library/interactive/Stopwatch.wgt/js/ubw-main.js index b6e2107e..fa08dbf0 100644 --- a/resources/library/interactive/Stopwatch.wgt/js/ubw-main.js +++ b/resources/library/interactive/Stopwatch.wgt/js/ubw-main.js @@ -1,6 +1,34 @@ +/* + * This program is free software: you can 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 . +*/ function init(){ + var tempHours; + var tempMinutes; + var tempSeconds; + + if(window.sankore){ + tempHours = window.sankore.preference("hours","00"); + tempMinutes = window.sankore.preference("minutes","00"); + tempSeconds = window.sankore.preference("seconds","00"); + } else { + tempHours = "00"; + tempMinutes = "00"; + tempSeconds = "00"; + } + var ubwidget = $("#ubwidget").ubwidget({ width:252, height:89 @@ -32,8 +60,8 @@ function init(){ borderRight:"none" }); spacec.find(".ubw-button-canvas").unbind("mouseenter"); - - var hours = $("
00
").ubwbutton({ + + var hours = $("
" + tempHours + "
").ubwbutton({ w:52, h:68 }, { @@ -45,7 +73,7 @@ function init(){ hours.find(".ubw-button-body").css({ borderRight:"none" }); - var minutes = $("
00
").ubwbutton({ + var minutes = $("
" + tempMinutes + "
").ubwbutton({ w:52, h:68 }, { @@ -58,7 +86,7 @@ function init(){ borderLeft:"none", borderRight:"none" }); - var seconds = $("
00
").ubwbutton({ + var seconds = $("
" + tempSeconds + "
").ubwbutton({ w:52, h:68 }, { @@ -67,6 +95,7 @@ function init(){ right:0, left:0 }); + seconds.find(".ubw-button-body").css({ borderLeft:"none", borderRight:"none" @@ -239,12 +268,26 @@ function init(){ } function timeButtonDownHandler(m){ - var button = m.data.button; - var mouseStart = { + var button = m.data.button; + var content = button.find(".ubw-button-content"); + if(window.sankore){ + var temp = button.attr("id"); + switch(temp){ + case "seconds": + window.sankore.setPreference("seconds", content.text()); + break; + case "minutes": + window.sankore.setPreference("minutes", content.text()); + break; + case "hours": + window.sankore.setPreference("hours", content.text()); + break; + } + } + /*var mouseStart = { pageX:m.pageX, pageY:m.pageY - }; - var content = button.find(".ubw-button-content"); + };*/ var val = content.text(); isScrolling = true; reverse = true; @@ -332,6 +375,12 @@ function init(){ minutesValue.text(formatTime(currentMinute)); secondsValue.text(formatTime(currentSecond)); + if(window.sankore){ + window.sankore.setPreference("hours", hoursValue.text()); + window.sankore.setPreference("minutes", minutesValue.text()); + window.sankore.setPreference("seconds", secondsValue.text()); + } + } function formatTime(time){ diff --git a/resources/library/interactive/VideoPicker.wgt/scripts/index.html b/resources/library/interactive/VideoPicker.wgt/scripts/index.html new file mode 100644 index 00000000..3c083f2e --- /dev/null +++ b/resources/library/interactive/VideoPicker.wgt/scripts/index.html @@ -0,0 +1,230 @@ + + + + + + + Video Picker + + + + + + + + + +
+
+ +
+ +
Show
+
+ +
+
arrow-top
+ +
+
+ +
+ +
+
+ + + + + + + +
 
+
+ +
+ + + \ No newline at end of file diff --git a/resources/library/interactive/WebBrowser.wgt/index.html b/resources/library/interactive/WebBrowser.wgt/index.html index 8f431720..49d1b680 100644 --- a/resources/library/interactive/WebBrowser.wgt/index.html +++ b/resources/library/interactive/WebBrowser.wgt/index.html @@ -33,11 +33,11 @@ //resizerIndex = 0; - /*if(window.sankore){ + if(window.sankore){ url = window.sankore.preference("url", ""); }else{ url = ""; - }; */ + }; language = navigator.userAgent.split(";"); language = language[3].replace(/\s/g, "").substr(0, 2); @@ -157,9 +157,9 @@ //clearTimeout(resizer); //resizerIndex = 0; - /*if(window.sankore){ + if(window.sankore){ window.sankore.setPreference("url", $("#textbox").val()); - };*/ + }; $("#embeded-content").hide(); $("#container").removeClass("load").addClass("show"); diff --git a/resources/library/interactive/barre_prof.wgt/config.xml b/resources/library/interactive/barre_prof.wgt/config.xml index 0009af14..2f634ce4 100644 --- a/resources/library/interactive/barre_prof.wgt/config.xml +++ b/resources/library/interactive/barre_prof.wgt/config.xml @@ -4,13 +4,13 @@ xmlns:ub="http://uniboard.mnemis.com/widgets" id="http://www.example.net/widgets/helloworld" version="1.0" - width="200" - height="700" + width="660" + height="410" ub:resizable="true"> - Rich Note - Allows the teacher to attach a rich note to the page. + Rich Text Editor + Allows the teacher to attach a text editor to the page. + value="sankore"/> diff --git a/resources/library/interactive/barre_prof.wgt/index.html b/resources/library/interactive/barre_prof.wgt/index.html index 783668fe..844c1772 100644 --- a/resources/library/interactive/barre_prof.wgt/index.html +++ b/resources/library/interactive/barre_prof.wgt/index.html @@ -1,31 +1,47 @@ - - - - + + + - - Template - - - - - - - - - - - - - - - - - + Very nice text editor!!11 + + + + - -
+ - \ No newline at end of file + diff --git a/src/adaptors/publishing/UBDocumentPublisher.cpp b/src/adaptors/publishing/UBDocumentPublisher.cpp index 5e3dc3a2..bb2c477b 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.cpp +++ b/src/adaptors/publishing/UBDocumentPublisher.cpp @@ -44,6 +44,7 @@ #include "UBSvgSubsetRasterizer.h" #include "core/memcheck.h" +#include "../../core/UBApplication.h" UBDocumentPublisher::UBDocumentPublisher(UBDocumentProxy* pDocument, QObject *parent) @@ -54,90 +55,52 @@ UBDocumentPublisher::UBDocumentPublisher(UBDocumentProxy* pDocument, QObject *pa , mPassword("") , bLoginCookieSet(false) { - mpWebView = new QWebView(0); - UBApplication::mainWindow->addSankoreWebDocumentWidget(mpWebView); - mpWebView->setWindowTitle(tr("Sankore Uploading Page")); - mpWebView->setAcceptDrops(false); - - connect(mpWebView, SIGNAL(loadFinished(bool)), this, SLOT(onLoadFinished(bool))); - connect(mpWebView, SIGNAL(linkClicked(QUrl)), this, SLOT(onLinkClicked(QUrl))); - connect(this, SIGNAL(loginDone()), this, SLOT(onLoginDone())); - - init(); } UBDocumentPublisher::~UBDocumentPublisher() { - //delete mpWebView; - //delete mPublishingDocument; + if(mSourceDocument){ + delete mSourceDocument; + mSourceDocument = NULL; + } + + if(mPublishingDocument){ + delete mPublishingDocument; + mPublishingDocument = NULL; + } } void UBDocumentPublisher::publish() { + //check that the username and password are stored on preferences + UBSettings* settings = UBSettings::settings(); + + if(settings->communityUsername().isEmpty() || settings->communityPassword().isEmpty()){ + UBApplication::showMessage(tr("Credentials has to not been filled out yet.")); + qDebug() << "trying to connect to community without the required credentials"; + return; + } + + mUsername = settings->communityUsername(); + mPassword = settings->communityPassword(); + UBPublicationDlg dlg; if(QDialog::Accepted == dlg.exec()) { mDocInfos.title = dlg.title(); mDocInfos.description = dlg.description(); - //check that the username and password are stored on preferences - UBSettings* settings = UBSettings::settings(); - - mUsername = settings->communityUsername(); - mPassword = settings->communityPassword(); buildUbwFile(); + UBApplication::showMessage(tr("Uploading Sankore File on Web.")); - login(mUsername, mPassword); - //sendUbw(); + sendUbw(mUsername, mPassword); } } -void UBDocumentPublisher::onLoginDone() -{ - sendUbw(); -} - -void UBDocumentPublisher::login(QString username, QString password) -{ - QString data,crlf; - QByteArray datatoSend; - - // Create the request body - data="srid=&j_username=" +username +"&j_password=" +password +crlf+crlf; - datatoSend=data.toAscii(); // convert data string to byte array for request - - // Create the request header - QString qsLoginURL = QString("http://sankore.devxwiki.com/xwiki/bin/loginsubmit/XWiki/XWikiLogin?xredirect=%0").arg(DOCPUBLICATION_URL); - QNetworkRequest request(QUrl(qsLoginURL.toAscii().constData())); - request.setRawHeader("Origin", "http://sankore.devxwiki.com"); - request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); - request.setRawHeader("Accept", "application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"); - request.setRawHeader("Referer", DOCPUBLICATION_URL); - request.setHeader(QNetworkRequest::ContentLengthHeader,datatoSend.size()); - request.setRawHeader("Accept-Language", "en-US,*"); - - // Generate a session id - //mSessionID = getSessionID(); - - // Create the cookie - //QList cookiesList; - //QString qsCookieValue; - //qsCookieValue = mSessionID; - //qsCookieValue += "; language=en"; - //QNetworkCookie cookie("JSESSIONID", qsCookieValue.toAscii().constData()); - //cookiesList << cookie; - //request.setHeader(QNetworkRequest::CookieHeader, QVariant::fromValue(cookiesList)); - - // Send the request - mpNetworkMgr->post(request,datatoSend); -} - - - void UBDocumentPublisher::buildUbwFile() { QDir d; @@ -164,7 +127,6 @@ void UBDocumentPublisher::buildUbwFile() ubzExporter.setVerbode(false); ubzExporter.persistsDocument(mSourceDocument, mPublishingDocument->persistencePath() + "/" + UBStringUtils::toCanonicalUuid(publishingUuid) + ".ubz"); - // remove all useless files for (int pageIndex = 0; pageIndex < mPublishingDocument->pageCount(); pageIndex++) { @@ -586,9 +548,6 @@ void UBDocumentPublisher::generateWidgetPropertyScript(UBGraphicsW3CWidgetItem * } } - - - void UBDocumentPublisher::init() { mCrlf=0x0d; @@ -599,21 +558,11 @@ void UBDocumentPublisher::init() mpNetworkMgr = new QNetworkAccessManager(this); mpCookieJar = new QNetworkCookieJar(); -// QNetworkProxy* pProxy = UBSettings::settings()->httpProxy(); -// if(NULL != pProxy) -// { -// mpNetworkMgr->setProxy(*pProxy); -// qDebug() << "Proxy set!"; -// } - connect(mpNetworkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(onFinished(QNetworkReply*))); - connect(mpNetworkMgr, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)), this, SLOT(onProxyAuthenticationRequired(QNetworkProxy,QAuthenticator*))); } void UBDocumentPublisher::onFinished(QNetworkReply *reply) { - QByteArray response = reply->readAll(); - QVariant cookieHeader = reply->rawHeader("Set-Cookie"); // First we concatenate all the Set-Cookie values (the packet can contains many of them) QStringList qslCookie = cookieHeader.toString().split("\n"); @@ -625,49 +574,6 @@ void UBDocumentPublisher::onFinished(QNetworkReply *reply) // Now we isolate every cookie value QStringList qslCookieVals = qsCookieValue.split("; "); - if (!bLoginCookieSet) - { - // Finally we create the cookies - for (int i = 0; i < qslCookieVals.size(); i++) - { - QString cookieString = qslCookieVals.at(i); - QStringList qslCrntCookie = cookieString.split("="); - QNetworkCookie crntCookie; - if (qslCrntCookie.length() == 2) - { - QString qsValue = qslCrntCookie.at(1); - qsValue.remove("\""); - crntCookie = QNetworkCookie(qslCrntCookie.at(0).toAscii().constData(), qsValue.toAscii().constData()); - } - else - { - crntCookie = QNetworkCookie(qslCrntCookie.at(0).toAscii().constData()); - } - // HACK : keep only the same cookies as the XWiki website does. - if(crntCookie.name() == "JSESSIONID" || - crntCookie.name() == "username" || - crntCookie.name() == "password" || - crntCookie.name() == "rememberme" || - crntCookie.name() == "validation") - { - mCookies << crntCookie; - } - } - QNetworkCookie langCookie("language", "en"); - mCookies << langCookie; - - // Set the cookiejar : it set the cookies that will be sent with every packet. - mpCookieJar->setCookiesFromUrl(mCookies, QUrl(DOCPUBLICATION_URL)/*reply->url()*/); - - mpNetworkMgr->setCookieJar(mpCookieJar); - bLoginCookieSet = true; - emit loginDone(); - } - else - { - if (response.isEmpty()) - { - // Verify that the UBW file has been sent correctly bool bTransferOk = false; for(int j = 0; j <= qslCookieVals.size(); j++) { @@ -689,12 +595,10 @@ void UBDocumentPublisher::onFinished(QNetworkReply *reply) { UBApplication::showMessage(tr("Failed to upload document on the web.")); } - } - } reply->deleteLater(); } -void UBDocumentPublisher::sendUbw() +void UBDocumentPublisher::sendUbw(QString username, QString password) { if (QFile::exists(mTmpZipFile)) { @@ -710,6 +614,10 @@ void UBDocumentPublisher::sendUbw() multipartHeader = "multipart/form-data; boundary="+boundary; data="--"+boundary+mCrlf; + data+="Content-Disposition: form-data; name=\"title\"" + mCrlf + mCrlf + mDocInfos.title + mCrlf; + data+="--"+boundary+mCrlf; + data+="Content-Disposition: form-data; name=\"description\"" + mCrlf + mCrlf + mDocInfos.description.remove("\n") + mCrlf; + data+="--"+boundary+mCrlf; data+="Content-Disposition: form-data; name=\"file\"; filename=\""+ fi.fileName() +"\""+mCrlf; data+="Content-Type: application/octet-stream"+mCrlf+mCrlf; datatoSend=data.toAscii(); // convert data string to byte array for request @@ -717,18 +625,15 @@ void UBDocumentPublisher::sendUbw() datatoSend += mCrlf; datatoSend += QString("--%0--%1").arg(boundary).arg(mCrlf); - QNetworkRequest request(QUrl(DOCPUBLICATION_URL)); + QNetworkRequest request(QUrl(QString(DOCPUBLICATION_URL).toAscii().constData())); + request.setHeader(QNetworkRequest::ContentTypeHeader, multipartHeader); request.setHeader(QNetworkRequest::ContentLengthHeader,datatoSend.size()); - request.setRawHeader("Accept", "application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"); + QString b64Auth = getBase64Of(QString("%0:%1").arg(username).arg(password)); + request.setRawHeader("Authorization", QString("Basic %0").arg(b64Auth).toAscii().constData()); + request.setRawHeader("Host", "sankore.devxwiki.com"); + request.setRawHeader("Accept", "*/*"); request.setRawHeader("Accept-Language", "en-US,*"); - request.setRawHeader("Referer", DOCPUBLICATION_URL); - - QNetworkCookie titleCookie("title", mDocInfos.title.toAscii().constData()); - QNetworkCookie descCookie("description", mDocInfos.description.remove("\n").toAscii().constData()); - - mCookies << titleCookie; - mCookies << descCookie; mpCookieJar->setCookiesFromUrl(mCookies, QUrl(DOCPUBLICATION_URL)); mpNetworkMgr->setCookieJar(mpCookieJar); @@ -744,37 +649,6 @@ QString UBDocumentPublisher::getBase64Of(QString stringToEncode) return stringToEncode.toAscii().toBase64(); } -void UBDocumentPublisher::onLinkClicked(const QUrl &url) -{ - // [Basic Auth] Here we interpret the link and send the request with the basic auth header. - QNetworkRequest request; - request.setUrl(url); - QString b64Auth = getBase64Of(QString("%0:%1").arg(mUsername).arg(mPassword)); - request.setRawHeader("Authorization", QString("Basic %0").arg(b64Auth).toAscii().constData()); - mpNetworkMgr->get(request); -} - -void UBDocumentPublisher::onLoadFinished(bool result) -{ - Q_UNUSED(result); - // [Basic Auth] This line says: if the user click on a link, do not interpret it. - //mpWebView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); - - mpWebView->page()->setNetworkAccessManager(mpNetworkMgr); -} - -void UBDocumentPublisher::onProxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator) -{ - Q_UNUSED(proxy); - UBProxyLoginDlg dlg; - if(QDialog::Accepted == dlg.exec()) - { - authenticator->setUser(dlg.username()); - authenticator->setPassword(dlg.password()); - } -} - - // --------------------------------------------------------- UBProxyLoginDlg::UBProxyLoginDlg(QWidget *parent, const char *name):QDialog(parent) , mpLayout(NULL) diff --git a/src/adaptors/publishing/UBDocumentPublisher.h b/src/adaptors/publishing/UBDocumentPublisher.h index 6d5a1297..6ed8dc7b 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.h +++ b/src/adaptors/publishing/UBDocumentPublisher.h @@ -21,7 +21,7 @@ #include "ui_webPublishing.h" #include "UBAbstractPublisher.h" -#define DOCPUBLICATION_URL "http://sankore.devxwiki.com/xwiki/bin/view/CreateResources/UniboardUpload" +#define DOCPUBLICATION_URL "http://sankore.devxwiki.com/xwiki/bin/view/CreateResources/UniboardUpload?xpage=plain&outputSyntax=plain" #define XWIKI_ORIGIN_HEADER "http://sankore.devxwiki.com" typedef struct @@ -104,21 +104,15 @@ protected: private slots: void onFinished(QNetworkReply* reply); - void onLinkClicked(const QUrl& url); - void onLoadFinished(bool result); - void onLoginDone(); - void onProxyAuthenticationRequired(const QNetworkProxy & proxy, QAuthenticator * authenticator); - private: UBDocumentProxy *mSourceDocument; UBDocumentProxy *mPublishingDocument; void init(); - void sendUbw(); + void sendUbw(QString username, QString password); QString getBase64Of(QString stringToEncode); - QWebView* mpWebView; QHBoxLayout* mpLayout; QNetworkAccessManager* mpNetworkMgr; QNetworkCookieJar* mpCookieJar; @@ -128,7 +122,6 @@ private: bool bLoginCookieSet; void buildUbwFile(); - void login(QString username, QString password); QString mTmpZipFile; QList mCookies; sDocumentInfos mDocInfos; diff --git a/src/core/UBApplication.cpp b/src/core/UBApplication.cpp index 3a29b323..bddfc5c3 100644 --- a/src/core/UBApplication.cpp +++ b/src/core/UBApplication.cpp @@ -349,11 +349,6 @@ void UBApplication::showDocument() applicationController->showDocument(); } -void UBApplication::showSankoreWebDocument() -{ - applicationController->showSankoreWebDocument(); -} - int UBApplication::toolBarHeight() { return mainWindow->boardToolBar->rect().height(); diff --git a/src/core/UBApplication.h b/src/core/UBApplication.h index 4e9f2747..bd1d994a 100644 --- a/src/core/UBApplication.h +++ b/src/core/UBApplication.h @@ -96,7 +96,6 @@ class UBApplication : public QtSingleApplication void showBoard(); void showInternet(); void showDocument(); - void showSankoreWebDocument(); void toolBarPositionChanged(QVariant topOrBottom); void toolBarDisplayTextChanged(QVariant display); diff --git a/src/core/UBApplicationController.cpp b/src/core/UBApplicationController.cpp index 28b3e6b6..c08ec695 100644 --- a/src/core/UBApplicationController.cpp +++ b/src/core/UBApplicationController.cpp @@ -1,17 +1,17 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ +/* + * This program is free software: you can 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 . + */ #include "UBApplicationController.h" #include "frameworks/UBPlatformUtils.h" @@ -365,7 +365,7 @@ void UBApplicationController::showInternet() { showDesktop(true); } - else + else { mMainWindow->boardToolBar->hide(); mMainWindow->documentToolBar->hide(); @@ -417,33 +417,6 @@ void UBApplicationController::showDocument() emit mainModeChanged(Document); } -void UBApplicationController::showSankoreWebDocument() -{ - mMainWindow->webToolBar->hide(); - mMainWindow->boardToolBar->hide(); - mMainWindow->tutorialToolBar->hide(); - mMainWindow->documentToolBar->show(); - - - mMainMode = WebDocument; - - adaptToolBar(); - - mirroringEnabled(false); - - mMainWindow->switchToSankoreWebDocumentWidget(); - - UBApplication::documentController->hide(); - - mMainWindow->show(); - - mUninoteController->hideWindow(); - - emit mainModeChanged(WebDocument); -} - - - void UBApplicationController::showDesktop(bool dontSwitchFrontProcess) { int desktopWidgetIndex = qApp->desktop()->screenNumber(mMainWindow); diff --git a/src/core/UBApplicationController.h b/src/core/UBApplicationController.h index 0f2c0e1d..75d6d3be 100644 --- a/src/core/UBApplicationController.h +++ b/src/core/UBApplicationController.h @@ -66,8 +66,6 @@ class UBApplicationController : public QObject void showDocument(); - void showSankoreWebDocument(); - void showMessage(const QString& message, bool showSpinningWheel); void importFile(const QString& pFilePath); diff --git a/src/core/UBPreferencesController.cpp b/src/core/UBPreferencesController.cpp index 95acbccd..867f3064 100644 --- a/src/core/UBPreferencesController.cpp +++ b/src/core/UBPreferencesController.cpp @@ -36,6 +36,27 @@ qreal UBPreferencesController::sSliderRatio = 10.0; qreal UBPreferencesController::sMinPenWidth = 0.5; qreal UBPreferencesController::sMaxPenWidth = 50.0; + +UBPreferencesDialog::UBPreferencesDialog(UBPreferencesController* prefController, QWidget* parent,Qt::WindowFlags f) + :QDialog(parent,f) + ,mPreferencesController(prefController) +{ +} + +UBPreferencesDialog::~UBPreferencesDialog() +{ +} + +void UBPreferencesDialog::closeEvent(QCloseEvent* e) +{ + if(mPreferencesController->inputValuesConsistence()) + e->accept(); + else + e->ignore(); +} + + + UBPreferencesController::UBPreferencesController(QWidget *parent) : QObject(parent) , mPreferencesWindow(0) @@ -43,8 +64,9 @@ UBPreferencesController::UBPreferencesController(QWidget *parent) , mPenProperties(0) , mMarkerProperties(0) { - mPreferencesWindow = new QDialog(parent, Qt::Dialog); - mPreferencesUI = new Ui::preferencesDialog(); // deleted in UBPreferencesController::destructor + mPreferencesWindow = new UBPreferencesDialog(this,parent, Qt::Dialog); + // mPreferencesWindow = new QDialog(parent, Qt::Dialog); + mPreferencesUI = new Ui::preferencesDialog(); // deleted in mPreferencesUI->setupUi(mPreferencesWindow); connect(mPreferencesUI->Username_textBox, SIGNAL(editingFinished()), this, SLOT(onCommunityUsernameChanged())); connect(mPreferencesUI->Password_textEdit, SIGNAL(editingFinished()), this, SLOT(onCommunityPasswordChanged())); @@ -108,8 +130,8 @@ void UBPreferencesController::wire() QList penDarkBackgroundSelectedColors = settings->boardPenDarkBackgroundSelectedColors->colors(); mPenProperties = new UBBrushPropertiesFrame(mPreferencesUI->penFrame, - penLightBackgroundColors, penDarkBackgroundColors, penLightBackgroundSelectedColors, - penDarkBackgroundSelectedColors, this); + penLightBackgroundColors, penDarkBackgroundColors, penLightBackgroundSelectedColors, + penDarkBackgroundSelectedColors, this); mPenProperties->opacityFrame->hide(); @@ -125,8 +147,8 @@ void UBPreferencesController::wire() QList markerDarkBackgroundSelectedColors = settings->boardMarkerDarkBackgroundSelectedColors->colors(); mMarkerProperties = new UBBrushPropertiesFrame(mPreferencesUI->markerFrame, markerLightBackgroundColors, - markerDarkBackgroundColors, markerLightBackgroundSelectedColors, - markerDarkBackgroundSelectedColors, this); + markerDarkBackgroundColors, markerLightBackgroundSelectedColors, + markerDarkBackgroundSelectedColors, this); mMarkerProperties->pressureSensitiveCheckBox->setText(tr("Marker is pressure sensitive")); @@ -151,7 +173,7 @@ void UBPreferencesController::init() mPreferencesUI->keyboardPaletteAutoMinimize->setChecked(settings->boardKeyboardPaletteAutoMinimize->get().toBool()); for(int i=0; ikeyboardPaletteKeyButtonSize->count(); i++) if (mPreferencesUI->keyboardPaletteKeyButtonSize->itemText(i) == - settings->boardKeyboardPaletteKeyBtnSize->get().toString()) + settings->boardKeyboardPaletteKeyBtnSize->get().toString()) { mPreferencesUI->keyboardPaletteKeyButtonSize->setCurrentIndex(i); break; @@ -201,15 +223,48 @@ void UBPreferencesController::onCommunityPasswordChanged() settings->setCommunityPassword(mPreferencesUI->Password_textEdit->text()); } + +bool UBPreferencesController::inputValuesConsistence() +{ + QString backgroundStyle = "QWidget {background-color: white}"; + mPreferencesUI->Username_textBox->setStyleSheet(backgroundStyle); + mPreferencesUI->Password_textEdit->setStyleSheet(backgroundStyle); + + QString username = mPreferencesUI->Username_textBox->text(); + QString password = mPreferencesUI->Password_textEdit->text(); + bool isConsistent = true; + if (username.length() + password.length()){ + backgroundStyle = "QWidget {background-color: magenta}"; + if(username.isEmpty()){ + isConsistent = false; + mPreferencesUI->mainTabWidget->setCurrentWidget(mPreferencesUI->networkTab); + mPreferencesUI->Username_textBox->setStyleSheet(backgroundStyle); + mPreferencesUI->Username_textBox->setFocus(); + mPreferencesUI->Username_textBox->setCursorPosition(0); + } + else if(password.isEmpty()){ + isConsistent = false; + mPreferencesUI->mainTabWidget->setCurrentWidget(mPreferencesUI->networkTab); + mPreferencesUI->Password_textEdit->setStyleSheet(backgroundStyle); + mPreferencesUI->Password_textEdit->setFocus(); + mPreferencesUI->Password_textEdit->setCursorPosition(0); + } + } + return isConsistent; +} + void UBPreferencesController::close() { //web QString homePage = mPreferencesUI->webHomePage->text(); - UBSettings::settings()->webHomePage->set(homePage); + UBSettings::settings()->webHomePage->set(homePage); UBSettings::settings()->setProxyUsername(mPreferencesUI->proxyUsername->text()); UBSettings::settings()->setProxyPassword(mPreferencesUI->proxyPassword->text()); + if (!inputValuesConsistence()) + return; + mPreferencesWindow->accept(); } @@ -253,8 +308,8 @@ void UBPreferencesController::defaultSettings() for (int i = 0 ; i < settings->colorPaletteSize ; i++) { - mPenProperties->lightBackgroundColorPickers[i]->setSelectedColorIndex(lightBackgroundSelectedColors.indexOf(settings->penColors(false).at(i))); - mPenProperties->darkBackgroundColorPickers[i]->setSelectedColorIndex(darkBackgroundSelectedColors.indexOf(settings->penColors(true).at(i))); + mPenProperties->lightBackgroundColorPickers[i]->setSelectedColorIndex(lightBackgroundSelectedColors.indexOf(settings->penColors(false).at(i))); + mPenProperties->darkBackgroundColorPickers[i]->setSelectedColorIndex(darkBackgroundSelectedColors.indexOf(settings->penColors(true).at(i))); } } else if (mPreferencesUI->mainTabWidget->currentWidget() == mPreferencesUI->markerTab) @@ -274,8 +329,8 @@ void UBPreferencesController::defaultSettings() for (int i = 0 ; i < settings->colorPaletteSize ; i++) { - mMarkerProperties->lightBackgroundColorPickers[i]->setSelectedColorIndex(lightBackgroundSelectedColors.indexOf(settings->markerColors(false).at(i))); - mMarkerProperties->darkBackgroundColorPickers[i]->setSelectedColorIndex(darkBackgroundSelectedColors.indexOf(settings->markerColors(true).at(i))); + mMarkerProperties->lightBackgroundColorPickers[i]->setSelectedColorIndex(lightBackgroundSelectedColors.indexOf(settings->markerColors(false).at(i))); + mMarkerProperties->darkBackgroundColorPickers[i]->setSelectedColorIndex(darkBackgroundSelectedColors.indexOf(settings->markerColors(true).at(i))); } } else if (mPreferencesUI->mainTabWidget->currentWidget() == mPreferencesUI->aboutTab) @@ -412,8 +467,8 @@ void UBPreferencesController::toolbarOrientationHorizontal(bool checked) } UBBrushPropertiesFrame::UBBrushPropertiesFrame(QFrame* owner, const QList& lightBackgroundColors, - const QList& darkBackgroundColors, const QList& lightBackgroundSelectedColors, - const QList& darkBackgroundSelectedColors, UBPreferencesController* controller) + const QList& darkBackgroundColors, const QList& lightBackgroundSelectedColors, + const QList& darkBackgroundSelectedColors, UBPreferencesController* controller) { setupUi(owner); @@ -485,4 +540,3 @@ UBBrushPropertiesFrame::UBBrushPropertiesFrame(QFrame* owner, const QList& lightBackgroundColors, - const QList& darkBackgroundColors, const QList& lightBackgroundSelectedColors, - const QList& darkBackgroundSelectedColors, UBPreferencesController* controller); + UBBrushPropertiesFrame(QFrame* owner, const QList& lightBackgroundColors,const QList& darkBackgroundColors, const QList& lightBackgroundSelectedColors,const QList& darkBackgroundSelectedColors, UBPreferencesController* controller); virtual ~UBBrushPropertiesFrame(){} diff --git a/src/gui/UBMainWindow.cpp b/src/gui/UBMainWindow.cpp index 26e84d82..bdf25ba4 100644 --- a/src/gui/UBMainWindow.cpp +++ b/src/gui/UBMainWindow.cpp @@ -43,7 +43,7 @@ UBMainWindow::UBMainWindow(QWidget *parent, Qt::WindowFlags flags) actionPreferences->setShortcut(QKeySequence(Qt::ALT + Qt::Key_Return)); actionQuit->setShortcut(QKeySequence(Qt::ALT + Qt::Key_F4)); #else - // No shortcut on Linux (like GEdit/Nautilius) + actionQuit->setShortcut(QKeySequence(Qt::ALT + Qt::Key_F4)); #endif } @@ -106,19 +106,6 @@ void UBMainWindow::switchToDocumentsWidget() } } -void UBMainWindow::addSankoreWebDocumentWidget(QWebView* pWidget) -{ - if(!mSankoreWebDocumentWidget){ - mSankoreWebDocumentWidget = pWidget; - mStackedLayout->addWidget(mSankoreWebDocumentWidget); - } -} - -void UBMainWindow::switchToSankoreWebDocumentWidget() -{ - if(mSankoreWebDocumentWidget) - mStackedLayout->setCurrentWidget(mSankoreWebDocumentWidget); -} void UBMainWindow::keyPressEvent(QKeyEvent *event) { QMainWindow::keyPressEvent(event); diff --git a/src/gui/UBMainWindow.h b/src/gui/UBMainWindow.h index 86f64302..12d7e457 100644 --- a/src/gui/UBMainWindow.h +++ b/src/gui/UBMainWindow.h @@ -42,9 +42,6 @@ class UBMainWindow : public QMainWindow, public Ui::MainWindow void addDocumentsWidget(QWidget *pWidget); void switchToDocumentsWidget(); - void addSankoreWebDocumentWidget(QWebView* pWidget); - void switchToSankoreWebDocumentWidget(); - public slots: void onExportDone();