I have made the following changes intended for : CE:Apps:MTF / 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/5268 Thank You, Robin Burchell [This message was auto-generated] --- Request # 5268: Messages from BOSS: State: review at 2012-07-23T11:37: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:MTF / qmlcontacts -> CE:Apps:MTF / qmlcontacts changes files: -------------- ++++++ new changes file: --- qmlcontacts.changes +++ qmlcontacts.changes @@ -0,0 +1,3 @@ +* Fri Jul 20 2012 Robin Burchell <[email protected]> - 0.3.7 +- Fixes NEMO#133: People should be replaced with QML Contacts App +- Initial packaging new: ---- 0001-clip-avatars-otherwise-we-ll-suffer-overdraw.patch 0001-correctly-crop-images.patch 0001-fix-hilights-to-overlay-the-image.patch 0001-fix-warping-of-avatar-images.patch 0001-only-set-one-dimension-of-sourceSize-to-avoid-stretc.patch qmlcontacts-0.3.7.tar.bz2 qmlcontacts.changes qmlcontacts.spec qmlcontacts.yaml spec files: ----------- ++++++ new spec file: --- qmlcontacts.spec +++ qmlcontacts.spec @@ -0,0 +1,85 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.24.1 +# + +Name: qmlcontacts + +# >> macros +# << macros + +Summary: Contacts application for nemo +Version: 0.3.7 +Release: 1 +Group: Applications/System +License: GPLv2 +URL: https://github.com/nemomobile/qmlcontacts +Source0: %{name}-%{version}.tar.bz2 +Source100: qmlcontacts.yaml +Patch0: 0001-correctly-crop-images.patch +Patch1: 0001-only-set-one-dimension-of-sourceSize-to-avoid-stretc.patch +Patch2: 0001-clip-avatars-otherwise-we-ll-suffer-overdraw.patch +Patch3: 0001-fix-hilights-to-overlay-the-image.patch +Patch4: 0001-fix-warping-of-avatar-images.patch +Requires: qt-components +Requires: libqtdeclarative4-folderlistmodel +BuildRequires: pkgconfig(QtCore) >= 4.7.0 +BuildRequires: pkgconfig(QtDeclarative) +BuildRequires: pkgconfig(QtContacts) +BuildRequires: pkgconfig(qdeclarative-boostable) +BuildRequires: desktop-file-utils +Provides: meego-handset-people > 0.2.32 +Provides: meego-handset-people-branding-upstream > 0.2.32 +Obsoletes: meego-handset-people <= 0.2.32 +Obsoletes: meego-handset-people-branding-upstream <= 0.2.32 + +%description +Contacts application using Qt Quick for Nemo Mobile. + + +%prep +%setup -q -n %{name} + +# 0001-correctly-crop-images.patch +%patch0 -p1 +# 0001-only-set-one-dimension-of-sourceSize-to-avoid-stretc.patch +%patch1 -p1 +# 0001-clip-avatars-otherwise-we-ll-suffer-overdraw.patch +%patch2 -p1 +# 0001-fix-hilights-to-overlay-the-image.patch +%patch3 -p1 +# 0001-fix-warping-of-avatar-images.patch +%patch4 -p1 +# >> setup +# << setup + +%build +# >> build pre +# << build pre + +%qmake + +make %{?jobs:-j%jobs} + +# >> build post +# << build post + +%install +rm -rf %{buildroot} +# >> install pre +# << install pre +%qmake_install + +# >> install post +# << install post + +desktop-file-install --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + %{buildroot}%{_datadir}/applications/*.desktop + +%files +%defattr(-,root,root,-) +%{_bindir}/qmlcontacts +%{_datadir}/applications/qmlcontacts.desktop +# >> files +# << files other changes: -------------- ++++++ 0001-clip-avatars-otherwise-we-ll-suffer-overdraw.patch (new) --- 0001-clip-avatars-otherwise-we-ll-suffer-overdraw.patch +++ 0001-clip-avatars-otherwise-we-ll-suffer-overdraw.patch @@ -0,0 +1,24 @@ +From 3b9dc31764d261d389e485ad372b7df3202641fc Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Mon, 23 Jul 2012 12:23:47 +0200 +Subject: [PATCH] clip avatars otherwise we'll suffer overdraw + +--- + AvatarPickerSheet.qml | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/AvatarPickerSheet.qml b/AvatarPickerSheet.qml +index 1d42a24..1ea9ba6 100644 +--- a/AvatarPickerSheet.qml ++++ b/AvatarPickerSheet.qml +@@ -49,6 +49,7 @@ Sheet { + asynchronous: true + sourceSize.width: avatarGridSize + fillMode: Image.PreserveAspectCrop ++ clip: true + } + MouseArea { + anchors.fill: parent +-- +1.7.7.6 + ++++++ 0001-correctly-crop-images.patch (new) --- 0001-correctly-crop-images.patch +++ 0001-correctly-crop-images.patch @@ -0,0 +1,24 @@ +From 9c403d3fd66b6e7a1f7440dc58a178a924f2ee66 Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Mon, 23 Jul 2012 12:08:02 +0200 +Subject: [PATCH] correctly crop images + +--- + AvatarPickerSheet.qml | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/AvatarPickerSheet.qml b/AvatarPickerSheet.qml +index 6cdadfc..15da6d7 100644 +--- a/AvatarPickerSheet.qml ++++ b/AvatarPickerSheet.qml +@@ -49,6 +49,7 @@ Sheet { + asynchronous: true + sourceSize.width: avatarGridSize + sourceSize.height: avatarGridSize ++ fillMode: Image.PreserveAspectCrop + } + MouseArea { + anchors.fill: parent +-- +1.7.7.6 + ++++++ 0001-fix-hilights-to-overlay-the-image.patch (new) --- 0001-fix-hilights-to-overlay-the-image.patch +++ 0001-fix-hilights-to-overlay-the-image.patch @@ -0,0 +1,57 @@ +From 601dcf3faa993113ba18698dc82858228478cbcb Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Mon, 23 Jul 2012 12:41:27 +0200 +Subject: [PATCH] fix hilights to overlay the image + +--- + AvatarPickerSheet.qml | 19 +++++++------------ + 1 files changed, 7 insertions(+), 12 deletions(-) + +diff --git a/AvatarPickerSheet.qml b/AvatarPickerSheet.qml +index 1ea9ba6..21455ba 100644 +--- a/AvatarPickerSheet.qml ++++ b/AvatarPickerSheet.qml +@@ -14,15 +14,6 @@ Sheet { + + property int avatarGridSize: avatarPickerSheet.width / 3 + +- Component { +- id: gridHighlight +- Rectangle { +- color: "blue" +- opacity: 0.5 +- width: avatarGridSize; height: avatarGridSize +- } +- } +- + content: GridView { + id: avatarGridView + anchors.fill: parent +@@ -36,7 +27,7 @@ Sheet { + showDirs: false + } + delegate: Item { +- id: bgRect ++ id: delegateInstance + width: avatarGridSize + height: avatarGridSize + property alias avatarPath: delegateImage.source +@@ -55,9 +46,13 @@ Sheet { + anchors.fill: parent + onClicked: avatarGridView.currentIndex = index + } ++ Rectangle { ++ color: "blue" ++ opacity: 0.3 ++ visible: delegateInstance.GridView.isCurrentItem ++ anchors.fill: parent ++ } + } +- highlight: gridHighlight +- highlightFollowsCurrentItem: true + focus: true + } + onAccepted: { +-- +1.7.7.6 + ++++++ 0001-fix-warping-of-avatar-images.patch (new) --- 0001-fix-warping-of-avatar-images.patch +++ 0001-fix-warping-of-avatar-images.patch @@ -0,0 +1,25 @@ +From 7acbe26b972b3c276fbf94e842cea31780d5a4d6 Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Mon, 23 Jul 2012 12:45:24 +0200 +Subject: [PATCH] fix warping of avatar images + +--- + AvatarImage.qml | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/AvatarImage.qml b/AvatarImage.qml +index 8cf9599..1f9f363 100644 +--- a/AvatarImage.qml ++++ b/AvatarImage.qml +@@ -17,7 +17,7 @@ Image { + height: UiConstants.ListItemHeightSmall + property Contact contact + sourceSize.width: width +- sourceSize.height: height ++ clip: true + + onContactChanged: { + contact.avatar.fieldsChanged.connect(avatarPotentiallyChanged) +-- +1.7.7.6 + ++++++ 0001-only-set-one-dimension-of-sourceSize-to-avoid-stretc.patch (new) --- 0001-only-set-one-dimension-of-sourceSize-to-avoid-stretc.patch +++ 0001-only-set-one-dimension-of-sourceSize-to-avoid-stretc.patch @@ -0,0 +1,24 @@ +From 97ca95a2657e20c9eaecee4079873d702c289928 Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Mon, 23 Jul 2012 12:16:31 +0200 +Subject: [PATCH] only set one dimension of sourceSize to avoid stretching + +--- + AvatarPickerSheet.qml | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/AvatarPickerSheet.qml b/AvatarPickerSheet.qml +index 15da6d7..1d42a24 100644 +--- a/AvatarPickerSheet.qml ++++ b/AvatarPickerSheet.qml +@@ -48,7 +48,6 @@ Sheet { + anchors.centerIn: parent + asynchronous: true + sourceSize.width: avatarGridSize +- sourceSize.height: avatarGridSize + fillMode: Image.PreserveAspectCrop + } + MouseArea { +-- +1.7.7.6 + ++++++ qmlcontacts-0.3.7.tar.bz2 (new) ++++++ qmlcontacts.yaml (new) --- qmlcontacts.yaml +++ qmlcontacts.yaml @@ -0,0 +1,39 @@ +Name: qmlcontacts +Summary: Contacts application for nemo +Version: 0.3.7 +Release: 1 +Group: Applications/System +License: GPLv2 +URL: https://github.com/nemomobile/qmlcontacts +Sources: + - "%{name}-%{version}.tar.bz2" +Patches: + - 0001-correctly-crop-images.patch + - 0001-only-set-one-dimension-of-sourceSize-to-avoid-stretc.patch + - 0001-clip-avatars-otherwise-we-ll-suffer-overdraw.patch + - 0001-fix-hilights-to-overlay-the-image.patch + - 0001-fix-warping-of-avatar-images.patch +Provides: + - meego-handset-people > 0.2.32 + - meego-handset-people-branding-upstream > 0.2.32 +Obsoletes: + - meego-handset-people <= 0.2.32 + - meego-handset-people-branding-upstream <= 0.2.32 +Description: Contacts application using Qt Quick for Nemo Mobile. +Configure: none +Builder: qmake +PkgConfigBR: + - QtCore >= 4.7.0 + - QtDeclarative + - QtContacts + - qdeclarative-boostable + +Requires: + - qt-components +# for avatar fetching + - libqtdeclarative4-folderlistmodel + +Files: + - "%{_bindir}/qmlcontacts" + - "%{_datadir}/applications/qmlcontacts.desktop" +
