Merge lp:~libqtelegram-team/telegram-app/the-account-name-in-the-top-of-the-dialog-page-is-too-small into lp:telegram-app

[Jin]

[Roberto Mier Escandon (rmescandon)]

Works as expected. LGTM

review: Approve

[Jin (jindallo)]

@Roberto,

Thanks for your approval!

[Ash (ashley-richards)]

Tested and I see no defects.

review: Approve

[Paz Chauhan (paz-chauhan)]

review: Approve

[Jin (jindallo)]

@Ash
Thanks for your test and review!

@Paz
Many thanks for the approval!

=== modified file 'telegram/app/qml/AccountDialogPage.qml'
--- telegram/app/qml/AccountDialogPage.qml	2016-05-15 13:26:31 +0000
+++ telegram/app/qml/AccountDialogPage.qml	2016-05-17 17:56:40 +0000
@@ -94,7 +94,8 @@
 
     flickable: null
 
-    head.contents: Rectangle { //Adds components to the header
+    //Adds components to the header
+    head.contents: Rectangle {
         anchors {
             top: parent.top
             topMargin: units.dp(8)
@@ -105,7 +106,8 @@
             bottom: parent.bottom
         }
 
-        Text { //Text adjusts to the parent
+        //Text adjusts to the parent
+        Text {
             anchors {
                 top: parent.top
                 topMargin: units.gu(0.2)
@@ -122,21 +124,26 @@
                     return user ? user.firstName + " " + user.lastName : ""; //Shown if a scret chat
                 }
             }
-            font.pointSize: 11
-            wrapMode: Text.WordWrap //Word wraps text when text is too long for wdith
-            elide: Text.ElideRight //Enables the elipse to the end of the text
-            maximumLineCount: 1 //Wraps text to 1 line
-        }
-
-        Avatar { //Avatar component gets avatar for user as specified from 'dialog' parameter
-        id: imgAvatar
-        width: height
-
-        telegram: dialog_page.telegramObject
-        dialog: dialog_page.currentDialog
-        }
-
-        Image { //'Lock' image that is overlayed ontop of the Avatar conponent
+            font.pixelSize: FontUtils.sizeToPixels("large")
+            //Word wraps text when text is too long for width
+            wrapMode: Text.WordWrap
+            //Enables the elipse to the end of the text
+            elide: Text.ElideRight
+            //Wraps text to 1 line
+            maximumLineCount: 1
+        }
+
+        //Avatar component gets avatar for user as specified from 'dialog' parameter
+        Avatar {
+            id: imgAvatar
+
+            width: height
+            telegram: dialog_page.telegramObject
+            dialog: dialog_page.currentDialog
+        }
+
+        //'Lock' image that is overlayed ontop of the Avatar conponent
+        Image {
             anchors {
                 left: imgAvatar.right
                 leftMargin: -width-5