Merge branch 'master' of github.com:Sankore/Sankore-3.1

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 \

lgplC++StandardHeaderFile.txt

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */

release.linux.sh

+# --------------------------------------------------------------------
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# ---------------------------------------------------------------------
+
 #!/bin/sh
 
 make clean

release.macx.sh

+# --------------------------------------------------------------------
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# ---------------------------------------------------------------------
+
 #!/bin/bash
 
 # Executables

release.vc9.bat

+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 <http://www.gnu.org/licenses/>.
+REM ---------------------------------------------------------------------
+
 set QT_DIR=..\Qt-sankore3.1
 set QT_BIN=%QT_DIR%\bin
 

resources/library/interactive/Anyembed.wgt/index.html

@@ -6,13 +6,8 @@
     <title>ubwidget</title>
     
 	<script src="js/jquery-1.3.2.min.js" type="text/javascript"></script>
-    <script src="js/jquery-ui-1.7.2.custom.min.js" type="text/javascript"></script>
 	<script src="js/jquery.disable.text.select.js" type="text/javascript"></script>
-    <script src="js/jquery.ubwidget.js" type="text/javascript"></script>
-    <script src="js/jquery.center.js" type="text/javascript"></script>
-	<script src="js/DD_roundies_0.0.2a.js" type="text/javascript"></script>
 	<script src="js/ubw-main.js" type="text/javascript"></script>
-	<script src="js/calculate.js" type="text/javascript"></script>
 
     <link rel="stylesheet" type="text/css" href="css/ubwidget.css" />
 
@@ -27,7 +22,6 @@
     </script>
 	<audio id='audio'></audio>
     <div id="ubwidget"></div>
-    
 </body>
 
 </html>
\ No newline at end of file

resources/library/interactive/Anyembed.wgt/js/ubw-main.js

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
 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();
+		
+		if(/<object/.test(embed)){
+			loadWindow.append(embed);
+			loadWindow.find("embed").attr("wmode","transparent");
+			var loadWindow_content = loadWindow.html();
+			loadWindow.empty().html(loadWindow_content);
+		}
+		else {
 			loadWindow.append(embed);				
+		}
 
-				if(window.uniboard){
-					window.uniboard.resize($(document).width(),$(document).height());
-					window.uniboard.setPreference("embed", escape(embed));
+		if(window.sankore){
+			window.sankore.resize($(document).width(),$(document).height());
+			window.sankore.setPreference("embed", escape(embed));
 		}
 		
 	});
 	
-	if(window.uniboard){
+	if(window.sankore){
 
-		if(window.uniboard.preferenceKeys().length != 0){
+		if(window.sankore.preferenceKeys().length != 0){
 
-				var loadEmbed = unescape(window.uniboard.preference("embed"));
+				var loadEmbed = unescape(window.sankore.preference("embed"));
 				inputBox.val(loadEmbed);
 				submit.trigger("click");	
 		}	

resources/library/interactive/Calculator.wgt/js/calculate.js

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 function addChar(input, character) {
 	if(input.value == null || input.value == "0")
 		input.value = character

resources/library/interactive/Calculator.wgt/js/ubw-main.js

+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 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 = $("<div id='indicator'></div>")
 		.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();

resources/library/interactive/GeoInfo.wgt/css/GeoInfo.css

+body {
+	background-color: white;
+}
+
 .styleDiv
 {
 	height:250px;