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

qml ui fixws: ss and cloak

Browse source
This commit is contained in:
pokamest 2021-10-28 15:31:54 +03:00
parent d7f672ab0a
commit 9de89e5544
10 changed files with 381 additions and 521 deletions
Download patch file Download diff file Expand all files Collapse all files

86
client/ui/pages_logic/protocols/CloakLogic.cpp
View file

@ -8,17 +8,17 @@ using namespace PageEnumNS;
CloakLogic::CloakLogic(UiLogic *logic, QObject *parent): CloakLogic::CloakLogic(UiLogic *logic, QObject *parent):
PageProtocolLogicBase(logic, parent), PageProtocolLogicBase(logic, parent),
m_comboBoxProtoCloakCipherText{"chacha20-poly1305"}, m_comboBoxCipherText{"chacha20-poly1305"},
m_lineEditProtoCloakSiteText{"tile.openstreetmap.org"}, m_lineEditSiteText{"tile.openstreetmap.org"},
m_lineEditProtoCloakPortText{}, m_lineEditPortText{},
m_pushButtonCloakSaveVisible{false}, m_pushButtonSaveVisible{false},
m_progressBarProtoCloakResetVisible{false}, m_progressBarResetVisible{false},
m_lineEditProtoCloakPortEnabled{false}, m_lineEditPortEnabled{false},
m_pageProtoCloakEnabled{true}, m_pageEnabled{true},
m_labelProtoCloakInfoVisible{true}, m_labelInfoVisible{true},
m_labelProtoCloakInfoText{}, m_labelInfoText{},
m_progressBarProtoCloakResetValue{0}, m_progressBarResetValue{0},
m_progressBarProtoCloakResetMaximium{100} m_progressBarResetMaximium{100}
{ {
} }
@ -26,31 +26,31 @@ CloakLogic::CloakLogic(UiLogic *logic, QObject *parent):
void CloakLogic::updateProtocolPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData) void CloakLogic::updateProtocolPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData)
{ {
set_pageEnabled(haveAuthData); set_pageEnabled(haveAuthData);
set_pushButtonCloakSaveVisible(haveAuthData); set_pushButtonSaveVisible(haveAuthData);
set_progressBarProtoCloakResetVisible(haveAuthData); set_progressBarResetVisible(haveAuthData);
set_comboBoxProtoCloakCipherText(ckConfig.value(config_key::cipher). set_comboBoxCipherText(ckConfig.value(config_key::cipher).
toString(protocols::cloak::defaultCipher)); toString(protocols::cloak::defaultCipher));
set_lineEditProtoCloakSiteText(ckConfig.value(config_key::site). set_lineEditSiteText(ckConfig.value(config_key::site).
toString(protocols::cloak::defaultRedirSite)); toString(protocols::cloak::defaultRedirSite));
set_lineEditProtoCloakPortText(ckConfig.value(config_key::port). set_lineEditPortText(ckConfig.value(config_key::port).
toString(protocols::cloak::defaultPort)); toString(protocols::cloak::defaultPort));
set_lineEditProtoCloakPortEnabled(container == DockerContainer::Cloak); set_lineEditPortEnabled(container == DockerContainer::Cloak);
} }
QJsonObject CloakLogic::getProtocolConfigFromPage(QJsonObject oldConfig) QJsonObject CloakLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
{ {
oldConfig.insert(config_key::cipher, comboBoxProtoCloakCipherText()); oldConfig.insert(config_key::cipher, comboBoxCipherText());
oldConfig.insert(config_key::site, lineEditProtoCloakSiteText()); oldConfig.insert(config_key::site, lineEditSiteText());
oldConfig.insert(config_key::port, lineEditProtoCloakPortText()); oldConfig.insert(config_key::port, lineEditPortText());
return oldConfig; return oldConfig;
} }
void CloakLogic::onPushButtonProtoCloakSaveClicked() void CloakLogic::onPushButtonSaveClicked()
{ {
QJsonObject protocolConfig = m_settings.protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Protocol::Cloak); QJsonObject protocolConfig = m_settings.protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Protocol::Cloak);
protocolConfig = getProtocolConfigFromPage(protocolConfig); protocolConfig = getProtocolConfigFromPage(protocolConfig);
@ -59,40 +59,40 @@ void CloakLogic::onPushButtonProtoCloakSaveClicked()
QJsonObject newContainerConfig = containerConfig; QJsonObject newContainerConfig = containerConfig;
newContainerConfig.insert(ProtocolProps::protoToString(Protocol::Cloak), protocolConfig); newContainerConfig.insert(ProtocolProps::protoToString(Protocol::Cloak), protocolConfig);
UiLogic::PageFunc page_proto_cloak; UiLogic::PageFunc page_func;
page_proto_cloak.setEnabledFunc = [this] (bool enabled) -> void { page_func.setEnabledFunc = [this] (bool enabled) -> void {
set_pageProtoCloakEnabled(enabled); set_pageEnabled(enabled);
}; };
UiLogic::ButtonFunc pushButton_proto_cloak_save; UiLogic::ButtonFunc pushButton_save_func;
pushButton_proto_cloak_save.setVisibleFunc = [this] (bool visible) ->void { pushButton_save_func.setVisibleFunc = [this] (bool visible) ->void {
set_pushButtonCloakSaveVisible(visible); set_pushButtonSaveVisible(visible);
}; };
UiLogic::LabelFunc label_proto_cloak_info; UiLogic::LabelFunc label_info_func;
label_proto_cloak_info.setVisibleFunc = [this] (bool visible) ->void { label_info_func.setVisibleFunc = [this] (bool visible) ->void {
set_labelProtoCloakInfoVisible(visible); set_labelInfoVisible(visible);
}; };
label_proto_cloak_info.setTextFunc = [this] (const QString& text) ->void { label_info_func.setTextFunc = [this] (const QString& text) ->void {
set_labelProtoCloakInfoText(text); set_labelInfoText(text);
}; };
UiLogic::ProgressFunc progressBar_proto_cloak_reset; UiLogic::ProgressFunc progressBar_reset;
progressBar_proto_cloak_reset.setVisibleFunc = [this] (bool visible) ->void { progressBar_reset.setVisibleFunc = [this] (bool visible) ->void {
set_progressBarProtoCloakResetVisible(visible); set_progressBarResetVisible(visible);
}; };
progressBar_proto_cloak_reset.setValueFunc = [this] (int value) ->void { progressBar_reset.setValueFunc = [this] (int value) ->void {
set_progressBarProtoCloakResetValue(value); set_progressBarResetValue(value);
}; };
progressBar_proto_cloak_reset.getValueFunc = [this] (void) -> int { progressBar_reset.getValueFunc = [this] (void) -> int {
return progressBarProtoCloakResetValue(); return progressBarResetValue();
}; };
progressBar_proto_cloak_reset.getMaximiumFunc = [this] (void) -> int { progressBar_reset.getMaximiumFunc = [this] (void) -> int {
return progressBarProtoCloakResetMaximium(); return progressBarResetMaximium();
}; };
ErrorCode e = uiLogic()->doInstallAction([this, containerConfig, &newContainerConfig](){ ErrorCode e = uiLogic()->doInstallAction([this, containerConfig, &newContainerConfig](){
return ServerController::updateContainer(m_settings.serverCredentials(uiLogic()->selectedServerIndex), uiLogic()->selectedDockerContainer, containerConfig, newContainerConfig); return ServerController::updateContainer(m_settings.serverCredentials(uiLogic()->selectedServerIndex), uiLogic()->selectedDockerContainer, containerConfig, newContainerConfig);
}, },
page_proto_cloak, progressBar_proto_cloak_reset, page_func, progressBar_reset,
pushButton_proto_cloak_save, label_proto_cloak_info); pushButton_save_func, label_info_func);
if (!e) { if (!e) {
m_settings.setContainerConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, newContainerConfig); m_settings.setContainerConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, newContainerConfig);

