Merge lp:~bfiller/gallery-app/multiple-bug-fixes into lp:gallery-app

[Bill Filler]

multiple gallery-app bug fixes Bug #907870: [desktop] Gallery does not display photos in sub folders, Bug #1221968: use libthumbnailer for gallery thumbnails, Bug #1268748: videos are not displayed when running on desktop, Bug #1271327: disable switching between camera and gallery on desktop, Bug #1287272: Black flash at the end of the zoom animation"

[MERGE] lp:~amanzi-team/gallery-app/gallery-app-sdk-thumbnailer
Use the SDK thumbnailer to generate thumbnails instead of the custom internal one

[MERGE] lp:~artmello/gallery-app/display_photos_in_sub_folders/
Add support for monitoring media on sub folders of the target ones.

[MERGE] lp:~artmello/gallery-app/switching_to_camera
Disable Camera Button on every view when on Desktop Mode

[MERGE] lp:~artmello/gallery-app/gallery-app-not_display_video
Fix the check if a file is a video or a photo

[MERGE] lp:~artmello/gallery-app/gallery-app-overlay_video_icon
Add play icon if thumbnail is from video

[MERGE] lp:~amanzi-team/gallery-app/gallery-app-black-flash-zoom
Prevent a black flash at the end of the zoom animation by ensuring the transition image isn't hidden until the final one has fully loaded.

Remove gstreamer deps

To prevent issues while rotating one image the following branch should be used:
lp:~jpakkane/thumbnailer/manual-orient

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:927
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/687/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/113
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3758
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3346/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3304
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3766
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3766/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3348
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3348/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5717/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4589

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/687/rebuild

review: Needs Fixing (continuous-integration)

[lp:~bfiller/gallery-app/multiple-bug-fixes]

929. By Bill Filler on 2014-03-07

fixes lp:907870

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:928
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/688/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3761
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3349
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3307
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3769
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3769/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3351
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3351/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5720
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4593

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/688/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:929
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/689/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/115
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3762
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3350
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/3308
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3770
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3770/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3352
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3352/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5721
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/4594

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/689/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:929
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/706/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-amd64-ci/131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-armhf-ci/132/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-trusty-i386-ci/131/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3942/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/3527/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3975/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/3529/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/gallery-app-ci/706/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-11 21:58:24 +0000
+++ CMakeLists.txt	2014-03-07 20:39:27 +0000
@@ -41,7 +41,6 @@
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(CONTENTHUB REQUIRED libcontent-hub)
 pkg_check_modules(EXIV2 REQUIRED exiv2)
-pkg_check_modules(GSTLIB REQUIRED gstreamer-0.10)
 pkg_check_modules(MEDIAINFO REQUIRED libmediainfo)
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
 
=== modified file 'debian/control'
--- debian/control	2014-01-14 08:01:56 +0000
+++ debian/control	2014-03-07 20:39:27 +0000
@@ -7,7 +7,6 @@
                pkg-config,
                dh-translations,
                libcontent-hub-dev (>= 0.0+13.10.20130930.1),
-               libgstreamer0.10-dev,
                libexiv2-dev,
                libgl1-mesa-dev | libgl-dev,
                libgles2-mesa-dev,
@@ -30,8 +29,6 @@
 Conflicts: ubuntu-gallery
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         gstreamer0.10-plugins-base,
-         gstreamer0.10-plugins-good,
          qtdeclarative5-accounts-plugin,
          libqt5sql5-sqlite,
          qtdeclarative5-qtquick2-plugin,
 
=== modified file 'rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml'
--- rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml	2013-04-08 14:55:34 +0000
+++ rc/qml/AlbumViewer/AlbumInternals/FramePortrait.qml	2014-03-07 20:39:27 +0000
@@ -18,6 +18,7 @@
  */
 
 import QtQuick 2.0
