refact fixes
This commit is contained in:
parent
16e887dcf0
commit
6516a84986
27 changed files with 558 additions and 561 deletions
|
@ -8,84 +8,84 @@ using namespace PageEnumNS;
|
|||
|
||||
OpenVpnLogic::OpenVpnLogic(UiLogic *logic, QObject *parent):
|
||||
PageLogicBase(logic, parent),
|
||||
m_lineEditProtoOpenvpnSubnetText{},
|
||||
m_radioButtonProtoOpenvpnUdpChecked{false},
|
||||
m_checkBoxProtoOpenvpnAutoEncryptionChecked{},
|
||||
m_comboBoxProtoOpenvpnCipherText{"AES-256-GCM"},
|
||||
m_comboBoxProtoOpenvpnHashText{"SHA512"},
|
||||
m_checkBoxProtoOpenvpnBlockDnsChecked{false},
|
||||
m_lineEditProtoOpenvpnPortText{},
|
||||
m_checkBoxProtoOpenvpnTlsAuthChecked{false},
|
||||
m_widgetProtoOpenvpnEnabled{false},
|
||||
m_lineEditProtoOpenVpnSubnetText{},
|
||||
m_radioButtonProtoOpenVpnUdpChecked{false},
|
||||
m_checkBoxProtoOpenVpnAutoEncryptionChecked{},
|
||||
m_comboBoxProtoOpenVpnCipherText{"AES-256-GCM"},
|
||||
m_comboBoxProtoOpenVpnHashText{"SHA512"},
|
||||
m_checkBoxProtoOpenVpnBlockDnsChecked{false},
|
||||
m_lineEditProtoOpenVpnPortText{},
|
||||
m_checkBoxProtoOpenVpnTlsAuthChecked{false},
|
||||
m_widgetProtoOpenVpnEnabled{false},
|
||||
m_pushButtonOpenvpnSaveVisible{false},
|
||||
m_progressBarProtoOpenvpnResetVisible{false},
|
||||
m_radioButtonProtoOpenvpnUdpEnabled{false},
|
||||
m_radioButtonProtoOpenvpnTcpEnabled{false},
|
||||
m_radioButtonProtoOpenvpnTcpChecked{false},
|
||||
m_lineEditProtoOpenvpnPortEnabled{false},
|
||||
m_comboBoxProtoOpenvpnCipherEnabled{true},
|
||||
m_comboBoxProtoOpenvpnHashEnabled{true},
|
||||
m_pageProtoOpenvpnEnabled{true},
|
||||
m_labelProtoOpenvpnInfoVisible{true},
|
||||
m_labelProtoOpenvpnInfoText{},
|
||||
m_progressBarProtoOpenvpnResetValue{0},
|
||||
m_progressBarProtoOpenvpnResetMaximium{100}
|
||||
m_progressBarProtoOpenVpnResetVisible{false},
|
||||
m_radioButtonProtoOpenVpnUdpEnabled{false},
|
||||
m_radioButtonProtoOpenVpnTcpEnabled{false},
|
||||
m_radioButtonProtoOpenVpnTcpChecked{false},
|
||||
m_lineEditProtoOpenVpnPortEnabled{false},
|
||||
m_comboBoxProtoOpenVpnCipherEnabled{true},
|
||||
m_comboBoxProtoOpenVpnHashEnabled{true},
|
||||
m_pageProtoOpenVpnEnabled{true},
|
||||
m_labelProtoOpenVpnInfoVisible{true},
|
||||
m_labelProtoOpenVpnInfoText{},
|
||||
m_progressBarProtoOpenVpnResetValue{0},
|
||||
m_progressBarProtoOpenVpnResetMaximium{100}
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void OpenVpnLogic::updateOpenVpnPage(const QJsonObject &openvpnConfig, DockerContainer container, bool haveAuthData)
|
||||
{
|
||||
set_widgetProtoOpenvpnEnabled(haveAuthData);
|
||||
set_widgetProtoOpenVpnEnabled(haveAuthData);
|
||||
set_pushButtonOpenvpnSaveVisible(haveAuthData);
|
||||
set_progressBarProtoOpenvpnResetVisible(haveAuthData);
|
||||
set_progressBarProtoOpenVpnResetVisible(haveAuthData);
|
||||
|
||||
set_radioButtonProtoOpenvpnUdpEnabled(true);
|
||||
set_radioButtonProtoOpenvpnTcpEnabled(true);
|
||||
set_radioButtonProtoOpenVpnUdpEnabled(true);
|
||||
set_radioButtonProtoOpenVpnTcpEnabled(true);
|
||||
|
||||
set_lineEditProtoOpenvpnSubnetText(openvpnConfig.value(config_key::subnet_address).
|
||||
set_lineEditProtoOpenVpnSubnetText(openvpnConfig.value(config_key::subnet_address).
|
||||
toString(protocols::openvpn::defaultSubnetAddress));
|
||||
|
||||
QString trasnsport = openvpnConfig.value(config_key::transport_proto).
|
||||
toString(protocols::openvpn::defaultTransportProto);
|
||||
|
||||
set_radioButtonProtoOpenvpnUdpChecked(trasnsport == protocols::openvpn::defaultTransportProto);
|
||||
set_radioButtonProtoOpenvpnTcpChecked(trasnsport != protocols::openvpn::defaultTransportProto);
|
||||
set_radioButtonProtoOpenVpnUdpChecked(trasnsport == protocols::openvpn::defaultTransportProto);
|
||||
set_radioButtonProtoOpenVpnTcpChecked(trasnsport != protocols::openvpn::defaultTransportProto);
|
||||
|
||||
set_comboBoxProtoOpenvpnCipherText(openvpnConfig.value(config_key::cipher).
|
||||
set_comboBoxProtoOpenVpnCipherText(openvpnConfig.value(config_key::cipher).
|
||||
toString(protocols::openvpn::defaultCipher));
|
||||
|
||||
set_comboBoxProtoOpenvpnHashText(openvpnConfig.value(config_key::hash).
|
||||
set_comboBoxProtoOpenVpnHashText(openvpnConfig.value(config_key::hash).
|
||||
toString(protocols::openvpn::defaultHash));
|
||||
|
||||
bool blockOutsideDns = openvpnConfig.value(config_key::block_outside_dns).toBool(protocols::openvpn::defaultBlockOutsideDns);
|
||||
set_checkBoxProtoOpenvpnBlockDnsChecked(blockOutsideDns);
|
||||
set_checkBoxProtoOpenVpnBlockDnsChecked(blockOutsideDns);
|
||||
|
||||
bool isNcpDisabled = openvpnConfig.value(config_key::ncp_disable).toBool(protocols::openvpn::defaultNcpDisable);
|
||||
set_checkBoxProtoOpenvpnAutoEncryptionChecked(!isNcpDisabled);
|
||||
set_checkBoxProtoOpenVpnAutoEncryptionChecked(!isNcpDisabled);
|
||||
|
||||
bool isTlsAuth = openvpnConfig.value(config_key::tls_auth).toBool(protocols::openvpn::defaultTlsAuth);
|
||||
set_checkBoxProtoOpenvpnTlsAuthChecked(isTlsAuth);
|
||||
set_checkBoxProtoOpenVpnTlsAuthChecked(isTlsAuth);
|
||||
|
||||
if (container == DockerContainer::OpenVpnOverShadowSocks) {
|
||||
set_radioButtonProtoOpenvpnUdpEnabled(false);
|
||||
set_radioButtonProtoOpenvpnTcpEnabled(false);
|
||||
set_radioButtonProtoOpenvpnTcpChecked(true);
|
||||
set_radioButtonProtoOpenVpnUdpEnabled(false);
|
||||
set_radioButtonProtoOpenVpnTcpEnabled(false);
|
||||
set_radioButtonProtoOpenVpnTcpChecked(true);
|
||||
}
|
||||
|
||||
set_lineEditProtoOpenvpnPortText(openvpnConfig.value(config_key::port).
|
||||
set_lineEditProtoOpenVpnPortText(openvpnConfig.value(config_key::port).
|
||||
toString(protocols::openvpn::defaultPort));
|
||||
|
||||
set_lineEditProtoOpenvpnPortEnabled(container == DockerContainer::OpenVpn);
|
||||
set_lineEditProtoOpenVpnPortEnabled(container == DockerContainer::OpenVpn);
|
||||
}
|
||||
|
||||
void OpenVpnLogic::onCheckBoxProtoOpenvpnAutoEncryptionClicked()
|
||||
void OpenVpnLogic::onCheckBoxProtoOpenVpnAutoEncryptionClicked()
|
||||
{
|
||||
set_comboBoxProtoOpenvpnCipherEnabled(!checkBoxProtoOpenvpnAutoEncryptionChecked());
|
||||
set_comboBoxProtoOpenvpnHashEnabled(!checkBoxProtoOpenvpnAutoEncryptionChecked());
|
||||
set_comboBoxProtoOpenVpnCipherEnabled(!checkBoxProtoOpenVpnAutoEncryptionChecked());
|
||||
set_comboBoxProtoOpenVpnHashEnabled(!checkBoxProtoOpenVpnAutoEncryptionChecked());
|
||||
}
|
||||
|
||||
void OpenVpnLogic::onPushButtonProtoOpenvpnSaveClicked()
|
||||
void OpenVpnLogic::onPushButtonProtoOpenVpnSaveClicked()
|
||||
{
|
||||
QJsonObject protocolConfig = m_settings.protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Protocol::OpenVpn);
|
||||
protocolConfig = getOpenVpnConfigFromPage(protocolConfig);
|
||||
|
@ -96,7 +96,7 @@ void OpenVpnLogic::onPushButtonProtoOpenvpnSaveClicked()
|
|||
|
||||
UiLogic::PageFunc page_proto_openvpn;
|
||||
page_proto_openvpn.setEnabledFunc = [this] (bool enabled) -> void {
|
||||
set_pageProtoOpenvpnEnabled(enabled);
|
||||
set_pageProtoOpenVpnEnabled(enabled);
|
||||
};
|
||||
UiLogic::ButtonFunc pushButton_proto_openvpn_save;
|
||||
pushButton_proto_openvpn_save.setVisibleFunc = [this] (bool visible) ->void {
|
||||
|
@ -104,23 +104,23 @@ void OpenVpnLogic::onPushButtonProtoOpenvpnSaveClicked()
|
|||
};
|
||||
UiLogic::LabelFunc label_proto_openvpn_info;
|
||||
label_proto_openvpn_info.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_labelProtoOpenvpnInfoVisible(visible);
|
||||
set_labelProtoOpenVpnInfoVisible(visible);
|
||||
};
|
||||
label_proto_openvpn_info.setTextFunc = [this] (const QString& text) ->void {
|
||||
set_labelProtoOpenvpnInfoText(text);
|
||||
set_labelProtoOpenVpnInfoText(text);
|
||||
};
|
||||
UiLogic::ProgressFunc progressBar_proto_openvpn_reset;
|
||||
progressBar_proto_openvpn_reset.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_progressBarProtoOpenvpnResetVisible(visible);
|
||||
set_progressBarProtoOpenVpnResetVisible(visible);
|
||||
};
|
||||
progressBar_proto_openvpn_reset.setValueFunc = [this] (int value) ->void {
|
||||
set_progressBarProtoOpenvpnResetValue(value);
|
||||
set_progressBarProtoOpenVpnResetValue(value);
|
||||
};
|
||||
progressBar_proto_openvpn_reset.getValueFunc = [this] (void) -> int {
|
||||
return progressBarProtoOpenvpnResetValue();
|
||||
return progressBarProtoOpenVpnResetValue();
|
||||
};
|
||||
progressBar_proto_openvpn_reset.getMaximiumFunc = [this] (void) -> int {
|
||||
return progressBarProtoOpenvpnResetMaximium();
|
||||
return progressBarProtoOpenVpnResetMaximium();
|
||||
};
|
||||
|
||||
ErrorCode e = uiLogic()->doInstallAction([this, containerConfig, newContainerConfig](){
|
||||
|
@ -138,13 +138,13 @@ void OpenVpnLogic::onPushButtonProtoOpenvpnSaveClicked()
|
|||
|
||||
QJsonObject OpenVpnLogic::getOpenVpnConfigFromPage(QJsonObject oldConfig)
|
||||
{
|
||||
oldConfig.insert(config_key::subnet_address, lineEditProtoOpenvpnSubnetText());
|
||||
oldConfig.insert(config_key::transport_proto, radioButtonProtoOpenvpnUdpChecked() ? protocols::UDP : protocols::TCP);
|
||||
oldConfig.insert(config_key::ncp_disable, ! checkBoxProtoOpenvpnAutoEncryptionChecked());
|
||||
oldConfig.insert(config_key::cipher, comboBoxProtoOpenvpnCipherText());
|
||||
oldConfig.insert(config_key::hash, comboBoxProtoOpenvpnHashText());
|
||||
oldConfig.insert(config_key::block_outside_dns, checkBoxProtoOpenvpnBlockDnsChecked());
|
||||
oldConfig.insert(config_key::port, lineEditProtoOpenvpnPortText());
|
||||
oldConfig.insert(config_key::tls_auth, checkBoxProtoOpenvpnTlsAuthChecked());
|
||||
oldConfig.insert(config_key::subnet_address, lineEditProtoOpenVpnSubnetText());
|
||||
oldConfig.insert(config_key::transport_proto, radioButtonProtoOpenVpnUdpChecked() ? protocols::UDP : protocols::TCP);
|
||||
oldConfig.insert(config_key::ncp_disable, ! checkBoxProtoOpenVpnAutoEncryptionChecked());
|
||||
oldConfig.insert(config_key::cipher, comboBoxProtoOpenVpnCipherText());
|
||||
oldConfig.insert(config_key::hash, comboBoxProtoOpenVpnHashText());
|
||||
oldConfig.insert(config_key::block_outside_dns, checkBoxProtoOpenVpnBlockDnsChecked());
|
||||
oldConfig.insert(config_key::port, lineEditProtoOpenVpnPortText());
|
||||
oldConfig.insert(config_key::tls_auth, checkBoxProtoOpenVpnTlsAuthChecked());
|
||||
return oldConfig;
|
||||
}
|
||||
|
|
|
@ -9,34 +9,34 @@ class OpenVpnLogic : public PageLogicBase
|
|||
{
|
||||
Q_OBJECT
|
||||
|
||||
AUTO_PROPERTY(QString, lineEditProtoOpenvpnSubnetText)
|
||||
AUTO_PROPERTY(bool, radioButtonProtoOpenvpnUdpChecked)
|
||||
AUTO_PROPERTY(bool, checkBoxProtoOpenvpnAutoEncryptionChecked)
|
||||
AUTO_PROPERTY(QString, comboBoxProtoOpenvpnCipherText)
|
||||
AUTO_PROPERTY(QString, comboBoxProtoOpenvpnHashText)
|
||||
AUTO_PROPERTY(bool, checkBoxProtoOpenvpnBlockDnsChecked)
|
||||
AUTO_PROPERTY(QString, lineEditProtoOpenvpnPortText)
|
||||
AUTO_PROPERTY(bool, checkBoxProtoOpenvpnTlsAuthChecked)
|
||||
AUTO_PROPERTY(QString, lineEditProtoOpenVpnSubnetText)
|
||||
AUTO_PROPERTY(bool, radioButtonProtoOpenVpnUdpChecked)
|
||||
AUTO_PROPERTY(bool, checkBoxProtoOpenVpnAutoEncryptionChecked)
|
||||
AUTO_PROPERTY(QString, comboBoxProtoOpenVpnCipherText)
|
||||
AUTO_PROPERTY(QString, comboBoxProtoOpenVpnHashText)
|
||||
AUTO_PROPERTY(bool, checkBoxProtoOpenVpnBlockDnsChecked)
|
||||
AUTO_PROPERTY(QString, lineEditProtoOpenVpnPortText)
|
||||
AUTO_PROPERTY(bool, checkBoxProtoOpenVpnTlsAuthChecked)
|
||||
|
||||
AUTO_PROPERTY(bool, widgetProtoOpenvpnEnabled)
|
||||
AUTO_PROPERTY(bool, widgetProtoOpenVpnEnabled)
|
||||
AUTO_PROPERTY(bool, pushButtonOpenvpnSaveVisible)
|
||||
AUTO_PROPERTY(bool, progressBarProtoOpenvpnResetVisible)
|
||||
AUTO_PROPERTY(bool, radioButtonProtoOpenvpnUdpEnabled)
|
||||
AUTO_PROPERTY(bool, radioButtonProtoOpenvpnTcpEnabled)
|
||||
AUTO_PROPERTY(bool, radioButtonProtoOpenvpnTcpChecked)
|
||||
AUTO_PROPERTY(bool, lineEditProtoOpenvpnPortEnabled)
|
||||
AUTO_PROPERTY(bool, progressBarProtoOpenVpnResetVisible)
|
||||
AUTO_PROPERTY(bool, radioButtonProtoOpenVpnUdpEnabled)
|
||||
AUTO_PROPERTY(bool, radioButtonProtoOpenVpnTcpEnabled)
|
||||
AUTO_PROPERTY(bool, radioButtonProtoOpenVpnTcpChecked)
|
||||
AUTO_PROPERTY(bool, lineEditProtoOpenVpnPortEnabled)
|
||||
|
||||
AUTO_PROPERTY(bool, comboBoxProtoOpenvpnCipherEnabled)
|
||||
AUTO_PROPERTY(bool, comboBoxProtoOpenvpnHashEnabled)
|
||||
AUTO_PROPERTY(bool, pageProtoOpenvpnEnabled)
|
||||
AUTO_PROPERTY(bool, labelProtoOpenvpnInfoVisible)
|
||||
AUTO_PROPERTY(QString, labelProtoOpenvpnInfoText)
|
||||
AUTO_PROPERTY(int, progressBarProtoOpenvpnResetValue)
|
||||
AUTO_PROPERTY(int, progressBarProtoOpenvpnResetMaximium)
|
||||
AUTO_PROPERTY(bool, comboBoxProtoOpenVpnCipherEnabled)
|
||||
AUTO_PROPERTY(bool, comboBoxProtoOpenVpnHashEnabled)
|
||||
AUTO_PROPERTY(bool, pageProtoOpenVpnEnabled)
|
||||
AUTO_PROPERTY(bool, labelProtoOpenVpnInfoVisible)
|
||||
AUTO_PROPERTY(QString, labelProtoOpenVpnInfoText)
|
||||
AUTO_PROPERTY(int, progressBarProtoOpenVpnResetValue)
|
||||
AUTO_PROPERTY(int, progressBarProtoOpenVpnResetMaximium)
|
||||
|
||||
public:
|
||||
Q_INVOKABLE void onCheckBoxProtoOpenvpnAutoEncryptionClicked();
|
||||
Q_INVOKABLE void onPushButtonProtoOpenvpnSaveClicked();
|
||||
Q_INVOKABLE void onCheckBoxProtoOpenVpnAutoEncryptionClicked();
|
||||
Q_INVOKABLE void onPushButtonProtoOpenVpnSaveClicked();
|
||||
|
||||
public:
|
||||
explicit OpenVpnLogic(UiLogic *uiLogic, QObject *parent = nullptr);
|
||||
|
|
|
@ -8,45 +8,45 @@ using namespace PageEnumNS;
|
|||
|
||||
ShadowSocksLogic::ShadowSocksLogic(UiLogic *logic, QObject *parent):
|
||||
PageLogicBase(logic, parent),
|
||||
m_widgetProtoSsEnabled{false},
|
||||
m_comboBoxProtoShadowsocksCipherText{"chacha20-poly1305"},
|
||||
m_lineEditProtoShadowsocksPortText{},
|
||||
m_pushButtonShadowsocksSaveVisible{false},
|
||||
m_progressBarProtoShadowsocksResetVisible{false},
|
||||
m_lineEditProtoShadowsocksPortEnabled{false},
|
||||
m_pageProtoShadowsocksEnabled{true},
|
||||
m_labelProtoShadowsocksInfoVisible{true},
|
||||
m_labelProtoShadowsocksInfoText{},
|
||||
m_progressBarProtoShadowsocksResetValue{0},
|
||||
m_progressBarProtoShadowsocksResetMaximium{100}
|
||||
m_widgetProtoShadowSocksEnabled{false},
|
||||
m_comboBoxProtoShadowSocksCipherText{"chacha20-poly1305"},
|
||||
m_lineEditProtoShadowSocksPortText{},
|
||||
m_pushButtonShadowSocksSaveVisible{false},
|
||||
m_progressBarProtoShadowSocksResetVisible{false},
|
||||
m_lineEditProtoShadowSocksPortEnabled{false},
|
||||
m_pageProtoShadowSocksEnabled{true},
|
||||
m_labelProtoShadowSocksInfoVisible{true},
|
||||
m_labelProtoShadowSocksInfoText{},
|
||||
m_progressBarProtoShadowSocksResetValue{0},
|
||||
m_progressBarProtoShadowSocksResetMaximium{100}
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::updateShadowSocksPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData)
|
||||
{
|
||||
set_widgetProtoSsEnabled(haveAuthData);
|
||||
set_pushButtonShadowsocksSaveVisible(haveAuthData);
|
||||
set_progressBarProtoShadowsocksResetVisible(haveAuthData);
|
||||
set_widgetProtoShadowSocksEnabled(haveAuthData);
|
||||
set_pushButtonShadowSocksSaveVisible(haveAuthData);
|
||||
set_progressBarProtoShadowSocksResetVisible(haveAuthData);
|
||||
|
||||
set_comboBoxProtoShadowsocksCipherText(ssConfig.value(config_key::cipher).
|
||||
set_comboBoxProtoShadowSocksCipherText(ssConfig.value(config_key::cipher).
|
||||
toString(protocols::shadowsocks::defaultCipher));
|
||||
|
||||
set_lineEditProtoShadowsocksPortText(ssConfig.value(config_key::port).
|
||||
set_lineEditProtoShadowSocksPortText(ssConfig.value(config_key::port).
|
||||
toString(protocols::shadowsocks::defaultPort));
|
||||
|
||||
set_lineEditProtoShadowsocksPortEnabled(container == DockerContainer::OpenVpnOverShadowSocks);
|
||||
set_lineEditProtoShadowSocksPortEnabled(container == DockerContainer::OpenVpnOverShadowSocks);
|
||||
}
|
||||
|
||||
QJsonObject ShadowSocksLogic::getShadowSocksConfigFromPage(QJsonObject oldConfig)
|
||||
{
|
||||
oldConfig.insert(config_key::cipher, comboBoxProtoShadowsocksCipherText());
|
||||
oldConfig.insert(config_key::port, lineEditProtoShadowsocksPortText());
|
||||
oldConfig.insert(config_key::cipher, comboBoxProtoShadowSocksCipherText());
|
||||
oldConfig.insert(config_key::port, lineEditProtoShadowSocksPortText());
|
||||
|
||||
return oldConfig;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::onPushButtonProtoShadowsocksSaveClicked()
|
||||
void ShadowSocksLogic::onPushButtonProtoShadowSocksSaveClicked()
|
||||
{
|
||||
QJsonObject protocolConfig = m_settings.protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Protocol::ShadowSocks);
|
||||
protocolConfig = getShadowSocksConfigFromPage(protocolConfig);
|
||||
|
@ -56,31 +56,31 @@ void ShadowSocksLogic::onPushButtonProtoShadowsocksSaveClicked()
|
|||
newContainerConfig.insert(config_key::shadowsocks, protocolConfig);
|
||||
UiLogic::PageFunc page_proto_shadowsocks;
|
||||
page_proto_shadowsocks.setEnabledFunc = [this] (bool enabled) -> void {
|
||||
set_pageProtoShadowsocksEnabled(enabled);
|
||||
set_pageProtoShadowSocksEnabled(enabled);
|
||||
};
|
||||
UiLogic::ButtonFunc pushButton_proto_shadowsocks_save;
|
||||
pushButton_proto_shadowsocks_save.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_pushButtonShadowsocksSaveVisible(visible);
|
||||
set_pushButtonShadowSocksSaveVisible(visible);
|
||||
};
|
||||
UiLogic::LabelFunc label_proto_shadowsocks_info;
|
||||
label_proto_shadowsocks_info.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_labelProtoShadowsocksInfoVisible(visible);
|
||||
set_labelProtoShadowSocksInfoVisible(visible);
|
||||
};
|
||||
label_proto_shadowsocks_info.setTextFunc = [this] (const QString& text) ->void {
|
||||
set_labelProtoShadowsocksInfoText(text);
|
||||
set_labelProtoShadowSocksInfoText(text);
|
||||
};
|
||||
UiLogic::ProgressFunc progressBar_proto_shadowsocks_reset;
|
||||
progressBar_proto_shadowsocks_reset.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_progressBarProtoShadowsocksResetVisible(visible);
|
||||
set_progressBarProtoShadowSocksResetVisible(visible);
|
||||
};
|
||||
progressBar_proto_shadowsocks_reset.setValueFunc = [this] (int value) ->void {
|
||||
set_progressBarProtoShadowsocksResetValue(value);
|
||||
set_progressBarProtoShadowSocksResetValue(value);
|
||||
};
|
||||
progressBar_proto_shadowsocks_reset.getValueFunc = [this] (void) -> int {
|
||||
return progressBarProtoShadowsocksResetValue();
|
||||
return progressBarProtoShadowSocksResetValue();
|
||||
};
|
||||
progressBar_proto_shadowsocks_reset.getMaximiumFunc = [this] (void) -> int {
|
||||
return progressBarProtoShadowsocksResetMaximium();
|
||||
return progressBarProtoShadowSocksResetMaximium();
|
||||
};
|
||||
|
||||
ErrorCode e = uiLogic()->doInstallAction([this, containerConfig, newContainerConfig](){
|
||||
|
|
|
@ -9,20 +9,20 @@ class ShadowSocksLogic : public PageLogicBase
|
|||
{
|
||||
Q_OBJECT
|
||||
|
||||
AUTO_PROPERTY(bool, widgetProtoSsEnabled)
|
||||
AUTO_PROPERTY(QString, comboBoxProtoShadowsocksCipherText)
|
||||
AUTO_PROPERTY(QString, lineEditProtoShadowsocksPortText)
|
||||
AUTO_PROPERTY(bool, pushButtonShadowsocksSaveVisible)
|
||||
AUTO_PROPERTY(bool, progressBarProtoShadowsocksResetVisible)
|
||||
AUTO_PROPERTY(bool, lineEditProtoShadowsocksPortEnabled)
|
||||
AUTO_PROPERTY(bool, pageProtoShadowsocksEnabled)
|
||||
AUTO_PROPERTY(bool, labelProtoShadowsocksInfoVisible)
|
||||
AUTO_PROPERTY(QString, labelProtoShadowsocksInfoText)
|
||||
AUTO_PROPERTY(int, progressBarProtoShadowsocksResetValue)
|
||||
AUTO_PROPERTY(int, progressBarProtoShadowsocksResetMaximium)
|
||||
AUTO_PROPERTY(bool, widgetProtoShadowSocksEnabled)
|
||||
AUTO_PROPERTY(QString, comboBoxProtoShadowSocksCipherText)
|
||||
AUTO_PROPERTY(QString, lineEditProtoShadowSocksPortText)
|
||||
AUTO_PROPERTY(bool, pushButtonShadowSocksSaveVisible)
|
||||
AUTO_PROPERTY(bool, progressBarProtoShadowSocksResetVisible)
|
||||
AUTO_PROPERTY(bool, lineEditProtoShadowSocksPortEnabled)
|
||||
AUTO_PROPERTY(bool, pageProtoShadowSocksEnabled)
|
||||
AUTO_PROPERTY(bool, labelProtoShadowSocksInfoVisible)
|
||||
AUTO_PROPERTY(QString, labelProtoShadowSocksInfoText)
|
||||
AUTO_PROPERTY(int, progressBarProtoShadowSocksResetValue)
|
||||
AUTO_PROPERTY(int, progressBarProtoShadowSocksResetMaximium)
|
||||
|
||||
public:
|
||||
Q_INVOKABLE void onPushButtonProtoShadowsocksSaveClicked();
|
||||
Q_INVOKABLE void onPushButtonProtoShadowSocksSaveClicked();
|
||||
|
||||
public:
|
||||
explicit ShadowSocksLogic(UiLogic *uiLogic, QObject *parent = nullptr);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue