gallery-app

Merge lp:~schwann/gallery-app/gallery-content-hub into lp:gallery-app

gallery-content-hub
Merge into trunk

Proposed by Günter Schwann on 2013-08-15

Status:	Merged
Approved by:	Gustavo Pichorim Boiko on 2013-08-28
Approved revision:	824
Merged at revision:	827
Proposed branch:	lp:~schwann/gallery-app/gallery-content-hub
Merge into:	lp:gallery-app
Diff against target:	622 lines (+313/-23) 14 files modified CMakeLists.txt (+5/-0) debian/control (+1/-0) rc/qml/GalleryApplication.qml (+10/-12) rc/qml/PickerScreen.qml (+0/-2) src/CMakeLists.txt (+4/-1) src/content-communicator.cpp (+96/-0) src/content-communicator.h (+51/-0) src/gallery-application.cpp (+2/-1) src/gallery-application.h (+0/-1) src/gallery-manager.cpp (+69/-4) src/gallery-manager.h (+15/-1) tests/unittests/stubs/content-communicator_stub.cpp (+43/-0) tests/unittests/stubs/gallery-manager_stub.cpp (+10/-1) tests/unittests/video/CMakeLists.txt (+7/-0)
To merge this branch:	bzr merge lp:~schwann/gallery-app/gallery-content-hub
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-08-28
Gustavo Pichorim Boiko (community)			Approve on 2013-08-28
Bill Filler (community)		2013-08-15	Needs Fixing on 2013-08-19
Review via email: mp+180378@code.launchpad.net

Commit message

Use content hub for content picking

Description of the change

Use content hub for content picking

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-15:

FAILED: Continuous integration, rev:815
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/429/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/239/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/239/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/239/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2294/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/61/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2300/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/63/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-16:

FAILED: Continuous integration, rev:815
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/430/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/240/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/240/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/240/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2303/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/64/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2309/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/66/console

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

review: Needs Fixing (continuous-integration)

lp:~schwann/gallery-app/gallery-content-hub updated on 2013-08-16

816. By Günter Schwann on 2013-08-16: Minor cmake improvement
817. By Günter Schwann on 2013-08-16: Trunk merged

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-16:

FAILED: Continuous integration, rev:817
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/432/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/242/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2321/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2327/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/69/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-19:

FAILED: Continuous integration, rev:817
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/436/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/246/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/246/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/246/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2357/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2363/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/79/console

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

review: Needs Fixing (continuous-integration)

lp:~schwann/gallery-app/gallery-content-hub updated on 2013-08-19

818. By Günter Schwann on 2013-08-19: trunk merged

Revision history for this message

Bill Filler (bfiller) wrote on 2013-08-19:

looks like typo in line 13
+set(CONTENTHUB_INCLUDE_DIRS "/usr/include/com/ununtu/content")

Also is Nick D'Offay intentionally listed as author of new files?

review: Needs Fixing

lp:~schwann/gallery-app/gallery-content-hub updated on 2013-08-19

819. By Günter Schwann on 2013-08-19: * remove (wrong) author of copyright
* mark the cmake variables for the content hub as fixme

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-19:

FAILED: Continuous integration, rev:818
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/438/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/248/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2364/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2370/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/82/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-19:

FAILED: Continuous integration, rev:819
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/439/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/249/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/249/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/249/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2367/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/81/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2373/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/83/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-20:

FAILED: Continuous integration, rev:819
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/441/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/251/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/251/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/251/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2382/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/84/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2388/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/86/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-20:

FAILED: Continuous integration, rev:819
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/442/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/252/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/252/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/252/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2412/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/90/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2418/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/92/console

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

review: Needs Fixing (continuous-integration)

lp:~schwann/gallery-app/gallery-content-hub updated on 2013-08-27

820. By Günter Schwann on 2013-08-27: Trunk merged

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-27:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-27:

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

review: Approve (continuous-integration)

lp:~schwann/gallery-app/gallery-content-hub updated on 2013-08-28

