AUTO_PROPERTY finished

This commit is contained in:
Pokamest Nikak 2021-09-08 13:52:36 +03:00
parent 63ffa4a212
commit 16e887dcf0
34 changed files with 510 additions and 3156 deletions

View file

@ -24,41 +24,27 @@ ServerSettingsLogic::ServerSettingsLogic(UiLogic *logic, QObject *parent):
void ServerSettingsLogic::updateServerSettingsPage()
{
setLabelServerSettingsWaitInfoVisible(false);
setLabelServerSettingsWaitInfoText("");
setPushButtonServerSettingsClearVisible(m_settings.haveAuthData(uiLogic()->selectedServerIndex));
setPushButtonServerSettingsClearClientCacheVisible(m_settings.haveAuthData(uiLogic()->selectedServerIndex));
setPushButtonServerSettingsShareFullVisible(m_settings.haveAuthData(uiLogic()->selectedServerIndex));
set_labelServerSettingsWaitInfoVisible(false);
set_labelServerSettingsWaitInfoText("");
set_pushButtonServerSettingsClearVisible(m_settings.haveAuthData(uiLogic()->selectedServerIndex));
set_pushButtonServerSettingsClearClientCacheVisible(m_settings.haveAuthData(uiLogic()->selectedServerIndex));
set_pushButtonServerSettingsShareFullVisible(m_settings.haveAuthData(uiLogic()->selectedServerIndex));
QJsonObject server = m_settings.server(uiLogic()->selectedServerIndex);
QString port = server.value(config_key::port).toString();
setLabelServerSettingsServerText(QString("%1@%2%3%4")
set_labelServerSettingsServerText(QString("%1@%2%3%4")
.arg(server.value(config_key::userName).toString())
.arg(server.value(config_key::hostName).toString())
.arg(port.isEmpty() ? "" : ":")
.arg(port));
setLineEditServerSettingsDescriptionText(server.value(config_key::description).toString());
set_lineEditServerSettingsDescriptionText(server.value(config_key::description).toString());
QString selectedContainerName = m_settings.defaultContainerName(uiLogic()->selectedServerIndex);
setLabelServerSettingsCurrentVpnProtocolText(tr("Protocol: ") + selectedContainerName);
set_labelServerSettingsCurrentVpnProtocolText(tr("Protocol: ") + selectedContainerName);
}
bool ServerSettingsLogic::getPageServerSettingsEnabled() const
{
return m_pageServerSettingsEnabled;
}
void ServerSettingsLogic::setPageServerSettingsEnabled(bool pageServerSettingsEnabled)
{
if (m_pageServerSettingsEnabled != pageServerSettingsEnabled) {
m_pageServerSettingsEnabled = pageServerSettingsEnabled;
emit pageServerSettingsEnabledChanged();
}
}
void ServerSettingsLogic::onPushButtonServerSettingsClearServer()
{
setPageServerSettingsEnabled(false);
setPushButtonServerSettingsClearText(tr("Uninstalling Amnezia software..."));
set_pageServerSettingsEnabled(false);
set_pushButtonServerSettingsClearText(tr("Uninstalling Amnezia software..."));
if (m_settings.defaultServerIndex() == uiLogic()->selectedServerIndex) {
uiLogic()->vpnLogic()->onDisconnect();
@ -74,15 +60,15 @@ void ServerSettingsLogic::onPushButtonServerSettingsClearServer()
emit uiLogic()->showConnectErrorDialog();
}
else {
setLabelServerSettingsWaitInfoVisible(true);
setLabelServerSettingsWaitInfoText(tr("Amnezia server successfully uninstalled"));
set_labelServerSettingsWaitInfoVisible(true);
set_labelServerSettingsWaitInfoText(tr("Amnezia server successfully uninstalled"));
}
m_settings.setContainers(uiLogic()->selectedServerIndex, {});
m_settings.setDefaultContainer(uiLogic()->selectedServerIndex, DockerContainer::None);
setPageServerSettingsEnabled(true);
setPushButtonServerSettingsClearText(tr("Clear server from Amnezia software"));
set_pageServerSettingsEnabled(true);
set_pushButtonServerSettingsClearText(tr("Clear server from Amnezia software"));
}
void ServerSettingsLogic::onPushButtonServerSettingsForgetServer()
@ -116,128 +102,9 @@ void ServerSettingsLogic::onPushButtonServerSettingsForgetServer()
}
}
bool ServerSettingsLogic::getLabelServerSettingsWaitInfoVisible() const
{
return m_labelServerSettingsWaitInfoVisible;
}
void ServerSettingsLogic::setLabelServerSettingsWaitInfoVisible(bool labelServerSettingsWaitInfoVisible)
{
if (m_labelServerSettingsWaitInfoVisible != labelServerSettingsWaitInfoVisible) {
m_labelServerSettingsWaitInfoVisible = labelServerSettingsWaitInfoVisible;
emit labelServerSettingsWaitInfoVisibleChanged();
}
}
QString ServerSettingsLogic::getLabelServerSettingsWaitInfoText() const
{
return m_labelServerSettingsWaitInfoText;
}
void ServerSettingsLogic::setLabelServerSettingsWaitInfoText(const QString &labelServerSettingsWaitInfoText)
{
if (m_labelServerSettingsWaitInfoText != labelServerSettingsWaitInfoText) {
m_labelServerSettingsWaitInfoText = labelServerSettingsWaitInfoText;
emit labelServerSettingsWaitInfoTextChanged();
}
}
bool ServerSettingsLogic::getPushButtonServerSettingsClearVisible() const
{
return m_pushButtonServerSettingsClearVisible;
}
void ServerSettingsLogic::setPushButtonServerSettingsClearVisible(bool pushButtonServerSettingsClearVisible)
{
if (m_pushButtonServerSettingsClearVisible != pushButtonServerSettingsClearVisible) {
m_pushButtonServerSettingsClearVisible = pushButtonServerSettingsClearVisible;
emit pushButtonServerSettingsClearVisibleChanged();
}
}
bool ServerSettingsLogic::getPushButtonServerSettingsClearClientCacheVisible() const
{
return m_pushButtonServerSettingsClearClientCacheVisible;
}
void ServerSettingsLogic::setPushButtonServerSettingsClearClientCacheVisible(bool pushButtonServerSettingsClearClientCacheVisible)
{
if (m_pushButtonServerSettingsClearClientCacheVisible != pushButtonServerSettingsClearClientCacheVisible) {
m_pushButtonServerSettingsClearClientCacheVisible = pushButtonServerSettingsClearClientCacheVisible;
emit pushButtonServerSettingsClearClientCacheVisibleChanged();
}
}
bool ServerSettingsLogic::getPushButtonServerSettingsShareFullVisible() const
{
return m_pushButtonServerSettingsShareFullVisible;
}
void ServerSettingsLogic::setPushButtonServerSettingsShareFullVisible(bool pushButtonServerSettingsShareFullVisible)
{
if (m_pushButtonServerSettingsShareFullVisible != pushButtonServerSettingsShareFullVisible) {
m_pushButtonServerSettingsShareFullVisible = pushButtonServerSettingsShareFullVisible;
emit pushButtonServerSettingsShareFullVisibleChanged();
}
}
QString ServerSettingsLogic::getLabelServerSettingsServerText() const
{
return m_labelServerSettingsServerText;
}
void ServerSettingsLogic::setLabelServerSettingsServerText(const QString &labelServerSettingsServerText)
{
if (m_labelServerSettingsServerText != labelServerSettingsServerText) {
m_labelServerSettingsServerText = labelServerSettingsServerText;
emit labelServerSettingsServerTextChanged();
}
}
QString ServerSettingsLogic::getLineEditServerSettingsDescriptionText() const
{
return m_lineEditServerSettingsDescriptionText;
}
void ServerSettingsLogic::setLineEditServerSettingsDescriptionText(const QString &lineEditServerSettingsDescriptionText)
{
if (m_lineEditServerSettingsDescriptionText != lineEditServerSettingsDescriptionText) {
m_lineEditServerSettingsDescriptionText = lineEditServerSettingsDescriptionText;
emit lineEditServerSettingsDescriptionTextChanged();
}
}
QString ServerSettingsLogic::getLabelServerSettingsCurrentVpnProtocolText() const
{
return m_labelServerSettingsCurrentVpnProtocolText;
}
void ServerSettingsLogic::setLabelServerSettingsCurrentVpnProtocolText(const QString &labelServerSettingsCurrentVpnProtocolText)
{
if (m_labelServerSettingsCurrentVpnProtocolText != labelServerSettingsCurrentVpnProtocolText) {
m_labelServerSettingsCurrentVpnProtocolText = labelServerSettingsCurrentVpnProtocolText;
emit labelServerSettingsCurrentVpnProtocolTextChanged();
}
}
QString ServerSettingsLogic::getPushButtonServerSettingsClearText() const
{
return m_pushButtonServerSettingsClearText;
}
void ServerSettingsLogic::setPushButtonServerSettingsClearText(const QString &pushButtonServerSettingsClearText)
{
if (m_pushButtonServerSettingsClearText != pushButtonServerSettingsClearText) {
m_pushButtonServerSettingsClearText = pushButtonServerSettingsClearText;
emit pushButtonServerSettingsClearTextChanged();
}
}
void ServerSettingsLogic::onPushButtonServerSettingsClearClientCacheClicked()
{
setPushButtonServerSettingsClearClientCacheText(tr("Cache cleared"));
set_pushButtonServerSettingsClearClientCacheText(tr("Cache cleared"));
const auto &containers = m_settings.containers(uiLogic()->selectedServerIndex);
for (DockerContainer container: containers.keys()) {
@ -245,32 +112,19 @@ void ServerSettingsLogic::onPushButtonServerSettingsClearClientCacheClicked()
}
QTimer::singleShot(3000, this, [this]() {
setPushButtonServerSettingsClearClientCacheText(tr("Clear client cached profile"));
set_pushButtonServerSettingsClearClientCacheText(tr("Clear client cached profile"));
});
}
void ServerSettingsLogic::onLineEditServerSettingsDescriptionEditingFinished()
{
const QString &newText = getLineEditServerSettingsDescriptionText();
const QString &newText = lineEditServerSettingsDescriptionText();
QJsonObject server = m_settings.server(uiLogic()->selectedServerIndex);
server.insert(config_key::description, newText);
m_settings.editServer(uiLogic()->selectedServerIndex, server);
uiLogic()->serverListLogic()->updateServersListPage();
}
QString ServerSettingsLogic::getPushButtonServerSettingsClearClientCacheText() const
{
return m_pushButtonServerSettingsClearClientCacheText;
}
void ServerSettingsLogic::setPushButtonServerSettingsClearClientCacheText(const QString &pushButtonServerSettingsClearClientCacheText)
{
if (m_pushButtonServerSettingsClearClientCacheText != pushButtonServerSettingsClearClientCacheText) {
m_pushButtonServerSettingsClearClientCacheText = pushButtonServerSettingsClearClientCacheText;
emit pushButtonServerSettingsClearClientCacheTextChanged();
}
}
void ServerSettingsLogic::onPushButtonServerSettingsShareFullClicked()
{
uiLogic()->shareConnectionLogic()->updateSharingPage(uiLogic()->selectedServerIndex, m_settings.serverCredentials(uiLogic()->selectedServerIndex), DockerContainer::None);