Merge lp:~libqtelegram-team/telegram-app/app-dev-fix-profile-image into lp:telegram-app/app-dev

Proposed by Michał Karnicki
Status: Merged
Approved by: Roberto Mier Escandon
Approved revision: 204
Merged at revision: 204
Proposed branch: lp:~libqtelegram-team/telegram-app/app-dev-fix-profile-image
Merge into: lp:telegram-app/app-dev
Diff against target: 27 lines (+4/-2)
1 file modified
ui/GroupProfilePage.qml (+4/-2)
To merge this branch: bzr merge lp:~libqtelegram-team/telegram-app/app-dev-fix-profile-image
Reviewer Review Type Date Requested Status
libqtelegram team Pending
Review via email: mp+244561@code.launchpad.net

Description of the change

Works with this plugin branch:
lp:~libqtelegram-team/libqtelegram/same-image-all-chats-fix

Tested by:
 - opening a couple different group profiles
 - tapping on their photo
 - tapping on generic image in the group profile -- as expected, nothing happens

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ui/GroupProfilePage.qml'
--- ui/GroupProfilePage.qml 2014-12-11 18:50:22 +0000
+++ ui/GroupProfilePage.qml 2014-12-12 11:13:41 +0000
@@ -57,7 +57,6 @@
57 body: Item {57 body: Item {
58 anchors.fill: parent58 anchors.fill: parent
5959
60
61 Image {60 Image {
62 id: photoImage61 id: photoImage
63 anchors {62 anchors {
@@ -70,11 +69,14 @@
70 height: width69 height: width
71 asynchronous: true70 asynchronous: true
72 fillMode: Image.PreserveAspectCrop71 fillMode: Image.PreserveAspectCrop
73 source: groupModel.photo72 source: groupModel.photo !== "" ? groupModel.photo
73 : "../images/" + Avatar.getAvatar(groupModel.chatId, true)
7474
75 MouseArea {75 MouseArea {
76 anchors.fill: parent76 anchors.fill: parent
77 onClicked: {77 onClicked: {
78 if (groupModel.photo === "") return;
79
78 var properties = { "title": groupModel.title,80 var properties = { "title": groupModel.title,
79 "photoPreviewSource": groupModel.photo };81 "photoPreviewSource": groupModel.photo };
80 pageStack.push(previewPage, properties);82 pageStack.push(previewPage, properties);

Subscribers

People subscribed via source and target branches

to all changes: