diff --git a/browser/README.html b/browser/README.html index 764b5e1e424..e69de29bb2d 100644 --- a/browser/README.html +++ b/browser/README.html @@ -1,143 +0,0 @@ - - - - Mozilla Firebird - - -

Mozilla Firebird

- -

This project is a redesign of the - Mozilla browser component, similar to Galeon, K-Meleon and Chimera, - but written using the XUL user interface language and designed to be - cross-platform.

- - -

Principles, Strategy, Tactics, and Concrete Design Decisions

- -
    -
  1. CVS access is restricted to a very small team. We'll grow as - needed, based on reputation and meritorious hacks.
    2. - -
  2. This will be a single process for the browser only. Mail - clients, web editors, etc, will be out-of-process. Hooks for other - apps will be provided eventually, although that is not an immediate - goal.
    3. - -
  3. No profile manager UI on startup, although you can still select - multiple profiles from the command line.
    4. - -
  4. The default theme will be based on Classic, utilizing nsITheme - to respects the system look and feel. Mozilla Firebird will not use the old - and stale Communicator icons. Additional themes will be supported - but will not be part of Mozilla Firebird.
    5. - -
  5. The toolbar(s) will be configurable. That includes moving the - location bar where the user wants it (not just splitting it so it - takes a whole toolbar width).
    6. - -
  6. The personal toolbar is the personal toolbar, not the - whorebar.
    7. - -
  7. All wallet-like functionality will be rewritten from - scratch.
    8. - -
  8. We will have a sidebar, but it may work differently from - Mozilla's current one.
    9. - -
  9. There won't be 239 access points for Search and for - Bookmarks!
    10. - -
  10. We may drop the throbber.
    11. - -
  11. The interface will not be "geeky" nor will it have a - "hacker-focus". Nor will it be "minimal". The idea is to design the - best web browser for most people. (This doesn't mean every feature - has to be enabled by default.)
    12. -
- - -

Notes

- -

We won't be redesigning the editor widget(s) or other parts of - Gecko as part of this project.

- -

We plan to move this app to the - MRE - or the XRE - but those projects are not ready for us so we have not started that - work yet.

- - -

FAQ

- -

Q1. Why?

- -

Some of us want to have fun and build an excellent, user-friendly - browser without the constraints (such as unnecessary features, - compatibility, marketing requirements, month long discussions, etc.) - that the current browser development requires.

- -

Others of us are simply using this as a prototype to demonstrate - possible optimizations to the trunk, such as stripping overlays or - separating the application into separate processes instead of - running one monolithic suite.

- -

Q2. Why only a small team?

- -

The size of the team working on the trunk is one of the many - reasons that development on the trunk is so slow. We feel that - fewer dependencies (no marketing constraints), faster innovation (no - UI committees), and more freedom to experiment (no backwards - compatibility requirements) will lead to a better end product.

- -

Q3. Where do I file bugs on this?

- -

We're still chopping with strong bursts and broad strokes. There's - plenty that's obviously broken and we don't need bugs on that. If you - find a bug (a feature request is not a bug) and you're sure that it's - specific to Mozilla Firebird (not present in Mozilla) and you've read all of the - existing Mozilla Firebird bugs well enough to know that it's not already reported - then feel free report it on the Phoenix product in Bugzilla.

- -

Q4: Why are you guys wasting time making a FAQ?

- -

Because we would waste tons of time answering these questions, if - there were no FAQ.

- -

Q5: How do I get involved?

- -

By invitation. This is a meritocracy -- those who gain the respect of - those in the group will be invited to join the group.

- - -

Getting and Building the Source

- -

UNIX, Windows (gmake), Mac (mach-o)

- -
    -
  1. Create a .mozconfig file in your home directory, or in the mozilla directory, containing the following:
    -
    - - export MOZ_PHOENIX=1
    - mk_add_options MOZ_PHOENIX=1
    - ac_add_options --enable-crypto
    - ac_add_options --disable-tests
    - ac_add_options --disable-debug
    - ac_add_options --disable-composer
    - ac_add_options --enable-optimize=-O2
    - ac_add_options --disable-ldap
    - ac_add_options --disable-mailnews
    - ac_add_options --enable-extensions=cookie,xml-rpc,xmlextras,p3p,pref,transformiix,universalchardet,typeaheadfind,webservices
    -
    - Note: DO NOT USE --enable-optimize=-O2 on Windows. There are bugs. Simply use --enable-optimize. -     -
  2. Pull from CVS and build as described in the Mozilla build instructions. -
  3. Run the MozillaFirebird executable that is left in dist/bin
    4. -
- -

Mac (CodeWarrior)

- -

This platform is currently not supported.

- - - diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 570f2c451ac..407e585a554 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -46,12 +46,12 @@ include $(DEPTH)/config/autoconf.mk DIRS = profile -PREF_JS_EXPORTS = $(srcdir)/profile/firebird.js +PREF_JS_EXPORTS = $(srcdir)/profile/firefox.js ifeq ($(USE_SHORT_LIBNAME), 1) -PROGRAM = MozillaFirebird$(BIN_SUFFIX) +PROGRAM = firefox$(BIN_SUFFIX) else -PROGRAM = MozillaFirebird-bin$(BIN_SUFFIX) +PROGRAM = firefox-bin$(BIN_SUFFIX) endif REQUIRES = \ @@ -190,20 +190,20 @@ endif endif ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) -MozillaFirebird:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk +firefox:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \ -e "s|%MREDIR%|$(mredir)|" \ -e "s|mozilla-bin|$(PROGRAM)|g" > $@ chmod +x $@ -libs:: MozillaFirebird +libs:: firefox $(INSTALL) $< $(DIST)/bin -install:: MozillaFirebird +install:: firefox $(SYSINSTALL) $< $(DESTDIR)$(bindir) -GARBAGE += MozillaFirebird -GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firebird.js) +GARBAGE += firefox +GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js) endif @@ -236,7 +236,7 @@ libs:: ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) -APP_NAME = Mozilla\ Firebird +APP_NAME = Firefox libs:: $(PROGRAM) mkdir -p $(DIST)/$(APP_NAME).app/Contents/MacOS diff --git a/browser/app/MozillaFirebird.exe.manifest b/browser/app/MozillaFirebird.exe.manifest deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/browser/app/brand.dtd.in b/browser/app/brand.dtd.in index af039839c93..040524fe49c 100644 --- a/browser/app/brand.dtd.in +++ b/browser/app/brand.dtd.in @@ -1,9 +1,9 @@ - - - + + + - + diff --git a/browser/app/brand.properties b/browser/app/brand.properties index 892757cfc4e..e69de29bb2d 100644 --- a/browser/app/brand.properties +++ b/browser/app/brand.properties @@ -1,3 +0,0 @@ -brandShortName=Mozilla Firebird -brandFullName=Mozilla Firebird -vendorShortName=Mozilla diff --git a/browser/app/macbuild/Contents/Info.plist.in b/browser/app/macbuild/Contents/Info.plist.in index 1da0725a94e..f65495e3122 100644 --- a/browser/app/macbuild/Contents/Info.plist.in +++ b/browser/app/macbuild/Contents/Info.plist.in @@ -68,9 +68,9 @@ CFBundleExecutable - MozillaFirebird-bin + firefox-bin CFBundleGetInfoString - Mozilla Firebird APP_VERSION, © 1998-2003 The Mozilla Organization + Firefox APP_VERSION, © 1998-2004 Contributors CFBundleIconFile mach CFBundleIdentifier @@ -78,7 +78,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - MozillaFirebird + Firefox CFBundlePackageType APPL CFBundleShortVersionString diff --git a/browser/app/module.ver b/browser/app/module.ver index 044b9eb2912..96e7b971ce4 100644 --- a/browser/app/module.ver +++ b/browser/app/module.ver @@ -1,8 +1,8 @@ WIN32_MODULE_COMPANYNAME=Mozilla -WIN32_MODULE_COPYRIGHT=©Firebird and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable. -WIN32_MODULE_FILEVERSION=0,7,0,0 -WIN32_MODULE_FILEVERSION_STRING=0.7+ -WIN32_MODULE_TRADEMARKS=Blah -WIN32_MODULE_DESCRIPTION=Mozilla Firebird -WIN32_MODULE_PRODUCTNAME=Firebird -WIN32_MODULE_NAME=Firebird +WIN32_MODULE_COPYRIGHT=©Firefox and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable. +WIN32_MODULE_FILEVERSION=0,8,0,0 +WIN32_MODULE_FILEVERSION_STRING=0.8 +WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation. +WIN32_MODULE_DESCRIPTION=Firefox +WIN32_MODULE_PRODUCTNAME=Firefox +WIN32_MODULE_NAME=Firefox diff --git a/browser/app/profile/bookmarks.html b/browser/app/profile/bookmarks.html index 01cb0594301..478abd7c235 100644 --- a/browser/app/profile/bookmarks.html +++ b/browser/app/profile/bookmarks.html @@ -10,23 +10,23 @@ Do Not Edit! -->

