commit d61c7774761994f2be3ab96b8adc4b147a41e30e Author: Sukhbir Singh sukhbir@torproject.org Date: Mon Aug 19 00:38:18 2013 -0400

Add overlay for troubleshoot mode --- chrome/content/preferences.js | 6 ++++++ chrome/content/preferences.xul | 5 ++++- chrome/content/troubleshoot.xul | 24 ++++++++++++++++++++++++ chrome/locale/en/torbirdy.dtd | 3 +++ 4 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/chrome/content/preferences.js b/chrome/content/preferences.js index d7f4aad..19a8d64 100644 --- a/chrome/content/preferences.js +++ b/chrome/content/preferences.js @@ -589,5 +589,11 @@ if (!org.torbirdy.prefs) org.torbirdy.prefs = new function() { } };

+ pub.troubleshoot = function() { + window.openDialog("chrome://castironthunderbirdclub/content/troubleshoot.xul", + "TroubleshootWindow", + "chrome, centerscreen, modal, resizable=yes").focus(); + }; + return pub; }; diff --git a/chrome/content/preferences.xul b/chrome/content/preferences.xul index 9218cd8..7ca4b8a 100644 --- a/chrome/content/preferences.xul +++ b/chrome/content/preferences.xul @@ -8,13 +8,16 @@ xmlns:html="http://www.w3.org/1999/xhtml" title="&torbirdy.prefs.title;" persist="screenX screenY width height" - buttons="accept,cancel,extra2" + buttons="accept,cancel,extra1,extra2" buttonlabelaccept="&torbirdy.prefs.save.button;" buttonaccesskeyaccept="&torbirdy.prefs.save.key;" buttonlabelcancel="&torbirdy.prefs.cancel.button;" + buttonlabelextra1="&torbirdy.prefs.extra1.button;" buttonlabelextra2="&torbirdy.prefs.extra2.button;" + buttonaccesskeyextra1="&torbirdy.prefs.extra1.key;" buttonaccesskeyextra2="&torbirdy.prefs.extra2.key;"

+ ondialogextra1="return org.torbirdy.prefs.troubleshoot();" ondialogextra2="return org.torbirdy.prefs.testSettings();" ondialogaccept="return org.torbirdy.prefs.onAccept();" onload="return org.torbirdy.prefs.onLoad();"> diff --git a/chrome/content/troubleshoot.xul b/chrome/content/troubleshoot.xul new file mode 100644 index 0000000..64075d8 --- /dev/null +++ b/chrome/content/troubleshoot.xul @@ -0,0 +1,24 @@ +<?xml version="1.0"?> +<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> + +<!DOCTYPE overlay SYSTEM "chrome://castironthunderbirdclub/locale/torbirdy.dtd"> + +<dialog id="castironthunderbird-troubleshoot" + xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" + title="&torbirdy.troubleshoot.title;" + buttons="accept" + onload="return org.torbirdy.troubleshoot.onLoad();" + ondialogaccept="window.close();"> + + <script type="application/x-javascript" + src="chrome://castironthunderbirdclub/content/troubleshoot.js"></script> + + <stringbundleset id="stringbundleset"> + <stringbundle id="torbirdy-strings-troubleshoot" src="chrome://castironthunderbirdclub/locale/torbirdy.properties"/> + </stringbundleset> + + <vbox flex="1" pack="start"> + <textbox id="torbirdy-troubleshoot" multiline="true" /> + </vbox> + +</dialog> diff --git a/chrome/locale/en/torbirdy.dtd b/chrome/locale/en/torbirdy.dtd index 30a1fc6..7113183 100644 --- a/chrome/locale/en/torbirdy.dtd +++ b/chrome/locale/en/torbirdy.dtd @@ -12,6 +12,8 @@ <!ENTITY torbirdy.prefs.save.button "Save"> <!ENTITY torbirdy.prefs.save.key "s"> <!ENTITY torbirdy.prefs.cancel.button "Cancel"> +<!ENTITY torbirdy.prefs.extra1.button "Troubleshoot"> +<!ENTITY torbirdy.prefs.extra1.key "o"> <!ENTITY torbirdy.prefs.extra2.button "Test Settings"> <!ENTITY torbirdy.prefs.extra2.key "n"> <!ENTITY torbirdy.prefs.proxy.label "Proxy Settings"> @@ -57,3 +59,4 @@ <!ENTITY torbirdy.panel.preferences.label "Open TorBirdy Preferences">

<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run"> +<!ENTITY torbirdy.troubleshoot.title "Troubleshooting">