Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into feature/new-gui
This commit is contained in:
commit
a76e22c021
4 changed files with 7 additions and 4 deletions
|
@ -98,6 +98,7 @@ bool IosController::initialize()
|
|||
if (manager.connection.status == NEVPNStatusConnected) {
|
||||
m_currentTunnel = manager;
|
||||
qDebug() << "IosController::initialize : VPN already connected";
|
||||
emit connectionStateChanged(Vpn::ConnectionState::Connected);
|
||||
break;
|
||||
|
||||
// TODO: show connected state
|
||||
|
|
|
@ -13,6 +13,8 @@ import ContainerProps 1.0
|
|||
import "./"
|
||||
import "../Controls2"
|
||||
import "../Controls2/TextTypes"
|
||||
import "../Config"
|
||||
import "../Components"
|
||||
|
||||
DrawerType {
|
||||
id: root
|
||||
|
@ -70,8 +72,8 @@ DrawerType {
|
|||
imageSource: "qrc:/images/controls/share-2.svg"
|
||||
|
||||
onClicked: {
|
||||
if (Qt.platform.os === "ios") {
|
||||
ExportController.saveFile("amnezia_config.vpn")
|
||||
if (GC.isMobile()) {
|
||||
ExportController.saveFile(configFileName)
|
||||
} else {
|
||||
fileDialog.open()
|
||||
}
|
||||
|
|
|
@ -101,7 +101,7 @@ PageType {
|
|||
image: "qrc:/images/controls/save.svg"
|
||||
|
||||
onClicked: {
|
||||
if (Qt.platform.os === "ios") {
|
||||
if (GC.isMobile()) {
|
||||
SettingsController.exportLogsFile("AmneziaVPN.log")
|
||||
} else {
|
||||
fileDialog.open()
|
||||
|
|
|
@ -300,7 +300,7 @@ PageType {
|
|||
text: qsTr("Save site list")
|
||||
|
||||
clickedFunction: function() {
|
||||
if (Qt.platform.os === "ios") {
|
||||
if (GC.isMobile()) {
|
||||
SitesController.exportSites("amezia_tunnel.json")
|
||||
} else {
|
||||
saveFileDialog.open()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue