Merge lp:~phablet-team/gallery-app/gallery-app-new-album-i18n into lp:gallery-app

[Ugo Riboni]

Move the new album strings to QML to make them translatable. Remove some dead code.

Move the new album strings to QML to make them translatable. Remove some dead code.

[lp:~phablet-team/gallery-app/gallery-app-new-album-i18n]

1050. By Ugo Riboni on 2014-09-02

merge changes from trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1049
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/973/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/148
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/314
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3239
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/455
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/509
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2656
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3532
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3532/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1050
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/974/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-amd64-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/149
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-armhf-ci/149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-utopic-i386-ci/149
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-utopic-touch/315
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3240
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/456
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-utopic-armhf/510
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/12469
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2657
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3533
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3533/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'rc/qml/AlbumEditor/AlbumEditor.qml'
--- rc/qml/AlbumEditor/AlbumEditor.qml	2014-06-10 00:13:50 +0000
+++ rc/qml/AlbumEditor/AlbumEditor.qml	2014-09-02 10:41:16 +0000
@@ -95,20 +95,6 @@
 
     /*!
     */
-    function editNewAlbum() {
-        albumEditor.album = albumModel.createOrphan();
-        coverMenu.hide()
-    }
-
-    /*!
-    */
-    function editAlbum(album) {
-        albumEditor.album = album;
-        coverMenu.hide()
-    }
-
-    /*!
-    */
     function setMediaSelectorScrollPos(newScrollPos) {
         mediaSelectorComponent.setCheckerboardScrollPos(newScrollPos);
     }

=== modified file 'rc/qml/AlbumsOverview.qml'
--- rc/qml/AlbumsOverview.qml	2014-06-10 16:56:56 +0000
+++ rc/qml/AlbumsOverview.qml	2014-09-02 10:41:16 +0000
@@ -227,6 +227,8 @@
                 iconSource: Qt.resolvedUrl("../img/add.png")
                 onTriggered: {
                     var album = albumCollectionModel.createOrphan();
+                    album.title = i18n.tr("New Photo Album");
+                    album.subtitle = i18n.tr("Subtitle");
                     albumCollectionModel.addOrphan(album);
 
                     albumEditor.album = album;

=== modified file 'rc/qml/Components/PopupAlbumPicker.qml'
--- rc/qml/Components/PopupAlbumPicker.qml	2013-09-20 13:56:39 +0000
+++ rc/qml/Components/PopupAlbumPicker.qml	2014-09-02 10:41:16 +0000
@@ -98,6 +98,8 @@
                                 anchors.fill: parent
                                 onClicked: {
                                     var album = albumGrid.albumCollectionModel.createOrphan();
+                                    album.title = i18n.tr("New Photo Album");
+                                    album.subtitle = i18n.tr("Subtitle");
                                     albumGrid.albumCollectionModel.addOrphan(album);
 
                                     popupAlbumPicker.hide();

=== modified file 'src/album/album.cpp'
--- src/album/album.cpp	2014-04-15 13:27:17 +0000
+++ src/album/album.cpp	2014-09-02 10:41:16 +0000
@@ -35,8 +35,6 @@
 // util
 #include "variants.h"
 
-const char *Album::DEFAULT_TITLE = "New Photo Album";
-const char *Album::DEFAULT_SUBTITLE = "Subtitle";
 const int Album::PAGES_PER_COVER = 1;
 // We use the left page's number as current_page_.  -1 because the cover is 0
 // and we want it to show up on the right.
@@ -47,10 +45,8 @@
  * \param parent
  */
 Album::Album(QObject *parent)
-    : ContainerSource(parent, DEFAULT_TITLE, MediaCollection::exposureDateTimeAscendingComparator),
+    : ContainerSource(parent, "New Album", MediaCollection::exposureDateTimeAscendingComparator),
       m_albumTemplate(0),
-      m_title(DEFAULT_TITLE),
-      m_subtitle(DEFAULT_SUBTITLE),
       m_newAlbum(false),
       m_albumTable(0)
 {