From 10870a0f74b80fc79ab324556c0b5d8511518413 Mon Sep 17 00:00:00 2001 From: Sepalani Date: Thu, 14 May 2020 23:09:32 +0400 Subject: Config: Migrate SSL options to Onion config --- Source/Core/DolphinQt/Debugger/NetworkWidget.cpp | 39 +++++++++++++----------- 1 file changed, 22 insertions(+), 17 deletions(-) (limited to 'Source/Core/DolphinQt/Debugger/NetworkWidget.cpp') diff --git a/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp b/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp index 537bf4be65..0c93d286f9 100644 --- a/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp +++ b/Source/Core/DolphinQt/Debugger/NetworkWidget.cpp @@ -18,7 +18,7 @@ #include #endif -#include "Core/ConfigManager.h" +#include "Core/Config/MainSettings.h" #include "Core/IOS/Network/SSL.h" #include "Core/IOS/Network/Socket.h" #include "DolphinQt/Host.h" @@ -191,16 +191,21 @@ void NetworkWidget::CreateWidgets() void NetworkWidget::ConnectWidgets() { - connect(m_dump_ssl_read_checkbox, &QCheckBox::stateChanged, - [](int state) { SConfig::GetInstance().m_SSLDumpRead = state == Qt::Checked; }); - connect(m_dump_ssl_write_checkbox, &QCheckBox::stateChanged, - [](int state) { SConfig::GetInstance().m_SSLDumpWrite = state == Qt::Checked; }); - connect(m_dump_root_ca_checkbox, &QCheckBox::stateChanged, - [](int state) { SConfig::GetInstance().m_SSLDumpRootCA = state == Qt::Checked; }); - connect(m_dump_peer_cert_checkbox, &QCheckBox::stateChanged, - [](int state) { SConfig::GetInstance().m_SSLDumpPeerCert = state == Qt::Checked; }); - connect(m_verify_certificates_checkbox, &QCheckBox::stateChanged, - [](int state) { SConfig::GetInstance().m_SSLVerifyCert = state == Qt::Checked; }); + connect(m_dump_ssl_read_checkbox, &QCheckBox::stateChanged, [](int state) { + Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_READ, state == Qt::Checked); + }); + connect(m_dump_ssl_write_checkbox, &QCheckBox::stateChanged, [](int state) { + Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_WRITE, state == Qt::Checked); + }); + connect(m_dump_root_ca_checkbox, &QCheckBox::stateChanged, [](int state) { + Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_ROOT_CA, state == Qt::Checked); + }); + connect(m_dump_peer_cert_checkbox, &QCheckBox::stateChanged, [](int state) { + Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_DUMP_PEER_CERT, state == Qt::Checked); + }); + connect(m_verify_certificates_checkbox, &QCheckBox::stateChanged, [](int state) { + Config::SetBaseOrCurrent(Config::MAIN_NETWORK_SSL_VERIFY_CERTIFICATES, state == Qt::Checked); + }); } void NetworkWidget::Update() @@ -237,12 +242,12 @@ void NetworkWidget::Update() } m_ssl_table->resizeColumnsToContents(); - const auto& config = SConfig::GetInstance(); - m_dump_ssl_read_checkbox->setChecked(config.m_SSLDumpRead); - m_dump_ssl_write_checkbox->setChecked(config.m_SSLDumpWrite); - m_dump_root_ca_checkbox->setChecked(config.m_SSLDumpRootCA); - m_dump_peer_cert_checkbox->setChecked(config.m_SSLDumpPeerCert); - m_verify_certificates_checkbox->setChecked(config.m_SSLVerifyCert); + m_dump_ssl_read_checkbox->setChecked(Config::Get(Config::MAIN_NETWORK_SSL_DUMP_READ)); + m_dump_ssl_write_checkbox->setChecked(Config::Get(Config::MAIN_NETWORK_SSL_DUMP_WRITE)); + m_dump_root_ca_checkbox->setChecked(Config::Get(Config::MAIN_NETWORK_SSL_DUMP_ROOT_CA)); + m_dump_peer_cert_checkbox->setChecked(Config::Get(Config::MAIN_NETWORK_SSL_DUMP_PEER_CERT)); + m_verify_certificates_checkbox->setChecked( + Config::Get(Config::MAIN_NETWORK_SSL_VERIFY_CERTIFICATES)); } QGroupBox* NetworkWidget::CreateSocketTableGroup() -- cgit v1.2.3