+import Gallery 1.0
 import "../../../js/Gallery.js" as Gallery
 
 /*!
@@ -45,6 +46,15 @@
         visible: fullImage.opacity < 1
         source: load && mediaSource ? mediaSource.galleryPreviewPath : ""
         fillMode: fullImage.fillMode
+
+        Connections {
+            target: mediaSource ? mediaSource : null
+            onDataChanged: {
+                // data changed but filename didn't, so we need to bypass the qml image
+                // cache by tacking a timestamp to the filename so sees it as different.
+                preview.source = mediaSource.galleryPreviewPath + "?at=" + Date.now()
+            }
+        }
     }
     Image {
         id: fullImage
@@ -62,4 +72,10 @@
             NumberAnimation { duration: Gallery.SNAP_DURATION }
         }
     }
+    Image {
+        // Display a play icon if the thumbnail is from a video
+        source: "../../../img/icon_play.png"
+        anchors.centerIn: parent
+        visible: isLoaded && mediaSource.type === MediaSource.Video
+    }
 }
 
=== modified file 'rc/qml/AlbumsOverview.qml'
--- rc/qml/AlbumsOverview.qml	2014-02-11 21:03:40 +0000
+++ rc/qml/AlbumsOverview.qml	2014-03-07 20:39:27 +0000
@@ -199,6 +199,7 @@
         }
         ToolbarButton {
             objectName: "cameraButton"
+            visible: !APP.desktopMode
             action: Action {
                 text: i18n.tr("Camera")
                 iconSource: Qt.resolvedUrl("../img/camera.png")
 
=== modified file 'rc/qml/Components/MediaGrid.qml'
--- rc/qml/Components/MediaGrid.qml	2013-06-26 08:59:08 +0000
+++ rc/qml/Components/MediaGrid.qml	2014-03-07 20:39:27 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import Gallery 1.0
 import "../OrganicView"
 import "../Utility"
 import "../../js/Gallery.js" as Gallery
@@ -80,8 +81,26 @@
             radius: "medium"
 
             image: Image {
+                id: thumbImage
                 source: mediaSource.galleryThumbnailPath
                 asynchronous: true
+                fillMode: Image.PreserveAspectCrop
+
+                Connections {
+                    target: mediaSource
+                    onDataChanged: {
+                        // data changed but filename didn't, so we need to bypass the qml image
+                        // cache by tacking a timestamp to the filename so sees it as different.
+                        thumbImage.source = mediaSource.galleryThumbnailPath + "?at=" + Date.now()
+                    }
+                }
+            }
+
+            Image {
+                // Display a play icon if the thumbnail is from a video
+                source: "../../img/icon_play.png"
+                anchors.centerIn: parent
+                visible: mediaSource.type === MediaSource.Video
             }
 
             OrganicItemInteraction {
 
=== modified file 'rc/qml/MediaViewer/PhotoViewerDelegate.qml'
--- rc/qml/MediaViewer/PhotoViewerDelegate.qml	2014-02-04 16:53:39 +0000
+++ rc/qml/MediaViewer/PhotoViewerDelegate.qml	2014-03-07 20:39:27 +0000
@@ -56,6 +56,15 @@
         fullPhotoComponentLoader.item.unzoom();
     }
 
+    Connections {
+        target: mediaSource
+        onDataChanged: {
+            // Force the image to be reloaded, to pick up the new thumbnail
+            interactivePreviewImage.active = false;
+            interactivePreviewImage.active = true;
+        }
+    }
+
     // Note that we haven't defined a state set in this component, even though
     // we bind the "state" property here. This is intentional and is necessary
     // to work around a binding issue on Qt 5.0 beta 1. Given a later version
@@ -63,19 +72,23 @@
     state: (fullPhotoComponentLoader.item &&
             !fullPhotoComponentLoader.item.fullyUnzoomed) ? "zoomed" :
                                                             "unzoomed";
-
-    Image {
+    Component {
+        id: interactivePreviewImageSource
+        Image {
+            fillMode: Image.PreserveAspectFit
+
+            source: mediaSource ? mediaSource.galleryPreviewPath : ""
+            cache: false
+        }
+    }
+
+    Loader {
         id: interactivePreviewImage
-
         z: 0
-
         anchors.fill: parent
 
         visible: photoViewerDelegate.state == "unzoomed"
-
-        fillMode: Image.PreserveAspectFit
-
-        source: mediaSource ? mediaSource.galleryPreviewPath : ""
+        sourceComponent: interactivePreviewImageSource
     }
 
     Loader {
 
=== modified file 'rc/qml/MediaViewer/ZoomablePhotoComponent.qml'
--- rc/qml/MediaViewer/ZoomablePhotoComponent.qml	2013-06-14 09:02:15 +0000
+++ rc/qml/MediaViewer/ZoomablePhotoComponent.qml	2014-03-07 20:39:27 +0000
@@ -389,7 +389,8 @@
                     transformOrigin: Item.TopLeft
 
                     visible: zoomablePhotoComponent.isZoomAnimationInProgress ||
-                             zoomablePhotoComponent.state == "pinching"
+                             zoomablePhotoComponent.state == "pinching" ||
+                             !zoomedPhoto.isLoaded
 
                     color: zoomablePhotoComponent.color
 
 
=== modified file 'rc/qml/OrganicView/OrganicMediaList.qml'
--- rc/qml/OrganicView/OrganicMediaList.qml	2013-06-26 13:46:56 +0000
+++ rc/qml/OrganicView/OrganicMediaList.qml	2014-03-07 20:39:27 +0000
@@ -161,8 +161,32 @@
                 radius: "medium"
 
                 image: Image {
+                    id: thumbImage
                     source: model.mediaSource.galleryThumbnailPath
                     asynchronous: true
+
+                    /* The SDK thumbnailer respects the freedesktop.org standard and uses 128 for the small
+                     * thumbnail size, while the previous thumbnailer used 216. To maintain the same visual
+                     * result as the previous thumbnailer, we force it to generate a large thumbnail, which
+                     * is closer to the older one in size and looks identical when downscaled */
+                    sourceSize.width: 256
+                    fillMode: Image.PreserveAspectCrop
+                }
+
+                Connections {
+                    target: model.mediaSource
+                    onDataChanged: {
+                        // data changed but filename didn't, so we need to bypass the qml image
+                        // cache by tacking a timestamp to the filename so sees it as different.
+                        thumbImage.source = model.mediaSource.galleryThumbnailPath + "?at=" + Date.now()
+                    }
+                }
+
+                Image {
+                    // Display a play icon if the thumbnail is from a video
+                    source: "../../img/icon_play.png"
+                    anchors.centerIn: parent
+                    visible: mediaSource.type === MediaSource.Video
                 }
 
                 OrganicItemInteraction {
 
=== modified file 'rc/qml/Utility/PhotosToolbarActions.qml'
--- rc/qml/Utility/PhotosToolbarActions.qml	2014-01-10 17:48:56 +0000
+++ rc/qml/Utility/PhotosToolbarActions.qml	2014-03-07 20:39:27 +0000
@@ -44,6 +44,7 @@
     ToolbarButton {
         objectName: "cameraButton"
         text: i18n.tr("Camera")
+        visible: !APP.desktopMode
         iconSource: Qt.resolvedUrl("../../img/camera.png")
         onTriggered: Qt.openUrlExternally("appid://com.ubuntu.camera/camera/current-user-version")
     }
 
=== modified file 'src/album/CMakeLists.txt'
--- src/album/CMakeLists.txt	2013-08-15 06:40:15 +0000
+++ src/album/CMakeLists.txt	2014-03-07 20:39:27 +0000
@@ -36,3 +36,6 @@
 
 qt5_use_modules(${GALLERY_ALBUM_LIB} Widgets Core Qml)
 
+target_link_libraries( ${GALLERY_ALBUM_LIB}
+    gallery-core
+    )
 
=== modified file 'src/gallery-application.cpp'
--- src/gallery-application.cpp	2014-02-20 17:53:20 +0000
+++ src/gallery-application.cpp	2014-03-07 20:39:27 +0000
@@ -38,7 +38,6 @@
 
 // qml
 #include "gallery-standard-image-provider.h"
-#include "gallery-thumbnail-image-provider.h"
 #include "qml-album-collection-model.h"
 #include "qml-event-collection-model.h"
 #include "qml-event-overview-model.h"
@@ -143,7 +142,7 @@
  */
 bool GalleryApplication::isDesktopMode() const
 {
-  return (qEnvironmentVariableIsSet("DESKTOP_MODE") && (qgetenv("DESKTOP_MODE") == "1"));
+    return(qEnvironmentVariableIsSet("DESKTOP_MODE") && (qgetenv("DESKTOP_MODE") == "1"));
 }
 
 /*!
@@ -169,7 +168,7 @@
         size.transpose();
 
     m_view->setResizeMode(QQuickView::SizeRootObjectToView);
-    if (m_cmdLineParser->formFactor() == "desktop" || isDesktopMode()) {
+    if (isDesktopMode()) {
         m_view->setMinimumSize(QSize(60 * m_bguSize, 60 * m_bguSize));
     }
 
@@ -213,8 +212,6 @@
     m_galleryManager->postInit();
     m_view->engine()->addImageProvider(GalleryStandardImageProvider::PROVIDER_ID,
                                        m_galleryManager->takeGalleryStandardImageProvider());
-    m_view->engine()->addImageProvider(GalleryThumbnailImageProvider::PROVIDER_ID,
-                                       m_galleryManager->takeGalleryThumbnailImageProvider());
 
     QApplication::processEvents();
     if (m_cmdLineParser->startupTimer())
 
=== modified file 'src/gallery-manager.cpp'
--- src/gallery-manager.cpp	2013-09-06 16:10:25 +0000
+++ src/gallery-manager.cpp	2014-03-07 20:39:27 +0000
@@ -35,11 +35,9 @@
 // media
 #include "media-collection.h"
 #include "media-monitor.h"
-#include "preview-manager.h"
 
 // qml
 #include "gallery-standard-image-provider.h"
-#include "gallery-thumbnail-image-provider.h"
 #include "qml-media-collection-model.h"
 
 // util
@@ -63,13 +61,11 @@
     : collectionsInitialised(false),
       m_resource(new Resource(picturesDir, view)),
       m_standardImageProvider(new GalleryStandardImageProvider()),
-      m_thumbnailImageProvider(new GalleryThumbnailImageProvider()),
       m_database(0),
       m_defaultTemplate(0),
       m_mediaCollection(0),
       m_albumCollection(0),
       m_eventCollection(0),
-      m_previewManager(0),
       m_monitor(0),
       m_mediaLibrary(0)
 {
@@ -94,9 +90,7 @@
     delete m_defaultTemplate;
     delete m_resource;
     delete m_mediaCollection;
-    delete m_previewManager;
     delete m_standardImageProvider;
-    delete m_thumbnailImageProvider;
 }
 
 /*!
@@ -145,7 +139,6 @@
         m_defaultTemplate = new AlbumDefaultTemplate();
         m_mediaCollection = new MediaCollection(m_database->getMediaTable());
 
-        initPreviewManager();
         fillMediaCollection();
         startFileMonitoring();
 
@@ -219,41 +212,6 @@
 void GalleryManager::logImageLoading(bool log)
 {
     m_standardImageProvider->setLogging(log);
-    m_thumbnailImageProvider->setLogging(log);
-}
-
-/*!
- * \brief GalleryManager::initPreviewManager creates the PreviewManager,
- * assigns it to all needed objects and creates all signal slot connection.
- */
-void GalleryManager::initPreviewManager()
-{
-    Q_ASSERT(m_resource);
-    Q_ASSERT(m_mediaCollection);
-    Q_ASSERT(m_standardImageProvider);
-    Q_ASSERT(m_thumbnailImageProvider);
-
-    if (m_previewManager)
-        return;
-
-    m_previewManager = new PreviewManager(m_resource->thumbnailDirectory());
-
-    m_standardImageProvider->setPreviewManager(m_previewManager);
-    m_thumbnailImageProvider->setPreviewManager(m_previewManager);
-
-    // Monitor MediaCollection for all new MediaSources
-    QObject::connect(m_mediaCollection,
-                     SIGNAL(contentsChanged(const QSet<DataObject*>*,const QSet<DataObject*>*)),
-                     m_previewManager,
-                     SLOT(onMediaAddedRemoved(const QSet<DataObject*>*,const QSet<DataObject*>*)));
-
-    QObject::connect(m_mediaCollection,
-                     SIGNAL(destroying(const QSet<DataObject*>*)),
-                     m_previewManager,
-                     SLOT(onMediaDestroying(const QSet<DataObject*>*)));
-
-    // Verify previews for all existing added MediaSources
-    m_previewManager->onMediaAddedRemoved(&m_mediaCollection->getAsSet(), NULL);
 }
 
 /*!
@@ -324,14 +282,3 @@
     m_standardImageProvider = 0;
     return provider;
 }
-
-/*!
- * \brief GalleryManager::takeGalleryThumbnailImageProvider returns the thumbnail image provider
- * and gives up the owndership 
- */
-GalleryThumbnailImageProvider* GalleryManager::takeGalleryThumbnailImageProvider()
-{
-    GalleryThumbnailImageProvider *provider = m_thumbnailImageProvider;
-    m_thumbnailImageProvider = 0;
-    return provider;
-}
 
=== modified file 'src/gallery-manager.h'
--- src/gallery-manager.h	2013-09-06 16:10:25 +0000
+++ src/gallery-manager.h	2014-03-07 20:39:27 +0000
@@ -36,11 +36,9 @@
 class EventCollection;
 class GalleryManager;
 class GalleryStandardImageProvider;
-class GalleryThumbnailImageProvider;
 class MediaCollection;
 class MediaMonitor;
 class MediaObjectFactory;
-class PreviewManager;
 class QmlMediaCollectionModel;
 class Resource;
 
@@ -68,7 +66,6 @@
     EventCollection *eventCollection();
     Resource *resource() { return m_resource; }
     GalleryStandardImageProvider *takeGalleryStandardImageProvider();
-    GalleryThumbnailImageProvider *takeGalleryThumbnailImageProvider();
 
     void logImageLoading(bool log);
 
@@ -85,7 +82,6 @@
     GalleryManager(const GalleryManager&);
     void operator=(const GalleryManager&);
 
-    void initPreviewManager();
     void fillMediaCollection();
     void startFileMonitoring();
 
@@ -95,13 +91,11 @@
 
     Resource* m_resource;
     GalleryStandardImageProvider* m_standardImageProvider;
-    GalleryThumbnailImageProvider* m_thumbnailImageProvider;
     Database* m_database;
     AlbumDefaultTemplate* m_defaultTemplate;
     MediaCollection* m_mediaCollection;
     AlbumCollection* m_albumCollection;
     EventCollection* m_eventCollection;
-    PreviewManager* m_previewManager;
     MediaObjectFactory *m_mediaFactory;
     MediaMonitor *m_monitor;
 
 
=== modified file 'src/media/media-monitor.cpp'
--- src/media/media-monitor.cpp	2013-08-09 15:13:08 +0000
+++ src/media/media-monitor.cpp	2014-03-07 20:39:27 +0000
@@ -135,15 +135,50 @@
 }
 
 /*!
+ * \brief MediaMonitor::expandSubDirectories List all sub directories under
+ * the base one. Use it to add to watch list
+ * \param dirPath
+ */
+QStringList MediaMonitorWorker::expandSubDirectories(const QString& dirPath)
+{
+    QStack<QString> dirStack;
+    dirStack.push(dirPath);
+
+    QStringList dirList;
+    while(!dirStack.isEmpty()) {
+        QDir dir(dirStack.pop());
+        dirList.append(dir.absolutePath());
+
+        foreach(const QFileInfo &info, dir.entryInfoList(QDir::NoDotAndDotDot | QDir::AllDirs)) {
+            QString path(info.absoluteFilePath());
+            if (info.isSymLink() && info.exists()) {
+                // If it's a SymLink and points to a valid target need to get the target path
+                path = info.symLinkTarget();
+            }
+            if(!dirList.contains(path)) {
+                // In case we already visited the folder we didn't expand it anymore
+                dirStack.push(path);
+            }
+        }
+    }
+
+    return dirList;
+}
+
+/*!
  * \brief MediaMonitor::startMonitoring
  * \param targetDirectories
  */
 void MediaMonitorWorker::startMonitoring(const QStringList &targetDirectories)
 {
     QStringList newDirectories;
-    foreach (const QString& dir, targetDirectories) {
-        if (!m_targetDirectories.contains(dir))
-            newDirectories.append(dir);
+    foreach (const QString& dirPath, targetDirectories) {
+        foreach (const QString& d, expandSubDirectories(dirPath)) {
+            // Add all sub folders from target directory on watch list
+            if (!m_targetDirectories.contains(d)) {
+                newDirectories.append(d);
+            }
+        }
     }
     m_targetDirectories += newDirectories;
     m_manifest = getManifest(m_targetDirectories);
 
=== modified file 'src/media/media-monitor.h'
--- src/media/media-monitor.h	2013-07-05 08:12:31 +0000
+++ src/media/media-monitor.h	2014-03-07 20:39:27 +0000
@@ -75,6 +75,7 @@
 
 public slots:
     void startMonitoring(const QStringList& targetDirectories);
+    QStringList expandSubDirectories(const QString& dirPath);
     void checkConsitency();
 
 signals:
 
=== modified file 'src/media/media-source.cpp'
--- src/media/media-source.cpp	2013-08-16 12:55:55 +0000
+++ src/media/media-source.cpp	2014-03-07 20:39:27 +0000
@@ -25,7 +25,8 @@
 
 // qml
 #include "gallery-standard-image-provider.h"
-#include "gallery-thumbnail-image-provider.h"
+
+#include <QUrl>
 
 /*!
  * \brief MediaSource::MediaSource
@@ -84,7 +85,17 @@
  */
 QUrl MediaSource::galleryPath() const
 {
-    return GalleryStandardImageProvider::toURL(m_file);
+    /* At the moment the only video files we recognize are mp4
+     * files. This was maintained hardcoded from the previous
+     * version of gallery app, and should be fixed in the future.
+     * For those files the full image is the thumbnail/preview itself */
+    if (m_file.suffix().toLower() == "mp4") {
+        QString path("image://thumbnailer/");
+        path.append(m_file.absoluteFilePath());
+        return QUrl(path);
+    } else {
+        return GalleryStandardImageProvider::toURL(m_file);
+    }
 }
 
 /*!
@@ -93,7 +104,9 @@
  */
 QUrl MediaSource::galleryPreviewPath() const
 {
-    return GalleryStandardImageProvider::toURL(m_file);
+    QString path("image://thumbnailer/");
+    path.append(m_file.absoluteFilePath());
+    return QUrl(path);
 }
 
 /*!
@@ -102,7 +115,9 @@
  */
 QUrl MediaSource::galleryThumbnailPath() const
 {
-    return GalleryThumbnailImageProvider::toURL(m_file);
+    QString path("image://thumbnailer/");
+    path.append(m_file.absoluteFilePath());
+    return QUrl(path);
 }
 
 /*!
 
=== modified file 'src/medialoader/CMakeLists.txt'
--- src/medialoader/CMakeLists.txt	2013-08-19 06:45:36 +0000
+++ src/medialoader/CMakeLists.txt	2014-03-07 20:39:27 +0000
@@ -16,17 +16,13 @@
 
 set(gallery_medialoader_HDRS
     gallery-standard-image-provider.h
-    gallery-thumbnail-image-provider.h
     photo-metadata.h
-    preview-manager.h
     video-metadata.h
     )
 
 set(gallery_medialoader_SRCS
     gallery-standard-image-provider.cpp
-    gallery-thumbnail-image-provider.cpp
     photo-metadata.cpp
-    preview-manager.cpp
     video-metadata.cpp
     )
 
@@ -43,4 +39,5 @@
     ${EXIV2_LIBRARIES}
     ${GSTLIB_LDFLAGS}
     ${MEDIAINFO_LIBRARIES}
+    gallery-util
     )
 
=== modified file 'src/medialoader/gallery-standard-image-provider.cpp'
--- src/medialoader/gallery-standard-image-provider.cpp	2013-08-12 08:51:09 +0000
+++ src/medialoader/gallery-standard-image-provider.cpp	2014-03-07 20:39:27 +0000
@@ -20,7 +20,6 @@
 
 #include "gallery-standard-image-provider.h"
 #include "photo-metadata.h"
-#include "preview-manager.h"
 
 #include <QDebug>
 #include <QElapsedTimer>
@@ -38,9 +37,7 @@
 
 const long MAX_CACHE_BYTES = 20L * 1024L * 1024L;
 
-// fully load previews into memory when requested
-const int SCALED_LOAD_FLOOR_DIM_PIXELS =
-        qMax(PreviewManager::PREVIEW_SIZE, PreviewManager::PREVIEW_SIZE);
+const int SCALED_LOAD_FLOOR_DIM_PIXELS = 360;
 
 /*!
  * \brief GalleryStandardImageProvider::GalleryStandardImageProvider
@@ -48,7 +45,6 @@
 GalleryStandardImageProvider::GalleryStandardImageProvider()
     : QQuickImageProvider(QQuickImageProvider::Image),
       m_cachedBytes(0),
-      m_previewManager(0),
       m_logImageLoading(false),
       m_maxLoadResolution(INT_MAX)
 {
@@ -89,11 +85,6 @@
 QImage GalleryStandardImageProvider::requestImage(const QString& id,
                                                   QSize* size, const QSize& requestedSize)
 {
-    if (!m_previewManager) {
-        qWarning() << Q_FUNC_INFO << "no PreviewManager set";
-        return QImage();
-    }
-
     // for LOG_IMAGE_STATUS
     QString loggingStr = "";
     QElapsedTimer timer;
@@ -101,26 +92,21 @@
 
     QUrl url(id);
     QFileInfo photoFile(url.path());
-    m_previewManager->ensurePreview(photoFile);
 
     QImage readyImage;
     uint bytesLoaded = 0;
     long currentCachedBytes = 0;
     int currentCacheEntries = 0;
 
-    if (photoFile.suffix().compare("mp4", Qt::CaseInsensitive) == 0) {
-        readyImage = QImage(m_previewManager->previewFileName(photoFile.absoluteFilePath()));
-    } else {
-        CachedImage* cachedImage = claimCachedImageEntry(id, loggingStr);
-        Q_ASSERT(cachedImage != NULL);
-
-        readyImage = fetchCachedImage(cachedImage, requestedSize, &bytesLoaded,
-                                               loggingStr);
-        if (readyImage.isNull())
-            LOG_IMAGE_STATUS("load-failure ");
-
-        releaseCachedImageEntry(cachedImage, bytesLoaded, &currentCachedBytes, &currentCacheEntries);
-    }
+    CachedImage* cachedImage = claimCachedImageEntry(id, loggingStr);
+    Q_ASSERT(cachedImage != NULL);
+
+    readyImage = fetchCachedImage(cachedImage, requestedSize, &bytesLoaded,
+                                           loggingStr);
+    if (readyImage.isNull())
+        LOG_IMAGE_STATUS("load-failure ");
+
+    releaseCachedImageEntry(cachedImage, bytesLoaded, &currentCachedBytes, &currentCacheEntries);
 
     if (m_logImageLoading) {
         if (bytesLoaded > 0) {
@@ -142,15 +128,6 @@
 }
 
 /*!
- * \brief GalleryStandardImageProvider::setPreviewManager
- * \param previewManager
- */
-void GalleryStandardImageProvider::setPreviewManager(PreviewManager *previewManager)
-{
-    m_previewManager = previewManager;
-}
-
-/*!
  * \brief GalleryStandardImageProvider::setLogging enables to print photo loading
  * times to stout
  * \param enableLogging
@@ -414,30 +391,15 @@
  */
 QString GalleryStandardImageProvider::idToFile(const QString& id) const
 {
-    if (!m_previewManager) {
-        qWarning() << Q_FUNC_INFO << "no PreviewManager set";
-        return QString();
-    }
-
     QUrl url = QUrl(id);
     QString fileName = url.path();
-
-    //Get our item value from our query by it's key.
-    QUrlQuery url_query(url);
-    url_query.hasQueryItem(GalleryStandardImageProvider::SIZE_KEY);
-    QString value = url_query.queryItemValue(GalleryStandardImageProvider::SIZE_KEY);
-
-    if (value == "1") {
-        fileName = m_previewManager->previewFileName(fileName);
-    }
-
     return fileName;
 }
 
 /*!
  * \brief GalleryStandardImageProvider::CachedImage::CachedImage
  * \param id the full URI of the image
- * \param fileName the filename for the URI (can be the file itself or the preview)
+ * \param fileName the filename for the URI (the file itself)
  */
 GalleryStandardImageProvider::CachedImage::CachedImage(const QString& fileId,
                                                        const QString& filename)
 
=== modified file 'src/medialoader/gallery-standard-image-provider.h'
--- src/medialoader/gallery-standard-image-provider.h	2013-06-10 10:59:47 +0000
+++ src/medialoader/gallery-standard-image-provider.h	2014-03-07 20:39:27 +0000
@@ -34,8 +34,6 @@
 #include <QString>
 #include <QUrl>
 
-class PreviewManager;
-
 /*!
  * Gallery uses a custom image provider for three reasons:
  *
@@ -73,7 +71,6 @@
     virtual QImage requestImage(const QString& id, QSize* size,
                                 const QSize& requestedSize);
 
-    void setPreviewManager(PreviewManager* previewManager);
     void setLogging(bool enableLogging);
     void setMaxLoadResolution(int resolution);
 
@@ -109,7 +106,6 @@
     QList<QString> m_fifo;
     QMutex m_cacheMutex;
     long m_cachedBytes;
-    PreviewManager* m_previewManager;
     bool m_logImageLoading;
     int m_maxLoadResolution;
 
 
=== removed file 'src/medialoader/gallery-thumbnail-image-provider.cpp'
--- src/medialoader/gallery-thumbnail-image-provider.cpp	2013-06-10 06:20:05 +0000
+++ src/medialoader/gallery-thumbnail-image-provider.cpp	1970-01-01 00:00:00 +0000
@@ -1,102 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Guenter Schwann <[e-mail]>
-*/
-
-#include "gallery-thumbnail-image-provider.h"
-
-// media
-#include "preview-manager.h"
-
-#include <QDebug>
-#include <QElapsedTimer>
-
-const char* GalleryThumbnailImageProvider::PROVIDER_ID = "gallery-thumbnail";
-const char* GalleryThumbnailImageProvider::PROVIDER_ID_SCHEME = "image://gallery-thumbnail/";
-const char* GalleryThumbnailImageProvider::REVISION_PARAM_NAME = "edit";
-
-/*!
- * @brief GalleryThumbnailImageProvider::GalleryThumbnailImageProvider
- */
-GalleryThumbnailImageProvider::GalleryThumbnailImageProvider()
-    : QQuickImageProvider(QQuickImageProvider::Image),
-      m_previewManager(0),
-      m_logImageLoading(false)
-{
-}
-
-/*!
- * \brief GalleryThumbnailImageProvider::toURL return the URL to this image provider for a local file
- * \param file is the file that you want the url for
- * \return URL to be used to load a local image usign this image provider
- */
-QUrl GalleryThumbnailImageProvider::toURL(const QFileInfo &file)
-{
-    return QUrl::fromUserInput(PROVIDER_ID_SCHEME + file.absoluteFilePath());
-}
-
-/*!
- * @brief GalleryThumbnailImageProvider::requestImage @reimp of QQuickImageProvider::requestImage
- * @param id is the requested image source
- * @param size must be set to the original size of the image
- * @param requestedSize is not used here, as thumbnails have a fixed size
- * @return the image with id
- */
-QImage GalleryThumbnailImageProvider::requestImage(const QString &id, QSize *size,
-                                                   const QSize &requestedSize)
-{
-    Q_UNUSED(requestedSize);
-
-    if (!m_previewManager) {
-        qWarning() << Q_FUNC_INFO << "no PreviewManager set";
-        return QImage();
-    }
-
-    QElapsedTimer timer;
-    timer.start();
-
-    QUrl url(id);
-    QFileInfo photoFile(url.path());
-    m_previewManager->ensurePreview(photoFile);
-
-    QString fileName = m_previewManager->thumbnailFileName(photoFile);
-
-    QImage thumbnail;
-    thumbnail.load(fileName);
-    if (thumbnail.isNull()) {
-        qWarning() << "Could not load thumbnail:" << id;
-    }
-
-    if (size != NULL)
-        *size = thumbnail.size();
-
-    if (m_logImageLoading) {
-        qDebug() << id << thumbnail.size() << "time:" << timer.elapsed() << "ms";
-    }
-
-    return thumbnail;
-}
-
-void GalleryThumbnailImageProvider::setPreviewManager(PreviewManager *previewManager)
-{
-    m_previewManager = previewManager;
-}
-
-void GalleryThumbnailImageProvider::setLogging(bool enableLogging)
-{
-    m_logImageLoading = enableLogging;
-}
 
=== removed file 'src/medialoader/gallery-thumbnail-image-provider.h'
--- src/medialoader/gallery-thumbnail-image-provider.h	2013-06-10 06:20:05 +0000
+++ src/medialoader/gallery-thumbnail-image-provider.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Guenter Schwann <[e-mail]>
-*/
-
-#ifndef GALLERYTHUMBNAILIMAGEPROVIDER_H
-#define GALLERYTHUMBNAILIMAGEPROVIDER_H
-
-#include <QFileInfo>
-#include <QQuickImageProvider>
-#include <QSize>
-#include <QString>
-
-class PreviewManager;
-
-/*!
- * @brief The GalleryThumbailImageProvider class is used to load the small square thumbnails
- *
- * An extra image provider is used, so the image can be updated by adding parameters to the URL,
- * to update the image. As for local URL, no parameters are used (internally).
- * In future it might be used for more functionality, like custom caching of images.
- */
-class GalleryThumbnailImageProvider : public QQuickImageProvider
-{
-public:
-    static const char* PROVIDER_ID;
-    static const char* PROVIDER_ID_SCHEME;
-    static const char* REVISION_PARAM_NAME;
-
-    GalleryThumbnailImageProvider();
-
-    static QUrl toURL(const QFileInfo& file);
-
-    virtual QImage requestImage(const QString& id, QSize* size,
-                                const QSize& requestedSize);
-
-    void setPreviewManager(PreviewManager* previewManager);
-    void setLogging(bool enableLogging);
-
-private:
-    PreviewManager* m_previewManager;
-    bool m_logImageLoading;
-};
-
-#endif // GALLERYTHUMBNAILIMAGEPROVIDER_H
 
=== removed file 'src/medialoader/preview-manager.cpp'
--- src/medialoader/preview-manager.cpp	2013-09-04 14:39:39 +0000
+++ src/medialoader/preview-manager.cpp	1970-01-01 00:00:00 +0000
@@ -1,423 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Jim Nelson <[e-mail]>
- */
-
-#include "preview-manager.h"
-#include "photo-metadata.h"
-#include "video-metadata.h"
-
-// media
-#include "media-source.h"
-
-#include <QCryptographicHash>
-#include <QDir>
-#include <QImageReader>
-#include <QMutexLocker>
-
-#include <gst/gst.h>
-
-// FIXME adapt to different sizes. This is fixed size for the demo device
-const int PreviewManager::PREVIEW_SIZE = 360; // in pixel
-const int PreviewManager::THUMBNAIL_SIZE = 216; // in pixel
-const int PreviewManager::PREVIEW_QUALITY = 70;
-const char* PreviewManager::PREVIEW_FILE_FORMAT = "JPEG";
-const char* PreviewManager::PREVIEW_FILE_EXT = ".jpg";
-const QString PreviewManager::PREVIEW_DIR = "preview";
-const QString PreviewManager::THUMBNAIL_DIR = "square";
-
-QMutex PreviewManager::m_createMutex;
-
-/*!
- * \brief PreviewManager::PreviewManager
- */
-PreviewManager::PreviewManager(const QString &thumbnailDirectory, QObject *parent)
-    : QObject(parent),
-      m_thumbnailDir(thumbnailDirectory)
-{
-    if (m_thumbnailDir.right(1) != QDir::separator())
-        m_thumbnailDir += QDir::separator();
-
-    // create the thumbnail directory if not already present
-    QDir dir;
-    dir.mkpath(m_thumbnailDir + PREVIEW_DIR);
-    dir.mkpath(m_thumbnailDir + THUMBNAIL_DIR);
-
-    gst_init(0, 0);
-}
-
-/*!
- * \brief PreviewManager::onMediaAddedRemoved
- * \param added
- * \param removed
- */
-void PreviewManager::onMediaAddedRemoved(const QSet<DataObject*>* added,
-                                            const QSet<DataObject*>* removed)
-{
-    if (added != NULL) {
-        DataObject* object;
-        foreach (object, *added) {
-            MediaSource* source = qobject_cast<MediaSource*>(object);
-
-            QObject::connect(source, SIGNAL(dataChanged()),
-                             this, SLOT(updatePreview()), Qt::UniqueConnection);
-        }
-    }
-
-    if (removed != NULL) {
-        DataObject* object;
-        foreach (object, *removed) {
-            MediaSource* source = qobject_cast<MediaSource*>(object);
-            QObject::disconnect(source, SIGNAL(dataChanged()),
-                                this, SLOT(updatePreview()));
-        }
-    }
-}
-
-/*!
- * \brief PreviewManager::onMediaDestroying
- * \param destroying
- */
-void PreviewManager::onMediaDestroying(const QSet<DataObject*>* destroying)
-{
-    if (destroying != NULL) {
-        DataObject* object;
-        foreach (object, *destroying)
-            destroyPreviews(qobject_cast<MediaSource*>(object));
-    }
-}
-
-/*!
- * \brief PreviewManager::updatePreview
- */
-void PreviewManager::updatePreview()
-{
-    QObject* object = QObject::sender();
-    MediaSource* source = qobject_cast<MediaSource*>(object);
-
-    ensurePreview(source->file(), true);
-}
-
-/*!
- * \brief PreviewManager::previewFileName
- * \param file
- * \return
- */
-QString PreviewManager::previewFileName(const QFileInfo& file) const
-{
-    return thumbnailFileName(file.canonicalFilePath(), PREVIEW_DIR);
-}
-
-/*!
- * \brief PreviewManager::thumbnailFileName
- * \param file
- * \return
- */
-QString PreviewManager::thumbnailFileName(const QFileInfo& file) const
-{
-    return thumbnailFileName(file.canonicalFilePath(), THUMBNAIL_DIR);
-}
-
-/*!
- * \brief PreviewManager::ensurePreview
- * \param file
- * \param regen
- * \return
- */
-bool PreviewManager::ensurePreview(QFileInfo file, bool regen)
-{
-    QMutexLocker locker(&m_createMutex);
-
-    // If preview file exists, considered valid (unless we're regenerating it).
-    QString preview = previewFileName(file);
-    QString thumbnail = thumbnailFileName(file);
-
-    QImage thumbMaster;
-    if (updateNeeded(file, QFileInfo(preview)) || regen) {
-        QSize previewSize(PREVIEW_SIZE, PREVIEW_SIZE);
-        QImage fullsized;
-        if (file.suffix().compare("mp4", Qt::CaseInsensitive) == 0) {
-            fullsized = grabVideoThumbnail(file.canonicalFilePath());
-        } else {
-            fullsized = loadPhoto(file.canonicalFilePath(), previewSize);
-        }
-        if (fullsized.isNull()) {
-            qDebug() << "Unable to generate fullsized image for " << file.filePath()
-                     << "not generating preview";
-            return false;
-        }
-
-        fullsized.setText("Thumb::URI", QUrl::fromLocalFile(file.canonicalFilePath()).toEncoded());
-        // scale the preview so it will fill the viewport specified by PREVIEW_*_MAX
-        // these values are replicated in the QML so that the preview will fill each
-        // grid cell, cropping down to the center of the image if necessary
-        QImage scaled = (fullsized.height() > fullsized.width())
-                ? fullsized.scaledToWidth(PREVIEW_SIZE, Qt::SmoothTransformation)
-                : fullsized.scaledToHeight(PREVIEW_SIZE, Qt::SmoothTransformation);
-
-        if (scaled.isNull()) {
-            qDebug() << "Unable to scale " << file.filePath() << "for preview";
-            return false;
-        }
-
-        if (!saveThumbnail(scaled, preview)) {
-            qDebug("Unable to save preview %s", qPrintable(preview));
-            return false;
-        }
-        thumbMaster = scaled;
-    }
-
-    if (updateNeeded(file, QFileInfo(thumbnail)) || regen) {
-        if (thumbMaster.isNull()) {
-            thumbMaster.load(preview);
-            if (thumbMaster.isNull()) {
-                qDebug("Unable load preview image for %s, not generating thumbnail",
-                       qPrintable(preview));
-                return false;
-            }
-        }
-
-        QImage square = generateThumbnail(thumbMaster);
-        if (!saveThumbnail(square, thumbnail)) {
-            qDebug("Unable to save preview %s", qPrintable(thumbnail));
-            return false;
-        }
-    }
-
-    return true;
-}
-
-/*!
- * \brief PreviewManager::saveThumbnail saves the thumbnail in a safe way
- * The image is written to a temporary file, and then moved (the move is atomic)
- * \param image thumbnail to save
- * \param fileName filename of the thumbnail
- * \return true, if saving the file was successful
- */
-bool PreviewManager::saveThumbnail(const QImage &image, const QString &fileName) const
-{
-    QString temporaryName(fileName+".tmp");
-    bool ok;
-    ok = image.save(temporaryName, PREVIEW_FILE_FORMAT, PREVIEW_QUALITY);
-    if (!ok) {
-        qWarning() << "Unanble to save the thumbnail" << temporaryName;
-        return false;
-    }
-
-    if (QFile::exists(fileName)) {
-        QFile::remove(fileName);
-    }
-
-    QFile thumbnail(temporaryName);
-    return thumbnail.rename(fileName);
-}
-
-/*!
- * \brief PreviewManager::destroyPreviews
- * \param media
- */
-void PreviewManager::destroyPreviews(MediaSource* media)
-{
-    QString filename = previewFileName(media->file());
-    if (!QFile::remove(filename))
-        qDebug("Unable to remove preview %s", qPrintable(filename));
-    filename = thumbnailFileName(media->file());
-    if (!QFile::remove(filename))
-        qDebug("Unable to remove thumbnail %s", qPrintable(filename));
-}
-
-/*!
- * \brief PreviewManager::generateThumbnail
- * \param master
- * \return
- */
-QImage PreviewManager::generateThumbnail(const QImage &master) const
-{
-    int xOffset = 0;
-    int yOffset = 0;
-    int size = 0;
-    if (master.width() > master.height()) {
-        size = master.height();
-        xOffset = (master.width() - size) / 2;
-    } else {
-        size = master.width();
-        yOffset = (master.height() - size) / 2;
-    }
-    QImage square = master.copy(xOffset, yOffset, size, size);
-
-    QImage thumbnail = square.scaled(THUMBNAIL_SIZE, THUMBNAIL_SIZE);
-    return thumbnail;
-}
-
-/*!
- * \brief PreviewManager::thumbnailFileName generates the file name for a given
- * file and it's level (size/type)
- * \param fileName full filename URI (file:///directory/file.name.png)
- * \param levelName correclates to the sub directory inside of the thumbnail directory
- * \return full filePath of the thumbnail
- */
-QString PreviewManager::thumbnailFileName(const QString &fileName,
-                                          const QString &levelName) const
-{
-    QCryptographicHash md5(QCryptographicHash::Md5);
-    md5.addData(QUrl::fromLocalFile(fileName).toEncoded());
-    QString previewDir = m_thumbnailDir + levelName + QDir::separator();
-    return QString(previewDir + md5.result().toHex() + PREVIEW_FILE_EXT);
-}
-
-/*!
- * \brief PreviewManager::updateNeeded checks if the thumbnail needs to be (re-)created
- * \param mediaFile the original photo/video
- * \param previewFile the preview file
- * \return true if the thumbnail needs to be created
- */
-bool PreviewManager::updateNeeded(const QFileInfo &mediaFile, const QFileInfo &previewFile) const
-{
-    if (!previewFile.exists())
-        return true;
-
-    return mediaFile.lastModified() > previewFile.lastModified();
-}
-
-/*!
- * \brief PreviewManager::loadPhoto load a photo with correct orientation
- * The size can be limited as well, to speed upt the loading
- * \param fileName file name of the photo
- * \param maxSize limits the size, so that one side fits into maxSize. If an
- * invalid size is passed, the image is loaded in full size.
- * \return the photo corrctly sized and oriented
- */
-QImage PreviewManager::loadPhoto(const QString &fileName, const QSize& maxSize) const
-{
-    QImageReader imageReader(fileName);
-
-    QSize imageSize = imageReader.size();
-    if (maxSize.isValid()) {
-        QSize size = imageSize;
-        size.scale(maxSize, Qt::KeepAspectRatioByExpanding);
-        imageReader.setScaledSize(size);
-    }
-
-    QImage image = imageReader.read();
-    if (!image.isNull()) {
-        PhotoMetadata* metadata = PhotoMetadata::fromFile(fileName.toStdString().c_str());
-        image = image.transformed(
-                    OrientationCorrection::fromOrientation(metadata->orientation())
-                    .toTransform());
-        delete metadata;
-    } else {
-        qWarning() << "Could not load the image" << fileName << "for thumbnail generation";
-    }
-
-    return image;
-}
-
-/*!
- * \brief destroyFrameData cleanup function for the video thumbnail QImage
- * \param data
- */
-static void destroyFrameData (void *data)
-{
-    gst_buffer_unref(GST_BUFFER (data));
-}
-
-/*!
- * \brief PreviewManager::grabVideoThumbnail grabs a frame from the given video file
- * \param fileName
- * \return
- */
-QImage PreviewManager::grabVideoThumbnail(const QString &fileName) const
-{
-    QUrl url("file://"+fileName);
-    gchar *guri = g_strdup(url.toString().toUtf8().data());
-
-    GstElement *asink;
-    GstElement *vsink;
-
-    GstElement *pipeline = gst_element_factory_make("playbin2", "play");
-    GstCaps *caps = gst_caps_new_simple("video/x-raw-rgb",
-                                        "bpp", G_TYPE_INT, 24,
-                                        "depth", G_TYPE_INT, 24,
-                                        "pixel-aspect-ratio", GST_TYPE_FRACTION, 1, 1,
-                                        "endianness", G_TYPE_INT, G_BIG_ENDIAN,
-                                        "red_mask", G_TYPE_INT, 0xff0000,
-                                        "green_mask", G_TYPE_INT, 0x00ff00,
-                                        "blue_mask", G_TYPE_INT, 0x0000ff,
-                                        NULL);
-    asink = gst_element_factory_make("fakesink", "audio-fake-sink");
-    vsink = gst_element_factory_make("fakesink", "video-fake-sink");
-    g_object_set(vsink, "sync", TRUE, NULL);
-    g_object_set(pipeline,
-                 "flags", 0x00000001, // Make sure to render only the video stream (we do not need audio here)
-                 "audio-sink", asink,
-                 "video-sink", vsink,
-                 NULL);
-
-    g_object_set(pipeline, "uri", guri, NULL);
-    GstStateChangeReturn ret = gst_element_set_state(pipeline, GST_STATE_PAUSED);
-    switch (ret)
-    {
-        case GST_STATE_CHANGE_FAILURE:
-            qWarning() << "Fail to start thumbnail pipeline";
-            return QImage();
-        case GST_STATE_CHANGE_NO_PREROLL:
-            qWarning() << "Thumbnail not supported for live sources";
-            return QImage();
-        default:
-            break;
-    }
-
-    gst_element_seek(pipeline, 1.0,
-                     GST_FORMAT_TIME,  static_cast<GstSeekFlags>(GST_SEEK_FLAG_FLUSH | GST_SEEK_FLAG_KEY_UNIT),
-                     GST_SEEK_TYPE_SET, 100 * GST_MSECOND,
-                     GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
-    /* And wait for this seek to complete */
-    gst_element_get_state(pipeline, NULL, NULL, GST_CLOCK_TIME_NONE);
-
-    GstBuffer *buf = 0;
-    g_signal_emit_by_name(pipeline, "convert-frame", caps, &buf);
-
-    QImage thumb;
-    if (buf && GST_BUFFER_CAPS(buf)) {
-        gint width, height;
-        GstStructure *s = gst_caps_get_structure(GST_BUFFER_CAPS (buf), 0);
-        gboolean res = gst_structure_get_int(s, "width", &width);
-        res |= gst_structure_get_int (s, "height", &height);
-        if (!res) {
-            qWarning() << "could not get snapshot dimension";
-            return QImage();
-        }
-
-        thumb = QImage(GST_BUFFER_DATA(buf), width, height, QImage::Format_RGB888, destroyFrameData, buf);
-    }
-
-    gst_caps_unref(caps);
-    gst_element_set_state(pipeline, GST_STATE_NULL);
-    gst_object_unref(pipeline);
-    g_free(guri);
-
-    VideoMetadata metadata;
-    metadata.parseMetadata(QFileInfo(fileName));
-    int rotation = metadata.rotation();
-    if (rotation != 0) {
-        QTransform transform;
-        transform.rotate(rotation);
-        thumb = thumb.transformed(transform);
-    }
-
-    return thumb;
-}
 
=== removed file 'src/medialoader/preview-manager.h'
--- src/medialoader/preview-manager.h	2013-08-12 08:51:09 +0000
+++ src/medialoader/preview-manager.h	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Jim Nelson <[e-mail]>
- */
-
-#ifndef GALLERY_PREVIEW_MANAGER_H_
-#define GALLERY_PREVIEW_MANAGER_H_
-
-#include <QFileInfo>
-#include <QMutex>
-#include <QObject>
-#include <QSet>
-#include <QSize>
-#include <QString>
-
-class QImage;
-class DataObject;
-class MediaSource;
-
-/*!
- * \brief The PreviewManager class creates and removes thumbnails
- *
- * The thumbnail storage and creation is inspired by
- * http://specifications.freedesktop.org/thumbnail-spec/thumbnail-spec-latest.html
- * But it uses jpeg (for performance),
- * uses different sizes,
- * not the standard sub directoy name (because of the sizes),
- * does not save any meta information in the thumbnails,
- * does not use the fail directory
- */
-class PreviewManager : public QObject
-{
-    Q_OBJECT
-
-public:
-    static const int PREVIEW_SIZE;
-    static const int THUMBNAIL_SIZE;
-    static const int PREVIEW_QUALITY;
-    static const char* PREVIEW_FILE_FORMAT;
-    static const char* PREVIEW_FILE_EXT;
-
-    static const QString PREVIEW_DIR;
-    static const QString THUMBNAIL_DIR;
-
-    PreviewManager(const QString& thumbnailDirectory, QObject* parent = 0);
-
-    QString previewFileName(const QFileInfo& file) const;
-    QString thumbnailFileName(const QFileInfo& file) const;
-
-    bool ensurePreview(QFileInfo file, bool regen = false);
-
-public slots:
-    void onMediaAddedRemoved(const QSet<DataObject*>* added,
-                                const QSet<DataObject*>* removed);
-    void onMediaDestroying(const QSet<DataObject*>* destroying);
-
-private slots:
-    void updatePreview();
-
-private:
-    bool saveThumbnail(const QImage& image, const QString& fileName) const;
-    void destroyPreviews(MediaSource* media);
-    QImage generateThumbnail(const QImage& master) const;
-    QString thumbnailFileName(const QString& fileName, const QString& levelName) const;
-    bool updateNeeded(const QFileInfo& mediaFile, const QFileInfo& previewFile) const;
-    QImage loadPhoto(const QString& fileName, const QSize &maxSize) const;
-    QImage grabVideoThumbnail(const QString& fileName) const;
-
-    static QMutex m_createMutex;
-    QString m_thumbnailDir;
-};
-
-#endif  // GALLERY_PREVIEW_MANAGER_H_
 
=== modified file 'src/photo/photo-caches.cpp'
--- src/photo/photo-caches.cpp	2013-07-05 08:12:31 +0000
+++ src/photo/photo-caches.cpp	2014-03-07 20:39:27 +0000
@@ -20,6 +20,7 @@
 #include "photo-caches.h"
 
 #include <QDir>
+#include <utime.h>
 
 const QString PhotoCaches::ORIGINAL_DIR = ".original";
 const QString PhotoCaches::ENHANCED_DIR = ".enhanced";
@@ -118,6 +119,8 @@
     }
 
     remove(m_file);
+    // touch the file so that the thumbnails will correctly regenerate
+    utime(m_originalFile.absoluteFilePath().toUtf8(), NULL);
     return rename(m_originalFile, m_file);
 }
 
 
=== modified file 'src/photo/photo.cpp'
--- src/photo/photo.cpp	2013-07-26 16:06:14 +0000
+++ src/photo/photo.cpp	2014-03-07 20:39:27 +0000
@@ -35,7 +35,6 @@
 
 // medialoader
 #include "gallery-standard-image-provider.h"
-#include "gallery-thumbnail-image-provider.h"
 #include "photo-metadata.h"
 
 // util
@@ -274,12 +273,7 @@
  */
 QUrl Photo::galleryPreviewPath() const
 {
-    QUrl url = MediaSource::galleryPreviewPath();
-    // previews are always stored fully transformed
-
-    appendPathParams(&url, TOP_LEFT_ORIGIN, 1);
-
-    return url;
+    return MediaSource::galleryPreviewPath();
 }
 
 /*!
@@ -287,16 +281,7 @@
  */
 QUrl Photo::galleryThumbnailPath() const
 {
-    QUrl url = MediaSource::galleryThumbnailPath();
-    // same as in append_path_params() this is needed to trigger an update of the image in QML
-    // so the URL is changed by adding/chageing the edit parameter
-    QUrlQuery query;
-    if (m_editRevision != 0) {
-        query.addQueryItem(GalleryThumbnailImageProvider::REVISION_PARAM_NAME,
-                           QString::number(m_editRevision));
-    }
-    url.setQuery(query);
-    return url;
+    return MediaSource::galleryThumbnailPath();
 }
 
 /*!
 
=== modified file 'src/video/video.cpp'
--- src/video/video.cpp	2013-08-12 08:51:09 +0000
+++ src/video/video.cpp	2014-03-07 20:39:27 +0000
@@ -56,8 +56,9 @@
  */
 bool Video::isCameraVideo(const QFileInfo &file)
 {
-    if (file.suffix() == QLatin1String("mp4") &&
-            file.baseName().startsWith("video")) {
+    QMimeDatabase mimedb;
+    QMimeType mimeType = mimedb.mimeTypeForFile(file);
+    if (mimeType.name().contains("video")) {
         return true;
     }
 
 
=== added file 'tests/autopilot/gallery_app/data/option01/clip_0001.mkv'
 Binary files tests/autopilot/gallery_app/data/option01/clip_0001.mkv	1970-01-01 00:00:00 +0000 and tests/autopilot/gallery_app/data/option01/clip_0001.mkv	2014-03-07 20:39:27 +0000 differ
=== modified file 'tests/autopilot/gallery_app/tests/__init__.py'
--- tests/autopilot/gallery_app/tests/__init__.py	2014-03-07 10:57:54 +0000
+++ tests/autopilot/gallery_app/tests/__init__.py	2014-03-07 20:39:27 +0000
@@ -320,9 +320,12 @@
         video_file = "video20130618_0002.mp4"
         shutil.copyfile(self.sample_dir+"/option01/"+video_file,
                         self.sample_destination_dir+"/"+video_file)
+        video_file = "clip_0001.mkv"
+        shutil.copyfile(self.sample_dir+"/option01/"+video_file,
+                        self.sample_destination_dir+"/"+video_file)
         self.assertThat(
             lambda: self.gallery_utils.number_of_photos_in_events(),
-            Eventually(Equals(3)))
+            Eventually(Equals(4)))
 
     def get_delete_dialog(self):
         """Raises StateNotFoundError if get_delete_dialog fails."""
 
=== modified file 'tests/autopilot/gallery_app/tests/test_albums_view.py'
--- tests/autopilot/gallery_app/tests/test_albums_view.py	2013-08-09 13:55:35 +0000
+++ tests/autopilot/gallery_app/tests/test_albums_view.py	2014-03-07 20:39:27 +0000
@@ -11,14 +11,16 @@
 from __future__ import absolute_import
 
 from testtools.matchers import Equals
+from autopilot.platform import model
 
 from gallery_app.tests import GalleryTestCase
 from gallery_app.emulators.albums_view import AlbumsView
 
 from time import sleep
-
+from os import environ as env
 
 class TestAlbumsView(GalleryTestCase):
+    envDesktopMode = None
 
     @property
     def albums_view(self):
@@ -26,9 +28,25 @@
 
     def setUp(self):
         self.ARGS = []
+
+        self.envDesktopMode = env.get("DESKTOP_MODE")
+
+        if model() == "Desktop":
+            env["DESKTOP_MODE"] = "1"
+        else:
+            env["DESKTOP_MODE"] = "0"
+
         super(TestAlbumsView, self).setUp()
         self.switch_to_albums_tab()
 
+    def tearDown(self):
+        if self.envDesktopMode:
+            env["DESKTOP_MODE"] = self.envDesktopMode
+        else:
+            del env["DESKTOP_MODE"]
+
+        super(TestAlbumsView, self).tearDown()
+
     def compare_number_of_albums(self, target):
         """Test if the number of albums is correct. For robustness (timing
            issues), the test is repeated after one second in case it fails"""
@@ -44,3 +62,13 @@
         self.compare_number_of_albums(1)
         self.main_view.open_toolbar().click_button("addButton")
         self.compare_number_of_albums(2)
+
+    # Check if Camera Button is not visible at Desktop mode
+    def test_camera_button_visible(self):
+        self.main_view.open_toolbar()
+        toolbar = self.main_view.get_toolbar()
+        cameraButton = toolbar.select_single("ActionItem", objectName="cameraButton")
+        if model() == "Desktop":
+            self.assertThat(cameraButton.visible, Equals(False))
+        else:
+            self.assertThat(cameraButton.visible, Equals(True))
 
=== modified file 'tests/autopilot/gallery_app/tests/test_events_view.py'
--- tests/autopilot/gallery_app/tests/test_events_view.py	2013-10-30 05:01:48 +0000
+++ tests/autopilot/gallery_app/tests/test_events_view.py	2014-03-07 20:39:27 +0000
@@ -12,22 +12,37 @@
 
 from testtools.matchers import Equals, Is
 from autopilot.matchers import Eventually
+from autopilot.platform import model
 
 from gallery_app.tests import GalleryTestCase
 
 from os.path import exists
-
+from os import environ as env
 
 class TestEventsView(GalleryTestCase):
     """Tests the main gallery features"""
+    envDesktopMode = None
 
     def setUp(self):
         self.ARGS = []
+
+        self.envDesktopMode = env.get("DESKTOP_MODE")
+
+        if model() == "Desktop":
+            env["DESKTOP_MODE"] = "1"
+        else:
+            env["DESKTOP_MODE"] = "0"
+
         # This is needed to wait for the application to start.
         # In the testfarm, the application may take some time to show up.
         super(TestEventsView, self).setUp()
 
     def tearDown(self):
+        if self.envDesktopMode:
+            env["DESKTOP_MODE"] = self.envDesktopMode
+        else:
+            del env["DESKTOP_MODE"]
+
         super(TestEventsView, self).tearDown()
 
     def get_events_view(self):
@@ -102,3 +117,13 @@
 
     def test_adding_a_video(self):
         self.add_video_sample()
+
+    # Check if Camera Button is not visible at Desktop mode
+    def test_camera_button_visible(self):
+        self.main_view.open_toolbar()
+        toolbar = self.main_view.get_toolbar()
+        cameraButton = toolbar.select_single("ActionItem", objectName="cameraButton")
+        if model() == "Desktop":
+            self.assertThat(cameraButton.visible, Equals(False))
+        else:
+            self.assertThat(cameraButton.visible, Equals(True))
 
=== modified file 'tests/autopilot/gallery_app/tests/test_photo_viewer.py'
--- tests/autopilot/gallery_app/tests/test_photo_viewer.py	2014-02-05 11:15:13 +0000
+++ tests/autopilot/gallery_app/tests/test_photo_viewer.py	2014-03-07 20:39:27 +0000
@@ -261,8 +261,8 @@
         # wait for new photo being set/reloaded, so saving thumbnailing etc.
         # is done
         edit_preview = self.photo_viewer.get_edit_preview()
-        new_source = "image://gallery-standard/" + self.sample_file + \
-                     "?size_level=1&orientation=1&edit=2"
+        new_source = "image://thumbnailer/" + self.sample_file
+
         self.assertThat(edit_preview.source, Eventually(Equals(new_source)))
 
         new_file_size = os.path.getsize(self.sample_file)
 
=== modified file 'tests/autopilot/gallery_app/tests/test_photos_view.py'
--- tests/autopilot/gallery_app/tests/test_photos_view.py	2014-02-14 10:43:17 +0000
+++ tests/autopilot/gallery_app/tests/test_photos_view.py	2014-03-07 20:39:27 +0000
@@ -19,8 +19,7 @@
 from gallery_app.emulators.photos_view import PhotosView
 
 from os.path import exists
-from os import environ
-
+from os import environ as env
 import unittest
 
 class TestPhotosView(GalleryTestCase):
@@ -32,21 +31,21 @@
 
     def setUp(self):
         self.ARGS = []
-        self.envDesktopMode = environ.get("DESKTOP_MODE")
+        self.envDesktopMode = env.get("DESKTOP_MODE")
 
         if model() == "Desktop":
-            environ["DESKTOP_MODE"] = "1"
+            env["DESKTOP_MODE"] = "1"
         else:
-            environ["DESKTOP_MODE"] = "0"
+            env["DESKTOP_MODE"] = "0"
 
         super(TestPhotosView, self).setUp()
         self.switch_to_photos_tab()
 
     def tearDown(self):
         if self.envDesktopMode:
-            environ["DESKTOP_MODE"] = self.envDesktopMode
+            env["DESKTOP_MODE"] = self.envDesktopMode
         else:
-            del environ["DESKTOP_MODE"]
+            del env["DESKTOP_MODE"]
 
         super(TestPhotosView, self).tearDown()
 
@@ -152,3 +151,13 @@
         self.assertThat(view.fullScreen, Eventually(Equals(False)))
         self.keyboard.press_and_release('Escape')
         self.assertThat(view.fullScreen, Eventually(Equals(False)))
+
+    # Check if Camera Button is not visible at Desktop mode
+    def test_camera_button_visible(self):
+        self.main_view.open_toolbar()
+        toolbar = self.main_view.get_toolbar()
+        cameraButton = toolbar.select_single("ActionItem", objectName="cameraButton")
+        if model() == "Desktop":
+            self.assertThat(cameraButton.visible, Equals(False))
+        else:
+            self.assertThat(cameraButton.visible, Equals(True))
 
=== modified file 'tests/unittests/CMakeLists.txt'
--- tests/unittests/CMakeLists.txt	2013-06-14 17:59:27 +0000
+++ tests/unittests/CMakeLists.txt	2014-03-07 20:39:27 +0000
@@ -1,7 +1,7 @@
 add_subdirectory(command-line-parser)
 add_subdirectory(gallerystandardimageprovider)
-add_subdirectory(gallerythumbnailimageprovider)
 add_subdirectory(imaging)
+add_subdirectory(mediamonitor)
 add_subdirectory(mediaobjectfactory)
 add_subdirectory(resource)
 add_subdirectory(video)
 
=== modified file 'tests/unittests/gallerystandardimageprovider/CMakeLists.txt'
--- tests/unittests/gallerystandardimageprovider/CMakeLists.txt	2013-12-16 21:49:56 +0000
+++ tests/unittests/gallerystandardimageprovider/CMakeLists.txt	2014-03-07 20:39:27 +0000
@@ -14,7 +14,6 @@
     )
 
 QT5_WRAP_CPP(GALLERYSTANDARDIMAGEPROVIDIER_MOCS
-    ${gallery_medialoader_src_SOURCE_DIR}/preview-manager.h
     ${gallery_medialoader_src_SOURCE_DIR}/photo-metadata.h
     )
 
@@ -22,7 +21,6 @@
     tst_gallerystandardimageprovidertest.cpp
     ${gallery_src_SOURCE_DIR}/medialoader/gallery-standard-image-provider.cpp
     ../stubs/orientation_stub.cpp
-    ../stubs/preview-manager_stub.cpp
     ../stubs/photometa-data_stub.cpp
     ${GALLERYSTANDARDIMAGEPROVIDIER_MOCS}
     )
 
