From fa259d2a3191c6a380ebbd147e26cd89e73008fd Mon Sep 17 00:00:00 2001 From: Gaelle Braud Date: Thu, 4 Jul 2024 13:14:18 +0200 Subject: [PATCH] return to call history on end call --- Linphone/view/App/CallsWindow.qml | 2 ++ Linphone/view/App/Layout/MainLayout.qml | 6 ++++++ Linphone/view/App/Main.qml | 5 +++++ Linphone/view/Page/Main/CallPage.qml | 3 +++ 4 files changed, 16 insertions(+) diff --git a/Linphone/view/App/CallsWindow.qml b/Linphone/view/App/CallsWindow.qml index ebfde3706..dc8b417be 100644 --- a/Linphone/view/App/CallsWindow.qml +++ b/Linphone/view/App/CallsWindow.qml @@ -73,6 +73,8 @@ AppWindow { function endCall(callToFinish) { if (callToFinish) callToFinish.core.lTerminate() + var mainWin = UtilsCpp.getMainWindow() + mainWin.goToCallHistory() } function callEnded(call){ if (call.core.state === LinphoneEnums.CallState.Error) { diff --git a/Linphone/view/App/Layout/MainLayout.qml b/Linphone/view/App/Layout/MainLayout.qml index e1811a169..1334cbee6 100644 --- a/Linphone/view/App/Layout/MainLayout.qml +++ b/Linphone/view/App/Layout/MainLayout.qml @@ -20,12 +20,17 @@ Item { signal addAccountRequest() signal openNewCall() + signal openCallHistory() signal createContactRequested(string name, string address) function goToNewCall() { tabbar.currentIndex = 0 mainItem.openNewCall() } + function goToCallHistory() { + tabbar.currentIndex = 0 + mainItem.openCallHistory() + } function createContact(name, address) { tabbar.currentIndex = 1 @@ -370,6 +375,7 @@ Item { Connections { target: mainItem onOpenNewCall: callPage.goToNewCall() + onOpenCallHistory: callPage.goToCallHistory() } onCreateContactRequested: (name, address) => { mainItem.createContact(name, address) diff --git a/Linphone/view/App/Main.qml b/Linphone/view/App/Main.qml index 7bfb46141..0ca859425 100644 --- a/Linphone/view/App/Main.qml +++ b/Linphone/view/App/Main.qml @@ -24,6 +24,11 @@ AppWindow { // color: DefaultStyle.grey_100 // } + function goToCallHistory() { + console.log("go to call history") + mainWindowStackView.replace(mainPage, StackView.Immediate) + mainWindowStackView.currentItem.goToCallHistory() + } function goToNewCall() { mainWindowStackView.replace(mainPage, StackView.Immediate) mainWindowStackView.currentItem.goToNewCall() diff --git a/Linphone/view/Page/Main/CallPage.qml b/Linphone/view/Page/Main/CallPage.qml index 5ccdb0031..18f38477e 100644 --- a/Linphone/view/Page/Main/CallPage.qml +++ b/Linphone/view/Page/Main/CallPage.qml @@ -50,6 +50,9 @@ AbstractMainPage { function goToNewCall() { listStackView.push(newCallItem) } + function goToCallHistory() { + listStackView.pop() + } Dialog { id: deleteHistoryPopup