From a703799580a208beac24c827fcd54b799f46a3d7 Mon Sep 17 00:00:00 2001
From: Einar Egilsson
Date: Wed, 7 Oct 2009 11:24:44 +0000
Subject: Finally working normally again after massive refactoring. Disabling
 single redirects works but needs more GUI work. Added Redirector log file
 since the Error Console keeps deleting our messages.

git-svn-id: http://einaregilsson.googlecode.com/svn/mozilla/redirector/trunk@253 119bf307-c92d-0410-89bd-8f53e6181181
---
 chrome/content/ui/browserOverlay.xul | 1 +
 chrome/content/ui/editRedirect.xul   | 5 +++--
 chrome/content/ui/redirectList.xul   | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'chrome/content/ui')

diff --git a/chrome/content/ui/browserOverlay.xul b/chrome/content/ui/browserOverlay.xul
index 9a02332..f12d0ff 100644
--- a/chrome/content/ui/browserOverlay.xul
+++ b/chrome/content/ui/browserOverlay.xul
@@ -3,6 +3,7 @@
 <!DOCTYPE overlay SYSTEM "chrome://redirector/locale/browserOverlay.xul.dtd">
 <overlay id="redirector-overlay"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <script src="../code/redirect.js"/>
   <script src="../code/browserOverlay.xul.js"/>
 
   <stringbundleset id="stringbundleset">
diff --git a/chrome/content/ui/editRedirect.xul b/chrome/content/ui/editRedirect.xul
index afca5b6..103d1b5 100644
--- a/chrome/content/ui/editRedirect.xul
+++ b/chrome/content/ui/editRedirect.xul
@@ -11,6 +11,7 @@
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+  <script type="application/x-javascript" src="../code/redirect.js"/>
   <script type="application/x-javascript" src="../code/editRedirect.xul.js"/>
   <stringbundleset id="stringbundleset">
     <stringbundle id="redirector-strings" src="chrome://redirector/locale/redirector.properties"/>
@@ -23,8 +24,8 @@
         <textbox id="txtExampleUrl" style="width:400px;"/>
       </row>
       <row align="center">
-        <text value="&txtPattern.label;" style="margin-top:6px;"/>
-        <textbox id="txtPattern" taborder="1"/>
+        <text value="&txtIncludePattern.label;" style="margin-top:6px;"/>
+        <textbox id="txtIncludePattern" taborder="1"/>
         <button id="btnTestPattern" label="&btnTestPattern.label;" onclick="EditRedirect.testPattern();" taborder="2"/>
       </row>
       <row align="center">
diff --git a/chrome/content/ui/redirectList.xul b/chrome/content/ui/redirectList.xul
index 29d5ceb..643a699 100644
--- a/chrome/content/ui/redirectList.xul
+++ b/chrome/content/ui/redirectList.xul
@@ -12,7 +12,11 @@
 		xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+  <script type="application/x-javascript" src="../code/redirect.js"/>
   <script type="application/x-javascript" src="../code/redirectList.xul.js"/>
+  <stringbundleset id="stringbundleset">
+    <stringbundle id="redirector-strings" src="chrome://redirector/locale/redirector.properties"/>
+  </stringbundleset>
 
   <vbox>
       <richlistbox seltype="single" id="lstRedirects" style="margin-bottom:5px; border:solid 1px grey;" height="330px" ondblclick="RedirectList.editRedirect();" onselect="RedirectList.selectionChange();">
@@ -41,6 +45,7 @@
         <button id="btnAdd" onclick="RedirectList.addRedirect();" label="&btnAdd.label;" disabled="false" />
         <button id="btnEdit" onclick="RedirectList.editRedirect();" label="&btnEdit.label;" disabled="true" />
         <button id="btnDelete" onclick="RedirectList.deleteRedirect();" label="&btnDelete.label;" disabled="true" />
+        <button id="btnDisable" onclick="RedirectList.toggleDisabled();" label="&btnDisable.label;" disabled="true" />
         <button id="btnImport" onclick="RedirectList.import();" label="&btnImport.label;"/>
         <button id="btnExport" onclick="RedirectList.export();" label="&btnExport.label;"/>
         <button id="btnHelp" onclick="RedirectList.openHelp();" label="&btnHelp.label;"/>
-- 
cgit v1.2.3-70-g09d2