[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [spacebar] app/package/contents/ui: [app] React to newRequestChannel() signal and switch the pages t
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2016-03-10 21:35:07
Message-ID: E1ae8Ed-00078N-DY () scm ! kde ! org
[Download RAW message or body]

Git commit 4342cd1fce8a1c7aa647b786188b26686c631edb by Martin Klapetek.
Committed on 10/03/2016 at 21:34.
Pushed by mklapetek into branch 'master'.

[app] React to newRequestChannel() signal and switch the pages to the conversation \
one

M  +1    -0    app/package/contents/ui/ConversationPage.qml
M  +3    -4    app/package/contents/ui/MainPage.qml
M  +1    -0    app/package/contents/ui/NewConversationPage.qml

http://commits.kde.org/spacebar/4342cd1fce8a1c7aa647b786188b26686c631edb

diff --git a/app/package/contents/ui/ConversationPage.qml \
b/app/package/contents/ui/ConversationPage.qml index 97dcf61..ce09fd6 100644
--- a/app/package/contents/ui/ConversationPage.qml
+++ b/app/package/contents/ui/ConversationPage.qml
@@ -31,6 +31,7 @@ MobileComponents.Page {
     anchors.fill: parent
 
     property Conversation conversation
+    property string pageName: "conversationPage"
 
     Loader {
         anchors.fill: parent
diff --git a/app/package/contents/ui/MainPage.qml \
b/app/package/contents/ui/MainPage.qml index a7817a9..4cd4ebc 100644
--- a/app/package/contents/ui/MainPage.qml
+++ b/app/package/contents/ui/MainPage.qml
@@ -57,12 +57,11 @@ MobileComponents.Page {
                     sourceModel: KTp.MainLogModel {
                         id: mainModel
 
-                        onRowsInserted: {
-                            if (mainModel.data(first, "personUri") == \
                root.requestedChannel) {
-                                root.requestedChannel = "";
+                        onNewRequestedChannel: {
+                            if (root.pageStack.currentPage.pageName === \
"newConversationPage") {  root.pageStack.pop();
                                 root.pageStack.push(conversationPageComponent);
-                                root.pageStack.currentPage.conversation = \
mainModel.data(first, "conversation"); +                                \
root.pageStack.currentPage.conversation = mainModel.data(index.row, "conversation");  \
}  }
 
diff --git a/app/package/contents/ui/NewConversationPage.qml \
b/app/package/contents/ui/NewConversationPage.qml index ea7fdc3..c149465 100644
--- a/app/package/contents/ui/NewConversationPage.qml
+++ b/app/package/contents/ui/NewConversationPage.qml
@@ -31,6 +31,7 @@ import org.kde.telepathy 0.1
 
 MobileComponents.Page {
     anchors.fill: parent
+    property string pageName: "newConversationPage"
 
     GridLayout {
         anchors.fill: parent


[prev in list] [next in list] [prev in thread] [next in thread]