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

This commit is contained in:
vladimir.kuznetsov 2023-04-18 15:47:11 +03:00
commit 87f01007cc
279 changed files with 3175 additions and 1503756 deletions

View file

@ -12,7 +12,8 @@ public:
enum Type {
Basic,
Proto,
ShareProto
ShareProto,
ClientInfo
};
Q_ENUM(Type)
};
@ -24,7 +25,8 @@ enum class Page {Start = 0, NewServer, NewServerProtocols, Vpn,
Wizard, WizardLow, WizardMedium, WizardHigh, WizardVpnMode, ServerConfiguringProgress,
GeneralSettings, AppSettings, NetworkSettings, ServerSettings,
ServerContainers, ServersList, ShareConnection, Sites,
ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig, AdvancedServerSettings,
ProtocolSettings, ProtocolShare, QrDecoder, QrDecoderIos, About, ViewConfig,
AdvancedServerSettings, ClientManagement, ClientInfo
Test, WizardCredentials, WizardProtocols, WizardEasySetup};
Q_ENUM_NS(Page)