camera-app

Merge lp:~fboucault/camera-app/sdcard into lp:camera-app

sdcard
Merge into trunk

Proposed by Florian Boucault on 2014-11-17

Status:

Merged

Approved by:

Bill Filler on 2014-12-11

Approved revision:

436

Merged at revision:

451

Proposed branch:

lp:~fboucault/camera-app/sdcard

Merge into:

lp:camera-app

Diff against target:

285 lines (+136/-17)

6 files modified

GalleryView.qml (+3/-1)
ViewFinderOverlay.qml (+36/-0)
camera-apparmor.json (+1/-1)
cameraapplication.cpp (+58/-0)
cameraapplication.h (+11/-0)
po/camera-app.pot (+27/-15)

To merge this branch:

bzr merge lp:~fboucault/camera-app/sdcard

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-12-12
Ubuntu Phablet Team		2014-11-17	Pending
Review via email: mp+241971@code.launchpad.net

Commit message

Add an option to save photos and videos to external SD card.
Adapted bottom edge UI to accomodate for more than 3 settings.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-17:

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

review: Needs Fixing (continuous-integration)

lp:~fboucault/camera-app/sdcard updated on 2014-11-18

427. By Florian Boucault on 2014-11-17: Blurred viewfinder is now darker making bottom edge more readable.
428. By Florian Boucault on 2014-11-17: Less opaque blur.
429. By Florian Boucault on 2014-11-17: Merged trunk
430. By Florian Boucault on 2014-11-18: Show/hide SD card option when an SD card is present/not present.
431. By Florian Boucault on 2014-11-18: Update pot
432. By Florian Boucault on 2014-11-18: Better backend code.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-11-18:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-11-24:

Pending two security fixes:
1) https://bugs.launchpad.net/ubuntu/+source/apparmor-easyprof-ubuntu/+bug/1391930
2) creation of Pictures and Videos directories on the SD card when plugged in (sergiusens taking care of it)

Revision history for this message

Florian Boucault (fboucault) wrote on 2014-12-01:

> 2) creation of Pictures and Videos directories on the SD card when plugged in
> (sergiusens taking care of it)

Link: https://code.launchpad.net/~sergiusens/ciborium/mediadirs/+merge/242838

lp:~fboucault/camera-app/sdcard updated on 2014-12-02

433. By Florian Boucault on 2014-12-02: Removed unwanted write/read paths from apparmor profile.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-02:

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

review: Needs Fixing (continuous-integration)

lp:~fboucault/camera-app/sdcard updated on 2014-12-05

434. By Florian Boucault on 2014-12-05: Merged from trunk

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-11:

FAILED: Continuous integration, rev:434
http://jenkins.qa.ubuntu.com/job/camera-app-ci/342/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/38/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/55/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/290/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/80/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/296/console

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

review: Needs Fixing (continuous-integration)

lp:~fboucault/camera-app/sdcard updated on 2014-12-11

435. By Florian Boucault on 2014-12-11: Merged from trunk
436. By Florian Boucault on 2014-12-11: Added bug

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-12-11:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

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

review: Needs Fixing (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:

Florian Boucault

Ubuntu Phablet Team

deaunapaul

 === modified file 'GalleryView.qml'
 --- GalleryView.qml	2014-12-03 12:37:15 +0000
 +++ GalleryView.qml	2014-12-11 16:55:23 +0000
@@ -29,7 +29,9 @@
      property bool userSelectionMode: false
      property Item currentView: state == "GRID" ? photogridView : slideshowView
      property var model: FoldersModel {
--        folders: [application.picturesLocation, application.videosLocation]
++        folders: [application.picturesLocation, application.videosLocation,
++                  application.removableStoragePicturesLocation,
++                  application.removableStorageVideosLocation]
          typeFilters: !main.contentExportMode ? [ "image", "video" ]
                                                : [MimeTypeMapper.contentTypeToMimeType(main.transferContentType)]
          singleSelectionOnly: main.transfer.selectionType === ContentTransfer.Single
 === modified file 'ViewFinderOverlay.qml'
 --- ViewFinderOverlay.qml	2014-12-09 21:48:11 +0000
 +++ ViewFinderOverlay.qml	2014-12-11 16:55:23 +0000
@@ -46,6 +46,7 @@
          property int selfTimerDelay: 0
          property int encodingQuality: 2 // QMultimedia.NormalQuality
          property bool gridEnabled: false
++        property bool preferRemovableStorage: false
+     }
      Binding {
@@ -296,9 +297,39 @@
                      label: QT_TR_NOOP("Off")
                      value: false
+                 }
++            },
++            ListModel {
++                id: removableStorageOptionsModel
++
++                property string settingsProperty: "preferRemovableStorage"
++                property string icon: ""
++                property string label: i18n.tr("SD")
++                property bool isToggle: true
++                property int selectedIndex: bottomEdge.indexForValue(removableStorageOptionsModel, settings.preferRemovableStorage)
++                property bool available: application.removableStoragePresent
++                property bool visible: available
++
++                ListElement {
++                    icon: ""
++                    label: QT_TR_NOOP("Save to SD Card")
++                    value: true
++                }
++                ListElement {
++                    icon: ""
++                    label: QT_TR_NOOP("Save internally")
++                    value: false
++                }
+             }
+         ]
++        /* FIXME: application.removableStoragePresent is not updated dynamically.
++           Workaround that by reading it when the bottom edge is opened/closed.
++        */
++        Connections {
++            target: bottomEdge
++            onOpenedChanged: removableStorageOptionsModel.available = application.removableStoragePresent
++        }
++
          function indexForValue(model, value) {
              var i;
              var element;
@@ -418,6 +449,9 @@
+             }
              if (camera.captureMode == Camera.CaptureVideo) {
++                if (application.removableStoragePresent && settings.preferRemovableStorage) {
++                    camera.videoRecorder.outputLocation = application.removableStorageVideosLocation;
++                }
                  if (camera.videoRecorder.recorderState == CameraRecorder.StoppedState) {
                      camera.videoRecorder.setMetadata("Orientation", orientation);
                      camera.videoRecorder.record();
@@ -441,6 +475,8 @@
+                 }
                  if (main.contentExportMode) {
                      camera.imageCapture.captureToLocation(application.temporaryLocation);
++                } else if (application.removableStoragePresent && settings.preferRemovableStorage) {
++                    camera.imageCapture.captureToLocation(application.removableStoragePicturesLocation);
                  } else {
                      camera.imageCapture.captureToLocation(application.picturesLocation);
+                 }
 === modified file 'camera-apparmor.json'
 --- camera-apparmor.json	2014-07-31 18:41:17 +0000
 +++ camera-apparmor.json	2014-12-11 16:55:23 +0000
@@ -11,4 +11,4 @@
          "location"
      ],
      "policy_version": 1.2
--}
 \ No newline at end of file
++}
 === modified file 'cameraapplication.cpp'
 --- cameraapplication.cpp	2014-09-03 18:51:53 +0000
 +++ cameraapplication.cpp	2014-12-11 16:55:23 +0000
@@ -147,3 +147,61 @@
      dir.mkpath(location);
      return location;
+ }
++
++bool CameraApplication::removableStoragePresent() const
++{
++    return !removableStorageLocation().isEmpty();
++}
++
++QString CameraApplication::removableStorageLocation() const
++{
++    /* FIXME: when Qt5.4 is available, switch to using newly introduced
++     * QStorageInfo API.
++     * Ref.: http://doc-snapshot.qt-project.org/qt5-5.4/qstorageinfo.html
++     */
++    QString userName = qgetenv("USER");
++    QDir media("/media/" + userName);
++    QStringList mediaDirs = media.entryList(QDir::Dirs | QDir::NoDotAndDotDot);
++
++    if (mediaDirs.size() > 0) {
++        return QString("/media/" + userName + "/" + mediaDirs.at(0));
++    } else {
++        return QString();
++    }
++}
++
++QString CameraApplication::removableStoragePicturesLocation() const
++{
++    QString storageLocation = removableStorageLocation();
++    if (storageLocation.isEmpty()) {
++        return QString();
++    }
++
++    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation);
++    QString pictureDir = QString(locations.at(0)).split("/").value(3);
++    if (pictureDir.isEmpty()){
++        return QString();
++    }
++    QString location = storageLocation + "/" + pictureDir;
++    QDir dir;
++    dir.mkpath(location);
++    return location;
++}
++
++QString CameraApplication::removableStorageVideosLocation() const
++{
++    QString storageLocation = removableStorageLocation();
++    if (storageLocation.isEmpty()) {
++        return QString();
++    }
++
++    QStringList locations = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation);
++    QString movieDir = QString(locations.at(0)).split("/").value(3);
++    if (movieDir.isEmpty()){
++        return QString();
++    }
++    QString location = storageLocation + "/" + movieDir;
++    QDir dir;
++    dir.mkpath(location);
++    return location;
++}
 === modified file 'cameraapplication.h'
 --- cameraapplication.h	2014-07-31 18:41:17 +0000
 +++ cameraapplication.h	2014-12-11 16:55:23 +0000
@@ -32,6 +32,10 @@
      Q_PROPERTY(QString picturesLocation READ picturesLocation CONSTANT)
      Q_PROPERTY(QString videosLocation READ videosLocation CONSTANT)
      Q_PROPERTY(QString temporaryLocation READ temporaryLocation CONSTANT)
++    Q_PROPERTY(bool removableStoragePresent READ removableStoragePresent NOTIFY removableStoragePresentChanged)
++    Q_PROPERTY(QString removableStorageLocation READ removableStorageLocation CONSTANT)
++    Q_PROPERTY(QString removableStoragePicturesLocation READ removableStoragePicturesLocation CONSTANT)
++    Q_PROPERTY(QString removableStorageVideosLocation READ removableStorageVideosLocation CONSTANT)
  public:
      CameraApplication(int &argc, char **argv);
@@ -41,6 +45,13 @@
      QString picturesLocation() const;
      QString videosLocation() const;
      QString temporaryLocation() const;
++    bool removableStoragePresent() const;
++    QString removableStorageLocation() const;
++    QString removableStoragePicturesLocation() const;
++    QString removableStorageVideosLocation() const;
++
++Q_SIGNALS:
++    void removableStoragePresentChanged();
  private:
      QScopedPointer<QQuickView> m_view;
 === modified file 'po/camera-app.pot'
 --- po/camera-app.pot	2014-12-08 11:49:38 +0000
 +++ po/camera-app.pot	2014-12-11 16:55:23 +0000
@@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: camera-app\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2014-12-08 09:47-0200\n"
++"POT-Creation-Date: 2014-12-11 10:23-0200\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@
  msgid "Cancel"
  msgstr ""
--#: ../GalleryView.qml:180
++#: ../GalleryView.qml:182
  msgid "No media available."
  msgstr ""
@@ -49,46 +49,58 @@
  msgid "Share"
  msgstr ""
--#: ../ViewFinderOverlay.qml:140 ../ViewFinderOverlay.qml:163
--#: ../ViewFinderOverlay.qml:191 ../ViewFinderOverlay.qml:214
--#: ../ViewFinderOverlay.qml:291
++#: ../ViewFinderOverlay.qml:141 ../ViewFinderOverlay.qml:164
++#: ../ViewFinderOverlay.qml:192 ../ViewFinderOverlay.qml:215
++#: ../ViewFinderOverlay.qml:292
  msgid "On"
  msgstr ""
--#: ../ViewFinderOverlay.qml:145 ../ViewFinderOverlay.qml:173
--#: ../ViewFinderOverlay.qml:196 ../ViewFinderOverlay.qml:219
--#: ../ViewFinderOverlay.qml:238 ../ViewFinderOverlay.qml:296
++#: ../ViewFinderOverlay.qml:146 ../ViewFinderOverlay.qml:174
++#: ../ViewFinderOverlay.qml:197 ../ViewFinderOverlay.qml:220
++#: ../ViewFinderOverlay.qml:239 ../ViewFinderOverlay.qml:297
  msgid "Off"
  msgstr ""
--#: ../ViewFinderOverlay.qml:168
++#: ../ViewFinderOverlay.qml:169
  msgid "Auto"
  msgstr ""
--#: ../ViewFinderOverlay.qml:205
++#: ../ViewFinderOverlay.qml:206
  msgid "HDR"
  msgstr ""
--#: ../ViewFinderOverlay.qml:243
++#: ../ViewFinderOverlay.qml:244
  msgid "5 seconds"
  msgstr ""
--#: ../ViewFinderOverlay.qml:248
++#: ../ViewFinderOverlay.qml:249
  msgid "15 seconds"
  msgstr ""
--#: ../ViewFinderOverlay.qml:265
++#: ../ViewFinderOverlay.qml:266
  msgid "Fine Quality"
  msgstr ""
--#: ../ViewFinderOverlay.qml:269
++#: ../ViewFinderOverlay.qml:270
  msgid "Normal Quality"
  msgstr ""
--#: ../ViewFinderOverlay.qml:273
++#: ../ViewFinderOverlay.qml:274
  msgid "Basic Quality"
  msgstr ""
++#: ../ViewFinderOverlay.qml:306
++msgid "SD"
++msgstr ""
++
++#: ../ViewFinderOverlay.qml:314
++msgid "Save to SD Card"
++msgstr ""
++
++#: ../ViewFinderOverlay.qml:319
++msgid "Save internally"
++msgstr ""
++
  #: ../camera-app.qml:36
  msgid "Flash"
  msgstr ""

camera-app

Merge lp:~fboucault/camera-app/sdcard into lp:camera-app

Commit message

Description of the change

Preview Diff

Subscribers