mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix for bug #21559 a=chofmann et al r=dveditz

This commit is contained in:
dbragg%netscape.com 1999-12-14 02:10:59 +00:00
Родитель 63b8d73500
Коммит 34b4a939e1
10 изменённых файлов: 311 добавлений и 104 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
xpinstall/res/Makefile.in
Просмотреть файл

@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DIRS = locale content
DIRS = locale content skin
EXPORT_RESOURCE_XPINSTALL = \
$(srcdir)/progress.xul \

20
xpinstall/res/content/institems.js
Просмотреть файл

@ -51,26 +51,30 @@ function addTreeItem(num, modName, url)
function onLoad()
{
var i = 0;
var row = 0;
var moduleName;
var URL;
var numberOfDialogTreeElements;
param = window.arguments[0].QueryInterface( Components.interfaces.nsIDialogParamBlock );
if( !param )
{
dump( " error getting param block interface\n" );
return;
}
param.SetInt(0, 1 ); /* Set the default return to Cancel */
var i = 0;
var row = 0;
var moduleName;
var URL;
while (moduleName != "")
numberOfDialogTreeElements = param.GetInt(1);
for (i=0; i < numberOfDialogTreeElements; i++)
{
moduleName = param.GetString(i++);
URL = param.GetString(i++);
moduleName = param.GetString(i);
URL = param.GetString(++i);
addTreeItem(row++, moduleName, URL);
}
}
function onOk()
{
// set the okay button in the param block

105
xpinstall/res/content/institems.xul
Просмотреть файл

@ -1,5 +1,28 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!-- The contents of this file are subject to the Netscape Public
License Version 1.1 (the "License"); you may not use this file
except in compliance with the License. You may obtain a copy of
the License at http://www.mozilla.org/NPL/
Software distributed under the License is distributed on an "AS
IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
implied. See the License for the specific language governing
rights and limitations under the License.
The Original Code is Mozilla Communicator client code.
The Initial Developer of the Original Code is Netscape
Communications Corporation. Portions created by Netscape are
Copyright (C) 1998-1999 Netscape Communications Corporation. All
Rights Reserved.
Contributor(s):
Don Bragg (dbragg@netscape.com)
-->
<?xml-stylesheet href="chrome://xpinstall/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://xpinstall/skin/xpinstall.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://xpinstall/locale/institems.dtd">
@ -8,64 +31,56 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="onLoad()"
title="&items.label;"
align = "vertical"
flex = "100%"
class="dialog"
width="350"
height="300">
class = "dialog"
align = "vertical"
height = "250"
width = "400"
>
<html:script language="javascript" src="institems.js"/>
<box align="vertical" id="Main-Box">
<box align="horizontal" style="width:100%">
<box align="vertical">
<html:div> <html:h2> &items.label; </html:h2> </html:div>
</box>
<spring flex="80%"/>
<box align="vertical">
<html:img src="chrome://global/skin/alert-icon.gif"/>
</box>
<box align="vertical" id="mainBox">
<box align="horizontal" id="interiorTitleBox">
<html:div id="interiorTitle"> &items.label; </html:div>
<spring flex="100%"/>
<titledbutton class="graphic" />
</box>
</box>
<html:div style="height:10px; width:100%">
<html:hr/>
</html:div>
<html:div >
<html:hr/>
</html:div>
<html:div>&componentList.label;</html:div>
<spring style="height: 1em;"/>
<spring id="verticalSmallSpacer"/>
<box align="vertical">
<html:div id="table-housing" flex="100%">
<tree id="tree">
<treecol style="width:55%"/>
<treecol style="width:40%"/>
<box align="vertical" id="treeBox">
<html:div id="table-housing">
<tree id="modulesTree">
<treecol />
<treecol />
<treehead>
<treerow>
<treecell value="&moduleName.label;" />
<treecell value="&moduleSource.label;"/>
</treerow>
</treehead>
<treehead>
<treerow>
<treecell id="moduleName" value="&moduleName.label;" />
<treecell id="moduleSource" value="&moduleSource.label;"/>
</treerow>
</treehead>
<treechildren id="theTreeBody">
</treechildren>
<treechildren id="theTreeBody">
</treechildren>
</tree>
</html:div>
</html:div>
</box>
<spring id="verticalLargeSpacer"/>
<box align="vertical">
<spring style="height:7em;"/>
</box>
<box align="horizontal">
<spring flex="100%"/>
<titledbutton class="dialog push" id="start" value="&dialogOk.label;" onclick="onOk();" />
<titledbutton class="dialog push" value="&dialogCancel.label;" onclick="cancel();" />
<box class="selection" align="horizontal" id="okcancelBox">
<titledbutton class="dialog push" id="start" value="&dialogOk.label;" onclick="onOk();" />
<!--spring style="width:4px"/-->
<titledbutton class="dialog push" id="cancel" value="&dialogCancel.label;" onclick="cancel();" />
</box>
<spring id="verticalMediumSpacer"/>
</box>

13
xpinstall/res/content/xpistatus.js
Просмотреть файл

@ -32,26 +32,33 @@ function onLoad()
var row = 0;
var moduleName;
var URL;
var numberOfDialogTreeElements;
dump ("In onLoad handler \n");
param = window.arguments[0].QueryInterface( Components.interfaces.nsIDialogParamBlock );
if ( !param )
{
dump (" error getting param block interface \n");
}
numberOfDialogTreeElements = param.GetInt(1);
dump(numberOfDialogTreeElements += "\n");
manager = window.arguments[1];
while (moduleName != "")
for (i = 0; i < numberOfDialogTreeElements; i++)
{
moduleName = param.GetString(i++);
moduleName = param.GetString(i);
URL = param.GetString(i++);
addTreeItem(row++, moduleName, URL);
}
manager.DialogOpened(window);
}
function addTreeItem(num, modName, url)
{
dump("Adding element " + num + " : " + name + "\n");
dump("Adding Progress element " + num + " : " + name + "\n");
var body = document.getElementById("theTreeBody");
var newitem = document.createElement('treeitem');

92
xpinstall/res/content/xpistatus.xul
Просмотреть файл

@ -1,5 +1,29 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!--
The contents of this file are subject to the Netscape Public
License Version 1.1 (the "License"); you may not use this file
except in compliance with the License. You may obtain a copy of
the License at http://www.mozilla.org/NPL/
Software distributed under the License is distributed on an "AS
IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
implied. See the License for the specific language governing
rights and limitations under the License.
The Original Code is Mozilla Communicator client code.
The Initial Developer of the Original Code is Netscape
Communications Corporation. Portions created by Netscape are
Copyright (C) 1998-1999 Netscape Communications Corporation. All
Rights Reserved.
Contributor(s):
Don Bragg (dbragg@netscape.com) 12/08/1999
-->
<?xml-stylesheet href="chrome://xpinstall/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://xpinstall/skin/xpinstall.css" type="text/css"?>
<!DOCTYPE window SYSTEM "chrome://xpinstall/locale/xpistatus.dtd" >
@ -11,39 +35,34 @@
align = "vertical"
class = "dialog"
width="350"
height="300">
height="300"
>
<html:script language="javascript" src="xpistatus.js">
</html:script>
<html:script language="javascript" src="xpistatus.js"/>
<box align="horizontal">
<box align="horizontal" flex="100%" >
<html:div> <html:h3> &progress.label; </html:h3> </html:div>
</box>
<spring flex="80%"/>
<!--box align="vertical"-->
<!--html:img src="chrome://global/skin/aler-icon.gif"/-->
<!--/box-->
<box align="vertical" id="mainBox">
<box align="horizontal" id="interiorTitleBox">
<html:div id="interiorTitle"> &progress.label; </html:div>
<spring flex="100%"/>
<titlebutton class="graphic"/>
</box>
<html:div style="height:10px; width:100%">
<html:div>
<html:hr/>
</html:div>
<html:div> <html:h5> &currentlyProcessing.text; </html:h5> </html:div>
<spring id="verticalSmallSpace"/>
<spring style="height: 1em"/>
<box align="vertical">
<html:div id="table-housing" flex="100%">
<tree id="tree">
<treecol style="width:55%"/>
<treecol style="width:40%"/>
<box align="vertical" id="treeBox">
<html:div id="table-housing">
<tree id="modulesTree">
<treecol />
<treecol />
<treehead>
<treerow>
<treecell value="&moduleName.label;" />
<treecell value="&moduleSource.label;"/>
<treecell id="moduleName" value="&moduleName.label;" />
<treecell id="moduleSource" value="&moduleSource.label;"/>
</treerow>
</treehead>
@ -53,29 +72,10 @@
</html:div>
</box>
<spring flex="100%"/>
<spring id="verticalLargeSpace"/>
<!--Testing
<html:table flex="100%">
<html:tr>
<html:td>
-->
<html:input id="dialog.uiPackageName" readonly="" style="width:100%" />
<!--Testing
</html:td>
</html:tr>
-->
<!--
<html:tr>
<html:td>
-->
<html:input id="dialog.currentAction" readonly="" style="width:100%" />
<!--
</html:td>
</html:tr>
</html:table>
-->
<html:input id="dialog.uiPackageName" readonly="" style="width:100%" />
<html:input id="dialog.currentAction" readonly="" style="width:100%" />
<spring style="height:1em"/>
@ -94,6 +94,6 @@
<html:button id="dialog.cancel" onclick="cancel()">&dialogCancel.label;</html:button>
<!--/box-->
</box>
</box>
</window>

2
xpinstall/res/makefile.win
Просмотреть файл

@ -21,7 +21,7 @@
DEPTH=..\..
DIRS = locale content
DIRS = locale content skin
include <$(DEPTH)\config\rules.mak>

1
xpinstall/res/skin/MANIFEST Normal file
Просмотреть файл

@ -0,0 +1 @@
xpinstall.css

38
xpinstall/res/skin/Makefile.in Normal file
Просмотреть файл

@ -0,0 +1,38 @@
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
#
DEPTH = ../../..
topsrcdir = @top_srcdir@
srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
FILES = \
xpinstall.css \
$(NULL)
include $(topsrcdir)/config/rules.mk
install::
$(INSTALL) $(addprefix $(srcdir)/, $(FILES)) $(DIST)/bin/chrome/xpinstall/skin/default

32
xpinstall/res/skin/Makefile.win Normal file
Просмотреть файл

@ -0,0 +1,32 @@
#!nmake
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation. Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s):
DEPTH=..\..\..
include <$(DEPTH)\config\rules.mak>
install:: $(DLL)
$(MAKE_INSTALL) xpinstall.css $(DIST)\bin\chrome\xpinstall\skin\default
clobber::
rm -f $(DIST)\bin\chrome\xpinstall\skin\default\xpistall.css

110
xpinstall/res/skin/xpinstall.css Normal file
Просмотреть файл

@ -0,0 +1,110 @@
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Don Bragg (dbragg@netscape.com) 12/08/1999
*/
@import url(chrome://global/skin);
div.label {
margin : 3px;
}
div#tree-housing {
height : 3em;
}
box#mainBox{
margin : 5px;
}
box#okcancelBox{
margin-left : 19em;
margin-top : 3px;
margin-bottom : 3px;
}
box#treeBox{
height : 18ex;
}
div#interiorTitle {
font-size : 24px;
font-weight : bold;
}
/*
#table-housing {
height: : 100%;
}
*/
tree#modulesTree {
background-color : transparent ! important;
height : 16ex;
}
treecell#moduleName {
width : 50%
}
treecell#moduleSource {
width : 50%;
}
tree > treechildren {
background-color : window ! important;
}
tree#modulesTree > treehead > treerow > treecell {
padding-left : 1px;
padding-right : 1px;
border-left : none;
border-top : none;
border-right : none;
background-color : transparent ! important;
color : windowtext;
}
titledbutton.graphic{
list-style-image: url("chrome://global/skin/animthrob_single.gif");
}
spring#verticalSmallSpacer {
height : 1ex;
}
spring#verticalLargeSpacer {
height : 20px;
}
spring#verticalMediumSpacer {
height : 3ex;
}
spring#horizontalSmallSpacer {
width : 2em;
}
spring#horizontalLargeSpacer {
width : 10em;
}