Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00
Code Releases Activity

[Cookies] Renamed Match Domain exactly to Filter 3rd party cookies

Browse Source 
Closes #1277

[ci skip]
This commit is contained in:
nowrep 2014-04-03 10:19:11 +02:00
parent 7469aced65
commit 61c1b8d8a1
3 changed files with 648 additions and 667 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/cookies/cookiemanager.cpp
View File

@ -71,7 +71,7 @@ CookieManager::CookieManager(QWidget* parent)
ui->deleteCookiesOnClose->setEnabled(false); ui->deleteCookiesOnClose->setEnabled(false);
} }
ui->deleteCookiesOnClose->setChecked(settings.value("deleteCookiesOnClose", false).toBool()); ui->deleteCookiesOnClose->setChecked(settings.value("deleteCookiesOnClose", false).toBool());
ui->matchExactly->setChecked(settings.value("allowCookiesFromVisitedDomainOnly", false).toBool()); ui->filter3rdParty->setChecked(settings.value("allowCookiesFromVisitedDomainOnly", false).toBool());
ui->filterTracking->setChecked(settings.value("filterTrackingCookie", false).toBool()); ui->filterTracking->setChecked(settings.value("filterTrackingCookie", false).toBool());
settings.endGroup(); settings.endGroup();
@ -327,7 +327,7 @@ void CookieManager::closeEvent(QCloseEvent* e)
settings.beginGroup("Cookie-Settings"); settings.beginGroup("Cookie-Settings");
settings.setValue("allowCookies", ui->saveCookies->isChecked()); settings.setValue("allowCookies", ui->saveCookies->isChecked());
settings.setValue("deleteCookiesOnClose", ui->deleteCookiesOnClose->isChecked()); settings.setValue("deleteCookiesOnClose", ui->deleteCookiesOnClose->isChecked());
settings.setValue("allowCookiesFromVisitedDomainOnly", ui->matchExactly->isChecked()); settings.setValue("allowCookiesFromVisitedDomainOnly", ui->filter3rdParty->isChecked());
settings.setValue("filterTrackingCookie", ui->filterTracking->isChecked()); settings.setValue("filterTrackingCookie", ui->filterTracking->isChecked());
settings.setValue("whitelist", whitelist); settings.setValue("whitelist", whitelist);
settings.setValue("blacklist", blacklist); settings.setValue("blacklist", blacklist);

6
src/lib/cookies/cookiemanager.ui
View File

@ -431,9 +431,9 @@
</spacer> </spacer>
</item> </item>
<item row="3" column="1" colspan="2"> <item row="3" column="1" colspan="2">
<widget class="QCheckBox" name="matchExactly"> <widget class="QCheckBox" name="filter3rdParty">
<property name="text"> <property name="text">
<string>Match domain exactly</string> <string>Filter 3rd party cookies</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -460,7 +460,7 @@
<item row="5" column="1" colspan="3"> <item row="5" column="1" colspan="3">
<widget class="QLabel" name="label_19"> <widget class="QLabel" name="label_19">
<property name="text"> <property name="text">
<string>&lt;b&gt;Warning:&lt;/b&gt; Match domain exactly and filter tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first!</string> <string>&lt;b&gt;Warning:&lt;/b&gt; Filter 3rd party and tracking cookies options can lead to deny some cookies from sites. If you have problems with cookies, try to disable these options first!</string>
</property> </property>
<property name="wordWrap"> <property name="wordWrap">
<bool>true</bool> <bool>true</bool>

1305
translations/empty.ts
View File

File diff suppressed because it is too large Load Diff