camera-app

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

  1. save_videos_subfolder
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Ugo Riboni
Approved revision: 326
Merged at revision: 333
Proposed branch: lp:~fboucault/camera-app/save_videos_subfolder
Merge into: lp:camera-app
Diff against target: 34 lines (+3/-3)
2 files modified
cameraapplication.cpp (+2/-2)
main.cpp (+1/-1)
To merge this branch: bzr merge lp:~fboucault/camera-app/save_videos_subfolder
Reviewer Review Type Date Requested Status
Ugo Riboni (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+228740@code.launchpad.net

Commit message

Save videos in a subfolder of ~/Videos

To post a comment you must log in.
Revision history for this message
Florian Boucault (fboucault) wrote :

Depends on https://code.launchpad.net/~fboucault/qtubuntu-camera/save_videos_subfolder/+merge/228741

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:326
http://jenkins.qa.ubuntu.com/job/camera-app-ci/248/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-armhf-ci/64/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-utopic-i386-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/2136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/368
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/348
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10638
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2394
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/2394/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Ugo Riboni (uriboni) wrote :

The directory gets created but the file isn't written, as expected due to the dependent MR

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cameraapplication.cpp'
2--- cameraapplication.cpp 2014-07-02 15:43:31 +0000
3+++ cameraapplication.cpp 2014-07-29 18:11:40 +0000
4@@ -110,7 +110,7 @@
5
6 QString CameraApplication::picturesLocation() const
7 {
8- QString location = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).at(0) + "/camera";
9+ QString location = QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).at(0) + "/" + QCoreApplication::applicationName();
10 QDir dir;
11 dir.mkpath(location);
12 return location;
13@@ -118,7 +118,7 @@
14
15 QString CameraApplication::videosLocation() const
16 {
17- QString location = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation).at(0);
18+ QString location = QStandardPaths::standardLocations(QStandardPaths::MoviesLocation).at(0) + "/" + QCoreApplication::applicationName();
19 QDir dir;
20 dir.mkpath(location);
21 return location;
22
23=== modified file 'main.cpp'
24--- main.cpp 2013-06-27 00:31:29 +0000
25+++ main.cpp 2014-07-29 18:11:40 +0000
26@@ -28,7 +28,7 @@
27
28 int main(int argc, char** argv)
29 {
30- QGuiApplication::setApplicationName("Camera App");
31+ QGuiApplication::setApplicationName("camera");
32 CameraApplication application(argc, argv);
33
34 if (!application.setup()) {

Subscribers

People subscribed via source and target branches