24
client/ui/pages_logic/protocols/CloakLogic.h
View file

@ -9,20 +9,20 @@ class CloakLogic : public PageProtocolLogicBase
{ {
Q_OBJECT Q_OBJECT
AUTO_PROPERTY(QString, comboBoxProtoCloakCipherText) AUTO_PROPERTY(QString, comboBoxCipherText)
AUTO_PROPERTY(QString, lineEditProtoCloakSiteText) AUTO_PROPERTY(QString, lineEditSiteText)
AUTO_PROPERTY(QString, lineEditProtoCloakPortText) AUTO_PROPERTY(QString, lineEditPortText)
AUTO_PROPERTY(bool, pushButtonCloakSaveVisible) AUTO_PROPERTY(bool, pushButtonSaveVisible)
AUTO_PROPERTY(bool, progressBarProtoCloakResetVisible) AUTO_PROPERTY(bool, progressBarResetVisible)
AUTO_PROPERTY(bool, lineEditProtoCloakPortEnabled) AUTO_PROPERTY(bool, lineEditPortEnabled)
AUTO_PROPERTY(bool, pageProtoCloakEnabled) AUTO_PROPERTY(bool, pageEnabled)
AUTO_PROPERTY(bool, labelProtoCloakInfoVisible) AUTO_PROPERTY(bool, labelInfoVisible)
AUTO_PROPERTY(QString, labelProtoCloakInfoText) AUTO_PROPERTY(QString, labelInfoText)
AUTO_PROPERTY(int, progressBarProtoCloakResetValue) AUTO_PROPERTY(int, progressBarResetValue)
AUTO_PROPERTY(int, progressBarProtoCloakResetMaximium) AUTO_PROPERTY(int, progressBarResetMaximium)
public: public:
Q_INVOKABLE void onPushButtonProtoCloakSaveClicked(); Q_INVOKABLE void onPushButtonSaveClicked();
public: public:
explicit CloakLogic(UiLogic *uiLogic, QObject *parent = nullptr); explicit CloakLogic(UiLogic *uiLogic, QObject *parent = nullptr);

63
client/ui/pages_logic/protocols/ShadowSocksLogic.cpp
View file

@ -8,16 +8,15 @@ using namespace PageEnumNS;
ShadowSocksLogic::ShadowSocksLogic(UiLogic *logic, QObject *parent): ShadowSocksLogic::ShadowSocksLogic(UiLogic *logic, QObject *parent):
PageProtocolLogicBase(logic, parent), PageProtocolLogicBase(logic, parent),
m_comboBoxProtoShadowSocksCipherText{"chacha20-poly1305"}, m_comboBoxCipherText{"chacha20-poly1305"},
m_lineEditProtoShadowSocksPortText{}, m_lineEditPortText{},
m_pushButtonShadowSocksSaveVisible{false}, m_pushButtonSaveVisible{false},
m_progressBarProtoShadowSocksResetVisible{false}, m_progressBaResetVisible{false},
m_lineEditProtoShadowSocksPortEnabled{false}, m_lineEditPortEnabled{false},
m_pageProtoShadowSocksEnabled{true}, m_labelInfoVisible{true},
m_labelProtoShadowSocksInfoVisible{true}, m_labelInfoText{},
m_labelProtoShadowSocksInfoText{}, m_progressBaResetValue{0},
m_progressBarProtoShadowSocksResetValue{0}, m_progressBaResetMaximium{100}
m_progressBarProtoShadowSocksResetMaximium{100}
{ {
} }
@ -25,27 +24,27 @@ ShadowSocksLogic::ShadowSocksLogic(UiLogic *logic, QObject *parent):
void ShadowSocksLogic::updateProtocolPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData) void ShadowSocksLogic::updateProtocolPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData)
{ {
set_pageEnabled(haveAuthData); set_pageEnabled(haveAuthData);
set_pushButtonShadowSocksSaveVisible(haveAuthData); set_pushButtonSaveVisible(haveAuthData);
set_progressBarProtoShadowSocksResetVisible(haveAuthData); set_progressBaResetVisible(haveAuthData);
set_comboBoxProtoShadowSocksCipherText(ssConfig.value(config_key::cipher). set_comboBoxCipherText(ssConfig.value(config_key::cipher).
toString(protocols::shadowsocks::defaultCipher)); toString(protocols::shadowsocks::defaultCipher));
set_lineEditProtoShadowSocksPortText(ssConfig.value(config_key::port). set_lineEditPortText(ssConfig.value(config_key::port).
toString(protocols::shadowsocks::defaultPort)); toString(protocols::shadowsocks::defaultPort));
set_lineEditProtoShadowSocksPortEnabled(container == DockerContainer::ShadowSocks); set_lineEditPortEnabled(container == DockerContainer::ShadowSocks);
} }
QJsonObject ShadowSocksLogic::getProtocolConfigFromPage(QJsonObject oldConfig) QJsonObject ShadowSocksLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
{ {
oldConfig.insert(config_key::cipher, comboBoxProtoShadowSocksCipherText()); oldConfig.insert(config_key::cipher, comboBoxCipherText());
oldConfig.insert(config_key::port, lineEditProtoShadowSocksPortText()); oldConfig.insert(config_key::port, lineEditPortText());
return oldConfig; return oldConfig;
} }
void ShadowSocksLogic::onPushButtonProtoShadowSocksSaveClicked() void ShadowSocksLogic::onPushButtonSaveClicked()
{ {
QJsonObject protocolConfig = m_settings.protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Protocol::ShadowSocks); QJsonObject protocolConfig = m_settings.protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Protocol::ShadowSocks);
//protocolConfig = getShadowSocksConfigFromPage(protocolConfig); //protocolConfig = getShadowSocksConfigFromPage(protocolConfig);
@ -55,37 +54,37 @@ void ShadowSocksLogic::onPushButtonProtoShadowSocksSaveClicked()
newContainerConfig.insert(ProtocolProps::protoToString(Protocol::ShadowSocks), protocolConfig); newContainerConfig.insert(ProtocolProps::protoToString(Protocol::ShadowSocks), protocolConfig);
UiLogic::PageFunc page_proto_shadowsocks; UiLogic::PageFunc page_proto_shadowsocks;
page_proto_shadowsocks.setEnabledFunc = [this] (bool enabled) -> void { page_proto_shadowsocks.setEnabledFunc = [this] (bool enabled) -> void {
set_pageProtoShadowSocksEnabled(enabled); set_pageEnabled(enabled);
}; };
UiLogic::ButtonFunc pushButton_proto_shadowsocks_save; UiLogic::ButtonFunc pushButton_proto_shadowsocks_save;
pushButton_proto_shadowsocks_save.setVisibleFunc = [this] (bool visible) ->void { pushButton_proto_shadowsocks_save.setVisibleFunc = [this] (bool visible) ->void {
set_pushButtonShadowSocksSaveVisible(visible); set_pushButtonSaveVisible(visible);
}; };
UiLogic::LabelFunc label_proto_shadowsocks_info; UiLogic::LabelFunc label_proto_shadowsocks_info;
label_proto_shadowsocks_info.setVisibleFunc = [this] (bool visible) ->void { label_proto_shadowsocks_info.setVisibleFunc = [this] (bool visible) ->void {
set_labelProtoShadowSocksInfoVisible(visible); set_labelInfoVisible(visible);
}; };
label_proto_shadowsocks_info.setTextFunc = [this] (const QString& text) ->void { label_proto_shadowsocks_info.setTextFunc = [this] (const QString& text) ->void {
set_labelProtoShadowSocksInfoText(text); set_labelInfoText(text);
}; };
UiLogic::ProgressFunc progressBar_proto_shadowsocks_reset; UiLogic::ProgressFunc progressBar_reset;
progressBar_proto_shadowsocks_reset.setVisibleFunc = [this] (bool visible) ->void { progressBar_reset.setVisibleFunc = [this] (bool visible) ->void {
set_progressBarProtoShadowSocksResetVisible(visible); set_progressBaResetVisible(visible);
}; };
progressBar_proto_shadowsocks_reset.setValueFunc = [this] (int value) ->void { progressBar_reset.setValueFunc = [this] (int value) ->void {
set_progressBarProtoShadowSocksResetValue(value); set_progressBaResetValue(value);
}; };
progressBar_proto_shadowsocks_reset.getValueFunc = [this] (void) -> int { progressBar_reset.getValueFunc = [this] (void) -> int {
return progressBarProtoShadowSocksResetValue(); return progressBaResetValue();
}; };
progressBar_proto_shadowsocks_reset.getMaximiumFunc = [this] (void) -> int { progressBar_reset.getMaximiumFunc = [this] (void) -> int {
return progressBarProtoShadowSocksResetMaximium(); return progressBaResetMaximium();
}; };
ErrorCode e = uiLogic()->doInstallAction([this, containerConfig, &newContainerConfig](){ ErrorCode e = uiLogic()->doInstallAction([this, containerConfig, &newContainerConfig](){
return ServerController::updateContainer(m_settings.serverCredentials(uiLogic()->selectedServerIndex), uiLogic()->selectedDockerContainer, containerConfig, newContainerConfig); return ServerController::updateContainer(m_settings.serverCredentials(uiLogic()->selectedServerIndex), uiLogic()->selectedDockerContainer, containerConfig, newContainerConfig);
}, },
page_proto_shadowsocks, progressBar_proto_shadowsocks_reset, page_proto_shadowsocks, progressBar_reset,
pushButton_proto_shadowsocks_save, label_proto_shadowsocks_info); pushButton_proto_shadowsocks_save, label_proto_shadowsocks_info);
if (!e) { if (!e) {

21
client/ui/pages_logic/protocols/ShadowSocksLogic.h
View file

@ -9,19 +9,18 @@ class ShadowSocksLogic : public PageProtocolLogicBase
{ {
Q_OBJECT Q_OBJECT
AUTO_PROPERTY(QString, comboBoxProtoShadowSocksCipherText) AUTO_PROPERTY(QString, comboBoxCipherText)
AUTO_PROPERTY(QString, lineEditProtoShadowSocksPortText) AUTO_PROPERTY(QString, lineEditPortText)
AUTO_PROPERTY(bool, pushButtonShadowSocksSaveVisible) AUTO_PROPERTY(bool, pushButtonSaveVisible)
AUTO_PROPERTY(bool, progressBarProtoShadowSocksResetVisible) AUTO_PROPERTY(bool, progressBaResetVisible)
AUTO_PROPERTY(bool, lineEditProtoShadowSocksPortEnabled) AUTO_PROPERTY(bool, lineEditPortEnabled)
AUTO_PROPERTY(bool, pageProtoShadowSocksEnabled) AUTO_PROPERTY(bool, labelInfoVisible)
AUTO_PROPERTY(bool, labelProtoShadowSocksInfoVisible) AUTO_PROPERTY(QString, labelInfoText)
AUTO_PROPERTY(QString, labelProtoShadowSocksInfoText) AUTO_PROPERTY(int, progressBaResetValue)
AUTO_PROPERTY(int, progressBarProtoShadowSocksResetValue) AUTO_PROPERTY(int, progressBaResetMaximium)
AUTO_PROPERTY(int, progressBarProtoShadowSocksResetMaximium)
public: public:
Q_INVOKABLE void onPushButtonProtoShadowSocksSaveClicked(); Q_INVOKABLE void onPushButtonSaveClicked();
public: public:
explicit ShadowSocksLogic(UiLogic *uiLogic, QObject *parent = nullptr); explicit ShadowSocksLogic(UiLogic *uiLogic, QObject *parent = nullptr);

168
client/ui/qml/Pages/PageNewServerProtocols.qml
View file

@ -147,172 +147,4 @@ PageBase {
} }
} }
} }
// ScrollView {
// id: scrollView
// width: parent.width - 40
// anchors.horizontalCenter: parent.horizontalCenter
// anchors.top: pb_add_container.bottom
// anchors.topMargin: 10
// anchors.bottom: pushButtonConfigure.top
// anchors.bottomMargin: 10
// clip: true
// Column {
// width: scrollView.width
// anchors.horizontalCenter: parent.horizontalCenter
// spacing: 5
// InstallSettingsBase {
// containerDescription: qsTr("OpenVPN and ShadowSocks\n with masking using Cloak plugin")
// onContainerChecked: NewServerProtocolsLogic.checkBoxCloakChecked = checked
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Port (TCP)")
// }
// TextFieldType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: NewServerProtocolsLogic.lineEditCloakPortText
// onEditingFinished: {
// NewServerProtocolsLogic.lineEditCloakPortText = text
// }
// }
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Fake Web Site")
// }
// TextFieldType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: NewServerProtocolsLogic.lineEditCloakSiteText
// onEditingFinished: {
// NewServerProtocolsLogic.lineEditCloakSiteText = text
// }
// }
// }
// InstallSettingsBase {
// containerDescription: qsTr("ShadowSocks")
// onContainerChecked: NewServerProtocolsLogic.checkBoxSsChecked = checked
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Port (TCP)")
// }
// TextFieldType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: NewServerProtocolsLogic.lineEditSsPortText
// onEditingFinished: {
// NewServerProtocolsLogic.lineEditSsPortText = text
// }
// }
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Encryption")
// }
// ComboBoxType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// model: [
// qsTr("chacha20-ietf-poly1305"),
// qsTr("xchacha20-ietf-poly1305"),
// qsTr("aes-256-gcm"),
// qsTr("aes-192-gcm"),
// qsTr("aes-128-gcm")
// ]
// currentIndex: {
// for (let i = 0; i < model.length; ++i) {
// if (NewServerProtocolsLogic.comboBoxSsCipherText === model[i]) {
// return i
// }
// }
// return -1
// }
// onCurrentTextChanged: {
// NewServerProtocolsLogic.comboBoxSsCipherText = currentText
// }
// }
// }
// InstallSettingsBase {
// containerDescription: qsTr("OpenVPN")
// onContainerChecked: NewServerProtocolsLogic.checkBoxOpenVpnChecked = checked
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Port (TCP/UDP)")
// }
// TextFieldType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: NewServerProtocolsLogic.lineEditOpenvpnPortText
// onEditingFinished: {
// NewServerProtocolsLogic.lineEditOpenvpnPortText = text
// }
// }
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// text: qsTr("Protocol")
// }
// ComboBoxType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2) / 2
// model: [
// qsTr("udp"),
// qsTr("tcp"),
// ]
// currentIndex: {
// for (let i = 0; i < model.length; ++i) {
// if (NewServerProtocolsLogic.comboBoxOpenvpnProtoText === model[i]) {
// return i
// }
// }
// return -1
// }
// onCurrentTextChanged: {
// NewServerProtocolsLogic.comboBoxOpenvpnProtoText = currentText
// }
// }
// }
// InstallSettingsBase {
// visible: false
// containerDescription: qsTr("WireGuard")
// onContainerChecked: NewServerProtocolsLogic.checkBoxWireGuardChecked = checked
// LabelType {
// width: 130
// height: (parent.height - parent.spacing - parent.topPadding * 2)
// text: qsTr("Port (UDP)")
// }
// TextFieldType {
// width: parent.width - 130 - parent.spacing - parent.leftPadding * 2
// height: (parent.height - parent.spacing - parent.topPadding * 2)
// text: "32767"
// }
// }
// }
// }
} }

