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) {
|
if (manager.connection.status == NEVPNStatusConnected) {
|
||||||
m_currentTunnel = manager;
|
m_currentTunnel = manager;
|
||||||
qDebug() << "IosController::initialize : VPN already connected";
|
qDebug() << "IosController::initialize : VPN already connected";
|
||||||
|
emit connectionStateChanged(Vpn::ConnectionState::Connected);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// TODO: show connected state
|
// TODO: show connected state
|
||||||
|
|
|
@ -13,6 +13,8 @@ import ContainerProps 1.0
|
||||||
import "./"
|
import "./"
|
||||||
import "../Controls2"
|
import "../Controls2"
|
||||||
import "../Controls2/TextTypes"
|
import "../Controls2/TextTypes"
|
||||||
|
import "../Config"
|
||||||
|
import "../Components"
|
||||||
|
|
||||||
DrawerType {
|
DrawerType {
|
||||||
id: root
|
id: root
|
||||||
|
@ -70,8 +72,8 @@ DrawerType {
|
||||||
imageSource: "qrc:/images/controls/share-2.svg"
|
imageSource: "qrc:/images/controls/share-2.svg"
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (Qt.platform.os === "ios") {
|
if (GC.isMobile()) {
|
||||||
ExportController.saveFile("amnezia_config.vpn")
|
ExportController.saveFile(configFileName)
|
||||||
} else {
|
} else {
|
||||||
fileDialog.open()
|
fileDialog.open()
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,7 +101,7 @@ PageType {
|
||||||
image: "qrc:/images/controls/save.svg"
|
image: "qrc:/images/controls/save.svg"
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (Qt.platform.os === "ios") {
|
if (GC.isMobile()) {
|
||||||
SettingsController.exportLogsFile("AmneziaVPN.log")
|
SettingsController.exportLogsFile("AmneziaVPN.log")
|
||||||
} else {
|
} else {
|
||||||
fileDialog.open()
|
fileDialog.open()
|
||||||
|
|
|
@ -300,7 +300,7 @@ PageType {
|
||||||
text: qsTr("Save site list")
|
text: qsTr("Save site list")
|
||||||
|
|
||||||
clickedFunction: function() {
|
clickedFunction: function() {
|
||||||
if (Qt.platform.os === "ios") {
|
if (GC.isMobile()) {
|
||||||
SitesController.exportSites("amezia_tunnel.json")
|
SitesController.exportSites("amezia_tunnel.json")
|
||||||
} else {
|
} else {
|
||||||
saveFileDialog.open()
|
saveFileDialog.open()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue