From e2753c4f0c1c8e4ba1eb8c301c18c63b7ed7cb6b Mon Sep 17 00:00:00 2001 From: Omar Date: Mon, 15 Sep 2025 06:41:42 +0300 Subject: [PATCH] Add ability to remove all domains --- Client/core/CSettings.cpp | 35 +++++++++++++++++++++++++++++++++-- Client/core/CSettings.h | 4 ++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/Client/core/CSettings.cpp b/Client/core/CSettings.cpp index 81a2c159891..15d0c396c15 100644 --- a/Client/core/CSettings.cpp +++ b/Client/core/CSettings.cpp @@ -982,7 +982,11 @@ void CSettings::CreateGUI() m_pButtonBrowserBlacklistRemove = reinterpret_cast(pManager->CreateButton(m_pTabBrowser, _("Remove domain"))); m_pButtonBrowserBlacklistRemove->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + m_pGridBrowserBlacklist->GetSize().fY + 5.0f)); - m_pButtonBrowserBlacklistRemove->SetSize(CVector2D(140.0f, 22.0f)); + m_pButtonBrowserBlacklistRemove->SetSize(CVector2D(145.0f, 22.0f)); + + m_pButtonBrowserBlacklistRemoveAll = reinterpret_cast(pManager->CreateButton(m_pTabBrowser, _("Remove all"))); + m_pButtonBrowserBlacklistRemoveAll->SetPosition(CVector2D(vecTemp.fX + 155.0f, vecTemp.fY + m_pGridBrowserBlacklist->GetSize().fY + 5.0f)); + m_pButtonBrowserBlacklistRemoveAll->SetSize(CVector2D(145.0f, 22.0f)); m_pLabelBrowserCustomBlacklist->GetPosition(vecTemp); // Reset vecTemp @@ -1017,7 +1021,11 @@ void CSettings::CreateGUI() m_pButtonBrowserWhitelistRemove = reinterpret_cast(pManager->CreateButton(m_pTabBrowser, _("Remove domain"))); m_pButtonBrowserWhitelistRemove->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + m_pGridBrowserWhitelist->GetSize().fY + 5.0f)); - m_pButtonBrowserWhitelistRemove->SetSize(CVector2D(140.0f, 22.0f)); + m_pButtonBrowserWhitelistRemove->SetSize(CVector2D(145.0f, 22.0f)); + + m_pButtonBrowserWhitelistRemoveAll = reinterpret_cast(pManager->CreateButton(m_pTabBrowser, _("Remove all"))); + m_pButtonBrowserWhitelistRemoveAll->SetPosition(CVector2D(vecTemp.fX + 155.0f, vecTemp.fY + m_pGridBrowserWhitelist->GetSize().fY + 5.0f)); + m_pButtonBrowserWhitelistRemoveAll->SetSize(CVector2D(145.0f, 22.0f)); /** * Advanced tab @@ -1317,10 +1325,12 @@ void CSettings::CreateGUI() m_pCheckBoxShowUnsafeResolutions->SetClickHandler(GUI_CALLBACK(&CSettings::ShowUnsafeResolutionsClick, this)); m_pButtonBrowserBlacklistAdd->SetClickHandler(GUI_CALLBACK(&CSettings::OnBrowserBlacklistAdd, this)); m_pButtonBrowserBlacklistRemove->SetClickHandler(GUI_CALLBACK(&CSettings::OnBrowserBlacklistRemove, this)); + m_pButtonBrowserBlacklistRemoveAll->SetClickHandler(GUI_CALLBACK(&CSettings::OnBrowserBlacklistRemoveAll, this)); m_pEditBrowserBlacklistAdd->SetActivateHandler(GUI_CALLBACK(&CSettings::OnBrowserBlacklistDomainAddFocused, this)); m_pEditBrowserBlacklistAdd->SetDeactivateHandler(GUI_CALLBACK(&CSettings::OnBrowserBlacklistDomainAddDefocused, this)); m_pButtonBrowserWhitelistAdd->SetClickHandler(GUI_CALLBACK(&CSettings::OnBrowserWhitelistAdd, this)); m_pButtonBrowserWhitelistRemove->SetClickHandler(GUI_CALLBACK(&CSettings::OnBrowserWhitelistRemove, this)); + m_pButtonBrowserWhitelistRemoveAll->SetClickHandler(GUI_CALLBACK(&CSettings::OnBrowserWhitelistRemoveAll, this)); m_pEditBrowserWhitelistAdd->SetActivateHandler(GUI_CALLBACK(&CSettings::OnBrowserWhitelistDomainAddFocused, this)); m_pEditBrowserWhitelistAdd->SetDeactivateHandler(GUI_CALLBACK(&CSettings::OnBrowserWhitelistDomainAddDefocused, this)); m_pProcessAffinityCheckbox->SetClickHandler(GUI_CALLBACK(&CSettings::OnAffinityClick, this)); @@ -4870,6 +4880,16 @@ bool CSettings::OnBrowserBlacklistRemove(CGUIElement* pElement) return true; } +bool CSettings::OnBrowserBlacklistRemoveAll(CGUIElement* pElement) +{ + if (m_pGridBrowserBlacklist->GetRowCount() > 0) + { + m_pGridBrowserBlacklist->Clear(); + m_bBrowserListsChanged = true; + } + return true; +} + bool CSettings::OnBrowserBlacklistDomainAddFocused(CGUIElement* pElement) { m_pLabelBrowserBlacklistAdd->SetVisible(false); @@ -4919,6 +4939,17 @@ bool CSettings::OnBrowserWhitelistRemove(CGUIElement* pElement) return true; } +bool CSettings::OnBrowserWhitelistRemoveAll(CGUIElement* pElement) +{ + if (m_pGridBrowserWhitelist->GetRowCount() > 0) + { + m_pGridBrowserWhitelist->Clear(); + m_bBrowserListsChanged = true; + } + + return true; +} + bool CSettings::OnBrowserWhitelistDomainAddFocused(CGUIElement* pElement) { m_pLabelBrowserWhitelistAdd->SetVisible(false); diff --git a/Client/core/CSettings.h b/Client/core/CSettings.h index 91b136b53e5..72d3bf47565 100644 --- a/Client/core/CSettings.h +++ b/Client/core/CSettings.h @@ -338,12 +338,14 @@ class CSettings CGUIButton* m_pButtonBrowserBlacklistAdd; CGUIGridList* m_pGridBrowserBlacklist; CGUIButton* m_pButtonBrowserBlacklistRemove; + CGUIButton* m_pButtonBrowserBlacklistRemoveAll; CGUILabel* m_pLabelBrowserCustomWhitelist; CGUIEdit* m_pEditBrowserWhitelistAdd; CGUILabel* m_pLabelBrowserWhitelistAdd; CGUIButton* m_pButtonBrowserWhitelistAdd; CGUIGridList* m_pGridBrowserWhitelist; CGUIButton* m_pButtonBrowserWhitelistRemove; + CGUIButton* m_pButtonBrowserWhitelistRemoveAll; CGUICheckBox* m_pCheckBoxBrowserGPUEnabled; bool m_bBrowserListsChanged; bool m_bBrowserListsLoadEnabled; @@ -383,10 +385,12 @@ class CSettings bool OnVerticalAimSensitivityChanged(CGUIElement* pElement); bool OnBrowserBlacklistAdd(CGUIElement* pElement); bool OnBrowserBlacklistRemove(CGUIElement* pElement); + bool OnBrowserBlacklistRemoveAll(CGUIElement* pElement); bool OnBrowserBlacklistDomainAddFocused(CGUIElement* pElement); bool OnBrowserBlacklistDomainAddDefocused(CGUIElement* pElement); bool OnBrowserWhitelistAdd(CGUIElement* pElement); bool OnBrowserWhitelistRemove(CGUIElement* pElement); + bool OnBrowserWhitelistRemoveAll(CGUIElement* pElement); bool OnBrowserWhitelistDomainAddFocused(CGUIElement* pElement); bool OnBrowserWhitelistDomainAddDefocused(CGUIElement* pElement);