commit bf942275f1b46b3a2ab52b68963199dd976b7c98 Author: Mike Perry mikeperry-git@torproject.org Date: Mon Feb 9 15:59:47 2015 -0800
Bug 14630: Hide Torbutton's proxy settings tab.
We only hide this for now in case we want to bring it back as a secondary tab after everyone cries about it. It also simplifies the code changes to simply hide it.
Also clean up the associated Torbutton menu and strings for clarity. --- src/chrome/content/popup.xul | 1 + src/chrome/content/preferences.xul | 10 +++++----- src/chrome/locale/en/torbutton.dtd | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 9a77c54..4117632 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -18,6 +18,7 @@ accesskey="&torbutton.context_menu.new_identity_key;" insertafter="context-stop" oncommand="torbutton_new_identity()"/> + <menuseparator/> <menuitem id="torbutton-cookie-protector" label="&torbutton.context_menu.cookieProtections;" accesskey="&torbutton.context_menu.cookieProtections.key;" diff --git a/src/chrome/content/preferences.xul b/src/chrome/content/preferences.xul index 57b013a..f4fcb4d 100644 --- a/src/chrome/content/preferences.xul +++ b/src/chrome/content/preferences.xul @@ -6,7 +6,7 @@ <dialog id="torbutton-prefs" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:html="http://www.w3.org/1999/xhtml" - title="&torbutton.prefs.title;" + title="&torbutton.prefs.privacy_security_settings;" buttons="accept,cancel,extra1" buttonlabelextra1="&torbutton.prefs.restore_defaults;" ondialogextra1="torbutton_prefs_reset_defaults();" @@ -18,11 +18,11 @@ <script type="application/x-javascript" src="preferences.js"/> <tabbox> <tabs> - <tab label="&torbutton.prefs.tor_settings;"/> - <tab label="&torbutton.prefs.privacy_security_settings;"/> + <tab hidden="true" label="&torbutton.prefs.privacy_security_settings;"/> + <tab hidden="true" label="&torbutton.prefs.tor_settings;"/> </tabs> <tabpanels> - <tabpanel> + <tabpanel hidden="true"> <vbox> <radiogroup id="torbutton_settingsMethod"> <radio value="recommended" id="torbutton_useRecommendedSettings" @@ -138,7 +138,7 @@ </hbox> </vbox> </tabpanel> - <tabpanel> + <tabpanel hidden="false"> <vbox> <groupbox> <caption label="&torbutton.prefs.priv_caption;"/> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index ea37d19..1b90d63 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -26,11 +26,11 @@ <!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.toggle "Toggle Tor status"> <!ENTITY torbutton.context_menu.toggle.key "T"> -<!ENTITY torbutton.context_menu.preferences "Preferences..."> +<!ENTITY torbutton.context_menu.preferences "Privacy and Security Settings…"> <!ENTITY torbutton.context_menu.preferences.key "P"> <!ENTITY torbutton.context_menu.about "About Torbutton..."> <!ENTITY torbutton.context_menu.about.key "A"> -<!ENTITY torbutton.context_menu.networksettings "Open Network Settings…"> +<!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> <!ENTITY torbutton.context_menu.networksettings.key "S"> <!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> <!ENTITY torbutton.context_menu.downloadUpdate.key "U">