gallery-app

Merge lp:~phablet-team/gallery-app/share-from-selection into lp:gallery-app

share-from-selection
Merge into trunk

Proposed by Ugo Riboni on 2014-09-10

Status:

Merged

Approved by:

Bill Filler on 2014-09-24

Approved revision:

1068

Merged at revision:

1079

Proposed branch:

lp:~phablet-team/gallery-app/share-from-selection

Merge into:

lp:gallery-app

Diff against target:

281 lines (+142/-4)

8 files modified

rc/qml/EventsOverview.qml (+47/-0)
rc/qml/MediaViewer/MediaViewer.qml (+1/-1)
rc/qml/PhotosOverview.qml (+45/-0)
rc/qml/Utility/SelectionState.qml (+31/-0)
rc/qml/Utility/SelectionToolbarAction.qml (+1/-1)
src/qml/qml-view-collection-model.cpp (+12/-0)
src/qml/qml-view-collection-model.h (+3/-0)
tests/autopilot/gallery_app/emulators/photo_viewer.py (+2/-2)

To merge this branch:

bzr merge lp:~phablet-team/gallery-app/share-from-selection

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Bill Filler (community)		2014-09-10	Approve on 2014-09-24
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-09-22
Review via email: mp+234215@code.launchpad.net

Commit message

Allow sharing from the events or photo view, while selecting.

Description of the change

Allow sharing from the events or photo view, while selecting.

Currently no application knows how to handle shares of multiple media. However the share peer picker displays these apps anyway (facebook and messaging) when there is multiple media selected, and going into these apps will give broken behaviour.
For this reason currently the share button is only enabled when there's one single item selected. This should be fixed in the content hub by allowing apps to declare if they can handle multiple selections or not.

Additionally the share button in the header does not visually show as disabled, even though it is, this is due to a bug in the SDK: https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1369640

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-10:

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

review: Needs Fixing (continuous-integration)

lp:~phablet-team/gallery-app/share-from-selection updated on 2014-09-15

1060. By Ugo Riboni on 2014-09-15: Hide the header when launching the share picker. Correctly count selected medias.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-15:

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

review: Needs Fixing (continuous-integration)

lp:~phablet-team/gallery-app/share-from-selection updated on 2014-09-16

1061. By Ugo Riboni on 2014-09-16: Fix naming object naming to prevent existing tests from failing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

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

review: Needs Fixing (continuous-integration)

lp:~phablet-team/gallery-app/share-from-selection updated on 2014-09-16

1062. By Ugo Riboni on 2014-09-16: Change the share photo message to a generic share because we could be sharing a video too

Revision history for this message

Bill Filler (bfiller) wrote on 2014-09-16:

2 issues:
1) screen totally white on gallery-app after returning from share
2) AP test is failing, see above

review: Needs Fixing

Revision history for this message

Bill Filler (bfiller) wrote on 2014-09-16:

Another issue:
I see the header stay visible if it was previously turned on, meaning: 1) from events view open a photo and click on it to reveal the header 2) press back button 3) select a photo and share. Then header incorrectly visible on pick screen

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

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

review: Needs Fixing (continuous-integration)

lp:~phablet-team/gallery-app/share-from-selection updated on 2014-09-16

1063. By Ugo Riboni on 2014-09-16: Temporarily merge qtcompat branch
1064. By Ugo Riboni on 2014-09-16: More properly fix test

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

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

review: Needs Fixing (continuous-integration)

lp:~phablet-team/gallery-app/share-from-selection updated on 2014-09-16

1065. By Ugo Riboni on 2014-09-16: Fix incorrect calculation of media types and total media
1066. By Ugo Riboni on 2014-09-16: Hide and show the ContentPeerPicker more properly

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-16:

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

review: Approve (continuous-integration)

lp:~phablet-team/gallery-app/share-from-selection updated on 2014-09-22

1067. By Ugo Riboni on 2014-09-22: Merge changes from trunk
1068. By Ugo Riboni on 2014-09-22: Make sure header is hidden even when sharing after coming back from photo viewer

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-09-22:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Bill Filler (bfiller) wrote on 2014-09-24:

tested, approved
Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

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:

Ubuntu Phablet Team

 === modified file 'rc/qml/EventsOverview.qml'
 --- rc/qml/EventsOverview.qml	2014-09-17 16:59:32 +0000
 +++ rc/qml/EventsOverview.qml	2014-09-22 14:10:21 +0000
@@ -18,6 +18,7 @@
  import Ubuntu.Components 0.1
  import Ubuntu.Components.Popups 0.1
  import Gallery 1.0
++import Ubuntu.Content 0.1
  import "Components"
  import "OrganicView"
  import "Utility"
