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

resources/library/interactivities/Ordre lettres.wgt/js/script.js

@@ -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);

resources/library/interactivities/Ordre lettres.wgt/locales/fr/js/script.js

@@ -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);

resources/library/interactivities/Ordre lettres.wgt/locales/ru/js/script.js

@@ -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);

src/board/UBBoardPaletteManager.cpp

@@ -884,6 +884,10 @@ void UBBoardPaletteManager::addItemToLibrary()
 
 #ifdef USE_WEB_WIDGET
         mpLibWidget->libNavigator()->libraryWidget()->libraryController()->importImageOnLibrary(image);
+#else
+        QDateTime now = QDateTime::currentDateTime();
+        QString capturedName  = tr("CapturedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss") + ".png";
+        mpFeaturesWidget->importImage(image, capturedName);
 #endif
 
     }

src/board/UBFeaturesController.cpp

@@ -108,8 +108,6 @@ UBFeaturesController::UBFeaturesController(QWidget *pParentWidget) :
     mLibSearchDirectoryPath =QUrl::fromLocalFile(UBSettings::settings()->userSearchDirectory());
     trashDirectoryPath = QUrl::fromLocalFile(UBSettings::userTrashDirPath());
 
-
-
     rootElement = UBFeature(QString(), QPixmap( ":images/libpalette/home.png" ), "root", QUrl());
     audiosElement = UBFeature( rootPath, QPixmap(":images/libpalette/AudiosCategory.svg"), "Audios" , mUserAudioDirectoryPath, FEATURE_CATEGORY);
     moviesElement = UBFeature( rootPath, QPixmap(":images/libpalette/MoviesCategory.svg"), "Movies" , mUserVideoDirectoryPath, FEATURE_CATEGORY);
@@ -167,15 +165,12 @@ void UBFeaturesController::scanFS()
 
     QList <UBToolsManager::UBToolDescriptor> tools = UBToolsManager::manager()->allTools();
 
-    foreach (UBToolsManager::UBToolDescriptor tool, tools)
-	{
+    foreach (UBToolsManager::UBToolDescriptor tool, tools) {
         featuresList->append(UBFeature(appPath, tool.icon, tool.label, QUrl(tool.id), FEATURE_INTERNAL));
-		if ( favoriteSet->find( QUrl( tool.id ) ) != favoriteSet->end() )
-		{
+        if (favoriteSet->find(QUrl(tool.id)) != favoriteSet->end()) {
             featuresList->append(UBFeature(favoritePath, tool.icon, tool.label, QUrl(tool.id), FEATURE_INTERNAL));
 		}
 	}
-
         //Claudio:
         // don't change the order of the scans
         fileSystemScan( mLibAudiosDirectoryPath, audiosPath);
@@ -194,7 +189,6 @@ void UBFeaturesController::scanFS()
         fileSystemScan( mLibInteractiveDirectoryPath, interactPath  );
         fileSystemScan( trashDirectoryPath, trashPath );
         fileSystemScan( mLibSearchDirectoryPath, rootPath + "/" + "Web search" );
-
 }
 
 void UBFeaturesController::fileSystemScan(const QUrl & currentPath, const QString & currVirtualPath)
@@ -202,62 +196,27 @@ void UBFeaturesController::fileSystemScan(const QUrl & currentPath, const QStrin
     QFileInfoList fileInfoList = UBFileSystemUtils::allElementsInDirectory(currentPath.toLocalFile());
 
     QFileInfoList::iterator fileInfo;
-    for ( fileInfo = fileInfoList.begin(); fileInfo != fileInfoList.end(); fileInfo +=  1)
-	{
-		UBFeatureElementType fileType = fileInfo->isDir() ? FEATURE_FOLDER : FEATURE_ITEM;
-
+    for ( fileInfo = fileInfoList.begin(); fileInfo != fileInfoList.end(); fileInfo +=  1) {
+        QString fullFileName = fileInfo->absoluteFilePath();
+        UBFeatureElementType featureType = fileTypeFromUrl(fullFileName);
         QString fileName = fileInfo->fileName();
-        if ( UBFileSystemUtils::mimeTypeFromFileName(fileName).contains("application") ) 
-		{
-			if ( UBFileSystemUtils::mimeTypeFromFileName(fileName).contains("application/search") )
-			{
-				fileType = FEATURE_SEARCH;
-			}
-			else
-             fileType = FEATURE_INTERACTIVE;
-        }
-		QString itemName = (fileType != FEATURE_ITEM) ? fileName : fileInfo->completeBaseName();
-		QPixmap icon = QPixmap(":images/libpalette/soundIcon.svg");
-		QString fullFileName = fileInfo->filePath();
 
+        QPixmap icon(getIcon(fullFileName, featureType));
 
-		if ( fileType == FEATURE_FOLDER ) 
-		{
-            icon = QPixmap(":images/libpalette/folder.svg");
-        }
-        else if ( fileType == FEATURE_INTERACTIVE )
-		{
-			icon = QPixmap( UBAbstractWidget::iconFilePath( QUrl::fromLocalFile(fullFileName) ) );
-		}
-		else
-		{
         if ( fullFileName.contains(".thumbnail."))
             continue;
-			icon = thumbnailForFile( fullFileName );
-			/*QString thumbnailPath = UBFileSystemUtils::thumbnailPath( fullFileName );
  
-			if (QFileInfo( thumbnailPath).exists() )
-				icon = QPixmap( thumbnailPath );
-			else icon = createThumbnail( fullFileName );*/
-		}
-
-        UBFeature testFeature(currVirtualPath, icon, fileName, QUrl::fromLocalFile(fullFileName), fileType);
-
-        if (featuresList->contains(testFeature)) {
-            qDebug() << "the same feature found";
-        }
+        UBFeature testFeature(currVirtualPath, icon, fileName, QUrl::fromLocalFile(fullFileName), featureType);
 
         featuresList->append(testFeature);
-		if ( favoriteSet->find( QUrl::fromLocalFile( fullFileName ) ) != favoriteSet->end() )
-		{
-			featuresList->append( UBFeature( favoritePath, icon, fileName, QUrl::fromLocalFile( fullFileName ), fileType ) );
+
+        if ( favoriteSet->find( QUrl::fromLocalFile( fullFileName ) ) != favoriteSet->end() ) {
+            featuresList->append( UBFeature( favoritePath, icon, fileName, QUrl::fromLocalFile( fullFileName ), featureType ) );
 		}
 
-		if ( fileType == FEATURE_FOLDER )
-		{
+        if (featureType == FEATURE_FOLDER) {
             fileSystemScan(QUrl::fromLocalFile(fullFileName), currVirtualPath + "/" + fileName);
 		}
-
     }
 }
 
@@ -301,7 +260,7 @@ void UBFeaturesController::addToFavorite( const QUrl &path )
 	{
 		QFileInfo fileInfo( filePath );
 		QString fileName = fileInfo.fileName();
-		UBFeature elem( favoritePath, thumbnailForFile( filePath ), fileName, path, fileTypeFromUrl(filePath) );
+        UBFeature elem( favoritePath, getIcon( filePath, FEATURE_CATEGORY ), fileName, path, fileTypeFromUrl(filePath) );
 		favoriteSet->insert( path );
 		saveFavoriteList();
 
@@ -336,22 +295,41 @@ QString UBFeaturesController::fileNameFromUrl( const QUrl &url )
 UBFeatureElementType UBFeaturesController::fileTypeFromUrl( const QString &path )
 {
     QFileInfo fileInfo(path);
+
+    if (!fileInfo.exists()) {
+        return FEATURE_INVALID;
+    }
+
     QString fileName = fileInfo.fileName();
+    QString mimeString = UBFileSystemUtils::mimeTypeFromFileName(fileName);
 
     UBFeatureElementType fileType = fileInfo.isDir() ? FEATURE_FOLDER : FEATURE_ITEM;
-	if ( UBFileSystemUtils::mimeTypeFromFileName(fileName).contains("application") ) 
-	{
+
+    if ( mimeString.contains("application")) {
+        if (mimeString.contains("application/search")) {
+            fileType = FEATURE_SEARCH;
+        } else {
             fileType = FEATURE_INTERACTIVE;
         }
-	else if ( path.contains("uniboardTool://")  )
-	{
+    } else if ( path.contains("uniboardTool://")) {
 		fileType = FEATURE_INTERNAL;
 	}
+
 	return fileType;
 }
 
-QPixmap UBFeaturesController::thumbnailForFile(const QString &path)
+QPixmap UBFeaturesController::getIcon(const QString &path, UBFeatureElementType pFType = FEATURE_INVALID)
+{
+    if ( pFType == FEATURE_FOLDER )
+    {
+        return QPixmap(":images/libpalette/folder.svg");
+    }
+    else if ( pFType == FEATURE_INTERACTIVE )
     {
+        return QPixmap( UBAbstractWidget::iconFilePath( QUrl::fromLocalFile(path) ) );
+    }
+
+
     if ( path.contains("uniboardTool://") )
     {
             return QPixmap( UBToolsManager::manager()->iconFromToolId(path) );
@@ -411,10 +389,18 @@ QPixmap UBFeaturesController::createThumbnail(const QString &path)
     return QPixmap(thumbnailPath);
 }
 
-UBFeature UBFeaturesController::importImage( const QImage &image, const UBFeature &destination )
+void UBFeaturesController::importImage(const QImage &image, const QString &fileName)
 {
+    importImage(image, currentElement, fileName);
+}
+
+void UBFeaturesController::importImage( const QImage &image, const UBFeature &destination, const QString &fileName )
+{
+    QString mFileName = fileName;
+    if (mFileName.isNull()) {
         QDateTime now = QDateTime::currentDateTime();
-    QString fileName = tr("ImportedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss") + ".png";
+        mFileName  = tr("ImportedImage") + "-" + now.toString("dd-MM-yyyy hh-mm-ss") + ".png";
+    }
 
     UBFeature dest = destination;
 
@@ -423,13 +409,15 @@ UBFeature UBFeaturesController::importImage( const QImage &image, const UBFeatur
 	    dest = picturesElement;
     }
 
-    QString filePath = dest.getFullPath().toLocalFile() + "/" + fileName;
+    QString filePath = dest.getFullPath().toLocalFile() + "/" + mFileName;
     image.save(filePath);
 
     QPixmap thumb = createThumbnail( filePath );
-    return UBFeature( dest.getFullVirtualPath(), thumb, fileName, 
+    UBFeature resultItem =  UBFeature( dest.getFullVirtualPath(), thumb, mFileName,
         QUrl::fromLocalFile( filePath ), FEATURE_ITEM );
 
+    featuresModel->addItem(resultItem);
+
 }
 
 void UBFeaturesController::addNewFolder(const QString &name)
@@ -456,7 +444,7 @@ void UBFeaturesController::addItemAsBackground(const UBFeature &item)
     UBApplication::boardController->downloadURL( item.getFullPath(), QPointF(), QSize(), true );
 }
 
-UBFeature UBFeaturesController::getParentFeatureForUrl( const QUrl &url )
+UBFeature UBFeaturesController::getDestinationFeatureForUrl( const QUrl &url )
 {
     QString mimetype = UBFileSystemUtils::mimeTypeFromFileName( url.toString() );
 
@@ -478,7 +466,7 @@ UBFeature UBFeaturesController::getParentFeatureForUrl( const QUrl &url )
 
 void UBFeaturesController::addDownloadedFile(const QUrl &sourceUrl, const QByteArray &pData)
 {
-    UBFeature dest = getParentFeatureForUrl( sourceUrl );
+    UBFeature dest = getDestinationFeatureForUrl( sourceUrl );
 
     if ( dest == UBFeature() )
         return;
@@ -492,7 +480,7 @@ void UBFeaturesController::addDownloadedFile(const QUrl &sourceUrl, const QByteA
         file.write(pData);
         file.close();
 
-        UBFeature downloadedFeature = UBFeature( dest.getFullVirtualPath(), thumbnailForFile( filePath ),
+        UBFeature downloadedFeature = UBFeature( dest.getFullVirtualPath(), getIcon( filePath ),
                                                  fileName, QUrl::fromLocalFile(filePath), FEATURE_ITEM);
         if (downloadedFeature != UBFeature()) {
             featuresModel->addItem(downloadedFeature);
@@ -510,7 +498,7 @@ UBFeature UBFeaturesController::moveItemToFolder( const QUrl &url, const UBFeatu
 
 	Q_ASSERT( QFileInfo( sourcePath ).exists() );
 
-    UBFeature possibleDest = getParentFeatureForUrl( url );
+    UBFeature possibleDest = getDestinationFeatureForUrl( url );
 
 	UBFeature dest = destination;
 
@@ -530,7 +518,7 @@ UBFeature UBFeaturesController::moveItemToFolder( const QUrl &url, const UBFeatu
         deleteItem( url );
     }
 
-	QPixmap thumb = thumbnailForFile( newFullPath );
+    QPixmap thumb = getIcon( newFullPath );
 	
     UBFeatureElementType type = FEATURE_ITEM;
 	if ( UBFileSystemUtils::mimeTypeFromFileName( newFullPath ).contains("application") ) 
@@ -589,7 +577,7 @@ UBFeature UBFeaturesController::copyItemToFolder( const QUrl &url, const UBFeatu
 
     Q_ASSERT( QFileInfo( sourcePath ).exists() );
 
-    UBFeature possibleDest = getParentFeatureForUrl( url );
+    UBFeature possibleDest = getDestinationFeatureForUrl( url );
 
     UBFeature dest = destination;
 
@@ -606,7 +594,7 @@ UBFeature UBFeaturesController::copyItemToFolder( const QUrl &url, const UBFeatu
     if (!sourcePath.compare(newFullPath, Qt::CaseInsensitive))
         QFile(sourcePath).copy(newFullPath);
 
-    QPixmap thumb = thumbnailForFile( newFullPath );
+    QPixmap thumb = getIcon(newFullPath);
 
     UBFeatureElementType type = FEATURE_ITEM;
     if (UBFileSystemUtils::mimeTypeFromFileName(newFullPath).contains("application"))
@@ -615,6 +603,45 @@ UBFeature UBFeaturesController::copyItemToFolder( const QUrl &url, const UBFeatu
     return newElement;
 }
 
+void UBFeaturesController::moveExternalData(const QUrl &url, const UBFeature &destination)
+{
+    QString sourcePath = url.toLocalFile();
+
+    Q_ASSERT( QFileInfo( sourcePath ).exists() );
+
+    UBFeature possibleDest = getDestinationFeatureForUrl(url);
+
+    UBFeature dest = destination;
+
+    if ( destination != trashElement &&
+        !destination.getFullVirtualPath().startsWith( possibleDest.getFullVirtualPath(), Qt::CaseInsensitive ) )
+    {
+        dest = possibleDest;
+    }
+
+    UBFeatureElementType type = fileTypeFromUrl(sourcePath);
+
+    if (type == FEATURE_FOLDER) {
+        return;
+    }
+
+    QString name = QFileInfo(sourcePath).fileName();
+    QString destPath = dest.getFullPath().toLocalFile();
+    QString destVirtualPath = dest.getFullVirtualPath();
+    QString newFullPath = destPath + "/" + name;
+
+    if (!sourcePath.compare(newFullPath, Qt::CaseInsensitive) || !UBFileSystemUtils::copy(sourcePath, newFullPath)) {
+        return;
+    }
+
+    Q_ASSERT(QFileInfo(newFullPath).exists());
+
+    QPixmap thumb = getIcon(newFullPath, type);
+    UBFeature newElement(destVirtualPath, thumb, name, QUrl::fromLocalFile(newFullPath), type);
+
+    featuresModel->addItem(newElement);
+}
+
 void UBFeaturesController::deleteItem(const QUrl &url)
 {
     QString path = url.toLocalFile();

src/board/UBFeaturesController.h

@@ -33,7 +33,8 @@ enum UBFeatureElementType
     FEATURE_ITEM,
 	FEATURE_TRASH,
 	FEATURE_FAVORITE,
-	FEATURE_SEARCH
+    FEATURE_SEARCH,
+    FEATURE_INVALID
 };
 
 class UBFeature
@@ -105,6 +106,7 @@ public:
 
 	UBFeature moveItemToFolder( const QUrl &url, const UBFeature &destination );
 	UBFeature copyItemToFolder( const QUrl &url, const UBFeature &destination );
+    void moveExternalData(const QUrl &url, const UBFeature &destination);
 
     void rescanModel();
     void siftElements(const QString &pSiftValue);
@@ -120,13 +122,15 @@ public:
     void addNewFolder(const QString &name);
     void addToFavorite( const QUrl &path );
     void removeFromFavorite(const QUrl &path, bool deleteManualy = false);
-    UBFeature importImage( const QImage &image, const UBFeature &destination );
+    void importImage(const QImage &image, const QString &fileName = QString());
+    void importImage( const QImage &image, const UBFeature &destination, const QString &fileName = QString() );
 
     void fileSystemScan(const QUrl &currPath, const QString & currVirtualPath);
+    static UBFeatureElementType fileTypeFromUrl( const QString &path );
 
 
 	static QString fileNameFromUrl( const QUrl &url );
-	static QPixmap thumbnailForFile( const QString &path );
+    static QPixmap getIcon( const QString &path, UBFeatureElementType pFType );
 	static bool isDeletable( const QUrl &url );
     static char featureTypeSplitter() {return ':';}
 
@@ -153,7 +157,7 @@ private:
 	void loadFavoriteList();
 	void saveFavoriteList();
 
-	static UBFeatureElementType fileTypeFromUrl( const QString &path );
+
 
     QList <UBFeature> *featuresList;
 
@@ -204,7 +208,7 @@ private:
 
 public:
     UBFeature trashElement;
-    UBFeature getParentFeatureForUrl( const QUrl &url );
+    UBFeature getDestinationFeatureForUrl( const QUrl &url );
 
 };
 

src/gui/UBFeaturesWidget.cpp

@@ -108,6 +108,9 @@ void UBFeaturesWidget::currentSelected(const QModelIndex &current)
         return;
     }
 
+    //Calling to reset the model for listView. Maybe separate function needed
+    controller->searchStarted("", mNavigator->listView());
+
     QString objName = sender()->objectName();
 
     if (objName.isEmpty()) {
@@ -357,6 +360,10 @@ QStringList UBFeaturesMimeData::formats() const
     return QMimeData::formats();
 }
 
+void UBFeaturesWidget::importImage(const QImage &image, const QString &fileName)
+{
+    controller->importImage(image, fileName);
+}
 
 UBFeaturesListView::UBFeaturesListView( QWidget* parent, const char* name ) 
 : QListView(parent)
@@ -862,6 +869,8 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
     Q_UNUSED(row)
 
     const UBFeaturesMimeData *fMimeData = qobject_cast<const UBFeaturesMimeData*>(mimeData);
+    UBFeaturesController *curController = qobject_cast<UBFeaturesController *>(QObject::parent());
+
     bool dataFromSameModel = false;
 
     if (fMimeData)
@@ -876,12 +885,12 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
 
     UBFeature parentFeature;
     if (!parent.isValid()) {
-		parentFeature = dynamic_cast<UBFeaturesWidget *>(QObject::parent())->getFeaturesController()->getCurrentElement();
+        parentFeature = curController->getCurrentElement();
     } else {
         parentFeature = parent.data( Qt::UserRole + 1).value<UBFeature>();
     }
 
-    if (mimeData->hasUrls()) {
+    if (dataFromSameModel) {
         QList<UBFeature> featList = fMimeData->features();
         for (int i = 0; i < featList.count(); i++) {
             UBFeature sourceElement;
@@ -890,10 +899,16 @@ bool UBFeaturesModel::dropMimeData(const QMimeData *mimeData, Qt::DropAction act
                 moveData(sourceElement, parentFeature, Qt::MoveAction);
             }
         }
+    } else if (mimeData->hasUrls()) {
+        QList<QUrl> urlList = mimeData->urls();
+        foreach (QUrl curUrl, urlList) {
+            qDebug() << "URl catched is " << curUrl.toLocalFile();
+            curController->moveExternalData(curUrl, parentFeature);
+        }
     } else if (mimeData->hasImage()) {
         QImage image = qvariant_cast<QImage>( mimeData->imageData() );
-        UBFeature element = dynamic_cast<UBFeaturesWidget *>(QObject::parent())->getFeaturesController()->importImage( image, parentFeature );
-        addItem( element );
+        curController->importImage( image, parentFeature );
+
     }
 
 	return true;
@@ -1019,7 +1034,7 @@ void UBFeaturesModel::moveData(const UBFeature &source, const UBFeature &destina
                         curFeature.setFullPath(newPath);
                     }
                 }
-                // processing copy or move action for real FS
+                // processing copy or move action for virtual FS
                 if (action == Qt::CopyAction) {
                     copyFeature.setFullVirtualPath(newVirtualPath);
                 } else {

src/gui/UBFeaturesWidget.h

@@ -56,6 +56,7 @@ public:
             || mode == eUBDockPaletteWidget_DESKTOP;
     }
     UBFeaturesController * getFeaturesController() const { return controller; }
+    void importImage(const QImage &image, const QString &fileName = QString());
 
 	static const int minThumbnailSize = 20;
 	static const int maxThumbnailSize = 100;