aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chrome/content/code/browserOverlay.xul.js7
-rw-r--r--chrome/content/ui/browserOverlay.xul2
-rw-r--r--chrome/content/ui/settings.xul2
-rw-r--r--chrome/skin/redirector.png (renamed from chrome/content/images/redirector.png)bin1462 -> 1462 bytes
-rw-r--r--chrome/skin/statusactive.PNG (renamed from chrome/content/images/statusactive.PNG)bin360 -> 360 bytes
-rw-r--r--chrome/skin/statusinactive.PNG (renamed from chrome/content/images/statusinactive.PNG)bin396 -> 396 bytes
-rw-r--r--install.rdf4
7 files changed, 7 insertions, 8 deletions
diff --git a/chrome/content/code/browserOverlay.xul.js b/chrome/content/code/browserOverlay.xul.js
index b5ec077..28047b1 100644
--- a/chrome/content/code/browserOverlay.xul.js
+++ b/chrome/content/code/browserOverlay.xul.js
@@ -16,7 +16,6 @@ var RedirectorOverlay = {
this.strings = document.getElementById("redirector-strings");
this.changedPrefs(Redirector.prefs);
Redirector.prefs.addListener(this);
-
} catch(e) {
if (this.strings) {
alert(this.strings.getString("initError") + "\n\n" + e);
@@ -35,10 +34,10 @@ var RedirectorOverlay = {
var statusImg = document.getElementById('redirector-statusbar-img');
if (prefs.enabled) {
- statusImg.src = 'chrome://redirector/content/images/statusactive.PNG'
+ statusImg.src = 'chrome://redirector/skin/statusactive.png'
statusImg.setAttribute('tooltiptext', this.strings.getString('enabledTooltip'));
} else {
- statusImg.src = 'chrome://redirector/content/images/statusinactive.PNG'
+ statusImg.src = 'chrome://redirector/skin/statusinactive.png'
statusImg.setAttribute('tooltiptext', this.strings.getString('disabledTooltip'));
}
@@ -82,7 +81,7 @@ var RedirectorOverlay = {
if (win) {
win.focus();
} else {
- window.openDialog("chrome://redirector/content/ui/redirectList.xul",
+ window.openDialog("chrome://redirector/content/ui/settings.xul",
windowName,
"chrome,dialog,resizable=yes,centerscreen", this);
}
diff --git a/chrome/content/ui/browserOverlay.xul b/chrome/content/ui/browserOverlay.xul
index 77bab92..7b40c65 100644
--- a/chrome/content/ui/browserOverlay.xul
+++ b/chrome/content/ui/browserOverlay.xul
@@ -23,7 +23,7 @@
</popup>
<statusbar id="status-bar">
<statusbarpanel id="redirector-status">
- <image id="redirector-statusbar-img" src="chrome://redirector/content/images/statusactive.PNG"
+ <image id="redirector-statusbar-img" src="chrome://redirector/skin/statusactive.PNG"
tooltiptext="Redirector is enabled;"
style="width:16px; height:16px;"
onclick="RedirectorOverlay.statusBarClick(event);" />
diff --git a/chrome/content/ui/settings.xul b/chrome/content/ui/settings.xul
index 58c726a..fca43a4 100644
--- a/chrome/content/ui/settings.xul
+++ b/chrome/content/ui/settings.xul
@@ -17,7 +17,7 @@
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"/>
+ <script type="application/x-javascript" src="../code/settings.xul.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="redirector-strings" src="chrome://redirector/locale/redirector.properties"/>
</stringbundleset>
diff --git a/chrome/content/images/redirector.png b/chrome/skin/redirector.png
index f8de12c..f8de12c 100644
--- a/chrome/content/images/redirector.png
+++ b/chrome/skin/redirector.png
Binary files differ
diff --git a/chrome/content/images/statusactive.PNG b/chrome/skin/statusactive.PNG
index 06ce766..06ce766 100644
--- a/chrome/content/images/statusactive.PNG
+++ b/chrome/skin/statusactive.PNG
Binary files differ
diff --git a/chrome/content/images/statusinactive.PNG b/chrome/skin/statusinactive.PNG
index 8b83562..8b83562 100644
--- a/chrome/content/images/statusinactive.PNG
+++ b/chrome/skin/statusinactive.PNG
Binary files differ
diff --git a/install.rdf b/install.rdf
index 2191264..0860b3c 100644
--- a/install.rdf
+++ b/install.rdf
@@ -9,8 +9,8 @@
<em:creator>Einar Egilsson</em:creator>
<em:description>Automatically redirects to user-defined urls on certain pages</em:description>
<em:homepageURL>http://tech.einaregilsson.com/projects/redirector/</em:homepageURL>
- <em:optionsURL>chrome://redirector/content/ui/redirectList.xul</em:optionsURL>
- <em:iconURL>chrome://redirector/content/images/redirector.png</em:iconURL>
+ <em:optionsURL>chrome://redirector/content/ui/settings.xul</em:optionsURL>
+ <em:iconURL>chrome://redirector/skin/redirector.png</em:iconURL>
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> <!-- firefox -->