[Merge] lp:~artmello/gallery-app/gallery-app-sdk_1_3 into lp:gallery-app

[Renato Araujo Oliveira Filho]

Diff comments:

> 
> === modified file 'rc/qml/AlbumsOverview.qml'
> --- rc/qml/AlbumsOverview.qml	2015-02-09 13:18:07 +0000
> +++ rc/qml/AlbumsOverview.qml	2015-11-05 12:56:26 +0000
> @@ -268,13 +255,39 @@
>          onQuickCloseRequested: isAlbumOpened = false;
>      }
>  
> -    AlbumEditor {
> -        id: albumEditor
> -        objectName: "albumEditor"
> +    Loader {
> +        id: albumEditorLoader
>          anchors.fill: parent
> -        visible: false 
> -
> -        onMediaSelectorHidden: albumEditorCheckerboardHidden(newScrollPos);
> -        onCloseRequested: overview.popPage();
> +
> +        property var album
> +
> +        onStatusChanged: {
> +            if (status === Loader.Ready) {
> +                albumEditorLoader.item.album = albumEditorLoader.album
> +            	overview.pushPage(albumEditorLoader.item)

line not aligned.

> +            }
> +        }
> +
> +        function load(album) {
> +            albumEditorLoader.album = album
> +            sourceComponent = albumEditorComponent
> +        }
> +
> +        Component {
> +            id: albumEditorComponent
> +            AlbumEditor {
> +                id: albumEditor
> +                objectName: "albumEditor"
> +                anchors.fill: parent
> +                visible: false 
> +
> +                onMediaSelectorHidden: albumEditorCheckerboardHidden(newScrollPos);
> +                onCloseRequested: {
> +                    overview.popPage()
> +                    albumEditorLoader.album = null
> +                    albumEditorLoader.sourceComponent = null
> +                }
> +            }
> +        }
>      }
>  }


-- 
https://code.launchpad.net/~artmello/gallery-app/gallery-app-sdk_1_3/+merge/276163
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~artmello/gallery-app/gallery-app-sdk_1_3 into lp:gallery-app.