Merge lp:~tiagosh/phone-app/phone-app-1181362 into lp:phone-app

Proposed by Bill Filler
Status: Merged
Approved by: Bill Filler
Approved revision: 660
Merged at revision: 660
Proposed branch: lp:~tiagosh/phone-app/phone-app-1181362
Merge into: lp:phone-app
Diff against target: 59 lines (+25/-2)
3 files modified
debian/changelog (+4/-2)
src/qml/PanelCommunications/CommunicationsPanel.qml (+10/-0)
src/qml/PanelContacts/ContactsPanel.qml (+11/-0)
To merge this branch: bzr merge lp:~tiagosh/phone-app/phone-app-1181362
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Bill Filler (community) Approve
Review via email: mp+166133@code.launchpad.net

This proposal supersedes a proposal from 2013-05-27.

Commit message

Prevent the search field from being partially covered by the view header

Description of the change

Prevent the search field from being partially covered by the view header

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:657
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~tiagosh/phone-app/phone-app-1181362/+merge/165921/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phone-app-ci/118/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-raring-amd64-ci/42/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/91
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-raring-armhf-ci/91/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/phone-app-raring-i386-ci/91/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/118/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

tested, works

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
658. By Tiago Salem Herrmann

* Allow toggling favorite even when not editing a contact (LP: #1185064).
* Added rotation support;
* Added i18n support;

659. By Tiago Salem Herrmann

update changelog

660. By Tiago Salem Herrmann

remove old code

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-05-29 03:13:19 +0000
+++ debian/changelog 2013-05-29 18:13:25 +0000
@@ -1,8 +1,10 @@
1phone-app (0.59.12-0ubuntu2) UNRELEASED; urgency=low1phone-app (0.59.12-0ubuntu2) raring; urgency=low
22
3 * Allow toggling favorite even when not editing a contact (LP: #1185064).3 * Allow toggling favorite even when not editing a contact (LP: #1185064).
4 * Prevent the search field from being partially covered by the
5 view header (LP: 1181362).
46
5 -- Tiago Salem Herrmann <tiago.herrmann@canonical.com> Wed, 29 May 2013 00:10:30 -03007 -- Tiago Salem Herrmann <tiago.herrmann@canonical.com> Wed, 29 May 2013 15:06:30 -0300
68
7phone-app (0.59.12-0ubuntu1) raring; urgency=low9phone-app (0.59.12-0ubuntu1) raring; urgency=low
810
911
=== modified file 'src/qml/PanelCommunications/CommunicationsPanel.qml'
--- src/qml/PanelCommunications/CommunicationsPanel.qml 2013-05-24 13:08:32 +0000
+++ src/qml/PanelCommunications/CommunicationsPanel.qml 2013-05-29 18:13:25 +0000
@@ -26,6 +26,16 @@
26 id: messageList26 id: messageList
27 objectName: "communicationPanel"27 objectName: "communicationPanel"
28 title: i18n.tr("Conversations")28 title: i18n.tr("Conversations")
29 onActiveChanged: {
30 // workaround to scroll ListView to the top.
31 // We currently place the search bar inside the
32 // ListView header, and it is not taken into
33 // account when calculating the header offset.
34 // Ref.: https://bugs.launchpad.net/phone-app/+bug/1181362
35 if (active) {
36 communicationsList.contentY = -communicationsList.headerItem.height-header.height
37 }
38 }
29 tools: ToolbarActions {39 tools: ToolbarActions {
30 Action {40 Action {
31 iconSource: Qt.resolvedUrl("../assets/compose.png")41 iconSource: Qt.resolvedUrl("../assets/compose.png")
3242
=== modified file 'src/qml/PanelContacts/ContactsPanel.qml'
--- src/qml/PanelContacts/ContactsPanel.qml 2013-05-24 13:08:32 +0000
+++ src/qml/PanelContacts/ContactsPanel.qml 2013-05-29 18:13:25 +0000
@@ -26,6 +26,17 @@
26LocalWidgets.PhonePage {26LocalWidgets.PhonePage {
27 id: contactsPanel27 id: contactsPanel
28 title: i18n.tr("Contacts")28 title: i18n.tr("Contacts")
29 onActiveChanged: {
30 // workaround to scroll ListView to the top.
31 // We currently place the search bar inside the
32 // ListView header, and it is not taken into
33 // account when calculating the header offset.
34 // Ref.: https://bugs.launchpad.net/phone-app/+bug/1181362
35 if (active) {
36 contactsList.contentY = -contactsList.headerItem.height-
37header.height
38 }
39 }
2940
30 tools: ToolbarActions {41 tools: ToolbarActions {
31 Action {42 Action {

Subscribers

People subscribed via source and target branches