diff --git a/resources/library/interactivities/Ass images.wgt/css/basic.css b/resources/library/interactivities/Ass images.wgt/css/basic.css index 033ef2d2..51369796 100644 --- a/resources/library/interactivities/Ass images.wgt/css/basic.css +++ b/resources/library/interactivities/Ass images.wgt/css/basic.css @@ -64,7 +64,7 @@ body{ .sub_cont{ width: 100%; padding: 0; - margin: 20px 0 0 0; + margin: 20px 0 5px 0; min-height: 60px; } @@ -84,7 +84,7 @@ body{ } .imgs_answers_gray{ - + } .imgs_answers_green{ @@ -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; + padding-left: 10px; + word-break: break-all; } .close_cont{ @@ -207,7 +208,7 @@ body{ } .dropBack{ - + } /* new design */ @@ -417,5 +418,5 @@ body{ } .open{ - + } \ No newline at end of file diff --git a/resources/library/interactivities/Ass sons.wgt/css/basic.css b/resources/library/interactivities/Ass sons.wgt/css/basic.css index b684a1d8..9045c831 100644 --- a/resources/library/interactivities/Ass sons.wgt/css/basic.css +++ b/resources/library/interactivities/Ass sons.wgt/css/basic.css @@ -218,6 +218,7 @@ body{ overflow-x: hidden; float: right; margin-left: 20px; + word-break: break-all; } .play, .stop{ diff --git a/resources/library/interactivities/Cat images.wgt/css/basic.css b/resources/library/interactivities/Cat images.wgt/css/basic.css index 64362b4a..1fd13dc1 100644 --- a/resources/library/interactivities/Cat images.wgt/css/basic.css +++ b/resources/library/interactivities/Cat images.wgt/css/basic.css @@ -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{ diff --git a/resources/library/interactivities/Cat images.wgt/img/minus.png b/resources/library/interactivities/Cat images.wgt/img/minus.png new file mode 100644 index 00000000..58da86aa Binary files /dev/null and b/resources/library/interactivities/Cat images.wgt/img/minus.png differ diff --git a/resources/library/interactivities/Cat images.wgt/img/plus.png b/resources/library/interactivities/Cat images.wgt/img/plus.png new file mode 100644 index 00000000..39ff322d Binary files /dev/null and b/resources/library/interactivities/Cat images.wgt/img/plus.png differ diff --git a/resources/library/interactivities/Cat images.wgt/js/script.js b/resources/library/interactivities/Cat images.wgt/js/script.js index 3f239c07..441c3ea1 100644 --- a/resources/library/interactivities/Cat images.wgt/js/script.js +++ b/resources/library/interactivities/Cat images.wgt/js/script.js @@ -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(){ $("
").appendTo(container); container.find(".imgs_cont").each(function(){ - $("").appendTo($(this)); - $("").appendTo($(this)); + $("").appendTo($(this)); + $("").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){ $("").appendTo(imgs_container); var tmp_div = $("
").appendTo(imgs_container); $("").appendTo(tmp_div); - $("").appendTo(imgs_container); - $("").appendTo(imgs_container); + $("").appendTo(imgs_container); + $("").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(){ $("").appendTo(imgs_container); var tmp_div = $("
").appendTo(imgs_container); $("").appendTo(tmp_div); - $("").appendTo(imgs_container); - $("").appendTo(imgs_container); + $("").appendTo(imgs_container); + $("").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."); diff --git a/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js b/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js index 0b45e459..4b2ff920 100644 --- a/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js +++ b/resources/library/interactivities/Cat images.wgt/locales/fr/js/script.js @@ -158,8 +158,8 @@ function start(){ $("
").appendTo(container); container.find(".imgs_cont").each(function(){ - $("").appendTo($(this)); - $("").appendTo($(this)); + $("").appendTo($(this)); + $("").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){ $("").appendTo(imgs_container); var tmp_div = $("
").appendTo(imgs_container); $("").appendTo(tmp_div); - $("").appendTo(imgs_container); - $("").appendTo(imgs_container); + $("").appendTo(imgs_container); + $("").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(){ $("").appendTo(imgs_container); var tmp_div = $("
").appendTo(imgs_container); $("").appendTo(tmp_div); - $("").appendTo(imgs_container); - $("").appendTo(imgs_container); + $("").appendTo(imgs_container); + $("").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;") diff --git a/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js b/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js index c6a2ab6d..367e5630 100644 --- a/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js +++ b/resources/library/interactivities/Cat images.wgt/locales/ru/js/script.js @@ -158,8 +158,8 @@ function start(){ $("
").appendTo(container); container.find(".imgs_cont").each(function(){ - $("").appendTo($(this)); - $("").appendTo($(this)); + $("").appendTo($(this)); + $("").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){ $("").appendTo(imgs_container); var tmp_div = $("
").appendTo(imgs_container); $("").appendTo(tmp_div); - $("").appendTo(imgs_container); - $("").appendTo(imgs_container); + $("").appendTo(imgs_container); + $("").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(){ $("").appendTo(imgs_container); var tmp_div = $("
").appendTo(imgs_container); $("").appendTo(tmp_div); - $("").appendTo(imgs_container); - $("").appendTo(imgs_container); + $("").appendTo(imgs_container); + $("").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;") diff --git a/resources/library/interactivities/Choisir.wgt/css/basic.css b/resources/library/interactivities/Choisir.wgt/css/basic.css index a391cfa7..0472e8ce 100644 --- a/resources/library/interactivities/Choisir.wgt/css/basic.css +++ b/resources/library/interactivities/Choisir.wgt/css/basic.css @@ -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{ diff --git a/resources/library/interactivities/Ordre images.wgt/css/basic.css b/resources/library/interactivities/Ordre images.wgt/css/basic.css index cc891579..48ab3bb5 100644 --- a/resources/library/interactivities/Ordre images.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre images.wgt/css/basic.css @@ -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{ diff --git a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css index 6830edb2..26583dd9 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css @@ -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*/ diff --git a/resources/library/interactivities/Selectionner.wgt/css/basic.css b/resources/library/interactivities/Selectionner.wgt/css/basic.css index 63a3511a..8a5c3d9d 100644 --- a/resources/library/interactivities/Selectionner.wgt/css/basic.css +++ b/resources/library/interactivities/Selectionner.wgt/css/basic.css @@ -94,6 +94,7 @@ body{ border-bottom-left-radius: 10px; padding-left: 10px; display: block; + word-break: break-all; } .close_cont{ diff --git a/src/domain/UBAbstractWidget.cpp b/src/domain/UBAbstractWidget.cpp index 9ea88035..8485f76b 100644 --- a/src/domain/UBAbstractWidget.cpp +++ b/src/domain/UBAbstractWidget.cpp @@ -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)); } diff --git a/src/gui/UBDocumentNavigator.cpp b/src/gui/UBDocumentNavigator.cpp index f4026d11..d2e81572 100644 --- a/src/gui/UBDocumentNavigator.cpp +++ b/src/gui/UBDocumentNavigator.cpp @@ -161,6 +161,7 @@ void UBDocumentNavigator::refreshScene() int rowIndex = i / mNbColumns; item.Place(rowIndex, columnIndex, mThumbnailWidth, thumbnailHeight); } + scene()->setSceneRect(scene()->itemsBoundingRect()); } /**