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

changed the protocols for easySetup setup

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-09-18 21:06:10 +05:00
parent e38fe871b2
commit d4d6fbab88
5 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
client/containers/containers_defs.cpp
View file

@ -223,9 +223,9 @@ QStringList ContainerProps::fixedPortsForContainer(DockerContainer c)
bool ContainerProps::isEasySetupContainer(DockerContainer container)
{
switch (container) {
case DockerContainer::OpenVpn: return true;
case DockerContainer::WireGuard: return true;
case DockerContainer::Cloak: return true;
case DockerContainer::ShadowSocks: return true;
case DockerContainer::OpenVpn: return true;
default: return false;
}
}
@ -233,9 +233,9 @@ bool ContainerProps::isEasySetupContainer(DockerContainer container)
QString ContainerProps::easySetupHeader(DockerContainer container)
{
switch (container) {
case DockerContainer::OpenVpn: return tr("Low");
case DockerContainer::WireGuard: return tr("Low");
case DockerContainer::Cloak: return tr("High");
case DockerContainer::ShadowSocks: return tr("Medium");
case DockerContainer::OpenVpn: return tr("Medium");
default: return "";
}
}
@ -243,13 +243,23 @@ QString ContainerProps::easySetupHeader(DockerContainer container)
QString ContainerProps::easySetupDescription(DockerContainer container)
{
switch (container) {
case DockerContainer::OpenVpn: return tr("I just want to increase the level of privacy");
case DockerContainer::WireGuard: return tr("I just want to increase the level of privacy");
case DockerContainer::Cloak: return tr("Many foreign websites and VPN providers are blocked");
case DockerContainer::ShadowSocks: return tr("Some foreign sites are blocked, but VPN providers are not blocked");
case DockerContainer::OpenVpn: return tr("Some foreign sites are blocked, but VPN providers are not blocked");
default: return "";
}
}
int ContainerProps::easySetupOrder(DockerContainer container)
{
switch (container) {
case DockerContainer::WireGuard: return 1;
case DockerContainer::Cloak: return 3;
case DockerContainer::OpenVpn: return 2;
default: return 0;
}
}
bool ContainerProps::isShareable(DockerContainer container)
{
switch (container) {

1
client/containers/containers_defs.h
View file

@ -64,6 +64,7 @@ namespace amnezia
static bool isEasySetupContainer(amnezia::DockerContainer container);
static QString easySetupHeader(amnezia::DockerContainer container);
static QString easySetupDescription(amnezia::DockerContainer container);
static int easySetupOrder(amnezia::DockerContainer container);
static bool isShareable(amnezia::DockerContainer container);
};

7
client/ui/models/containers_model.cpp
View file

@ -75,6 +75,7 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
case IsEasySetupContainerRole: return ContainerProps::isEasySetupContainer(container);
case EasySetupHeaderRole: return ContainerProps::easySetupHeader(container);
case EasySetupDescriptionRole: return ContainerProps::easySetupDescription(container);
case EasySetupOrderRole: return ContainerProps::easySetupOrder(container);
case IsInstalledRole: return m_containers.contains(container);
case IsCurrentlyProcessedRole: return container == static_cast<DockerContainer>(m_currentlyProcessedContainerIndex);
case IsDefaultRole: return container == m_defaultContainerIndex;
@ -213,11 +214,6 @@ bool ContainersModel::isAmneziaDnsContainerInstalled(const int serverIndex)
return containers.contains(DockerContainer::Dns);
}
// bool ContainersModel::isOnlyServicesInstalled(const int serverIndex)
//{
//}
QHash<int, QByteArray> ContainersModel::roleNames() const
{
QHash<int, QByteArray> roles;
@ -231,6 +227,7 @@ QHash<int, QByteArray> ContainersModel::roleNames() const
roles[IsEasySetupContainerRole] = "isEasySetupContainer";
roles[EasySetupHeaderRole] = "easySetupHeader";
roles[EasySetupDescriptionRole] = "easySetupDescription";
roles[EasySetupOrderRole] = "easySetupOrder";
roles[IsInstalledRole] = "isInstalled";
roles[IsCurrentlyProcessedRole] = "isCurrentlyProcessed";

1
client/ui/models/containers_model.h
View file

@ -26,6 +26,7 @@ public:
IsEasySetupContainerRole,
EasySetupHeaderRole,
EasySetupDescriptionRole,
EasySetupOrderRole,
IsInstalledRole,
IsCurrentlyProcessedRole,

2
client/ui/qml/Pages2/PageSetupWizardEasy.qml
View file

@ -27,7 +27,7 @@ PageType {
}
]
sorters: RoleSorter {
roleName: "dockerContainer"
roleName: "easySetupOrder"
sortOrder: Qt.DescendingOrder
}
}