Merge lp:~artmello/gallery-app/gallery-app-handle_gif_files into lp:gallery-app

[Arthur Mello]

Make gallery display files that are not supported by QImageWriter or that do not have metadata
Disable the editing options for files that are not supported by QImageWriter

Make gallery display files that are not supported by QImageWriter or that do not have metadata
Disable the editing options for files that are not supported by QImageWriter

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1123
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1086/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/66/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/335/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/98/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/341/console

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

review: Needs Fixing (continuous-integration)

[lp:~artmello/gallery-app/gallery-app-handle_gif_files]

1124. By Arthur Mello on 2014-12-17

Fix stub on unittests

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1124
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1087/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/15
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/67
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/337/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/706
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/99
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16639
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-vivid/277/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/343
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/343/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Bill Filler (bfiller)]

approved

review: Approve

=== modified file 'rc/qml/MediaViewer/MediaViewer.qml'
--- rc/qml/MediaViewer/MediaViewer.qml	2014-11-06 14:43:21 +0000
+++ rc/qml/MediaViewer/MediaViewer.qml	2014-12-17 10:40:49 +0000
@@ -479,6 +479,7 @@
                 objectName: "editButton"
                 text: i18n.tr("Edit")
                 iconSource: "../../img/edit.png"
+                enabled: galleryPhotoViewer.media.canBeEdited
                 onTriggered: PopupUtils.open(editPopoverComponent, null);
             },
             Action {

=== modified file 'src/photo/photo.cpp'
--- src/photo/photo.cpp	2014-02-11 19:56:40 +0000
+++ src/photo/photo.cpp	2014-12-17 10:40:49 +0000
@@ -169,13 +169,7 @@
             return false;
     }
 
-    PhotoMetadata* tmp = PhotoMetadata::fromFile(file);
-    if (tmp == NULL)
-        return false;
-
-    delete tmp;
-    return reader.canRead() &&
-            QImageWriter::supportedImageFormats().contains(reader.format());
+    return reader.canRead();
 }
 
 /*!
@@ -394,6 +388,11 @@
     return currentState().isOriginal();
 }
 
+bool Photo::canBeEdited() const
+{
+    return QImageWriter::supportedImageFormats().contains(m_fileFormat.toUtf8());
+}
+
 /*!
  * \brief Photo::rotateRight
  */

=== modified file 'src/photo/photo.h'
--- src/photo/photo.h	2013-07-26 15:43:53 +0000
+++ src/photo/photo.h	2014-12-17 10:40:49 +0000
@@ -44,6 +44,7 @@
     Q_PROPERTY(bool canUndo READ canUndo NOTIFY editStackChanged)
     Q_PROPERTY(bool canRedo READ canRedo NOTIFY editStackChanged)
     Q_PROPERTY(bool isOriginal READ isOriginal NOTIFY editStackChanged)
+    Q_PROPERTY(bool canBeEdited READ canBeEdited)
 
 public:
     explicit Photo(const QFileInfo& file);
@@ -69,6 +70,7 @@
     bool canUndo() const;
     bool canRedo() const;
     bool isOriginal() const;
+    bool canBeEdited() const;
 
     Q_INVOKABLE void revertToOriginal();
     Q_INVOKABLE void undo();

=== modified file 'tests/unittests/stubs/photo_stub.cpp'
--- tests/unittests/stubs/photo_stub.cpp	2013-07-26 15:43:53 +0000
+++ tests/unittests/stubs/photo_stub.cpp	2014-12-17 10:40:49 +0000
@@ -122,6 +122,11 @@
     return true;
 }
 
+bool Photo::canBeEdited() const
+{
+    return true;
+}
+
 void Photo::rotateRight()
 {
 }