=== modified file 'tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp'
--- tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp	2013-07-03 11:53:48 +0000
+++ tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp	2014-03-07 20:39:27 +0000
@@ -24,7 +24,6 @@
 #include <QUrl>
 
 #include "gallery-standard-image-provider.h"
-#include "preview-manager.h"
 #include "media-collection.h"
 
 class tst_GalleryStandardImageProvider : public QObject
@@ -63,8 +62,6 @@
 
     QTest::newRow("FullSize") << "/home/user/Pictures/logo.jpg?size_level=0&orientation=1" <<
                                  "/home/user/Pictures/logo.jpg";
-    QTest::newRow("Thumbnail") << "/home/user/Pictures/logo.jpg?size_level=1&orientation=1" <<
-                                 "/home/user/Pictures/.thumbs/logo_th.JPG";
 }
 
 void tst_GalleryStandardImageProvider::idToFile()
@@ -72,9 +69,7 @@
     QFETCH(QString, id);
     QFETCH(QString, fileName);
 
-    PreviewManager previewManager("/home/user/thumbnails");
     GalleryStandardImageProvider provider;
-    provider.setPreviewManager(&previewManager);
     QCOMPARE(provider.idToFile(id), fileName);
 }
 
 
=== removed directory 'tests/unittests/gallerythumbnailimageprovider'
=== removed file 'tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt'
--- tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt	2013-12-16 21:49:56 +0000
+++ tests/unittests/gallerythumbnailimageprovider/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-add_definitions(-DTEST_SUITE)
-
-if(NOT CTEST_TESTING_TIMEOUT)
-    set(CTEST_TESTING_TIMEOUT 60)
-endif()
-
-include_directories(
-    ${gallery_core_src_SOURCE_DIR}
-    ${gallery_media_src_SOURCE_DIR}
-    ${gallery_medialoader_src_SOURCE_DIR}
-    ${gallery_util_src_SOURCE_DIR}
-    ${CMAKE_BINARY_DIR}
-    )
-
-QT5_WRAP_CPP(GALLERYTHUMBNAILIMAGEPROVIDIER_MOCS
-    ${gallery_medialoader_src_SOURCE_DIR}/preview-manager.h
-    )
-
-add_executable(gallerythumbnailimageprovider
-    tst_gallerythumbnailimageprovider.cpp
-    ../stubs/preview-manager_stub.cpp
-    ${gallery_src_SOURCE_DIR}/medialoader/gallery-thumbnail-image-provider.cpp
-    ${GALLERYTHUMBNAILIMAGEPROVIDIER_MOCS}
-    )
-
-qt5_use_modules(gallerythumbnailimageprovider Quick Test)
-add_test(gallerythumbnailimageprovider gallerythumbnailimageprovider
-    -xunitxml -o test_gallerythumbnailimageprovider.xml
-    )
-set_tests_properties(gallerythumbnailimageprovider PROPERTIES
-    TIMEOUT ${CTEST_TESTING_TIMEOUT}
-    ENVIRONMENT "QT_QPA_PLATFORM=minimal"
-    )
-
 
