Merge Chimera->Camino name changing to the trunk.

This commit is contained in:
sfraser%netscape.com 2003-03-04 18:18:53 +00:00
parent 64b226cae2
commit 13946a57bb
17 changed files with 76 additions and 157 deletions

View File

@ -102,7 +102,7 @@
//174
17587328FF379C6511CA2CBB = {
isa = PBXApplicationReference;
path = Navigator.app;
path = Camino.app;
refType = 3;
};
//170
@ -186,7 +186,7 @@
F6BD637A01B30E0F01A962F7,
);
isa = PBXGroup;
name = Chimera;
name = Camino;
path = "";
refType = 4;
};
@ -294,7 +294,7 @@
OTHER_LDFLAGS = "-lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -lm";
PREBINDING = NO;
PREFIX_HEADER = src/includes/ChimeraPrefix.h;
PRODUCT_NAME = Navigator;
PRODUCT_NAME = Camino;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wno-four-char-constants -Wno-unknown-pragmas -Wall -Wconversion -Wpointer-arith -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth -Wno-long-long";
WRAPPER_EXTENSION = app;
@ -308,9 +308,9 @@
F5170513034A396401026D5D,
);
isa = PBXApplicationTarget;
name = Navigator;
name = Camino;
productInstallPath = "$(HOME)/Applications";
productName = Chimera;
productName = Camino;
productReference = 17587328FF379C6511CA2CBB;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
@ -399,9 +399,9 @@
</dict>
</array>
<key>CFBundleExecutable</key>
<string>Navigator</string>
<string>Camino</string>
<key>CFBundleGetInfoString</key>
<string>Navigator 0.6.0, © 2002 The Mozilla Organization</string>
<string>Camino 0.6.0, © 2002 The Mozilla Organization</string>
<key>CFBundleIconFile</key>
<string>appicon.icns</string>
<key>CFBundleIdentifier</key>
@ -409,7 +409,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Navigator</string>
<string>Camino</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
@ -482,12 +482,12 @@
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>Open URL in Navigator</string>
<string>Open URL in Camino</string>
</dict>
<key>NSMessage</key>
<string>openURL</string>
<key>NSPortName</key>
<string>Navigator</string>
<string>Camino</string>
<key>NSSendTypes</key>
<array>
<string>NSStringPboardType</string>
@ -1436,7 +1436,7 @@
F517395B020CE3740189DA0C,
);
isa = PBXGroup;
name = Chimera;
name = Camino;
path = "";
refType = 4;
};
@ -2442,8 +2442,8 @@
};
F51B70B4026EC8A601A80166 = {
isa = PBXFileReference;
name = Navigator.scriptSuite;
path = resources/application/Navigator.scriptSuite;
name = Camino.scriptSuite;
path = resources/application/Camino.scriptSuite;
refType = 2;
};
F51B70B5026EC8A601A80166 = {
@ -4654,7 +4654,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/Developer/Tools/Rez resources/application/ChimeraVersion.r -o build/Navigator.app/Contents/Resources/English.lproj/Localized.rsrc -useDF";
shellScript = "/Developer/Tools/Rez resources/application/ChimeraVersion.r -o build/Camino.app/Contents/Resources/English.lproj/Localized.rsrc -useDF";
};
F56610A3039474F501A9666E = {
buildActionMask = 2147483647;
@ -4667,7 +4667,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/Developer/Tools/Rez resources/application/ChimeraVersion.r -o build/Navigator.app/Contents/Resources/English.lproj/Localized.rsrc -useDF";
shellScript = "/Developer/Tools/Rez resources/application/ChimeraVersion.r -o build/Camino.app/Contents/Resources/English.lproj/Localized.rsrc -useDF";
};
F56610A40394767101A9666E = {
children = (
@ -7181,7 +7181,7 @@
};
F5BAAB1802AC45D301A967F3 = {
isa = PBXApplicationReference;
path = Navigator.app;
path = Camino.app;
refType = 3;
};
F5BAAB1902AC45D301A967F3 = {
@ -7219,7 +7219,7 @@
OTHER_CFLAGS = "-fno-rtti -fno-exceptions -fpascal-strings -fshort-wchar -DOSTYPE=\\\"Darwin1.4\\\" -DOSARCH=\\\"Darwin\\\" -D_BUILD_STATIC_BIN -DIBMBIDI";
OTHER_LDFLAGS = "-lxpcom -lplds4 -lplc4 -lnspr4 -lsmime3 -lssl3 -lnss3 -lsoftokn3 -lmozjs -lmozjpeg -ljsj -lmozpng -lmozmng -lpthread -lz -lm";
PREFIX_HEADER = src/includes/ChimeraPrefix.h;
PRODUCT_NAME = Navigator;
PRODUCT_NAME = Camino;
SECTORDER_FLAGS = "";
WARNING_CFLAGS = "-Wno-four-char-constants -Wno-unknown-pragmas -Wall -Wconversion -Wpointer-arith -Wbad-function-cast -Wcast-align -Woverloaded-virtual -Wsynth -Wno-long-long";
WRAPPER_EXTENSION = app;
@ -7233,9 +7233,9 @@
F5170514034A396701026D5D,
);
isa = PBXApplicationTarget;
name = NavigatorStatic;
name = CaminoStatic;
productInstallPath = "$(HOME)/Applications";
productName = NavigatorStatic;
productName = CaminoStatic;
productReference = F5BAAB1802AC45D301A967F3;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
@ -7324,9 +7324,9 @@
</dict>
</array>
<key>CFBundleExecutable</key>
<string>Navigator</string>
<string>Camino</string>
<key>CFBundleGetInfoString</key>
<string>Navigator 0.6.0, © 2002 The Mozilla Organization</string>
<string>Camino 0.6.0, © 2002 The Mozilla Organization</string>
<key>CFBundleIconFile</key>
<string>appicon.icns</string>
<key>CFBundleIdentifier</key>
@ -7334,7 +7334,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Navigator</string>
<string>Camino</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
@ -7407,12 +7407,12 @@
<key>NSMenuItem</key>
<dict>
<key>default</key>
<string>Open URL in Navigator</string>
<string>Open URL in Camino</string>
</dict>
<key>NSMessage</key>
<string>openURL</string>
<key>NSPortName</key>
<string>Navigator</string>
<string>Camino</string>
<key>NSSendTypes</key>
<array>
<string>NSStringPboardType</string>
@ -9358,14 +9358,14 @@
F5CA1A1A02D3956F01F34900,
);
isa = PBXVariantGroup;
name = Navigator.scriptTerminology;
name = Camino.scriptTerminology;
path = "";
refType = 4;
};
F5CA1A1A02D3956F01F34900 = {
isa = PBXFileReference;
name = English;
path = resources/localized/English.lproj/Navigator.scriptTerminology;
path = resources/localized/English.lproj/Camino.scriptTerminology;
refType = 2;
};
F5CA1A1B02D3957001F34900 = {

View File

@ -53,9 +53,9 @@ endif
endif
ifdef BUILD_STATIC_LIBS
TARGET = NavigatorStatic
TARGET = CaminoStatic
else
TARGET = Navigator
TARGET = Camino
endif
all:
@ -64,5 +64,5 @@ all:
clean clobber:
rm -rf build
rm -f resources/localized/English.lproj/Localized.rsrc

View File

@ -5,33 +5,33 @@
\margl1440\margr1440\vieww13940\viewh15220\viewkind0
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\f0\b\fs48 \cf0 Chimera Read Me\
\f0\b\fs48 \cf0 Camino Read Me\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\f1\b0\fs24 \cf2 http://www.mozilla.org/projects/chimera/\cf0 \
\f1\b0\fs24 \cf2 http://www.mozilla.org/projects/camino/\cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\f2 \cf0 \
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\f1 \cf0 Thank you for downloading Chimera! Please take a moment to read this information to find out about what\'d5s new in Chimera, and to learn about known issues.\
\f1 \cf0 Thank you for downloading Camino! Please take a moment to read this information to find out about what\'d5s new in Camino, and to learn about known issues.\
\
Chimera is still under development. It is stable enough to use day-to-day, but you may still encounter bugs. You should always keep backup copies of important data that you use with Chimera (e.g. your bookmarks file). \
Camino is still under development. It is stable enough to use day-to-day, but you may still encounter bugs. You should always keep backup copies of important data that you use with Camino (e.g. your bookmarks file). \
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\f0\b\fs36 \cf0 Installation
\f1\b0\fs24 \
\
To install Chimera, simply drag the Navigator icon onto your hard disk. We recommend that you copy it to the Applications folder. You can then Eject the disk image. If you like, you can drag Navigator to your dock to have it easily accessible at all times. You might also wish to select Navigator as your default browser in the Internet system preferences pane (under the Web tab). Note that although the project is called \'d2Chimera\'d3, the name of the application is \'d2Navigator\'d3.\
To install Camino, simply drag the Camino icon onto your hard disk. We recommend that you copy it to the Applications folder. You can then Eject the disk image. If you like, you can drag Camino to your dock to have it easily accessible at all times. You might also wish to select Camino as your default browser in the Internet system preferences pane (under the Web tab).\
\
After installation, you may want to import bookmarks from another browser. Run Navigator, choose \'d3Manage Bookmarks\'d3 from the Bookmarks menu, and choose \'d2Import Bookmarks\'d3 from the submenu. In the resulting file dialog, choose the bookmarks file you wish to import, and click Open. The bookmarks will be imported.\
After installation, you may want to import bookmarks from another browser. Run Camino, choose \'d3Manage Bookmarks\'d3 from the Bookmarks menu, and choose \'d2Import Bookmarks\'d3 from the submenu. In the resulting file dialog, choose the bookmarks file you wish to import, and click Open. The bookmarks will be imported.\
\
\f0\b\fs36 Where information is kept on disk
\f1\b0\fs24 \
\
When you first run Chimera, it makes a folder in
When you first run Camino, it makes a folder in
\f3\fs20 ~/Library/Application Support/
\f1\fs24 (where
\f3\fs20 ~
@ -47,9 +47,9 @@ There are two files in your profile that you might need to know about. First,
\f0\b\fs36 Uninstall
\f1\b0\fs24 \
\
To get rid of all the files related to Chimera, do the following:\
To get rid of all the files related to Camino, do the following:\
\
1. Drag the Navigator icon to the trash\
1. Drag the Camino icon to the trash\
2. Drag the
\f3\fs20 ~/Library/Application Support/Chimera
\f1\fs24 folder to the trash\
@ -59,7 +59,7 @@ To get rid of all the files related to Chimera, do the following:\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\f1\b0\fs24 \cf0 \
See the accompanying \'d2Release Notes\'d3 file for information about what has changed in this version of Chimera, and a list of the known issues.\
See the accompanying \'d2Release Notes\'d3 file for information about what has changed in this version of Camino, and a list of the known issues.\
\
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
@ -67,11 +67,9 @@ See the accompanying \'d2Release Notes\'d3 file for information about what has c
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural
\f1\b0\fs24 \cf0 \
To find out more about Chimera, see the project page at:\
To find out more about Camino, see the project page at:\
\
\cf2 http://www.mozilla.org/projects/chimera/\cf0 \
\cf2 http://www.mozilla.org/projects/camino/\cf0 \
\
This page contains information about how to give feedback on Chimera, has links that allow you to query for known bugs, see what\'d5s going on with current development, and about how to build it yourself from source.\
\
There is also a Unix browser project called Chimera, which is unrelated to Chimera for OS X. More information about the Unix/X11 Chimera browser can be found at \cf2 http://www.chimera.org/\cf0 \
This page contains information about how to give feedback on Camino, has links that allow you to query for known bugs, see what\'d5s going on with current development, and about how to build it yourself from source.\
}

View File

@ -99,6 +99,6 @@
</dict>
</dict>
<key>Name</key>
<string>Navigator</string>
<string>Camino</string>
</dict>
</plist>

View File

@ -62,7 +62,7 @@
#define COPYRIGHT_STRING "© 1998-2002 The Mozilla Organization"
#define GETINFO_VERSION VERSION_STRING ", " COPYRIGHT_STRING
#define PACKAGE_NAME "Chimera " VERSION_STRING
#define PACKAGE_NAME "Camino " VERSION_STRING
// Resources definition

View File

@ -2,11 +2,12 @@
{\fonttbl\f0\fswiss\fcharset77 Optima-BoldItalic;\f1\fswiss\fcharset77 Optima-Italic;\f2\fswiss\fcharset77 Optima-Regular;
\f3\fswiss\fcharset77 Optima-Bold;}
{\colortbl;\red255\green255\blue255;}
\vieww9000\viewh9000\viewkind0
\pard\tx1440\tx2880\tx4320\tx5760\tx7200\ql\qnatural
\f0\i\b\fs18 \cf0 \
\fs68 Navigator\
\fs68 Camino\
\f1\b0\fs24 \
\
@ -17,9 +18,8 @@
\
\
\f2\i0 Navigator version 0.6\
http://www.mozilla.org\
http://chimera.mozdev.org\
\f2\i0 Camino version 0.6\
http://www.mozilla.org/projects/camino/\
\fs48 \
\

View File

@ -1,7 +1,7 @@
HomePageDefault = "http://www.mozilla.org/projects/chimera/homepage.html";
HomePageDefault = "http://www.mozilla.org/projects/camino/homepage.html";
SearchPageDefault = "http://www.google.com/";
StartPageDefault = "http://www.mozilla.org/projects/chimera/welcome.html";
ThrobberPageDefault = "http://www.mozilla.org/projects/chimera/";
FeedbackPageDefault = "http://www.mozilla.org/projects/chimera/feedback.html";
InfoPageDefault = "http://www.mozilla.org/projects/chimera/";
StartPageDefault = "http://www.mozilla.org/projects/camino/welcome.html";
ThrobberPageDefault = "http://www.mozilla.org/projects/camino/";
FeedbackPageDefault = "http://www.mozilla.org/projects/camino/feedback.html";
InfoPageDefault = "http://www.mozilla.org/projects/camino/";
RendezvousPageDefault="http://www.zeroconf.org/webbrowsers.html";

View File

@ -2,9 +2,9 @@
<!DOCTYPE bookmarks SYSTEM "http://www.mozilla.org/DTDs/ChimeraBookmarks.dtd">
<bookmarks xmlns="http://chimera.mozdev.org/bookmarks/">
<folder name="Toolbar Bookmarks" type="toolbar" open="true">
<folder name="Chimera Info">
<bookmark name="Chimera" href="http://www.mozilla.org/projects/chimera/" />
<bookmark name="Chimera Feedback" href="http://www.mozilla.org/projects/chimera/feedback.html" />
<folder name="Camino Info">
<bookmark name="Camino" href="http://www.mozilla.org/projects/camino/" />
<bookmark name="Camino Feedback" href="http://www.mozilla.org/projects/camino/feedback.html" />
<bookmark name="Mozilla.org" href="http://www.mozilla.org" />
</folder>
<folder name="News">

View File

@ -7,25 +7,25 @@
<key>IBEditorPositions</key>
<dict>
<key>124</key>
<string>107 563 170 144 0 0 1600 1002 </string>
<string>83 451 170 144 0 0 1280 832 </string>
<key>160</key>
<string>496 172 195 666 0 0 1152 848 </string>
<key>28</key>
<string>478 352 195 457 0 0 1152 848 </string>
<string>567 326 195 457 0 0 1280 832 </string>
<key>297</key>
<string>107 466 213 294 0 0 1600 1002 </string>
<string>82 354 213 294 0 0 1280 832 </string>
<key>314</key>
<string>72 544 213 150 0 0 1600 1002 </string>
<string>55 435 213 150 0 0 1280 832 </string>
<key>336</key>
<string>486 756 213 180 0 0 1600 1002 </string>
<string>374 600 213 180 0 0 1280 832 </string>
<key>365</key>
<string>31 719 93 162 0 0 1600 1002 </string>
<string>97 563 93 162 0 0 1280 832 </string>
<key>463</key>
<string>349 487 213 246 0 0 1600 1002 </string>
<string>268 375 213 264 0 0 1280 832 </string>
<key>56</key>
<string>450 634 343 68 0 0 1280 1002 </string>
<string>493 520 343 68 0 0 1280 832 </string>
<key>654</key>
<string>140 644 198 144 0 0 1152 848 </string>
<string>159 629 198 144 0 0 1280 832 </string>
</dict>
<key>IBFramework Version</key>
<string>291.0</string>
@ -42,6 +42,6 @@
<key>IBLockedObjects</key>
<array/>
<key>IBSystem Version</key>
<string>6G30</string>
<string>6I32</string>
</dict>
</plist>

View File

@ -26,7 +26,7 @@
<key>NSApplication</key>
<dict>
<key>Description</key>
<string>The Chimera application</string>
<string>The Camino application</string>
<key>Name</key>
<string>application</string>
<key>PluralName</key>
@ -72,8 +72,8 @@
</dict>
</dict>
<key>Description</key>
<string>Navigator's scripting suite</string>
<string>Camino's scripting suite</string>
<key>Name</key>
<string>Navigator suite</string>
<string>Camino suite</string>
</dict>
</plist>

View File

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.9">
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>16 36 356 240 0 0 1024 746 </string>
<string>22 42 356 240 0 0 1280 832 </string>
<key>IBFramework Version</key>
<string>248.0</string>
<string>291.0</string>
<key>IBOpenObjects</key>
<array>
<integer>7</integer>
</array>
<key>IBSystem Version</key>
<string>5Q125</string>
<string>6I32</string>
</dict>
</plist>

View File

@ -9,7 +9,7 @@
<key>266</key>
<string>644 623 277 90 0 0 1600 1002 </string>
<key>29</key>
<string>103 790 446 44 0 0 1152 848 </string>
<string>122 774 446 44 0 0 1280 832 </string>
<key>494</key>
<string>117 597 185 48 0 0 1280 1002 </string>
</dict>
@ -36,6 +36,6 @@
<integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>6G30</string>
<string>6I32</string>
</dict>
</plist>

View File

@ -1,79 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Classes</key>
<dict>
<key>BrowserWindow</key>
<dict>
<key>Attributes</key>
<dict>
<key>URL</key>
<dict>
<key>Description</key>
<string>Current URL</string>
<key>Name</key>
<string>URL</string>
</dict>
</dict>
<key>Description</key>
<string>A browser window</string>
<key>Name</key>
<string>browser window</string>
<key>PluralName</key>
<string>browser windows</string>
</dict>
<key>NSApplication</key>
<dict>
<key>Description</key>
<string>The Chimera application</string>
<key>Name</key>
<string>application</string>
<key>PluralName</key>
<string>applications</string>
</dict>
</dict>
<key>Commands</key>
<dict>
<key>DoJavaScript</key>
<dict>
<key>Description</key>
<string>Execute the supplied JS in the context of the frontmost window. (Not yet implemented)</string>
<key>Name</key>
<string>do javascript</string>
</dict>
<key>GetURL</key>
<dict>
<key>Description</key>
<string>Load a URL in the frontmost window</string>
<key>Name</key>
<string>Get URL</string>
</dict>
<key>OpenURL</key>
<dict>
<key>Description</key>
<string>Load a URL in the frontmost window</string>
<key>Name</key>
<string>open url</string>
</dict>
<key>RegisterEchoHandler</key>
<dict>
<key>Description</key>
<string>Register a URL echo handler. The handler will get called whenever a new URL is loaded. (Not yet implemented)</string>
<key>Name</key>
<string>register echo handler</string>
</dict>
<key>UnregisterEchoHandler</key>
<dict>
<key>Description</key>
<string>Unregister a URL echo handler. (Not yet implemented)</string>
<key>Name</key>
<string>unregister echo handler</string>
</dict>
</dict>
<key>Description</key>
<string>Navigator's scripting suite</string>
<key>Name</key>
<string>Navigator suite</string>
</dict>
</plist>