From 2cd408aa7fb265068d0ee04649f7c184f1c65b62 Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@sente.ch>
Date: Wed, 27 Jul 2011 14:11:16 +0200
Subject: [PATCH] shockwave-flash are stored in a new category called
 Animations. Those file are also automatically routed

---
 src/board/UBLibraryController.cpp | 17 +++++++++++++++--
 src/board/UBLibraryController.h   |  1 +
 src/core/UBSettings.cpp           |  9 +++++++++
 src/core/UBSettings.h             |  3 ++-
 src/gui/UBLibraryWidget.cpp       | 30 +++++++++++++++---------------
 5 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/src/board/UBLibraryController.cpp b/src/board/UBLibraryController.cpp
index ba603e3f..caa553bd 100644
--- a/src/board/UBLibraryController.cpp
+++ b/src/board/UBLibraryController.cpp
@@ -50,6 +50,8 @@ UBLibraryController::UBLibraryController(QWidget *pParentWidget, UBBoardControll
 
     mInteractiveUserDirectoryPath = QUrl::fromLocalFile(UBSettings::settings()->uniboardInteractiveUserDirectory());
 
+    mAnimationUserDirectoryPath = QUrl::fromLocalFile(UBSettings::settings()->animationUserDirectory());
+
     createInternalWidgetItems();
 
 }
@@ -103,8 +105,12 @@ void UBLibraryController::routeItem(QString& pItem, QString pMiddleDirectory)
         destination = mVideoStandardDirectoryPath.toLocalFile();
     else if (mimetype.contains("image"))
         destination = mPicturesStandardDirectoryPath.toLocalFile();
-    else if (mimetype.contains("application"))
-        destination = UBSettings::settings()->uniboardInteractiveUserDirectory();
+    else if (mimetype.contains("application")){
+        if (mimetype.contains("x-shockwave-flash"))
+            destination = mAnimationUserDirectoryPath.toLocalFile();
+        else
+            destination = mInteractiveUserDirectoryPath.toLocalFile();
+    }
     else{
         return;
     }
@@ -225,6 +231,13 @@ QList<UBLibElement*> UBLibraryController::rootCategoriesList()
     element->setMoveable(false);
     categories << element;
 
+    categoryImage = new QImage(":images/libpalette/InteractivesCategory.svg");
+    element = new UBLibElement(eUBLibElementType_Folder, mAnimationUserDirectoryPath, tr("Animations", "Animations category element"));
+    element->setThumbnail(categoryImage);
+    element->setMoveable(false);
+    categories << element;
+
+
 
     categories << UBLibElement::trashElement();
 
diff --git a/src/board/UBLibraryController.h b/src/board/UBLibraryController.h
index 25539234..8ddab8ad 100644
--- a/src/board/UBLibraryController.h
+++ b/src/board/UBLibraryController.h
@@ -139,6 +139,7 @@ class UBLibraryController : public QObject
         QUrl mPicturesStandardDirectoryPath;
         QUrl mInteractiveUserDirectoryPath;
         QUrl mInteractiveCategoryPath;
+        QUrl mAnimationUserDirectoryPath;
 
         QStringList addItemsToCurrentLibrary(const QDir& pSelectedFolder, const QStringList& pExtensions);
 
diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp
index 3707e997..02e16a3c 100644
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
@@ -1052,6 +1052,15 @@ QString UBSettings::uniboardDefaultUserImageLibraryDirectory()
 }
 
 
+QString UBSettings::animationUserDirectory()
+{
+    QString animationDirectory = uniboardDataDirectory() + "/animationUserDirectory";
+    if (!QDir(animationDirectory).exists())
+        QDir().mkpath(animationDirectory);
+
+    return animationDirectory;
+}
+
 QString UBSettings::uniboardInteractiveUserDirectory()
 {
     QString valideUserInteractiveDirectory = uniboardDataDirectory() + "/interactive content";
diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h
index 08748383..05c39d5e 100644
--- a/src/core/UBSettings.h
+++ b/src/core/UBSettings.h
@@ -112,9 +112,10 @@ class UBSettings : public QObject
         QString uniboardDefaultUserImageLibraryDirectory();
 
         QString uniboardInteractiveUserDirectory();
+        QString animationUserDirectory();
         QString uniboardInteractiveLibraryDirectory();
         QString uniboardInteractiveFavoritesDirectory();
-	QString sankoreDistributedInteractiveDirectory();
+        QString sankoreDistributedInteractiveDirectory();
 
         QString podcastRecordingDirectory();
 
diff --git a/src/gui/UBLibraryWidget.cpp b/src/gui/UBLibraryWidget.cpp
index cf44f3cf..069b3637 100644
--- a/src/gui/UBLibraryWidget.cpp
+++ b/src/gui/UBLibraryWidget.cpp
@@ -32,21 +32,21 @@ UBLibraryWidget::UBLibraryWidget(QWidget *parent, const char *name):UBThumbnailW
  */
 UBLibraryWidget::~UBLibraryWidget()
 {
-    //if(NULL != chainedElements)
-    //{
-    //    delete chainedElements;
-    //    chainedElements = NULL;
-    //}
-    //if(NULL != mpCrntDir)
-    //{
-    //    delete mpCrntDir;
-    //    mpCrntDir = NULL;
-    //}
-    //if(NULL != mpCrntElem)
-    //{
-    //    delete mpCrntElem;
-    //    mpCrntElem = NULL;
-    //}
+//     if(NULL != chainedElements)
+//     {
+//        delete chainedElements;
+//        chainedElements = NULL;
+//     }
+//     if(NULL != mpCrntDir)
+//     {
+//        delete mpCrntDir;
+//        mpCrntDir = NULL;
+//     }
+//     if(NULL != mpCrntElem)
+//     {
+//        delete mpCrntElem;
+//        mpCrntElem = NULL;
+//     }
 }
 
 /**