=== removed file 'tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp'
--- tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp	2013-06-10 06:20:05 +0000
+++ tests/unittests/gallerythumbnailimageprovider/tst_gallerythumbnailimageprovider.cpp	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * Authors:
- *  Guenter Schwann <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QtTest/QtTest>
-#include <QFileInfo>
-#include <QUrl>
-
-#include "gallery-thumbnail-image-provider.h"
-
-class tst_GalleryThumbnailImageProvider : public QObject
-{
-  Q_OBJECT
-public:
-    tst_GalleryThumbnailImageProvider();
-
-private slots:
-    void ToURL();
-
-private:
-    GalleryThumbnailImageProvider gallery_thumbnail_image_provider;
-};
-
-tst_GalleryThumbnailImageProvider::tst_GalleryThumbnailImageProvider()
-    : gallery_thumbnail_image_provider()
-{
-}
-
-void tst_GalleryThumbnailImageProvider::ToURL()
-{
-    QFileInfo fi("/tmp/test.jpg");
-    QUrl url = gallery_thumbnail_image_provider.toURL(fi);
-    QUrl expect("image://gallery-thumbnail//tmp/test.jpg");
-    QCOMPARE(url, expect);
-}
-
-QTEST_MAIN(tst_GalleryThumbnailImageProvider);
-
-#include "tst_gallerythumbnailimageprovider.moc"
 
