commit edb653cad4f927a766e7b8527cb8b66d1e894e87
parent 139fc8ca99b8ba8795e87d060ba76b14563bfec1
Author: David Norton <david@nortoncrew.com>
Date: Tue, 23 May 2006 19:12:53 +0000
completed move to overlay.xul. Main interface will now be in scholar.xul. Next move: move functionality from sidebar.xul, editpane.xul to scholar.xul
Diffstat:
4 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/chrome/chromeFiles/content/scholar/overlay.xul b/chrome/chromeFiles/content/scholar/overlay.xul
@@ -25,7 +25,7 @@
<menupopup id="menu_ToolsPopup">
<menuitem id="tools-scholar"
- oncommand="open('chrome://scholar/content/scholar-main.xul','scholar-window','chrome, resizable');" label="Scholar"
+ oncommand="open('chrome://scholar/content/scholar.xul','scholar-window','chrome, resizable');" label="Scholar"
key="key_openScholar"/>
</menupopup>
diff --git a/chrome/chromeFiles/content/scholar/scholar-main.xul b/chrome/chromeFiles/content/scholar/scholar-main.xul
@@ -1,73 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://scholar/locale/scholar.dtd">
-
-<window
- id="scholar-window"
- title="Scholar"
- orient="vertical"
- width="800"
- height="600"
- onload="init()"
- xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
- <script src="scholar-main.js"/>
- <script src="treeView.js"/>
-
- <toolbar>
- <toolbarbutton label="Add Folder..."/>
- <spacer flex="1"/>
- <toolbarbutton label="New Item..." type="menu">
- <menupopup>
- <menuitem label="Book"/>
- <menuitem label="Journal Article"/>
- </menupopup>
- </toolbarbutton>
- </toolbar>
- <hbox flex="1">
- <vbox id="folders-pane" flex="1">
- <tree id="folders-tree" flex="1">
- <treecols>
- <treecol
- id="name_column"
- label="Name"
- flex="1"/>
- </treecols>
- <treechildren/>
- </tree>
- </vbox>
- <splitter collapse="before" resizebefore="closest" resizeafter="closest">
- <grippy/>
- </splitter>
- <vbox flex="3">
- <tree
- id="items-tree"
- enablecolumndrag="true"
- flex="1">
-
- <treecols>
- <treecol
- id="title_column"
- label="&sidebar.items.title_column;"
- flex="2"/>
- <splitter class="tree-splitter"/>
- <treecol
- id="creator_column"
- label="&sidebar.items.creator_column;"
- flex="1"/>
- <splitter class="tree-splitter"/>
- <treecol
- id="source_column"
- label="&sidebar.items.source_column;"
- flex="1"/>
- </treecols>
-
- <treechildren/>
- </tree>
- <splitter collapse="after" resizebefore="closest" resizeafter="closest">
- <grippy/>
- </splitter>
- <tree id="edit-pane" flex="2"/>
- </vbox>
- </hbox>
-</window>
-\ No newline at end of file
diff --git a/chrome/chromeFiles/content/scholar/scholar-main.js b/chrome/chromeFiles/content/scholar/scholar.js
diff --git a/chrome/chromeFiles/content/scholar/scholar.xul b/chrome/chromeFiles/content/scholar/scholar.xul
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
+<!DOCTYPE window SYSTEM "chrome://scholar/locale/scholar.dtd">
+
+<window
+ id="scholar-window"
+ title="Scholar"
+ orient="vertical"
+ width="800"
+ height="600"
+ onload="init()"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+ <script src="scholar.js"/>
+ <script src="treeView.js"/>
+
+ <toolbar>
+ <toolbarbutton label="Add Folder..."/>
+ <spacer flex="1"/>
+ <toolbarbutton label="New Item..." type="menu">
+ <menupopup>
+ <menuitem label="Book"/>
+ <menuitem label="Journal Article"/>
+ </menupopup>
+ </toolbarbutton>
+ </toolbar>
+ <hbox flex="1">
+ <vbox id="folders-pane" flex="1">
+ <tree id="folders-tree" flex="1">
+ <treecols>
+ <treecol
+ id="name_column"
+ label="Name"
+ flex="1"/>
+ </treecols>
+ <treechildren/>
+ </tree>
+ </vbox>
+ <splitter collapse="before" resizebefore="closest" resizeafter="closest">
+ <grippy/>
+ </splitter>
+ <vbox flex="3">
+ <tree
+ id="items-tree"
+ enablecolumndrag="true"
+ flex="1">
+
+ <treecols>
+ <treecol
+ id="title_column"
+ label="&sidebar.items.title_column;"
+ flex="2"/>
+ <splitter class="tree-splitter"/>
+ <treecol
+ id="creator_column"
+ label="&sidebar.items.creator_column;"
+ flex="1"/>
+ <splitter class="tree-splitter"/>
+ <treecol
+ id="source_column"
+ label="&sidebar.items.source_column;"
+ flex="1"/>
+ </treecols>
+
+ <treechildren/>
+ </tree>
+ <splitter collapse="after" resizebefore="closest" resizeafter="closest">
+ <grippy/>
+ </splitter>
+ <tree id="edit-pane" flex="2"/>
+ </vbox>
+ </hbox>
+</window>
+\ No newline at end of file
