I have made the following changes intended for : CE:Apps / qmlmessages Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below.
https://build.pub.meego.com//request/show/8302 Thank You, Robin Burchell [This message was auto-generated] --- Request # 8302: Messages from BOSS: State: review at 2013-03-03T01:28:49 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:w00t:branches:CE:Apps / qmlmessages -> CE:Apps / qmlmessages changes files: -------------- --- qmlmessages.changes +++ qmlmessages.changes @@ -0,0 +1,3 @@ +* Sun Mar 03 2013 Robin Burchell <[email protected]> - 0.1.3 +- Use common empty state component (from Robin) + old: ---- qmlmessages-0.1.2.tar.bz2 new: ---- qmlmessages-0.1.3.tar.bz2 spec files: ----------- --- qmlmessages.spec +++ qmlmessages.spec @@ -9,14 +9,14 @@ # << macros Summary: Messaging application for nemo -Version: 0.1.2 +Version: 0.1.3 Release: 1 Group: Applications/System License: BSD URL: https://github.com/nemomobile/qmlmessages Source0: %{name}-%{version}.tar.bz2 Source100: qmlmessages.yaml -Requires: qt-components +Requires: qt-components >= 1.4.8 Requires: nemo-qml-plugin-messages-internal Requires: libcommhistory-declarative Requires: commhistory-daemon other changes: -------------- ++++++ qmlmessages-0.1.2.tar.bz2 -> qmlmessages-0.1.3.tar.bz2 --- qml/ConversationListWidget.qml +++ qml/ConversationListWidget.qml @@ -30,15 +30,13 @@ */ import QtQuick 1.1 -import com.nokia.meego 1.0 +import com.nokia.meego 1.2 import org.nemomobile.messages.internal 1.0 Item { - EmptyConversations { - id: emptyListView - onClicked: { - pageStack.push(Qt.resolvedUrl("ConversationPage.qml")) - } + ViewPlaceholder { + enabled: cardListView.count == 0 + text: "No messages yet" } ListView { @@ -49,7 +47,6 @@ focus: true keyNavigationWraps: false clip: true - opacity: 0 model: groupModel delegate: ConversationListDelegate { @@ -59,15 +56,4 @@ } } } - - Binding { - target: emptyListView; - property: "opacity"; - value: ((cardListView.count == 0) ? 1 : 0); - } - Binding { - target: cardListView; - property: "opacity"; - value: ((cardListView.count > 0) ? 1 : 0); - } } --- qml/EmptyConversations.qml +++ qml/EmptyConversations.qml @@ -1,67 +0,0 @@ -/* Copyright (C) 2012 John Brooks <[email protected]> - * Copyright (C) 2011 Robin Burchell <[email protected]> - * - * You may use this file under the terms of the BSD license as follows: - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Nemo Mobile nor the names of its contributors - * may be used to endorse or promote products derived from this - * software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import QtQuick 1.1 -import com.nokia.meego 1.0 - -Item { - id: root - anchors.centerIn: parent - width: textColumn.width - height: textColumn.height - - property string subText: qsTr("You haven't had any chats yet.") - property string addConversation: qsTr("Start a chat") - - signal clicked() - - Column { - id: textColumn - width: childrenRect.width - height: childrenRect.height - spacing: 15 - - Label { - id: no_conversations - text: subText - smooth: true - } - - Button { - id: button - text: addConversation - height: 60 - onClicked: { - root.clicked() - } - } - } -} --- qml/qml.qrc +++ qml/qml.qrc @@ -2,7 +2,6 @@ <qresource prefix="/qml"> <file>main.qml</file> <file>PageHeader.qml</file> - <file>EmptyConversations.qml</file> <file>ConversationPage.qml</file> <file>ConversationListWidget.qml</file> <file>ConversationListPage.qml</file> ++++++ qmlmessages.yaml --- qmlmessages.yaml +++ qmlmessages.yaml @@ -1,6 +1,6 @@ Name: qmlmessages Summary: Messaging application for nemo -Version: 0.1.2 +Version: 0.1.3 Release: 1 Group: Applications/System License: BSD @@ -41,7 +41,7 @@ - TelepathyQt4 Requires: - - qt-components + - qt-components >= 1.4.8 - nemo-qml-plugin-messages-internal - libcommhistory-declarative - commhistory-daemon