821. By Günter Schwann on 2013-08-28: Dynamicly switch to pick mode if needed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-28:

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

review: Needs Fixing (continuous-integration)

lp:~schwann/gallery-app/gallery-content-hub updated on 2013-08-28

822. By Günter Schwann on 2013-08-28: Fix to start with --pick-mode

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-28:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-28:

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

review: Approve (continuous-integration)

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-08-28:

275 + * Simple class which encapsulates instantiates objects which require only one instance.

The "encapsulates instantiates" part seems to be a typo?

review: Needs Fixing

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-08-28:

285 + virtual void handle_export(content::Transfer*transfer);

Just nitpicking, can you fix the coding style in there so that it is the same as used in the other methods of the same file?

review: Needs Fixing

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-08-28:

236 + foreach (const QUrl url, urls) {

can this be a const reference instead? (const QUrl &url)

review: Needs Fixing

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-08-28:

437 + * \brief GalleryManager::pickMode returns if the current UI mode should be for

That should read GalleryManager::pickModeEnabled

review: Needs Fixing

lp:~schwann/gallery-app/gallery-content-hub updated on 2013-08-28

823. By Günter Schwann on 2013-08-28: Better name for "normal" mode of gallery
824. By Günter Schwann on 2013-08-28: Fix comments from MR

Revision history for this message

Gustavo Pichorim Boiko (boiko) wrote on 2013-08-28:

Looks good now!

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2013-08-28:

FAILED: Continuous integration, rev:823
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/454/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/264/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/264/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/264/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2752/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/364/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2758/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/366/console

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) on 2013-08-28:

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Günter Schwann

Ubuntu Phablet Team

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2013-08-16 12:55:55 +0000
 +++ CMakeLists.txt	2013-08-28 19:23:56 +0000
@@ -38,10 +38,15 @@
  endif()
  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)
++# FIXME use cmake to find the proper variables
++set(CONTENTHUB_INCLUDE_DIRS "/usr/include/com/ubuntu/content")
++set(CONTENTHUB_LIBRARIES "content-hub")
++
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
  # Standard install paths
 === modified file 'debian/control'
 --- debian/control	2013-08-26 09:28:46 +0000
 +++ debian/control	2013-08-28 19:23:56 +0000
@@ -5,6 +5,7 @@
  Build-Depends: debhelper (>= 9),
                 cmake,
                 dh-translations,
++               libcontent-hub-dev,
                 libgstreamer0.10-dev,
                 libexiv2-dev,
                 libgl1-mesa-dev | libgl-dev,
 === modified file 'rc/qml/GalleryApplication.qml'
 --- rc/qml/GalleryApplication.qml	2013-06-26 08:59:08 +0000
 +++ rc/qml/GalleryApplication.qml	2013-08-28 19:23:56 +0000
@@ -37,6 +37,9 @@
      property bool automaticOrientation: true
++    /// Indicates if the backend is loaded and the UI can be shown
++    property bool allLoaded: false
++
      // Big list of form factor-specific values.  'default' is used if the key
      // can't be found under any other form_factor (otherwise, form_factors should
      // match the FORM_FACTOR values passed from main.cpp).  Just add Portrait to
@@ -141,8 +144,7 @@
      /*!
      */
      function onLoaded() {
--        mainScreenLoader.load();
--        loadingScreen.visible = false;
++        allLoaded = true;
+     }
      width: units.gu(DEVICE_WIDTH)