@@ -99,8 +100,54 @@
          onDeleteClicked: {
              PopupUtils.open(deleteDialog, null);
+         }
++
++        onShareClicked: {
++            overview.pushPage(sharePicker);
++            sharePicker.visible = true;
++        }
+     }
      property bool selectionMode: selection.inSelectionMode
      tools: selectionMode ? selectionTools : overviewTools
++
++    Component {
++        id: contentItemComp
++        ContentItem {}
++    }
++
++    Page {
++        id: sharePicker
++        visible: false
++        title: i18n.tr("Share to")
++
++        ContentPeerPicker {
++            objectName: "sharePickerEvents"
++            anchors.fill: parent
++            showTitle: false
++
++            contentType: organicEventView.selection.mediaType === MediaSource.Video ? ContentType.Videos : ContentType.Pictures
++            handler: ContentHandler.Share
++
++            onPeerSelected: {
++                overview.popPage();
++                sharePicker.visible = false;
++
++                var curTransfer = peer.request();
++                if (curTransfer.state === ContentTransfer.InProgress)
++                {
++                    var medias = organicEventView.selection.model.selectedMediasQML;
++                    curTransfer.items = medias.filter(function(data) {
++                        return data.hasOwnProperty('type'); // filter out event headers
++                    }).map(function(data) {
++                        return contentItemComp.createObject(parent, {"url": data.path});
++                    });
++                    curTransfer.state = ContentTransfer.Charged;
++                }
++            }
++            onCancelPressed: {
++                overview.popPage();
++                sharePicker.visible = false;
++            }
++        }
++    }
+ }
 === modified file 'rc/qml/MediaViewer/MediaViewer.qml'
 --- rc/qml/MediaViewer/MediaViewer.qml	2014-09-03 00:14:45 +0000
 +++ rc/qml/MediaViewer/MediaViewer.qml	2014-09-22 14:10:21 +0000
@@ -499,7 +499,7 @@
              },
              Action {
                  objectName: "shareButton"
--                text: i18n.tr("Share photo")
++                text: i18n.tr("Share")
                  iconName: "share"
                  visible: !APP.desktopMode
                  onTriggered: sharePicker.visible = true;
 === modified file 'rc/qml/PhotosOverview.qml'
 --- rc/qml/PhotosOverview.qml	2014-09-17 16:59:32 +0000
 +++ rc/qml/PhotosOverview.qml	2014-09-22 14:10:21 +0000
@@ -21,6 +21,7 @@
  import Gallery 1.0
  import Ubuntu.Components 0.1
  import Ubuntu.Components.Popups 0.1
++import Ubuntu.Content 0.1
  import "Components"
  import "OrganicView"
  import "Utility"
@@ -50,6 +51,8 @@
          d.selection.inSelectionMode = false;
+     }
++    property string pageTitle
++
      tools: inSelectionMode ? d.selectionTools : d.overviewTools
      Image {
@@ -114,6 +117,48 @@
              onDeleteClicked: {
                  PopupUtils.open(deleteDialog, null);
+             }
++
++            onShareClicked: {
++                overview.pushPage(sharePicker)
++                sharePicker.visible = true;
++            }
++        }
++    }
++
++    Component {
++        id: contentItemComp
++        ContentItem {}
++    }
++
++    Page {
++        id: sharePicker
++        visible: false
++        title: i18n.tr("Share to")
++
++        ContentPeerPicker {
++            objectName: "sharePickerPhotos"
++            showTitle: false
++            anchors.fill: parent
++            contentType: d.selection.mediaType === MediaSource.Video ? ContentType.Videos : ContentType.Pictures
++            handler: ContentHandler.Share
++
++            onPeerSelected: {
++                overview.popPage();
++                sharePicker.visible = false;
++
++                var curTransfer = peer.request();
++                if (curTransfer.state === ContentTransfer.InProgress)
++                {
++                    curTransfer.items = d.selection.model.selectedMediasQML.map(function(data) {
++                        return contentItemComp.createObject(parent, {"url": data.path});
++                    });
++                    curTransfer.state = ContentTransfer.Charged;
++                }
++            }
++            onCancelPressed: {
++                overview.popPage();
++                sharePicker.visible = false;
++            }
+         }
+     }
+ }
 === modified file 'rc/qml/Utility/SelectionState.qml'
 --- rc/qml/Utility/SelectionState.qml	2013-06-26 08:59:08 +0000
 +++ rc/qml/Utility/SelectionState.qml	2014-09-22 14:10:21 +0000
@@ -31,6 +31,12 @@
      property bool allowSelectionModeChange: true
      /// It true, only one item can be selected
      property bool singleSelect: false
++    /// If true, a mix of videos and pictures is selected.
++    /// Should be ignored if only one item is selected.
++    property bool isMixed: false
++    /// The type of all the selected media.
++    /// Should be ignored if isMixed is true.
++    property var mediaType
      /*!
      */
