Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move task bar to tasksOverlay.xul. Added in some test content

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@40756 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
davidm%netscape.com 1999-07-23 00:32:42 +00:00
parent 5687e4e131
commit 85436a5a14
4 changed files with 70 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
mozilla/suite/browser/navigator.xul
View File

@ -270,17 +270,6 @@ Contributor(s): ______________________________________. -->
<!ENTITY buildId.label "Build ID: 1999070614">
<!ENTITY security-button.label "Secure Conn">
<!-- taskbar -->
<!ENTITY webButton.label "Web">
<!ENTITY mailButton.label "Mail">
<!ENTITY dayplannerButton.label "DayPlanner">
<!ENTITY shoppingButton.label "Shopping">
<!ENTITY myDeskButton.label "My Desk">
<!ENTITY openWinButton.label "Open Windows">
]>
<window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
@ -790,39 +779,6 @@ Contributor(s): ______________________________________. -->
</box>
<toolbox>
<toolbar id="taskbar" chromeclass="status">
<popup id="samplePopup">
<menu><menuitem name="Sample Item One"/><menuitem name="Sample Item Two"/></menu>
</popup>
<box align="horizontal">
<titledbutton align="left" class="button"
popupanchor="topleft" popupalign="bottomleft" value="&webButton.label;" />
<titledbutton align="left" class="button"
popupanchor="topleft" popupalign="bottomleft" value="&mailButton.label;" />
</box>
<spring flex="100%"/>
<box align="horizontal">
<titledbutton align="left" class="popup" popup="samplePopup" tooltip="aTooltip" tooltiptext="This is a toolbar"
popupanchor="topleft" popupalign="bottomleft" value="&dayplannerButton.label;" />
<titledbutton align="left" class="popup" popup="samplePopup"
popupanchor="topleft" popupalign="bottomleft" value="&shoppingButton.label;" />
<titledbutton align="left" class="popup" popup="samplePopup"
popupanchor="topleft" popupalign="bottomleft"
value="&myDeskButton.label;" />
</box>
<spring flex="100%"/>
<box align="horizontal">
<titledbutton align="left" class="popup" value="&openWinButton.label;" />
<titledbutton align="left" id="mini-nav" value="" />
<titledbutton align="left" id="mini-mail" value="" onclick="OpenMessenger()"/>
<titledbutton align="left" id="mini-addr" value="" onclick="OpenAddressbook()"/>
<titledbutton align="left" id="mini-comp" value="" />
</box>
</toolbar>
<toolbar id="taskbar" />
</toolbox>
</window>

46
mozilla/xpfe/browser/resources/content/navigator.xul
View File

@ -270,17 +270,6 @@ Contributor(s): ______________________________________. -->
<!ENTITY buildId.label "Build ID: 1999070614">
<!ENTITY security-button.label "Secure Conn">
<!-- taskbar -->
<!ENTITY webButton.label "Web">
<!ENTITY mailButton.label "Mail">
<!ENTITY dayplannerButton.label "DayPlanner">
<!ENTITY shoppingButton.label "Shopping">
<!ENTITY myDeskButton.label "My Desk">
<!ENTITY openWinButton.label "Open Windows">
]>
<window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
@ -790,39 +779,6 @@ Contributor(s): ______________________________________. -->
</box>
<toolbox>
<toolbar id="taskbar" chromeclass="status">
<popup id="samplePopup">
<menu><menuitem name="Sample Item One"/><menuitem name="Sample Item Two"/></menu>
</popup>
<box align="horizontal">
<titledbutton align="left" class="button"
popupanchor="topleft" popupalign="bottomleft" value="&webButton.label;" />
<titledbutton align="left" class="button"
popupanchor="topleft" popupalign="bottomleft" value="&mailButton.label;" />
</box>
<spring flex="100%"/>
<box align="horizontal">
<titledbutton align="left" class="popup" popup="samplePopup" tooltip="aTooltip" tooltiptext="This is a toolbar"
popupanchor="topleft" popupalign="bottomleft" value="&dayplannerButton.label;" />
<titledbutton align="left" class="popup" popup="samplePopup"
popupanchor="topleft" popupalign="bottomleft" value="&shoppingButton.label;" />
<titledbutton align="left" class="popup" popup="samplePopup"
popupanchor="topleft" popupalign="bottomleft"
value="&myDeskButton.label;" />
</box>
<spring flex="100%"/>
<box align="horizontal">
<titledbutton align="left" class="popup" value="&openWinButton.label;" />
<titledbutton align="left" id="mini-nav" value="" />
<titledbutton align="left" id="mini-mail" value="" onclick="OpenMessenger()"/>
<titledbutton align="left" id="mini-addr" value="" onclick="OpenAddressbook()"/>
<titledbutton align="left" id="mini-comp" value="" />
</box>
</toolbar>
<toolbar id="taskbar" />
</toolbox>
</window>

