I have made the following changes intended for : CE:Apps:MTF / 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/5357 Thank You, Robin Burchell [This message was auto-generated] --- Request # 5357: Messages from BOSS: State: review at 2012-07-31T16:10:30 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 / qmlmessages -> CE:Apps:MTF / qmlmessages changes files: -------------- ++++++ new changes file: --- qmlmessages.changes +++ qmlmessages.changes @@ -0,0 +1,2 @@ +* Mon Jul 30 2012 Robin Burchell <[email protected]> - 0.0.1 +- Initial packaging new: ---- 0001-Fix-MessagesView-scrolling.patch 0001-add-a-.desktop-file-for-qmlmessages.patch qmlmessages-0.0.1.tar.bz2 qmlmessages.changes qmlmessages.spec qmlmessages.yaml spec files: ----------- ++++++ new spec file: --- qmlmessages.spec +++ qmlmessages.spec @@ -0,0 +1,74 @@ +# +# Do NOT Edit the Auto-generated Part! +# Generated by: spectacle version 0.24.1 +# + +Name: qmlmessages + +# >> macros +# << macros + +Summary: Messaging application for nemo +Version: 0.0.1 +Release: 1 +Group: Applications/System +License: BSD +URL: https://github.com/nemomobile/qmlmessages +Source0: %{name}-%{version}.tar.bz2 +Source100: qmlmessages.yaml +Patch0: 0001-add-a-.desktop-file-for-qmlmessages.patch +Patch1: 0001-Fix-MessagesView-scrolling.patch +Requires: qt-components +Requires: nemo-qml-plugins-thumbnailer +Requires: nemo-qml-plugins-contacts +BuildRequires: pkgconfig(QtCore) >= 4.7.0 +BuildRequires: pkgconfig(QtDeclarative) +BuildRequires: pkgconfig(QtContacts) +BuildRequires: pkgconfig(qdeclarative-boostable) +BuildRequires: pkgconfig(TelepathyQt4) +BuildRequires: desktop-file-utils + +%description +Messaging application using Qt Quick for Nemo Mobile. + + +%prep +%setup -q -n %{name} + +# 0001-add-a-.desktop-file-for-qmlmessages.patch +%patch0 -p1 +# 0001-Fix-MessagesView-scrolling.patch +%patch1 -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}/qmlmessages +%{_datadir}/applications/qmlmessages.desktop +# >> files +# << files other changes: -------------- ++++++ 0001-Fix-MessagesView-scrolling.patch (new) --- 0001-Fix-MessagesView-scrolling.patch +++ 0001-Fix-MessagesView-scrolling.patch @@ -0,0 +1,59 @@ +From b660689a53d221ff4d811121dcc92aaa32bb322e Mon Sep 17 00:00:00 2001 +From: John Brooks <[email protected]> +Date: Mon, 30 Jul 2012 14:32:55 -0400 +Subject: [PATCH] Fix MessagesView scrolling + +The attempt at attaching items to the bottom of the screen caused +some bad visual bugs (including all of the text disappearing +entirely), probably due to contentHeight/contentY being unreliable. +Disabled that for now, since it's better to have a view that works. + +Also fixed the scroll-to-bottom logic to always work correctly by +using positionViewAtEnd, and to not break with the VKB open (which +was caused by contentHeight changing oddly). + +This should be reliable for now; I'll revisit the bottom attaching +behavior later. +--- + qml/qmlmessages/MessagesView.qml | 20 ++++---------------- + 1 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/qml/qmlmessages/MessagesView.qml b/qml/qmlmessages/MessagesView.qml +index 4d1ed92..87efc43 100644 +--- a/qml/qmlmessages/MessagesView.qml ++++ b/qml/qmlmessages/MessagesView.qml +@@ -35,27 +35,15 @@ import org.nemomobile.qmlmessages 1.0 + Item { + property alias model: view.model + +- onHeightChanged: view.updateHeight() +- + ListView { + id: view + spacing: 20 +- anchors.left: parent.left +- anchors.right: parent.right +- anchors.bottom: parent.bottom +- height: 1 ++ anchors.fill: parent + cacheBuffer: parent.height + +- // Bottom-align chat items when contentHeight is less than the screen. +- // This requires a hack - adjusting the height of the view and anchoring +- // it to the bottom, while disabling interactive scrolling. +- // Also, update contentY to keep the latest item at the bottom. +- onContentHeightChanged: { updateHeight() } +- function updateHeight() { +- height = Math.max(1, Math.min(parent.height, contentHeight)) +- interactive = parent.height < contentHeight +- contentY = contentHeight - height +- } ++ onCountChanged: view.positionViewAtEnd() ++ // Necessary when opening VKB, for example ++ onHeightChanged: view.positionViewAtEnd() + + delegate: BorderImage { + id: messageBox +-- +1.7.7.6 + ++++++ 0001-add-a-.desktop-file-for-qmlmessages.patch (new) --- 0001-add-a-.desktop-file-for-qmlmessages.patch +++ 0001-add-a-.desktop-file-for-qmlmessages.patch @@ -0,0 +1,41 @@ +From ecbba929776e7e70379e9850a914b0cc934c3560 Mon Sep 17 00:00:00 2001 +From: Robin Burchell <[email protected]> +Date: Mon, 30 Jul 2012 15:43:07 +0200 +Subject: [PATCH] add a .desktop file for qmlmessages + +--- + qmlmessages.desktop | 6 ++++++ + qmlmessages.pro | 4 ++++ + 2 files changed, 10 insertions(+), 0 deletions(-) + create mode 100644 qmlmessages.desktop + +diff --git a/qmlmessages.desktop b/qmlmessages.desktop +new file mode 100644 +index 0000000..ab9ab6c +--- /dev/null ++++ b/qmlmessages.desktop +@@ -0,0 +1,6 @@ ++[Desktop Entry] ++Type=Application ++Name=Messages ++Icon=icons-Applications-sms ++Exec=invoker -s --type=d /usr/bin/qmlmessages -fullscreen ++Comment=Nemo messaging application +diff --git a/qmlmessages.pro b/qmlmessages.pro +index 63ff569..fb595ec 100644 +--- a/qmlmessages.pro ++++ b/qmlmessages.pro +@@ -8,6 +8,10 @@ CXXFLAGS += -fPIC + target.path = $$INSTALL_ROOT/usr/bin + INSTALLS += target + ++desktop.files = $${PROJECT_NAME}.desktop ++desktop.path = $$INSTALL_ROOT/usr/share/applications ++INSTALLS += desktop ++ + SOURCES += src/main.cpp \ + src/accountsmodel.cpp \ + src/clienthandler.cpp \ +-- +1.7.7.6 + ++++++ qmlmessages-0.0.1.tar.bz2 (new) ++++++ qmlmessages.yaml (new) --- qmlmessages.yaml +++ qmlmessages.yaml @@ -0,0 +1,32 @@ +Name: qmlmessages +Summary: Messaging application for nemo +Version: 0.0.1 +Release: 1 +Group: Applications/System +License: BSD +URL: https://github.com/nemomobile/qmlmessages +Sources: + - "%{name}-%{version}.tar.bz2" +Patches: + - 0001-add-a-.desktop-file-for-qmlmessages.patch + - 0001-Fix-MessagesView-scrolling.patch + +Description: Messaging application using Qt Quick for Nemo Mobile. +Configure: none +Builder: qmake + +PkgConfigBR: + - QtCore >= 4.7.0 + - QtDeclarative + - QtContacts + - qdeclarative-boostable + - TelepathyQt4 + +Requires: + - qt-components + - nemo-qml-plugins-thumbnailer + - nemo-qml-plugins-contacts + +Files: + - "%{_bindir}/qmlmessages" + - "%{_datadir}/applications/qmlmessages.desktop"
