I have made the following changes intended for : CE:Apps / qmlcontacts 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/6947 Thank You, Robin Burchell [This message was auto-generated] --- Request # 6947: Messages from BOSS: State: review at 2012-10-05T11:31:27 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 / qmlcontacts -> CE:Apps / qmlcontacts changes files: -------------- --- qmlcontacts.changes +++ qmlcontacts.changes @@ -0,0 +1,3 @@ +* Fri Oct 5 2012 Robin Burchell <[email protected]> - 0.4.1 +- Remove duplicated PageHeader now that components contains it + old: ---- qmlcontacts-0.4.0.tar.bz2 new: ---- qmlcontacts-0.4.1.tar.bz2 spec files: ----------- --- qmlcontacts.spec +++ qmlcontacts.spec @@ -9,7 +9,7 @@ # << macros Summary: Contacts application for nemo -Version: 0.4.0 +Version: 0.4.1 Release: 1 Group: Applications/System License: GPLv2 other changes: -------------- ++++++ qmlcontacts-0.4.0.tar.bz2 -> qmlcontacts-0.4.1.tar.bz2 --- src/qml/AvatarPickerSheet.qml +++ src/qml/AvatarPickerSheet.qml @@ -1,4 +1,5 @@ /* + * Copyright (C) 2012 Jolla Ltd. * Copyright (C) 2011-2012 Robin Burchell <[email protected]> * * You may use this file under the terms of the BSD license as follows: --- src/qml/ContactEditorSheet.qml +++ src/qml/ContactEditorSheet.qml @@ -1,4 +1,5 @@ /* + * Copyright (C) 2012 Jolla Ltd. * Copyright (C) 2011-2012 Robin Burchell <[email protected]> * * You may use this file under the terms of the BSD license as follows: --- src/qml/ContactImportSheet.qml +++ src/qml/ContactImportSheet.qml @@ -1,5 +1,6 @@ /* * Copyright (C) 2011-2012 Robin Burchell <[email protected]> + * Copyright (C) 2012 Jolla Ltd. * * You may use this file under the terms of the BSD license as follows: * --- src/qml/ContactListPage.qml +++ src/qml/ContactListPage.qml @@ -30,7 +30,7 @@ */ import QtQuick 1.1 -import com.nokia.meego 1.0 +import com.nokia.meego 1.2 import "constants.js" as Constants import org.nemomobile.qmlcontacts 1.0 import org.nemomobile.contacts 1.0 @@ -41,6 +41,7 @@ PageHeader { id: header text: qsTr("Contacts") + color: "#007FFF" } SearchBox { --- src/qml/PageHeader.qml +++ src/qml/PageHeader.qml @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2011-2012 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 - -Rectangle { - id: detailHeader - - // TODO: landscape - height: UiConstants.HeaderDefaultHeightPortrait; - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - color: "#007FFF" - property alias text: label.text - property alias content: othercontent.children - - Item { - id: othercontent - width: childrenRect.width - height: childrenRect.height - anchors.left: parent.left - anchors.leftMargin: children.length > 0 ? UiConstants.DefaultMargin : 0 - anchors.verticalCenter: parent.verticalCenter - } - - Label { - id: label - anchors.left: othercontent.right - anchors.leftMargin: UiConstants.DefaultMargin - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - elide: Text.ElideRight - smooth: true - color: "white" - font: UiConstants.HeaderFont - } -} - --- src/qml/SearchBox.qml +++ src/qml/SearchBox.qml @@ -1,5 +1,6 @@ /**************************************************************************** ** + ** Copyright (C) 2012 Robin Burchell <[email protected]> ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** ** $QT_BEGIN_LICENSE:BSD$ --- src/res.qrc +++ src/res.qrc @@ -8,7 +8,6 @@ <file>qml/EditableList.qml</file> <file>qml/ContactListPage.qml</file> <file>qml/DeleteContactDialog.qml</file> - <file>qml/PageHeader.qml</file> <file>qml/main.qml</file> <file>qml/constants.js</file> <file>qml/SearchBox.qml</file> ++++++ qmlcontacts.yaml --- qmlcontacts.yaml +++ qmlcontacts.yaml @@ -1,6 +1,6 @@ Name: qmlcontacts Summary: Contacts application for nemo -Version: 0.4.0 +Version: 0.4.1 Release: 1 Group: Applications/System License: GPLv2
