From 9ebeb982c4ff99bb0efa05d46e8b8745a23d854d Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Tue, 31 Jul 2012 12:33:54 +0300 Subject: [PATCH 1/5] Corrected displaying pages previews. --- src/gui/UBDocumentNavigator.cpp | 1 + 1 file changed, 1 insertion(+) 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()); } /** From d33b872ba6dc2e90d3c71927a5e52c8bb8217bb7 Mon Sep 17 00:00:00 2001 From: Aleksei Kanash Date: Tue, 31 Jul 2012 15:57:00 +0300 Subject: [PATCH 2/5] Fixed minimum size for W3C. --- src/domain/UBAbstractWidget.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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)); } From f4ac3c881d6330d0dcc0a0c86dfe8fe592f2e9ae Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 31 Jul 2012 16:52:21 +0200 Subject: [PATCH 3/5] some easy fixes --- .../interactivities/Cat images.wgt/css/basic.css | 6 +++--- .../interactivities/Cat images.wgt/img/minus.png | Bin 0 -> 1536 bytes .../interactivities/Cat images.wgt/img/plus.png | Bin 0 -> 1563 bytes .../interactivities/Cat images.wgt/js/script.js | 15 +++++++-------- .../Cat images.wgt/locales/fr/js/script.js | 12 ++++++------ .../Cat images.wgt/locales/ru/js/script.js | 12 ++++++------ 6 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 resources/library/interactivities/Cat images.wgt/img/minus.png create mode 100644 resources/library/interactivities/Cat images.wgt/img/plus.png 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 0000000000000000000000000000000000000000..58da86aaff8cf4ce05e3f48f96b8b92dadce24a4 GIT binary patch literal 1536 zcmeAS@N?(olHy`uVBq!ia0vp^av;pX1|+Qw)-3{3k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m=!WZB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{LeTnUYGpj(%jU%5}4i;gkCe8dO-;xw*Y9fOKMSOS!#+~QGTuh*uz$txZPrm(>$o& z6x?nx!Kqgt=oo!av?4__ObD2EKuma|1#;lYJ~a=R){B6Nn(@{C7YqzcWu7jMAr-fd zgvYz21WN3`D>U($rqZ-4)rKx-x-Lm6dAa212dXX2iAvR6n=wVnwJYvbYPHv5kN+JV zXD;lUu3DwJNK|m+{{H*NZ@!KzPM>A{_eZJK^5XOFYwlY<|GkfE(#a)Hg?kf3a+tUe zTJ^;@=0DJ^5a4S+|3@cmg4+(3p2o)sJJ0jlH53-G&aOD?wu3i@&3k!A577fZ&YSKo3A=$o~+AN1OH)K&ZVg4?NYr8fAts!H?}o|_~p zbM0o|%7Q5e9q-KM@DdHnKb<{!2Sa&#=#8WV4ymd{Yu5x8UeoN6kmy$~XJ%KDu|urpOgX ze||s6u=Z`LwE5=CT-hp`;rmz<-dbFr*1ac@%iGjqk>%wT(~A_P5_#1nE}ptvb|g^u zRGI3pCk|Ug&vx#TSoAy2^t#9n)@e=cZu8E$h3vbVT)LU@B4_%OqDAfLhP>x4zV)uV ztoC}nPc-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%s|1+P|wiV z#N6CmN5ROz&_Lh7NZ-&%*U;R`*vQJjKmiJrfVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj z%k|2Q_413-^$jg8EkR}&8R-I5=oVMzl_XZ^<`pZ$OmImpPAEg{v+u2}(t{7puX=A(aKG z`a!A1`K3k4z=%sz23b{LD^lm>QXz7@Iko z8k@rOy5uL9=BDPA!1Sgd^qS+;3rYyN1wfl!Qj0RnQd8WD@^cly9=6KF?G_W9=0WwQ z;C72CPQCg-$LNEi6)BowLcp{GV!{(GkONQlsd>P(UIa|k&0c$VGcYhs^mK6yskn6{ zJkVuHpvb(Rt;Lbgr&bY>V8e^L3MdYEVkhG~do+%T#%jr`O(^ z{#LWMH!vzG(#Y91T=-(JOJ_&w{=?-v{yxip=ks@Sd;YsS|L^^;dp@W7-OlIyV%WmS#-amfcUAa&K_{Q7`22 zJ}g)4@_7OG`c*ydHrJ}w+!KAooXog?sqgn&4{u)LI-LJ9{r7RhbNPE1k3^}g(fFvT z>-XzuN6y#2(p!d`Zmc`(qTe`(q|jytM6R(Ei(S()*n0DWO9<w?{rIssovEQ;F{LLS;z9?;~b{UW!IYiabGy}kMI5E z(q%WDl^?fS+NZ^ARzFa%mUVB}j+!ZAHXFZu;").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;") From 8c3fd4306695e229bbf555d03f833b65c3df15df Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 31 Jul 2012 17:05:05 +0200 Subject: [PATCH 4/5] some easy fixes in 'ordre letters' widget --- .../interactivities/Ordre lettres.wgt/css/basic.css | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css index 6830edb2..057d3f0f 100644 --- a/resources/library/interactivities/Ordre lettres.wgt/css/basic.css +++ b/resources/library/interactivities/Ordre lettres.wgt/css/basic.css @@ -205,16 +205,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*/ From aeb3c344f4f9111fa2106860219b14e19107538e Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 31 Jul 2012 17:54:01 +0200 Subject: [PATCH 5/5] some fixes in text typing --- .../interactivities/Ass images.wgt/css/basic.css | 13 +++++++------ .../interactivities/Ass sons.wgt/css/basic.css | 1 + .../interactivities/Choisir.wgt/css/basic.css | 10 ++++------ .../interactivities/Ordre images.wgt/css/basic.css | 3 ++- .../interactivities/Ordre lettres.wgt/css/basic.css | 1 + .../interactivities/Selectionner.wgt/css/basic.css | 1 + 6 files changed, 16 insertions(+), 13 deletions(-) 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/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 057d3f0f..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{ 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{