Merge branch 'develop' into anatoly_dev

Sankore 3.1.iss

@@ -47,9 +47,6 @@ Type: files ; Name: "{app}\*.dll"
 Source: "..\Sankore-ThirdParty\microsoft\vcredist_x86.exe"; DestDir:"{tmp}"
 Source: "build\win32\release\product\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 
-;Sankore plugins
-;Source: "plugins\cffadaptor\build\win32\release\lib\CFF_Adaptor.dll"; DestDir: "{app}"; Flags: ignoreversion
-
 ;OpenSSL
 Source: "..\Sankore-ThirdParty\openssl\win32\libeay32.dll"; DestDir:"{app}"; Flags: ignoreversion
 Source: "..\Sankore-ThirdParty\openssl\win32\ssleay32.dll"; DestDir:"{app}"; Flags: ignoreversion
@@ -85,6 +82,15 @@ Source: "..\Qt-4.8\plugins\imageformats\qtiff4.dll"; DestDir: "{app}\imageformat
 Source: "..\Qt-4.8\plugins\phonon_backend\phonon_ds94.dll"; DestDir: "{app}\phonon_backend"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
+;qt multimedia plugins
+Source: "c:\OpenSankore\plugins\mediaservice\dsengine.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\dsengined.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengine.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\mediaservice\qtmedia_audioengined.dll"; DestDir: "c:\OpenSankore\mediaservice"; Flags: ignoreversion
+
+Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3u.dll"; DestDir: "c:\OpenSankore\playlistformats"; Flags: ignoreversion
+Source: "c:\OpenSankore\plugins\playlistformats\qtmultimediakit_m3ud.dll"; DestDir: "c:\OpenSankore\playlistformats"; Flags: ignoreversion
+
 [Icons]
 Name: "{group}\Open-Sankor"; Filename: "{app}\Open-Sankore.exe"
 Name: "{group}\{cm:UninstallProgram,Open-Sankor}"; Filename: "{uninstallexe}"

resources/library/interactivities/Ass images.wgt/locales/fr/js/script.js

@@ -9,7 +9,7 @@ var sankoreLang = {
     slate: "ardoise",
     pad: "tablette",
     none: "aucun",
-    help: "aide",
+    help: "Aide",
     help_content: "Ceci est un exemple de contenu de l'aide ..."
 };
 

resources/library/interactivities/Calcul.wgt/i18n/Messages_fr.properties

 fr.njin.i18n.document.title = Calcul rapide
 
 fr.njin.i18n.toolbar.edit = Modifier
-fr.njin.i18n.toolbar.view = Editer
+fr.njin.i18n.toolbar.view = Afficher
 fr.njin.i18n.toolbar.reload = Recharger
 fr.njin.i18n.toolbar.help = Aide
 

resources/library/interactivities/Ordre lettres.wgt/css/basic.css

@@ -64,12 +64,6 @@ body{
     min-height: 60px;
 }
 
-.imgs_cont{
-    width: 100%;
-    min-height: 62px;
-    margin: 0;
-}
-
 .imgs_answers_gray{
 
 }
@@ -115,19 +109,41 @@ body{
     left: 5px;
 }
 
-.img_block{
-    width: 50px;
+#sortable{
+/*    width: 100%;
+    min-height: 62px;
+    margin: 0;*/
+    list-style-type: none;
+    margin: 10px 0 10px 20px;
+    padding: 0;
+}
+
+#sortable li{
+/*    width: 50px;
     height: 50px;
     margin: 5px 10px;
     cursor: pointer;
+    float: left;
     display: inline-block;
     position: relative;
     background-color: white;
     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%;*/
+    margin: 5px 10px;
+    display: inline-table;
+    width: 50px;
+    height: 50px;
+    background-color: white;
     font-size: 230%;