@@ -161,26 +163,22 @@
+         }
+     }
--    LoadingScreen {
++    Loader {
          id: loadingScreen
--
          anchors.fill: parent
++        visible: mainScreenLoader.status !== Loader.Ready
++        source: visible ? Qt.resolvedUrl("LoadingScreen.qml") : ""
+     }
      Loader {
          id: mainScreenLoader
--
          // find the loader with autopilot:
          objectName: "mainLoader"
--        function load() {
--            if (PICK_MODE_ENABLED)
--                source = "PickerScreen.qml";
--            else
--                source = "MainScreen.qml";
--        }
--
          anchors.fill: parent
++        source: allLoaded ? (MANAGER.pickModeEnabled ? Qt.resolvedUrl("PickerScreen.qml")
++                                                     : Qt.resolvedUrl("MainScreen.qml"))
++                          : ""
+     }
      HUD.HUD {
 === modified file 'rc/qml/PickerScreen.qml'
 --- rc/qml/PickerScreen.qml	2013-08-27 06:48:42 +0000
 +++ rc/qml/PickerScreen.qml	2013-08-28 19:23:56 +0000
@@ -102,7 +102,6 @@
                      return;
                  MANAGER.returnPickedContent(mediaLibrary.selectedMedias);
--                Qt.quit();
+             }
+         }
@@ -113,7 +112,6 @@
              width: units.gu(10)
              onClicked: {
                  MANAGER.contentPickingCanceled()
--                Qt.quit();
+             }
+         }
          opened: true
 === modified file 'src/CMakeLists.txt'
 --- src/CMakeLists.txt	2013-08-14 20:19:09 +0000
 +++ src/CMakeLists.txt	2013-08-28 19:23:56 +0000
@@ -31,15 +31,18 @@
      ${gallery_video_src_SOURCE_DIR}
      ${gallery_qml_src_SOURCE_DIR}
      ${CMAKE_BINARY_DIR}
