diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-07-19 10:41:27 -0500 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-07-21 20:14:03 +0000 |
| commit | e4b444acc8dd991b84c95c08b70fa51af95564a1 (patch) | |
| tree | bcf97612be2d2f138b075da9914ef72cb5f863cb /src/resources | |
| parent | 9b161c46f9d3122cec9f2df6aa8c2cadec803f63 (diff) | |
| download | epiphany-e4b444acc8dd991b84c95c08b70fa51af95564a1.tar.gz | |
Move adblock and popup blocking to general page
The adblock setting is kinda related to privacy, but it's primarily a
user experience setting. It will make more sense on the general page.
The popup blocking is not in any way related to privacy, so having it
under privacy really doesn't make sense. Move it too.
Diffstat (limited to 'src/resources')
| -rw-r--r-- | src/resources/gtk/prefs-general-page.ui | 34 | ||||
| -rw-r--r-- | src/resources/gtk/prefs-privacy-page.ui | 30 |
2 files changed, 35 insertions, 29 deletions
diff --git a/src/resources/gtk/prefs-general-page.ui b/src/resources/gtk/prefs-general-page.ui index bc7f85b32..48777d4fb 100644 --- a/src/resources/gtk/prefs-general-page.ui +++ b/src/resources/gtk/prefs-general-page.ui @@ -117,6 +117,40 @@ </object> </child> <child> + <object class="HdyPreferencesGroup"> + <property name="title" translatable="yes">Web Content</property> + <property name="visible">True</property> + <child> + <object class="HdyActionRow" id="adblock_allow_row"> + <property name="activatable_widget">adblock_allow_switch</property> + <property name="title" translatable="yes">Block _Advertisements</property> + <property name="use_underline">True</property> + <property name="visible">True</property> + <child> + <object class="GtkSwitch" id="adblock_allow_switch"> + <property name="valign">center</property> + <property name="visible">True</property> + </object> + </child> + </object> + </child> + <child> + <object class="HdyActionRow"> + <property name="activatable_widget">popups_allow_switch</property> + <property name="title" translatable="yes">Block _Popup Windows</property> + <property name="use_underline">True</property> + <property name="visible">True</property> + <child> + <object class="GtkSwitch" id="popups_allow_switch"> + <property name="valign">center</property> + <property name="visible">True</property> + </object> + </child> + </object> + </child> + </object> + </child> + <child> <object class="HdyPreferencesGroup" id="homepage_box"> <property name="title" translatable="yes">Homepage</property> <property name="visible">True</property> diff --git a/src/resources/gtk/prefs-privacy-page.ui b/src/resources/gtk/prefs-privacy-page.ui index ab871cd77..562632ede 100644 --- a/src/resources/gtk/prefs-privacy-page.ui +++ b/src/resources/gtk/prefs-privacy-page.ui @@ -10,37 +10,9 @@ </style> <child> <object class="HdyPreferencesGroup"> - <property name="title" translatable="yes">Web Content</property> + <property name="title" translatable="yes">Web Safety</property> <property name="visible">True</property> <child> - <object class="HdyActionRow" id="adblock_allow_row"> - <property name="activatable_widget">adblock_allow_switch</property> - <property name="title" translatable="yes">Try to Block _Advertisements</property> - <property name="use_underline">True</property> - <property name="visible">True</property> - <child> - <object class="GtkSwitch" id="adblock_allow_switch"> - <property name="valign">center</property> - <property name="visible">True</property> - </object> - </child> - </object> - </child> - <child> - <object class="HdyActionRow"> - <property name="activatable_widget">popups_allow_switch</property> - <property name="title" translatable="yes">Block Popup _Windows</property> - <property name="use_underline">True</property> - <property name="visible">True</property> - <child> - <object class="GtkSwitch" id="popups_allow_switch"> - <property name="valign">center</property> - <property name="visible">True</property> - </object> - </child> - </object> - </child> - <child> <object class="HdyActionRow"> <property name="activatable_widget">enable_safe_browsing_switch</property> <property name="title" translatable="yes">Try to Block Dangerous Web_sites</property> |