andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-24 02:00:24 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

feat: move amnezia hardcode from sources to cmake

Browse Source
This commit is contained in:
vkamn
2026-05-22 21:49:16 +08:00
parent 4787f3915b
commit 2990508fcf
22 changed files with 265 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/ui/controllers/qml/pageController.cpp
+2 -1
View File
@@ -2,6 +2,7 @@
#include "ui/utils/converter.h"
#include "core/utils/errorStrings.h"
#include "core/utils/appUiConfig.h"
#if defined(MACOS_NE)
#include "platforms/ios/ios_controller.h"
#endif
@@ -63,7 +64,7 @@ QString PageController::getPagePath(PageLoader::PageEnum page)
{
QMetaEnum metaEnum = QMetaEnum::fromType<PageLoader::PageEnum>();
QString pageName = metaEnum.valueToKey(static_cast<int>(page));
return "qrc:/ui/qml/Pages2/" + pageName + ".qml";
return QStringLiteral(APP_QML_PAGES_PREFIX) + pageName + QStringLiteral(".qml");
}
void PageController::closeWindow()
client/ui/controllers/settingsUiController.cpp
+3 -3
View File
@@ -17,7 +17,7 @@
#endif
#if defined(Q_OS_IOS) || defined(MACOS_NE)
#include <AmneziaVPN-Swift.h>
#include "core/utils/swiftInterop.h"
#endif
SettingsUiController::SettingsUiController(SettingsController* settingsController,
@@ -83,7 +83,7 @@ void SettingsUiController::toggleLogging(bool enable)
{
m_settingsController->toggleLogging(enable);
#if defined(Q_OS_IOS)
AmneziaVPN::toggleLogging(enable);
SWIFT_INTEROP_NAMESPACE::toggleLogging(enable);
#endif
if (enable == true) {
qInfo().noquote() << QString("Logging has enabled on %1 version %2 %3").arg(APPLICATION_NAME, APP_VERSION, GIT_COMMIT_HASH);
@@ -182,7 +182,7 @@ void SettingsUiController::clearSettings()
emit changeSettingsFinished(tr("All settings have been reset to default values"));
#if defined(Q_OS_IOS) || defined(MACOS_NE)
AmneziaVPN::clearSettings();
SWIFT_INTEROP_NAMESPACE::clearSettings();
#endif
}