[Merge] lp:~phablet-team/messaging-app/checkmarks into lp:messaging-app

[Arthur Mello]

Diff comments:

> === added file 'src/qml/DeliveryStatus.qml'
> --- src/qml/DeliveryStatus.qml	1970-01-01 00:00:00 +0000
> +++ src/qml/DeliveryStatus.qml	2015-12-16 20:01:50 +0000
> @@ -0,0 +1,37 @@
> +/*
> + * Copyright 2015 Canonical Ltd.
> + *
> + * This file is part of messaging-app.
> + *
> + * messaging-app is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; version 3.
> + *
> + * messaging-app is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program.  If not, see <http://www.gnu.org/licenses/>.
> + */
> +import QtQuick 2.2
> +import Ubuntu.History 0.1
> +
> +Image {
> +    property int status: -1

Change property name to avoid conflict with status property of Image component

> +    property bool enabled: true
> +    height: enabled ? units.gu(1) : 0
> +    fillMode: Image.PreserveAspectFit
> +    source: {
> +        if (!enabled) {
> +            return ""
> +        }
> +        if (status == HistoryThreadModel.MessageStatusDelivered) {
> +            return Qt.resolvedUrl("./assets/check_single_white.png")
> +        } else if (status == HistoryThreadModel.MessageStatusRead) {
> +            return Qt.resolvedUrl("./assets/check_double_white.png")
> +        }
> +        return ""
> +    }
> +}


-- 
https://code.launchpad.net/~phablet-team/messaging-app/checkmarks/+merge/280507
Your team Ubuntu Phablet Team is requested to review the proposed merge of lp:~phablet-team/messaging-app/checkmarks into lp:messaging-app.