Skip to content

Add ability to remove all domains #4465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add ability to remove all domains #4465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e2753c4
Add ability to remove all domains
omar-o22 Sep 15, 2025
0f49e69
Merge branch 'master' into feature/remove-all-domains
omar-o22 Sep 23, 2025
359043e
Merge branch 'master' into feature/remove-all-domains
omar-o22 Oct 3, 2025
208fa48
Merge branch 'master' into feature/remove-all-domains
omar-o22 Oct 12, 2025
f9f14d1
Merge branch 'multitheftauto:master' into feature/remove-all-domains
omar-o22 Nov 18, 2025
56eedca
Merge branch 'master' into feature/remove-all-domains
tederis Nov 20, 2025
3e4c54a
Merge branch 'multitheftauto:master' into feature/remove-all-domains
omar-o22 Nov 28, 2025
538342f
Fix conflict mistakes & improve button styling to match the others
omar-o22 Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions Client/core/CSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1594,7 +1594,9 @@ void CSettings::CreateGUI()
const CVector2D blacklistGridPos = vecTemp;
const float browserBottomPadding = 32.0f;
const float browserButtonSpacing = 5.0f;
const CVector2D blacklistRemoveSize(140.0f, 22.0f);
const CVector2D blacklistRemoveSize(155.0f, 22.0f);
const CVector2D blacklistRemoveAllSize(155.0f, 22.0f);
const float blacklistRemoveAllSpacing = 165.0f;
const float blacklistHeightAvailable = tabPanelSize.fY - blacklistGridPos.fY - blacklistRemoveSize.fY - browserButtonSpacing - browserBottomPadding;
m_pGridBrowserBlacklist->SetSize(CVector2D(browserColumnWidth, std::max(80.0f, blacklistHeightAvailable)));
m_pGridBrowserBlacklist->AddColumn(_("Domain"), 0.9f);
Expand All @@ -1603,6 +1605,10 @@ void CSettings::CreateGUI()
m_pButtonBrowserBlacklistRemove->SetSize(blacklistRemoveSize);
m_pButtonBrowserBlacklistRemove->SetPosition(CVector2D(blacklistGridPos.fX, blacklistGridPos.fY + m_pGridBrowserBlacklist->GetSize().fY + browserButtonSpacing));

m_pButtonBrowserBlacklistRemoveAll = reinterpret_cast<CGUIButton*>(pManager->CreateButton(m_pTabBrowser, _("Remove all")));
m_pButtonBrowserBlacklistRemoveAll->SetSize(blacklistRemoveAllSize);
m_pButtonBrowserBlacklistRemoveAll->SetPosition(CVector2D(vecTemp.fX + blacklistRemoveAllSpacing, vecTemp.fY + m_pGridBrowserBlacklist->GetSize().fY + browserButtonSpacing));

m_pLabelBrowserCustomBlacklist->GetPosition(vecTemp); // Reset vecTemp

m_pLabelBrowserCustomWhitelist = reinterpret_cast<CGUILabel*>(pManager->CreateLabel(m_pTabBrowser, _("Custom whitelist")));
Expand Down Expand Up @@ -1632,7 +1638,9 @@ void CSettings::CreateGUI()
m_pGridBrowserWhitelist->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY + 32.0f));
m_pGridBrowserWhitelist->GetPosition(vecTemp);
const CVector2D whitelistGridPos = vecTemp;
const CVector2D whitelistRemoveSize(140.0f, 22.0f);
const CVector2D whitelistRemoveSize(155.0f, 22.0f);
const CVector2D whitelistRemoveAllSize(155.0f, 22.0f);
const float whitelistRemoveAllSpacing = 165.0f;
const float whitelistHeightAvailable = tabPanelSize.fY - whitelistGridPos.fY - whitelistRemoveSize.fY - browserButtonSpacing - browserBottomPadding;
m_pGridBrowserWhitelist->SetSize(CVector2D(browserColumnWidth, std::max(80.0f, whitelistHeightAvailable)));
m_pGridBrowserWhitelist->AddColumn(_("Domain"), 0.9f);
Expand All @@ -1641,6 +1649,10 @@ void CSettings::CreateGUI()
m_pButtonBrowserWhitelistRemove->SetSize(whitelistRemoveSize);
m_pButtonBrowserWhitelistRemove->SetPosition(CVector2D(whitelistGridPos.fX, whitelistGridPos.fY + m_pGridBrowserWhitelist->GetSize().fY + browserButtonSpacing));

m_pButtonBrowserWhitelistRemoveAll = reinterpret_cast<CGUIButton*>(pManager->CreateButton(m_pTabBrowser, _("Remove all")));
m_pButtonBrowserWhitelistRemoveAll->SetSize(whitelistRemoveAllSize);
m_pButtonBrowserWhitelistRemoveAll->SetPosition(CVector2D(vecTemp.fX + whitelistRemoveAllSpacing, vecTemp.fY + m_pGridBrowserWhitelist->GetSize().fY + browserButtonSpacing));

/**
* Advanced tab
**/
Expand Down Expand Up @@ -1963,10 +1975,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));
Expand Down Expand Up @@ -5877,6 +5891,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);
Expand Down Expand Up @@ -5926,6 +5950,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);
Expand Down
4 changes: 4 additions & 0 deletions Client/core/CSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,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;
Expand Down Expand Up @@ -421,10 +423,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);

Expand Down
Loading