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

[Giulio Collura]

Fix bug #1423154, if no contact is selected, don't show group member count label in header.

[Michał Karnicki (karni)]

review: Approve

[lp:~libqtelegram-team/telegram-app/app-dev-fix-1423154]

263. By Giulio Collura on 2015-02-18

remove useless color code

=== modified file 'components/TelegramContactsListItem.qml'
--- components/TelegramContactsListItem.qml	2015-02-04 18:32:33 +0000
+++ components/TelegramContactsListItem.qml	2015-02-18 14:36:17 +0000
@@ -5,20 +5,18 @@
 import "TelegramColors.js" as TelegramColors
 
 ListItemWithActions {
+    id: listitem
 
     property alias image: image.source
     property alias title: title.text
     property string lastSeen
     property bool isOnline: false
-    property bool selected: false
+    showDivider: true
 
-    id: listitem
     width: parent.width
     height: units.gu(8)
 
-    color: listitem.selected ? TelegramColors.blue
-                             : listitem.pressed ? TelegramColors.list_pressed
-                                                : TelegramColors.white
+    color: listitem.pressed ? TelegramColors.list_pressed : TelegramColors.white
 
     UbuntuShape {
         id: imageShape
@@ -79,17 +77,6 @@
         elide: Text.ElideRight
     }
 
-    ListItem.ThinDivider {
-        id: divider
-        anchors {
-            bottom: parent.bottom
-            left: parent.left
-            leftMargin: units.gu(2)
-            right: parent.right
-            rightMargin: units.gu(2)
-        }
-    }
-
     onLastSeenChanged: updateLastSeen(lastSeen)
 
     onIsOnlineChanged: updateLastSeen(lastSeen)
 
=== modified file 'ui/ContactsPage.qml'
--- ui/ContactsPage.qml	2015-02-04 18:32:33 +0000
+++ ui/ContactsPage.qml	2015-02-18 14:36:17 +0000
@@ -60,6 +60,7 @@
             return i18n.tr("Contacts");
         }
     }
+    pageSubtitle: ""
 
     head.actions: {
         if (isSearching) {
@@ -105,13 +106,13 @@
             id: groupChatTitleTextField
             anchors {
                 top: parent.top
-                topMargin: units.gu(1)
+                topMargin: isVisible ? units.gu(1) : 0
                 left: parent.left
                 leftMargin: units.gu(1)
                 right: parent.right
                 rightMargin: units.gu(1)
             }
-            height: isVisible ? units.gu(5) : 0
+            height: isVisible ? units.gu(4) : 0
             opacity: isVisible ? 1.0 : 0.0
             placeholderText: i18n.tr("Chat title")
 
@@ -131,7 +132,6 @@
                 left: parent.left
                 right: parent.right
                 bottom: parent.bottom
-                bottomMargin: units.dp(4)
             }
 
             clip: true
@@ -155,6 +155,7 @@
                 lastSeen: model.lastSeenOnline > 0 ? Time.formatLastSeen(model.lastSeenOnline * 1000) : ""
                 isOnline: model.online
                 selected: contactListView.isSelected(contactDelegate)
+                selectionMode: groupChatMode
 
                 onItemClicked: {
                     if (contactListView.isInSelectionMode) {
@@ -193,8 +194,8 @@
             }
 
             function refreshSubtitle() {
-                if (groupChatMode) {
-                    var count = contactListView.selectedItems.count;
+                var count = contactListView.selectedItems.count;
+                if (groupChatMode && count > 0) {
                     var maxMembers = 200;
                     // TRANSLATORS: the first argument refers to the number of members
                     // on a group conversation. The second one refers to the maximum
@@ -219,6 +220,7 @@
             contactParser.vCardUrl = url;
         }
     }
+
     Component {
         id: contactImportDialogComponent
         Dialog {