Hotfix 2017/07-1: Regression bug from previous release, minor Dialog …

…list cleanups
ubports · Jul 4, 2017 · b50b569 · b50b569
1 parent 162dda3
commit b50b569
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 23 deletions.
diff --git a/telegram/app/main.cpp b/telegram/app/main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
     AsemanApplication app(argc, argv);
     app.setApplicationName("Telegram");
     app.setApplicationDisplayName("Telegram");
-    app.setApplicationVersion("2.4.41.0");
+    app.setApplicationVersion("2.4.41.1");
     app.setOrganizationDomain("com.ubuntu.telegram");
     app.setOrganizationName("com.ubuntu.telegram");
 //    app.setWindowIcon(QIcon(":/qml/Cutegram/files/icon.png"));

diff --git a/telegram/app/qml/AccountSendMessage.qml b/telegram/app/qml/AccountSendMessage.qml
@@ -474,17 +474,10 @@ Rectangle {
     }
 
     function send() {
-//        if( currentDialog == telegramObject.nullDialog )
-//            return
         var msg = txt.text.trim()
         if( msg == "" )
             return
 
-//        if(Cutegram.autoEmojis)
-//            msg = emojis.convertSmiliesToEmoji(msg)
-//        if(privates.suggestionItem)
-//            privates.suggestionItem.destroy()
-
         smsg.accepted(msg, messageReply.replyMessage? messageReply.replyMessage.id : 0)
         messageReply.discard()
         txt.text = ""

diff --git a/telegram/app/qml/components/DialogsListItem.qml b/telegram/app/qml/components/DialogsListItem.qml
@@ -183,19 +183,6 @@ ListItem {
             width: height
         }
 
-        Text {
-            id: title_text
-            horizontalAlignment: Text.AlignLeft
-            verticalAlignment: Text.AlignVCenter
-            clip: true
-            elide: Text.ElideRight
-            wrapMode: Text.WrapAnywhere
-            maximumLineCount: 1
-            font.weight: Font.DemiBold
-            font.pixelSize: units.dp(17)//FontUtils.sizeToPixels("large")
-            text: list_item.title
-        }
-
         Icon {
             id: audio_volume_muted_icon
             visible: isMuted
@@ -208,6 +195,19 @@ ListItem {
             }
             width: height
         }
+
+        Text {
+            id: title_text
+            horizontalAlignment: Text.AlignLeft
+            verticalAlignment: Text.AlignVCenter
+            elide: Text.ElideRight
+            wrapMode: Text.WrapAnywhere
+            maximumLineCount: 1
+            font.weight: Font.DemiBold
+            font.pixelSize: units.dp(17)//FontUtils.sizeToPixels("large")
+            text: list_item.title
+            width: parent.width - (contact_group_icon.visible? contact_group_icon.width : 0.0) - (audio_volume_muted_icon.visible? audio_volume_muted_icon.width : 0.0)
+        }
     }
 
     Row {

diff --git a/telegram/app/qml/js/version.js b/telegram/app/qml/js/version.js
@@ -1 +1 @@
-var version = "2.4.41.0";
+var version = "2.4.41.1";
diff --git a/telegram/manifest.json.in b/telegram/manifest.json.in
@@ -21,6 +21,6 @@
             "scope": "scope"
         }
     },
-    "version": "2.4.41.0",
+    "version": "2.4.41.1",
     "maintainer": "Ubuntu Telegram team <[email protected]>"
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		var version = "2.4.41.0";
		var version = "2.4.41.1";