Skip to content

O
OpenBoard
Commit 0317a3e6 authored by Claudio Valerio's avatar Claudio Valerio
Browse files
Options

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

parents 47f69a82 0ba8dd86
Show whitespace changes
Inline Side-by-side
Showing with 784 additions and 669 deletions
resources/library/interactive/ColorPicker.wgt/css/colorpicker.css
View file @ 0317a3e6
......@@ -32,7 +32,7 @@
width: 11px;
height: 11px;
overflow: hidden;
background: url(../images/colorpicker_select.gif);
background: url(../images/colorpicker_select.png);
margin: -5px 0 0 -5px;
}
.colorpicker_hue {
......@@ -48,7 +48,7 @@
width: 35px;
height: 9px;
overflow: hidden;
background: url(../images/colorpicker_indic.gif) left top;
background: url(../images/colorpicker_indic.png) left top;
margin: -4px 0 0 0;
left: 0px;
}
......@@ -147,6 +147,25 @@
top: 142px;
overflow: hidden;
}
.tools_change {
position: absolute;
width: 22px;
height: 22px;
background: url(../images/tools.jpg) top;
left: 290px;
top: 142px;
overflow: hidden;
}
.tools_change.tools_compass{
background-position: bottom;
}
.tools_change.tools_border{
border: 1px solid #999090;
}
.colorpicker_focus {
background-position: center;
}
......
resources/library/interactive/ColorPicker.wgt/css/layout.css
View file @ 0317a3e6
......@@ -180,7 +180,7 @@ h1 {
left: 0;
}
#colorpickerHolder2 .colorpicker_hue div {
background-image: url(../images/custom_indic.gif);
background-image: url(../images/custom_indic.png);
}
#colorpickerHolder2 .colorpicker_hex {
background-image: url(../images/custom_hex.png);
......
resources/library/interactive/ColorPicker.wgt/index.html
View file @ 0317a3e6
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<head>
<link rel="stylesheet" href="css/colorpicker.css" type="text/css" />
<link rel="stylesheet" media="screen" type="text/css" href="css/layout.css" />
<title>ColorPicker - jQuery plugin</title>
......@@ -9,8 +9,8 @@
<script type="text/javascript" src="js/eye.js"></script>
<script type="text/javascript" src="js/utils.js"></script>
<script type="text/javascript" src="js/layout.js?ver=1.0.2"></script>
</head>
<body>
<p id="colorpickerHolder">
</body>
</head>
<body>
<p id="colorpickerHolder"></p>
</body>
</html>
resources/library/interactive/ColorPicker.wgt/js/colorpicker.js
View file @ 0317a3e6
......@@ -10,10 +10,11 @@
var ColorPicker = function () {
var
ids = {},
penFlag = true,
inAction,
charMin = 65,
visible,
tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div></div>',
tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="tools_change"></div><div class="colorpicker_submit"></div></div>',
defaults = {
eventName: 'click',
onShow: function () {},
......@@ -43,7 +44,11 @@
.eq(0).val(HSBToHex(hsb)).end();
},
setSelector = function (hsb, cal) {
$(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100}));
$(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({
h: hsb.h,
s: 100,
b: 100
}));
$(cal).data('colorpicker').selectorIndic.css({
left: parseInt(150 * hsb.s/100, 10),
top: parseInt(150 * (100-hsb.b)/100, 10)
......@@ -57,8 +62,17 @@
},
setNewColor = function (hsb, cal) {
$(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb));
if(penFlag){
$("div.tools_change").removeClass("tools_compass");
window.sankore.setTool('pen');
window.sankore.setPenColor('#' + HSBToHex(hsb));
sankore.returnStatus("PEN installed", penFlag);
} else {
$("div.tools_change").addClass("tools_compass");
window.sankore.setTool('compass');
window.sankore.setPenColor('#' + HSBToHex(hsb));
sankore.returnStatus("Compass installed", penFlag);
}
},
keyDown = function (ev) {
var pressedKey = ev.charCode || ev.keyCode || -1;
......@@ -203,6 +217,22 @@
setCurrentColor(col, cal.get(0));
cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el);
},
mouseOverBorder = function(ev) {
$(this).addClass("tools_border");
},
mouseOutBorder = function(ev) {
$(this).removeClass("tools_border");
},
clickToolsChange = function (ev) {
var cal = $(this).parent();
var col = cal.data('colorpicker').color;
cal.data('colorpicker').origColor = col;
setCurrentColor(col, cal.get(0));
cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el);
penFlag = (penFlag)?false:true;
setNewColor(col, cal.get(0));
sankore.returnStatus("startEditing()", penFlag);
},
show = function (ev) {
var cal = $('#' + $(this).data('colorpickerId'));
cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]);
......@@ -216,11 +246,16 @@
if (left + 356 > viewPort.l + viewPort.w) {
left -= 356;
}
cal.css({left: left + 'px', top: top + 'px'});
cal.css({
left: left + 'px',
top: top + 'px'
});
if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) {
cal.show();
}
$(document).bind('mousedown', {cal: cal}, hide);
$(document).bind('mousedown', {
cal: cal
}, hide);
return false;
},
hide = function (ev) {
......@@ -286,7 +321,11 @@
},
HexToRGB = function (hex) {
var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
return {
r: hex >> 16,
g: (hex & 0x00FF00) >> 8,
b: (hex & 0x0000FF)
};
},
HexToHSB = function (hex) {
return RGBToHSB(HexToRGB(hex));
......@@ -336,15 +375,47 @@
var t2 = (255-s)*v/255;
var t3 = (t1-t2)*(h%60)/60;
if(h==360) h = 0;
if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3}
else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3}
else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3}
else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3}
else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3}
else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3}
else {rgb.r=0; rgb.g=0; rgb.b=0}
if(h<60) {
rgb.r=t1;
rgb.b=t2;
rgb.g=t2+t3
}
else if(h<120) {
rgb.g=t1;
rgb.b=t2;
rgb.r=t1-t3
}
else if(h<180) {
rgb.g=t1;
rgb.r=t2;
rgb.b=t2+t3
}
else if(h<240) {
rgb.b=t1;
rgb.r=t2;
rgb.g=t1-t3
}
return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)};
else if(h<300) {
rgb.b=t1;
rgb.g=t2;
rgb.r=t2+t3
}
else if(h<360) {
rgb.r=t1;
rgb.g=t2;
rgb.b=t1-t3
}
else {
rgb.r=0;
rgb.g=0;
rgb.b=0
}
}
return {
r:Math.round(rgb.r),
g:Math.round(rgb.g),
b:Math.round(rgb.b)
};
},
RGBToHex = function (rgb) {
var hex = [
......@@ -418,6 +489,10 @@
.bind('mouseenter', enterSubmit)
.bind('mouseleave', leaveSubmit)
.bind('click', clickSubmit);
cal.find('div.tools_change')
.bind('mouseover', mouseOverBorder)
.bind('mouseout', mouseOutBorder)
.bind('click', clickToolsChange);
fillRGBFields(options.color, cal.get(0));
fillHSBFields(options.color, cal.get(0));
fillHexFields(options.color, cal.get(0));
......
resources/library/interactive/TextEditor.wgt/config.xml
View file @ 0317a3e6
......@@ -4,8 +4,8 @@
xmlns:ub="http://uniboard.mnemis.com/widgets"
id="http://www.example.net/widgets/helloworld"
version="1.0"
width="200"
height="700"
width="540"
height="320"
ub:resizable="true">
<name>Rich Note</name>
......
resources/library/interactive/TextEditor.wgt/index.html
View file @ 0317a3e6
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Full featured example</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- TinyMCE -->
<script type="text/javascript" src="jscripts/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript">
<head>
<title>Full featured example</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- TinyMCE -->
<script type="text/javascript" src="jscripts/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript">
var flag = false;
tinyMCE.init({
// General options
mode : "textareas",
......@@ -13,9 +14,9 @@
plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
// Theme options
theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect",
theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,code,insertdate,inserttime,preview,|,forecolor,backcolor",
theme_advanced_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,advhr,|,ltr,rtl,|,fullscreen,|,visualchars,nonbreaking",
theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,formatselect,fontselect,fontsizeselect",
theme_advanced_buttons2 : "undo,redo,|,cut,copy,paste,pasteword,|,bullist,numlist,|,outdent,indent,|,code,insertdate,inserttime,preview,|,forecolor,backcolor",
theme_advanced_buttons3 : "hr,removeformat,|,sub,sup,|,charmap,emotions,iespell,|,ltr,rtl",
theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left",
theme_advanced_statusbar_location : "bottom",
......@@ -47,19 +48,38 @@
staffid : "991234"
}
});
</script>
<!-- /TinyMCE -->
</head>
<body>
function setSankoreData() {
if(window.sankore) {
if(flag)
window.sankore.setPreference("textForEditing", window.frames[0].document.getElementById("tinymce").innerHTML);
}
}
function setTextEditorData() {
if(window.sankore) {
if(!window.frames[0])
setTimeout(function(){setTextEditorData()}, 300);
else {
flag = true;
window.frames[0].document.getElementById("tinymce").innerHTML = window.sankore.preference("textForEditing","<p>Enter your text here ...</p>");
}
}
}
/*function setSpanHandler(){
alert(document.body.innerHTML);
alert(document.getElementById("elm1_toolbargroup").innerHTML);
document.getElementById("elm1_toolbargroup").onmouseout = function(){
setSankoreData();
};
}*/
</script>
<!-- /TinyMCE -->
</head>
<body onmouseout="setSankoreData()" onload="setTextEditorData()">
<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%">
&lt;p&gt;
This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;.
&lt;/p&gt;
&lt;p&gt;
Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros.
&lt;/p&gt;
</textarea>
</body>
</body>
</html>
resources/library/interactive/TextEditor.wgt/jscripts/tiny_mce/themes/advanced/langs/en.js
View file @ 0317a3e6
......@@ -51,7 +51,7 @@ cut_desc:"Cut",
copy_desc:"Copy",
paste_desc:"Paste",
image_props_desc:"Image properties",
newdocument_desc:"New document",
newdocument_desc:"Clean",
help_desc:"Help",
blockquote_desc:"Blockquote",
clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?",
......
resources/library/interactive/iCell.wgt/js/script.js
View file @ 0317a3e6
......@@ -102,7 +102,7 @@ function adn() {
document.getElementById("div_zoom").innerHTML='<img src="images/'+elt_a_zoomer+'_zoom.jpg" alt="" />'
/*Uniboard 4 ne supportant pas bien les gifs...*/
if(window.uniboard){
if(window.sankore){
document.getElementById("img_ADN").src="images/adn.jpg"
} else {
document.getElementById("img_ADN").src="images/ADN.gif"
......
src/frameworks/UBPlatformUtils_linux.cpp
View file @ 0317a3e6
......@@ -248,7 +248,7 @@ const KEYBT FRENCH_LOCALE[] = {
/* j J */ KEYBT(0x6a, 0x4a),
/* k K */ KEYBT(0x6b, 0x4b),
/* l L */ KEYBT(0x6c, 0x4c),
/* m M */ KEYBT(0x6b, 0x4d),
/* m M */ KEYBT(0x6d, 0x4d),
/* ? % */ KEYBT(0xf9, 0x25),
/* * ? */ KEYBT(0x2a, 0xb5),
......
src/frameworks/UBPlatformUtils_win.cpp
View file @ 0317a3e6
......@@ -282,7 +282,7 @@ const KEYBT FRENCH_LOCALE[] = {
/* j J */ KEYBT(0x6a, 0x4a),
/* k K */ KEYBT(0x6b, 0x4b),
/* l L */ KEYBT(0x6c, 0x4c),
/* m M */ KEYBT(0x6b, 0x4d),
/* m M */ KEYBT(0x6d, 0x4d),
/* ? % */ KEYBT(0xf9, 0x25),
/* * ? */ KEYBT(0x2a, 0xb5),
......
src/gui/UBKeyboardPalette_linux.cpp
View file @ 0317a3e6
......@@ -75,6 +75,7 @@ void x11SendKey(Display *display, int keyCode, int modifiers)
void UBKeyboardButton::sendUnicodeSymbol(unsigned int nSymbol1, unsigned int nSymbol2, bool shift)
{
unsigned int nSymbol = shift ? nSymbol2 : nSymbol1;
// Obtain the X11 display.
Display *display = XOpenDisplay(0);
if(display == NULL)
......@@ -97,6 +98,7 @@ void UBKeyboardButton::sendControlSymbol(int nSymbol)
if(display == NULL)
return;
KeyCode keyCode = XKeysymToKeycode(display, nSymbol);
if (keyCode != NoSymbol)
......@@ -174,8 +176,10 @@ void setSymbolsFromButton(Display *display,
{
keySyms[byte_per_code * i + 0] =
keySyms[byte_per_code * i + 2] = locale[nFromButton + i]->code1;
keySyms[byte_per_code * i + 1] =
keySyms[byte_per_code * i + 3] = locale[nFromButton + i]->code2;
for(int j=4; j<byte_per_code; j++)
keySyms[byte_per_code * i + j] = NoSymbol;
}
......@@ -193,11 +197,8 @@ void UBKeyboardPalette::onLocaleChanged(UBKeyboardLocale* locale)
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 41, 0, 1);
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 2, 1, 12);
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 16, 13, 12);
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 30, 25, 12);
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 30, 25, 11);
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 44, 37, 10);
XCloseDisplay(display);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment