qml ui fixws: ss and cloak
This commit is contained in:
pokamest
parent
d7f672ab0a
commit
9de89e5544
10 changed files with 381 additions and 521 deletions
|
|
@ -8,17 +8,17 @@ using namespace PageEnumNS;
|
|||
|
||||
CloakLogic::CloakLogic(UiLogic *logic, QObject *parent):
|
||||
PageProtocolLogicBase(logic, parent),
|
||||
m_comboBoxProtoCloakCipherText{"chacha20-poly1305"},
|
||||
m_lineEditProtoCloakSiteText{"tile.openstreetmap.org"},
|
||||
m_lineEditProtoCloakPortText{},
|
||||
m_pushButtonCloakSaveVisible{false},
|
||||
m_progressBarProtoCloakResetVisible{false},
|
||||
m_lineEditProtoCloakPortEnabled{false},
|
||||
m_pageProtoCloakEnabled{true},
|
||||
m_labelProtoCloakInfoVisible{true},
|
||||
m_labelProtoCloakInfoText{},
|
||||
m_progressBarProtoCloakResetValue{0},
|
||||
m_progressBarProtoCloakResetMaximium{100}
|
||||
m_comboBoxCipherText{"chacha20-poly1305"},
|
||||
m_lineEditSiteText{"tile.openstreetmap.org"},
|
||||
m_lineEditPortText{},
|
||||
m_pushButtonSaveVisible{false},
|
||||
m_progressBarResetVisible{false},
|
||||
m_lineEditPortEnabled{false},
|
||||
m_pageEnabled{true},
|
||||
m_labelInfoVisible{true},
|
||||
m_labelInfoText{},
|
||||
m_progressBarResetValue{0},
|
||||
m_progressBarResetMaximium{100}
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -26,31 +26,31 @@ CloakLogic::CloakLogic(UiLogic *logic, QObject *parent):
|
|||
void CloakLogic::updateProtocolPage(const QJsonObject &ckConfig, DockerContainer container, bool haveAuthData)
|
||||
{
|
||||
set_pageEnabled(haveAuthData);
|
||||
set_pushButtonCloakSaveVisible(haveAuthData);
|
||||
set_progressBarProtoCloakResetVisible(haveAuthData);
|
||||
set_pushButtonSaveVisible(haveAuthData);
|
||||
set_progressBarResetVisible(haveAuthData);
|
||||
|
||||
set_comboBoxProtoCloakCipherText(ckConfig.value(config_key::cipher).
|
||||
set_comboBoxCipherText(ckConfig.value(config_key::cipher).
|
||||
toString(protocols::cloak::defaultCipher));
|
||||
|
||||
set_lineEditProtoCloakSiteText(ckConfig.value(config_key::site).
|
||||
set_lineEditSiteText(ckConfig.value(config_key::site).
|
||||
toString(protocols::cloak::defaultRedirSite));
|
||||
|
||||
set_lineEditProtoCloakPortText(ckConfig.value(config_key::port).
|
||||
set_lineEditPortText(ckConfig.value(config_key::port).
|
||||
toString(protocols::cloak::defaultPort));
|
||||
|
||||
set_lineEditProtoCloakPortEnabled(container == DockerContainer::Cloak);
|
||||
set_lineEditPortEnabled(container == DockerContainer::Cloak);
|
||||
}
|
||||
|
||||
QJsonObject CloakLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
|
||||
{
|
||||
oldConfig.insert(config_key::cipher, comboBoxProtoCloakCipherText());
|
||||
oldConfig.insert(config_key::site, lineEditProtoCloakSiteText());
|
||||
oldConfig.insert(config_key::port, lineEditProtoCloakPortText());
|
||||
oldConfig.insert(config_key::cipher, comboBoxCipherText());
|
||||
oldConfig.insert(config_key::site, lineEditSiteText());
|
||||
oldConfig.insert(config_key::port, lineEditPortText());
|
||||
|
||||
return oldConfig;
|
||||
}
|
||||
|
||||
void CloakLogic::onPushButtonProtoCloakSaveClicked()
|
||||
void CloakLogic::onPushButtonSaveClicked()
|
||||
{
|
||||
QJsonObject protocolConfig = m_settings.protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Protocol::Cloak);
|
||||
protocolConfig = getProtocolConfigFromPage(protocolConfig);
|
||||
|
|
@ -59,40 +59,40 @@ void CloakLogic::onPushButtonProtoCloakSaveClicked()
|
|||
QJsonObject newContainerConfig = containerConfig;
|
||||
newContainerConfig.insert(ProtocolProps::protoToString(Protocol::Cloak), protocolConfig);
|
||||
|
||||
UiLogic::PageFunc page_proto_cloak;
|
||||
page_proto_cloak.setEnabledFunc = [this] (bool enabled) -> void {
|
||||
set_pageProtoCloakEnabled(enabled);
|
||||
UiLogic::PageFunc page_func;
|
||||
page_func.setEnabledFunc = [this] (bool enabled) -> void {
|
||||
set_pageEnabled(enabled);
|
||||
};
|
||||
UiLogic::ButtonFunc pushButton_proto_cloak_save;
|
||||
pushButton_proto_cloak_save.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_pushButtonCloakSaveVisible(visible);
|
||||
UiLogic::ButtonFunc pushButton_save_func;
|
||||
pushButton_save_func.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_pushButtonSaveVisible(visible);
|
||||
};
|
||||
UiLogic::LabelFunc label_proto_cloak_info;
|
||||
label_proto_cloak_info.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_labelProtoCloakInfoVisible(visible);
|
||||
UiLogic::LabelFunc label_info_func;
|
||||
label_info_func.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_labelInfoVisible(visible);
|
||||
};
|
||||
label_proto_cloak_info.setTextFunc = [this] (const QString& text) ->void {
|
||||
set_labelProtoCloakInfoText(text);
|
||||
label_info_func.setTextFunc = [this] (const QString& text) ->void {
|
||||
set_labelInfoText(text);
|
||||
};
|
||||
UiLogic::ProgressFunc progressBar_proto_cloak_reset;
|
||||
progressBar_proto_cloak_reset.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_progressBarProtoCloakResetVisible(visible);
|
||||
UiLogic::ProgressFunc progressBar_reset;
|
||||
progressBar_reset.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_progressBarResetVisible(visible);
|
||||
};
|
||||
progressBar_proto_cloak_reset.setValueFunc = [this] (int value) ->void {
|
||||
set_progressBarProtoCloakResetValue(value);
|
||||
progressBar_reset.setValueFunc = [this] (int value) ->void {
|
||||
set_progressBarResetValue(value);
|
||||
};
|
||||
progressBar_proto_cloak_reset.getValueFunc = [this] (void) -> int {
|
||||
return progressBarProtoCloakResetValue();
|
||||
progressBar_reset.getValueFunc = [this] (void) -> int {
|
||||
return progressBarResetValue();
|
||||
};
|
||||
progressBar_proto_cloak_reset.getMaximiumFunc = [this] (void) -> int {
|
||||
return progressBarProtoCloakResetMaximium();
|
||||
progressBar_reset.getMaximiumFunc = [this] (void) -> int {
|
||||
return progressBarResetMaximium();
|
||||
};
|
||||
|
||||
ErrorCode e = uiLogic()->doInstallAction([this, containerConfig, &newContainerConfig](){
|
||||
return ServerController::updateContainer(m_settings.serverCredentials(uiLogic()->selectedServerIndex), uiLogic()->selectedDockerContainer, containerConfig, newContainerConfig);
|
||||
},
|
||||
page_proto_cloak, progressBar_proto_cloak_reset,
|
||||
pushButton_proto_cloak_save, label_proto_cloak_info);
|
||||
page_func, progressBar_reset,
|
||||
pushButton_save_func, label_info_func);
|
||||
|
||||
if (!e) {
|
||||
m_settings.setContainerConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, newContainerConfig);
|
||||
|
|
|
|||
|
|
@ -9,20 +9,20 @@ class CloakLogic : public PageProtocolLogicBase
|
|||
{
|
||||
Q_OBJECT
|
||||
|
||||
AUTO_PROPERTY(QString, comboBoxProtoCloakCipherText)
|
||||
AUTO_PROPERTY(QString, lineEditProtoCloakSiteText)
|
||||
AUTO_PROPERTY(QString, lineEditProtoCloakPortText)
|
||||
AUTO_PROPERTY(bool, pushButtonCloakSaveVisible)
|
||||
AUTO_PROPERTY(bool, progressBarProtoCloakResetVisible)
|
||||
AUTO_PROPERTY(bool, lineEditProtoCloakPortEnabled)
|
||||
AUTO_PROPERTY(bool, pageProtoCloakEnabled)
|
||||
AUTO_PROPERTY(bool, labelProtoCloakInfoVisible)
|
||||
AUTO_PROPERTY(QString, labelProtoCloakInfoText)
|
||||
AUTO_PROPERTY(int, progressBarProtoCloakResetValue)
|
||||
AUTO_PROPERTY(int, progressBarProtoCloakResetMaximium)
|
||||
AUTO_PROPERTY(QString, comboBoxCipherText)
|
||||
AUTO_PROPERTY(QString, lineEditSiteText)
|
||||
AUTO_PROPERTY(QString, lineEditPortText)
|
||||
AUTO_PROPERTY(bool, pushButtonSaveVisible)
|
||||
AUTO_PROPERTY(bool, progressBarResetVisible)
|
||||
AUTO_PROPERTY(bool, lineEditPortEnabled)
|
||||
AUTO_PROPERTY(bool, pageEnabled)
|
||||
AUTO_PROPERTY(bool, labelInfoVisible)
|
||||
AUTO_PROPERTY(QString, labelInfoText)
|
||||
AUTO_PROPERTY(int, progressBarResetValue)
|
||||
AUTO_PROPERTY(int, progressBarResetMaximium)
|
||||
|
||||
public:
|
||||
Q_INVOKABLE void onPushButtonProtoCloakSaveClicked();
|
||||
Q_INVOKABLE void onPushButtonSaveClicked();
|
||||
|
||||
public:
|
||||
explicit CloakLogic(UiLogic *uiLogic, QObject *parent = nullptr);
|
||||
|
|
|
|||
|
|
@ -8,16 +8,15 @@ using namespace PageEnumNS;
|
|||
|
||||
ShadowSocksLogic::ShadowSocksLogic(UiLogic *logic, QObject *parent):
|
||||
PageProtocolLogicBase(logic, parent),
|
||||
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_comboBoxCipherText{"chacha20-poly1305"},
|
||||
m_lineEditPortText{},
|
||||
m_pushButtonSaveVisible{false},
|
||||
m_progressBaResetVisible{false},
|
||||
m_lineEditPortEnabled{false},
|
||||
m_labelInfoVisible{true},
|
||||
m_labelInfoText{},
|
||||
m_progressBaResetValue{0},
|
||||
m_progressBaResetMaximium{100}
|
||||
{
|
||||
|
||||
}
|
||||
|
|
@ -25,27 +24,27 @@ ShadowSocksLogic::ShadowSocksLogic(UiLogic *logic, QObject *parent):
|
|||
void ShadowSocksLogic::updateProtocolPage(const QJsonObject &ssConfig, DockerContainer container, bool haveAuthData)
|
||||
{
|
||||
set_pageEnabled(haveAuthData);
|
||||
set_pushButtonShadowSocksSaveVisible(haveAuthData);
|
||||
set_progressBarProtoShadowSocksResetVisible(haveAuthData);
|
||||
set_pushButtonSaveVisible(haveAuthData);
|
||||
set_progressBaResetVisible(haveAuthData);
|
||||
|
||||
set_comboBoxProtoShadowSocksCipherText(ssConfig.value(config_key::cipher).
|
||||
set_comboBoxCipherText(ssConfig.value(config_key::cipher).
|
||||
toString(protocols::shadowsocks::defaultCipher));
|
||||
|
||||
set_lineEditProtoShadowSocksPortText(ssConfig.value(config_key::port).
|
||||
set_lineEditPortText(ssConfig.value(config_key::port).
|
||||
toString(protocols::shadowsocks::defaultPort));
|
||||
|
||||
set_lineEditProtoShadowSocksPortEnabled(container == DockerContainer::ShadowSocks);
|
||||
set_lineEditPortEnabled(container == DockerContainer::ShadowSocks);
|
||||
}
|
||||
|
||||
QJsonObject ShadowSocksLogic::getProtocolConfigFromPage(QJsonObject oldConfig)
|
||||
{
|
||||
oldConfig.insert(config_key::cipher, comboBoxProtoShadowSocksCipherText());
|
||||
oldConfig.insert(config_key::port, lineEditProtoShadowSocksPortText());
|
||||
oldConfig.insert(config_key::cipher, comboBoxCipherText());
|
||||
oldConfig.insert(config_key::port, lineEditPortText());
|
||||
|
||||
return oldConfig;
|
||||
}
|
||||
|
||||
void ShadowSocksLogic::onPushButtonProtoShadowSocksSaveClicked()
|
||||
void ShadowSocksLogic::onPushButtonSaveClicked()
|
||||
{
|
||||
QJsonObject protocolConfig = m_settings.protocolConfig(uiLogic()->selectedServerIndex, uiLogic()->selectedDockerContainer, Protocol::ShadowSocks);
|
||||
//protocolConfig = getShadowSocksConfigFromPage(protocolConfig);
|
||||
|
|
@ -55,37 +54,37 @@ void ShadowSocksLogic::onPushButtonProtoShadowSocksSaveClicked()
|
|||
newContainerConfig.insert(ProtocolProps::protoToString(Protocol::ShadowSocks), protocolConfig);
|
||||
UiLogic::PageFunc page_proto_shadowsocks;
|
||||
page_proto_shadowsocks.setEnabledFunc = [this] (bool enabled) -> void {
|
||||
set_pageProtoShadowSocksEnabled(enabled);
|
||||
set_pageEnabled(enabled);
|
||||
};
|
||||
UiLogic::ButtonFunc pushButton_proto_shadowsocks_save;
|
||||
pushButton_proto_shadowsocks_save.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_pushButtonShadowSocksSaveVisible(visible);
|
||||
set_pushButtonSaveVisible(visible);
|
||||
};
|
||||
UiLogic::LabelFunc label_proto_shadowsocks_info;
|
||||
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 {
|
||||
set_labelProtoShadowSocksInfoText(text);
|
||||
set_labelInfoText(text);
|
||||
};
|
||||
UiLogic::ProgressFunc progressBar_proto_shadowsocks_reset;
|
||||
progressBar_proto_shadowsocks_reset.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_progressBarProtoShadowSocksResetVisible(visible);
|
||||
UiLogic::ProgressFunc progressBar_reset;
|
||||
progressBar_reset.setVisibleFunc = [this] (bool visible) ->void {
|
||||
set_progressBaResetVisible(visible);
|
||||
};
|
||||
progressBar_proto_shadowsocks_reset.setValueFunc = [this] (int value) ->void {
|
||||
set_progressBarProtoShadowSocksResetValue(value);
|
||||
progressBar_reset.setValueFunc = [this] (int value) ->void {
|
||||
set_progressBaResetValue(value);
|
||||
};
|
||||
progressBar_proto_shadowsocks_reset.getValueFunc = [this] (void) -> int {
|
||||
return progressBarProtoShadowSocksResetValue();
|
||||
progressBar_reset.getValueFunc = [this] (void) -> int {
|
||||
return progressBaResetValue();
|
||||
};
|
||||
progressBar_proto_shadowsocks_reset.getMaximiumFunc = [this] (void) -> int {
|
||||
return progressBarProtoShadowSocksResetMaximium();
|
||||
progressBar_reset.getMaximiumFunc = [this] (void) -> int {
|
||||
return progressBaResetMaximium();
|
||||
};
|
||||
|
||||
ErrorCode e = uiLogic()->doInstallAction([this, 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);
|
||||
|
||||
if (!e) {
|
||||
|
|
|
|||
|
|
@ -9,19 +9,18 @@ class ShadowSocksLogic : public PageProtocolLogicBase
|
|||
{
|
||||
Q_OBJECT
|
||||
|
||||
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(QString, comboBoxCipherText)
|
||||
AUTO_PROPERTY(QString, lineEditPortText)
|
||||
AUTO_PROPERTY(bool, pushButtonSaveVisible)
|
||||
AUTO_PROPERTY(bool, progressBaResetVisible)
|
||||
AUTO_PROPERTY(bool, lineEditPortEnabled)
|
||||
AUTO_PROPERTY(bool, labelInfoVisible)
|
||||
AUTO_PROPERTY(QString, labelInfoText)
|
||||
AUTO_PROPERTY(int, progressBaResetValue)
|
||||
AUTO_PROPERTY(int, progressBaResetMaximium)
|
||||
|
||||
public:
|
||||
Q_INVOKABLE void onPushButtonProtoShadowSocksSaveClicked();
|
||||
Q_INVOKABLE void onPushButtonSaveClicked();
|
||||
|
||||
public:
|
||||
explicit ShadowSocksLogic(UiLogic *uiLogic, QObject *parent = nullptr);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue