Merge lp:~mzanetti/reminders-app/gif-support into lp:reminders-app

[Michael Zanetti]

add gif support

As Qt doesn't support writing gif (probably licensing reasons) the code
will now always store cached images as jpg

[lp:~mzanetti/reminders-app/gif-support]

293. By Michael Zanetti on 2014-11-06

drop unneeded _

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:293
http://91.189.93.70:8080/job/reminders-app-ci/583/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-vivid/35
        deb: http://91.189.93.70:8080/job/generic-mediumtests-vivid/35/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/reminders-app-vivid-amd64-ci/4

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/reminders-app-ci/583/rebuild

review: Approve (continuous-integration)

[David Planella (dpm)]

Looks good to me and works as expected!

review: Approve

=== modified file 'src/plugin/Evernote/resource.cpp'
--- src/plugin/Evernote/resource.cpp	2014-05-06 20:48:29 +0000
+++ src/plugin/Evernote/resource.cpp	2014-11-06 12:24:20 +0000
@@ -77,6 +77,8 @@
         m_type = "image/png";
     } else if (m_fileName.endsWith(".jpg") || m_fileName.endsWith(".jpeg")) {
         m_type = "image/jpeg";
+    } else if (m_fileName.endsWith(".gif")) {
+        m_type = "image/gif";
     } else {
         qWarning() << "cannot determine mime type of file" << m_fileName;
     }
@@ -113,7 +115,7 @@
 
     QString finalFilePath = m_filePath;
     if (size.isValid() && !size.isNull()) {
-        finalFilePath = m_filePath + "_" + QString::number(size.width()) + "x" + QString::number(size.height()) + "_" + m_fileName;
+        finalFilePath = m_filePath + "_" + QString::number(size.width()) + "x" + QString::number(size.height()) + ".jpg";
         QFileInfo fi(finalFilePath);
         if (!fi.exists()) {
             QImage image(m_filePath);