AUTO_PROPERTY finished
This commit is contained in:
parent
63ffa4a212
commit
16e887dcf0
34 changed files with 510 additions and 3156 deletions
|
@ -61,7 +61,7 @@ VpnLogic::VpnLogic(UiLogic *logic, QObject *parent):
|
|||
|
||||
if (m_settings.isAutoConnect() && m_settings.defaultServerIndex() >= 0) {
|
||||
QTimer::singleShot(1000, this, [this](){
|
||||
setPushButtonConnectEnabled(false);
|
||||
set_pushButtonConnectEnabled(false);
|
||||
onConnect();
|
||||
});
|
||||
}
|
||||
|
@ -71,10 +71,10 @@ VpnLogic::VpnLogic(UiLogic *logic, QObject *parent):
|
|||
void VpnLogic::updateVpnPage()
|
||||
{
|
||||
Settings::RouteMode mode = m_settings.routeMode();
|
||||
setRadioButtonVpnModeAllSitesChecked(mode == Settings::VpnAllSites);
|
||||
setRadioButtonVpnModeForwardSitesChecked(mode == Settings::VpnOnlyForwardSites);
|
||||
setRadioButtonVpnModeExceptSitesChecked(mode == Settings::VpnAllExceptSites);
|
||||
setPushButtonVpnAddSiteEnabled(mode != Settings::VpnAllSites);
|
||||
set_radioButtonVpnModeAllSitesChecked(mode == Settings::VpnAllSites);
|
||||
set_radioButtonVpnModeForwardSitesChecked(mode == Settings::VpnOnlyForwardSites);
|
||||
set_radioButtonVpnModeExceptSitesChecked(mode == Settings::VpnAllExceptSites);
|
||||
set_pushButtonVpnAddSiteEnabled(mode != Settings::VpnAllSites);
|
||||
}
|
||||
|
||||
|
||||
|
@ -99,153 +99,10 @@ void VpnLogic::onRadioButtonVpnModeExceptSitesToggled(bool checked)
|
|||
}
|
||||
}
|
||||
|
||||
bool VpnLogic::getRadioButtonVpnModeAllSitesChecked() const
|
||||
{
|
||||
return m_radioButtonVpnModeAllSitesChecked;
|
||||
}
|
||||
|
||||
bool VpnLogic::getRadioButtonVpnModeForwardSitesChecked() const
|
||||
{
|
||||
return m_radioButtonVpnModeForwardSitesChecked;
|
||||
}
|
||||
|
||||
bool VpnLogic::getRadioButtonVpnModeExceptSitesChecked() const
|
||||
{
|
||||
return m_radioButtonVpnModeExceptSitesChecked;
|
||||
}
|
||||
|
||||
void VpnLogic::setRadioButtonVpnModeAllSitesChecked(bool radioButtonVpnModeAllSitesChecked)
|
||||
{
|
||||
if (m_radioButtonVpnModeAllSitesChecked != radioButtonVpnModeAllSitesChecked) {
|
||||
m_radioButtonVpnModeAllSitesChecked = radioButtonVpnModeAllSitesChecked;
|
||||
emit radioButtonVpnModeAllSitesCheckedChanged();
|
||||
}
|
||||
}
|
||||
|
||||
void VpnLogic::setRadioButtonVpnModeForwardSitesChecked(bool radioButtonVpnModeForwardSitesChecked)
|
||||
{
|
||||
if (m_radioButtonVpnModeForwardSitesChecked != radioButtonVpnModeForwardSitesChecked) {
|
||||
m_radioButtonVpnModeForwardSitesChecked = radioButtonVpnModeForwardSitesChecked;
|
||||
emit radioButtonVpnModeForwardSitesCheckedChanged();
|
||||
}
|
||||
}
|
||||
|
||||
void VpnLogic::setRadioButtonVpnModeExceptSitesChecked(bool radioButtonVpnModeExceptSitesChecked)
|
||||
{
|
||||
if (m_radioButtonVpnModeExceptSitesChecked != radioButtonVpnModeExceptSitesChecked) {
|
||||
m_radioButtonVpnModeExceptSitesChecked = radioButtonVpnModeExceptSitesChecked;
|
||||
emit radioButtonVpnModeExceptSitesCheckedChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool VpnLogic::getPushButtonConnectChecked() const
|
||||
{
|
||||
return m_pushButtonConnectChecked;
|
||||
}
|
||||
|
||||
void VpnLogic::setPushButtonConnectChecked(bool pushButtonConnectChecked)
|
||||
{
|
||||
if (m_pushButtonConnectChecked != pushButtonConnectChecked) {
|
||||
m_pushButtonConnectChecked = pushButtonConnectChecked;
|
||||
emit pushButtonConnectCheckedChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool VpnLogic::getPushButtonVpnAddSiteEnabled() const
|
||||
{
|
||||
return m_pushButtonVpnAddSiteEnabled;
|
||||
}
|
||||
|
||||
void VpnLogic::setPushButtonVpnAddSiteEnabled(bool pushButtonVpnAddSiteEnabled)
|
||||
{
|
||||
if (m_pushButtonVpnAddSiteEnabled != pushButtonVpnAddSiteEnabled) {
|
||||
m_pushButtonVpnAddSiteEnabled = pushButtonVpnAddSiteEnabled;
|
||||
emit pushButtonVpnAddSiteEnabledChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString VpnLogic::getLabelSpeedReceivedText() const
|
||||
{
|
||||
return m_labelSpeedReceivedText;
|
||||
}
|
||||
|
||||
void VpnLogic::setLabelSpeedReceivedText(const QString &labelSpeedReceivedText)
|
||||
{
|
||||
if (m_labelSpeedReceivedText != labelSpeedReceivedText) {
|
||||
m_labelSpeedReceivedText = labelSpeedReceivedText;
|
||||
emit labelSpeedReceivedTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString VpnLogic::getLabelSpeedSentText() const
|
||||
{
|
||||
return m_labelSpeedSentText;
|
||||
}
|
||||
|
||||
void VpnLogic::setLabelSpeedSentText(const QString &labelSpeedSentText)
|
||||
{
|
||||
if (m_labelSpeedSentText != labelSpeedSentText) {
|
||||
m_labelSpeedSentText = labelSpeedSentText;
|
||||
emit labelSpeedSentTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString VpnLogic::getLabelStateText() const
|
||||
{
|
||||
return m_labelStateText;
|
||||
}
|
||||
|
||||
void VpnLogic::setLabelStateText(const QString &labelStateText)
|
||||
{
|
||||
if (m_labelStateText != labelStateText) {
|
||||
m_labelStateText = labelStateText;
|
||||
emit labelStateTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool VpnLogic::getPushButtonConnectEnabled() const
|
||||
{
|
||||
return m_pushButtonConnectEnabled;
|
||||
}
|
||||
|
||||
void VpnLogic::setPushButtonConnectEnabled(bool pushButtonConnectEnabled)
|
||||
{
|
||||
if (m_pushButtonConnectEnabled != pushButtonConnectEnabled) {
|
||||
m_pushButtonConnectEnabled = pushButtonConnectEnabled;
|
||||
emit pushButtonConnectEnabledChanged();
|
||||
}
|
||||
}
|
||||
|
||||
bool VpnLogic::getWidgetVpnModeEnabled() const
|
||||
{
|
||||
return m_widgetVpnModeEnabled;
|
||||
}
|
||||
|
||||
void VpnLogic::setWidgetVpnModeEnabled(bool widgetVpnModeEnabled)
|
||||
{
|
||||
if (m_widgetVpnModeEnabled != widgetVpnModeEnabled) {
|
||||
m_widgetVpnModeEnabled = widgetVpnModeEnabled;
|
||||
emit widgetVpnModeEnabledChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString VpnLogic::getLabelErrorText() const
|
||||
{
|
||||
return m_labelErrorText;
|
||||
}
|
||||
|
||||
void VpnLogic::setLabelErrorText(const QString &labelErrorText)
|
||||
{
|
||||
if (m_labelErrorText != labelErrorText) {
|
||||
m_labelErrorText = labelErrorText;
|
||||
emit labelErrorTextChanged();
|
||||
}
|
||||
}
|
||||
|
||||
void VpnLogic::onBytesChanged(quint64 receivedData, quint64 sentData)
|
||||
{
|
||||
setLabelSpeedReceivedText(VpnConnection::bytesPerSecToText(receivedData));
|
||||
setLabelSpeedSentText(VpnConnection::bytesPerSecToText(sentData));
|
||||
set_labelSpeedReceivedText(VpnConnection::bytesPerSecToText(receivedData));
|
||||
set_labelSpeedSentText(VpnConnection::bytesPerSecToText(sentData));
|
||||
}
|
||||
|
||||
void VpnLogic::onConnectionStateChanged(VpnProtocol::ConnectionState state)
|
||||
|
@ -254,14 +111,14 @@ void VpnLogic::onConnectionStateChanged(VpnProtocol::ConnectionState state)
|
|||
|
||||
bool pushButtonConnectEnabled = false;
|
||||
bool radioButtonsModeEnabled = false;
|
||||
setLabelStateText(VpnProtocol::textConnectionState(state));
|
||||
set_labelStateText(VpnProtocol::textConnectionState(state));
|
||||
|
||||
uiLogic()->setTrayState(state);
|
||||
|
||||
switch (state) {
|
||||
case VpnProtocol::Disconnected:
|
||||
onBytesChanged(0,0);
|
||||
setPushButtonConnectChecked(false);
|
||||
set_pushButtonConnectChecked(false);
|
||||
pushButtonConnectEnabled = true;
|
||||
radioButtonsModeEnabled = true;
|
||||
break;
|
||||
|
@ -286,7 +143,7 @@ void VpnLogic::onConnectionStateChanged(VpnProtocol::ConnectionState state)
|
|||
radioButtonsModeEnabled = false;
|
||||
break;
|
||||
case VpnProtocol::Error:
|
||||
setPushButtonConnectEnabled(false);
|
||||
set_pushButtonConnectEnabled(false);
|
||||
pushButtonConnectEnabled = true;
|
||||
radioButtonsModeEnabled = true;
|
||||
break;
|
||||
|
@ -295,13 +152,13 @@ void VpnLogic::onConnectionStateChanged(VpnProtocol::ConnectionState state)
|
|||
radioButtonsModeEnabled = true;
|
||||
}
|
||||
|
||||
setPushButtonConnectEnabled(pushButtonConnectEnabled);
|
||||
setWidgetVpnModeEnabled(radioButtonsModeEnabled);
|
||||
set_pushButtonConnectEnabled(pushButtonConnectEnabled);
|
||||
set_widgetVpnModeEnabled(radioButtonsModeEnabled);
|
||||
}
|
||||
|
||||
void VpnLogic::onVpnProtocolError(ErrorCode errorCode)
|
||||
{
|
||||
setLabelErrorText(errorString(errorCode));
|
||||
set_labelErrorText(errorString(errorCode));
|
||||
}
|
||||
|
||||
void VpnLogic::onPushButtonConnectClicked(bool checked)
|
||||
|
@ -320,14 +177,14 @@ void VpnLogic::onConnect()
|
|||
DockerContainer container = m_settings.defaultContainer(serverIndex);
|
||||
|
||||
if (m_settings.containers(serverIndex).isEmpty()) {
|
||||
setLabelErrorText(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
|
||||
setPushButtonConnectChecked(false);
|
||||
set_labelErrorText(tr("VPN Protocols is not installed.\n Please install VPN container at first"));
|
||||
set_pushButtonConnectChecked(false);
|
||||
return;
|
||||
}
|
||||
|
||||
if (container == DockerContainer::None) {
|
||||
setLabelErrorText(tr("VPN Protocol not choosen"));
|
||||
setPushButtonConnectChecked(false);
|
||||
set_labelErrorText(tr("VPN Protocol not choosen"));
|
||||
set_pushButtonConnectChecked(false);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -338,8 +195,8 @@ void VpnLogic::onConnect()
|
|||
|
||||
void VpnLogic::onConnectWorker(int serverIndex, const ServerCredentials &credentials, DockerContainer container, const QJsonObject &containerConfig)
|
||||
{
|
||||
setLabelErrorText("");
|
||||
setPushButtonConnectChecked(true);
|
||||
set_labelErrorText("");
|
||||
set_pushButtonConnectChecked(true);
|
||||
qApp->processEvents();
|
||||
|
||||
ErrorCode errorCode = uiLogic()->m_vpnConnection->connectToVpn(
|
||||
|
@ -353,11 +210,11 @@ void VpnLogic::onConnectWorker(int serverIndex, const ServerCredentials &credent
|
|||
return;
|
||||
}
|
||||
|
||||
setPushButtonConnectEnabled(false);
|
||||
set_pushButtonConnectEnabled(false);
|
||||
}
|
||||
|
||||
void VpnLogic::onDisconnect()
|
||||
{
|
||||
setPushButtonConnectChecked(false);
|
||||
set_pushButtonConnectChecked(false);
|
||||
uiLogic()->m_vpnConnection->disconnectFromVpn();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue