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

added the ability to restore settings from backup on the initial screen

Browse source 
- fixed the display of services in the settings for mobile devices
This commit is contained in:
vladimir.kuznetsov 2023-09-01 00:48:58 +05:00
parent cbcf187814
commit b58295d1d6
8 changed files with 48 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/fileUtilites.cpp
View file

@ -81,5 +81,5 @@ QString FileUtilites::getFileName(QString fileName)
return fileName;
#endif
return QUrl(FileUtilites::getFileName(fileName)).toLocalFile();
return QUrl(fileName).toLocalFile();
}

6
client/ui/qml/Components/HomeContainersListView.qml
View file

@ -53,6 +53,12 @@ ListView {
checkable: isInstalled
checked: isDefault
onPressed: function(mouse) {
if (!isSupported) {
PageController.showErrorMessage(qsTr("The selected protocol is not supported on the current platform"))
}
}
onClicked: {
if (checked) {
isDefault = true

8
client/ui/qml/Filters/ContainersModelFilters.qml
View file

@ -32,16 +32,16 @@ Item {
}
function getWriteAccessProtocolsListFilters() {
return [vpnTypeFilter, supportedFilter]
return [vpnTypeFilter]
}
function getReadAccessProtocolsListFilters() {
return [vpnTypeFilter, supportedFilter, installedFilter]
return [vpnTypeFilter, installedFilter]
}
function getWriteAccessServicesListFilters() {
return [serviceTypeFilter, supportedFilter]
return [serviceTypeFilter
}
function getReadAccessServicesListFilters() {
return [serviceTypeFilter, supportedFilter, installedFilter]
return [serviceTypeFilter, installedFilter]
}
}

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

@ -22,7 +22,7 @@ PageType {
if (isInstalledContainerFound) {
message = qsTr("All installed containers have been added to the application")
} else {
message = qsTr("No installed containers found")
message = qsTr("No new installed containers found")
}
PageController.showErrorMessage(message)

6
client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
View file

@ -241,8 +241,10 @@ PageType {
buttonImageSource: "qrc:/images/controls/plus.svg"
clickedFunc: function() {
PageController.showBusyIndicator(true)
SitesController.addSite(textFieldText)
textFieldText = ""
PageController.showBusyIndicator(false)
}
}
@ -312,8 +314,10 @@ PageType {
currentFile: StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/sites"
defaultSuffix: ".json"
onAccepted: {
PageController.showBusyIndicator(true)
SitesController.exportSites(saveFileDialog.currentFile.toString())
moreActionsDrawer.close()
PageController.showBusyIndicator(false)
}
}
}
@ -394,9 +398,11 @@ PageType {
acceptLabel: qsTr("Open sites file")
nameFilters: [ "Sites files (*.json)" ]
onAccepted: {
PageController.showBusyIndicator(true)
SitesController.importSites(openFileDialog.selectedFile.toString(), replaceExistingSites)
importSitesDrawer.close()
moreActionsDrawer.close()
PageController.showBusyIndicator(false)
}
}
}

14
client/ui/qml/Pages2/PageSetupWizardConfigSource.qml
View file

@ -65,7 +65,7 @@ It's okay as long as it's from someone you trust.")
Layout.fillWidth: true
Layout.topMargin: 16
text: qsTr("File with connection settings")
text: qsTr("File with connection settings or backup")
rightImageSource: "qrc:/images/controls/chevron-right.svg"
leftImageSource: "qrc:/images/controls/folder-open.svg"
@ -76,10 +76,16 @@ It's okay as long as it's from someone you trust.")
FileDialog {
id: fileDialog
acceptLabel: qsTr("Open config file")
nameFilters: [ "Config files (*.vpn *.ovpn *.conf)" ]
nameFilters: [ "Config or backup files (*.vpn *.ovpn *.conf *.backup)" ]
onAccepted: {
ImportController.extractConfigFromFile(fileDialog.selectedFile.toString())
goToPage(PageEnum.PageSetupWizardViewConfig)
if (fileDialog.selectedFile.toString().indexOf(".backup") != -1) {
PageController.showBusyIndicator(true)
SettingsController.restoreAppConfig(fileDialog.selectedFile.toString())
PageController.showBusyIndicator(false)
} else {
ImportController.extractConfigFromFile(fileDialog.selectedFile.toString())
goToPage(PageEnum.PageSetupWizardViewConfig)
}
}
}
}

19
client/ui/qml/Pages2/PageSetupWizardStart.qml
View file

@ -19,6 +19,19 @@ PageType {
function onGoToPageViewConfig() {
goToPage(PageEnum.PageSetupWizardViewConfig)
}
function onShowBusyIndicator(visible) {
busyIndicator.visible = visible
}
}
Connections {
target: SettingsController
function onRestoreBackupFinished() {
PageController.showNotificationMessage(qsTr("Settings restored from backup file"))
PageController.replaceStartPage()
}
}
FlickableType {
@ -93,4 +106,10 @@ PageType {
id: connectionTypeSelection
}
}
BusyIndicatorType {
id: busyIndicator
anchors.centerIn: parent
z: 1
}
}

4
client/ui/qml/main2.qml
View file

@ -47,9 +47,7 @@ Window {
function onReplaceStartPage() {
var pagePath = PageController.getInitialPage()
while (rootStackView.depth > 1) {
rootStackView.pop()
}
rootStackView.clear()
PageController.updateNavigationBarColor(PageController.getInitialPageNavigationBarColor())
rootStackView.replace(pagePath, { "objectName" : pagePath })
}