++    ${CONTENTHUB_INCLUDE_DIRS}
+     )
  set(gallery_HDRS
++    content-communicator.h
      gallery-application.h
      gallery-manager.h
      media-object-factory.h
+     )
  set(gallery_SRCS
++    content-communicator.cpp
      gallery-application.cpp
      gallery-manager.cpp
      main.cpp
@@ -63,7 +66,7 @@
      gallery-qml
      gallery-util
      gallery-video
--    ${GSTLIB_LDFLAGS}
++    ${CONTENTHUB_LIBRARIES}
+     )
  install(TARGETS ${GALLERY} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 === added file 'src/content-communicator.cpp'
 --- src/content-communicator.cpp	1970-01-01 00:00:00 +0000
 +++ src/content-communicator.cpp	2013-08-28 19:23:56 +0000
@@ -0,0 +1,96 @@
++/*
++ * Copyright (C) 2013 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 <content-communicator.h>
++
++#include <QDebug>
++#include <QFileInfo>
++
++#include <com/ubuntu/content/hub.h>
++#include <com/ubuntu/content/item.h>
++#include <com/ubuntu/content/transfer.h>
++
++using namespace com::ubuntu::content;
++
++/*!
++ * \brief ContentCommunicator::ContentCommunicator
++ * \param parent
++ */
++ContentCommunicator::ContentCommunicator(QObject *parent)
++    : ImportExportHandler(parent),
++      m_transfer(nullptr)
++{
++    Hub *hub = Hub::Client::instance();
++    hub->register_import_export_handler(this);
++}
++
++/*!
++ * \brief \reimp
++ */
++void ContentCommunicator::handle_import(content::Transfer *)
++{
++    qDebug() << Q_FUNC_INFO << "gallery does not import content";
++}
++
++/*!
++ * \brief \reimp
++ */
++void ContentCommunicator::handle_export(content::Transfer *transfer)
++{
++    if (m_transfer != nullptr) {
++        qWarning() << "gallery-app does only one content export at a time";
++        transfer->abort();
++        return;
++    }
++
++    m_transfer = transfer;
++    emit photoRequested();
++}
++
++/*!
++ * \brief ContentCommunicator::cancelTransfer aborts the current transfer
++ */
++void ContentCommunicator::cancelTransfer()
++{
++    if (!m_transfer) {
++        qWarning() << "No ongoing transfer to cancel";
++        return;
++    }
++
++    m_transfer->abort();
++}
++
++/*!
++ * \brief ContentCommunicator::returnPhoto returns the given photos
++ * via content hub to the requester
++ * \param urls
++ */
++void ContentCommunicator::returnPhotos(const QVector<QUrl> &urls)
++{
++    if (!m_transfer) {
++        qWarning() << "No ongoing transfer to return a photo";
++        return;
++    }
++
++    QVector<Item> items;
++    items.reserve(urls.size());
++    foreach (const QUrl &url, urls) {
++        items.append(Item(url));
++    }
++    m_transfer->charge(items);
++    m_transfer = nullptr;
++}
 === added file 'src/content-communicator.h'
 --- src/content-communicator.h	1970-01-01 00:00:00 +0000
 +++ src/content-communicator.h	2013-08-28 19:23:56 +0000
@@ -0,0 +1,51 @@
++/*
++ * Copyright (C) 2013 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/>.
++ *
++ */
++
++#ifndef CONTENTCOMMUNICATOR_H
++#define CONTENTCOMMUNICATOR_H
++
++#include <com/ubuntu/content/import_export_handler.h>
++
++#include <QUrl>
++#include <QVector>
++
++using namespace com::ubuntu;
++
++/*!
++ * Class to handle the communication with the content manager
++ */
++class ContentCommunicator : public content::ImportExportHandler
++{
++    Q_OBJECT
++
++public:
++    ContentCommunicator(QObject *parent = nullptr);
++
++    virtual void handle_import(content::Transfer*);
++    virtual void handle_export(content::Transfer *transfer);
++
++    void cancelTransfer();
++    void returnPhotos(const QVector<QUrl> &urls);
++
++signals:
++    void photoRequested();
++
++private:
++    content::Transfer *m_transfer;
++};
++
++#endif // CONTENTCOMMUNICATOR_H
 === modified file 'src/gallery-application.cpp'
 --- src/gallery-application.cpp	2013-08-27 06:48:42 +0000
 +++ src/gallery-application.cpp	2013-08-28 19:23:56 +0000
@@ -81,6 +81,8 @@
      m_galleryManager = new GalleryManager(m_cmdLineParser->picturesDir(), m_view);
      m_galleryManager->logImageLoading(m_cmdLineParser->logImageLoading());
++    if (m_cmdLineParser->pickModeEnabled())
++        m_galleryManager->setDefaultUiMode(GalleryManager::PickContentMode);
      if (m_cmdLineParser->startupTimer())
          qDebug() << "Construct GalleryApplication" << m_timer->elapsed() << "ms";
@@ -161,7 +163,6 @@
      rootContext->setContextProperty("DEVICE_WIDTH", QVariant(size.width()));
      rootContext->setContextProperty("DEVICE_HEIGHT", QVariant(size.height()));
      rootContext->setContextProperty("FORM_FACTOR", QVariant(m_cmdLineParser->formFactor()));
--    rootContext->setContextProperty("PICK_MODE_ENABLED", QVariant(m_cmdLineParser->pickModeEnabled()));
      rootContext->setContextProperty("MAX_GL_TEXTURE_SIZE",
                                      QVariant(m_galleryManager->resource()->maxTextureSize()));
 === modified file 'src/gallery-application.h'
 --- src/gallery-application.h	2013-06-28 11:53:54 +0000
 +++ src/gallery-application.h	2013-08-28 19:23:56 +0000
@@ -56,7 +56,6 @@
      void registerQML();
      void createView();
--
      QQuickView *m_view;
      GalleryManager *m_galleryManager;
      CommandLineParser* m_cmdLineParser;
 === modified file 'src/gallery-manager.cpp'
 --- src/gallery-manager.cpp	2013-08-13 09:31:23 +0000
 +++ src/gallery-manager.cpp	2013-08-28 19:23:56 +0000
@@ -19,6 +19,7 @@
   */
  #include "gallery-manager.h"
++#include "content-communicator.h"
  #include "media-object-factory.h"
  // album
@@ -45,6 +46,7 @@
  // util
  #include "resource.h"
++#include <QApplication>
  #include <QElapsedTimer>
  #include <exiv2/exiv2.hpp>
@@ -70,6 +72,9 @@
        m_eventCollection(0),
        m_previewManager(0),
        m_monitor(0),
++      m_contentCommunicator(new ContentCommunicator(this)),
++      m_pickModeEnabled(false),
++      m_defaultUiMode(BrowseContentMode),
        m_mediaLibrary(0)
+ {
      const int maxTextureSize = m_resource->maxTextureSize();
@@ -77,6 +82,9 @@
      m_mediaFactory = new MediaObjectFactory();
      m_galleryManager = this;
++
++    QObject::connect(m_contentCommunicator, SIGNAL(photoRequested()),
++                     this, SLOT(switchToPickMode()));
+ }
  /*!
@@ -125,10 +133,18 @@
+     }
      QList<MediaSource*> sources = qvariant_cast<QList<MediaSource*> >(variant);
--
++    QVector<QUrl> selectedMedias;
++    selectedMedias.reserve(sources.size());
      foreach (const MediaSource *media, sources) {
--        //FIXME call content manager API
--        qDebug() << "Picked media:" << media->path();
++        QUrl url(media->path().toLocalFile());
++        selectedMedias.append(url);
++    }
++    m_contentCommunicator->returnPhotos(selectedMedias);
++
++    if (m_defaultUiMode == BrowseContentMode) {
++        setUiMode(BrowseContentMode);
++    } else {
++        qApp->quit();
+     }
+ }
@@ -138,7 +154,13 @@
   */
  void GalleryManager::contentPickingCanceled()
+ {
--    //FIXME call content manager API
++    m_contentCommunicator->cancelTransfer();
++
++    if (m_defaultUiMode == BrowseContentMode) {
++        setUiMode(BrowseContentMode);
++    } else {
++        qApp->quit();
++    }
+ }
  /*!
@@ -240,6 +262,41 @@
+ }
  /*!
++ * \brief GalleryManager::setDefaultUiMode set the default UI mode. This might
++ * get overridden during the lifetime
++ * \param mode
++ */
++void GalleryManager::setDefaultUiMode(GalleryManager::UiMode mode)
++{
++    m_defaultUiMode = mode;
++    m_pickModeEnabled = true;
++}
++
++/*!
++ * \brief GalleryManager::setUiMode set's the current UI mode
++ * \param mode
++ */
++void GalleryManager::setUiMode(GalleryManager::UiMode mode)
++{
++    bool enablePickMode = (mode == PickContentMode);
++
++    if (enablePickMode != m_pickModeEnabled) {
++        m_pickModeEnabled = enablePickMode;
++        Q_EMIT pickModeEnabledChanged();
++    }
++}
++
++/*!
++ * \brief GalleryManager::pickModeEnabled returns if the current UI mode should be for
++ * picking acontent
++ * \return
++ */
++bool GalleryManager::pickModeEnabled() const
++{
++    return m_pickModeEnabled;
++}
++
++/*!
   * \brief GalleryManager::logImageLoading enabled or disbaled logging image load
   * times to stdout
   * \param log
@@ -343,6 +400,14 @@
+ }
  /*!
++ * \brief GalleryManager::switchToPickMode
++ */
++void GalleryManager::switchToPickMode()
++{
++    setUiMode(PickContentMode);
++}
++
++/*!
   * \brief GalleryManager::takeGalleryStandardImageProvider returns the standard image provider
   * and gives up the owndership
   */
 === modified file 'src/gallery-manager.h'
 --- src/gallery-manager.h	2013-08-13 09:31:23 +0000
 +++ src/gallery-manager.h	2013-08-28 19:23:56 +0000
@@ -32,6 +32,7 @@
  class AlbumCollection;
  class AlbumDefaultTemplate;
++class ContentCommunicator;
  class Database;
  class EventCollection;
  class GalleryManager;
@@ -51,9 +52,13 @@
+ {
      Q_OBJECT
      Q_PROPERTY(QmlMediaCollectionModel* mediaLibrary READ mediaLibrary NOTIFY mediaLibraryChanged)
--
++    Q_PROPERTY(bool pickModeEnabled READ pickModeEnabled NOTIFY pickModeEnabledChanged)
  public:
++    enum UiMode{
++        BrowseContentMode,
++        PickContentMode
++    };
      GalleryManager(const QString &picturesDir, QQuickView *view);
      ~GalleryManager();
@@ -78,12 +83,18 @@
      QmlMediaCollectionModel *mediaLibrary() const;
++    void setDefaultUiMode(UiMode mode);
++    void setUiMode(UiMode mode);
++    bool pickModeEnabled() const;
++
  signals:
      void mediaLibraryChanged();
++    void pickModeEnabledChanged();
  private slots:
      void onMediaItemAdded(QString file);
      void onMediaItemRemoved(qint64 mediaId);
++    void switchToPickMode();
  private:
      GalleryManager(const GalleryManager&);
@@ -108,6 +119,9 @@
      PreviewManager* m_previewManager;
      MediaObjectFactory *m_mediaFactory;
      MediaMonitor *m_monitor;
++    ContentCommunicator *m_contentCommunicator;
++    bool m_pickModeEnabled;
++    UiMode m_defaultUiMode;
      mutable QmlMediaCollectionModel *m_mediaLibrary;
  };
 === added file 'tests/unittests/stubs/content-communicator_stub.cpp'
 --- tests/unittests/stubs/content-communicator_stub.cpp	1970-01-01 00:00:00 +0000
 +++ tests/unittests/stubs/content-communicator_stub.cpp	2013-08-28 19:23:56 +0000
@@ -0,0 +1,43 @@
++/*
++ * Copyright (C) 2013 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 <content-communicator.h>
++
++using namespace com::ubuntu::content;
++
++ContentCommunicator::ContentCommunicator(QObject *parent)
++    : ImportExportHandler(parent),
++      m_transfer(nullptr)
++{
++}
++
++void ContentCommunicator::handle_import(content::Transfer *)
++{
++}
++
++void ContentCommunicator::handle_export(content::Transfer *)
++{
++}
++
++void ContentCommunicator::cancelTransfer()
++{
++}
++
++void ContentCommunicator::returnPhotos(const QVector<QUrl> &urls)
++{
++    Q_UNUSED(urls);
++}
 === modified file 'tests/unittests/stubs/gallery-manager_stub.cpp'
 --- tests/unittests/stubs/gallery-manager_stub.cpp	2013-08-13 09:31:23 +0000
 +++ tests/unittests/stubs/gallery-manager_stub.cpp	2013-08-28 19:23:56 +0000
@@ -119,6 +119,15 @@
      Q_UNUSED(mediaId);
+ }
++bool GalleryManager::pickModeEnabled() const
++{
++    return false;
++}
++
++void GalleryManager::switchToPickMode()
++{
++}
++
  GalleryStandardImageProvider* GalleryManager::takeGalleryStandardImageProvider()
+ {
      return 0;
@@ -127,4 +136,4 @@
  GalleryThumbnailImageProvider* GalleryManager::takeGalleryThumbnailImageProvider()
+ {
      return 0;
--}
 \ No newline at end of file
++}
 === modified file 'tests/unittests/video/CMakeLists.txt'
 --- tests/unittests/video/CMakeLists.txt	2013-08-14 07:26:50 +0000
 +++ tests/unittests/video/CMakeLists.txt	2013-08-28 19:23:56 +0000
@@ -24,10 +24,16 @@
      ${gallery_video_src_SOURCE_DIR}
+     )
++QT_WRAP_CPP(mediaobjectfactory TST_VIDEO_MOCS
++    ${gallery_src_SOURCE_DIR}/content-communicator.h
++    )
++
  add_executable(video
      tst_video.cpp
      ${gallery_src_SOURCE_DIR}/gallery-manager.cpp
      ${gallery_src_SOURCE_DIR}/media-object-factory.cpp
++    ../stubs/content-communicator_stub.cpp
++    ${TST_VIDEO_MOCS}
+     )
  qt5_use_modules(video Widgets Core Qml Quick Test)
@@ -48,4 +54,5 @@
      gallery-qml
      gallery-util
      gallery-video
++    "content-hub"
+     )