Display back button in login with 'assistant_go_directly_to_third_party_sip_account_login' option.
This commit is contained in:
parent
b27cc35638
commit
8aefe3d800
2 changed files with 6 additions and 2 deletions
|
|
@ -31,7 +31,6 @@ LoginLayout {
|
||||||
console.debug("[SIPLoginPage] User: return")
|
console.debug("[SIPLoginPage] User: return")
|
||||||
mainItem.goBack()
|
mainItem.goBack()
|
||||||
}
|
}
|
||||||
visible: !SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin
|
|
||||||
}
|
}
|
||||||
Image {
|
Image {
|
||||||
fillMode: Image.PreserveAspectFit
|
fillMode: Image.PreserveAspectFit
|
||||||
|
|
|
||||||
|
|
@ -134,7 +134,12 @@ AbstractWindow {
|
||||||
Component {
|
Component {
|
||||||
id: sipLoginPage
|
id: sipLoginPage
|
||||||
SIPLoginPage {
|
SIPLoginPage {
|
||||||
onGoBack: mainWindowStackView.pop()
|
onGoBack: {
|
||||||
|
if(SettingsCpp.assistantGoDirectlyToThirdPartySipAccountLogin)
|
||||||
|
mainWindowStackView.replace(mainPage)
|
||||||
|
else
|
||||||
|
mainWindowStackView.pop()
|
||||||
|
}
|
||||||
onGoToRegister: mainWindowStackView.replace(registerPage)
|
onGoToRegister: mainWindowStackView.replace(registerPage)
|
||||||
|
|
||||||
onConnectionSucceed: {
|
onConnectionSucceed: {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue