Strange merge

12 years ago · 450c785990
parent 0467211997 5510a30b20
commit 450c785990
17 changed files with 36 additions and 24 deletions
--- a/JournalDesModifications.pdf
+++ b/JournalDesModifications.pdf
--- a/ReleaseNotes.pdf
+++ b/ReleaseNotes.pdf
--- a/release.win7.vc9.bat
+++ b/release.win7.vc9.bat
@ -38,7 +38,7 @@ REM is correct. This is important because installer
 REM pick up dll from this directory
 IF NOT EXIST "%QT_DIR%\lib\QtCore4.dll" GOTO EXIT_WITH_ERROR
-REM rmdir /S /Q %BUILD_DIR%
+rmdir /S /Q %BUILD_DIR%
 set EDITION=MNEMIS_EDITION
--- a/resources/etc/freezedWidgetWrapper.html
+++ b/resources/etc/freezedWidgetWrapper.html
@ -9,9 +9,19 @@
                width: 100%;
            }
-            div{
+            #freezed{
                text-align: center;
-                border: 5px #ccc outset;
+                border: 5px solid #ccc;
                border-radius: 80px;
                box-shadow: inset 0 0 30px rgba(66,66,66,0.5);
            }
            .loading{
                color: #999;
                font-weight: bold;
                font-size: large;
                margin-top: 5px;
                margin-left: 5px;
            }
        </style>
        <script type="text/javascript">
@ -42,6 +52,6 @@
        </script>
    </head>
    <body>
-        <div id="freezed">Widget freezed.</div>
+        <div id="freezed"><img src="img/loading.gif"/><div class="loading">Loading ...</div></div>
    </body>
 </html>
--- a/resources/etc/img/loading.gif
+++ b/resources/etc/img/loading.gif
--- a/resources/library/interactivities/Ass
+++ b/resources/library/interactivities/Ass
@ -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{
--- a/resources/library/interactivities/Ass
+++ b/resources/library/interactivities/Ass
@ -218,6 +218,7 @@ body{
    overflow-x: hidden;
    float: right;
    margin-left: 20px;
    word-break: break-all;
 }
 .play, .stop{
--- 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{
--- a/resources/library/interactivities/Ordre
+++ b/resources/library/interactivities/Ordre
@ -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{
--- a/resources/library/interactivities/Ordre
+++ b/resources/library/interactivities/Ordre
@ -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*/
--- a/resources/library/interactivities/Ordre
+++ b/resources/library/interactivities/Ordre
@ -337,7 +337,7 @@ function showExample(){
    var audio_block = $("<div class='audio_block'>").appendTo(text);
    $("<div class='play'>").appendTo(audio_block);
    $("<div class='replay'>").appendTo(audio_block);
-    var source = $("<source/>").attr("src", "objects/beep.wav");
+    var source = $("<source/>").attr("src", "objects/beep.mp3");
    var audio = $("<audio>").appendTo(audio_block);
    audio.append(source);
    $("<input type='hidden'/>").appendTo(audio_block);
--- a/resources/library/interactivities/Ordre
+++ b/resources/library/interactivities/Ordre
@ -331,7 +331,7 @@ function showExample(){
    var audio_block = $("<div class='audio_block'>").appendTo(text);
    $("<div class='play'>").appendTo(audio_block);
    $("<div class='replay'>").appendTo(audio_block);
-    var source = $("<source/>").attr("src", "../../objects/beep.wav");
+    var source = $("<source/>").attr("src", "objects/exemple.mp3");
    var audio = $("<audio>").appendTo(audio_block);
    audio.append(source);
    $("<input type='hidden'/>").appendTo(audio_block);
--- a/lettres.wgt/locales/fr/objects/exemple.mp3
+++ b/lettres.wgt/locales/fr/objects/exemple.mp3
--- a/resources/library/interactivities/Ordre
+++ b/resources/library/interactivities/Ordre
@ -332,7 +332,7 @@ function showExample(){
    var audio_block = $("<div class='audio_block'>").appendTo(text);
    $("<div class='play'>").appendTo(audio_block);
    $("<div class='replay'>").appendTo(audio_block);
-    var source = $("<source/>").attr("src", "../../objects/beep.wav");
+    var source = $("<source/>").attr("src", "objects/example.mp3");
    var audio = $("<audio>").appendTo(audio_block);
    audio.append(source);
    $("<input type='hidden'/>").appendTo(audio_block);
--- a/lettres.wgt/locales/ru/objects/example.mp3
+++ b/lettres.wgt/locales/ru/objects/example.mp3
--- a/resources/library/interactivities/Ordre
+++ b/resources/library/interactivities/Ordre
--- 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{