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

Merge branch 'feature/new-gui' of github.com:amnezia-vpn/amnezia-client into feature/new-gui

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-09-01 20:21:33 +05:00
commit 7fc4ea0c68
12 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/ui/controllers/importController.cpp
View file

@ -97,7 +97,7 @@ void ImportController::extractConfigFromFile(const QString &fileName)
}
}
void ImportController::extractConfigFromData(QString &data)
void ImportController::extractConfigFromData(QString data)
{
auto configFormat = checkConfigFormat(data);
if (configFormat == ConfigTypes::OpenVpn) {

2
client/ui/controllers/importController.h
View file

@ -22,7 +22,7 @@ public:
public slots:
void importConfig();
void extractConfigFromFile(const QString &fileName);
void extractConfigFromData(QString &data);
void extractConfigFromData(QString data);
void extractConfigFromCode(QString code);
bool extractConfigFromQr(const QByteArray &data);
QString getConfig();

3
client/ui/macos_util.h
View file

@ -1,9 +1,12 @@
#ifndef OSXUTIL_H
#define OSXUTIL_H
#ifndef Q_OS_IOS
#include <QDialog>
#include <QWidget>
void setDockIconVisible(bool visible);
void fixWidget(QWidget *widget);
#endif
#endif

8
client/ui/qml/Components/ShareConnectionDrawer.qml
View file

@ -69,7 +69,13 @@ DrawerType {
text: qsTr("Share")
imageSource: "qrc:/images/controls/share-2.svg"
onClicked: fileDialog.open()
onClicked: {
if (Qt.platform.os === "ios") {
ExportController.saveFile("amnezia_config.vpn")
} else {
fileDialog.open()
}
}
FileDialog {
id: fileDialog

8
client/ui/qml/Pages2/PageSettingsLogging.qml
View file

@ -100,7 +100,13 @@ PageType {
image: "qrc:/images/controls/save.svg"
onClicked: fileDialog.open()
onClicked: {
if (Qt.platform.os === "ios") {
SettingsController.exportLogsFile("AmneziaVPN.log")
} else {
fileDialog.open()
}
}
FileDialog {
id: fileDialog

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

@ -302,7 +302,11 @@ PageType {
text: qsTr("Save site list")
clickedFunction: function() {
saveFileDialog.open()
if (Qt.platform.os === "ios") {
ExportController.saveFile("amezia_tunnel.json")
} else {
saveFileDialog.open()
}
}
FileDialog {