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

removed Widgets from service part

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-08-23 00:20:59 +05:00
parent f7926847ac
commit 23ad006187
11 changed files with 178 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/ui/controllers/exportController.cpp
View file

@ -4,7 +4,6 @@
#include <QDataStream>
#include <QDesktopServices>
#include <QFile>
#include <QFileDialog>
#include <QFileInfo>
#include <QImage>
#include <QStandardPaths>
@ -12,7 +11,7 @@
#include "configurators/openvpn_configurator.h"
#include "configurators/wireguard_configurator.h"
#include "core/errorstrings.h"
#include "utilities.h"
#include "fileUtilites.h"
#ifdef Q_OS_ANDROID
#include "platforms/android/android_controller.h"
#include "platforms/android/androidutils.h"
@ -230,7 +229,7 @@ void ExportController::saveFile(const QString &fileExtension, const QString &cap
return;
#endif
Utils::saveFile(fileExtension, caption, fileName, m_config);
FileUtilites::saveFile(fileExtension, caption, fileName, m_config);
}
QList<QString> ExportController::generateQrCodeImageSeries(const QByteArray &data)

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

@ -10,7 +10,7 @@
#include "../../platforms/android/androidutils.h"
#include <QJniObject>
#endif
#include "utilities.h"
#include "fileUtilites.h"
namespace
{
@ -84,9 +84,9 @@ ImportController::ImportController(const QSharedPointer<ServersModel> &serversMo
void ImportController::extractConfigFromFile()
{
QString fileName = Utils::getFileName(Q_NULLPTR, tr("Open config file"),
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
"*.vpn *.ovpn *.conf");
QString fileName = FileUtilites::getFileName(Q_NULLPTR, tr("Open config file"),
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation),
"*.vpn *.ovpn *.conf");
QFile file(fileName);
if (file.open(QIODevice::ReadOnly)) {
QString data = file.readAll();

1
client/ui/controllers/installController.cpp
View file

@ -7,6 +7,7 @@
#include "core/errorstrings.h"
#include "core/servercontroller.h"
#include "fileUtilites.h"
#include "utilities.h"
namespace

10
client/ui/controllers/settingsController.cpp
View file

@ -2,8 +2,8 @@
#include <QStandardPaths>
#include "fileUtilites.h"
#include "logger.h"
#include "utilities.h"
#include "version.h"
SettingsController::SettingsController(const QSharedPointer<ServersModel> &serversModel,
@ -69,7 +69,7 @@ void SettingsController::openLogsFolder()
void SettingsController::exportLogsFile()
{
Utils::saveFile(".log", tr("Save log"), "AmneziaVPN", Logger::getLogFile());
FileUtilites::saveFile(".log", tr("Save log"), "AmneziaVPN", Logger::getLogFile());
}
void SettingsController::clearLogs()
@ -80,14 +80,14 @@ void SettingsController::clearLogs()
void SettingsController::backupAppConfig()
{
Utils::saveFile(".backup", tr("Backup application config"), "AmneziaVPN", m_settings->backupAppConfig());
FileUtilites::saveFile(".backup", tr("Backup application config"), "AmneziaVPN", m_settings->backupAppConfig());
}
void SettingsController::restoreAppConfig()
{
QString fileName =
Utils::getFileName(Q_NULLPTR, tr("Open backup"),
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup");
FileUtilites::getFileName(Q_NULLPTR, tr("Open backup"),
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.backup");
if (fileName.isEmpty()) {
return;

9
client/ui/controllers/sitesController.cpp
View file

@ -3,7 +3,7 @@
#include <QHostInfo>
#include <QStandardPaths>
#include "utilities.h"
#include "fileUtilites.h"
SitesController::SitesController(const std::shared_ptr<Settings> &settings,
const QSharedPointer<VpnConnection> &vpnConnection,
@ -80,8 +80,9 @@ void SitesController::removeSite(int index)
void SitesController::importSites(bool replaceExisting)
{
QString fileName = Utils::getFileName(Q_NULLPTR, tr("Open sites file"),
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.json");
QString fileName =
FileUtilites::getFileName(Q_NULLPTR, tr("Open sites file"),
QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation), "*.json");
if (fileName.isEmpty()) {
return;
@ -149,7 +150,7 @@ void SitesController::exportSites()
QJsonDocument jsonDocument(jsonArray);
QByteArray jsonData = jsonDocument.toJson();
Utils::saveFile(".json", tr("Export sites file"), "sites", jsonData);
FileUtilites::saveFile(".json", tr("Export sites file"), "sites", jsonData);
emit finished(tr("Export completed"));
}