37
client/ui/qml/Pages/PageServerContainers.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Controls 2.12 import QtQuick.Controls 2.12
import QtQuick.Dialogs 1.1
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import SortFilterProxyModel 0.2 import SortFilterProxyModel 0.2
import ContainerProps 1.0 import ContainerProps 1.0
@ -292,21 +293,32 @@ PageBase {
} }
ImageButtonType { ImageButtonType {
id: button_default id: button_remove
visible: service_type_role == ProtocolEnum.Vpn visible: index === tb_c.currentIndex
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
checkable: true checkable: true
img.source: checked ? "qrc:/images/check.png" : "qrc:/images/uncheck.png" icon.source: "qrc:/images/delete.png"
implicitWidth: 30 implicitWidth: 30
implicitHeight: 30 implicitHeight: 30
checked: default_role checked: default_role
onClicked: {
ServerContainersLogic.onPushButtonDefaultClicked(proxyContainersModel.mapToSource(index)) MessageDialog {
id: dialogRemove
standardButtons: StandardButton.Yes | StandardButton.Cancel
title: "AmneziaVPN"
text: qsTr("Remove container") + " " + name_role + "?" + "\n" + qsTr("This action will erase all data of this container on the server.")
onAccepted: {
tb_c.currentIndex = -1
ServerContainersLogic.onPushButtonRemoveClicked(proxyContainersModel.mapToSource(index))
} }
} }
onClicked: dialogRemove.open()
VisibleBehavior on visible { }
}
ImageButtonType { ImageButtonType {
id: button_share id: button_share
visible: index === tb_c.currentIndex visible: index === tb_c.currentIndex
@ -322,23 +334,20 @@ PageBase {
} }
ImageButtonType { ImageButtonType {
id: button_remove id: button_default
visible: index === tb_c.currentIndex visible: service_type_role == ProtocolEnum.Vpn
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
checkable: true checkable: true
icon.source: "qrc:/images/delete.png" img.source: checked ? "qrc:/images/check.png" : "qrc:/images/uncheck.png"
implicitWidth: 30 implicitWidth: 30
implicitHeight: 30 implicitHeight: 30
checked: default_role checked: default_role
onClicked: { onClicked: {
tb_c.currentIndex = -1 ServerContainersLogic.onPushButtonDefaultClicked(proxyContainersModel.mapToSource(index))
ServerContainersLogic.onPushButtonRemoveClicked(proxyContainersModel.mapToSource(index))
} }
VisibleBehavior on visible { }
} }
} }

