commit 139fc8ca99b8ba8795e87d060ba76b14563bfec1
parent bfcd391da656a0f92b7aab16b9095ad3b29e0812
Author: David Norton <david@nortoncrew.com>
Date: Tue, 23 May 2006 19:10:03 +0000
step 2 of moving scholar.xul to overlay.xul
Diffstat:
5 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/chrome.manifest b/chrome.manifest
@@ -2,5 +2,5 @@ content scholar chrome/chromeFiles/content/scholar/
locale scholar en-US chrome/chromeFiles/locale/en-US/scholar/
skin scholar default chrome/chromeFiles/skin/default/scholar/
-overlay chrome://browser/content/browser.xul chrome://scholar/content/scholar.xul
+overlay chrome://browser/content/browser.xul chrome://scholar/content/overlay.xul
style chrome://browser/content/browser.xul chrome://scholar/skin/scholar.css
diff --git a/chrome/chromeFiles/content/scholar/scholar.js b/chrome/chromeFiles/content/scholar/overlay.js
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://scholar/skin/scholar.css" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://scholar/locale/scholar.dtd">
+
+<overlay id="scholar"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <?xul-overlay href="editpane.xul" ?>
+
+ <script src="overlay.js"/>
+ <script src="db.js"/>
+ <script src="data_access.js"/>
+
+ <stringbundleset id="stringbundleset">
+ <stringbundle id="scholar-strings" src="chrome://scholar/locale/scholar.properties"/>
+ </stringbundleset>
+
+ <statusbar id="status-bar">
+ <statusbarpanel onclick="alert(Scholar.testString)" id="my-panel" label="&statusbarpanel.helloworld;"/>
+ </statusbar>
+
+ <menupopup id="viewSidebarMenu">
+ <menuitem observes="viewScholarSidebar" />
+ </menupopup>
+
+ <menupopup id="menu_ToolsPopup">
+ <menuitem id="tools-scholar"
+ oncommand="open('chrome://scholar/content/scholar-main.xul','scholar-window','chrome, resizable');" label="Scholar"
+ key="key_openScholar"/>
+ </menupopup>
+
+ <keyset id="mainKeyset">
+ <key id="key_openScholar"
+ key="S"
+ modifiers="shift accel" />
+ </keyset>
+
+ <broadcasterset id="mainBroadcasterSet">
+ <broadcaster id="viewScholarSidebar"
+ label="Scholar"
+ autoCheck="false"
+ type="checkbox"
+ group="sidebar"
+ sidebarurl="chrome://scholar/content/sidebar.xul"
+ sidebartitle="Scholar"
+ oncommand="toggleSidebar('viewScholarSidebar');" />
+ </broadcasterset>
+</overlay>
+\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/scholar.xul b/chrome/chromeFiles/content/scholar/scholar.xul
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://scholar/skin/scholar.css" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://scholar/locale/scholar.dtd">
-
-<overlay id="scholar"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <?xul-overlay href="editpane.xul" ?>
-
- <script src="scholar.js"/>
- <script src="db.js"/>
- <script src="data_access.js"/>
-
- <stringbundleset id="stringbundleset">
- <stringbundle id="scholar-strings" src="chrome://scholar/locale/scholar.properties"/>
- </stringbundleset>
-
- <statusbar id="status-bar">
- <statusbarpanel onclick="alert(Scholar.testString)" id="my-panel" label="&statusbarpanel.helloworld;"/>
- </statusbar>
-
- <menupopup id="viewSidebarMenu">
- <menuitem observes="viewScholarSidebar" />
- </menupopup>
-
- <menupopup id="menu_ToolsPopup">
- <menuitem id="tools-scholar"
- oncommand="open('chrome://scholar/content/scholar-main.xul','scholar-window','chrome, resizable');" label="Scholar"
- key="key_openScholar"/>
- </menupopup>
-
- <keyset id="mainKeyset">
- <key id="key_openScholar"
- key="S"
- modifiers="shift accel" />
- </keyset>
-
- <broadcasterset id="mainBroadcasterSet">
- <broadcaster id="viewScholarSidebar"
- label="Scholar"
- autoCheck="false"
- type="checkbox"
- group="sidebar"
- sidebarurl="chrome://scholar/content/sidebar.xul"
- sidebartitle="Scholar"
- oncommand="toggleSidebar('viewScholarSidebar');" />
- </broadcasterset>
-</overlay>
-\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/test/test.xul b/chrome/chromeFiles/content/scholar/test/test.xul
@@ -9,7 +9,7 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="padding:2em">
- <script src="../scholar.js"/>
+ <script src="../overlay.js"/>
<script src="../db.js"/>
<script src="test.js"/>
