diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/prefs-dialog.c | 3 | ||||
-rw-r--r-- | src/resources/prefs-dialog.ui | 100 |
2 files changed, 56 insertions, 47 deletions
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 748b0658d..ebd82cdff 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -985,6 +985,9 @@ static const PrefsDialogPreference preferences[] = { "popups_allow_checkbutton", "active", EPHY_PREFS_WEB_SCHEMA, EPHY_PREFS_WEB_ENABLE_POPUPS, G_SETTINGS_BIND_DEFAULT, NULL, NULL }, + { "adblock_allow_checkbutton", "active", + EPHY_PREFS_WEB_SCHEMA, EPHY_PREFS_WEB_ENABLE_ADBLOCK, + G_SETTINGS_BIND_INVERT_BOOLEAN, NULL, NULL }, { "enable_plugins_checkbutton", "active", EPHY_PREFS_WEB_SCHEMA, EPHY_PREFS_WEB_ENABLE_PLUGINS, G_SETTINGS_BIND_DEFAULT, NULL, NULL }, diff --git a/src/resources/prefs-dialog.ui b/src/resources/prefs-dialog.ui index 5462d6d97..1f2847a8f 100644 --- a/src/resources/prefs-dialog.ui +++ b/src/resources/prefs-dialog.ui @@ -22,11 +22,11 @@ <child> <object class="GtkButton" id="cancelbutton1"> <property name="label">gtk-cancel</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -38,11 +38,11 @@ <child> <object class="GtkButton" id="add_button"> <property name="label">gtk-add</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -155,11 +155,11 @@ <child> <object class="GtkButton" id="closebutton1"> <property name="label">gtk-close</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -253,11 +253,12 @@ <child> <object class="GtkCheckButton" id="automatic_downloads_checkbutton"> <property name="label" translatable="yes">A_utomatically open downloaded files</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> @@ -340,11 +341,12 @@ <child> <object class="GtkCheckButton" id="use_gnome_fonts_checkbutton"> <property name="label" translatable="yes">_Use system fonts</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> @@ -368,10 +370,10 @@ <property name="row_spacing">6</property> <child> <object class="GtkFontButton" id="sans_fontbutton"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_font">True</property> </object> <packing> @@ -382,10 +384,10 @@ </child> <child> <object class="GtkFontButton" id="serif_fontbutton"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="font_name">Serif 12</property> <property name="use_font">True</property> </object> @@ -399,10 +401,10 @@ </child> <child> <object class="GtkFontButton" id="mono_fontbutton"> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="font_name">Monospace 12</property> <property name="use_font">True</property> </object> @@ -512,11 +514,12 @@ <child> <object class="GtkCheckButton" id="css_checkbox"> <property name="label" translatable="yes">Use custom _stylesheet</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> @@ -533,11 +536,11 @@ <child> <object class="GtkButton" id="css_edit_button"> <property name="label" translatable="yes">_Edit Stylesheet…</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> @@ -625,11 +628,12 @@ <child> <object class="GtkCheckButton" id="popups_allow_checkbutton"> <property name="label" translatable="yes">Allow popup _windows</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> @@ -639,35 +643,54 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="adblock_allow_checkbutton"> + <property name="label" translatable="yes">Allow _advertisements</property> + <property name="use_action_appearance">False</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> <object class="GtkCheckButton" id="enable_plugins_checkbutton"> <property name="label" translatable="yes">Enable _plugins</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> <object class="GtkCheckButton" id="enable_javascript_checkbutton"> <property name="label" translatable="yes">Enable Java_Script</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> @@ -720,11 +743,12 @@ <child> <object class="GtkRadioButton" id="always"> <property name="label" translatable="yes">_Always accept</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> <packing> @@ -736,11 +760,12 @@ <child> <object class="GtkRadioButton" id="no-third-party"> <property name="label" translatable="yes">Only _from sites you visit</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> <property name="group">always</property> </object> @@ -774,11 +799,12 @@ <child> <object class="GtkRadioButton" id="never"> <property name="label" translatable="yes">_Never accept</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> <property name="group">always</property> </object> @@ -833,10 +859,10 @@ <child> <object class="GtkCheckButton" id="do_not_track_checkbutton"> <property name="label" translatable="yes">_Tell web sites I do not want to be tracked</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> @@ -885,11 +911,12 @@ <child> <object class="GtkCheckButton" id="remember_passwords_checkbutton"> <property name="label" translatable="yes">_Remember passwords</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> + <property name="xalign">0.5</property> <property name="draw_indicator">True</property> </object> </child> @@ -998,10 +1025,10 @@ <child> <object class="GtkButton" id="clear_cache_button"> <property name="label" translatable="yes">Cl_ear</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> </object> <packing> @@ -1199,11 +1226,11 @@ <child> <object class="GtkButton" id="lang_add_button"> <property name="label">gtk-add</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -1215,11 +1242,11 @@ <child> <object class="GtkButton" id="lang_remove_button"> <property name="label">gtk-remove</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -1231,11 +1258,11 @@ <child> <object class="GtkButton" id="lang_up_button"> <property name="label">gtk-go-up</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -1247,11 +1274,11 @@ <child> <object class="GtkButton" id="lang_down_button"> <property name="label">gtk-go-down</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> <property name="use_stock">True</property> </object> <packing> @@ -1268,27 +1295,6 @@ <property name="height">1</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> </child> </object> @@ -1335,10 +1341,10 @@ <child> <object class="GtkCheckButton" id="enable_spell_checking_checkbutton"> <property name="label" translatable="yes">_Enable spell checking</property> + <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> |