=== added directory 'tests/unittests/mediamonitor'
=== added file 'tests/unittests/mediamonitor/CMakeLists.txt'
--- tests/unittests/mediamonitor/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/unittests/mediamonitor/CMakeLists.txt	2014-03-07 20:39:27 +0000
@@ -0,0 +1,36 @@
+add_definitions(-DTEST_SUITE)
+
+if(NOT CTEST_TESTING_TIMEOUT)
+    set(CTEST_TESTING_TIMEOUT 60)
+endif()
+
+include_directories(
+    ${gallery_media_src_SOURCE_DIR}
+    ${gallery_core_src_SOURCE_DIR}
+    ${gallery_util_src_SOURCE_DIR}
+    ${gallery_medialoader_src_SOURCE_DIR}
+    ${gallery_database_src_SOURCE_DIR}
+    ${gallery_album_src_SOURCE_DIR}
+    ${gallery_src_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}
+    )
+
+add_executable(mediamonitor tst_mediamonitor.cpp)
+
+qt5_use_modules(mediamonitor Quick Test)
+
+add_test(mediamonitor mediamonitor -xunitxml -o test_mediamonitor.xml)
+
+set_tests_properties(mediamonitor PROPERTIES
+    TIMEOUT ${CTEST_TESTING_TIMEOUT}
+    ENVIRONMENT "QT_QPA_PLATFORM=minimal"
+    )
+
+target_link_libraries(mediamonitor
+    gallery-util
+    gallery-media
+    gallery-core
+    gallery-medialoader
+    gallery-database
+    gallery-album
+    )
 