2
client/ui/qml/Pages/PageVPN.qml
View file

@ -137,7 +137,7 @@ PageBase {
width: parent.width - 40 width: parent.width - 40
height: 1 height: 1
anchors.bottom: GC.isMobile() ? root.bottom : conn_type_label.top anchors.bottom: GC.isMobile() ? root.bottom : conn_type_label.top
anchors.bottomMargin: s10 anchors.bottomMargin: 10
color: "#DDDDDD" color: "#DDDDDD"
} }

162
client/ui/qml/Pages/Protocols/PageProtoCloak.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Controls 2.12 import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import ProtocolEnum 1.0 import ProtocolEnum 1.0
import "../" import "../"
import "../../Controls" import "../../Controls"
@ -10,20 +11,38 @@ PageProtocolBase {
protocol: ProtocolEnum.Cloak protocol: ProtocolEnum.Cloak
logic: UiLogic.protocolLogic(protocol) logic: UiLogic.protocolLogic(protocol)
enabled: logic.pageProtoCloakEnabled enabled: logic.pageEnabled
BackButton { BackButton {
id: back id: back
} }
Item {
x: 0 Caption {
y: 40 id: caption
width: 380 text: qsTr("Cloak Settings")
height: 600 }
ColumnLayout {
id: content
enabled: logic.pageEnabled enabled: logic.pageEnabled
anchors.top: caption.bottom
anchors.left: root.left
anchors.right: root.right
anchors.bottom: pb_save.top
anchors.margins: 20
anchors.topMargin: 10
RowLayout {
Layout.fillWidth: true
LabelType {
height: 31
text: qsTr("Cipher")
Layout.preferredWidth: 0.3 * root.width - 10
}
ComboBoxType { ComboBoxType {
x: 190 Layout.fillWidth: true
y: 60
width: 151
height: 31 height: 31
model: [ model: [
qsTr("chacha20-poly1305"), qsTr("chacha20-poly1305"),
@ -33,92 +52,82 @@ PageProtocolBase {
] ]
currentIndex: { currentIndex: {
for (let i = 0; i < model.length; ++i) { for (let i = 0; i < model.length; ++i) {
if (logic.comboBoxProtoCloakCipherText === model[i]) { if (logic.comboBoxCipherText === model[i]) {
return i return i
} }
} }
return -1 return -1
} }
onCurrentTextChanged: { onCurrentTextChanged: {
logic.comboBoxProtoCloakCipherText = currentText logic.comboBoxCipherText = currentText
} }
} }
}
RowLayout {
Layout.fillWidth: true
LabelType { LabelType {
x: 30 Layout.preferredWidth: 0.3 * root.width - 10
y: 60
width: 151
height: 31 height: 31
text: qsTr("Cipher") text: qsTr("Fake Web Site")
} }
TextFieldType {
id: lineEdit_proto_cloak_site
Layout.fillWidth: true
height: 31
text: logic.lineEditSiteText
onEditingFinished: {
logic.lineEditSiteText = text
}
}
}
RowLayout {
Layout.fillWidth: true
LabelType { LabelType {
x: 30 Layout.preferredWidth: 0.3 * root.width - 10
y: 160
width: 151
height: 31 height: 31
text: qsTr("Port") text: qsTr("Port")
} }
Text {
font.family: "Lato" TextFieldType {
font.styleName: "normal" id: lineEdit_proto_cloak_port
font.pixelSize: 24 Layout.fillWidth: true
color: "#100A44"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
text: qsTr("Cloak Settings")
x: 20
y: 0
width: 340
height: 30
}
LabelType {
x: 30
y: 110
width: 151
height: 31 height: 31
text: qsTr("Fake Web Site") text: logic.lineEditPortText
onEditingFinished: {
logic.lineEditPortText = text
}
enabled: logic.lineEditPortEnabled
}
}
Item {
Layout.fillHeight: true
}
} }
LabelType { LabelType {
id: label_proto_cloak_info id: label_proto_cloak_info
x: 30 x: 30
y: 550 anchors.bottom: pb_save.top
width: 321 anchors.bottomMargin: 10
height: 41 width: parent.width - 40
visible: logic.labelProtoCloakInfoVisible visible: logic.labelInfoVisible
text: logic.labelProtoCloakInfoText text: logic.labelInfoText
}
TextFieldType {
id: lineEdit_proto_cloak_port
x: 190
y: 160
width: 151
height: 31
text: logic.lineEditProtoCloakPortText
onEditingFinished: {
logic.lineEditProtoCloakPortText = text
}
enabled: logic.lineEditProtoCloakPortEnabled
}
TextFieldType {
id: lineEdit_proto_cloak_site
x: 190
y: 110
width: 151
height: 31
text: logic.lineEditProtoCloakSiteText
onEditingFinished: {
logic.lineEditProtoCloakSiteText = text
}
} }
ProgressBar { ProgressBar {
id: progressBar_proto_cloak_reset id: progressBar_proto_cloak_reset
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
y: 500 anchors.fill: pb_save
width: 321
height: 40
from: 0 from: 0
to: logic.progressBarProtoCloakResetMaximium to: logic.progressBarResetMaximium
value: logic.progressBarProtoCloakResetValue value: logic.progressBarResetValue
background: Rectangle { background: Rectangle {
implicitWidth: parent.width implicitWidth: parent.width
implicitHeight: parent.height implicitHeight: parent.height
@ -136,18 +145,21 @@ PageProtocolBase {
color: Qt.rgba(255, 255, 255, 0.15); color: Qt.rgba(255, 255, 255, 0.15);
} }
} }
visible: logic.progressBarProtoCloakResetVisible visible: logic.progressBarResetVisible
} }
BlueButtonType { BlueButtonType {
id: pb_save
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
y: 500 enabled: logic.pageEnabled
width: 321 anchors.bottom: root.bottom
anchors.bottomMargin: 20
width: root.width - 60
height: 40 height: 40
text: qsTr("Save and restart VPN") text: qsTr("Save and restart VPN")
visible: logic.pushButtonCloakSaveVisible visible: logic.pushButtonSaveVisible
onClicked: { onClicked: {
logic.onPushButtonProtoCloakSaveClicked() logic.onPushButtonSaveClicked()
}
} }
} }
} }

5
client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml
View file

@ -338,9 +338,6 @@ PageProtocolBase {
} }
LabelType { LabelType {
id: label_proto_openvpn_info id: label_proto_openvpn_info
@ -349,8 +346,6 @@ PageProtocolBase {
text: logic.labelProtoOpenVpnInfoText text: logic.labelProtoOpenVpnInfoText
} }
Rectangle { Rectangle {
id: it_save id: it_save
implicitWidth: parent.width implicitWidth: parent.width

138
client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.12 import QtQuick 2.12
import QtQuick.Controls 2.12 import QtQuick.Controls 2.12
import QtQuick.Layouts 1.15
import ProtocolEnum 1.0 import ProtocolEnum 1.0
import "../" import "../"
import "../../Controls" import "../../Controls"
@ -10,21 +11,42 @@ PageProtocolBase {
protocol: ProtocolEnum.ShadowSocks protocol: ProtocolEnum.ShadowSocks
logic: UiLogic.protocolLogic(protocol) logic: UiLogic.protocolLogic(protocol)
enabled: logic.pageProtoShadowSocksEnabled enabled: logic.pageEnabled
BackButton { BackButton {
id: back id: back
} }
Item {
x: 0 Caption {
y: 40 id: caption
width: 380 text: qsTr("ShadowSocks Settings")
height: 600 }
ColumnLayout {
id: content
enabled: logic.pageEnabled enabled: logic.pageEnabled
ComboBoxType { anchors.top: caption.bottom
x: 190 anchors.left: root.left
y: 60 anchors.right: root.right
width: 151 anchors.bottom: pb_save.top
anchors.margins: 20
anchors.topMargin: 10
RowLayout {
Layout.fillWidth: true
LabelType {
height: 31 height: 31
text: qsTr("Cipher")
Layout.preferredWidth: 0.3 * root.width - 10
}
ComboBoxType {
height: 31
Layout.fillWidth: true
model: [ model: [
qsTr("chacha20-ietf-poly1305"), qsTr("chacha20-ietf-poly1305"),
qsTr("xchacha20-ietf-poly1305"), qsTr("xchacha20-ietf-poly1305"),
@ -34,71 +56,60 @@ PageProtocolBase {
] ]
currentIndex: { currentIndex: {
for (let i = 0; i < model.length; ++i) { for (let i = 0; i < model.length; ++i) {
if (logic.comboBoxProtoShadowSocksCipherText === model[i]) { if (logic.comboBoxCipherText === model[i]) {
return i return i
} }
} }
return -1 return -1
} }
} }
LabelType {
x: 30
y: 60
width: 151
height: 31
text: qsTr("Cipher")
} }
RowLayout {
Layout.fillWidth: true
LabelType { LabelType {
x: 30 Layout.preferredWidth: 0.3 * root.width - 10
y: 110
width: 151
height: 31 height: 31
text: qsTr("Port") text: qsTr("Port")
} }
Text {
font.family: "Lato" TextFieldType {
font.styleName: "normal" id: lineEdit_proto_shadowsocks_port
font.pixelSize: 24 Layout.fillWidth: true
color: "#100A44" height: 31
horizontalAlignment: Text.AlignHCenter text: logic.lineEditPortText
verticalAlignment: Text.AlignVCenter onEditingFinished: {
text: qsTr("ShadowSocks Settings") logic.lineEditPortText = text
x: 30
y: 0
width: 340
height: 30
} }
enabled: logic.lineEditPortEnabled
}
}
Item {
Layout.fillHeight: true
}
}
LabelType { LabelType {
id: label_proto_shadowsocks_info id: label_proto_shadowsocks_info
x: 30 x: 30
y: 550 anchors.bottom: pb_save.top
width: 321 anchors.bottomMargin: 10
width: parent.width - 40
height: 41 height: 41
visible: logic.labelProtoShadowSocksInfoVisible visible: logic.labelInfoVisible
text: logic.labelProtoShadowSocksInfoText text: logic.labelInfoText
}
TextFieldType {
id: lineEdit_proto_shadowsocks_port
x: 190
y: 110
width: 151
height: 31
text: logic.lineEditProtoShadowSocksPortText
onEditingFinished: {
logic.lineEditProtoShadowSocksPortText = text
}
enabled: logic.lineEditProtoShadowSocksPortEnabled
} }
ProgressBar { ProgressBar {
id: progressBar_proto_shadowsocks_reset id: progressBar_reset
anchors.horizontalCenter: parent.horizontalCenter anchors.fill: pb_save
y: 500
width: 321
height: 40
from: 0 from: 0
to: logic.progressBarProtoShadowSocksResetMaximium to: logic.progressBaResetMaximium
value: logic.progressBarProtoShadowSocksResetValue value: logic.progressBaResetValue
visible: logic.progressBarProtoShadowSocksResetVisible visible: logic.progressBaResetVisible
background: Rectangle { background: Rectangle {
implicitWidth: parent.width implicitWidth: parent.width
implicitHeight: parent.height implicitHeight: parent.height
@ -110,23 +121,26 @@ PageProtocolBase {
implicitWidth: parent.width implicitWidth: parent.width
implicitHeight: parent.height implicitHeight: parent.height
Rectangle { Rectangle {
width: progressBar_proto_shadowsocks_reset.visualPosition * parent.width width: progressBar_reset.visualPosition * parent.width
height: parent.height height: parent.height
radius: 4 radius: 4
color: Qt.rgba(255, 255, 255, 0.15); color: Qt.rgba(255, 255, 255, 0.15);
} }
} }
} }
BlueButtonType { BlueButtonType {
id: pb_save
enabled: logic.pageEnabled
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
y: 500 anchors.bottom: root.bottom
width: 321 anchors.bottomMargin: 20
width: root.width - 60
height: 40 height: 40
text: qsTr("Save and restart VPN") text: qsTr("Save and restart VPN")
visible: logic.pushButtonShadowSocksSaveVisible visible: logic.pushButtonSaveVisible
onClicked: { onClicked: {
logic.onPushButtonProtoShadowSocksSaveClicked() logic.onPushButtonSaveClicked()
}
} }
} }
} }