Skip to content

O
OpenBoard
Commit 5ddebd96 authored by Claudio Valerio's avatar Claudio Valerio
Browse files
Options

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

parents fee86294 aeb3c344
master bugfix 1.5.4z3 1.5.4z2 1.5.4z
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing with 46 additions and 42 deletions
resources/library/interactivities/Ass images.wgt/css/basic.css
View file @ 5ddebd96
......@@ -64,7 +64,7 @@ body{
.sub_cont{
width: 100%;
padding: 0;
margin: 20px 0 0 0;
margin: 20px 0 5px 0;
min-height: 60px;
}
......@@ -114,11 +114,12 @@ body{
min-height: 40px;
max-height: 60px;
float: right;
overflow: auto;
overflow-x: hidden;
background-color: #ccc;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
padding-left: 10px;
word-break: break-all;
}
.close_cont{
......
resources/library/interactivities/Ass sons.wgt/css/basic.css
View file @ 5ddebd96
......@@ -218,6 +218,7 @@ body{
overflow-x: hidden;
float: right;
margin-left: 20px;
word-break: break-all;
}
.play, .stop{
......
resources/library/interactivities/Cat images.wgt/css/basic.css
View file @ 5ddebd96
......@@ -150,16 +150,16 @@ body{
height: 30px;
float: right;
cursor: pointer;
background-color: white;
background-color: transparent;
border: none;
}
.del_category{
background-image: url(../img/minus.png);
}
.add_category{
background-image: url(../img/plus.png);
}
.cat_desc{
......
resources/library/interactivities/Cat images.wgt/img/minus.png 0 → 100644
View file @ 5ddebd96
resources/library/interactivities/Cat images.wgt/img/minus.png

1.5 KB

resources/library/interactivities/Cat images.wgt/img/plus.png 0 → 100644
View file @ 5ddebd96
resources/library/interactivities/Cat images.wgt/img/plus.png

1.53 KB

resources/library/interactivities/Cat images.wgt/js/script.js
View file @ 5ddebd96
......@@ -5,7 +5,7 @@ var sankoreLang = {
second_desc: "Even numbers",
enter: "Enter your category name here ...",
add: "Add new block",
wgt_name: "Order images",
wgt_name: "Categorize images",
reload: "Reload",
slate: "Wood",
pad: "Pad",
......@@ -160,8 +160,8 @@ function start(){
$("<div class='close_cont'>").appendTo(container);
container.find(".imgs_cont").each(function(){
$("<button class='del_category'>-</button>").appendTo($(this));
$("<button class='add_category'>+</button>").appendTo($(this));
$("<button class='del_category'></button>").appendTo($(this));
$("<button class='add_category'></button>").appendTo($(this));
$(this).attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;")
......@@ -558,8 +558,8 @@ function addCategory(obj){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container);
$("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;")
......@@ -579,8 +579,8 @@ function addContainer(){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'/>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container);
$("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"#e6f6ff\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"#c3e9ff\"); return false;")
......@@ -787,7 +787,6 @@ function onDropTarget(obj, event) {
}
}
}
exportData();
}
else {
alert ("Your browser does not support the dataTransfer object.");
......
resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js
View file @ 5ddebd96
......@@ -158,8 +158,8 @@ function start(){
$("<div class='close_cont'>").appendTo(container);
container.find(".imgs_cont").each(function(){
$("<button class='del_category'>-</button>").appendTo($(this));
$("<button class='add_category'>+</button>").appendTo($(this));
$("<button class='del_category'></button>").appendTo($(this));
$("<button class='add_category'></button>").appendTo($(this));
$(this).attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;")
......@@ -556,8 +556,8 @@ function addCategory(obj){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container);
$("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;")
......@@ -577,8 +577,8 @@ function addContainer(){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'/>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container);
$("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;")
......
resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js
View file @ 5ddebd96
......@@ -158,8 +158,8 @@ function start(){
$("<div class='close_cont'>").appendTo(container);
container.find(".imgs_cont").each(function(){
$("<button class='del_category'>-</button>").appendTo($(this));
$("<button class='add_category'>+</button>").appendTo($(this));
$("<button class='del_category'></button>").appendTo($(this));
$("<button class='add_category'></button>").appendTo($(this));
$(this).attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"#E6F6FF\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"#C3E9FF\"); return false;")
......@@ -559,8 +559,8 @@ function addCategory(obj){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container);
$("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;")
......@@ -580,8 +580,8 @@ function addContainer(){
$("<input type='hidden' name='count' value=''/>").appendTo(imgs_container);
var tmp_div = $("<div style='width: 100%; overflow: hidden;'>").appendTo(imgs_container);
$("<input type='text' class='cat_desc' value='" + sankoreLang.enter + "'/>").appendTo(tmp_div);
$("<button class='del_category'>-</button>").appendTo(imgs_container);
$("<button class='add_category'>+</button>").appendTo(imgs_container);
$("<button class='del_category'></button>").appendTo(imgs_container);
$("<button class='add_category'></button>").appendTo(imgs_container);
imgs_container.attr("ondragenter", "return false;")
.attr("ondragleave", "$(this).css(\"background-color\",\"\"); return false;")
.attr("ondragover", "$(this).css(\"background-color\",\"\"); return false;")
......
resources/library/interactivities/Choisir.wgt/css/basic.css
View file @ 5ddebd96
......@@ -149,12 +149,10 @@ body{
font-family: Verdana,Arial,Helvetica,sans-serif;
font-size: small;
border: 3px solid #ccc;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow: #dadada -1px 0 4px;
-webkit-box-shadow: #dadada -1px 0 4px;
box-shadow: #dadada -1px 0 4px;
color: white;
word-break: break-all;
}
.qstContentDisplay{
......@@ -169,6 +167,7 @@ body{
border: 1px solid #DFDFDE;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
word-break: break-all;
}
.ansDiv{
......@@ -222,12 +221,10 @@ body{
overflow-x: hidden;
float: left;
border: 3px solid #ccc;
-webkit-border-radius: 5px;
border-radius: 5px;
-moz-box-shadow: #dadada -1px 0 4px;
-webkit-box-shadow: #dadada -1px 0 4px;
box-shadow: #dadada -1px 0 4px;
color: white;
word-break: break-all;
}
.ansContentDisplay{
......@@ -244,6 +241,7 @@ body{
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
color: white;
word-break: break-all;
}
.ansDelete{
......
resources/library/interactivities/Ordre images.wgt/css/basic.css
View file @ 5ddebd96
......@@ -60,7 +60,7 @@ body{
.sub_cont{
width: 100%;
padding: 0;
margin: 20px 0 0 0;
margin: 20px 0 5px 0;
min-height: 60px;
}
......@@ -93,6 +93,7 @@ body{
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
padding-left: 10px;
word-break: break-all;
}
.close_cont{
......
resources/library/interactivities/Ordre lettres.wgt/css/basic.css
View file @ 5ddebd96
......@@ -172,6 +172,7 @@ body{
overflow-x: hidden;
float: right;
margin-left: 20px;
word-break: break-all;
}
.play, .stop{
......@@ -205,16 +206,15 @@ body{
.audio_answer{
min-height: 50px;
min-width: 200px;
max-width: 700px;
margin: 5px 10px;
padding: 0 10px;
background-color: white;
display: inline-block;
position: relative;
border: 1px solid #ccc;
-moz-box-shadow: #ccc -1px 0 4px;
-webkit-box-shadow: #ccc -1px 0 4px;
box-shadow: #ccc -1px 0 4px;
font-size: 230%;
word-wrap: break-word;
}
/*new design*/
......
resources/library/interactivities/Selectionner.wgt/css/basic.css
View file @ 5ddebd96
......@@ -94,6 +94,7 @@ body{
border-bottom-left-radius: 10px;
padding-left: 10px;
display: block;
word-break: break-all;
}
.close_cont{
......
src/domain/UBAbstractWidget.cpp
View file @ 5ddebd96
......@@ -172,8 +172,10 @@ bool UBAbstractWidget::hasEmbededFlash()
void UBAbstractWidget::resize(qreal width, qreal height)
{
QWebView::page()->setViewportSize(QSize(width, height));
QWebView::setFixedSize(QSize(width, height));
qreal w = qMax((qreal)mNominalSize.width(), width);
qreal h = qMax((qreal)mNominalSize.height(), height);
QWebView::page()->setViewportSize(QSize(w, h));
QWebView::setFixedSize(QSize(w, h));
}
......
src/gui/UBDocumentNavigator.cpp
View file @ 5ddebd96
......@@ -161,6 +161,7 @@ void UBDocumentNavigator::refreshScene()
int rowIndex = i / mNbColumns;
item.Place(rowIndex, columnIndex, mThumbnailWidth, thumbnailHeight);
}
scene()->setSceneRect(scene()->itemsBoundingRect());
}
/**
......
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