+    -webkit-box-shadow: #ccc -1px 0 4px;
+    box-shadow: #ccc -1px 0 4px;
+    text-align: center;
+}
+
+.highlight { 
+    background-color: #999 !important;
 }
 
 .add_block{

resources/library/interactivities/Ordre lettres.wgt/index.html

@@ -6,8 +6,8 @@
         <link rel="stylesheet" type="text/css" href="css/basic.css"/>
         <link rel="stylesheet" href="css/fonts/Lobster/stylesheet.css">
 	<link rel="stylesheet" href="css/fonts/SF-Toontime/stylesheet.css">
-        <script type="text/javascript" src="js/jquery-1.6.2.min.js"></script>
-        <script type="text/javascript" src="js/jquery-ui-1.8.9.custom.min.js"></script>
+        <script src="js/jquery-1.8.0.min.js"></script>
+        <script src="js/jquery-ui-1.8.23.custom.min.js"></script>        
         <script type="text/javascript" src="js/script.js"></script>
         <script type="text/javascript">
             $(document).ready(function(){

resources/library/interactivities/Ordre lettres.wgt/locales/fr/index.html

@@ -6,8 +6,8 @@
         <link rel="stylesheet" type="text/css" href="../../css/basic.css"/>
         <link rel="stylesheet" href="../../css/fonts/Lobster/stylesheet.css">
 	<link rel="stylesheet" href="../../css/fonts/SF-Toontime/stylesheet.css">
-        <script type="text/javascript" src="../../js/jquery-1.6.2.min.js"></script>
-        <script type="text/javascript" src="../../js/jquery-ui-1.8.9.custom.min.js"></script>
+        <script type="text/javascript" src="../../js/jquery-1.8.0.min.js"></script>
+        <script type="text/javascript" src="../../js/jquery-ui-1.8.23.custom.min.js"></script>
         <script type="text/javascript" src="js/script.js"></script>
         <script type="text/javascript">
             $(document).ready(function(){

resources/library/interactivities/Ordre lettres.wgt/locales/ru/index.html

@@ -6,17 +6,17 @@
         <link rel="stylesheet" type="text/css" href="../../css/basic.css"/>
         <link rel="stylesheet" href="../../css/fonts/Lobster/stylesheet.css">
 	<link rel="stylesheet" href="../../css/fonts/SF-Toontime/stylesheet.css">
-        <script type="text/javascript" src="../../js/jquery-1.6.2.min.js"></script>
-        <script type="text/javascript" src="../../js/jquery-ui-1.8.9.custom.min.js"></script>
+        <script type="text/javascript" src="../../js/jquery-1.8.0.min.js"></script>
+        <script type="text/javascript" src="../../js/jquery-ui-1.8.23.custom.min.js"></script>
         <script type="text/javascript" src="js/script.js"></script>
         <script type="text/javascript">
-            $(document).ready(function(){ 
+            $(document).ready(function(){
                 sankore.enableDropOnWidget(false);
                 start();
             });
         </script>
     </head>
-    <body>        
+    <body>       
         <table class="body_table" cellpadding=0 cellspacing=0>
             <tr style="height: 54px;">
                 <td class="b_top_left">&nbsp;</td>

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -238,7 +238,7 @@ QString UBSvgSubsetAdaptor::uniboardDocumentNamespaceUriFromVersion(int mFileVer
 UBGraphicsScene* UBSvgSubsetAdaptor::loadScene(UBDocumentProxy* proxy, const int pageIndex)
 {
     QString fileName = proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", pageIndex);
-
+    qDebug() << fileName;
     QFile file(fileName);
 
     if (file.exists())

src/adaptors/UBThumbnailAdaptor.cpp

@@ -96,7 +96,6 @@ void UBThumbnailAdaptor::updateDocumentToHandleZeroPage(UBDocumentProxy* proxy)
     if(UBSettings::settings()->teacherGuidePageZeroActivated->get().toBool()){
     	QString fileName = proxy->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", 0);
     	QFile file(fileName);
-    	qDebug() << fileName;
     	if(!file.exists()){
     		UBPersistenceManager::persistenceManager()->persistDocumentScene(proxy,new UBGraphicsScene(proxy),0);
     	}

src/core/UBApplication.cpp

@@ -224,8 +224,7 @@ void UBApplication::setupTranslators(QStringList args)
         if(!setLanguage.isEmpty())
             forcedLanguage = setLanguage;
     }
-    
-    QStringList availablesTranslations = UBPlatformUtils::availableTranslations();
+
     QString language("");
 
     if(!forcedLanguage.isEmpty())
@@ -366,14 +365,13 @@ int UBApplication::exec(const QString& pFileToImport)
     boardController->setupLayout();
 
     if (pFileToImport.length() > 0)
-    {
         UBApplication::applicationController->importFile(pFileToImport);
-    }
 
 #if defined(Q_WS_MAC)
     static AEEventHandlerUPP ub_proc_ae_handlerUPP = AEEventHandlerUPP(ub_appleEventProcessor);
     AEInstallEventHandler(kCoreEventClass, kAEReopenApplication, ub_proc_ae_handlerUPP, SRefCon(UBApplication::applicationController), true);
 #endif
+
     if (UBSettings::settings()->appStartMode->get() == "Desktop")
         applicationController->showDesktop();
     else

src/core/UBDocumentManager.cpp

@@ -149,32 +149,32 @@ UBDocumentProxy* UBDocumentManager::importFile(const QFile& pFile, const QString
                 UBPageBasedImportAdaptor* importAdaptor = (UBPageBasedImportAdaptor*)adaptor;
 
                 // Document import procedure.....
-                QString documentName = QFileInfo(pFile.fileName()).completeBaseName();
-                document = UBPersistenceManager::persistenceManager()->createDocument(pGroup, documentName);
-
-                QUuid uuid = QUuid::createUuid();
-                QString filepath = pFile.fileName();
-                if (importAdaptor->folderToCopy() != "")
-                {
-                    bool b = UBPersistenceManager::persistenceManager()->addFileToDocument(document, pFile.fileName(), importAdaptor->folderToCopy() , uuid, filepath);
-                    if (!b)
-                    {
-                        UBPersistenceManager::persistenceManager()->deleteDocument(document);
-                        UBApplication::setDisabled(false);
-                        return NULL;
-                    }
-                }
-
-                QList<UBGraphicsItem*> pages = importAdaptor->import(uuid, filepath);
-                int nPage = 0;
-                foreach(UBGraphicsItem* page, pages)
-                {
-                    UBApplication::showMessage(tr("Inserting page %1 of %2").arg(++nPage).arg(pages.size()), true);
-                    int pageIndex = document->pageCount();
-                    UBGraphicsScene* scene = UBPersistenceManager::persistenceManager()->createDocumentSceneAt(document, pageIndex);
-                    importAdaptor->placeImportedItemToScene(scene, page);
-                    UBPersistenceManager::persistenceManager()->persistDocumentScene(document, scene, pageIndex);
-                }
+                QString documentName = QFileInfo(pFile.fileName()).completeBaseName();
+                document = UBPersistenceManager::persistenceManager()->createDocument(pGroup, documentName);
+
+                QUuid uuid = QUuid::createUuid();
+                QString filepath = pFile.fileName();
+                if (importAdaptor->folderToCopy() != "")
+                {
+                    bool b = UBPersistenceManager::persistenceManager()->addFileToDocument(document, pFile.fileName(), importAdaptor->folderToCopy() , uuid, filepath);
+                    if (!b)
+                    {
+                        UBPersistenceManager::persistenceManager()->deleteDocument(document);
+                        UBApplication::setDisabled(false);
+                        return NULL;
+                    }
+                }
+
+                QList<UBGraphicsItem*> pages = importAdaptor->import(uuid, filepath);
+                int nPage = 0;
+                foreach(UBGraphicsItem* page, pages)
+                {
+                    UBApplication::showMessage(tr("Inserting page %1 of %2").arg(++nPage).arg(pages.size()), true);
+                    int pageIndex = document->pageCount();
+                    UBGraphicsScene* scene = UBPersistenceManager::persistenceManager()->createDocumentSceneAt(document, pageIndex);
+                    importAdaptor->placeImportedItemToScene(scene, page);
+                    UBPersistenceManager::persistenceManager()->persistDocumentScene(document, scene, pageIndex);
+                }
 
                 UBPersistenceManager::persistenceManager()->persistDocumentMetadata(document);
                 UBApplication::showMessage(tr("Import successful."));
@@ -216,28 +216,28 @@ int UBDocumentManager::addFilesToDocument(UBDocumentProxy* document, QStringList
                 {
                     UBPageBasedImportAdaptor* importAdaptor = (UBPageBasedImportAdaptor*)adaptor;
 
-                    QUuid uuid = QUuid::createUuid();
-                    QString filepath = file.fileName();
-                    if (importAdaptor->folderToCopy() != "")
-                    {
-                        bool b = UBPersistenceManager::persistenceManager()->addFileToDocument(document, file.fileName(), importAdaptor->folderToCopy() , uuid, filepath);
-                        if (!b)
-                        {
-                            continue;
-                        }
-                    }
-
-                    QList<UBGraphicsItem*> pages = importAdaptor->import(uuid, filepath);
-                    int nPage = 0;
-                    foreach(UBGraphicsItem* page, pages)
-                    {
-                        UBApplication::showMessage(tr("Inserting page %1 of %2").arg(++nPage).arg(pages.size()), true);
-                        int pageIndex = document->pageCount();
-                        UBGraphicsScene* scene = UBPersistenceManager::persistenceManager()->createDocumentSceneAt(document, pageIndex);
-                        importAdaptor->placeImportedItemToScene(scene, page);
+                    QUuid uuid = QUuid::createUuid();
+                    QString filepath = file.fileName();
+                    if (importAdaptor->folderToCopy() != "")
+                    {
+                        bool b = UBPersistenceManager::persistenceManager()->addFileToDocument(document, file.fileName(), importAdaptor->folderToCopy() , uuid, filepath);
+                        if (!b)
+                        {
+                            continue;
+                        }
+                    }
+
+                    QList<UBGraphicsItem*> pages = importAdaptor->import(uuid, filepath);
+                    int nPage = 0;
+                    foreach(UBGraphicsItem* page, pages)
+                    {
+                        UBApplication::showMessage(tr("Inserting page %1 of %2").arg(++nPage).arg(pages.size()), true);
+                        int pageIndex = document->pageCount();
+                        UBGraphicsScene* scene = UBPersistenceManager::persistenceManager()->createDocumentSceneAt(document, pageIndex);
+                        importAdaptor->placeImportedItemToScene(scene, page);
                         UBPersistenceManager::persistenceManager()->persistDocumentScene(document, scene, pageIndex);
-                        UBApplication::boardController->addEmptyThumbPage();
-                    }
+                        UBApplication::boardController->addEmptyThumbPage();
+                    }
 
                     UBPersistenceManager::persistenceManager()->persistDocumentMetadata(document);
                     UBApplication::showMessage(tr("Import of file %1 successful.").arg(file.fileName()));

src/core/UBPersistenceManager.cpp

@@ -587,6 +587,10 @@ UBGraphicsScene* UBPersistenceManager::loadDocumentScene(UBDocumentProxy* proxy,
         return mSceneCache.value(proxy, sceneIndex);
     else {
         UBGraphicsScene* scene = UBSvgSubsetAdaptor::loadScene(proxy, sceneIndex);
+        if(!scene && UBSettings::settings()->teacherGuidePageZeroActivated->get().toBool()){
+            createDocumentSceneAt(proxy,0);
+            scene = UBSvgSubsetAdaptor::loadScene(proxy, 0);
+        }
 
         if (scene)
             mSceneCache.insert(proxy, sceneIndex, scene);

src/core/main.cpp

@@ -127,9 +127,9 @@ int main(int argc, char *argv[])
 
     app.initialize(false);
 
-    QObject::connect(&app, SIGNAL(messageReceived(const QString&)), &app,
-                     SLOT(handleOpenMessage(const QString&)));
+    QObject::connect(&app, SIGNAL(messageReceived(const QString&)), &app, SLOT(handleOpenMessage(const QString&)));
 
+    qDebug() << fileToOpen;
     int result = app.exec(fileToOpen);
 
     app.cleanup();

src/domain/UBGraphicsScene.cpp

@@ -628,6 +628,11 @@ bool UBGraphicsScene::inputDeviceRelease()
 
     setDocumentUpdated();
 
+    if (mCurrentStroke && mCurrentStroke->polygons().empty()){
+        delete mCurrentStroke;
+    }
+    mCurrentStroke = NULL;
+
     return accepted;
 }