diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro index c6cb40b8..e6a69f4e 100644 --- a/Sankore_3.1.pro +++ b/Sankore_3.1.pro @@ -7,9 +7,9 @@ CONFIG += debug_and_release \ no_include_pwd VERSION_MAJ = 1 -VERSION_MIN = 10 +VERSION_MIN = 11 VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error -VERSION_PATCH = 01 +VERSION_PATCH = 00 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}" VERSION = $$replace(VERSION, "\\.r", "") @@ -185,6 +185,12 @@ macx { TRANSLATION_fr.path = "$$RESOURCES_DIR/fr.lproj" QMAKE_BUNDLE_DATA += TRANSLATION_fr } + exists(resources/i18n/sankore_fr_CH.qm) { + TRANSLATION_fr.files = resources/i18n/sankore_fr_CH.qm \ + resources/i18n/Localizable.strings + TRANSLATION_fr.path = "$$RESOURCES_DIR/fr.lproj" + QMAKE_BUNDLE_DATA += TRANSLATION_fr_CH + } exists(resources/i18n/sankore_de.qm) { TRANSLATION_de.files = resources/i18n/sankore_de.qm \ resources/i18n/Localizable.strings @@ -331,6 +337,7 @@ RESOURCES += resources/sankore.qrc TRANSLATIONS = resources/i18n/sankore_en.ts \ resources/i18n/sankore_en_UK.ts \ resources/i18n/sankore_fr.ts \ + resources/i18n/sankore_fr_CH.ts \ resources/i18n/sankore_de.ts \ resources/i18n/sankore_nl.ts \ resources/i18n/sankore_es.ts \ diff --git a/lgplC++StandardHeaderFile.txt b/lgplC++StandardHeaderFile.txt new file mode 100644 index 00000000..3e5bd070 --- /dev/null +++ b/lgplC++StandardHeaderFile.txt @@ -0,0 +1,14 @@ +/* + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ diff --git a/release.linux.sh b/release.linux.sh index 6c93e193..9251d438 100644 --- a/release.linux.sh +++ b/release.linux.sh @@ -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 . +# --------------------------------------------------------------------- + #!/bin/sh make clean diff --git a/release.macx.sh b/release.macx.sh index 0549b371..1226458f 100644 --- a/release.macx.sh +++ b/release.macx.sh @@ -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 . +# --------------------------------------------------------------------- + #!/bin/bash # Executables diff --git a/release.vc9.bat b/release.vc9.bat index 85bd8cf7..58157072 100644 --- a/release.vc9.bat +++ b/release.vc9.bat @@ -1,3 +1,18 @@ +REM -------------------------------------------------------------------- +REM This program is free software: you can redistribute it and/or modify +REM it under the terms of the GNU General Public License as published by +REM the Free Software Foundation, either version 3 of the License, or +REM (at your option) any later version. +REM +REM This program is distributed in the hope that it will be useful, +REM but WITHOUT ANY WARRANTY; without even the implied warranty of +REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +REM GNU General Public License for more details. +REM +REM You should have received a copy of the GNU General Public License +REM along with this program. If not, see . +REM --------------------------------------------------------------------- + set QT_DIR=..\Qt-sankore3.1 set QT_BIN=%QT_DIR%\bin 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 ad76065d..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; @@ -38,8 +52,8 @@ function init(){ }); //FIT WIDGET FRAME ON LAUNCH... - if(window.uniboard){ - window.uniboard.resize($("#ubwidget").width()-15,85); + if(window.sankore){ + window.sankore.resize($("#ubwidget").width()-15,85); } searchWrap.append(inputBox) @@ -51,20 +65,29 @@ function init(){ $("#ubwidget").append(loadWindow) embed = inputBox.val(); searchWrap.hide(); - loadWindow.append(embed); - if(window.uniboard){ - window.uniboard.resize($(document).width(),$(document).height()); - window.uniboard.setPreference("embed", escape(embed)); - } + 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 44c86b95..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; @@ -26,8 +41,8 @@ function init(){ backgroundImage:"url(images/back.png)", width:328 }); - if(window.uniboard){ - window.uniboard.setPreference('historyTab', "visible"); + if(window.sankore){ + window.sankore.setPreference('historyTab', "visible"); }; }, function(){ @@ -37,8 +52,8 @@ function init(){ backgroundImage:"url(images/back_small.png)", width:160 }); - if(window.uniboard){ - window.uniboard.setPreference('historyTab', "hidden"); + if(window.sankore){ + window.sankore.setPreference('historyTab', "hidden"); }; } ) @@ -200,9 +215,9 @@ function init(){ .append(historyPanel) .append(keysPanel); - if(window.uniboard){ - historyTxt = window.uniboard.preference('historyTxt', historyTxt); - var ht = window.uniboard.preference('historyTab', "hidden"); + if(window.sankore){ + historyTxt = window.sankore.preference('historyTxt', historyTxt); + var ht = window.sankore.preference('historyTab', "hidden"); $("#historyBox").val(historyTxt); if(ht === "visible"){ historyTab.trigger("click"); @@ -210,7 +225,7 @@ function init(){ } function resizeWidget(w, h){ - window.uniboard.resize(w+2, h+2); + window.sankore.resize(w+2, h+2); $("#indicator").remove(); var indicator = $("
") .css({ @@ -238,8 +253,8 @@ function compute(){ displayTrunk = ""; historyTrunk = ""; - if(window.uniboard){ - window.uniboard.setPreference('historyTxt', $("#historyBox").val()); + if(window.sankore){ + window.sankore.setPreference('historyTxt', $("#historyBox").val()); }; lastHistory = $("#historyBox").val(); diff --git a/resources/library/interactive/GeoInfo.wgt/GeoInfo.html b/resources/library/interactive/GeoInfo.wgt/GeoInfo.html index bb934dd7..d3559a9d 100644 --- a/resources/library/interactive/GeoInfo.wgt/GeoInfo.html +++ b/resources/library/interactive/GeoInfo.wgt/GeoInfo.html @@ -1013,11 +1013,11 @@ Comparer les pays: - - - - - + + + + +
@@ -1025,1061 +1025,1061 @@
Maroc
Capitale: Rabat
- +
Algerie
Capitale: Alger
- +
Tunisie
Capitale: Tunis
- +
Libye
Capitale: Tripoli
- +
Egypte
Capitale: Le Caire
- +
Sahara occidental
Capitale:
- +
Mauritanie
Capitale: Nouakchott
- +
Mali
Capitale: Bamako
- +
Niger
Capitale: Niamey
- +
Tchad
Capitale: Ndjamena
- +
Soudan
Capitale: Khartoum
- +
Erythree
Capitale: Asmara
- +
Djibouti
Capitale: Djibouti
- +
Ethiopie
Capitale: Addis Abeba
- +
Somalie
Capitale: Mogadiscio
- +
Kenya
Capitale: Nairobi
- +
Ouganda
Capitale: Kampala
- +
Republique democratique du Congo
Capitale: Kinshasa
- +
Republique centrafricaine
Capitale: Bangui
- +
Cameroun
Capitale: Yaounde
- +
Nigeria
Capitale: Abuja
- +
Benin
Capitale: Porto Novo
- +
Togo
Capitale: Lome
- +
Ghana
Capitale: Accra
- +
Cote d'Ivoire
Capitale: Yamoussoukro
- +
Burkina Faso
Capitale: Ouagadougou
- +
Liberia
Capitale: Monravia
- +
Sierra Leone
Capitale: Freetown
- +
Guinee
Capitale: Conakry
- +
Guinee-Bissau
Capitale: Bissau
- +
Senegal
Capitale: Dakar
- +
Gambie
Capitale: Banjul
- +
Rwanda
Capitale: Kigali
- +
Burundi
Capitale: Bujumbura
- +
Republique du Congo
Capitale: Brazzaville
- +
Gabon
Capitale: Libreville
- +
Guinee Equatoriale
Capitale: Malabo
- +
Tanzanie
Capitale: Dodoma
- +
Malawi
Capitale: Lilongwe
- +
Zambie
Capitale: Lusaka
- +
Angola
Capitale: Luanda
- +
Mozambique
Capitale: Maputo
- +
Zimbabwe
Capitale: Harare
- +
Botswana
Capitale: Gaborone
- +
Namibie
Capitale: Windhoec
- +
Afrique du Sud
Capitale: Pretoria
- +
Lesotho
Capitale: Maseru
- +
Swaziland
Capitale: Mbabane
- +
Madagascar
Capitale: Antananarivo
- +
Argentine
Capitale: Buenos Aires
- +
Chili
Capitale: Santiago
- +
Uruguay
Capitale: Montevideo
- +
Paraguay
Capitale: Asuncion
- +
Bolivie
Capitale: La Paz
- +
Bresil
Capitale: Brasilia
- +
Perou
Capitale: Lima
- +
Equateur
Capitale: Quito
- +
Colombie
Capitale: Bogota
- +
Venezuela
Capitale: Caracas
- +
Guyana
Capitale: Georgetown
- +
Suriname
Capitale: Paramaribo
- +
Guyane
Capitale: Paris
- +
Canada
Capitale: Ottawa
- +
Groenland
Capitale: Nuuk
- +
Etats-Unis d'Amerique
Capitale: Washington DC
- +
Mexique
Capitale: Mexico
- +
Cuba
Capitale: La Havane
- +
Haiti
Capitale: Port-au-Prince
- +
Republique dominicaine
Capitale: Saint-Domingue
- +
Jamaique
Capitale: Kingston
- +
Bahamas
Capitale: Nassau
- +
Guatemala
Capitale: Guatemala
- +
Belize
Capitale: Belmopan
- +
El Salvador
Capitale: San Salvador
- +
Honduras
Capitale: Tegucigalpa
- +
Nicaragua
Capitale: Managua
- +
Costa-Rica
Capitale: San Jose
- +
Panama
Capitale: Panama
- +
Australie
Capitale: Canberra
- +
Nouvelle-Zelande
Capitale: Wellington
- +
Papouasie-Nouvelle-Guinee
Capitale: Port Moresby
- +
Indonesie
Capitale: Jakarta
- +
Iles Salomon
Capitale: Honiara
- +
Vanuatu
Capitale: Port-Vila
- +
Nouvelle-Caledonie
Capitale: Paris
- +
Albanie
Capitale: Tirana
- +
Allemagne
Capitale: Berlin
- +
Armenie
Capitale: Erevan
- +
Autriche
Capitale: Vienne
- +
Azerbaidjan
Capitale: Bakou
- +
Belgique
Capitale: Bruxelles
- +
Belarus
Capitale: Minsk
- +
Bosnie
Capitale: Sarajevo
- +
Bulgarie
Capitale: Sofia
- +
Chypre
Capitale: Nicosie
- +
Croatie
Capitale: Zagreb
- +
Danemark
Capitale: Copenhague
- +
Espagne
Capitale: Madrid
- +
Estonie
Capitale: Tallinn
- +
Finlande
Capitale: Helsinki
- +
France
Capitale: Paris
- +
Georgie
Capitale: Tbilissi
- +
Grece
Capitale: Athenes
- +
Hongrie
Capitale: Budapest
- +
Irlande
Capitale: Dublin
- +
Islande
Capitale: Reykjavik
- +
Italie
Capitale: Rome
- +
Lettonie
Capitale: Riga
- +
Liechtenstein
Capitale: Vaduz
- +
Lituanie
Capitale: Vilnius
- +
Luxembourg
Capitale: Luxembourg
- +
Macedoine
Capitale: Skopje
- +
Malte
Capitale: La Valette
- +
Moldavie
Capitale: Chisinau
- +
Monaco
Capitale: Monaco
- +
Montenegro
Capitale: Podaorica
- +
Norvege
Capitale: Oslo
- +
Pays-Bas
Capitale: Amsterdam
- +
Pologne
Capitale: Varsovie
- +
Portugal
Capitale: Lisbonne
- +
Republique tcheque
Capitale: Prague
- +
Roumanie
Capitale: Bucarest
- +
Royaume-Uni
Capitale: Londres
- +
Saint-Marin
Capitale: Saint-Marin
- +
Serbie
Capitale: Belgrade
- +
Slovaquie
Capitale: Bratislava
- +
Slovenie
Capitale: Ljubljana
- +
Suede
Capitale: Stockholm
- +
Suisse
Capitale: Berne
- +
Turquie
Capitale: Ankara
- +
Ukraine
Capitale: Kiev
- +
Vatican
Capitale: Cite du Vatican
- +
Afghanistan
Capitale: Kaboul
- +
Arabie Saoudite
Capitale: Riyad
- +
Bahrein
Capitale: Manama
- +
Bangladesh
Capitale: Dhaka
- +
Bhoutan
Capitale: Thimphou
- +
Brunei
Capitale: Bandar Seri Begawan
- +
Cambodge
Capitale: Phnom Penh
- +
Chine
Capitale: Pekin
- +
Coree du Nord
Capitale: Pyongyang
- +
Coree du Sud
Capitale: Seoul
- +
Emirats arabes unis
Capitale: Abou Dabi
- +
Inde
Capitale: New Delhi
- +
Indonesie
Capitale: Jakarta
- +
Iran
Capitale: Teheran
- +
Iraq
Capitale: Bagdad
- +
Israel
Capitale: Jerusalem
- +
Japon
Capitale: Tokyo
- +
Jordanie
Capitale: Amman
- +
Kazakhstan
Capitale: Astana
- +
Kirghizistan
Capitale: Bichkek
- +
Koweit
Capitale: Koweit
- +
Laos
Capitale: Vientiane
- +
Liban
Capitale: Beyrouth
- +
Malaisie
Capitale: Kuala Lumpur
- +
Maldives
Capitale: Male
- +
Mongolie
Capitale: Oulan-Bator
- +
Myanmar
Capitale: Naypyidaw
- +
Nepal
Capitale: Katmandou
- +
Oman
Capitale: Mascate
- +
Ouzbekistan
Capitale: Tachkent
- +
Pakistan
Capitale: Islamabad
- +
Philippines
Capitale: Manille
- +
Qatar
Capitale: Doha
- +
Russie
Capitale: Moscou
- +
Singapour
Capitale: Singapour
- +
Sri Lanka
Capitale: Colombo
- +
Syrie
Capitale: Damas
- +
Tadjikistan
Capitale: Douchanbe
- +
Thailande
Capitale: Bangkok
- +
Timor-oriental
Capitale: Dili
- +
Turkmenistan
Capitale: Achgabat
- +
Viet Nam
Capitale: Hanoi
- +
Yemen
Capitale: Sanaa
- +
diff --git a/resources/library/interactive/GeoInfo.wgt/css/GeoInfo.css b/resources/library/interactive/GeoInfo.wgt/css/GeoInfo.css index 65c9d25b..6bc7a4d4 100644 --- a/resources/library/interactive/GeoInfo.wgt/css/GeoInfo.css +++ b/resources/library/interactive/GeoInfo.wgt/css/GeoInfo.css @@ -1,3 +1,7 @@ +body { + background-color: white; +} + .styleDiv { height:250px; diff --git a/resources/library/interactive/GeoInfo.wgt/icon.png b/resources/library/interactive/GeoInfo.wgt/icon.png index 881af284..b66223b5 100644 Binary files a/resources/library/interactive/GeoInfo.wgt/icon.png and b/resources/library/interactive/GeoInfo.wgt/icon.png differ 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/GeoInfo.wgt/js/GeoInfo.js b/resources/library/interactive/GeoInfo.wgt/js/GeoInfo.js index 2898ed4d..704b1f52 100644 --- a/resources/library/interactive/GeoInfo.wgt/js/GeoInfo.js +++ b/resources/library/interactive/GeoInfo.wgt/js/GeoInfo.js @@ -89,9 +89,7 @@ function popupInfo(text) // met la bonne grandeur à chaque div for (i = 1; i <= currentInfo; i++) - { document.getElementById("info" + i).style.width = (654/currentInfo) + 'px'; - } } // affiche le text de l'erreur en cas de problème @@ -224,19 +222,19 @@ function fondu(carte) // permet de faire apparaître les infos du pays dans la petite fenêtre function afficheInfoPays(pays) { - document.getElementById("infoPays").innerHTML = document.getElementById(pays).innerHTML + document.getElementById("infoPays").innerHTML = document.getElementById(pays).innerHTML; } // permet de cacher la petite fenêtre function cacherInfoPays() { - document.getElementById("infoPays").style.display = 'none' + document.getElementById("infoPays").style.display = 'none'; } // permet à la petite fenêtre de suivre la souris function deplacerInfo(event) { - document.getElementById("infoPays").style.display = 'block' - document.getElementById("infoPays").style.top = event.clientY - document.getElementById ("infoPays").style.left = event.clientX+20 + document.getElementById("infoPays").style.display = 'block'; + document.getElementById("infoPays").style.top = event.clientY; + document.getElementById ("infoPays").style.left = event.clientX+20; } diff --git a/resources/library/interactive/GeoInfo.wgt/js/soapclient.js b/resources/library/interactive/GeoInfo.wgt/js/soapclient.js index 99143a95..31555465 100644 --- a/resources/library/interactive/GeoInfo.wgt/js/soapclient.js +++ b/resources/library/interactive/GeoInfo.wgt/js/soapclient.js @@ -162,7 +162,7 @@ SOAPClient._sendSoapRequest = function(url, method, parameters, async, callback, "" + + "xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " + "xmlns:ser=\"" + ns + "\">" + "" + "" + parameters.toXml() + 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 @@ - - + @@ -27,11 +26,23 @@ .height(($(window).height())-(40)); $('iframe').width($(window).width()-24) .height($(window).height()-46); - if(window.uniboard){ - var html = window.uniboard.preference("html", "Welcome to HTML EDITOR"); + if(window.sankore){ + var html = window.sankore.preference("iHtml", "Welcome to HTML EDITOR"); $("#markItUp").val(html); }; + $("#markItUp").keyup(function(){ + if(window.sankore){ + window.sankore.setPreference("iHtml", $("#markItUp").val()); + } + }); + + $("li").mouseout(function(){ + if(window.sankore){ + window.sankore.setPreference("iHtml", $("#markItUp").val()); + } + }); + $("#reset-btn").click(function(){ $(this).data("hidden", true).hide(); $('textarea').show(); diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/set.js b/resources/library/interactive/Html.wgt/markitup/sets/html/set.js index 6ae74c3d..e1a5504e 100644 --- a/resources/library/interactive/Html.wgt/markitup/sets/html/set.js +++ b/resources/library/interactive/Html.wgt/markitup/sets/html/set.js @@ -34,6 +34,6 @@ mySettings = { {name:'Link', key:'L', openWith:'', closeWith:'', placeHolder:'Your text to link...' }, {separator:'---------------' }, //{name:'Editor', className:'clean', replaceWith:function() { $('textarea').show(); $('iframe').remove();} }, - {name:'Preview', className:'preview', call:'preview'} + {name:'', className:'preview', call:'preview'} ] } \ No newline at end of file diff --git a/resources/library/interactive/Html.wgt/markitup/sets/html/style.css b/resources/library/interactive/Html.wgt/markitup/sets/html/style.css index aa8db144..c22ef4de 100644 --- a/resources/library/interactive/Html.wgt/markitup/sets/html/style.css +++ b/resources/library/interactive/Html.wgt/markitup/sets/html/style.css @@ -3,95 +3,71 @@ // By Jay Salvat - http://markitup.jaysalvat.com/ // ------------------------------------------------------------------*/ .markItUp .markItUpButton1 a { - position:static; - margin-left:5px; background-image:url(images/h1.png); + background-repeat:no-repeat; } -.markItUp .markItUpButton2 a { - position:static; - +.markItUp .markItUpButton2 a { background-image:url(images/h2.png); + background-repeat:no-repeat; } .markItUp .markItUpButton3 a { - position:static; - background-image:url(images/h3.png); + background-repeat:no-repeat; } .markItUp .markItUpButton4 a { - position:static; - background-image:url(images/h4.png); + background-repeat:no-repeat; } .markItUp .markItUpButton5 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/h5.png); } .markItUp .markItUpButton6 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/h6.png); } .markItUp .markItUpButton7 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/paragraph.png); } .markItUp .markItUpButton8 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/bold.png); } .markItUp .markItUpButton9 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/italic.png); } .markItUp .markItUpButton10 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/stroke.png); } .markItUp .markItUpButton11 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/list-bullet.png); } .markItUp .markItUpButton12 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/list-numeric.png); } .markItUp .markItUpButton13 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/list-item.png); } .markItUp .markItUpButton14 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/picture.png); } .markItUp .markItUpButton15 a { - position:static; - + background-repeat:no-repeat; background-image:url(images/link.png); } -.markItUp .clean a { - position:static; - - margin-top:-2px; - width:32px; - height:20px; - background-image:url(images/clean.png); -} .markItUp .preview a { - position:static; - + background-repeat:no-repeat; margin-top:-2px; width:46px; height:20px; diff --git a/resources/library/interactive/Html.wgt/markitup/templates/preview.css b/resources/library/interactive/Html.wgt/markitup/templates/preview.css index 05eb4e3b..000d9ee4 100644 --- a/resources/library/interactive/Html.wgt/markitup/templates/preview.css +++ b/resources/library/interactive/Html.wgt/markitup/templates/preview.css @@ -1,3 +1,4 @@ body { font:70% Verdana, Arial, Helvetica, sans-serif; + color: orange; } \ No newline at end of file diff --git a/resources/library/interactive/Notes.wgt/css/ubwidget.css b/resources/library/interactive/Notes.wgt/css/ubwidget.css index 0a9d155f..d0d52396 100644 --- a/resources/library/interactive/Notes.wgt/css/ubwidget.css +++ b/resources/library/interactive/Notes.wgt/css/ubwidget.css @@ -41,7 +41,7 @@ body{ .stickytitle{ background-color: transparent; min-width: 10px; - max-width: 60%; + max-width: 70%; width: 100%; padding-top: 4px; height: 20px; diff --git a/resources/library/interactive/Notes.wgt/js/ubw-main.js b/resources/library/interactive/Notes.wgt/js/ubw-main.js index b5ff1e8d..662a41ae 100644 --- a/resources/library/interactive/Notes.wgt/js/ubw-main.js +++ b/resources/library/interactive/Notes.wgt/js/ubw-main.js @@ -1,10 +1,26 @@ +/* + * This program is free software: you can 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 ubwidget = $("#ubwidget").ubwidget({ - width:300, + width:360, height:240 }); + var checkMinimize = false; var text = ""; var winwidth; var minimizedHeight; @@ -12,18 +28,18 @@ function init(){ var scroll = false; var defaultFontSize = 35; var currentFontSize = defaultFontSize; - var header = $(''); - var fontUp = $(''); - var fontDown = $(''); - var minimize = $(''); - var maximize = $(''); + var header = $(''); + var fontUp = $(''); + var fontDown = $(''); + var minimize = $(''); + var maximize = $(''); var title = $(''); var textField = $('
'); var shadow = $("
 
") .appendTo("body"); - var shadowleft = $("") + var shadowleft = $("") .appendTo($("#sl")); - var shadowright = $("") + var shadowright = $("") .appendTo($("#sr")); $("#ubwidget") @@ -44,7 +60,6 @@ function init(){ titletext.click( function(){ - titletext.focus(); }); @@ -60,16 +75,16 @@ function init(){ controlTextField(); - if(window.uniboard){ - window.uniboard.setPreference("fontSize", newFontSize); + if(window.sankore){ + window.sankore.setPreference("fontSize", newFontSize); }; - textField.focus(); + if(!checkMinimize) + textField.focus(); }); fontUp.click( function(){ - var newFontSize = parseInt(currentFontSize) + 3; textField.css({ @@ -78,41 +93,40 @@ function init(){ controlTextField(); - if(window.uniboard){ - window.uniboard.setPreference("fontSize", newFontSize); + if(window.sankore){ + window.sankore.setPreference("fontSize", newFontSize); }; - textField.focus(); + if(!checkMinimize) + textField.focus(); }); minimize.click( function(){ - $('.ubw-container').animate({height:"26px"},100); - minimizedHeight = $('.ubw-container').height() ; + $('.ubw-container').animate({height:"26px"},500); + minimizedHeight = $('.ubw-container').height(); minimize.hide(); maximize.show(); + controlTextField(); $('#headtitle').show(); - window.resizeTo($('.ubw-container').width(),0); + $('#headtitle').focus(); + //window.resizeTo($('.ubw-container').width(),0); + checkMinimize = true; - if(window.uniboard){ - window.uniboard.setPreference("minimized", "true"); - }; }); maximize.click( function(){ var lastHeight = String(minimizedHeight)+'px'; - $('.ubw-container').animate({height: lastHeight},100); + $('.ubw-container').animate({height: lastHeight},500); maximize.hide(); minimize.show(); $('#headtitle').hide(); - - window.resizeTo($('.ubw-container').width()+15,minimizedHeight+20); + //textField.focus(); + //window.resizeTo($('.ubw-container').width()+15,minimizedHeight+20); + checkMinimize = false; - if(window.uniboard){ - window.uniboard.setPreference("minimized", "false"); - }; }); header @@ -126,11 +140,11 @@ function init(){ .css("fontSize",currentFontSize) .attr('contentEditable','true') .keyup(function(){ - if(window.uniboard){ - window.uniboard.setPreference("text", textField.html()); + if(window.sankore){ + window.sankore.setPreference("noteText", textField.html()); } controlTextField(); - $('#headtitle').hide(); + //$('#headtitle').hide(); }); if(textField.html().length === 0){ textField.focus(); @@ -139,10 +153,10 @@ function init(){ .attr('rows','1'); function controlTextField(){ - if(textField.text().length < 25){ - var titleStr = textField.text() + '...'; - $('#headtitle').val(titleStr); - } + if(textField.text().length < 25) + $('#headtitle').val(textField.text()); + else + $('#headtitle').val(textField.text().substr(0,25) + "..."); textField.css({ height : $('.ubw-container').height()-28, @@ -160,18 +174,19 @@ function init(){ textField.bind('paste', function(e) { controlTextField(); - }); + }); + $('#headtitle').hide(); - if(window.uniboard){ - text = window.uniboard.preference('text', text); - currentFontSize = window.uniboard.preference('fontSize', defaultFontSize); - + + if(window.sankore){ + text = window.sankore.preference('noteText', text); + currentFontSize = window.sankore.preference('fontSize', defaultFontSize); $('.ubw-container').css({ - width:parseInt(window.uniboard.preference('width', "300")), - height:parseInt(window.uniboard.preference('height', "240")) + width:window.innerWidth - 2, + height:window.innerHeight - 20 }); - if(window.uniboard.preference('minimized', "false") == "true"){ + if(checkMinimize){ minimize.trigger("click"); }; @@ -196,15 +211,14 @@ function init(){ if(winheight > 600) { window.resizeTo(winwidth,600); - } - - $('.ubw-container').width(winwidth-2) ; - $('.ubw-container').height(winheight-20) ; + } - if(window.uniboard){ - window.uniboard.setPreference("width", winwidth-2); - window.uniboard.setPreference("height", winheight-20); - } + $('.ubw-container').width(winwidth-2); + + if(checkMinimize) + minimizedHeight = winheight-40; + else + $('.ubw-container').height(winheight-40); controlTextField(); } diff --git a/resources/library/interactive/Notes.wgt/ubw-main.js b/resources/library/interactive/Notes.wgt/ubw-main.js new file mode 100644 index 00000000..1e86c2a5 --- /dev/null +++ b/resources/library/interactive/Notes.wgt/ubw-main.js @@ -0,0 +1,211 @@ +function init(){ + + var ubwidget = $("#ubwidget").ubwidget({ + width:300, + height:240 + }); + + var text = ""; + var winwidth; + var minimizedHeight; + var winheight; + var scroll = false; + var defaultFontSize = 35; + var currentFontSize = defaultFontSize; + var header = $(''); + var fontUp = $(''); + var fontDown = $(''); + var minimize = $(''); + var maximize = $(''); + var title = $(''); + var textField = $('
'); + var shadow = $("
 
") + .appendTo("body"); + var shadowleft = $("") + .appendTo($("#sl")); + var shadowright = $("") + .appendTo($("#sr")); + + $("#ubwidget") + .append(header) + .append(textField); + + fontUp.addClass('menuElement'); + fontDown.addClass('menuElement'); + minimize.addClass('menuElement'); + maximize.addClass('menuElement') + .hide(); + + header.append(maximize) + .append(minimize) + .append(fontUp) + .append(fontDown); + var titletext = header.find('textarea'); + + titletext.click( + function(){ + + titletext.focus(); + + }); + + fontDown.click( + function(){ + + var newFontSize = parseInt(currentFontSize) - 3; + + textField.css({ + fontSize : newFontSize + }) + + controlTextField(); + + if(window.sankore){ + window.sankore.setPreference("fontSize", newFontSize); + }; + + //textField.focus(); + }); + + fontUp.click( + function(){ + + var newFontSize = parseInt(currentFontSize) + 3; + + textField.css({ + fontSize : newFontSize + }) + + controlTextField(); + + if(window.sankore){ + window.sankore.setPreference("fontSize", newFontSize); + }; + + //textField.focus(); + }); + + minimize.click( + function(){ + $('.ubw-container').animate({height:"26px"},100); + minimizedHeight = $('.ubw-container').height() ; + minimize.hide(); + maximize.show(); + $('#headtitle').show(); + window.resizeTo($('.ubw-container').width(),0); + + if(window.sankore){ + window.sankore.setPreference("minimized", "true"); + }; + }); + + maximize.click( + function(){ + var lastHeight = String(minimizedHeight)+'px'; + $('.ubw-container').animate({height: lastHeight},100); + + maximize.hide(); + minimize.show(); + $('#headtitle').hide(); + + window.resizeTo($('.ubw-container').width()+15,minimizedHeight+20); + + if(window.sankore){ + window.sankore.setPreference("minimized", "false"); + }; + }); + + header + .append(title); + title + .addClass('menu'); + header + .addClass('head'); + textField + .addClass("textField") + .css("fontSize",currentFontSize) + .attr('contentEditable','true') + .keyup(function(){ + if(window.sankore){ + window.sankore.setPreference("text", textField.html()); + } + controlTextField(); + $('#headtitle').hide(); + }); + if(textField.html().length === 0){ + textField.focus(); + } + titletext + .attr('rows','1'); + + function controlTextField(){ + if(textField.text().length < 25){ + var titleStr = textField.text() + '...'; + $('#headtitle').val(titleStr); + } + + textField.css({ + height : $('.ubw-container').height()-28, + }) + + if(textField.text().length == 0){ + textField.css({ + fontSize: defaultFontSize, + }); + } + + currentFontSize = textField.css('fontSize').replace('px',''); + + } + + textField.bind('paste', function(e) { + controlTextField(); + }); + $('#headtitle').hide(); + if(window.sankore){ + text = window.sankore.preference('text', text); + currentFontSize = window.sankore.preference('fontSize', defaultFontSize); + + $('.ubw-container').css({ + width:parseInt(window.sankore.preference('width', "300")), + height:parseInt(window.sankore.preference('height', "240")) + }); + + if(window.sankore.preference('minimized', "false") == "true"){ + minimize.trigger("click"); + }; + + textField.css({ + fontSize : parseInt(currentFontSize) + }) + textField.html(text); + } + + window.onresize = function(){ + winwidth = window.innerWidth; + winheight = window.innerHeight; + + if(winwidth <= 290) + { + window.resizeTo(290,winheight); + } + if(winheight <= 100) + { + window.resizeTo(winwidth,100); + } + if(winheight > 600) + { + window.resizeTo(winwidth,600); + } + + $('.ubw-container').width(winwidth-2) ; + $('.ubw-container').height(winheight-20) ; + + if(window.sankore){ + window.sankore.setPreference("width", winwidth-2); + window.sankore.setPreference("height", winheight-20); + } + + controlTextField(); + } +} \ No newline at end of file diff --git a/resources/library/interactive/Stopwatch.wgt/index.html b/resources/library/interactive/Stopwatch.wgt/index.html index d488498e..55139583 100644 --- a/resources/library/interactive/Stopwatch.wgt/index.html +++ b/resources/library/interactive/Stopwatch.wgt/index.html @@ -12,7 +12,6 @@ - diff --git a/resources/library/interactive/Stopwatch.wgt/js/ubw-main.js b/resources/library/interactive/Stopwatch.wgt/js/ubw-main.js index 6f7c1206..fa08dbf0 100644 --- a/resources/library/interactive/Stopwatch.wgt/js/ubw-main.js +++ b/resources/library/interactive/Stopwatch.wgt/js/ubw-main.js @@ -1,91 +1,158 @@ +/* + * This program is free software: you can 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 ubwidget = $("#ubwidget").ubwidget({ - width:252, - height:89 - }); - - var space = $("
h
").ubwbutton({w:17, h:68}); - space.find(".ubw-button-body").css({ - borderLeft:"none", - borderRight:"none" - }); - var spaceb = $("
m
").ubwbutton({w:17, h:68}); - spaceb.find(".ubw-button-body").css({ - borderLeft:"none", - borderRight:"none" - }); - spaceb.find(".ubw-button-canvas").unbind("mouseenter"); - var spacec = $("
s
").ubwbutton({w:17, h:68}); - spacec.find(".ubw-button-body").css({ - borderLeft:"none", - borderRight:"none" - }); - spacec.find(".ubw-button-canvas").unbind("mouseenter"); + 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 + }); - var hours = $("
00
").ubwbutton({w:52, h:68}, {bottom:1, top:1, right:0, left:0}); - hours.find(".ubw-button-body").css({ - borderRight:"none" - }); - var minutes = $("
00
").ubwbutton({w:52, h:68}, {bottom:1, top:1, right:0, left:0}); - minutes.find(".ubw-button-body").css({ - borderLeft:"none", - borderRight:"none" - }); - var seconds = $("
00
").ubwbutton({w:52, h:68}, {bottom:1, top:1, right:0, left:0}); - seconds.find(".ubw-button-body").css({ - borderLeft:"none", - borderRight:"none" - }); - var pause = $("
") - pause.css({ - marginLeft:8, - marginTop:3, - marginBottom:-2, - height:47 - }); + var space = $("
h
").ubwbutton({ + w:17, + h:68 + }); + space.find(".ubw-button-body").css({ + borderLeft:"none", + borderRight:"none" + }); + var spaceb = $("
m
").ubwbutton({ + w:17, + h:68 + }); + spaceb.find(".ubw-button-body").css({ + borderLeft:"none", + borderRight:"none" + }); + spaceb.find(".ubw-button-canvas").unbind("mouseenter"); + var spacec = $("
s
").ubwbutton({ + w:17, + h:68 + }); + spacec.find(".ubw-button-body").css({ + borderLeft:"none", + borderRight:"none" + }); + spacec.find(".ubw-button-canvas").unbind("mouseenter"); + + var hours = $("
" + tempHours + "
").ubwbutton({ + w:52, + h:68 + }, { + bottom:1, + top:1, + right:0, + left:0 + }); + hours.find(".ubw-button-body").css({ + borderRight:"none" + }); + var minutes = $("
" + tempMinutes + "
").ubwbutton({ + w:52, + h:68 + }, { + bottom:1, + top:1, + right:0, + left:0 + }); + minutes.find(".ubw-button-body").css({ + borderLeft:"none", + borderRight:"none" + }); + var seconds = $("
" + tempSeconds + "
").ubwbutton({ + w:52, + h:68 + }, { + bottom:1, + top:1, + right:0, + left:0 + }); + + seconds.find(".ubw-button-body").css({ + borderLeft:"none", + borderRight:"none" + }); + var pause = $("
") + pause.css({ + marginLeft:8, + marginTop:3, + marginBottom:-2, + height:47 + }); - var reset = $("
") - .css({ - marginLeft:8, - marginTop:1 - }) - .click(function(){ - $("#hours").find(".ubw-button-content").text("00"); - $("#minutes").find(".ubw-button-content").text("00"); - $("#seconds").find(".ubw-button-content").text("00"); - clearTimeout(currentTimer); - if(play){ - $("#pausebutton").trigger("click"); - } - }); + var reset = $("
") + .css({ + marginLeft:8, + marginTop:1 + }) + .click(function(){ + $("#hours").find(".ubw-button-content").text("00"); + $("#minutes").find(".ubw-button-content").text("00"); + $("#seconds").find(".ubw-button-content").text("00"); + clearTimeout(currentTimer); + if(play){ + $("#pausebutton").trigger("click"); + } + }); - if (window.widget) { - window.widget.onremove = function(){ - if(play){ - $("#pausebutton").trigger("click"); - }; - }; - }; + if (window.widget) { + window.widget.onremove = function(){ + if(play){ + $("#pausebutton").trigger("click"); + } + }; + } - pause.toggle( - function(){ - play = false; - clearTimeout(currentTimer); - $(this).find("img").attr("src", "images/button_play_invert.png"); - }, - function(){ - play = true; - var timeInSeconds = parseInt($("#seconds").find(".ubw-button-content").text(), 10) + - parseInt($("#minutes").find(".ubw-button-content").text(), 10)*60 + - parseInt($("#hours").find(".ubw-button-content").text(), 10)*3600; + pause.toggle( + function(){ + play = false; + clearTimeout(currentTimer); + $(this).find("img").attr("src", "images/button_play_invert.png"); + }, + function(){ + if($("#hours").find(".ubw-button-content").text() != "00" || + $("#minutes").find(".ubw-button-content").text() != "00" || + $("#seconds").find(".ubw-button-content").text() != "00") { + + play = true; + var timeInSeconds = parseInt($("#seconds").find(".ubw-button-content").text(), 10) + + parseInt($("#minutes").find(".ubw-button-content").text(), 10)*60 + + parseInt($("#hours").find(".ubw-button-content").text(), 10)*3600; - updateChronometerReverse(timeInSeconds); + updateChronometerReverse(timeInSeconds); - $(this).find("img").attr("src", "images/button_pause_invert.png"); - } - );/*.mouseenter(function(){ + $(this).find("img").attr("src", "images/button_pause_invert.png"); + } + } + );/*.mouseenter(function(){ var o = $(this).find("img").attr("src"); $(this).find("img").attr("src", o.split(".")[0]+"xov.png"); }).mouseout(function(){ @@ -93,103 +160,143 @@ function init(){ $(this).find("img").attr("src", o.split("x")[0]+".png"); });*/ - setTimeout(function(){pause.trigger("click")}, 200); + setTimeout(function(){ + pause.trigger("click") + }, 200); - hours - .bind("mousedown", {button:hours}, timeButtonDownHandler) - .find(".ubw-button-arrowTop").bind("mousedown",{button:hours}, addbtn); - hours - .find(".ubw-button-arrowBottom").bind("mousedown",{button:hours}, rembtn); - minutes - .bind("mousedown", {button:minutes}, timeButtonDownHandler) - .find(".ubw-button-arrowTop").bind("mousedown",{button:minutes}, addbtn); - minutes - .find(".ubw-button-arrowBottom").bind("mousedown",{button:minutes}, rembtn); - seconds - .bind("mousedown", {button:seconds}, timeButtonDownHandler) - .find(".ubw-button-arrowTop").bind("mousedown",{button:seconds}, addbtn); - seconds - .find(".ubw-button-arrowBottom").bind("mousedown",{button:seconds}, rembtn); + hours + .bind("mousedown", { + button:hours + }, timeButtonDownHandler) + .find(".ubw-button-arrowTop").bind("mousedown",{ + button:hours + }, addbtn); + hours + .find(".ubw-button-arrowBottom").bind("mousedown",{ + button:hours + }, rembtn); + minutes + .bind("mousedown", { + button:minutes + }, timeButtonDownHandler) + .find(".ubw-button-arrowTop").bind("mousedown",{ + button:minutes + }, addbtn); + minutes + .find(".ubw-button-arrowBottom").bind("mousedown",{ + button:minutes + }, rembtn); + seconds + .bind("mousedown", { + button:seconds + }, timeButtonDownHandler) + .find(".ubw-button-arrowTop").bind("mousedown",{ + button:seconds + }, addbtn); + seconds + .find(".ubw-button-arrowBottom").bind("mousedown",{ + button:seconds + }, rembtn); - $(document).mouseup(function(){ - /*if(isScrolling){ + $(document).mouseup(function(){ + /*if(isScrolling){ $().unbind("mousemove"); activeTimeScroll.find(".ubw-button-canvas") .bind("mouseleave", {button:activeTimeScroll}, buttonOutHandler) .bind("mouseenter", {button:activeTimeScroll}, buttonOverHandler); };*/ - clearTimeout(incDecTime); - }); + clearTimeout(incDecTime); + }); - var btnsWrapper = $("
") - .css({ - float:"left", - marginLeft:5, - marginTop:6 - }) - .append(pause) - .append(reset); + var btnsWrapper = $("
") + .css({ + float:"left", + marginLeft:5, + marginTop:6 + }) + .append(pause) + .append(reset); - ubwidget - .append(hours) - .append(space.clone()) - .append(minutes) - .append(spaceb) - .append(seconds) - .append(spacec) - .append(btnsWrapper); + ubwidget + .append(hours) + .append(space.clone()) + .append(minutes) + .append(spaceb) + .append(seconds) + .append(spacec) + .append(btnsWrapper); - clearTimeout(currentTimer); - updateChronometer(0); + clearTimeout(currentTimer); - var currentTimer = null; - var incDecTime = null; - var play = true; - var isScrolling = false; - var reverse = true; - var activeTimeScroll = null; + var currentTimer = null; + var incDecTime = null; + var play = true; + var isScrolling = false; + var reverse = true; + var activeTimeScroll = null; - function addbtn(m){ + function addbtn(m){ - var button = m.data.button; - var content = button.find(".ubw-button-content"); + var button = m.data.button; + var content = button.find(".ubw-button-content"); - if(content.text().substr(0, 1) == "0"){ - content.text(content.text().substr(1, content.text().length)) - } + if(content.text().substr(0, 1) == "0"){ + content.text(content.text().substr(1, content.text().length)) + } - content.text(formatTime(parseInt(content.text())+1)); + content.text(formatTime(parseInt(content.text())+1)); - incDecTime = setTimeout(function(){addbtn(m)},150); - }; + incDecTime = setTimeout(function(){ + addbtn(m) + },150); + } - function rembtn(m){ + function rembtn(m){ - var button = m.data.button; - var content = button.find(".ubw-button-content"); + var button = m.data.button; + var content = button.find(".ubw-button-content"); - if(content.text().substr(0, 1) == "0"){ - content.text(content.text().substr(1, content.text().length)) - } + if(content.text().substr(0, 1) == "0"){ + content.text(content.text().substr(1, content.text().length)) + } - content.text(formatTime(parseInt(content.text())-1)); + content.text(formatTime(parseInt(content.text())-1)); - incDecTime = setTimeout(function(){rembtn(m)},150); - }; + incDecTime = setTimeout(function(){ + rembtn(m); + },150); + } - function timeButtonDownHandler(m){ + function timeButtonDownHandler(m){ var button = m.data.button; - var mouseStart = {pageX:m.pageX, pageY:m.pageY}; var content = button.find(".ubw-button-content"); - var val = content.text(); - isScrolling = true; - reverse = true; - activeTimeScroll = button; - if(play){ - $("#pausebutton").trigger("click"); + 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 val = content.text(); + isScrolling = true; + reverse = true; + activeTimeScroll = button; + if(play){ + $("#pausebutton").trigger("click"); + } - /*button.find(".ubw-button-canvas") + /*button.find(".ubw-button-canvas") .unbind("mouseenter") .unbind("mouseleave"); @@ -204,81 +311,95 @@ function init(){ content.text(content.text()%60); if(content.text() < 0)content.text(0); });*/ - }; + } - function buttonOverHandler(e) { - var button = e.data.button; - var buttonbody = button.find(".ubw-button-body"); + function buttonOverHandler(e) { + var button = e.data.button; + var buttonbody = button.find(".ubw-button-body"); - button.css({zIndex:1}) - buttonbody.removeClass("ubw-button-out") - .addClass("ubw-button-over") - .css({fontSize:"125%"}); + button.css({ + zIndex:1 + }) + buttonbody.removeClass("ubw-button-out") + .addClass("ubw-button-over") + .css({ + fontSize:"125%" + }); - button.find(".ubw-button-canvas").find(".ubw-button-arrowTop").children("img").attr("src", "images/arrows_over/top.png"); - button.find(".ubw-button-canvas").find(".ubw-button-arrowBottom").children("img").attr("src", "images/arrows_over/bottom.png"); - }; + button.find(".ubw-button-canvas").find(".ubw-button-arrowTop").children("img").attr("src", "images/arrows_over/top.png"); + button.find(".ubw-button-canvas").find(".ubw-button-arrowBottom").children("img").attr("src", "images/arrows_over/bottom.png"); + } - function buttonOutHandler(e){ - var button = e.data.button; - var buttonbody = button.find(".ubw-button-body"); + function buttonOutHandler(e){ + var button = e.data.button; + var buttonbody = button.find(".ubw-button-body"); - button.css({zIndex:0}); - buttonbody.removeClass("ubw-button-over") - .addClass("ubw-button-out") - .css({ - fontSize:"100%", - }); + button.css({ + zIndex:0 + }); + buttonbody.removeClass("ubw-button-over") + .addClass("ubw-button-out") + .css({ + fontSize:"100%" + }); - button.find(".ubw-button-canvas").find(".ubw-button-arrowTop").children("img").attr("src", "images/arrows_out/top.png"); - button.find(".ubw-button-canvas").find(".ubw-button-arrowBottom").children("img").attr("src", "images/arrows_out/top.png"); - }; + button.find(".ubw-button-canvas").find(".ubw-button-arrowTop").children("img").attr("src", "images/arrows_out/top.png"); + button.find(".ubw-button-canvas").find(".ubw-button-arrowBottom").children("img").attr("src", "images/arrows_out/top.png"); + } - function updateChronometerReverse(seconds){ + function updateChronometerReverse(seconds){ - currentTimer = setTimeout(function(){updateChronometerReverse(seconds-1)}, 1000); - if (seconds < 6 && seconds > 0){ - DHTMLSound('beep.wav'); - }else if(seconds === 0){ - DHTMLSound('finalbeep.wav'); - }; + currentTimer = setTimeout(function(){ + updateChronometerReverse(seconds-1) + }, 1000); + if (seconds < 6 && seconds > 0){ + DHTMLSound('beep.wav'); + }else if(seconds === 0){ + DHTMLSound('finalbeep.wav'); + } - if(seconds < 1){ - seconds = 0; - $("#pausebutton").trigger("click"); - } + if(seconds < 1){ + seconds = 0; + $("#pausebutton").trigger("click"); + } - var hoursValue = $("#hours").find(".ubw-button-content"); - var minutesValue = $("#minutes").find(".ubw-button-content"); - var secondsValue = $("#seconds").find(".ubw-button-content"); + var hoursValue = $("#hours").find(".ubw-button-content"); + var minutesValue = $("#minutes").find(".ubw-button-content"); + var secondsValue = $("#seconds").find(".ubw-button-content"); - var currentSecond = String(seconds%60); - var currentMinute = String(Math.floor(seconds/60)%60); - var currentHour = String(Math.floor(seconds/3600)); + var currentSecond = String(seconds%60); + var currentMinute = String(Math.floor(seconds/60)%60); + var currentHour = String(Math.floor(seconds/3600)); - hoursValue.text(formatTime(currentHour)); - minutesValue.text(formatTime(currentMinute)); - secondsValue.text(formatTime(currentSecond)); + hoursValue.text(formatTime(currentHour)); + 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){ + function formatTime(time){ - document.title = time +", " + String(time).length; + document.title = time +", " + String(time).length; - if(time<0){ - time = 59; - } + if(time<0){ + time = 59; + } - time = time%60; + time = time%60; - String(time).length < 2 ? time = "0"+time : time = time; + String(time).length < 2 ? time = "0"+time : time = time; - return time; - } + return time; + } - function DHTMLSound(surl) { - document.getElementById("audio").innerHTML= - "