зеркало из https://github.com/mozilla/gecko-dev.git
xmlterm changes only.
Chrome restructuring: xmlterm extension is not part of communicator and needs to have top level chrome (like chatzilla).
This commit is contained in:
svn%xmlterm.org
Родитель
7730e52385
Коммит
804e34f633
|
|
@ -533,7 +533,7 @@ NS_IMETHODIMP mozXMLTermSession::ReadAll(mozILineTermAux* lineTermAux,
|
|||
|
||||
if (streamIsSecure) {
|
||||
// Secure stream, i.e., prefixed with cookie; fragments allowed
|
||||
streamURL = "chrome://communicator/content/xmlterm/xmltblank.html";
|
||||
streamURL = "chrome://xmlterm/content/xmltblank.html";
|
||||
|
||||
if (opcodes & LTERM_JSSTREAM_CODE) {
|
||||
// Javascript stream
|
||||
|
|
@ -3117,7 +3117,7 @@ NS_IMETHODIMP mozXMLTermSession::NewEntry(const nsString& aPrompt)
|
|||
imgElement->SetAttribute(attName, attValue);
|
||||
|
||||
attName = "src";
|
||||
attValue = "chrome://communicator/skin/xmlterm/wheel.gif";
|
||||
attValue = "chrome://xmlterm/skin/wheel.gif";
|
||||
imgElement->SetAttribute(attName, attValue);
|
||||
|
||||
attName = "align";
|
||||
|
|
|
|||
|
|
@ -404,7 +404,7 @@ mozXMLTermShell::NewXMLTermWindow(const PRUnichar* args,
|
|||
// Create top level window
|
||||
nsCOMPtr<nsIWebShellWindow> webShellWin;
|
||||
nsCOMPtr<nsIURI> uri = nsnull;
|
||||
//nsCAutoString urlCString("chrome://communicator/content/xmlterm/xmlterm.html");
|
||||
//nsCAutoString urlCString("chrome://xmlterm/content/xmlterm.html");
|
||||
//result = uri->SetSpec(urlCString.GetBuffer());
|
||||
|
||||
XMLT_LOG(mozXMLTermShell::NewXMLTermWindow,0,("check6\n"));
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ int main( int argc, char *argv[] )
|
|||
#else
|
||||
// Load initial XMLterm document
|
||||
result = gSimpleContainer->LoadURL(
|
||||
"chrome://communicator/content/xmlterm/xmlterm.html");
|
||||
"chrome://xmlterm/content/xmlterm.html");
|
||||
if (NS_FAILED(result))
|
||||
return result;
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ fi
|
|||
echo cd $MOZILLA_DIR
|
||||
cd $MOZILLA_DIR
|
||||
|
||||
if [ -f chrome/xmlterm/content/default/$XMLTERM_CHROME ]
|
||||
if [ -f chrome/xmlterm/content/$XMLTERM_CHROME ]
|
||||
then
|
||||
dummy=0
|
||||
else
|
||||
|
|
|
|||
|
|
@ -39,11 +39,9 @@ VPATH = @srcdir@
|
|||
srcdir = @srcdir@
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
CHROME_DIR = communicator
|
||||
CHROME_CONTENT_DIR = content/xmlterm
|
||||
CHROME_L10N_DIR = locale/xmlterm
|
||||
CHROME_SKIN_DIR = skin/xmlterm
|
||||
CHROME_DIR = xmlterm
|
||||
|
||||
CHROME_CONTENT_DIR = content
|
||||
CHROME_CONTENT = \
|
||||
xmlterm.html \
|
||||
xmlterm.xul \
|
||||
|
|
@ -55,6 +53,7 @@ CHROME_CONTENT = \
|
|||
xmltblank.html \
|
||||
$(NULL)
|
||||
|
||||
CHROME_SKIN_DIR = skin
|
||||
CHROME_SKIN = \
|
||||
xmlterm.css \
|
||||
xmltpage.css \
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ function SetPrompt(value) {
|
|||
|
||||
// Create new XMLTerm window
|
||||
function NewXMLTerm(firstcommand) {
|
||||
newwin = window.openDialog( "chrome://communicator/content/xmlterm/xmlterm.xul",
|
||||
newwin = window.openDialog( "chrome://xmlterm/content/xmlterm.xul",
|
||||
"xmlterm", "chrome,dialog=no,resizable",
|
||||
firstcommand);
|
||||
dump("NewXMLTerm: "+newwin+"\n")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
/* xmlterm.css: Stylesheet for XUL wrapper ../content/xmlterm.xul */
|
||||
|
||||
@import url(chrome://global/skin/global.css);
|
||||
@import url(chrome://global/skin/);
|
||||
|
||||
/**
|
||||
* remove black border from iframe
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
-->
|
||||
|
||||
<?xml-stylesheet href="chrome://communicator/skin/xmlterm/xmlterm.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://xmlterm/skin/xmlterm.css" type="text/css"?>
|
||||
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window>
|
||||
|
|
@ -30,9 +30,9 @@
|
|||
onload="StartupXMLTerm();"
|
||||
title="xmlterm" align="vertical" width="586" height="412">
|
||||
|
||||
<html:script src="chrome://communicator/content/xmlterm/XMLTermChrome.js"></html:script>
|
||||
<html:script src="chrome://xmlterm/content/XMLTermChrome.js"></html:script>
|
||||
|
||||
<html:iframe id="content-frame" type="content" html:name="content"
|
||||
html:src="chrome://communicator/content/xmlterm/xmlterm.html" flex="100%"/>
|
||||
html:src="chrome://xmlterm/content/xmlterm.html" flex="100%"/>
|
||||
|
||||
</window>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
|
||||
-->
|
||||
|
||||
<?xml-stylesheet href="chrome://communicator/skin/xmlterm/xmlterm.css" type="text/css"?>
|
||||
<?xml-stylesheet href="chrome://xmlterm/skin/xmlterm.css" type="text/css"?>
|
||||
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
|
||||
|
||||
<!DOCTYPE window>
|
||||
|
|
@ -30,12 +30,12 @@
|
|||
onload="StartupXMLTerm();"
|
||||
title="xmlterm2" align="vertical" width="740" height="484">
|
||||
|
||||
<html:script src="chrome://communicator/content/xmlterm/XMLTermChrome.js"></html:script>
|
||||
<html:script src="chrome://xmlterm/content/XMLTermChrome.js"></html:script>
|
||||
|
||||
<html:iframe id="content-frame2" type="content" html:name="content2"
|
||||
html:src="about:blank" flex="100%"/>
|
||||
|
||||
<html:iframe id="content-frame" type="content" html:name="content"
|
||||
html:src="chrome://communicator/content/xmlterm/xmlterm.html" flex="100%"/>
|
||||
html:src="chrome://xmlterm/content/xmlterm.html" flex="100%"/>
|
||||
|
||||
</window>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче