diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index c6cb40b8..7003f481 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -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 3a137c42..1226458f 100644
--- a/release.macx.sh
+++ b/release.macx.sh
@@ -1,8 +1,23 @@
+# --------------------------------------------------------------------
+# 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
QMAKE="/usr/local/Trolltech/Qt-4.7.3/bin/qmake"
-MACDEPLOYQT="/usr/bin/macdeployqt"
+MACDEPLOYQT="`pwd`/../Qt-sankore3.1/bin/macdeployqt"
DMGUTIL="`pwd`/../Sankore-ThirdParty/refnum/dmgutil/dmgutil.pl"
DSYMUTIL=/usr/bin/dsymutil
STRIP=/usr/bin/strip
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/library/interactive/Anyembed.wgt/js/ubw-main.js b/resources/library/interactive/Anyembed.wgt/js/ubw-main.js
index ad76065d..91a1632f 100644
--- a/resources/library/interactive/Anyembed.wgt/js/ubw-main.js
+++ b/resources/library/interactive/Anyembed.wgt/js/ubw-main.js
@@ -38,8 +38,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)
@@ -50,21 +50,27 @@ function init(){
submit.click(function(){
$("#ubwidget").append(loadWindow)
embed = inputBox.val();
+ ////////////!!!1///////// ïîïðîáîâàòü ñ ðåàäè
searchWrap.hide();
loadWindow.append(embed);
-
- if(window.uniboard){
- window.uniboard.resize($(document).width(),$(document).height());
- window.uniboard.setPreference("embed", escape(embed));
- }
+ //alert($("#ubwidget").html());
+ $("#ubwidget embed").attr("wmode", "transparent");
+ var ubwidget_html = $("#ubwidget").html();
+ alert(ubwidget_html);
+ setTimeOut(alert);
+ $("#ubwidget").empty().html(ubwidget_html);
+ if(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");
}
diff --git a/resources/library/interactive/Calculator.wgt/js/ubw-main.js b/resources/library/interactive/Calculator.wgt/js/ubw-main.js
index 44c86b95..23dc7f29 100644
--- a/resources/library/interactive/Calculator.wgt/js/ubw-main.js
+++ b/resources/library/interactive/Calculator.wgt/js/ubw-main.js
@@ -26,8 +26,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 +37,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 +200,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 +210,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 = $("