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

preferencesAboutTextFull
Anatoly Mihalchenko 12 years ago
commit 3213bf08b7
  1. 82
      resources/i18n/sankore_nb.ts
  2. 1
      resources/library/interactivities/Ass images.wgt/css/basic.css
  3. 8
      resources/library/interactivities/Ass images.wgt/js/script.js
  4. 3
      resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js
  5. 3
      resources/library/interactivities/Ass images.wgt/locales/ru/js/script.js
  6. 3
      resources/library/interactivities/Cat images.wgt/js/script.js
  7. 3
      resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js
  8. 3
      resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js
  9. 9
      resources/library/interactivities/Cat text.wgt/js/script.js
  10. 9
      resources/library/interactivities/Cat text.wgt/locales/fr/js/script.js
  11. 9
      resources/library/interactivities/Cat text.wgt/locales/ru/js/script.js
  12. 11
      resources/library/interactivities/Contraste.wgt/locales/fr/scripts/blackYellow.js
  13. 11
      resources/library/interactivities/Contraste.wgt/locales/ru/scripts/blackYellow.js
  14. 11
      resources/library/interactivities/Contraste.wgt/scripts/blackYellow.js
  15. 3
      resources/library/interactivities/Ordre images.wgt/js/script.js
  16. 3
      resources/library/interactivities/Ordre images.wgt/locales/fr/js/script.js
  17. 3
      resources/library/interactivities/Ordre images.wgt/locales/ru/js/script.js
  18. 8
      resources/library/interactivities/Ordre mots.wgt/locales/fr/scripts/template2.js
  19. 8
      resources/library/interactivities/Ordre mots.wgt/locales/ru/scripts/template2.js
  20. 9
      resources/library/interactivities/Ordre mots.wgt/scripts/template2.js
  21. 12
      resources/library/interactivities/Ordre phrase.wgt/locales/fr/script/template2.js
  22. 12
      resources/library/interactivities/Ordre phrase.wgt/locales/ru/script/template2.js
  23. 12
      resources/library/interactivities/Ordre phrase.wgt/scripts/template2.js
  24. 17
      resources/library/interactivities/Separe phrase.wgt/scripts/app.js
  25. 18
      resources/library/interactivities/Separe texte.wgt/scripts/app2.js
  26. 18
      resources/library/interactivities/Syllabes.wgt/scripts/spl-word.js
  27. 49
      resources/library/search/Audio Planete.wgs/css/basic.css
  28. 49
      resources/library/search/Flash Planete.wgs/css/basic.css
  29. 392
      resources/library/search/Google images.wgs/css/basic.css
  30. 49
      resources/library/search/Image Planete.wgs/css/basic.css
  31. 49
      resources/library/search/Video Planete.wgs/css/basic.css
  32. 4
      src/frameworks/UBPlatformUtils_linux.cpp
  33. 4
      src/frameworks/UBPlatformUtils_win.cpp

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
<TS version="2.0">
<TS version="2.0" language="nb_NO">
<context>
<name>BlackoutWidget</name>
<message>
@ -769,35 +769,37 @@
</message>
<message utf8="true">
<source>Open-Sankoré</source>
<translation type="unfinished"></translation>
<translation>Åpne-Sankoré</translation>
</message>
<message utf8="true">
<source>Quit Open-Sankoré</source>
<translation type="unfinished"></translation>
<translation>Avslutt Åpne-Sankoré</translation>
</message>
<message utf8="true">
<source>Open-Sankoré Editor</source>
<translation type="unfinished"></translation>
<translatorcomment>I have kept Editor, as it seems like a name...</translatorcomment>
<translation>Åpne-Sankoré Editor</translation>
</message>
<message utf8="true">
<source>Show Open-Sankoré Widgets Editor</source>
<translation type="unfinished"></translation>
<translatorcomment>I have kept Sankoré Widgets Editor as it seems like a name...</translatorcomment>
<translation>Vis Åpne-Sankoré Widgets Editor</translation>
</message>
<message utf8="true">
<source>Hide Open-Sankoré</source>
<translation type="unfinished"></translation>
<translation>Skjul Åpne-Sankoré</translation>
</message>
<message utf8="true">
<source>Hide Open-Sankoré Application</source>
<translation type="unfinished"></translation>
<translation>Skjul Åpne-Sankoré-applikasjon</translation>
</message>
<message>
<source>Import Uniboard Documents</source>
<translation type="unfinished"></translation>
<translation>Importer Uniboard-dokumenter</translation>
</message>
<message>
<source>Import old Sankore or Uniboard documents</source>
<translation type="unfinished"></translation>
<translation>Importer gamle Sankore eller Uniboard-dokumenter</translation>
</message>
</context>
<context>
@ -853,6 +855,10 @@
</context>
<context>
<name>UBAbstractWidget</name>
<message>
<source>Cannot load content</source>
<translation>Kan ikke laste innhold</translation>
</message>
<message>
<source>Loading ...</source>
<translation>Laster ...</translation>
@ -1101,7 +1107,8 @@
</message>
<message numerus="yes">
<source>Are you sure you want to remove %n page(s) from the selected document &apos;%1&apos;?</source>
<translation type="unfinished">
<translation>
<numerusform>Er du sikker at du vil fjerne %n siden(e) fra det valgte dokumentet &apos;%1&apos;?</numerusform>
<numerusform></numerusform>
</translation>
</message>
@ -1191,7 +1198,8 @@
</message>
<message numerus="yes">
<source>%1 pages copied</source>
<translation type="unfinished">
<translation>
<numerusform>%1 sider kopiert</numerusform>
<numerusform></numerusform>
</translation>
</message>
@ -1200,11 +1208,11 @@
<name>UBDownloadWidget</name>
<message>
<source>Downloading files</source>
<translation type="unfinished"></translation>
<translation>Nedlasting av filer</translation>
</message>
<message>
<source>Cancel</source>
<translation type="unfinished">Kanseller</translation>
<translation>Avbryt</translation>
</message>
</context>
<context>
@ -1333,7 +1341,7 @@
</message>
<message>
<source>Editable</source>
<translation type="unfinished"></translation>
<translation>Redigerbar</translation>
</message>
</context>
<context>
@ -1386,7 +1394,7 @@
</message>
<message>
<source>Open-Sankore (*.ubz)</source>
<translation type="unfinished"></translation>
<translation>Åpne-Sankore (*.ubz)</translation>
</message>
</context>
<context>
@ -1445,7 +1453,8 @@
<name>UBKeyboardPalette</name>
<message>
<source>Enter</source>
<translation type="unfinished"></translation>
<translatorcomment>Translation of the key on the keyboard - if it is &quot;Enter the numer X&quot; - It should be &quot;Tast inn nummeret X&quot;</translatorcomment>
<translation>Enter</translation>
</message>
</context>
<context>
@ -1559,7 +1568,7 @@
<message>
<source>Web Search</source>
<comment>Web search category element</comment>
<translation type="unfinished"></translation>
<translation>Nettsøk</translation>
</message>
</context>
<context>
@ -1581,11 +1590,11 @@
<name>UBMediaPlayer</name>
<message>
<source>Open Location</source>
<translation type="unfinished"></translation>
<translation>Åpne sted</translation>
</message>
<message>
<source>Please enter a valid address here:</source>
<translation type="unfinished"></translation>
<translation>Tast inn en gyldig adresse her:</translation>
</message>
</context>
<context>
@ -1883,7 +1892,7 @@ Please reboot the application to access the updated documents.</source>
</message>
<message>
<source>Remind me later</source>
<translation type="unfinished"></translation>
<translation>Minn meg det senere</translation>
</message>
</context>
<context>
@ -2003,11 +2012,11 @@ Please reboot the application to access the updated documents.</source>
<name>UniboardSankoreTransition</name>
<message>
<source>Import old Uniboard/Sankore documents</source>
<translation type="unfinished"></translation>
<translation>Importer gamle Uniboard/Sankore-dokumenter</translation>
</message>
<message>
<source>There are no documents that should be imported</source>
<translation type="unfinished"></translation>
<translation>Det er ingen dokumenter som skal importeres</translation>
</message>
</context>
<context>
@ -2468,55 +2477,56 @@ p, li { white-space: pre-wrap; }
</message>
<message utf8="true">
<source>Open-Sankoré</source>
<translation type="unfinished"></translation>
<translation>Åpne-Sankoré</translation>
</message>
<message>
<source>Show internal web page content on secondary screen or projector</source>
<translation type="unfinished"></translation>
<translation>Vis innhold fra internt nettsted annen skjerm eller projektor</translation>
</message>
<message>
<source>Multi display</source>
<translation type="unfinished"></translation>
<translation>Multidisplay</translation>
</message>
<message>
<source>Swap control display and view display</source>
<translation type="unfinished"></translation>
<translatorcomment>I have translated this as swap between cd and vd</translatorcomment>
<translation>Bytt mellom kontrolldisplay og se display</translation>
</message>
<message>
<source>Mode</source>
<translation type="unfinished"></translation>
<translation>Modus</translation>
</message>
<message>
<source>Mode to start in:</source>
<translation type="unfinished"></translation>
<translation>Modus å starte i:</translation>
</message>
<message>
<source>Board</source>
<translation type="unfinished">Tavle</translation>
<translation>Tavle</translation>
</message>
<message>
<source>Desktop</source>
<translation type="unfinished"></translation>
<translation>Skrivebord</translation>
</message>
<message>
<source>Proxy User:</source>
<translation type="unfinished"></translation>
<translation>Proxy-bruker</translation>
</message>
<message>
<source>Pass:</source>
<translation type="unfinished"></translation>
<translation>Pass:</translation>
</message>
<message utf8="true">
<source>Planète Sankoré ID</source>
<translation type="unfinished"></translation>
<translation>Planet Sankoré-ID</translation>
</message>
<message>
<source>User:</source>
<translation type="unfinished"></translation>
<translation>Bruker:</translation>
</message>
<message>
<source>Pass: </source>
<translation type="unfinished"></translation>
<translation>Pass:</translation>
</message>
<message>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
@ -2524,7 +2534,7 @@ p, li { white-space: pre-wrap; }
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Ubuntu&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The licences are in English to respect the official and legal approved translation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation>
<translation>Lisensene er engelsk for å respektere den offisielle og juridisk godkjente oversettelsen.</translation>
</message>
</context>
<context>

