Merge lp:~libqtelegram-team/telegram-app/obtain-messages-model-from-dialogid into lp:~libqtelegram-team/telegram-app/qml-plugin

[Roberto Mier Escandon]

Added methods in TelegramClient accesible from qml:

Q_INVOKABLE QVariant getMessagesModelOfDialog(qint32 dialogId);
Q_INVOKABLE QVariant getDialog(qint32 dialogId);

First returns a MessagesModel object to be attached to a listView
Second returns a DialogItem object with the general data of that dialog

Both them are necessary to implement in qml the messages page

--------------------

This commit also fix a hidden bug: getMessagesModel and getMessagesModelFromId were set in DialogsModel but not in DialogsProxy, so they weren't usable from qml.

[Michał Karnicki (karni)]

One in-line comment. Otherwise great.

review: Approve

[Roberto Mier Escandon (rmescandon)]

No problem (see below)

[Michał Karnicki (karni)]

review: Approve

=== modified file 'qmlplugin/data.cpp'
--- qmlplugin/data.cpp	2014-07-23 13:39:50 +0000
+++ qmlplugin/data.cpp	2014-07-24 08:49:31 +0000
@@ -291,8 +291,8 @@
         }
 
         MessageItem *message = topMessage(d->id(), d->isChat());
-        MessagesModel &mm = d->getMessagesModel();
-        mm.append(*message);
+        MessagesModel *mm = d->messagesModel();
+        mm->append(*message);
         result.append(d);
     }
     return result;

=== modified file 'qmlplugin/models/dialogitem.cpp'
--- qmlplugin/models/dialogitem.cpp	2014-07-23 09:47:04 +0000
+++ qmlplugin/models/dialogitem.cpp	2014-07-24 08:49:31 +0000
@@ -95,8 +95,8 @@
     }
 }
 
-MessagesModel &DialogItem::getMessagesModel() {
-    return m_messagesModel;
+MessagesModel *DialogItem::messagesModel() {
+    return &m_messagesModel;
 }
 
 void DialogItem::dump() {

=== modified file 'qmlplugin/models/dialogitem.h'
--- qmlplugin/models/dialogitem.h	2014-07-22 12:02:01 +0000
+++ qmlplugin/models/dialogitem.h	2014-07-24 08:49:31 +0000
@@ -23,6 +23,7 @@
     Q_PROPERTY(qint32 membersOnline READ membersOnline)
     Q_PROPERTY(bool userOnline READ userOnline)
     Q_PROPERTY(qint32 lastSeenOnline READ lastSeenOnline)
+    Q_PROPERTY(MessagesModel* messagesModel READ messagesModel)
 
 public:
 
@@ -56,7 +57,7 @@
     void appendMessage(const MessageItem &m);
     void setIsTyping(qint32 whoisTyping);
 
-    MessagesModel &getMessagesModel();
+    MessagesModel *messagesModel();
 
     void dump();
 

=== modified file 'qmlplugin/models/dialogsmodel.cpp'
--- qmlplugin/models/dialogsmodel.cpp	2014-07-23 11:18:25 +0000
+++ qmlplugin/models/dialogsmodel.cpp	2014-07-24 08:49:31 +0000
@@ -68,13 +68,18 @@
     return QVariant::fromValue(&d);
 }
 
+QVariant DialogsModel::getFromId(int dialogId) {
+    qint32 pos = m_dlgIdsMap.value(dialogId, -1);
+    return get(pos);
+}
+
 QVariant DialogsModel::getMessagesModel(int row) {
     if ((row < 0) || (row >= m_dialogs.size())) {
         return QVariant();
     }
     DialogItem &tlDialog = m_dialogs[row];
-    MessagesModel &mm = tlDialog.getMessagesModel();
-    return QVariant::fromValue(&mm);
+    MessagesModel *mm = tlDialog.messagesModel();
+    return QVariant::fromValue(mm);
 }
 
 QVariant DialogsModel::getMessagesModelFromId(int dialogId) {

=== modified file 'qmlplugin/models/dialogsmodel.h'
--- qmlplugin/models/dialogsmodel.h	2014-07-23 09:47:04 +0000
+++ qmlplugin/models/dialogsmodel.h	2014-07-24 08:49:31 +0000
@@ -57,6 +57,7 @@
     Qt::ItemFlags flags(const QModelIndex &index) const;
 
     Q_INVOKABLE QVariant get(int row);
+    Q_INVOKABLE QVariant getFromId(int dialogId);
     Q_INVOKABLE QVariant getMessagesModel(int row);
     Q_INVOKABLE QVariant getMessagesModelFromId(int dialogId);
 

=== modified file 'qmlplugin/models/dialogsproxy.cpp'
--- qmlplugin/models/dialogsproxy.cpp	2014-07-23 09:47:04 +0000
+++ qmlplugin/models/dialogsproxy.cpp	2014-07-24 08:49:31 +0000
@@ -5,14 +5,18 @@
     QSortFilterProxyModel(parent) {
 }
 
-bool DialogsProxy::lessThan(const QModelIndex &left, const QModelIndex &right) const {
-    QVariant leftData = sourceModel()->data(left, DialogsModel::TopMessageDateRole);
-    QVariant rightData = sourceModel()->data(right, DialogsModel::TopMessageDateRole);
-    return leftData.toInt() < rightData.toInt();
-}
-
 QVariant DialogsProxy::get(int row) {
     QModelIndex proxyIndex = index(row, 0);
     QModelIndex modelIndex = mapToSource(proxyIndex);
     return static_cast<DialogsModel *>(sourceModel())->get(modelIndex.row());
 }
+
+QVariant DialogsProxy::getMessagesModel(int row) {
+    QModelIndex proxyIndex = index(row, 0);
+    QModelIndex modelIndex = mapToSource(proxyIndex);
+    return static_cast<DialogsModel *>(sourceModel())->getMessagesModel(modelIndex.row());
+}
+
+QVariant DialogsProxy::getMessagesModelFromId(int dialogId) {
+    return static_cast<DialogsModel *>(sourceModel())->getMessagesModelFromId(dialogId);
+}

=== modified file 'qmlplugin/models/dialogsproxy.h'
--- qmlplugin/models/dialogsproxy.h	2014-07-23 09:47:04 +0000
+++ qmlplugin/models/dialogsproxy.h	2014-07-24 08:49:31 +0000
@@ -10,9 +10,8 @@
     explicit DialogsProxy(QObject *parent = 0);
 
     Q_INVOKABLE QVariant get(int row);
-
-protected:
-    bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
+    Q_INVOKABLE QVariant getMessagesModel(int row);
+    Q_INVOKABLE QVariant getMessagesModelFromId(int dialogId);
 };
 
 #endif // DIALOGSPROXY_H

=== modified file 'qmlplugin/telegramclient.cpp'
--- qmlplugin/telegramclient.cpp	2014-07-23 11:46:15 +0000
+++ qmlplugin/telegramclient.cpp	2014-07-24 08:49:31 +0000
@@ -77,6 +77,16 @@
     m_telegram->contactsGetContacts();
 }
 
+QVariant TelegramClient::getMessagesModelOfDialog(qint32 dialogId) {
+    MessagesModel &mm = ModelsManager::instance()->messagesModel(dialogId);
+    return QVariant::fromValue(&mm);
+}
+
+QVariant TelegramClient::getDialog(qint32 dialogId) {
+    DialogsModel &dm = ModelsManager::instance()->dialogsModel();
+    return dm.getFromId(dialogId);
+}
+
 qint64 TelegramClient::messagesSendMessage(TLInputPeer *peer, const QString &message) {
    qint64 requestId = RawApiClient::messagesSendMessage(peer, message);
    qint32 dialogsItemId = peer->userId();

=== modified file 'qmlplugin/telegramclient.h'
--- qmlplugin/telegramclient.h	2014-07-22 12:02:01 +0000
+++ qmlplugin/telegramclient.h	2014-07-24 08:49:31 +0000
@@ -30,8 +30,10 @@
 
     Q_INVOKABLE void initTelegramLibrary();
 
-    // Working with messages
-    Q_INVOKABLE qint64 messagesSendMessage (TLInputPeer *peer, const QString &message);
+    Q_INVOKABLE QVariant getMessagesModelOfDialog(qint32 dialogId);
+    Q_INVOKABLE QVariant getDialog(qint32 dialogId);
+
+    Q_INVOKABLE qint64 messagesSendMessage(TLInputPeer *peer, const QString &message);
 
 Q_SIGNALS:
     void dialogsModelChanged(QSortFilterProxyModel *);

=== modified file 'uitest/components/listitems/DlgItem.qml'
--- uitest/components/listitems/DlgItem.qml	2014-07-07 13:44:35 +0000
+++ uitest/components/listitems/DlgItem.qml	2014-07-24 08:49:31 +0000
@@ -11,5 +11,10 @@
 
         console.log("ID:" + dialogPage.peerId);
         console.log("ISCHAT" + dialogPage.peerIsChat);
+
+
+        // fill messages model data
+        dialogPage.labelText = telegramClient.getDialog(dialogPage.peerId).name;
+        dialogPage.listModel = telegramClient.getMessagesModelOfDialog(dialogPage.peerId);
     }
 }

=== modified file 'uitest/ui/DialogDesignPage.qml'
--- uitest/ui/DialogDesignPage.qml	2014-07-07 13:44:35 +0000
+++ uitest/ui/DialogDesignPage.qml	2014-07-24 08:49:31 +0000
@@ -6,27 +6,44 @@
 
     property int peerId
     property int peerIsChat
+
     property alias sendMsgTextField : sendMsgTextField
     property alias backButton: backButton
+    property alias labelText: label.text
+    property alias listModel: messagesListView.model
 
     title: i18n.tr('Dialog');
 
-//    Flickable {
-//        boundsBehavior: Flickable.StopAtBounds
-
-//        SentPhraseBubble {
-//            text: "ey, nene, que tal te va?"
-//        }
-//    }
+
+    ListView {
+        id: messagesListView
+        anchors {
+            top: parent.top
+            left: parent.left
+            right: parent.right
+            bottom: column.top
+        }
+
+        delegate: Text {
+            text: model.text
+        }
+    }
 
     Column {
 
+        id: column
+
         anchors {
             left: parent.left
             right: parent.right
             bottom: parent.bottom
         }
 
+        Label {
+            id: label
+
+        }
+
         Button {
             id: backButton
             text: "<- Back"

=== modified file 'uitest/uitest.qml'
--- uitest/uitest.qml	2014-07-23 13:39:50 +0000
+++ uitest/uitest.qml	2014-07-24 08:49:31 +0000
@@ -112,13 +112,11 @@
 
         onAuthSendCallAnswer: verificationCodePage.countdownLabel.text = i18n.tr("calling user's mobile");
 
-//        onAuthLoggedIn: {
-//            console.log("onAuthLoggedIn");
-//            messagesGetDialogs();
-//        }
-
         onMessagesGetDialogsAnswer: {
+            // *Uncomment to render dialogsPage
             pageStack.showPage(dialogsPage);
+
+            // *Uncomment to render contactsPage
             //pageStack.showPage(contactsPage);
         }