@@ -38,10 +44,35 @@
          monitored: true
+     }
++    Connections {
++        target: model
++        onSelectionChanged: {
++            var data = model.selectedMediasQML;
++            var photos = 0;
++            var videos = 0;
++            var medias = 0;
++
++            for (var i in data) {
++                if (data[i].hasOwnProperty('type')) {
++                    medias++;
++                    (data[i].type === MediaSource.Photo) ? photos++ : videos++;
++                }
++            }
++
++            organicSelectionState.mediaType = (photos > videos) ? MediaSource.Photo : MediaSource.Video;
++            organicSelectionState.isMixed = (photos > 0 && videos > 0);
++            organicSelectionState.selectedMediaCount = medias;
++        }
++    }
++
      // readonly
      /// The number of currently selected items
      property int selectedCount: model.selectedCount
++    // readonly
++    /// The number of currently selected media items
++    property int selectedMediaCount: 0
++
      //internal
      // HACK: this is used as a spurious extra QML condition in our isSelected
      // check so we can cause the function to be reevaluated whenever the
 === modified file 'rc/qml/Utility/SelectionToolbarAction.qml'
 --- rc/qml/Utility/SelectionToolbarAction.qml	2014-08-31 09:22:54 +0000
 +++ rc/qml/Utility/SelectionToolbarAction.qml	2014-09-22 14:10:21 +0000
@@ -64,7 +64,7 @@
              objectName: "shareButton"
              text: i18n.tr("Share")
              iconName: "share"
--            enabled: root.selection.selectedCount > 0
++            enabled: root.selection.selectedMediaCount == 1
              onTriggered: root.shareClicked();
+         }
+     }
 === modified file 'src/qml/qml-view-collection-model.cpp'
 --- src/qml/qml-view-collection-model.cpp	2014-08-20 18:37:06 +0000
 +++ src/qml/qml-view-collection-model.cpp	2014-09-22 14:10:21 +0000
@@ -413,6 +413,18 @@
      return selectedList;
+ }
++QVariantList QmlViewCollectionModel::selectedMediasQML() const
++{
++    QVariantList selectedList;
++    QSet<DataObject*> totalSelection = m_view->getSelected();
++    foreach (DataObject* data, totalSelection) {
++        QVariant var;
++        var.setValue(data);
++        selectedList << var;
++    }
++    return selectedList;
++}
++
  /*!
   * \brief QmlViewCollectionModel::setBackingViewCollection
   * \param view
 === modified file 'src/qml/qml-view-collection-model.h'
 --- src/qml/qml-view-collection-model.h	2014-08-19 08:28:09 +0000
 +++ src/qml/qml-view-collection-model.h	2014-09-22 14:10:21 +0000
@@ -26,6 +26,7 @@
  #include <QList>
  #include <QModelIndex>
  #include <QVariant>
++#include <QVariantList>
  // core
  #include <data-collection.h>
@@ -48,6 +49,7 @@
      Q_PROPERTY(int selectedCount READ selectedCount NOTIFY selectedCountChanged)
      // not for use in QML directly, but QML can use it, to pass it as QVariant back to C++
      Q_PROPERTY(QList<MediaSource*> selectedMedias READ selectedMedias NOTIFY selectionChanged)
++    Q_PROPERTY(QVariantList selectedMediasQML READ selectedMediasQML NOTIFY selectionChanged)
      Q_PROPERTY(QVariant forCollection READ forCollection WRITE setForCollection
                 NOTIFY backingCollectionChanged)
      Q_PROPERTY(QVariant monitorSelection READ monitorSelection
@@ -119,6 +121,7 @@
      void setMediaTypeFilter(MediaSource::MediaType mediaTypeFilter);
      QList<MediaSource*> selectedMedias() const;
++    QVariantList selectedMediasQML() const;
      SelectableViewCollection* backingViewCollection() const;
 === modified file 'tests/autopilot/gallery_app/emulators/photo_viewer.py'
 --- tests/autopilot/gallery_app/emulators/photo_viewer.py	2014-09-03 00:14:45 +0000
 +++ tests/autopilot/gallery_app/emulators/photo_viewer.py	2014-09-22 14:10:21 +0000
@@ -31,8 +31,8 @@
      def get_content_peer_picker_cancel_button(self):
          """Returns the ContentPeerPicker cancel button."""
--        return self.app.wait_select_single("Button",
--                                           objectName="contentPeerPickerCancelButton")
++        return self.get_share_peer_picker().wait_select_single("Button",
++                                            objectName="contentPeerPickerCancelButton")
      def get_share_peer_picker(self):
          """Returns the photo viewer share picker."""