@ -143,6 +143,7 @@ body{
cursor: pointer;
display: inline-block;
position: relative;
text-align: center;
}
.img_gray{

@ -33,7 +33,7 @@ function start(){
//events
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -303,7 +303,6 @@ function exportData(){
//import
function importData(data){
var tmp = 0;
for(var i in data){
if(data[i].tmp){
@ -330,9 +329,12 @@ function importData(data){
img.height(data[i].imgs[j].ht).width(data[i].imgs[j].wd);
if((120 - data[i].imgs[j].ht) > 0)
img.css("margin",(120 - data[i].imgs[j].ht)/2 + "px 0");
var hidden_input = $("<input type='hidden'>").val(data[i].imgs[j].value);
img_block.append(hidden_input).append(img);
tmp_array.push(img_block);
}
tmp_array = shuffle(tmp_array);
for(j in tmp_array){
@ -714,7 +716,9 @@ function onDropTarget(obj, event) {
tmp_img.attr("width","120");
tmp_img.css("margin",(120 - tmp_img.height())/2 + "px 0");
}
exportData();
}, 6)
}
else {
alert ("Your browser does not support the dataTransfer object.");

@ -33,7 +33,7 @@ function start(){
//events
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -714,6 +714,7 @@ function onDropTarget(obj, event) {
tmp_img.attr("width","120");
tmp_img.css("margin",(120 - tmp_img.height())/2 + "px 0");
}
exportData();
}, 6)
}
else {

@ -33,7 +33,7 @@ function start(){
//events
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -714,6 +714,7 @@ function onDropTarget(obj, event) {
tmp_img.attr("width","120");
tmp_img.css("margin",(120 - tmp_img.height())/2 + "px 0");
}
exportData();
}, 6)
}
else {

@ -34,7 +34,7 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -730,6 +730,7 @@ function onDropTarget(obj, event) {
}
}
}
exportData();
}
else {
alert ("Your browser does not support the dataTransfer object.");

@ -34,7 +34,7 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -734,6 +734,7 @@ function onDropTarget(obj, event) {
}
}
}
exportData();
}
else {
alert ("Your browser does not support the dataTransfer object.");

@ -34,7 +34,7 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -734,6 +734,7 @@ function onDropTarget(obj, event) {
}
}
}
exportData();
}
else {
alert ("Your browser does not support the dataTransfer object.");

@ -40,7 +40,7 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -202,6 +202,13 @@ function start(){
$(this).parent().remove();
}
});
$(".text_cont").live("blur", function(){
exportData();
}).live("keyup", function(e){
if (e.keyCode == 13)
exportData();
});
}
//export

@ -40,7 +40,7 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -202,6 +202,13 @@ function start(){
$(this).parent().remove();
}
});
$(".text_cont").live("blur", function(){
exportData();
}).live("keyup", function(e){
if (e.keyCode == 13)
exportData();
});
}
//export

@ -40,7 +40,7 @@ function start(){
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -202,6 +202,13 @@ function start(){
$(this).parent().remove();
}
});
$(".text_cont").live("blur", function(){
exportData();
}).live("keyup", function(e){
if (e.keyCode == 13)
exportData();
});
}
//export

@ -222,6 +222,7 @@ function init(){
shadowDiv.hide("fast");
shadowOver = false;
addTask(expresionText.val(), resultText.val());
exportToSankore();
$("#resultText, #expresionText").val("")
.css("background-color", "#ffc");
})
@ -263,6 +264,9 @@ function init(){
$("body").mouseup(function(event){
if(!shadowOver){
if (dragElement) {
exportToSankore();
}
dragElement = null;
resizeObj.x = false;
resizeObj.y = false;
@ -299,7 +303,7 @@ function init(){
if (window.widget) {
window.widget.onleave = function(){
exportToSankore();
//exportToSankore();
sankore.setPreference("by_style", $(".style_select").find("option:selected").val());
}
}
@ -366,7 +370,10 @@ function checkEmptyFields(field){
//adding a new task to the page
function addTask(expression, result){
var editContent = $("<div class='editContainer'>").width(240).height(70).appendTo("#data");
var lastItem = $(".editContainer:last"),
lastItemPos = lastItem.length ? lastItem.position().top : 45,
lastItemHeight = lastItem.length ? lastItem.height() : 0;
var editContent = $("<div class='editContainer'>").width(240).height(70).css("top", lastItemPos + lastItemHeight + 15 + "px").appendTo("#data");
var closeItem = $("<div class='closeItem'>").appendTo(editContent);
var rightResize = $("<div class='rightResize'>").appendTo(editContent);
var bottomResize = $("<div class='bottomResize'>").appendTo(editContent);

@ -222,6 +222,7 @@ function init(){
shadowDiv.hide("fast");
shadowOver = false;
addTask(expresionText.val(), resultText.val());
exportToSankore();
$("#resultText, #expresionText").val("")
.css("background-color", "#ffc");
})
@ -263,6 +264,9 @@ function init(){
$("body").mouseup(function(event){
if(!shadowOver){
if (dragElement) {
exportToSankore();
}
dragElement = null;
resizeObj.x = false;
resizeObj.y = false;
@ -299,7 +303,7 @@ function init(){
if (window.widget) {
window.widget.onleave = function(){
exportToSankore();
//exportToSankore();
sankore.setPreference("by_style", $(".style_select").find("option:selected").val());
}
}
@ -366,7 +370,10 @@ function checkEmptyFields(field){
//adding a new task to the page
function addTask(expression, result){
var editContent = $("<div class='editContainer'>").width(240).height(70).appendTo("#data");
var lastItem = $(".editContainer:last"),
lastItemPos = lastItem.length ? lastItem.position().top : 45,
lastItemHeight = lastItem.length ? lastItem.height() : 0;
var editContent = $("<div class='editContainer'>").width(240).height(70).css("top", lastItemPos + lastItemHeight + 15 + "px").appendTo("#data");
var closeItem = $("<div class='closeItem'>").appendTo(editContent);
var rightResize = $("<div class='rightResize'>").appendTo(editContent);
var bottomResize = $("<div class='bottomResize'>").appendTo(editContent);

@ -223,6 +223,7 @@ function init(){
shadowDiv.hide("fast");
shadowOver = false;
addTask(expresionText.val(), resultText.val());
exportToSankore();
$("#resultText, #expresionText").val("")
.css("background-color", "#ffc");
})
@ -264,6 +265,9 @@ function init(){
$("body").mouseup(function(event){
if(!shadowOver){
if (dragElement) {
exportToSankore();
}
dragElement = null;
resizeObj.x = false;
resizeObj.y = false;
@ -300,7 +304,7 @@ function init(){
if (window.widget) {
window.widget.onleave = function(){
exportToSankore();
//exportToSankore();
sankore.setPreference("by_style", $(".style_select").find("option:selected").val());
}
}
@ -367,7 +371,10 @@ function checkEmptyFields(field){
//adding a new task to the page
function addTask(expression, result){
var editContent = $("<div class='editContainer'>").width(240).height(70).appendTo("#data");
var lastItem = $(".editContainer:last"),
lastItemPos = lastItem.length ? lastItem.position().top : 45,
lastItemHeight = lastItem.length ? lastItem.height() : 0;
var editContent = $("<div class='editContainer'>").width(240).height(70).css("top", lastItemPos + lastItemHeight + 15 + "px").appendTo("#data");
var closeItem = $("<div class='closeItem'>").appendTo(editContent);
var rightResize = $("<div class='rightResize'>").appendTo(editContent);
var bottomResize = $("<div class='bottomResize'>").appendTo(editContent);

@ -34,7 +34,7 @@ function start(){
//events
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -453,6 +453,7 @@ function onDropTarget(obj, event) {
tmp_img.attr("width","120");
tmp_img.css("margin",(120 - tmp_img.height())/2 + "px 0");
}
exportData();
}, 6)
}
else {

@ -35,7 +35,7 @@ function start(){
//events
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -452,6 +452,7 @@ function onDropTarget(obj, event) {
tmp_img.attr("width","120");
tmp_img.css("margin",(120 - tmp_img.height())/2 + "px 0");
}
exportData();
}, 6)
}
else {

@ -35,7 +35,7 @@ function start(){
//events
if (window.widget) {
window.widget.onleave = function(){
exportData();
//exportData();
}
}
@ -452,6 +452,7 @@ function onDropTarget(obj, event) {
tmp_img.attr("width","120");
tmp_img.css("margin",(120 - tmp_img.height())/2 + "px 0");
}
exportData();
}, 6)
}
else {

@ -102,6 +102,10 @@ $(document).ready(function(){
$(".style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
$("#mp_word input:text").live("change", function(){
saveData();
});
})
/*
@ -292,8 +296,8 @@ function modeEdit()
}
if (window.widget) {
window.widget.onleave = function(){
function saveData() {
if (window.widget) {
sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val());
if($( "#mp_word input:text" ).attr( "value" ))
{

@ -102,6 +102,10 @@ $(document).ready(function(){
$(".style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
$("#mp_word input:text").live("change", function(){
saveData();
});
})
/*
@ -292,8 +296,8 @@ function modeEdit()
}
if (window.widget) {
window.widget.onleave = function(){
function saveData() {
if (window.widget) {
sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val());
if($( "#mp_word input:text" ).attr( "value" ))
{

@ -102,6 +102,10 @@ $(document).ready(function(){
$(".style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
$("#mp_word input:text").live("change", function(){
saveData();
});
})
/*
@ -292,8 +296,9 @@ function modeEdit()
}
if (window.widget) {
window.widget.onleave = function(){
function saveData() {
if (window.widget) {
sankore.setPreference("ord_words_style", $(".style_select").find("option:selected").val());
if($( "#mp_word input:text" ).attr( "value" ))
{

@ -101,6 +101,10 @@ $(document).ready(function(){
$(".style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
$( "#mp_word textarea" ).live("change", function(){
saveData();
})
})
function str_replace( w, b, s ){
@ -261,8 +265,8 @@ function modeEdit()
.append('<textarea cols="50" rows="5">'+sentence+'</textarea>');
}
if (window.widget) {
window.widget.onleave = function(){
function saveData() {
if (window.widget) {
sankore.setPreference("ord_phrases_style", $(".style_select").find("option:selected").val());
if($( "#mp_word textarea" ).val())
{
@ -271,7 +275,7 @@ if (window.widget) {
$( "#mp_word .phrase" ).each( function()
{
ph.push( $( this ).text() );
});
});
sankore.setPreference("currentOrdPhrases", ph.join( "\n" ));
modeEdit();
}
@ -280,7 +284,7 @@ if (window.widget) {
$( "#mp_word .phrase" ).each( function()
{
ph.push( $( this ).text() );
});
});
sankore.setPreference("currentOrdPhrases", ph.join( "\n" ));
}
sankore.setPreference("rightOrdPhrases", sentence);

@ -101,6 +101,10 @@ $(document).ready(function(){
$(".style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
$( "#mp_word textarea" ).live("change", function(){
saveData();
})
})
function str_replace( w, b, s ){
@ -261,8 +265,8 @@ function modeEdit()
.append('<textarea cols="50" rows="5">'+sentence+'</textarea>');
}
if (window.widget) {
window.widget.onleave = function(){
function saveData() {
if (window.widget) {
sankore.setPreference("ord_phrases_style", $(".style_select").find("option:selected").val());
if($( "#mp_word textarea" ).val())
{
@ -271,7 +275,7 @@ if (window.widget) {
$( "#mp_word .phrase" ).each( function()
{
ph.push( $( this ).text() );
});
});
sankore.setPreference("currentOrdPhrases", ph.join( "\n" ));
modeEdit();
}
@ -280,7 +284,7 @@ if (window.widget) {
$( "#mp_word .phrase" ).each( function()
{
ph.push( $( this ).text() );
});
});
sankore.setPreference("currentOrdPhrases", ph.join( "\n" ));
}
sankore.setPreference("rightOrdPhrases", sentence);

@ -102,6 +102,10 @@ $(document).ready(function(){
$(".style_select").change(function (event){
changeStyle($(this).find("option:selected").val());
})
$( "#mp_word textarea" ).live("change", function(){
saveData();
})
})
function str_replace( w, b, s ){
@ -262,8 +266,8 @@ function modeEdit()
.append('<textarea cols="50" rows="5">'+sentence+'</textarea>');
}
if (window.widget) {
window.widget.onleave = function(){
function saveData() {
if (window.widget) {
sankore.setPreference("ord_phrases_style", $(".style_select").find("option:selected").val());
if($( "#mp_word textarea" ).val())
{
@ -272,7 +276,7 @@ if (window.widget) {
$( "#mp_word .phrase" ).each( function()
{
ph.push( $( this ).text() );
});
});
sankore.setPreference("currentOrdPhrases", ph.join( "\n" ));
modeEdit();
}
@ -281,7 +285,7 @@ if (window.widget) {
$( "#mp_word .phrase" ).each( function()
{
ph.push( $( this ).text() );
});
});
sankore.setPreference("currentOrdPhrases", ph.join( "\n" ));
}
sankore.setPreference("rightOrdPhrases", sentence);

@ -17,15 +17,6 @@ function createElements( phrase )
return s;
}
if (window.widget) {
window.widget.onleave = function(){
sankore.setPreference("spl_phrase_style", $(".style_select").find("option:selected").val());
if(w.editMode)
sankore.setPreference("ordSplPhrases", w.elements.container.find( "textarea" ).val());
else
sankore.setPreference("ordSplPhrases", w.getData("phrase"));
}
}
$(document).ready(function()
{
@ -75,6 +66,14 @@ $(document).ready(function()
sentence = (sankore.preference("ordSplPhrases", ""))?sankore.preference("ordSplPhrases", ""):sankoreLang.example;
else
sentence = sankoreLang.example;
w.elements.container.find( "textarea" ).live("change", function(){
sankore.setPreference("spl_phrase_style", $(".style_select").find("option:selected").val());
if(w.editMode)
sankore.setPreference("ordSplPhrases", w.elements.container.find( "textarea" ).val());
else
sankore.setPreference("ordSplPhrases", w.getData("phrase"));
})
w.maxWidth = 600;

@ -19,16 +19,6 @@ function createElements( text )
return s;
}
if (window.widget) {
window.widget.onleave = function(){
sankore.setPreference("spl_text_style", $(".style_select").find("option:selected").val());
if(w.editMode)
sankore.setPreference("ordSplText", w.elements.container.find( "textarea" ).val());
else
sankore.setPreference("ordSplText", w.getData( "text" ));
}
}
$(document).ready(function()
{
if(sankore.preference("spl_text_style","")){
@ -79,6 +69,14 @@ $(document).ready(function()
sentences = (sankore.preference("ordSplText", ""))?sankore.preference("ordSplText", ""):sankoreLang.example;
else
sentences = sankoreLang.example;
w.elements.container.find( "textarea" ).live("change", function(){
sankore.setPreference("spl_text_style", $(".style_select").find("option:selected").val());
if(w.editMode)
sankore.setPreference("ordSplText", w.elements.container.find( "textarea" ).val());
else
sankore.setPreference("ordSplText", w.getData( "text" ));
})
w.maxWidth = 600;

@ -17,16 +17,6 @@ function createWord( word )
var w;
if (window.widget) {
window.widget.onleave = function(){
sankore.setPreference("spl_word_style", $(".style_select").find("option:selected").val());
if(w.editMode)
sankore.setPreference("ordSplWords", w.elements.container.find( "input" ).val().trim( ['*'] ));
else
sankore.setPreference("ordSplWords", w.getData( "word" ));
}
}
$(document).ready(function()
{
if(sankore.preference("spl_word_style","")){
@ -80,6 +70,14 @@ $(document).ready(function()
w.setViewContent( '<span class="upper"><span class="dash fixed">&mdash;</span></span>' );
w.setData( "dashWidth", w.elements.container.find( "span.dash" ).outerWidth() );
w.setViewContent( "" );
w.elements.container.find( "input" ).live("change", function(){
sankore.setPreference("spl_word_style", $(".style_select").find("option:selected").val());
if(w.editMode)
sankore.setPreference("ordSplWords", w.elements.container.find( "input" ).val().trim( ['*'] ));
else
sankore.setPreference("ordSplWords", w.getData( "word" ));
})
// onViewMode
w.onViewMode = function()

@ -10,6 +10,38 @@ a {
text-decoration: none;
}
::-webkit-scrollbar {
width: 14px;
background-color:white;
}
::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color:lightgray;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:start{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgUp.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:end{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgDown.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
.disclaimer{
height: auto;
position: fixed;
@ -27,8 +59,8 @@ a {
border-top-right-radius: 15px;
border: solid 4px #EEEEEE;
border-bottom: none;
z-index: 10;
font-size: 12px;
z-index: 10;
}
#searchResult {
@ -324,3 +356,18 @@ input[type="radio"]:checked + .filter_button.button.color {
background-color: gray;
color: white;
}
/*
Planete Sankore Changes
*/
.searchButton{
right: 10px;
}
#subSearchInput{
padding-right: 5px;
}
.imgContainer img {
width: 100px;
}

@ -10,6 +10,38 @@ a {
text-decoration: none;
}
::-webkit-scrollbar {
width: 14px;
background-color:white;
}
::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color:lightgray;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:start{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgUp.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:end{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgDown.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
.disclaimer{
height: auto;
position: fixed;
@ -27,8 +59,8 @@ a {
border-top-right-radius: 15px;
border: solid 4px #EEEEEE;
border-bottom: none;
z-index: 10;
font-size: 12px;
z-index: 10;
}
#searchResult {
@ -324,3 +356,18 @@ input[type="radio"]:checked + .filter_button.button.color {
background-color: gray;
color: white;
}
/*
Planete Sankore Changes
*/
.searchButton{
right: 10px;
}
#subSearchInput{
padding-right: 5px;
}
.imgContainer img {
width: 100px;
}

@ -6,6 +6,47 @@ html, body{
margin: 0;
}
a {html, body{
width: 100%;
padding: 0;
height: auto;
background-color: white;
margin: 0;
}
::-webkit-scrollbar {
width: 14px;
background-color:white;
}
::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color:lightgray;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:start{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgUp.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:end{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgDown.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
a {
text-decoration: none;
}
@ -318,6 +359,357 @@ input[type="radio"]:checked + .filter_button.button.color {
display: inline-block;
}
.pager_button.active {
border-radius: 3px;
-webkit-border-radius: 3px;
background-color: gray;
color: white;
}
text-decoration: none;
}
::-webkit-scrollbar {
width: 14px;
background-color:white;
}
::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color:lightgray;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:start{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgUp.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:end{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgDown.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
.disclaimer{
height: auto;
position: fixed;
left: 0;
bottom: 0;
margin-left: 1px;
margin-right: 1px;
margin-bottom: 0px;
padding: 5px;
text-align: center;
background-color: #BBBBBB;
-webkit-border-top-left-radius: 15px;
-webkit-border-top-right-radius: 15px;
border-top-left-radius: 15px;
border-top-right-radius: 15px;
border: solid 4px #EEEEEE;
border-bottom: none;
z-index: 10;
font-size: 12px;
}
#searchResult {
overflow: hidden;
text-align: center;
}
.search{
width: 90%;
position: fixed;
top: 0;
left: 0;
padding: 5px;
background-color: #BBBBBB;
-webkit-border-bottom-left-radius: 15px;
-webkit-border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
border-bottom-right-radius: 15px;
border: solid 4px #EEEEEE;
border-top: none;
z-index: 101;
}
.search,
.disclaimer {
width: 100%;
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.togglePages{
padding: 0;
position: absolute;
bottom: -19px;
left: 40%;
width: 22%;
height: 15px;
background-color: #666;
-webkit-border-bottom-left-radius: 20px;
-webkit-border-bottom-right-radius: 20px;
border-bottom-left-radius: 20px;
border-bottom-right-radius: 20px;
-webkit-box-shadow: #dadada -1px 0 4px;
box-shadow: #dadada -1px 0 4px;
cursor: pointer;
z-index: 100;
text-align: center;
}
.toggleIcon{
display: inline-block;
width: 14px;
height: 14px;
background: url(../images/trgUp.png) 50% no-repeat;
}
.searchInput{
padding: 3px;
float: left;
width: 100%;
border-radius: 3px;
border-style: none;
height: 22px;
line-height: 18px;
vertical-align: middle;
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.searchButton{
background: url("../images/search_app.png") -38px -38px no-repeat;
width: 24px;
height: 24px;
overflow: hidden;
position: absolute;
right: 30px;
top: 9px;
margin-left: -2px;
cursor: pointer;
}
.subSearch{
margin: 0;
float: left;
}
#subSearchInput{
width: 100%;
float: left;
box-sizing: border-box;
-webkit-box-sizing: border-box;
padding: 5px;
padding-right: 26px;
}
#subSearchFilter{
width: 100%;
float: left;
display: none;
}
.searchResult{
width: 98%;
padding: 3px;
background-color:#123456;
}
.imgContainer{
display: inline-block;
padding: 3px;
margin: 3px;
text-align: center;
overflow: hidden;
font-size: small;
font-family: Verdana,Arial,Helvetica,sans-serif;
border: 1px solid #666;
border-radius: 5px;
-webkit-box-shadow: #dadada -1px 0 4px;
-webkit-border-radius: 5px;
box-shadow: #666 -1px 0 4px;
vertical-align: top;
}
.resultFooter{
float: left;
margin: 5px;
padding: 3px;
width: 100%;
font-family: Verdana,Arial,Helvetica,sans-serif;
font-weight: bold;
font-size: x-large;
text-align: center;
}
#branding{
position: absolute;
top: 0;
left: 0;
z-index: 2;
}
.filterContainer{
float: left;
margin: 2px;
padding: 2px;
font-size: 14px;
}
.filterSelect{
border-style:none;
-webkit-border-top-right-radius: 15px;
-webkit-border-bottom-right-radius: 15px;
-moz-border-radius-topright: 15px;
-moz-border-radius-bottomright: 15px;
border-top-right-radius: 15px;
margin-top: 2px;
width: 100%;
}
span{
font-family: Verdana,Arial,Helvetica,sans-serif;
color: #666;
}
[draggable] {
-webkit-user-select: none;
user-select: none;
}
.toggleFilters{
margin: 0;
padding: 0;
background-position: center;
background-image: url(../images/down.png);
position: absolute;
top: 11px;
right: 6px;
width: 20px;
height: 20px;
cursor: pointer;
}
.colors_line {
float: left;
margin: 4px;
margin-right: 0;
clear: left;
}
.custom {
opacity: 0;
position: absolute;
left: -10000px;
}
.filter_button.button.color {
display: inline-block;
width: 15px;
height: 15px;
border: 1px solid #EBEBEB;
padding: 0;
margin: 0;
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.filter_button.button.color:hover {
border: 1px solid rgb(128,128,128);
cursor: pointer;
}
input[type="radio"]:checked + .filter_button.button.color {
border: 1px solid rgb(255,255,255);
box-shadow: 0 0 0px 1px #000;
-webkit-box-shadow: 0 0 0px 1px #000;
}
#allcolor {
background: white url('../images/search_app.png') -43px -144px no-repeat;
}
#colored {
background: white url('../images/search_app.png') -43px -244px no-repeat;
}
#grayed {
background: white url('../images/search_app.png') -45px -343px no-repeat;
}
#black{
background-color:#ffffff;
}
#blue{
background-color:#0000FF;
}
#brown{
background-color:rgba(139, 82, 16, 1);
}
#gray{
background-color:#999999;
}
#green{
background-color:#00CC00;
}
#orange{
background-color:#FB940B;
}
#pink{
background-color:#FF98BF;
}
#purple{
background-color:#762CA7;
}
#red{
background-color:#CC0000;
}
#teal{
background-color:#03C0C6;
}
#white{
background-color:#000000;
}
#yellow{
background-color:#FFFF00;
}
.selectBox-dropdown, .selectBox-options li a {
line-height: 1.3 !important;
font-size: 13px;
}
.pager_button {
padding: 3px 5px;
font-size: 16px;
color: black;
display: inline-block;
}
.pager_button.active {
border-radius: 3px;
-webkit-border-radius: 3px;

@ -10,6 +10,38 @@ a {
text-decoration: none;
}
::-webkit-scrollbar {
width: 14px;
background-color:white;
}
::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color:lightgray;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:start{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgUp.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:end{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgDown.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
.disclaimer{
height: auto;
position: fixed;
@ -27,8 +59,8 @@ a {
border-top-right-radius: 15px;
border: solid 4px #EEEEEE;
border-bottom: none;
z-index: 10;
font-size: 12px;
z-index: 10;
}
#searchResult {
@ -324,3 +356,18 @@ input[type="radio"]:checked + .filter_button.button.color {
background-color: gray;
color: white;
}
/*
Planete Sankore Changes
*/
.searchButton{
right: 10px;
}
#subSearchInput{
padding-right: 5px;
}
.imgContainer img {
width: 100px;
}

@ -10,6 +10,38 @@ a {
text-decoration: none;
}
::-webkit-scrollbar {
width: 14px;
background-color:white;
}
::-webkit-scrollbar-thumb {
border-radius: 10px;
background-color:lightgray;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:start{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgUp.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
::-webkit-scrollbar-button:vertical:end{
border-radius: 10px;
background-color:lightgray;
background-image: url(../images/trgDown.png);
background-size: 8px auto;
background-position: center;
background-repeat: no-repeat;
border: 2px solid gray;
}
.disclaimer{
height: auto;
position: fixed;
@ -27,8 +59,8 @@ a {
border-top-right-radius: 15px;
border: solid 4px #EEEEEE;
border-bottom: none;
z-index: 10;
font-size: 12px;
z-index: 10;
}
#searchResult {
@ -324,3 +356,18 @@ input[type="radio"]:checked + .filter_button.button.color {
background-color: gray;
color: white;
}
/*
Planete Sankore Changes
*/
.searchButton{
right: 10px;
}
#subSearchInput{
padding-right: 5px;
}
.imgContainer img {
width: 100px;
}

@ -282,7 +282,7 @@ KEYBT FRENCH_LOCALE[] = {
/* ? 7 */ KEYBTDECL(0xe8, 0x37, true, 8),
/* _ 8 */ KEYBTDECL(0x5f, 0x38, true, 9),
/* ? 9 */ KEYBTDECL(0xe7, 0x39, true, 10),
/* ? 0 */ KEYBTDECL(0xe0, 0x29, true, 11),
/* ? 0 */ KEYBTDECL(0xe0, 0x30, true, 11),
/* ) ? */ KEYBTDECL(0x29, 0xb0, true, 12),
/* = + */ KEYBTDECL(0x3d, 0x2b, true, 13),
@ -386,7 +386,7 @@ void UBPlatformUtils::initializeKeyboardLayouts()
keyboardLayouts[1] = new UBKeyboardLocale("Russian", "ru", "", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE);
keyboardLayouts[2] = new UBKeyboardLocale("German", "de", "", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE);
keyboardLayouts[3] = new UBKeyboardLocale("French", "fr", "", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE);
keyboardLayouts[4] = new UBKeyboardLocale("Swiss French", "fr", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE);
keyboardLayouts[4] = new UBKeyboardLocale("Swiss French", "fr-CH", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE);
}
void UBPlatformUtils::destroyKeyboardLayouts()

@ -247,7 +247,7 @@ KEYBT FRENCH_LOCALE[] = {
/* ? 7 */ KEYBTDECL(0xe8, 0x37, true),
/* _ 8 */ KEYBTDECL(0x5f, 0x38, true),
/* ? 9 */ KEYBTDECL(0xe7, 0x39, true),
/* ? 0 */ KEYBTDECL(0xe0, 0x29, true),
/* ? 0 */ KEYBTDECL(0xe0, 0x30, true),
/* ) ? */ KEYBTDECL(0x29, 0xb0, true),
/* = + */ KEYBTDECL(0x3d, 0x2b, true),
@ -401,7 +401,7 @@ void UBPlatformUtils::initializeKeyboardLayouts()
keyboardLayouts[0] = new UBKeyboardLocale("English", "en", "", new QIcon(":/images/flags/en.png"), ENGLISH_LOCALE);
keyboardLayouts[1] = new UBKeyboardLocale("Russian", "ru", "", new QIcon(":/images/flags/ru.png"),RUSSIAN_LOCALE);
keyboardLayouts[2] = new UBKeyboardLocale("French", "fr", "", new QIcon(":/images/flags/fr.png"), FRENCH_LOCALE);
keyboardLayouts[3] = new UBKeyboardLocale("Swiss French", "fr", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE);
keyboardLayouts[3] = new UBKeyboardLocale("Swiss French", "fr-CH", "", new QIcon(":/images/flags/fr.png"), SWISS_FRENCH_LOCALE);
keyboardLayouts[4] = new UBKeyboardLocale("German", "de", "", new QIcon(":/images/flags/de.png"), GERMAN_LOCALE);
}

Loading…
Cancel
Save