mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-10-23 03:26:59 +09:00
NickVs2015andvkamn
b1a37b3779
* feat: move amnezia hardcode from sources to cmake * feat: move amnezia hardcode from sources to cmake * refactor: remove prem v1 migration * chore: move more branding * fix: use host-matching architecture for iOS simulator builds x86_64 was hardcoded; Apple Silicon Macs run arm64 simulators and Xcode 26 has no Rosetta simulator destinations, so simulators showed as unsupported. * fix: mark the branded media assets catalog as a bundle resource MACOSX_PACKAGE_LOCATION was set on the upstream Media.xcassets path while target_sources uses CLIENT_IOS_MEDIA_ASSETS_PATH, so a branded catalog was never compiled by actool and the app got a blank icon. * fix: parametrize the Swift app-group identifier used by Log.swift Log.swift hardcoded Amnezia's own app-group instead of the branded one, since Swift -D flags can't carry the string value like the ObjC++ side does. Generate a small Swift constants file instead, same pattern as version.h.in, wired into all four targets that compile Log.swift. * fix: use APPLICATION_NAME instead of hardcoded Amnezia in log line format Every log line printed "Amnezia" regardless of branding; the log file name two lines above this already used APPLICATION_NAME correctly. * fix: restore branding fixes dropped by rebase, rename swiftInterop to swiftBridge * fix: move more branding variables to cmake * feat: move macOS branding from sources to cmake - macos/app/Info.plist.in: app group, camera usage text, UTI ids and descriptions now come from CLIENT_APPLICATION_NAME / BUILD_* variables, mirroring ios/app/Info.plist.in - macos/networkextension/Info.plist.in: bundle names and app group ids are templated; the plist is configured by CMake into the binary dir because Xcode only expands its own $(...) settings - new knobs: CLIENT_MACOS_MEDIA_ASSETS_PATH, CLIENT_MACOS_APP_ICNS_PATH, CLIENT_MACOS_PROVISIONING_PROFILE_SPECIFIER(_DEBUG), CLIENT_MACOS_NE_PROVISIONING_PROFILE_SPECIFIER(_DEBUG) * fix: resolve macOS pf template paths relative to the client source dir CMAKE_SOURCE_DIR points at the wrapper project when the client is built as a subproject, so the pf template lookup failed there. * chore: separate brandings defaults --------- Co-authored-by: vkamn <vk@amnezia.org>
101 lines
2.7 KiB
C++
101 lines
2.7 KiB
C++
#ifndef PAGE_ENUM_H
|
|
#define PAGE_ENUM_H
|
|
|
|
#include <QObject>
|
|
#include <QQmlEngine>
|
|
|
|
namespace PageLoader
|
|
{
|
|
Q_NAMESPACE
|
|
enum class PageEnum {
|
|
PageStart = 0,
|
|
PageHome,
|
|
PageShare,
|
|
PageDeinstalling,
|
|
PageAbout,
|
|
|
|
PageSettingsServersList,
|
|
PageSettings,
|
|
PageSettingsServerData,
|
|
PageSettingsServerInfo,
|
|
PageSettingsServerProtocols,
|
|
PageSettingsServerServices,
|
|
PageSettingsServerProtocol,
|
|
PageSettingsConnection,
|
|
PageSettingsDns,
|
|
PageSettingsApplication,
|
|
PageSettingsNewsNotifications,
|
|
PageSettingsNewsDetail,
|
|
PageSettingsBackup,
|
|
PageSettingsAbout,
|
|
PageSettingsLogging,
|
|
PageSettingsSplitTunneling,
|
|
PageSettingsAppSplitTunneling,
|
|
PageSettingsKillSwitch,
|
|
PageSettingsApiServerInfo,
|
|
PageSettingsApiAvailableCountries,
|
|
PageSettingsApiSupport,
|
|
PageSettingsApiInstructions,
|
|
PageSettingsApiNativeConfigs,
|
|
PageSettingsApiDevices,
|
|
PageSettingsApiSubscriptionKey,
|
|
PageSettingsKillSwitchExceptions,
|
|
|
|
PageServiceSftpSettings,
|
|
PageServiceTorWebsiteSettings,
|
|
PageServiceDnsSettings,
|
|
PageServiceSocksProxySettings,
|
|
PageServiceMtProxySettings,
|
|
PageServiceTelemtSettings,
|
|
|
|
PageSetupWizardStart,
|
|
PageSetupWizardCredentials,
|
|
PageSetupWizardProtocols,
|
|
PageSetupWizardEasy,
|
|
PageSetupWizardProtocolSettings,
|
|
PageSetupWizardInstalling,
|
|
PageSetupWizardConfigSource,
|
|
PageSetupWizardTextKey,
|
|
PageSetupWizardViewConfig,
|
|
PageSetupWizardQrReader,
|
|
PageSetupWizardApiServicesList,
|
|
PageSetupWizardApiFreeInfo,
|
|
|
|
PageProtocolOpenVpnSettings,
|
|
PageProtocolXraySettings,
|
|
PageProtocolWireGuardSettings,
|
|
PageProtocolAwgSettings,
|
|
PageProtocolIKev2Settings,
|
|
PageProtocolRaw,
|
|
|
|
PageProtocolWireGuardClientSettings,
|
|
PageProtocolAwgClientSettings,
|
|
|
|
PageShareFullAccess,
|
|
PageShareConnection,
|
|
|
|
PageSetupWizardApiPremiumInfo,
|
|
PageSetupWizardApiTrialEmail,
|
|
|
|
PageDevMenu,
|
|
|
|
PageProtocolXraySnapshots,
|
|
PageProtocolXrayTransportSettings,
|
|
PageProtocolXrayXmuxSettings,
|
|
PageProtocolXrayXPaddingSettings,
|
|
PageProtocolXrayFlowSettings,
|
|
PageProtocolXraySecuritySettings,
|
|
PageProtocolXrayXPaddingBytesSettings,
|
|
|
|
PageSettingsLanguage,
|
|
};
|
|
Q_ENUM_NS(PageEnum)
|
|
|
|
static void declareQmlPageEnum()
|
|
{
|
|
qmlRegisterUncreatableMetaObject(PageLoader::staticMetaObject, "PageEnum", 1, 0, "PageEnum", "Error: only enums");
|
|
}
|
|
}
|
|
|
|
#endif // PAGE_ENUM_H
|