=== added file 'tests/unittests/mediamonitor/tst_mediamonitor.cpp'
--- tests/unittests/mediamonitor/tst_mediamonitor.cpp	1970-01-01 00:00:00 +0000
+++ tests/unittests/mediamonitor/tst_mediamonitor.cpp	2014-03-07 20:39:27 +0000
@@ -0,0 +1,96 @@
+/* * Copyright (C) 2014 Canonical, Ltd.  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include <QtTest>
+
+#include <QDir>
+#include <QTemporaryDir>
+#include <QImage>
+#include <QColor>
+#include <QStringList>
+
+#include "media-monitor.h"
+
+class tst_MediaMonitor : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void initTestCase();
+    void tst_scanning_sub_folders();
+    void cleanupTestCase();
+
+private:
+    QTemporaryDir *m_tmpDir;
+    QImage *m_sampleImage;
+    MediaMonitor *m_monitor;
+};
+
+void tst_MediaMonitor::initTestCase()
+{
+    m_tmpDir = new QTemporaryDir();
+
+    // Create a simple directories tree
+    QDir *dir = new QDir(m_tmpDir->path());
+    dir->mkpath("A/A");
+    dir->mkpath("A/B");
+    dir->mkpath("B/A");
+    dir->mkpath("B/B");
+
+    // Create sample image
+    m_sampleImage = new QImage(400, 600, QImage::Format_RGB32);
+    m_sampleImage->fill(QColor(Qt::red));
+}
+
+void tst_MediaMonitor::tst_scanning_sub_folders()
+{
+    // Create a Media Monitor
+    m_monitor = new MediaMonitor();
+
+    // Emitted every time a new photo/video found
+    QSignalSpy filesFound(m_monitor, SIGNAL(mediaItemAdded(QString)));
+
+    // Add some debug to check which media was found
+    connect(m_monitor, &MediaMonitor::mediaItemAdded, [](const QString &file) {
+        qDebug() << "File Found:" << file;
+    });
+
+    // Launch the monitoring process
+    m_monitor->startMonitoring(QStringList(m_tmpDir->path()));
+
+    // Save sample image allover the tree
+    m_sampleImage->save(m_tmpDir->path() + "/A/A/sample_AA.jpg", "JPG");
+    m_sampleImage->save(m_tmpDir->path() + "/A/B/sample_AB.jpg", "JPG");
+    m_sampleImage->save(m_tmpDir->path() + "/B/A/sample_BA.jpg", "JPG");
+    m_sampleImage->save(m_tmpDir->path() + "/B/B/sample_BB.jpg", "JPG");
+
+    m_sampleImage->save(m_tmpDir->path() + "/A/sample_A.jpg", "JPG");
+    m_sampleImage->save(m_tmpDir->path() + "/B/sample_B.jpg", "JPG");
+
+    m_sampleImage->save(m_tmpDir->path() + "/sample.jpg", "JPG");
+
+    QTRY_COMPARE_WITH_TIMEOUT(filesFound.count(), 7, 10000);
+}
+
+void tst_MediaMonitor::cleanupTestCase()
+{
+    //Remove the previously created files
+    QDir *dir = new QDir(m_tmpDir->path());
+    dir->removeRecursively();
+}
+
+QTEST_MAIN(tst_MediaMonitor)
+
+#include "tst_mediamonitor.moc"
 
=== modified file 'tests/unittests/mediaobjectfactory/CMakeLists.txt'
--- tests/unittests/mediaobjectfactory/CMakeLists.txt	2013-12-16 21:49:56 +0000
+++ tests/unittests/mediaobjectfactory/CMakeLists.txt	2014-03-07 20:39:27 +0000
@@ -26,7 +26,6 @@
     ${gallery_database_src_SOURCE_DIR}/photo-edit-table.h
     ${gallery_medialoader_src_SOURCE_DIR}/gallery-standard-image-provider.h
     ${gallery_medialoader_src_SOURCE_DIR}/photo-metadata.h
-    ${gallery_medialoader_src_SOURCE_DIR}/preview-manager.h
     ${gallery_medialoader_src_SOURCE_DIR}/video-metadata.h
     ${gallery_photo_src_SOURCE_DIR}/photo.h
     )
@@ -41,10 +40,8 @@
     ../stubs/photo-caches_stub.cpp
     ../stubs/photo-edit-table_stub.cpp
     ../stubs/photometa-data_stub.cpp
-    ../stubs/preview-manager_stub.cpp
     ../stubs/video-metadata_stub.cpp
     ../stubs/gallery-standard-image-provider_stub.cpp
-    ../stubs/gallery-thumbnail-image-provider_stub.cpp
     ../stubs/gallery-manager_stub.cpp
     ${MEDIAOBJECTFACTORY_MOCS}
     )
 
=== modified file 'tests/unittests/stubs/gallery-manager_stub.cpp'
--- tests/unittests/stubs/gallery-manager_stub.cpp	2013-09-06 16:10:25 +0000
+++ tests/unittests/stubs/gallery-manager_stub.cpp	2014-03-07 20:39:27 +0000
@@ -35,7 +35,6 @@
 
 // qml
 #include "gallery-standard-image-provider.h"
-#include "gallery-thumbnail-image-provider.h"
 
 GalleryManager* GalleryManager::m_galleryManager = NULL;
 
@@ -43,13 +42,11 @@
     : collectionsInitialised(false),
       m_resource(0),
       m_standardImageProvider(new GalleryStandardImageProvider()),
-      m_thumbnailImageProvider(new GalleryThumbnailImageProvider()),
       m_database(0),
       m_defaultTemplate(0),
       m_mediaCollection(0),
       m_albumCollection(0),
       m_eventCollection(0),
-      m_previewManager(0),
       m_monitor(0),
       m_mediaLibrary(0)
 {
@@ -93,7 +90,6 @@
 GalleryManager::~GalleryManager()
 {
     delete m_standardImageProvider;
-    delete m_thumbnailImageProvider;
     delete m_defaultTemplate;
     delete m_mediaCollection;
     delete m_albumCollection;
@@ -114,8 +110,3 @@
 {
     return 0;
 }
-
-GalleryThumbnailImageProvider* GalleryManager::takeGalleryThumbnailImageProvider()
-{
-    return 0;
-}
 
=== modified file 'tests/unittests/stubs/gallery-standard-image-provider_stub.cpp'
--- tests/unittests/stubs/gallery-standard-image-provider_stub.cpp	2013-06-14 17:59:27 +0000
+++ tests/unittests/stubs/gallery-standard-image-provider_stub.cpp	2014-03-07 20:39:27 +0000
@@ -19,7 +19,6 @@
  */
 
 #include "gallery-standard-image-provider.h"
-#include "preview-manager.h"
 
 const char* GalleryStandardImageProvider::PROVIDER_ID = "gallery-standard";
 const char* GalleryStandardImageProvider::PROVIDER_ID_SCHEME = "image://gallery-standard/";
@@ -32,13 +31,11 @@
 const long MAX_CACHE_BYTES = 20L * 1024L * 1024L;
 
 // fully load previews into memory when requested
-const int SCALED_LOAD_FLOOR_DIM_PIXELS =
-        qMax(PreviewManager::PREVIEW_SIZE, PreviewManager::PREVIEW_SIZE);
+const int SCALED_LOAD_FLOOR_DIM_PIXELS = 360;
 
 GalleryStandardImageProvider::GalleryStandardImageProvider()
     : QQuickImageProvider(QQuickImageProvider::Image),
       m_cachedBytes(0),
-      m_previewManager(0),
       m_logImageLoading(false),
       m_maxLoadResolution(INT_MAX)
 {
@@ -62,11 +59,6 @@
     return QUrl::fromUserInput(PROVIDER_ID_SCHEME + file.absoluteFilePath());
 }
 
-void GalleryStandardImageProvider::setPreviewManager(PreviewManager *previewManager)
-{
-    m_previewManager = previewManager;
-}
-
 void GalleryStandardImageProvider::setLogging(bool enableLogging)
 {
     m_logImageLoading = enableLogging;
 
=== removed file 'tests/unittests/stubs/gallery-thumbnail-image-provider_stub.cpp'
--- tests/unittests/stubs/gallery-thumbnail-image-provider_stub.cpp	2013-06-14 17:59:27 +0000
+++ tests/unittests/stubs/gallery-thumbnail-image-provider_stub.cpp	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2012 Canonical Ltd
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors:
- * Guenter Schwann <[e-mail]>
-*/
-
-#include "gallery-thumbnail-image-provider.h"
-
-const char* GalleryThumbnailImageProvider::PROVIDER_ID = "gallery-thumbnail";
-const char* GalleryThumbnailImageProvider::PROVIDER_ID_SCHEME = "image://gallery-thumbnail/";
-const char* GalleryThumbnailImageProvider::REVISION_PARAM_NAME = "edit";
-
-GalleryThumbnailImageProvider::GalleryThumbnailImageProvider()
-    : QQuickImageProvider(QQuickImageProvider::Image),
-      m_previewManager(0),
-      m_logImageLoading(false)
-{
-}
-
-QImage GalleryThumbnailImageProvider::requestImage(const QString& id,
-                                                  QSize* size, const QSize& requestedSize)
-{
-    Q_UNUSED(id);
-    Q_UNUSED(size);
-    Q_UNUSED(requestedSize);
-    return QImage();
-}
-
-QUrl GalleryThumbnailImageProvider::toURL(const QFileInfo &file)
-{
-    return QUrl::fromUserInput(PROVIDER_ID_SCHEME + file.absoluteFilePath());
-}
-
-void GalleryThumbnailImageProvider::setPreviewManager(PreviewManager *previewManager)
-{
-    m_previewManager = previewManager;
-}
-
-void GalleryThumbnailImageProvider::setLogging(bool enableLogging)
-{
-    m_logImageLoading = enableLogging;
-}
 
=== removed file 'tests/unittests/stubs/preview-manager_stub.cpp'
--- tests/unittests/stubs/preview-manager_stub.cpp	2013-06-18 06:16:55 +0000
+++ tests/unittests/stubs/preview-manager_stub.cpp	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * Authors:
- *  Nicolas d'Offay <[e-mail]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QDir>
-
-#include "preview-manager.h"
-#include "media-collection.h"
-
-const int PreviewManager::PREVIEW_SIZE = 360;
-const QString PreviewManager::PREVIEW_DIR = ".thumbs";
-const char* PreviewManager::PREVIEW_FILE_EXT = "JPG";
-
-PreviewManager::PreviewManager(const QString &thumbnailDirectory, QObject *parent)
-{
-    Q_UNUSED(thumbnailDirectory);
-}
-
-bool PreviewManager::ensurePreview(QFileInfo file, bool regen)
-{
-    file = QFileInfo();
-    regen = false;
-
-    return regen;
-}
-
-void PreviewManager::onMediaAddedRemoved(const QSet<DataObject *> *, const QSet<DataObject *> *)
-{
-}
-
-void PreviewManager::onMediaDestroying(const QSet<DataObject *> *)
-{
-}
-
-void PreviewManager::updatePreview()
-{
-}
-
-QString PreviewManager::previewFileName(const QFileInfo &file) const
-{
-    return QString(file.absolutePath() + QDir::separator() + PREVIEW_DIR +
-                   QDir::separator() + file.completeBaseName() + "_th." + PREVIEW_FILE_EXT);
-}
-
-QString PreviewManager::thumbnailFileName(const QFileInfo& file) const
-{
-  return QString(file.absolutePath() + PREVIEW_DIR + QDir::separator() +
-                 file.completeBaseName() + "_th_s." + PREVIEW_FILE_EXT);
-}
 
=== modified file 'tests/unittests/video/tst_video.cpp'
--- tests/unittests/video/tst_video.cpp	2013-08-12 09:29:34 +0000
+++ tests/unittests/video/tst_video.cpp	2014-03-07 20:39:27 +0000
@@ -33,10 +33,10 @@
     QVERIFY(Video::isCameraVideo(fi));
 
     fi.setFileName("/dir/video20130612_0001.avi");
-    QVERIFY(!Video::isCameraVideo(fi));
+    QVERIFY(Video::isCameraVideo(fi));
 
     fi.setFileName("/dir/home_video.mp4");
-    QVERIFY(!Video::isCameraVideo(fi));
+    QVERIFY(Video::isCameraVideo(fi));
 }
 
 QTEST_MAIN(tst_Video);