mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 18:56:34 +01:00
CookieManager: Don't add same server to different filters,
- Also don't allow duplicate entries in filters.
This commit is contained in:
parent
e60df0c9f4
commit
9301a5a2a8
@ -254,11 +254,19 @@ void CookieManager::slotRefreshFilters()
|
|||||||
void CookieManager::addWhitelist()
|
void CookieManager::addWhitelist()
|
||||||
{
|
{
|
||||||
const QString server = QInputDialog::getText(this, tr("Add to whitelist"), tr("Server:"));
|
const QString server = QInputDialog::getText(this, tr("Add to whitelist"), tr("Server:"));
|
||||||
|
|
||||||
if (server.isEmpty()) {
|
if (server.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ui->whiteList->addItem(server);
|
if (!ui->blackList->findItems(server, Qt::MatchFixedString).isEmpty()) {
|
||||||
|
QMessageBox::information(this, tr("Already blacklisted!"), tr("The server \"%1\" is already in blacklist, please remove it first.").arg(server));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ui->whiteList->findItems(server, Qt::MatchFixedString).isEmpty()) {
|
||||||
|
ui->whiteList->addItem(server);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CookieManager::removeWhitelist()
|
void CookieManager::removeWhitelist()
|
||||||
@ -269,11 +277,19 @@ void CookieManager::removeWhitelist()
|
|||||||
void CookieManager::addBlacklist()
|
void CookieManager::addBlacklist()
|
||||||
{
|
{
|
||||||
const QString server = QInputDialog::getText(this, tr("Add to blacklist"), tr("Server:"));
|
const QString server = QInputDialog::getText(this, tr("Add to blacklist"), tr("Server:"));
|
||||||
|
|
||||||
if (server.isEmpty()) {
|
if (server.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ui->blackList->addItem(server);
|
if (!ui->whiteList->findItems(server, Qt::MatchFixedString).isEmpty()) {
|
||||||
|
QMessageBox::information(this, tr("Already whitelisted!"), tr("The server \"%1\" is already in whitelist, please remove it first.").arg(server));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ui->blackList->findItems(server, Qt::MatchFixedString).isEmpty()) {
|
||||||
|
ui->blackList->addItem(server);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CookieManager::removeBlacklist()
|
void CookieManager::removeBlacklist()
|
||||||
|
Loading…
Reference in New Issue
Block a user