9
mozilla/xpfe/global/resources/content/tasksOverlay.js
View File

@ -123,6 +123,7 @@ function toNewTextEditorWindow()
dump("Error; can't create toolkitCore\n");
}
}
function ShowWindowFromResource( node )
{
var windowManager = Components.classes['component://netscape/rdf/datasource?name=window-mediator'].getService();
@ -142,3 +143,11 @@ function ShowWindowFromResource( node )
}
}
function OpenTaskURL( inURL )
{
dump("loading "+inURL+"\n");
window.content.location.href= inURL;
dump(window.content.location.href+"\n");
RefreshUrlbar();
}

59
mozilla/xpfe/global/resources/content/tasksOverlay.xul
View File

@ -18,6 +18,20 @@
<!ENTITY importUtilCmd.label ".Import Utility">
<!ENTITY javaConsoleCmd.label ".Java Console">
<!-- taskbar -->
<!ENTITY mozillaButton.label "Mozilla">
<!ENTITY shoppingButton.label "Shopping">
<!ENTITY entertainment.label "Entertainment">
<!ENTITY openWinButton.label "Open Windows">
<!-- taskbar popups -->
<!ENTITY bugzillaButton.label "Go to Bugzilla">
<!ENTITY tinderboxButton.label "Look at Tinderbox">
<!ENTITY bonsai.label "Look at Bonsai">
<!ENTITY booksButton.label "Buy Books at Fatbrain">
<!ENTITY cdButton.label "Buy CD's at CDNOW">
<!ENTITY lifeButton.label "Get a life at Match.com">
]>
@ -49,4 +63,49 @@
</menu>
<toolbar id="taskbar" chromeclass="status">
<popup id="mozillaPopup">
<menu>
<menuitem name="&bonsai.label;" onclick="OpenTaskURL('http://cvs-mirror.mozilla.org/webtools/bonsai/toplevel.cgi?treeid=SeaMonkey');"/>
<menuitem name="&bugzillaButton.label;" onclick="OpenTaskURL('http://bugzilla.mozilla.org');"/>
</menu>
</popup>
<popup id="shoppingPopup">
<menu>
<menuitem name="&booksButton.label;" onclick="OpenTaskURL('http://www.fatbrain.com' );"/>
<menuitem name="&cdButton.label;" onclick="OpenTaskURL('http://www.cdnow.com');" />
<menuitem name="&lifeButton.label;" onclick="OpenTaskURL('http://www.match.com');"/>
</menu>
</popup>
<popup id="windowPopup" >
<menu onclick="ShowWindowFromResource(event.target)" datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot" >
</menu>
</popup>
<box align="horizontal">
<titledbutton align="left" id="mini-nav" value="" onclick="toNavigator();"/>
<titledbutton align="left" id="mini-mail" value="" onclick="OpenMessenger()"/>
<titledbutton align="left" id="mini-addr" value="" onclick="OpenAddressbook()"/>
<titledbutton align="left" id="mini-comp" value="" onclick="toEditor();" />
</box>
<spring flex="100%"/>
<box align="horizontal">
<titledbutton align="left" class="popup" popup="mozillaPopup" tooltip="aTooltip" tooltiptext="Mozilla development info"
popupanchor="topleft" popupalign="bottomleft" value="&mozillaButton.label;" />
<titledbutton align="left" class="popup" popup="shoppingPopup"
popupanchor="topleft" popupalign="bottomleft" value="&shoppingButton.label;" />
<titledbutton align="left" class="popup" value="&openWinButton.label;" popup="windowPopup"
popupanchor="topleft" popupalign="bottomleft" />
</box>
<spring flex="100%"/>
</toolbar>
</overlay>