Bookmarks Toolbar Folder

Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar

-

Mozilla Firebird Help -
David Tenser's Mozilla Firebird help site -
Mozilla Firebird Support -
MozillaZine's Firebird Support forum +
Firefox Help +
David Tenser's Firefox help site +
Firefox Support +
MozillaZine's Firefox Support forum
Plug-in FAQ -
Mozilla Firebird Plug-in Frequently Asked Questions +
Firefox Plug-in Frequently Asked Questions

-

Mozilla Firebird & Mozilla Information

-
Information about Mozilla Firebird and Mozilla +

Firefox & Mozilla Information

+
Information about Firefox and Mozilla

-

Mozilla Firebird Extensions -
Mozilla Firebird add-ons and extensions -
Mozilla Firebird Themes -
Mozilla Firebird themes -
Mozilla Firebird Discussions -
MozillaZine's Mozilla Firebird discussion forums +
Firefox Extensions +
Firefox add-ons and extensions +
Firefox Themes +
Firefox themes +
Firefox Discussions +
MozillaZine's Firefox discussion forums
MozillaZine
Mozilla community news and advocacy

@@ -34,8 +34,8 @@ Do Not Edit! -->

Quick Searches

Handy searches that can be performed in the addressbar

-

Using Mozilla Firebird Quick Searches -
Learn how to create and use Mozilla Firebird custom keywords and quick searches +
Using Firefox Quick Searches +
Learn how to create and use Firefox custom keywords and quick searches
Google Quicksearch
Type "google <search term>" in the addressbar to perform a Google search
I'm Feeling Lucky Quicksearch diff --git a/browser/app/profile/firebird.js b/browser/app/profile/firebird.js deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js new file mode 100644 index 00000000000..cb0d38e8c0a --- /dev/null +++ b/browser/app/profile/firefox.js @@ -0,0 +1,192 @@ +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla 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/MPL/ + * + * 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 the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +// SYNTAX HINTS: dashes are delimiters. Use underscores instead. +// The first character after a period must be alphabetic. + +// pref("startup.homepage_override_url","chrome://browser-region/locale/region.properties"); +pref("general.startup.browser", true); + +pref("browser.chromeURL","chrome://browser/content/"); +pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul"); +pref("xpinstall.dialog.confirm", "chrome://mozapps/content/xpinstall/xpinstallConfirm.xul"); +pref("xpinstall.dialog.progress", "chrome://mozapps/content/downloads/downloads.xul"); +pref("xpinstall.dialog.progress.type", "Download:Manager"); + +pref("keyword.enabled", true); +pref("keyword.URL", "http://www.google.com/search?btnI=I%27m+Feeling+Lucky&ie=UTF-8&oe=UTF-8&q="); + +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); +pref("general.useragent.contentlocale", "chrome://browser-region/locale/region.properties"); +pref("general.useragent.vendor", "Firebird"); +pref("general.useragent.vendorSub", +#expand __APP_VERSION__ +); + +pref("general.smoothScroll", false); +#ifdef XP_UNIX +pref("general.autoScroll", false); +#else +pref("general.autoScroll", true); +#endif + +// 0 = blank, 1 = home (browser.startup.homepage), 2 = last +// XXXBlake Remove this stupid pref +pref("browser.startup.page", 1); +pref("browser.startup.homepage", "chrome://browser-region/locale/region.properties"); +// "browser.startup.homepage_override" was for 4.x +pref("browser.startup.homepage_override.1", false); + +pref("browser.cache.disk.capacity", 50000); +pref("browser.enable_automatic_image_resizing", true); +pref("browser.urlbar.matchOnlyTyped", false); +pref("browser.chrome.site_icons", true); +pref("browser.chrome.favicons", true); +pref("browser.turbo.enabled", false); +pref("browser.formfill.enable", true); + +pref("browser.download.useDownloadDir", true); +pref("browser.download.folderList", 0); +pref("browser.download.manager.showAlertOnComplete", true); +pref("browser.download.manager.showAlertInterval", 2000); +pref("browser.download.manager.retention", 2); +pref("browser.download.manager.showWhenStarting", true); +pref("browser.download.manager.useWindow", true); +pref("browser.download.manager.closeWhenDone", true); +pref("browser.download.manager.openDelay", 500); + +// pointer to the default engine name +pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties"); +// pointer to the Web Search url (content area context menu) +pref("browser.search.defaulturl", "chrome://browser-region/locale/region.properties"); + +// basic search popup constraint: minimum sherlock plugin version displayed +// (note: must be a string representation of a float or it'll default to 0.0) +pref("browser.search.basic.min_ver", "0.0"); + +pref("browser.history.grouping", "day"); +pref("browser.sessionhistory.max_entries", 50); + +// Tab browser preferences. +pref("browser.tabs.loadInBackground", true); +pref("browser.tabs.loadFolderAndReplace", true); +pref("browser.tabs.opentabfor.middleclick", true); +pref("browser.tabs.opentabfor.urlbar", true); + +// Smart Browsing prefs +pref("browser.related.enabled", true); +pref("browser.related.autoload", 1); // 0 = Always, 1 = After first use, 2 = Never +pref("browser.related.provider", "http://www-rl.netscape.com/wtgn?"); +pref("browser.related.disabledForDomains", ""); +pref("browser.goBrowsing.enabled", true); + +// Default bookmark sorting +pref("browser.bookmarks.sort.direction", "descending"); +pref("browser.bookmarks.sort.resource", "rdf:http://home.netscape.com/NC-rdf#Name"); + +// Scripts & Windows prefs +pref("dom.disable_open_during_load", true); +pref("javascript.options.showInConsole", false); + +// popups.policy 1=allow,2=reject +pref("privacy.popups.policy", 1); +pref("privacy.popups.usecustom", true); +pref("privacy.popups.firstTime", true); + +pref("network.protocols.useSystemDefaults", false); // set to true if user links should use system default handlers +pref("network.cookie.cookieBehavior", 0); // cookies enabled +pref("network.cookie.enableForCurrentSessionOnly", false); + +// l12n and i18n +pref("intl.accept_languages", "chrome://global/locale/intl.properties"); +// collationOption is only set on linux for japanese. see bug 18338 and 62015 +// we need to check if this pref is still useful. +pref("intl.collationOption", "chrome://global-platform/locale/intl.properties"); +pref("intl.charsetmenu.browser.static", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more1", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more2", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more3", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more4", "chrome://global/locale/intl.properties"); +pref("intl.charsetmenu.browser.more5", "chrome://global/locale/intl.properties"); +pref("intl.charset.detector", "chrome://global/locale/intl.properties"); +pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); +pref("font.language.group", "chrome://global/locale/intl.properties"); +pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); + +// 0=lines, 1=pages, 2=history , 3=text size +pref("mousewheel.withcontrolkey.action",3); +pref("mousewheel.withshiftkey.action",2); +pref("mousewheel.withaltkey.action",0); + +pref("profile.allow_automigration", false); // setting to false bypasses automigration in the profile code + +// Customizable toolbar stuff +pref("custtoolbar.personal_toolbar_folder", ""); +pref("browser.throbber.url","chrome://browser-region/locale/region.properties"); + +// pref to control the alert notification +pref("alerts.slideIncrement", 1); +pref("alerts.slideIncrementTime", 10); +pref("alerts.totalOpenTime", 4000); +pref("alerts.height", 50); + +// update notifications prefs +pref("update_notifications.enabled", true); +pref("update_notifications.provider.0.frequency", 7); // number of days +pref("update_notifications.provider.0.datasource", "chrome://browser-region/locale/region.properties"); + +pref("browser.xul.error_pages.enabled", false); + +pref("signon.rememberSignons", true); +pref("signon.expireMasterPassword", false); +pref("signon.SignonFileName", "signons.txt"); + +pref("network.protocol-handler.external.mailto", true); // for mail +pref("network.protocol-handler.external.news" , true); // for news + +// By default, all protocol handlers are exposed. This means that +// the browser will respond to openURL commands for all URL types. +// It will also try to open link clicks inside the browser before +// failing over to the system handlers. +pref("network.protocol-handler.expose-all", true); + +// Default security warning dialogs to show once. +pref("security.warn_entering_secure.show_once", true); +pref("security.warn_entering_weak.show_once", true); +pref("security.warn_leaving_secure.show_once", true); +pref("security.warn_viewing_mixed.show_once", true); +pref("security.warn_submit_insecure.show_once", true); diff --git a/browser/app/splash.rc b/browser/app/splash.rc index 6623bf3aa03..9de106a032b 100644 --- a/browser/app/splash.rc +++ b/browser/app/splash.rc @@ -39,7 +39,7 @@ #include #include "nsINativeAppSupportWin.h" -1 24 "MozillaFirebird.exe.manifest" +1 24 "firefox.exe.manifest" // Program icon. IDI_APPLICATION ICON @@ -67,8 +67,8 @@ IDD_SPLASH DIALOGEX STRINGTABLE DISCARDABLE BEGIN - ID_DDE_APPLICATION_NAME, "Mozilla Firebird" - IDS_STARTMENU_APPNAME, "Mozilla Firebird" + ID_DDE_APPLICATION_NAME, "Firefox" + IDS_STARTMENU_APPNAME, "Firefox" END #ifdef MOZ_STATIC_BUILD diff --git a/browser/app/splashos2.rc b/browser/app/splashos2.rc index ae4b1940274..728bb2b90b3 100644 --- a/browser/app/splashos2.rc +++ b/browser/app/splashos2.rc @@ -46,5 +46,5 @@ END STRINGTABLE DISCARDABLE BEGIN - ID_DDE_APPLICATION_NAME, "Mozilla Firebird" + ID_DDE_APPLICATION_NAME, "Firefox" END diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index 6803602a6a8..5f881397605 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -49,38 +49,27 @@ + buttons="accept,extra2" + onload="init(event);" onunload="uninit(event);" + title="&aboutDialog.title;" creditslabel="©right;" aboutlabel="&aboutLink;" + style="width: 299px"> - +