AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into feature/split-tunnel-mobile

Browse source
This commit is contained in:
Mykola Baibuz 2023-10-27 15:37:28 -04:00
commit 9e92e4b5ff
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/translations/amneziavpn_ru.ts
View file

@ -1332,7 +1332,7 @@ Already installed containers were found on the server. All installed containers
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/> <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="87"/>
<source>Clear Amnezia cache</source> <source>Clear Amnezia cache</source>
<translation>Очистить кэш Amnezia на сервере</translation> <translation>Очистить кэш Amnezia</translation>
</message> </message>
<message> <message>
<location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="88"/> <location filename="../ui/qml/Pages2/PageSettingsServerData.qml" line="88"/>

2
client/ui/qml/Pages2/PageHome.qml
View file

@ -32,7 +32,7 @@ PageType {
function onRestorePageHomeState(isContainerInstalled) { function onRestorePageHomeState(isContainerInstalled) {
buttonContent.state = "expanded" buttonContent.state = "expanded"
if (isContainerInstalled) { if (isContainerInstalled) {
containersDropDown.menuVisible = true containersDropDown.rootButtonClickedFunction()
} }
} }
function onForceCloseDrawer() { function onForceCloseDrawer() {

12
client/ui/qml/Pages2/PageSetupWizardInstalling.qml
View file

@ -28,17 +28,11 @@ PageType {
ContainersModel.setDefaultContainer(ContainersModel.getCurrentlyProcessedContainerIndex()) ContainersModel.setDefaultContainer(ContainersModel.getCurrentlyProcessedContainerIndex())
} }
PageController.goToStartPage() PageController.closePage() // close installing page
PageController.closePage() // close protocol settings page
if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) { if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) {
PageController.restorePageHomeState(true) PageController.restorePageHomeState(true)
} else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) {
PageController.goToPage(PageEnum.PageSettingsServersList, false)
PageController.goToPage(PageEnum.PageSettingsServerInfo, false)
if (isServiceInstall) {
PageController.goToPageSettingsServerServices()
}
} else {
PageController.goToPage(PageEnum.PageHome)
} }
PageController.showNotificationMessage(finishedMessage) PageController.showNotificationMessage(finishedMessage)